diff --git a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
similarity index 86%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
rename to Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
index 0d8accb9f86..9ef968e43b1 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
@@ -1,11 +1,9 @@
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-using Content.Client.Psionics.UI;
+using Robust.Client.UserInterface;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Psionics.GlimmerMonitor;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {
diff --git a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
similarity index 87%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
rename to Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
index ade0720696b..e09a422ddf7 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/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.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/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
similarity index 87%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
rename to Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
index f0dcfbce65a..3325c0d379e 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Psionics.UI;
+using Content.Client.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.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/Chat/PsionicChatUpdateSystem.cs
similarity index 92%
rename from Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
rename to Content.Client/Chat/PsionicChatUpdateSystem.cs
index 7bb88764a1f..066501acb78 100644
--- a/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
+++ b/Content.Client/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.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {
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/Eye/PenLight/UI/PenLightBoundUserInterface.cs b/Content.Client/Eye/PenLight/UI/PenLightBoundUserInterface.cs
new file mode 100644
index 00000000000..c4887531151
--- /dev/null
+++ b/Content.Client/Eye/PenLight/UI/PenLightBoundUserInterface.cs
@@ -0,0 +1,47 @@
+using Content.Shared.Medical;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Eye.PenLight.UI
+{
+    [UsedImplicitly]
+    public sealed class PenLightBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private PenLightWindow? _window;
+
+        public PenLightBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = new PenLightWindow
+            {
+                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
+            };
+            _window.OnClose += Close;
+            _window.OpenCentered();
+        }
+
+        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        {
+            if (_window == null
+                || message is not PenLightUserMessage cast)
+                return;
+
+            _window.Diagnose(cast);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            if (_window != null)
+                _window.OnClose -= Close;
+
+            _window?.Dispose();
+        }
+    }
+}
diff --git a/Content.Client/Eye/PenLight/UI/PenLightWindow.xaml b/Content.Client/Eye/PenLight/UI/PenLightWindow.xaml
new file mode 100644
index 00000000000..149b8a13828
--- /dev/null
+++ b/Content.Client/Eye/PenLight/UI/PenLightWindow.xaml
@@ -0,0 +1,11 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc 'pen-light-exam-title'}"
+    SetSize="0 -300">
+    <ScrollContainer VerticalExpand="True">
+        <BoxContainer Name="RootContainer" Orientation="Vertical" HorizontalExpand="True">
+            <Label Name="NoPatientDataText" Text="{Loc 'pen-light-window-no-patient-data-text'}" Visible="False"/>
+            <Label Name="ExamDataLabel"/>
+        </BoxContainer>
+    </ScrollContainer>
+</controls:FancyWindow>
\ No newline at end of file
diff --git a/Content.Client/Eye/PenLight/UI/PenLightWindow.xaml.cs b/Content.Client/Eye/PenLight/UI/PenLightWindow.xaml.cs
new file mode 100644
index 00000000000..809a569fa47
--- /dev/null
+++ b/Content.Client/Eye/PenLight/UI/PenLightWindow.xaml.cs
@@ -0,0 +1,78 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Damage;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Medical;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+using System.Text;
+
+
+namespace Content.Client.Eye.PenLight.UI
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class PenLightWindow : FancyWindow
+    {
+        private readonly IEntityManager _entityManager;
+        private const int LightHeight = 150;
+        private const int LightWidth = 900;
+
+        public PenLightWindow()
+        {
+            RobustXamlLoader.Load(this);
+
+            var dependencies = IoCManager.Instance!;
+            _entityManager = dependencies.Resolve<IEntityManager>();
+        }
+        public void Diagnose(PenLightUserMessage msg)
+        {
+            var target = _entityManager.GetEntity(msg.TargetEntity);
+
+            if (target == null || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
+            {
+                NoPatientDataText.Visible = true;
+                ExamDataLabel.Text = string.Empty;
+                return;
+            }
+
+            NoPatientDataText.Visible = false;
+
+
+            string entityName = Loc.GetString("pen-light-window-entity-unknown-text");
+            if (_entityManager.HasComponent<MetaDataComponent>(target.Value))
+                entityName = Identity.Name(target.Value, _entityManager);
+
+            var sb = new StringBuilder();
+            sb.AppendLine(Loc.GetString("pen-light-window-entity-eyes-text", ("entityName", entityName)));
+
+            // Check if Blind and return early if true
+            if (msg.Blind == true)
+            {
+                sb.AppendLine(Loc.GetString("pen-light-exam-blind-text"));
+                ExamDataLabel.Text = sb.ToString();
+                SetHeight = LightHeight;
+                SetWidth = LightWidth;
+                return;
+            }
+            // EyeDamage
+            if (msg.EyeDamage == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-eyedamage-text"));
+
+            // Drunk
+            if (msg.Drunk == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-drunk-text"));
+
+            // Hallucinating
+            if (msg.SeeingRainbows == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-hallucinating-text"));
+
+            // Healthy
+            if (msg.Healthy == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-healthy-text"));
+
+            ExamDataLabel.Text = sb.ToString();
+
+            SetHeight = LightHeight;
+            SetWidth = LightWidth;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index ad8f8b0b82b..57a91983a96 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -38,8 +38,10 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
             // Few things here:
             // 1. If a shorter duration flash is applied then don't do anything
             // 2. If the client-side time is later than when the flash should've ended don't do anything
+            var calculatedStateDuration = state.Duration * state.DurationMultiplier;
+
             var currentTime = _gameTiming.CurTime.TotalSeconds;
-            var newEndTime = state.Time.TotalSeconds + state.Duration;
+            var newEndTime = state.Time.TotalSeconds + calculatedStateDuration;
             var currentEndTime = component.LastFlash.TotalSeconds + component.Duration;
 
             if (currentEndTime > newEndTime)
@@ -53,7 +55,7 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
             }
 
             component.LastFlash = state.Time;
-            component.Duration = state.Duration;
+            component.Duration = calculatedStateDuration;
 
             var overlay = _overlayManager.GetOverlay<FlashOverlay>();
             overlay.ReceiveFlash(component.Duration);
diff --git a/Content.Client/Forensics/ScentTrackerSystem.cs b/Content.Client/Forensics/ScentTrackerSystem.cs
new file mode 100644
index 00000000000..4e6254502aa
--- /dev/null
+++ b/Content.Client/Forensics/ScentTrackerSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Forensics;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Client.Player;
+
+namespace Content.Client.Forensics
+{
+    public sealed class ScentTrackerSystem : EntitySystem
+    {
+        [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+
+            var query = AllEntityQuery<ForensicsComponent>();
+            while (query.MoveNext(out var uid, out var comp))
+                if (TryComp<ScentTrackerComponent>(_playerManager.LocalEntity, out var scentcomp)
+                    && scentcomp.Scent != string.Empty
+                    && scentcomp.Scent == comp.Scent
+                    && _timing.CurTime > comp.TargetTime)
+                {
+                    comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(1.0f);
+                    Spawn("ScentTrackEffect", _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
+                }
+        }
+    }
+}
\ No newline at end of file
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/Psionics/UserInterface/AcceptPsionicsEUI.cs b/Content.Client/Psionics/UI/AcceptPsionicsEUI.cs
similarity index 100%
rename from Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
rename to Content.Client/Psionics/UI/AcceptPsionicsEUI.cs
diff --git a/Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs b/Content.Client/Psionics/UI/AcceptPsionicsWindow.cs
similarity index 100%
rename from Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
rename to Content.Client/Psionics/UI/AcceptPsionicsWindow.cs
diff --git a/Content.Client/Traits/SingerSystem.cs b/Content.Client/Traits/SingerSystem.cs
new file mode 100644
index 00000000000..4a7bd4ca043
--- /dev/null
+++ b/Content.Client/Traits/SingerSystem.cs
@@ -0,0 +1,13 @@
+using Content.Client.Instruments;
+using Content.Shared.Instruments;
+using Content.Shared.Traits.Assorted.Systems;
+
+namespace Content.Client.Traits;
+
+public sealed class SingerSystem : SharedSingerSystem
+{
+    protected override SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid)
+    {
+        return EnsureComp<InstrumentComponent>(uid); // I hate this, but it's the only way.
+    }
+}
diff --git a/Content.Client/Psionics/UserInterface/GlimmerGraph.cs b/Content.Client/UserInterface/GlimmerGraph.cs
similarity index 98%
rename from Content.Client/Psionics/UserInterface/GlimmerGraph.cs
rename to Content.Client/UserInterface/GlimmerGraph.cs
index 111c810acb1..188ebe2475b 100644
--- a/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
+++ b/Content.Client/UserInterface/GlimmerGraph.cs
@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Psionics.UI;
+namespace Content.Client.UserInterface;
 
 public sealed class GlimmerGraph : Control
 {
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 0bab11f0265..28fb64d7957 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,6 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Psionics.Chat;
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -60,7 +60,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
-    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //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 +82,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 +97,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.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index 641d56d3d14..98528c691d4 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Gameplay;
+using Content.Shared.CCVar;
 using Content.Shared.CombatMode;
 using Content.Shared.Effects;
 using Content.Shared.Hands.Components;
@@ -16,8 +17,6 @@
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Weapons.Melee;
 
@@ -223,12 +222,12 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En
 
         var userPos = TransformSystem.GetWorldPosition(userXform);
         var direction = targetMap.Position - userPos;
-        var distance = MathF.Min(component.Range, direction.Length());
+        var distance = MathF.Min(component.Range * component.HeavyRangeModifier, direction.Length());
 
         // This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes.
         // Server will validate it with InRangeUnobstructed.
         var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user).ToList());
-        RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
+        RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(component.MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
     }
 
     private void OnMeleeLunge(MeleeLungeEvent ev)
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/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DispelPowerSystem.cs
similarity index 70%
rename from Content.Server/Psionics/Abilities/DispelPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/DispelPowerSystem.cs
index 3d7d5c20c7c..d338a5a5bcb 100644
--- a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/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/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
new file mode 100644
index 00000000000..b775117b716
--- /dev/null
+++ b/Content.Server/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/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
similarity index 72%
rename from Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index b4129581ec1..b23224cab48 100644
--- a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/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/Abilities/Psionics/Abilities/MindSwappedComponent.cs
similarity index 79%
rename from Content.Server/Psionics/Abilities/MindSwappedComponent.cs
rename to Content.Server/Abilities/Psionics/Abilities/MindSwappedComponent.cs
index 82c0313bca6..72cd6a66ef9 100644
--- a/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/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/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
new file mode 100644
index 00000000000..0fd261ef12f
--- /dev/null
+++ b/Content.Server/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/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
new file mode 100644
index 00000000000..5ca1dc7a6dc
--- /dev/null
+++ b/Content.Server/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/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
new file mode 100644
index 00000000000..097a0cb750b
--- /dev/null
+++ b/Content.Server/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/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
new file mode 100644
index 00000000000..407b72c6b58
--- /dev/null
+++ b/Content.Server/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/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
new file mode 100644
index 00000000000..f7ae04b61ea
--- /dev/null
+++ b/Content.Server/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/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
new file mode 100644
index 00000000000..e59696aa904
--- /dev/null
+++ b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -0,0 +1,127 @@
+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.StatusEffect;
+using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
+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 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!;
+
+        private ISawmill _sawmill = 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)
+                || HasComp<PsionicComponent>(uid))
+                return;
+
+            if (!_mindSystem.TryGetMind(uid, out _, out var mind))
+            {
+                EnsureComp<PsionicAwaitingPlayerComponent>(uid);
+                return;
+            }
+
+            if (!_mindSystem.TryGetSession(mind, out var client))
+                return;
+
+            if (warn && HasComp<ActorComponent>(uid))
+                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), client);
+            else
+                AddRandomPsionicPower(uid);
+        }
+
+        public void AddPsionics(EntityUid uid, string powerComp)
+        {
+            if (Deleted(uid)
+                || 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))
+            {
+                _sawmill.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)
+                || !psionic.Removable)
+                return;
+
+            if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
+            {
+                _sawmill.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)
+                && psiAbility is not null)
+                _actionsSystem.RemoveAction(uid, psionic.PsionicAbility);
+
+            _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
+
+            RemComp<PsionicComponent>(uid);
+        }
+    }
+}
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/Arachne/ArachneSystem.cs b/Content.Server/Arachne/ArachneSystem.cs
new file mode 100644
index 00000000000..9cdefb441be
--- /dev/null
+++ b/Content.Server/Arachne/ArachneSystem.cs
@@ -0,0 +1,231 @@
+using Content.Shared.Arachne;
+using Content.Shared.Actions;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Verbs;
+using Content.Shared.Buckle.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.Stunnable;
+using Content.Shared.Eye.Blinding.Systems;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Damage;
+using Content.Shared.Inventory;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.Humanoid;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Server.Buckle.Systems;
+using Content.Server.Popups;
+using Content.Server.DoAfter;
+using Content.Server.Body.Components;
+using Content.Server.Vampiric;
+using Content.Server.Speech.Components;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Utility;
+using Robust.Server.Console;
+
+namespace Content.Server.Arachne
+{
+    public sealed class ArachneSystem : EntitySystem
+    {
+        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly DoAfterSystem _doAfter = default!;
+        [Dependency] private readonly BuckleSystem _buckleSystem = default!;
+        [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
+        [Dependency] private readonly BlindableSystem _blindableSystem = default!;
+        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+
+        [Dependency] private readonly IServerConsoleHost _host = default!;
+        [Dependency] private readonly BloodSuckerSystem _bloodSuckerSystem = default!;
+        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
+        private const string BodySlot = "body_slot";
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ArachneComponent, GetVerbsEvent<InnateVerb>>(AddCocoonVerb);
+
+            SubscribeLocalEvent<CocoonComponent, EntInsertedIntoContainerMessage>(OnCocEntInserted);
+            SubscribeLocalEvent<CocoonComponent, EntRemovedFromContainerMessage>(OnCocEntRemoved);
+            SubscribeLocalEvent<CocoonComponent, DamageChangedEvent>(OnDamageChanged);
+            SubscribeLocalEvent<CocoonComponent, GetVerbsEvent<AlternativeVerb>>(AddSuccVerb);
+            SubscribeLocalEvent<ArachneComponent, ArachneCocoonDoAfterEvent>(OnCocoonDoAfter);
+        }
+
+        private void AddCocoonVerb(EntityUid uid, ArachneComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            if (!args.CanAccess || !args.CanInteract)
+                return;
+
+            if (args.Target == uid)
+                return;
+
+            if (!TryComp<BloodstreamComponent>(args.Target, out var bloodstream))
+                return;
+
+            if (bloodstream.BloodReagent != component.WebBloodReagent)
+                return;
+
+            InnateVerb verb = new()
+            {
+                Act = () =>
+                {
+                    StartCocooning(uid, component, args.Target);
+                },
+                Text = Loc.GetString("cocoon"),
+                Priority = 2
+            };
+            args.Verbs.Add(verb);
+        }
+
+        private void OnCocEntInserted(EntityUid uid, CocoonComponent component, EntInsertedIntoContainerMessage args)
+        {
+            _blindableSystem.UpdateIsBlind(args.Entity);
+            EnsureComp<StunnedComponent>(args.Entity);
+
+            if (TryComp<ReplacementAccentComponent>(args.Entity, out var currentAccent))
+            {
+                component.WasReplacementAccent = true;
+                component.OldAccent = currentAccent.Accent;
+                currentAccent.Accent = "mumble";
+            } else
+            {
+                component.WasReplacementAccent = false;
+                var replacement = EnsureComp<ReplacementAccentComponent>(args.Entity);
+                replacement.Accent = "mumble";
+            }
+        }
+
+        private void OnCocEntRemoved(EntityUid uid, CocoonComponent component, EntRemovedFromContainerMessage args)
+        {
+            if (component.WasReplacementAccent && TryComp<ReplacementAccentComponent>(args.Entity, out var replacement))
+            {
+                replacement.Accent = component.OldAccent;
+            } else
+            {
+                RemComp<ReplacementAccentComponent>(args.Entity);
+            }
+
+            RemComp<StunnedComponent>(args.Entity);
+            _blindableSystem.UpdateIsBlind(args.Entity);
+        }
+
+        private void OnDamageChanged(EntityUid uid, CocoonComponent component, DamageChangedEvent args)
+        {
+            if (!args.DamageIncreased)
+                return;
+
+            if (args.DamageDelta == null)
+                return;
+
+            var body = _itemSlots.GetItemOrNull(uid, BodySlot);
+
+            if (body == null)
+                return;
+
+            var damage = args.DamageDelta * component.DamagePassthrough;
+            _damageableSystem.TryChangeDamage(body, damage);
+        }
+
+        private void AddSuccVerb(EntityUid uid, CocoonComponent component, GetVerbsEvent<AlternativeVerb> args)
+        {
+            if (!args.CanAccess || !args.CanInteract)
+                return;
+
+            if (!TryComp<BloodSuckerComponent>(args.User, out var sucker))
+                return;
+
+            if (!sucker.WebRequired)
+                return;
+
+            var victim = _itemSlots.GetItemOrNull(uid, BodySlot);
+
+            if (victim == null)
+                return;
+
+            if (!TryComp<BloodstreamComponent>(victim, out var stream))
+                return;
+
+            AlternativeVerb verb = new()
+            {
+                Act = () =>
+                {
+                    _bloodSuckerSystem.StartSuccDoAfter(args.User, victim.Value, sucker, stream, false); // start doafter
+                },
+                Text = Loc.GetString("action-name-suck-blood"),
+                Icon = new SpriteSpecifier.Texture(new ("/Textures/Nyanotrasen/Icons/verbiconfangs.png")),
+                Priority = 2
+            };
+            args.Verbs.Add(verb);
+        }
+
+        private void OnEntRemoved(EntityUid uid, WebComponent web, EntRemovedFromContainerMessage args)
+        {
+            if (!TryComp<StrapComponent>(uid, out var strap))
+                return;
+
+            if (HasComp<ArachneComponent>(args.Entity))
+                _buckleSystem.StrapSetEnabled(uid, false, strap);
+        }
+
+        private void StartCocooning(EntityUid uid, ArachneComponent component, EntityUid target)
+        {
+            _popupSystem.PopupEntity(Loc.GetString("cocoon-start-third-person", ("target", Identity.Entity(target, EntityManager)), ("spider", Identity.Entity(uid, EntityManager))), uid,
+                Shared.Popups.PopupType.MediumCaution);
+
+            _popupSystem.PopupEntity(Loc.GetString("cocoon-start-second-person", ("target", Identity.Entity(target, EntityManager))), uid, uid, Shared.Popups.PopupType.Medium);
+
+            var delay = component.CocoonDelay;
+
+            if (HasComp<KnockedDownComponent>(target))
+                delay *= component.CocoonKnockdownMultiplier;
+
+            // Is it good practice to use empty data just to disambiguate doafters
+            // Who knows, there's no docs!
+            var ev = new ArachneCocoonDoAfterEvent();
+
+            var args = new DoAfterArgs(EntityManager, uid, delay, ev, uid, target: target)
+            {
+                BreakOnUserMove = true,
+                BreakOnTargetMove = true,
+            };
+
+            _doAfter.TryStartDoAfter(args);
+        }
+
+        private void OnCocoonDoAfter(EntityUid uid, ArachneComponent component, ArachneCocoonDoAfterEvent args)
+        {
+            if (args.Handled || args.Cancelled || args.Args.Target == null)
+                return;
+
+            var spawnProto = HasComp<HumanoidAppearanceComponent>(args.Args.Target) ? "CocoonedHumanoid" : "CocoonSmall";
+            Transform(args.Args.Target.Value).AttachToGridOrMap();
+            var cocoon = Spawn(spawnProto, Transform(args.Args.Target.Value).Coordinates);
+
+            if (!TryComp<ItemSlotsComponent>(cocoon, out var slots))
+                return;
+
+            // todo: our species should use scale visuals probably...
+            // TODO: We need a client-accessible notion of scale influence here.
+            /* if (spawnProto == "CocoonedHumanoid" && TryComp<SpriteComponent>(args.Args.Target.Value, out var sprite)) */
+            /* { */
+            /*     // why the fuck is this only available as a console command. */
+            /*     _host.ExecuteCommand(null, "scale " + cocoon + " " + sprite.Scale.Y); */
+            if (TryComp<PhysicsComponent>(args.Args.Target.Value, out var physics))
+            {
+                var scale = Math.Clamp(1 / (35 / physics.FixturesMass), 0.35, 2.5);
+                _host.ExecuteCommand(null, "scale " + cocoon + " " + scale);
+            }
+            _itemSlots.SetLock(cocoon, BodySlot, false, slots);
+            _itemSlots.TryInsert(cocoon, BodySlot, args.Args.Target.Value, args.Args.User);
+            _itemSlots.SetLock(cocoon, BodySlot, true, slots);
+
+            var impact = (spawnProto == "CocoonedHumanoid") ? LogImpact.High : LogImpact.Medium;
+
+            _adminLogger.Add(LogType.Action, impact, $"{ToPrettyString(args.Args.User):player} cocooned {ToPrettyString(args.Args.Target.Value):target}");
+            args.Handled = true;
+        }
+    }
+}
diff --git a/Content.Server/Arachne/CocoonComponent.cs b/Content.Server/Arachne/CocoonComponent.cs
new file mode 100644
index 00000000000..42ecf27971a
--- /dev/null
+++ b/Content.Server/Arachne/CocoonComponent.cs
@@ -0,0 +1,13 @@
+namespace Content.Server.Arachne
+{
+    [RegisterComponent]
+    public sealed partial class CocoonComponent : Component
+    {
+        public bool WasReplacementAccent = false;
+
+        public string OldAccent = "";
+
+        [DataField("damagePassthrough")]
+        public float DamagePassthrough = 0.5f;
+    }
+}
diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs
index 679b5510586..33a163228f1 100644
--- a/Content.Server/Atmos/Components/FlammableComponent.cs
+++ b/Content.Server/Atmos/Components/FlammableComponent.cs
@@ -61,5 +61,11 @@ public sealed partial class FlammableComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float FirestackFade = -0.1f;
+
+        /// <summary>
+        ///     How stronger will firestack increases be?
+        /// </summary>
+        [DataField]
+        public float FireStackIncreaseMultiplier = 1f;
     }
 }
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/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 53fcb720766..d34de937a41 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -274,6 +274,9 @@ public void AdjustFireStacks(EntityUid uid, float relativeFireStacks, FlammableC
             if (!Resolve(uid, ref flammable))
                 return;
 
+            if (relativeFireStacks > 0)
+                relativeFireStacks *= flammable.FireStackIncreaseMultiplier;
+
             flammable.FireStacks = MathF.Min(MathF.Max(MinimumFireStacks, flammable.FireStacks + relativeFireStacks), MaximumFireStacks);
 
             if (flammable.OnFire && flammable.FireStacks <= 0)
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index 3e4340bf1db..d53e29c9499 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
+using Content.Server.Silicons.Borgs.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -91,6 +92,10 @@ private void DirtyUI(EntityUid uid,
         if (canister.GasTankSlot.Item != null)
         {
             var tank = canister.GasTankSlot.Item.Value;
+            if (TryComp<BorgJetpackComponent>(tank, out var jetpack) && jetpack.JetpackUid.HasValue)
+            {
+                tank = jetpack.JetpackUid.Value;
+            }
             var tankComponent = Comp<GasTankComponent>(tank);
             tankLabel = Name(tank);
             tankPressure = tankComponent.Air.Pressure;
@@ -163,7 +168,12 @@ private void OnCanisterUpdated(EntityUid uid, GasCanisterComponent canister, ref
         {
             if (canister.GasTankSlot.Item != null)
             {
-                var gasTank = Comp<GasTankComponent>(canister.GasTankSlot.Item.Value);
+                var tank = canister.GasTankSlot.Item;
+                if (TryComp<BorgJetpackComponent>(tank, out var jetpack) && jetpack.JetpackUid.HasValue)
+                {
+                    tank = jetpack.JetpackUid.Value;
+                }
+                var gasTank = Comp<GasTankComponent>(tank.Value);
                 _atmos.ReleaseGasTo(canister.Air, gasTank.Air, canister.ReleasePressure);
             }
             else
@@ -233,7 +243,19 @@ private void OnCanisterInsertAttempt(EntityUid uid, GasCanisterComponent compone
         if (args.Slot.ID != component.ContainerName || args.User == null)
             return;
 
-        if (!TryComp<GasTankComponent>(args.Item, out var gasTank) || gasTank.IsValveOpen)
+        var tank = args.Item;
+
+        if (TryComp<BorgJetpackComponent>(tank, out var jetpack))
+        {
+            if (!jetpack.JetpackUid.HasValue)
+            {
+                args.Cancelled = true;
+                return;
+            }
+            tank = jetpack.JetpackUid.Value;
+        }
+
+        if (!TryComp<GasTankComponent>(tank, out var gasTank) || gasTank.IsValveOpen)
         {
             args.Cancelled = true;
             return;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index 9b61044f03e..720fd5b5b91 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -143,7 +143,7 @@ private bool IsHeater(GasThermoMachineComponent comp)
 
         private void OnToggleMessage(EntityUid uid, GasThermoMachineComponent thermoMachine, GasThermomachineToggleMessage args)
         {
-            var powerState = _power.TogglePower(uid);
+            var powerState = _power.TryTogglePower(uid);
             _adminLogger.Add(LogType.AtmosPowerChanged, $"{ToPrettyString(args.Session.AttachedEntity)} turned {(powerState ? "On" : "Off")} {ToPrettyString(uid)}");
             DirtyUI(uid, thermoMachine);
         }
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
index fff15f696c4..8094b0e1a66 100644
--- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
+++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
@@ -98,7 +98,7 @@ private void OnToggle(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeat
         if (!Resolve(uid, ref powerReceiver))
             return;
 
-        _power.TogglePower(uid);
+        _power.TryTogglePower(uid);
 
         UpdateAppearance(uid);
         DirtyUI(uid, spaceHeater);
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 24d6514cba0..771c1f450a1 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -1,15 +1,9 @@
-using Content.Shared.Damage;
-using Content.Shared.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Temperature.Components;
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Rotting;
-using Content.Shared.Examine;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Rejuvenate;
+using Content.Shared.Damage;
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
@@ -23,95 +17,16 @@ public sealed class RottingSystem : SharedRottingSystem
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<PerishableComponent, MapInitEvent>(OnPerishableMapInit);
-        SubscribeLocalEvent<PerishableComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<PerishableComponent, ExaminedEvent>(OnPerishableExamined);
-
-        SubscribeLocalEvent<RottingComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<RottingComponent, MobStateChangedEvent>(OnRottingMobStateChanged);
         SubscribeLocalEvent<RottingComponent, BeingGibbedEvent>(OnGibbed);
-        SubscribeLocalEvent<RottingComponent, RejuvenateEvent>(OnRejuvenate);
 
         SubscribeLocalEvent<TemperatureComponent, IsRottingEvent>(OnTempIsRotting);
     }
 
-    private void OnPerishableMapInit(EntityUid uid, PerishableComponent component, MapInitEvent args)
-    {
-        component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
-    }
-
-    private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
-    {
-        if (args.NewMobState != MobState.Dead && args.OldMobState != MobState.Dead)
-            return;
-
-        if (HasComp<RottingComponent>(uid))
-            return;
-
-        component.RotAccumulator = TimeSpan.Zero;
-        component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
-    }
-
-    private void OnShutdown(EntityUid uid, RottingComponent component, ComponentShutdown args)
-    {
-        if (TryComp<PerishableComponent>(uid, out var perishable))
-        {
-            perishable.RotNextUpdate = TimeSpan.Zero;
-        }
-    }
-
-    private void OnRottingMobStateChanged(EntityUid uid, RottingComponent component, MobStateChangedEvent args)
-    {
-        if (args.NewMobState == MobState.Dead)
-            return;
-        RemCompDeferred(uid, component);
-    }
-
-    public bool IsRotProgressing(EntityUid uid, PerishableComponent? perishable)
-    {
-        // things don't perish by default.
-        if (!Resolve(uid, ref perishable, false))
-            return false;
-
-        // only dead things or inanimate objects can rot
-        if (TryComp<MobStateComponent>(uid, out var mobState) && !_mobState.IsDead(uid, mobState))
-            return false;
-
-        if (_container.TryGetOuterContainer(uid, Transform(uid), out var container) &&
-            HasComp<AntiRottingContainerComponent>(container.Owner))
-        {
-            return false;
-        }
-
-        if (TryComp<CuffableComponent>(uid, out var cuffed) && cuffed.CuffedHandCount > 0)
-        {
-            if (TryComp<HandcuffComponent>(cuffed.LastAddedCuffs, out var cuffcomp))
-            {
-                if (cuffcomp.NoRot)
-                {
-                    return false;
-                }
-            }
-        }
-
-
-        var ev = new IsRottingEvent();
-        RaiseLocalEvent(uid, ref ev);
-
-        return !ev.Handled;
-    }
-
-    public bool IsRotten(EntityUid uid, RottingComponent? rotting = null)
-    {
-        return Resolve(uid, ref rotting, false);
-    }
-
     private void OnGibbed(EntityUid uid, RottingComponent component, BeingGibbedEvent args)
     {
         if (!TryComp<PhysicsComponent>(uid, out var physics))
@@ -125,36 +40,6 @@ private void OnGibbed(EntityUid uid, RottingComponent component, BeingGibbedEven
         tileMix?.AdjustMoles(Gas.Ammonia, molsToDump);
     }
 
-    private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref ExaminedEvent args)
-    {
-        int stage = PerishStage(perishable, MaxStages);
-        if (stage < 1 || stage > MaxStages)
-        {
-            // We dont push an examined string if it hasen't started "perishing" or it's already rotting
-            return;
-        }
-
-        var isMob = HasComp<MobStateComponent>(perishable);
-        var description = "perishable-" + stage + (!isMob ? "-nonmob" : string.Empty);
-        args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
-    }
-
-    /// <summary>
-    /// Return an integer from 0 to maxStage representing how close to rotting an entity is. Used to
-    /// generate examine messages for items that are starting to rot.
-    /// </summary>
-    public int PerishStage(Entity<PerishableComponent> perishable, int maxStages)
-    {
-        if (perishable.Comp.RotAfter.TotalSeconds == 0 || perishable.Comp.RotAccumulator.TotalSeconds == 0)
-            return 0;
-        return (int)(1 + maxStages * perishable.Comp.RotAccumulator.TotalSeconds / perishable.Comp.RotAfter.TotalSeconds);
-    }
-
-    private void OnRejuvenate(EntityUid uid, RottingComponent component, RejuvenateEvent args)
-    {
-        RemCompDeferred<RottingComponent>(uid);
-    }
-
     private void OnTempIsRotting(EntityUid uid, TemperatureComponent component, ref IsRottingEvent args)
     {
         if (args.Handled)
diff --git a/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs b/Content.Server/Audio/GlimmerSoundComponent.cs
similarity index 80%
rename from Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
rename to Content.Server/Audio/GlimmerSoundComponent.cs
index 9a6c62381be..850be3e831c 100644
--- a/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
+++ b/Content.Server/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/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
index 1d8aa9ffd3d..dd93da9598c 100644
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
+using Content.Server.Traits.Assorted;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
@@ -11,7 +12,7 @@
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem))]
+    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), typeof(BloodDeficiencySystem), typeof(HemophiliaSystem))]
     public sealed partial class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";
@@ -171,5 +172,18 @@ public sealed partial class BloodstreamComponent : Component
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         public TimeSpan StatusTime;
+
+        /// <summary>
+        ///     If this is true, the entity will not passively regenerate blood,
+        ///     and instead will slowly lose blood.
+        /// </summary>
+        [DataField]
+        public bool HasBloodDeficiency = false;
+
+        /// <summary>
+        ///     How much reagent of blood should be removed with blood deficiency in each update interval?
+        /// </summary>
+        [DataField]
+        public FixedPoint2 BloodDeficiencyLossAmount;
     }
 }
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 90c99df7db2..7fe7d23cf34 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Body.Systems;
+using Content.Server.Traits.Assorted;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
@@ -44,7 +45,7 @@ public sealed partial class MetabolizerComponent : Component
         ///     List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e.
         /// </summary>
         [DataField]
-        [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
+        [Access(typeof(MetabolizerSystem), typeof(LiquorLifelineSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
         public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes = null;
 
         /// <summary>
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index 9e29fdf7568..b37ac5efeb4 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -118,8 +118,14 @@ public override void Update(float frameTime)
             if (!_solutionContainerSystem.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
                 continue;
 
-            // Adds blood to their blood level if it is below the maximum; Blood regeneration. Must be alive.
-            if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
+            // Removes blood for Blood Deficiency constantly.
+            if (bloodstream.HasBloodDeficiency)
+            {
+                if (!_mobStateSystem.IsDead(uid))
+                    RemoveBlood(uid, bloodstream.BloodDeficiencyLossAmount, bloodstream);
+            }
+            // Adds blood to their blood level if it is below the maximum.
+            else if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
             {
                 TryModifyBloodLevel(uid, bloodstream.BloodRefreshAmount, bloodstream);
             }
@@ -242,20 +248,29 @@ private void OnHealthBeingExamined(Entity<BloodstreamComponent> ent, ref HealthB
         if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount / 2)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner)));
+            if (!args.IsSelfAware)
+                args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner)));
+            else
+                args.Message.AddMarkup(Loc.GetString("bloodstream-component-selfaware-profusely-bleeding"));
         }
         // Shows bleeding message when bleeding, but less than profusely.
         else if (ent.Comp.BleedAmount > 0)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner)));
+            if (!args.IsSelfAware)
+                args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner)));
+            else
+                args.Message.AddMarkup(Loc.GetString("bloodstream-component-selfaware-bleeding"));
         }
 
         // If the mob's blood level is below the damage threshhold, the pale message is added.
         if (GetBloodLevelPercentage(ent, ent) < ent.Comp.BloodlossThreshold)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
+            if (!args.IsSelfAware)
+                args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
+            else
+                args.Message.AddMarkup(Loc.GetString("bloodstream-component-selfaware-looks-pale"));
         }
     }
 
@@ -463,4 +478,16 @@ public void ChangeBloodReagent(EntityUid uid, string reagent, BloodstreamCompone
         if (currentVolume > 0)
             _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, out _);
     }
+
+    /// <summary>
+    ///   Remove blood from an entity, without spilling it.
+    /// </summary>
+    private void RemoveBlood(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null)
+    {
+        if (!Resolve(uid, ref component, logMissing: false)
+            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
+            return;
+
+        bloodSolution.RemoveReagent(component.BloodReagent, amount);
+    }
 }
diff --git a/Content.Server/Botany/Components/TeleportingTraitComponent.cs b/Content.Server/Botany/Components/TeleportingTraitComponent.cs
new file mode 100644
index 00000000000..b5f79ac8c7e
--- /dev/null
+++ b/Content.Server/Botany/Components/TeleportingTraitComponent.cs
@@ -0,0 +1,31 @@
+namespace Content.Server.Botany
+{
+    [RegisterComponent]
+
+    public sealed partial class TeleportingTraitComponent : Component
+    {
+        /// <summary>
+        ///     Teleportation radius of produce.
+        /// </summary>
+        [DataField]
+        public float ProduceTeleportRadius;
+
+        /// <summary>
+        ///     How much to divide the potency.
+        /// </summary>
+        [DataField]
+        public float PotencyDivide = 10f;
+
+        /// <summary>
+        ///     Potency of fruit.
+        /// </summary>
+        [DataField]
+        public float Potency;
+
+        /// <summary>
+        ///     Chance of deletion.
+        /// </summary>
+        [DataField]
+        public float DeletionChance = .5f;
+    }
+}
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index 1a3c0473a48..2644da2a3b0 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -205,6 +205,11 @@ public partial class SeedData
     /// </summary>
     [DataField("ligneous")] public bool Ligneous;
 
+    /// <summary>
+    ///     If true, teleports both fruit and player if slippable.
+    /// </summary>
+    [DataField] public bool Teleporting;
+
     // No, I'm not removing these.
     // if you re-add these, make sure that they get cloned.
     //public PlantSpread Spread { get; set; }
@@ -215,7 +220,6 @@ public partial class SeedData
     //public bool Hematophage { get; set; }
     //public bool Thorny { get; set; }
     //public bool Stinging { get; set; }
-    // public bool Teleporting { get; set; }
     // public PlantJuicy Juicy { get; set; }
 
     #endregion
@@ -295,6 +299,7 @@ public SeedData Clone()
             Slip = Slip,
             Sentient = Sentient,
             Ligneous = Ligneous,
+            Teleporting = Teleporting,
 
             PlantRsi = PlantRsi,
             PlantIconState = PlantIconState,
@@ -358,6 +363,7 @@ public SeedData SpeciesChange(SeedData other)
             Slip = Slip,
             Sentient = Sentient,
             Ligneous = Ligneous,
+            Teleporting = Teleporting,
 
             PlantRsi = other.PlantRsi,
             PlantIconState = other.PlantIconState,
diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index f64fcb3c43d..82190d1c443 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -207,6 +207,11 @@ public IEnumerable<EntityUid> GenerateProduct(SeedData proto, EntityCoordinates
                 var collisionWake = EnsureComp<CollisionWakeComponent>(entity);
                 _colWakeSystem.SetEnabled(entity, false, collisionWake);
             }
+            if (proto.Teleporting)
+            {
+                var teleporting = EnsureComp<TeleportingTraitComponent>(entity);
+                TeleportingTraitSystem.SetPotencyRadius(proto.Potency, teleporting);
+            }
         }
 
         return products;
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index c7ce5d47efa..4780f8b3310 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -40,7 +40,7 @@ public void MutateSeed(ref SeedData seed, float severity)
         }
 
         // Add up everything in the bits column and put the number here.
-        const int totalbits = 275;
+        const int totalbits = 285;
 
         // Tolerances (55)
         MutateFloat(ref seed.NutrientConsumption  , 0.05f, 1.2f, 5, totalbits, severity);
@@ -66,11 +66,12 @@ public void MutateSeed(ref SeedData seed, float severity)
         // Kill the plant (30)
         MutateBool(ref seed.Viable        , false, 30, totalbits, severity);
 
-        // Fun (90)
+        // Fun (100)
         MutateBool(ref seed.Seedless      , true , 10, totalbits, severity);
         MutateBool(ref seed.Slip          , true , 10, totalbits, severity);
         MutateBool(ref seed.Sentient      , true , 10, totalbits, severity);
         MutateBool(ref seed.Ligneous      , true , 10, totalbits, severity);
+        MutateBool(ref seed.Teleporting   , true , 10, totalbits, severity);
         MutateBool(ref seed.Bioluminescent, true , 10, totalbits, severity);
         MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity);
         MutateBool(ref seed.CanScream     , true , 10, totalbits, severity);
@@ -120,6 +121,7 @@ public SeedData Cross(SeedData a, SeedData b)
         CrossBool(ref result.Slip, a.Slip);
         CrossBool(ref result.Sentient, a.Sentient);
         CrossBool(ref result.Ligneous, a.Ligneous);
+        CrossBool(ref result.Teleporting, a.Teleporting);
         CrossBool(ref result.Bioluminescent, a.Bioluminescent);
         CrossBool(ref result.TurnIntoKudzu, a.TurnIntoKudzu);
         CrossBool(ref result.CanScream, a.CanScream);
diff --git a/Content.Server/Botany/Systems/TeleportingTraitSystem.cs b/Content.Server/Botany/Systems/TeleportingTraitSystem.cs
new file mode 100644
index 00000000000..7aa9a6a82ab
--- /dev/null
+++ b/Content.Server/Botany/Systems/TeleportingTraitSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Random;
+using Content.Shared.Slippery;
+using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Popups;
+
+namespace Content.Server.Botany.Systems;
+
+public sealed class TeleportingTraitSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly PuddleSystem _puddle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TeleportingTraitComponent, SlipEvent>(Teleport);
+    }
+
+    // sets the potency and the radius
+    public static void SetPotencyRadius(float seedPotency, TeleportingTraitComponent comp)
+    {
+        comp.Potency = seedPotency;
+        comp.ProduceTeleportRadius = comp.Potency / comp.PotencyDivide;
+    }
+
+    // teleports both the produce and the foolish fool who slipped on it to a random postion limited by the radius
+    private void Teleport(EntityUid uid, TeleportingTraitComponent comp, ref SlipEvent args)
+    {
+        var coordinates = Transform(uid).Coordinates;
+        _xform.SetCoordinates(uid, coordinates.Offset(_random.NextVector2(comp.ProduceTeleportRadius)));
+        _popup.PopupEntity(Loc.GetString("teleporting-trait-component-slipped"), args.Slipped, args.Slipped, PopupType.SmallCaution);
+        _xform.SetCoordinates(args.Slipped, coordinates.Offset(_random.NextVector2(comp.ProduceTeleportRadius)));
+        VanishProbablity(uid, comp);
+    }
+
+    // chance of being deleted and then spawnin the goop
+    private void VanishProbablity(EntityUid uid, TeleportingTraitComponent comp)
+    {
+        if (!_random.Prob(comp.DeletionChance))
+            return;
+        Solution vanishSolution = new();
+        vanishSolution.AddReagent("Slime", comp.Potency / 2);
+        _puddle.TrySpillAt(uid, vanishSolution, out _);
+        QueueDel(uid);
+    }
+}
+
diff --git a/Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeComponent.cs
rename to Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeComponent.cs
diff --git a/Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeSystem.cs
rename to Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeSystem.cs
diff --git a/Content.Server/Psionics/Telepathy/TSayCommand.cs b/Content.Server/Chat/Commands/TSayCommand.cs
similarity index 96%
rename from Content.Server/Psionics/Telepathy/TSayCommand.cs
rename to Content.Server/Chat/Commands/TSayCommand.cs
index edb7e528e2e..af925d54453 100644
--- a/Content.Server/Psionics/Telepathy/TSayCommand.cs
+++ b/Content.Server/Chat/Commands/TSayCommand.cs
@@ -6,7 +6,7 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
     internal sealed class TSayCommand : IConsoleCommand
@@ -42,4 +42,4 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             EntitySystem.Get<ChatSystem>().TrySendInGameICMessage(playerEntity, message, InGameICChatType.Telepathic, ChatTransmitRange.Normal, false, shell, player);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 450a35f438c..c713757ff82 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -8,7 +8,7 @@
 using Content.Server.Language;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Psionics.Telepathy;
+using Content.Server.Chat;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
@@ -69,9 +69,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
     [Dependency] private readonly LanguageSystem _language = default!;
-
-    //Nyano - Summary: pulls in the nyano chat system for psionics.
-    [Dependency] private readonly NyanoChatSystem _nyanoChatSystem = default!;
+    [Dependency] private readonly TelepathicChatSystem _telepath = default!;
 
     public const int VoiceRange = 10; // how far voice goes in world units
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
@@ -280,7 +278,7 @@ public void TrySendInGameICMessage(
                 break;
             //Nyano - Summary: case adds the telepathic chat sending ability.
             case InGameICChatType.Telepathic:
-                _nyanoChatSystem.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
+                _telepath.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
                 break;
         }
     }
diff --git a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs b/Content.Server/Chat/TelepathicChatSystem.cs
similarity index 78%
rename from Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
rename to Content.Server/Chat/TelepathicChatSystem.cs
index 917511d1477..8d44ead9d07 100644
--- a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
+++ b/Content.Server/Chat/TelepathicChatSystem.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,13 +16,13 @@
 using System.Linq;
 using System.Text;
 
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Chat
 {
     /// <summary>
-    /// Extensions for Telepathic Chat
+    /// Extensions for Telepathic chat stuff
     /// </summary>
 
-    public sealed class NyanoChatSystem : EntitySystem
+    public sealed class TelepathicChatSystem : EntitySystem
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
@@ -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/Chat/TelepathicRepeaterComponent.cs
similarity index 82%
rename from Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
rename to Content.Server/Chat/TelepathicRepeaterComponent.cs
index 6e194f76c8f..2183fafd4d1 100644
--- a/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
+++ b/Content.Server/Chat/TelepathicRepeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Chat
 {
     /// <summary>
     /// Repeats whatever is happening in telepathic chat.
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/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs
index 9d8958f7614..dc3074f1958 100644
--- a/Content.Server/Construction/Components/WelderRefinableComponent.cs
+++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Tools;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.Storage;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Construction.Components
 {
@@ -10,13 +11,13 @@ namespace Content.Server.Construction.Components
     [RegisterComponent]
     public sealed partial class WelderRefinableComponent : Component
     {
-        [DataField("refineResult")]
-        public HashSet<string>? RefineResult = new();
+        [DataField]
+        public List<EntitySpawnEntry> RefineResult = new();
 
-        [DataField("refineTime")]
+        [DataField]
         public float RefineTime = 2f;
 
-        [DataField("qualityNeeded", customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-        public string QualityNeeded = "Welding";
+        [DataField]
+        public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
     }
 }
diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Server/Construction/RefiningSystem.cs
index b9d80c7170a..d4df8b0916b 100644
--- a/Content.Server/Construction/RefiningSystem.cs
+++ b/Content.Server/Construction/RefiningSystem.cs
@@ -1,11 +1,8 @@
 using Content.Server.Construction.Components;
 using Content.Server.Stack;
 using Content.Shared.Construction;
-using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
-using Content.Shared.Stacks;
-using Content.Shared.Tools;
-using Robust.Shared.Serialization;
+using Content.Shared.Storage;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
 namespace Content.Server.Construction
@@ -13,7 +10,6 @@ namespace Content.Server.Construction
     public sealed class RefiningSystem : EntitySystem
     {
         [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-        [Dependency] private readonly StackSystem _stackSystem = default!;
         public override void Initialize()
         {
             base.Initialize();
@@ -39,14 +35,9 @@ private void OnDoAfter(EntityUid uid, WelderRefinableComponent component, Welder
             EntityManager.DeleteEntity(uid);
 
             // spawn each result after refine
-            foreach (var result in component.RefineResult!)
+            foreach (var ent in EntitySpawnCollection.GetSpawns(component.RefineResult))
             {
-                var droppedEnt = EntityManager.SpawnEntity(result, resultPosition);
-
-                // TODO: If something has a stack... Just use a prototype with a single thing in the stack.
-                // This is not a good way to do it.
-                if (TryComp<StackComponent>(droppedEnt, out var stack))
-                    _stackSystem.SetCount(droppedEnt, 1, stack);
+                Spawn(ent, resultPosition);
             }
         }
     }
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/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
deleted file mode 100644
index 21b5b3a2456..00000000000
--- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using Content.Server.Instruments;
-using Content.Server.Speech.Components;
-using Content.Server.UserInterface;
-using Content.Shared.Instruments;
-using Content.Shared.Instruments.UI;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Damage;
-using Content.Shared.Damage.ForceSay;
-using Content.Shared.DeltaV.Harpy;
-using Content.Shared.FixedPoint;
-using Content.Shared.Inventory;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Mobs;
-using Content.Shared.Popups;
-using Content.Shared.StatusEffect;
-using Content.Shared.Stunnable;
-using Content.Shared.UserInterface;
-using Content.Shared.Zombies;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Content.Shared.DeltaV.Harpy.Components;
-
-namespace Content.Server.DeltaV.Harpy
-{
-    public sealed class HarpySingerSystem : EntitySystem
-    {
-        [Dependency] private readonly InstrumentSystem _instrument = default!;
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly InventorySystem _inventorySystem = default!;
-        [Dependency] private readonly ActionBlockerSystem _blocker = default!;
-        [Dependency] private readonly IPrototypeManager _prototype = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<InstrumentComponent, MobStateChangedEvent>(OnMobStateChangedEvent);
-            SubscribeLocalEvent<GotEquippedEvent>(OnEquip);
-            SubscribeLocalEvent<EntityZombifiedEvent>(OnZombified);
-            SubscribeLocalEvent<InstrumentComponent, KnockedDownEvent>(OnKnockedDown);
-            SubscribeLocalEvent<InstrumentComponent, StunnedEvent>(OnStunned);
-            SubscribeLocalEvent<InstrumentComponent, SleepStateChangedEvent>(OnSleep);
-            SubscribeLocalEvent<InstrumentComponent, StatusEffectAddedEvent>(OnStatusEffect);
-            SubscribeLocalEvent<InstrumentComponent, DamageChangedEvent>(OnDamageChanged);
-            SubscribeLocalEvent<HarpySingerComponent, BoundUIClosedEvent>(OnBoundUIClosed);
-            SubscribeLocalEvent<HarpySingerComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
-
-            // This is intended to intercept the UI event and stop the MIDI UI from opening if the
-            // singer is unable to sing. Thus it needs to run before the ActivatableUISystem.
-            SubscribeLocalEvent<HarpySingerComponent, OpenUiActionEvent>(OnInstrumentOpen, before: new[] { typeof(ActivatableUISystem) });
-        }
-
-        private void OnEquip(GotEquippedEvent args)
-        {
-            // Check if an item that makes the singer mumble is equipped to their face
-            // (not their pockets!). As of writing, this should just be the muzzle.
-            if (TryComp<AddAccentClothingComponent>(args.Equipment, out var accent) &&
-                accent.ReplacementPrototype == "mumble" &&
-                args.Slot == "mask")
-            {
-                CloseMidiUi(args.Equipee);
-            }
-        }
-
-        private void OnMobStateChangedEvent(EntityUid uid, InstrumentComponent component, MobStateChangedEvent args)
-        {
-            if (args.NewMobState is MobState.Critical or MobState.Dead)
-                CloseMidiUi(args.Target);
-        }
-
-        private void OnZombified(ref EntityZombifiedEvent args)
-        {
-            CloseMidiUi(args.Target);
-        }
-
-        private void OnKnockedDown(EntityUid uid, InstrumentComponent component, ref KnockedDownEvent args)
-        {
-            CloseMidiUi(uid);
-        }
-
-        private void OnStunned(EntityUid uid, InstrumentComponent component, ref StunnedEvent args)
-        {
-            CloseMidiUi(uid);
-        }
-
-        private void OnSleep(EntityUid uid, InstrumentComponent component, ref SleepStateChangedEvent args)
-        {
-            if (args.FellAsleep)
-                CloseMidiUi(uid);
-        }
-
-        private void OnStatusEffect(EntityUid uid, InstrumentComponent component, StatusEffectAddedEvent args)
-        {
-            if (args.Key == "Muted")
-                CloseMidiUi(uid);
-        }
-
-        /// <summary>
-        /// Almost a copy of Content.Server.Damage.ForceSay.DamageForceSaySystem.OnDamageChanged.
-        /// Done so because DamageForceSaySystem doesn't output an event, and my understanding is
-        /// that we don't want to change upstream code more than necessary to avoid merge conflicts
-        /// and maintenance overhead. It still reuses the values from DamageForceSayComponent, so
-        /// any tweaks to that will keep ForceSay consistent with singing interruptions.
-        /// </summary>
-        private void OnDamageChanged(EntityUid uid, InstrumentComponent instrumentComponent, DamageChangedEvent args)
-        {
-            if (!TryComp<DamageForceSayComponent>(uid, out var component) ||
-                args.DamageDelta == null ||
-                !args.DamageIncreased ||
-                args.DamageDelta.GetTotal() < component.DamageThreshold ||
-                component.ValidDamageGroups == null)
-                return;
-
-            var totalApplicableDamage = FixedPoint2.Zero;
-            foreach (var (group, value) in args.DamageDelta.GetDamagePerGroup(_prototype))
-            {
-                if (!component.ValidDamageGroups.Contains(group))
-                    continue;
-
-                totalApplicableDamage += value;
-            }
-
-            if (totalApplicableDamage >= component.DamageThreshold)
-                CloseMidiUi(uid);
-        }
-
-        /// <summary>
-        /// Closes the MIDI UI if it is open.
-        /// </summary>
-        private void CloseMidiUi(EntityUid uid)
-        {
-            if (HasComp<ActiveInstrumentComponent>(uid) &&
-                TryComp<ActorComponent>(uid, out var actor))
-            {
-                _instrument.ToggleInstrumentUi(uid, actor.PlayerSession);
-            }
-        }
-
-        /// <summary>
-        /// Prevent the player from opening the MIDI UI under some circumstances.
-        /// </summary>
-        private void OnInstrumentOpen(EntityUid uid, HarpySingerComponent component, OpenUiActionEvent args)
-        {
-            // CanSpeak covers all reasons you can't talk, including being incapacitated
-            // (crit/dead), asleep, or for any reason mute inclding glimmer or a mime's vow.
-            var canNotSpeak = !_blocker.CanSpeak(uid);
-            var zombified = TryComp<ZombieComponent>(uid, out var _);
-            var muzzled = _inventorySystem.TryGetSlotEntity(uid, "mask", out var maskUid) &&
-                TryComp<AddAccentClothingComponent>(maskUid, out var accent) &&
-                accent.ReplacementPrototype == "mumble";
-
-            // Set this event as handled when the singer should be incapable of singing in order
-            // to stop the ActivatableUISystem event from opening the MIDI UI.
-            args.Handled = canNotSpeak || muzzled || zombified;
-
-            // Tell the user that they can not sing.
-            if (args.Handled)
-                _popupSystem.PopupEntity(Loc.GetString("no-sing-while-no-speak"), uid, uid, PopupType.Medium);
-        }
-
-        private void OnBoundUIClosed(EntityUid uid, HarpySingerComponent component, BoundUIClosedEvent args)
-        {
-            if (args.UiKey is not InstrumentUiKey)
-                return;
-
-            TryComp(uid, out AppearanceComponent? appearance);
-            _appearance.SetData(uid, HarpyVisualLayers.Singing, SingingVisualLayer.False, appearance);
-        }
-
-        private void OnBoundUIOpened(EntityUid uid, HarpySingerComponent component, BoundUIOpenedEvent args)
-        {
-            if (args.UiKey is not InstrumentUiKey)
-                return;
-
-            TryComp(uid, out AppearanceComponent? appearance);
-            _appearance.SetData(uid, HarpyVisualLayers.Singing, SingingVisualLayer.True, appearance);
-
-        }
-    }
-}
diff --git a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
index b4e99e6199d..ee1c4582239 100644
--- a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
+++ b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
@@ -58,7 +58,7 @@ public override void Update(float frameTime)
                     }
                     else if (CheckTier(roboisseur.DesiredPrototype.ID, roboisseur) > 2)
                         message = Loc.GetString(_random.Pick(roboisseur.DemandMessagesTier2), ("item", roboisseur.DesiredPrototype.Name));
-                    _chat.TrySendInGameICMessage(roboisseur.Owner, message, InGameICChatType.Speak, false);
+                    _chat.TrySendInGameICMessage(roboisseur.Owner, message, InGameICChatType.Speak, true);
                 }
 
                 if (roboisseur.Accumulator >= roboisseur.ResetTime.TotalSeconds)
@@ -100,7 +100,7 @@ private void OnInteractHand(EntityUid uid, RoboisseurComponent component, Intera
             if (CheckTier(component.DesiredPrototype.ID, component) > 1)
                 message = Loc.GetString(_random.Pick(component.DemandMessagesTier2), ("item", component.DesiredPrototype.Name));
 
-            _chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, false);
+            _chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, true);
         }
 
         private void OnInteractUsing(EntityUid uid, RoboisseurComponent component, InteractUsingEvent args)
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/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 0fa3c06c04b..65851f17360 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,11 +1,12 @@
 using System.Numerics;
-using Content.Server.Forensics;
+using Content.Shared.Forensics;
 using Content.Server.Stack;
 using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Content.Server.Administration.Commands;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
@@ -85,6 +86,7 @@ public void TransferForensics(EntityUid spawned, DestructibleSystem system, Enti
 
             if (!system.Random.Prob(0.4f))
                 return;
+
             comp.Fingerprints = forensicsComponent.Fingerprints;
             comp.Fibers = forensicsComponent.Fibers;
         }
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index f9403f33b9d..d6647bbf2eb 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -235,7 +235,7 @@ private void OnUiButtonPressed(EntityUid uid, SharedDisposalUnitComponent compon
                 _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} hit flush button on {ToPrettyString(uid)}, it's now {(component.Engaged ? "on" : "off")}");
                 break;
             case SharedDisposalUnitComponent.UiButton.Power:
-                _power.TogglePower(uid, user: args.Session.AttachedEntity);
+                _power.TryTogglePower(uid, user: args.Session.AttachedEntity);
                 break;
             default:
                 throw new ArgumentOutOfRangeException($"{ToPrettyString(player):player} attempted to hit a nonexistant button on {ToPrettyString(uid)}");
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index 7c1a6f9b5db..3a1d2d28196 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Explosion.EntitySystems;
+using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio;
-using Content.Server.SurveillanceCamera;
 using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Robust.Shared.Map;
@@ -22,8 +22,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<EmpDisabledComponent, RadioSendAttemptEvent>(OnRadioSendAttempt);
         SubscribeLocalEvent<EmpDisabledComponent, RadioReceiveAttemptEvent>(OnRadioReceiveAttempt);
-        SubscribeLocalEvent<EmpDisabledComponent, ApcToggleMainBreakerAttemptEvent>(OnApcToggleMainBreaker);
-        SubscribeLocalEvent<EmpDisabledComponent, SurveillanceCameraSetActiveAttemptEvent>(OnCameraSetActive);
     }
 
     /// <summary>
@@ -75,7 +73,19 @@ public void DoEmpEffects(EntityUid uid, float energyConsumption, float duration)
         if (ev.Disabled)
         {
             var disabled = EnsureComp<EmpDisabledComponent>(uid);
-            disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
+            // couldnt use null-coalescing operator here sadge
+            if (disabled.DisabledUntil == TimeSpan.Zero)
+            {
+                disabled.DisabledUntil = Timing.CurTime;
+            }
+            disabled.DisabledUntil = disabled.DisabledUntil + TimeSpan.FromSeconds(duration);
+
+            /// i tried my best to go through the Pow3r server code but i literally couldn't find in relation to PowerNetworkBatteryComponent that uses the event system
+            /// the code is otherwise too esoteric for my innocent eyes
+            if (TryComp<PowerNetworkBatteryComponent>(uid, out var powerNetBattery))
+            {
+                powerNetBattery.CanCharge = false;
+            }
         }
     }
 
@@ -91,6 +101,11 @@ public override void Update(float frameTime)
                 RemComp<EmpDisabledComponent>(uid);
                 var ev = new EmpDisabledRemoved();
                 RaiseLocalEvent(uid, ref ev);
+
+                if (TryComp<PowerNetworkBatteryComponent>(uid, out var powerNetBattery))
+                {
+                    powerNetBattery.CanCharge = true;
+                }
             }
         }
     }
@@ -115,16 +130,6 @@ private void OnRadioReceiveAttempt(EntityUid uid, EmpDisabledComponent component
     {
         args.Cancelled = true;
     }
-
-    private void OnApcToggleMainBreaker(EntityUid uid, EmpDisabledComponent component, ref ApcToggleMainBreakerAttemptEvent args)
-    {
-        args.Cancelled = true;
-    }
-
-    private void OnCameraSetActive(EntityUid uid, EmpDisabledComponent component, ref SurveillanceCameraSetActiveAttemptEvent args)
-    {
-        args.Cancelled = true;
-    }
 }
 
 /// <summary>
diff --git a/Content.Server/Execution/ExecutionSystem.cs b/Content.Server/Execution/ExecutionSystem.cs
index 3b87fa17cad..326aa1d6a49 100644
--- a/Content.Server/Execution/ExecutionSystem.cs
+++ b/Content.Server/Execution/ExecutionSystem.cs
@@ -251,7 +251,7 @@ private void OnDoafterMelee(EntityUid uid, SharpComponent component, DoAfterEven
             return;
 
         _damageableSystem.TryChangeDamage(victim, melee.Damage * DamageModifier, true);
-        _audioSystem.PlayEntity(melee.HitSound, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
+        _audioSystem.PlayEntity(melee.SoundHit, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
 
         if (attacker == victim)
         {
diff --git a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs b/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
index 2d54c03b51b..744483cfb82 100644
--- a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
+++ b/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
@@ -11,7 +11,7 @@ public sealed class EyeProtectionSystem : EntitySystem
     {
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly BlindableSystem _blindingSystem = default!;
-        
+
         public override void Initialize()
         {
             base.Initialize();
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index 013ee37a416..7706bfec4ea 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -21,6 +21,8 @@
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
 using Content.Shared.Traits.Assorted.Components;
+using Robust.Shared.Random;
+using Content.Shared.Eye.Blinding.Systems;
 
 namespace Content.Server.Flash
 {
@@ -37,6 +39,8 @@ internal sealed class FlashSystem : SharedFlashSystem
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly StunSystem _stun = default!;
         [Dependency] private readonly TagSystem _tag = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly BlindableSystem _blindingSystem = default!;
 
         public override void Initialize()
         {
@@ -133,10 +137,17 @@ public void Flash(EntityUid target,
                     RaiseLocalEvent(used.Value, ref ev);
             }
 
+            flashDuration *= flashable.DurationMultiplier;
+
             flashable.LastFlash = _timing.CurTime;
             flashable.Duration = flashDuration / 1000f; // TODO: Make this sane...
             Dirty(target, flashable);
 
+            if (TryComp<BlindableComponent>(target, out var blindable)
+                && !blindable.IsBlind
+                && _random.Prob(flashable.EyeDamageChance))
+                _blindingSystem.AdjustEyeDamage((target, blindable), flashable.EyeDamage);
+
             _stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration/1000f), true,
                 slowTo, slowTo);
 
diff --git a/Content.Server/Forensics/Components/FiberComponent.cs b/Content.Server/Forensics/Components/FiberComponent.cs
index 2086c958702..4cbb1e7be7f 100644
--- a/Content.Server/Forensics/Components/FiberComponent.cs
+++ b/Content.Server/Forensics/Components/FiberComponent.cs
@@ -12,5 +12,8 @@ public sealed partial class FiberComponent : Component
 
         [DataField]
         public string? FiberColor;
+
+        [DataField]
+        public string? Fiberprint;
     }
 }
diff --git a/Content.Server/Forensics/Components/ScentComponent.cs b/Content.Server/Forensics/Components/ScentComponent.cs
new file mode 100644
index 00000000000..85331f36126
--- /dev/null
+++ b/Content.Server/Forensics/Components/ScentComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.Forensics;
+
+/// <summary>
+/// This component is for mobs that have a Scent.
+/// </summary>
+[RegisterComponent]
+public sealed partial class ScentComponent : Component
+{
+    [DataField]
+    public string Scent = String.Empty;
+}
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index a081429fd3a..dff134a5113 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Random;
+using Content.Shared.Inventory.Events;
 
 namespace Content.Server.Forensics
 {
@@ -23,8 +24,11 @@ public sealed class ForensicsSystem : EntitySystem
         public override void Initialize()
         {
             SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
+            SubscribeLocalEvent<ScentComponent, DidEquipEvent>(OnEquip);
+            SubscribeLocalEvent<FiberComponent, MapInitEvent>(OnFiberInit);
             SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
             SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
+            SubscribeLocalEvent<ScentComponent, MapInitEvent>(OnScentInit);
 
             SubscribeLocalEvent<DnaComponent, BeingGibbedEvent>(OnBeingGibbed);
             SubscribeLocalEvent<ForensicsComponent, MeleeHitEvent>(OnMeleeHit);
@@ -39,6 +43,16 @@ private void OnInteract(EntityUid uid, FingerprintComponent component, ContactIn
             ApplyEvidence(uid, args.Other);
         }
 
+        private void OnEquip(EntityUid uid, ScentComponent component, DidEquipEvent args)
+        {
+            ApplyScent(uid, args.Equipment);
+        }
+
+        private void OnFiberInit(EntityUid uid, FiberComponent component, MapInitEvent args)
+        {
+            component.Fiberprint = GenerateFingerprint(length: 7);
+        }
+
         private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, MapInitEvent args)
         {
             component.Fingerprint = GenerateFingerprint();
@@ -47,35 +61,49 @@ private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, Ma
         private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args)
         {
             component.DNA = GenerateDNA();
+
+        }
+
+        private void OnScentInit(EntityUid uid, ScentComponent component, MapInitEvent args)
+        {
+            component.Scent = GenerateFingerprint(length: 5);
+
+            var updatecomp = EnsureComp<ForensicsComponent>(uid);
+            updatecomp.Scent = component.Scent;
+
+            Dirty(uid, updatecomp);
         }
 
         private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEvent args)
         {
-            foreach(EntityUid part in args.GibbedParts)
+            foreach (EntityUid part in args.GibbedParts)
             {
                 var partComp = EnsureComp<ForensicsComponent>(part);
                 partComp.DNAs.Add(component.DNA);
                 partComp.CanDnaBeCleaned = false;
+                Dirty(part, partComp);
             }
         }
 
         private void OnMeleeHit(EntityUid uid, ForensicsComponent component, MeleeHitEvent args)
         {
-            if((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
+            if ((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
                 (args.BaseDamage.DamageDict.TryGetValue("Slash", out var slashDamage) && slashDamage.Value > 0) ||
                 (args.BaseDamage.DamageDict.TryGetValue("Piercing", out var pierceDamage) && pierceDamage.Value > 0))
             {
-                foreach(EntityUid hitEntity in args.HitEntities)
+                foreach (EntityUid hitEntity in args.HitEntities)
                 {
-                    if(TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
+                    if (TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
                         component.DNAs.Add(hitEntityComp.DNA);
                 }
             }
+            Dirty(uid, component);
         }
 
         private void OnRehydrated(Entity<ForensicsComponent> ent, ref GotRehydratedEvent args)
         {
             CopyForensicsFrom(ent.Comp, args.Target);
+            Dirty(args.Target, ent.Comp);
         }
 
         /// <summary>
@@ -106,19 +134,43 @@ private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component,
             if (args.Handled)
                 return;
 
-            if (!TryComp<ForensicsComponent>(args.Target, out var forensicsComp))
+            if (TryComp<ForensicsComponent>(args.Target, out var forensicsComp)
+                && forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned
+                && forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0
+                && forensicsComp.Scent != string.Empty)
+            {
+                var cleanDelay = component.CleanDelay;
+                if (HasComp<ScentComponent>(args.Target))
+                    cleanDelay += 30;
+
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
+                {
+                    BreakOnHandChange = true,
+                    NeedHand = true,
+                    BreakOnDamage = true,
+                    BreakOnTargetMove = true,
+                    MovementThreshold = 0.01f,
+                    DistanceThreshold = forensicsComp.CleanDistance,
+                };
+
+                _doAfterSystem.TryStartDoAfter(doAfterArgs);
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
+
+                args.Handled = true;
                 return;
+            }
 
-            if((forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned) || (forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0))
+            if (TryComp<ScentComponent>(args.Target, out var scentComp))
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
+                var cleanDelay = component.CleanDelay + 30;
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
                 {
                     BreakOnHandChange = true,
                     NeedHand = true,
                     BreakOnDamage = true,
                     BreakOnTargetMove = true,
                     MovementThreshold = 0.01f,
-                    DistanceThreshold = forensicsComp.CleanDistance,
+                    DistanceThreshold = 1.5f,
                 };
 
                 _doAfterSystem.TryStartDoAfter(doAfterArgs);
@@ -138,6 +190,7 @@ private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component
 
             targetComp.Fibers = new();
             targetComp.Fingerprints = new();
+            targetComp.Scent = String.Empty;
 
             if (targetComp.CanDnaBeCleaned)
                 targetComp.DNAs = new();
@@ -148,11 +201,35 @@ private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component
 
             if (TryComp<ResidueComponent>(args.Used, out var residue))
                 targetComp.Residues.Add(string.IsNullOrEmpty(residue.ResidueColor) ? Loc.GetString("forensic-residue", ("adjective", residue.ResidueAdjective)) : Loc.GetString("forensic-residue-colored", ("color", residue.ResidueColor), ("adjective", residue.ResidueAdjective)));
+
+            // If the ent has a Scent Component, we compleatly generate a new one and apply the new scent to all currently weared items.
+            if (TryComp<ScentComponent>(args.Target, out var scentComp))
+            {
+                var generatedscent = GenerateFingerprint(length: 5);
+                scentComp.Scent = generatedscent;
+                targetComp.Scent = generatedscent;
+
+                if (args.Target is { Valid: true } target
+                    && _inventory.TryGetSlots(target, out var slotDefinitions))
+                    foreach (var slot in slotDefinitions)
+                    {
+                        if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt))
+                            continue;
+
+                        EnsureComp<ForensicsComponent>(slotEnt.Value, out var recipientComp);
+                        recipientComp.Scent = generatedscent;
+
+                        Dirty(slotEnt.Value, recipientComp);
+                    }
+            }
+
+            if (args.Target is { Valid: true } targetuid)
+                Dirty(targetuid, targetComp);
         }
 
-        public string GenerateFingerprint()
+        public string GenerateFingerprint(int length = 16)
         {
-            var fingerprint = new byte[16];
+            var fingerprint = new byte[Math.Clamp(length, 0, 255)];
             _random.NextBytes(fingerprint);
             return Convert.ToHexString(fingerprint);
         }
@@ -179,13 +256,36 @@ private void ApplyEvidence(EntityUid user, EntityUid target)
             if (_inventory.TryGetSlotEntity(user, "gloves", out var gloves))
             {
                 if (TryComp<FiberComponent>(gloves, out var fiber) && !string.IsNullOrEmpty(fiber.FiberMaterial))
-                    component.Fibers.Add(string.IsNullOrEmpty(fiber.FiberColor) ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial)) : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial)));
+                {
+                    var fiberLocale = string.IsNullOrEmpty(fiber.FiberColor)
+                        ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial))
+                        : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial));
+                    component.Fibers.Add(fiberLocale + " ; " + fiber.Fiberprint);
+                }
 
                 if (HasComp<FingerprintMaskComponent>(gloves))
+                {
+                    Dirty(target, component);
                     return;
+                }
             }
             if (TryComp<FingerprintComponent>(user, out var fingerprint))
+            {
                 component.Fingerprints.Add(fingerprint.Fingerprint ?? "");
+                Dirty(target, component);
+            }
+        }
+
+        private void ApplyScent(EntityUid user, EntityUid target)
+        {
+            if (HasComp<ScentComponent>(target))
+                return;
+
+            var component = EnsureComp<ForensicsComponent>(target);
+            if (TryComp<ScentComponent>(user, out var scent))
+                component.Scent = scent.Scent;
+
+            Dirty(target, component);
         }
 
         private void OnTransferDnaEvent(EntityUid uid, DnaComponent component, ref TransferDnaEvent args)
@@ -193,6 +293,8 @@ private void OnTransferDnaEvent(EntityUid uid, DnaComponent component, ref Trans
             var recipientComp = EnsureComp<ForensicsComponent>(args.Recipient);
             recipientComp.DNAs.Add(component.DNA);
             recipientComp.CanDnaBeCleaned = args.CanDnaBeCleaned;
+
+            Dirty(args.Recipient, recipientComp);
         }
 
         #region Public API
@@ -210,6 +312,8 @@ public void TransferDna(EntityUid recipient, EntityUid donor, bool canDnaBeClean
                 EnsureComp<ForensicsComponent>(recipient, out var recipientComp);
                 recipientComp.DNAs.Add(donorComp.DNA);
                 recipientComp.CanDnaBeCleaned = canDnaBeCleaned;
+
+                Dirty(recipient, recipientComp);
             }
         }
 
diff --git a/Content.Server/Forensics/Systems/ScentTrackerSystem.cs b/Content.Server/Forensics/Systems/ScentTrackerSystem.cs
new file mode 100644
index 00000000000..e3542eaba47
--- /dev/null
+++ b/Content.Server/Forensics/Systems/ScentTrackerSystem.cs
@@ -0,0 +1,130 @@
+using Content.Server.Popups;
+using Content.Shared.DoAfter;
+using Content.Shared.Verbs;
+using Content.Shared.Forensics;
+using Content.Shared.Examine;
+using Robust.Shared.Utility;
+using Content.Shared.IdentityManagement;
+
+namespace Content.Server.Forensics
+{
+    public sealed class ScentTrackerSystem : EntitySystem
+    {
+        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        public override void Initialize()
+        {
+            SubscribeLocalEvent<ScentTrackerComponent, GetVerbsEvent<InnateVerb>>(AddVerbs);
+            SubscribeLocalEvent<ScentTrackerComponent, ScentTrackerDoAfterEvent>(TrackScentDoAfter);
+            SubscribeLocalEvent<ForensicsComponent, ExaminedEvent>((uid, _, args) => OnExamine(uid, args));
+        }
+
+        private void AddVerbs(EntityUid uid, ScentTrackerComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            TrackScentVerb(uid, component, args);
+            StopTrackScentVerb(uid, component, args);
+        }
+
+        private void TrackScentVerb(EntityUid uid, ScentTrackerComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            if (!args.CanInteract 
+                || !args.CanAccess 
+                || args.User == args.Target)
+                return;
+
+            InnateVerb verbTrackScent = new()
+            {
+                Act = () => AttemptTrackScent(uid, args.Target, component),
+                Text = Loc.GetString("track-scent"),
+                Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/psionic_invisibility.png")),
+                Priority = 1
+            };
+            args.Verbs.Add(verbTrackScent);
+        }
+
+        private void AttemptTrackScent(EntityUid user, EntityUid target, ScentTrackerComponent component)
+        {
+            if (!HasComp<ScentTrackerComponent>(user))
+                return;
+
+            var doAfterEventArgs = new DoAfterArgs(EntityManager, user, component.SniffDelay, new ScentTrackerDoAfterEvent(), user, target: target)
+            {
+                BreakOnUserMove = true,
+                BreakOnDamage = true,
+                BreakOnTargetMove = true
+            };
+
+            _popupSystem.PopupEntity(Loc.GetString("start-tracking-scent", ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))), user);
+            _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
+        }
+
+        private void TrackScentDoAfter(Entity<ScentTrackerComponent> entity, ref ScentTrackerDoAfterEvent args)
+        {
+            if (args.Handled 
+                || args.Cancelled 
+                || args.Args.Target == null)
+                return;
+
+            TrackScent(args.Args.User, args.Args.Target.Value);
+
+            args.Handled = true;
+        }
+
+        private void StopTrackScentVerb(EntityUid uid, ScentTrackerComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            if (args.User != args.Target 
+                || component.Scent == string.Empty)
+                return;
+
+            InnateVerb verbStopTrackScent = new()
+            {
+                Act = () => StopTrackScent(uid, component),
+                Text = Loc.GetString("stop-track-scent"),
+                Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/psionic_invisibility.png")),
+                Priority = 2
+            };
+            args.Verbs.Add(verbStopTrackScent);
+        }
+
+        private void OnExamine(EntityUid uid, ExaminedEvent args)
+        {
+            if (!TryComp<ScentTrackerComponent>(args.Examiner, out var component)
+                || !TryComp<ForensicsComponent>(args.Examined, out var forcomp))
+                return;
+
+            if (forcomp.Scent != string.Empty && component.Scent == forcomp.Scent)
+                args.PushMarkup(Loc.GetString("examined-scent"), -1);
+        }
+
+        #region Utilities
+        public void TrackScent(EntityUid uid, EntityUid target)
+        {
+            if (!TryComp<ScentTrackerComponent>(uid, out var component)
+                || !TryComp<ForensicsComponent>(target, out var forcomp))
+                return;
+
+            if (forcomp.Scent != string.Empty)
+            {
+                component.Scent = forcomp.Scent;
+                _popupSystem.PopupEntity(Loc.GetString("tracking-scent", ("target", Identity.Name(target, EntityManager))), uid, uid);
+            }
+            else
+                _popupSystem.PopupEntity(Loc.GetString("no-scent"), uid, uid);
+
+            Dirty(uid, component);
+        }
+
+        public void StopTrackScent(EntityUid uid, ScentTrackerComponent component)
+        {
+            if (!HasComp<ScentTrackerComponent>(uid))
+                return;
+
+            component.Scent = string.Empty;
+            _popupSystem.PopupEntity(Loc.GetString("stopped-tracking-scent"), uid, uid);
+
+            Dirty(uid, component);
+        }
+
+        #endregion
+    }
+}
diff --git a/Content.Server/Gravity/GravityGeneratorSystem.cs b/Content.Server/Gravity/GravityGeneratorSystem.cs
index b0c4bb56ff3..ec5646457e2 100644
--- a/Content.Server/Gravity/GravityGeneratorSystem.cs
+++ b/Content.Server/Gravity/GravityGeneratorSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Audio;
 using Content.Server.Power.Components;
+using Content.Server.Emp;
 using Content.Shared.Database;
 using Content.Shared.Gravity;
 using Content.Shared.Interaction;
@@ -28,6 +29,8 @@ public override void Initialize()
             SubscribeLocalEvent<GravityGeneratorComponent, InteractHandEvent>(OnInteractHand);
             SubscribeLocalEvent<GravityGeneratorComponent, SharedGravityGeneratorComponent.SwitchGeneratorMessage>(
                 OnSwitchGenerator);
+
+            SubscribeLocalEvent<GravityGeneratorComponent, EmpPulseEvent>(OnEmpPulse);
         }
 
         private void OnParentChanged(EntityUid uid, GravityGeneratorComponent component, ref EntParentChangedMessage args)
@@ -289,5 +292,28 @@ private void OnSwitchGenerator(
         {
             SetSwitchedOn(uid, component, args.On, session:args.Session);
         }
+
+        private void OnEmpPulse(EntityUid uid, GravityGeneratorComponent component, EmpPulseEvent args)
+        {
+            /// i really don't think that the gravity generator should use normalised 0-1 charge
+            /// as opposed to watts charge that every other battery uses
+
+            ApcPowerReceiverComponent? powerReceiver = null;
+            if (!Resolve(uid, ref powerReceiver, false))
+                return;
+
+            var ent = (uid, component, powerReceiver);
+
+            // convert from normalised energy to watts and subtract
+            float maxEnergy = component.ActivePowerUse / component.ChargeRate;
+            float currentEnergy = maxEnergy * component.Charge;
+            currentEnergy = Math.Max(0, currentEnergy - args.EnergyConsumption);
+
+            // apply renormalised energy to charge variable
+            component.Charge = currentEnergy / maxEnergy;
+
+            // update power state
+            UpdateState(ent);
+        }
     }
 }
diff --git a/Content.Server/HealthExaminable/HealthExaminableComponent.cs b/Content.Server/HealthExaminable/HealthExaminableComponent.cs
index 3f434a93cfe..04053aed70e 100644
--- a/Content.Server/HealthExaminable/HealthExaminableComponent.cs
+++ b/Content.Server/HealthExaminable/HealthExaminableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -7,8 +7,12 @@ namespace Content.Server.HealthExaminable;
 [RegisterComponent, Access(typeof(HealthExaminableSystem))]
 public sealed partial class HealthExaminableComponent : Component
 {
+    // <summary>
+    //     The thresholds for determining the examine text for certain amounts of damage.
+    //     These are calculated as a percentage of the entity's critical threshold.
+    // </summary>
     public List<FixedPoint2> Thresholds = new()
-        { FixedPoint2.New(10), FixedPoint2.New(25), FixedPoint2.New(50), FixedPoint2.New(75) };
+        { FixedPoint2.New(0.10), FixedPoint2.New(0.25), FixedPoint2.New(0.50), FixedPoint2.New(0.75) };
 
     [DataField("examinableTypes", required: true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<DamageTypePrototype>))]
     public HashSet<string> ExaminableTypes = default!;
diff --git a/Content.Server/HealthExaminable/HealthExaminableSystem.cs b/Content.Server/HealthExaminable/HealthExaminableSystem.cs
index ed69a1c096a..89291726fbe 100644
--- a/Content.Server/HealthExaminable/HealthExaminableSystem.cs
+++ b/Content.Server/HealthExaminable/HealthExaminableSystem.cs
@@ -1,15 +1,20 @@
-using Content.Shared.Damage;
+using Content.Server.Traits.Assorted;
+using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.Server.HealthExaminable;
 
 public sealed class HealthExaminableSystem : EntitySystem
 {
     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
+    [Dependency] private readonly MobThresholdSystem _threshold = default!;
 
     public override void Initialize()
     {
@@ -29,7 +34,13 @@ private void OnGetExamineVerbs(EntityUid uid, HealthExaminableComponent componen
         {
             Act = () =>
             {
-                var markup = CreateMarkup(uid, component, damage);
+                FormattedMessage markup;
+                if (uid == args.User
+                    && TryComp<SelfAwareComponent>(uid, out var selfAware))
+                    markup = CreateMarkupSelfAware(uid, selfAware, component, damage);
+                else
+                    markup = CreateMarkup(uid, component, damage);
+
                 _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false);
             },
             Text = Loc.GetString("health-examinable-verb-text"),
@@ -47,6 +58,9 @@ private FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent c
         var msg = new FormattedMessage();
 
         var first = true;
+
+        var adjustedThresholds = GetAdjustedThresholds(uid, component.Thresholds);
+
         foreach (var type in component.ExaminableTypes)
         {
             if (!damage.Damage.DamageDict.TryGetValue(type, out var dmg))
@@ -58,7 +72,7 @@ private FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent c
             FixedPoint2 closest = FixedPoint2.Zero;
 
             string chosenLocStr = string.Empty;
-            foreach (var threshold in component.Thresholds)
+            foreach (var threshold in adjustedThresholds)
             {
                 var str = $"health-examinable-{component.LocPrefix}-{type}-{threshold}";
                 var tempLocStr = Loc.GetString($"health-examinable-{component.LocPrefix}-{type}-{threshold}", ("target", Identity.Entity(uid, EntityManager)));
@@ -94,10 +108,100 @@ private FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent c
         }
 
         // Anything else want to add on to this?
-        RaiseLocalEvent(uid, new HealthBeingExaminedEvent(msg), true);
+        RaiseLocalEvent(uid, new HealthBeingExaminedEvent(msg, false), true);
 
         return msg;
     }
+
+    private FormattedMessage CreateMarkupSelfAware(EntityUid target, SelfAwareComponent selfAware, HealthExaminableComponent component, DamageableComponent damage)
+    {
+        var msg = new FormattedMessage();
+
+        var first = true;
+
+        foreach (var type in selfAware.AnalyzableTypes)
+        {
+            if (!damage.Damage.DamageDict.TryGetValue(type, out var typeDmgUnrounded))
+                continue;
+
+            var typeDmg = (int) Math.Round(typeDmgUnrounded.Float(), 0);
+            if (typeDmg <= 0)
+                continue;
+
+            var damageString = Loc.GetString(
+                "health-examinable-selfaware-type-text",
+                ("damageType", Loc.GetString($"health-examinable-selfaware-type-{type}")),
+                ("amount", typeDmg)
+            );
+
+            if (!first)
+                msg.PushNewline();
+            else
+                first = false;
+            msg.AddMarkup(damageString);
+        }
+
+        var adjustedThresholds = GetAdjustedThresholds(target, selfAware.Thresholds);
+
+        foreach (var group in selfAware.DetectableGroups)
+        {
+            if (!damage.DamagePerGroup.TryGetValue(group, out var groupDmg)
+                || groupDmg == FixedPoint2.Zero)
+                continue;
+
+            FixedPoint2 closest = FixedPoint2.Zero;
+
+            string chosenLocStr = string.Empty;
+            foreach (var threshold in adjustedThresholds)
+            {
+                var locName = $"health-examinable-selfaware-group-{group}-{threshold}";
+                var locStr = Loc.GetString(locName);
+
+                var locDoesNotExist = locStr == locName;
+                if (locDoesNotExist)
+                    continue;
+
+                if (groupDmg > threshold && threshold > closest)
+                {
+                    chosenLocStr = locStr;
+                    closest = threshold;
+                }
+            }
+
+            if (closest == FixedPoint2.Zero)
+                continue;
+
+            if (!first)
+                msg.PushNewline();
+            else
+                first = false;
+            msg.AddMarkup(chosenLocStr);
+        }
+
+        if (msg.IsEmpty)
+            msg.AddMarkup(Loc.GetString($"health-examinable-selfaware-none"));
+
+        // Event listeners can know if the examination is Self-Aware.
+        RaiseLocalEvent(target, new HealthBeingExaminedEvent(msg, true), true);
+
+        return msg;
+    }
+
+    /// <summary>
+    ///     Return thresholds as percentages of an entity's critical threshold.
+    /// </summary>
+    private List<FixedPoint2> GetAdjustedThresholds(EntityUid uid, List<FixedPoint2> thresholdPercentages)
+    {
+        FixedPoint2 critThreshold = 0;
+        if (TryComp<MobThresholdsComponent>(uid, out var threshold))
+            critThreshold = _threshold.GetThresholdForState(uid, Shared.Mobs.MobState.Critical, threshold);
+
+        // Fallback to 100 crit threshold if none found
+        if (critThreshold == 0)
+            critThreshold = 100;
+
+        return thresholdPercentages.Select(percentage => critThreshold * percentage).ToList();
+    }
 }
 
 /// <summary>
@@ -108,9 +212,11 @@ private FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent c
 public sealed class HealthBeingExaminedEvent
 {
     public FormattedMessage Message;
+    public bool IsSelfAware;
 
-    public HealthBeingExaminedEvent(FormattedMessage message)
+    public HealthBeingExaminedEvent(FormattedMessage message, bool isSelfAware)
     {
         Message = message;
+        IsSelfAware = isSelfAware;
     }
 }
diff --git a/Content.Server/Language/Commands/AdminLanguageCommand.cs b/Content.Server/Language/Commands/AdminLanguageCommand.cs
new file mode 100644
index 00000000000..f02d9c7f401
--- /dev/null
+++ b/Content.Server/Language/Commands/AdminLanguageCommand.cs
@@ -0,0 +1,75 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Language;
+using Content.Shared.Language.Components;
+using Content.Shared.Language.Systems;
+using Robust.Shared.Toolshed;
+using Robust.Shared.Toolshed.Syntax;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Server.Language.Commands;
+
+[ToolshedCommand(Name = "language"), AdminCommand(AdminFlags.Admin)]
+public sealed class AdminLanguageCommand : ToolshedCommand
+{
+    private LanguageSystem? _languagesField;
+    private LanguageSystem Languages => _languagesField ??= GetSys<LanguageSystem>();
+
+    [CommandImplementation("add")]
+    public EntityUid AddLanguage(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] EntityUid input,
+        [CommandArgument] ValueRef<string, Prototype<LanguagePrototype>> @ref,
+        [CommandArgument] bool canSpeak = true,
+        [CommandArgument] bool canUnderstand = true
+    )
+    {
+        var language = @ref.Evaluate(ctx)!;
+
+        if (language == SharedLanguageSystem.UniversalPrototype)
+        {
+            EnsureComp<UniversalLanguageSpeakerComponent>(input);
+            Languages.UpdateEntityLanguages(input);
+        }
+        else
+        {
+            EnsureComp<LanguageSpeakerComponent>(input);
+            Languages.AddLanguage(input, language, canSpeak, canUnderstand);
+        }
+
+        return input;
+    }
+
+    [CommandImplementation("rm")]
+    public EntityUid RemoveLanguage(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] EntityUid input,
+        [CommandArgument] ValueRef<string, Prototype<LanguagePrototype>> @ref,
+        [CommandArgument] bool removeSpeak = true,
+        [CommandArgument] bool removeUnderstand = true
+    )
+    {
+        var language = @ref.Evaluate(ctx)!;
+        if (language == SharedLanguageSystem.UniversalPrototype && HasComp<UniversalLanguageSpeakerComponent>(input))
+        {
+            RemComp<UniversalLanguageSpeakerComponent>(input);
+            EnsureComp<LanguageSpeakerComponent>(input);
+        }
+        // We execute this branch even in case of universal so that it gets removed if it was added manually to the LanguageKnowledge
+        Languages.RemoveLanguage(input, language, removeSpeak, removeUnderstand);
+
+        return input;
+    }
+
+    [CommandImplementation("lsspoken")]
+    public IEnumerable<string> ListSpoken([PipedArgument] EntityUid input)
+    {
+        return Languages.GetSpokenLanguages(input);
+    }
+
+    [CommandImplementation("lsunderstood")]
+    public IEnumerable<string> ListUnderstood([PipedArgument] EntityUid input)
+    {
+        return Languages.GetUnderstoodLanguages(input);
+    }
+}
diff --git a/Content.Server/Language/Commands/AdminTranslatorCommand.cs b/Content.Server/Language/Commands/AdminTranslatorCommand.cs
new file mode 100644
index 00000000000..8a7984bc36b
--- /dev/null
+++ b/Content.Server/Language/Commands/AdminTranslatorCommand.cs
@@ -0,0 +1,155 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Language;
+using Content.Shared.Language.Components;
+using Content.Shared.Language.Components.Translators;
+using Content.Shared.Language.Systems;
+using Robust.Server.Containers;
+using Robust.Shared.Toolshed;
+using Robust.Shared.Toolshed.Syntax;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Server.Language.Commands;
+
+[ToolshedCommand(Name = "translator"), AdminCommand(AdminFlags.Admin)]
+public sealed class AdminTranslatorCommand : ToolshedCommand
+{
+    private LanguageSystem? _languagesField;
+    private ContainerSystem? _containersField;
+
+    private ContainerSystem Containers => _containersField ??= GetSys<ContainerSystem>();
+    private LanguageSystem Languages => _languagesField ??= GetSys<LanguageSystem>();
+
+    [CommandImplementation("addlang")]
+    public EntityUid AddLanguage(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] EntityUid input,
+        [CommandArgument] ValueRef<string, Prototype<LanguagePrototype>> @ref,
+        [CommandArgument] bool addSpeak = true,
+        [CommandArgument] bool addUnderstand = true
+    )
+    {
+        var language = @ref.Evaluate(ctx)!;
+        // noob trap - needs a universallanguagespeakercomponent
+        if (language == SharedLanguageSystem.UniversalPrototype)
+            throw new ArgumentException(Loc.GetString("command-language-error-this-will-not-work"));
+
+        if (!TryGetTranslatorComp(input, out var translator))
+            throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
+
+        if (addSpeak && !translator.SpokenLanguages.Contains(language))
+            translator.SpokenLanguages.Add(language);
+        if (addUnderstand && !translator.UnderstoodLanguages.Contains(language))
+            translator.UnderstoodLanguages.Add(language);
+
+        UpdateTranslatorHolder(input);
+
+        return input;
+    }
+
+    [CommandImplementation("rmlang")]
+    public EntityUid RemoveLanguage(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] EntityUid input,
+        [CommandArgument] ValueRef<string, Prototype<LanguagePrototype>> @ref,
+        [CommandArgument] bool removeSpeak = true,
+        [CommandArgument] bool removeUnderstand = true
+    )
+    {
+        var language = @ref.Evaluate(ctx)!;
+        if (!TryGetTranslatorComp(input, out var translator))
+            throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
+
+        if (removeSpeak)
+            translator.SpokenLanguages.Remove(language);
+        if (removeUnderstand)
+            translator.UnderstoodLanguages.Remove(language);
+
+        UpdateTranslatorHolder(input);
+
+        return input;
+    }
+
+    [CommandImplementation("addrequired")]
+    public EntityUid AddRequiredLanguage(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] EntityUid input,
+        [CommandArgument] ValueRef<string, Prototype<LanguagePrototype>> @ref)
+    {
+        var language = @ref.Evaluate(ctx)!;
+        if (!TryGetTranslatorComp(input, out var translator))
+            throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
+
+        if (!translator.RequiredLanguages.Contains(language))
+        {
+            translator.RequiredLanguages.Add(language);
+            UpdateTranslatorHolder(input);
+        }
+
+        return input;
+    }
+
+    [CommandImplementation("rmrequired")]
+    public EntityUid RemoveRequiredLanguage(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] EntityUid input,
+        [CommandArgument] ValueRef<string, Prototype<LanguagePrototype>> @ref)
+    {
+        var language = @ref.Evaluate(ctx)!;
+        if (!TryGetTranslatorComp(input, out var translator))
+            throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
+
+        if (translator.RequiredLanguages.Remove(language))
+            UpdateTranslatorHolder(input);
+
+        return input;
+    }
+
+    [CommandImplementation("lsspoken")]
+    public IEnumerable<string> ListSpoken([PipedArgument] EntityUid input)
+    {
+        if (!TryGetTranslatorComp(input, out var translator))
+            return [];
+        return translator.SpokenLanguages;
+    }
+
+    [CommandImplementation("lsunderstood")]
+    public IEnumerable<string> ListUnderstood([PipedArgument] EntityUid input)
+    {
+        if (!TryGetTranslatorComp(input, out var translator))
+            return [];
+        return translator.UnderstoodLanguages;
+    }
+
+    [CommandImplementation("lsrequired")]
+    public IEnumerable<string> ListRequired([PipedArgument] EntityUid input)
+    {
+        if (!TryGetTranslatorComp(input, out var translator))
+            return [];
+        return translator.RequiredLanguages;
+    }
+
+    private bool TryGetTranslatorComp(EntityUid uid, [NotNullWhen(true)] out BaseTranslatorComponent? translator)
+    {
+        if (TryComp<HandheldTranslatorComponent>(uid, out var handheld))
+            translator = handheld;
+        else if (TryComp<TranslatorImplantComponent>(uid, out var implant))
+            translator = implant;
+        else if (TryComp<IntrinsicTranslatorComponent>(uid, out var intrinsic))
+            translator = intrinsic;
+        else
+            translator = null;
+
+        return translator != null;
+    }
+
+    private void UpdateTranslatorHolder(EntityUid translator)
+    {
+        if (!Containers.TryGetContainingContainer(translator, out var cont)
+            || cont.Owner is not { Valid: true } holder)
+            return;
+
+        Languages.UpdateEntityLanguages(holder);
+    }
+}
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 2b18b57ff8b..c313b0d4ccd 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -141,9 +141,6 @@ private void OnWriteUiPublishMessage(Entity<NewsWriterComponent> ent, ref NewsWr
         if (msg.Session.AttachedEntity is not { } author)
             return;
 
-        if (!_accessReader.FindStationRecordKeys(author, out _))
-            return;
-
         string? authorName = null;
         if (_idCardSystem.TryFindIdCard(author, out var idCard))
             authorName = idCard.Comp.FullName;
diff --git a/Content.Server/Medical/PenLightSystem.cs b/Content.Server/Medical/PenLightSystem.cs
new file mode 100644
index 00000000000..f48a84d0476
--- /dev/null
+++ b/Content.Server/Medical/PenLightSystem.cs
@@ -0,0 +1,118 @@
+using Content.Server.DoAfter;
+using Content.Server.PowerCell;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.Drugs;
+using Content.Shared.Drunk;
+using Content.Shared.Eye.Blinding.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Medical;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Traits.Assorted.Components;
+using Robust.Server.GameObjects;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Medical;
+/// <summary>
+///     This stores the eye exam system for <see cref="PenLightComponent"/>
+/// </summary>
+public sealed class PenLightSystem : EntitySystem
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly DoAfterSystem _doAfter = default!;
+    [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PenLightComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<PenLightComponent, PenLightDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnAfterInteract(EntityUid uid, PenLightComponent component, AfterInteractEvent args)
+    {
+        if (args.Handled 
+            || args.Target is not { } target)
+            return;
+
+        args.Handled = TryStartExam(uid, target, args.User, component);
+    }
+
+    private void OnDoAfter(Entity<PenLightComponent> uid, ref PenLightDoAfterEvent args)
+    {
+        if (args.Handled 
+            || args.Cancelled 
+            || args.Target == null 
+            || !_powerCell.HasDrawCharge(uid, user: args.User))
+            return;
+
+        OpenUserInterface(args.User, uid);
+        Diagnose(uid, args.Target.Value);
+        args.Handled = true;
+    }
+
+
+    /// <summary>
+    ///     Actually handles the exam interaction.
+    /// </summary>
+    public bool TryStartExam(EntityUid uid, EntityUid target, EntityUid user, PenLightComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return false;
+
+        return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.ExamSpeed, new PenLightDoAfterEvent(),
+            uid, target, uid)
+        {
+            BlockDuplicate = true,
+            BreakOnUserMove = true,
+            BreakOnTargetMove = true,
+            BreakOnHandChange = true,
+            NeedHand = true
+        });
+    }
+    private void OpenUserInterface(EntityUid user, EntityUid penlight)
+    {
+        if (!TryComp<ActorComponent>(user, out var actor) 
+            || !_uiSystem.TryGetUi(penlight, PenLightUiKey.Key, out var ui))
+            return;
+
+        _uiSystem.OpenUi(ui, actor.PlayerSession);
+    }
+
+    /// <summary>
+    ///     Runs the checks for the different types of eye damage
+    /// </summary>
+    private void Diagnose(EntityUid penlight, EntityUid target)
+    {
+        if (!_uiSystem.TryGetUi(penlight, PenLightUiKey.Key, out var ui)
+            || !HasComp<EyeComponent>(target))
+            return;
+        // Blind
+        var blind = _entityManager.HasComponent<PermanentBlindnessComponent>(target);
+
+        // Drunk
+        var drunk = _entityManager.HasComponent<DrunkComponent>(target);
+
+        // EyeDamage
+        var eyeDamage = false;
+        if (TryComp<BlindableComponent>(target, out var eyeDam))
+        {
+            eyeDamage = eyeDam.EyeDamage > 0 && eyeDam.EyeDamage < 6; //6 means perma-blind
+        }
+
+        // Hallucinating
+        var seeingRainbows = _entityManager.HasComponent<SeeingRainbowsComponent>(target);
+
+        // Healthy
+        var healthy = !(blind || drunk || eyeDamage || seeingRainbows);
+
+        _uiSystem.SendUiMessage(ui, new PenLightUserMessage(GetNetEntity(target),
+        blind,
+        drunk,
+        eyeDamage,
+        healthy,
+        seeingRainbows
+        ));
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs b/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs
index 8bb68cb6f55..6f533c34199 100644
--- a/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs
@@ -14,7 +14,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<BoxerComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<BoxerComponent, MeleeHitEvent>(OnMeleeHit);
-        SubscribeLocalEvent<BoxingGlovesComponent, StaminaMeleeHitEvent>(OnStamHit);
+        SubscribeLocalEvent<BoxingGlovesComponent, TakeStaminaDamageEvent>(OnStamHit);
     }
 
     private void OnInit(EntityUid uid, BoxerComponent component, ComponentInit args)
@@ -27,7 +27,7 @@ private void OnMeleeHit(EntityUid uid, BoxerComponent component, MeleeHitEvent a
         args.ModifiersList.Add(component.UnarmedModifiers);
     }
 
-    private void OnStamHit(EntityUid uid, BoxingGlovesComponent component, StaminaMeleeHitEvent args)
+    private void OnStamHit(EntityUid uid, BoxingGlovesComponent component, TakeStaminaDamageEvent args)
     {
         if (!_containerSystem.TryGetContainingContainer(uid, out var equipee))
             return;
diff --git a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs b/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
index 6fdb27097e9..4fc078e85bc 100644
--- a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
@@ -21,7 +21,7 @@ public override void Initialize()
             SubscribeLocalEvent<OniComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
             SubscribeLocalEvent<OniComponent, MeleeHitEvent>(OnOniMeleeHit);
             SubscribeLocalEvent<HeldByOniComponent, MeleeHitEvent>(OnHeldMeleeHit);
-            SubscribeLocalEvent<HeldByOniComponent, StaminaMeleeHitEvent>(OnStamHit);
+            SubscribeLocalEvent<HeldByOniComponent, TakeStaminaDamageEvent>(OnStamHit);
         }
 
         private void OnEntInserted(EntityUid uid, OniComponent component, EntInsertedIntoContainerMessage args)
@@ -68,7 +68,7 @@ private void OnHeldMeleeHit(EntityUid uid, HeldByOniComponent component, MeleeHi
             args.ModifiersList.Add(oni.MeleeModifiers);
         }
 
-        private void OnStamHit(EntityUid uid, HeldByOniComponent component, StaminaMeleeHitEvent args)
+        private void OnStamHit(EntityUid uid, HeldByOniComponent component, TakeStaminaDamageEvent args)
         {
             if (!TryComp<OniComponent>(component.Holder, out var oni))
                 return;
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/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/Power/Components/ActiveChargerComponent.cs b/Content.Server/Power/Components/ActiveChargerComponent.cs
deleted file mode 100644
index f3d863c9e43..00000000000
--- a/Content.Server/Power/Components/ActiveChargerComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Power;
-
-namespace Content.Server.Power.Components
-{
-    [RegisterComponent]
-    public sealed partial class ActiveChargerComponent : Component
-    {
-    }
-}
diff --git a/Content.Server/Power/Components/ChargingComponent.cs b/Content.Server/Power/Components/ChargingComponent.cs
new file mode 100644
index 00000000000..db7c14f7082
--- /dev/null
+++ b/Content.Server/Power/Components/ChargingComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Power;
+
+namespace Content.Server.Power.Components
+{
+    [RegisterComponent]
+    public sealed partial class ChargingComponent : Component
+    {
+        ///<summary>
+        ///References the entity of the charger that is currently powering this battery
+        ///</summary>
+        public EntityUid ChargerUid;
+
+        ///<summary>
+        ///References the component of the charger that is currently powering this battery
+        ///</summary>
+        public ChargerComponent ChargerComponent;
+    }
+}
diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs
index 95b5d74a945..f345c9e88ea 100644
--- a/Content.Server/Power/EntitySystems/ApcSystem.cs
+++ b/Content.Server/Power/EntitySystems/ApcSystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.APC;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Emp;
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -37,6 +38,7 @@ public override void Initialize()
         SubscribeLocalEvent<ApcComponent, GotEmaggedEvent>(OnEmagged);
 
         SubscribeLocalEvent<ApcComponent, EmpPulseEvent>(OnEmpPulse);
+        SubscribeLocalEvent<ApcComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
     }
 
     public override void Update(float deltaTime)
@@ -163,7 +165,7 @@ public void UpdateUIState(EntityUid uid,
 
     private ApcChargeState CalcChargeState(EntityUid uid, PowerState.Battery battery)
     {
-        if (HasComp<EmaggedComponent>(uid))
+        if (HasComp<EmaggedComponent>(uid) || HasComp<EmpDisabledComponent>(uid))
             return ApcChargeState.Emag;
 
         if (battery.CurrentStorage / battery.Capacity > ApcComponent.HighPowerThreshold)
@@ -190,15 +192,16 @@ private ApcExternalPowerState CalcExtPowerState(EntityUid uid, PowerState.Batter
 
         return ApcExternalPowerState.Good;
     }
-
+    
     private void OnEmpPulse(EntityUid uid, ApcComponent component, ref EmpPulseEvent args)
     {
-        if (component.MainBreakerEnabled)
-        {
-            args.Affected = true;
-            args.Disabled = true;
-            ApcToggleBreaker(uid, component);
-        }
+        EnsureComp<EmpDisabledComponent>(uid, out var emp); //event calls before EmpDisabledComponent is added, ensure it to force sprite update
+        UpdateApcState(uid);
+    }
+
+    private void OnEmpDisabledRemoved(EntityUid uid, ApcComponent component, ref EmpDisabledRemoved args)
+    {
+        UpdateApcState(uid);
     }
 }
 
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index 0a0f2068b58..1c5d83b094d 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Cargo.Systems;
 using Content.Server.Emp;
+using Content.Shared.Emp;
 using Content.Server.Power.Components;
 using Content.Shared.Examine;
 using Content.Shared.Rejuvenate;
@@ -20,6 +21,7 @@ public override void Initialize()
             SubscribeLocalEvent<BatteryComponent, RejuvenateEvent>(OnBatteryRejuvenate);
             SubscribeLocalEvent<BatteryComponent, PriceCalculationEvent>(CalculateBatteryPrice);
             SubscribeLocalEvent<BatteryComponent, EmpPulseEvent>(OnEmpPulse);
+            SubscribeLocalEvent<BatteryComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
 
             SubscribeLocalEvent<NetworkBatteryPreSync>(PreSync);
             SubscribeLocalEvent<NetworkBatteryPostSync>(PostSync);
@@ -85,7 +87,7 @@ public override void Update(float frameTime)
             {
                 if (!comp.AutoRecharge) continue;
                 if (batt.IsFullyCharged) continue;
-                SetCharge(uid, batt.CurrentCharge + comp.AutoRechargeRate * frameTime, batt);
+                TrySetCharge(uid, batt.CurrentCharge + comp.AutoRechargeRate * frameTime, batt);
             }
         }
 
@@ -100,9 +102,21 @@ private void CalculateBatteryPrice(EntityUid uid, BatteryComponent component, re
         private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseEvent args)
         {
             args.Affected = true;
+            args.Disabled = true;
             UseCharge(uid, args.EnergyConsumption, component);
         }
 
+        // if a disabled battery is put into a recharged,
+        // allow the recharger to start recharging again after the disable ends
+        private void OnEmpDisabledRemoved(EntityUid uid, BatteryComponent component, ref EmpDisabledRemoved args)
+        {
+            if (!TryComp<ChargingComponent>(uid, out var charging))
+                return;
+
+            var ev = new ChargerUpdateStatusEvent(); 
+            RaiseLocalEvent<ChargerUpdateStatusEvent>(charging.ChargerUid, ref ev);
+        }
+
         public float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null)
         {
             if (value <= 0 ||  !Resolve(uid, ref battery) || battery.CurrentCharge == 0)
@@ -157,6 +171,18 @@ public bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery =
             return true;
         }
 
+        /// <summary>
+        ///     Like SetCharge, but checks for conditions like EmpDisabled before executing
+        /// </summary>
+        public bool TrySetCharge(EntityUid uid, float value, BatteryComponent? battery = null)
+        {
+            if (!Resolve(uid, ref battery, false) || TryComp<EmpDisabledComponent>(uid, out var emp))
+                return false;
+
+            SetCharge(uid, value, battery);
+            return true;
+        }
+
         /// <summary>
         /// Returns whether the battery is at least 99% charged, basically full.
         /// </summary>
@@ -165,6 +191,10 @@ public bool IsFull(EntityUid uid, BatteryComponent? battery = null)
             if (!Resolve(uid, ref battery))
                 return false;
 
+            // If the battery is full, remove its charging component.
+            if (TryComp<ChargingComponent>(uid, out _))
+                RemComp<ChargingComponent>(uid);
+
             return battery.CurrentCharge / battery.MaxCharge >= 0.99f;
         }
     }
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index db16dfa008e..ae6b024162e 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -1,13 +1,16 @@
 using Content.Server.Power.Components;
+using Content.Server.Emp;
 using Content.Server.PowerCell;
 using Content.Shared.Examine;
 using Content.Shared.Power;
 using Content.Shared.PowerCell.Components;
+using Content.Shared.Emp;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Storage.Components;
 using Robust.Server.Containers;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Power.EntitySystems;
 
@@ -28,6 +31,11 @@ public override void Initialize()
         SubscribeLocalEvent<ChargerComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
         SubscribeLocalEvent<ChargerComponent, InsertIntoEntityStorageAttemptEvent>(OnEntityStorageInsertAttempt);
         SubscribeLocalEvent<ChargerComponent, ExaminedEvent>(OnChargerExamine);
+
+        SubscribeLocalEvent<ChargerComponent, ChargerUpdateStatusEvent>(OnUpdateStatus);
+    
+        SubscribeLocalEvent<ChargerComponent, EmpPulseEvent>(OnEmpPulse);
+        SubscribeLocalEvent<ChargerComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
     }
 
     private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStartup args)
@@ -40,21 +48,58 @@ private void OnChargerExamine(EntityUid uid, ChargerComponent component, Examine
         args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate)));
     }
 
+    private void StartChargingBattery(EntityUid uid, ChargerComponent component, EntityUid target)
+    {
+        bool charge = true;
+
+        if (HasComp<EmpDisabledComponent>(uid))
+            charge = false;
+        else
+        if (!TryComp<BatteryComponent>(target, out var battery))
+            charge = false;
+        else
+        if (Math.Abs(battery.MaxCharge - battery.CurrentCharge) < 0.01)
+            charge = false;
+
+        // wrap functionality in an if statement instead of returning...
+        if (charge)
+        {
+            var charging = EnsureComp<ChargingComponent>(target);
+            charging.ChargerUid = uid;
+            charging.ChargerComponent = component;
+        }
+
+        // ...so the status always updates (for insertin a power cell)
+        UpdateStatus(uid, component);
+    }
+
+    private void StopChargingBattery(EntityUid uid, ChargerComponent component, EntityUid target)
+    {
+        if (HasComp<ChargingComponent>(target))
+            RemComp<ChargingComponent>(target);
+        UpdateStatus(uid, component);
+    }
+
     public override void Update(float frameTime)
     {
-        var query = EntityQueryEnumerator<ActiveChargerComponent, ChargerComponent, ContainerManagerComponent>();
-        while (query.MoveNext(out var uid, out _, out var charger, out var containerComp))
+        var query = EntityQueryEnumerator<ChargingComponent>();
+        while (query.MoveNext(out var uid, out var charging))
         {
-            if (!_container.TryGetContainer(uid, charger.SlotId, out var container, containerComp))
+            if (!TryComp<ChargerComponent>(charging.ChargerUid, out var chargerComponent))
                 continue;
 
-            if (charger.Status == CellChargerStatus.Empty || charger.Status == CellChargerStatus.Charged || container.ContainedEntities.Count == 0)
+            if (charging.ChargerComponent.Status == CellChargerStatus.Off || charging.ChargerComponent.Status == CellChargerStatus.Empty)
                 continue;
 
-            foreach (var contained in container.ContainedEntities)
-            {
-                TransferPower(uid, contained, charger, frameTime);
-            }
+            if (HasComp<EmpDisabledComponent>(charging.ChargerUid))
+                continue;
+
+            if (!TryComp<BatteryComponent>(uid, out var battery))
+                continue;
+
+            if (Math.Abs(battery.MaxCharge - battery.CurrentCharge) < 0.01)
+                StopChargingBattery(charging.ChargerUid, charging.ChargerComponent, uid);
+            TransferPower(charging.ChargerUid, uid, charging.ChargerComponent, frameTime);
         }
     }
 
@@ -71,7 +116,7 @@ private void OnInserted(EntityUid uid, ChargerComponent component, EntInsertedIn
         if (args.Container.ID != component.SlotId)
             return;
 
-        UpdateStatus(uid, component);
+        StartChargingBattery(uid, component, args.Entity);
     }
 
     private void OnRemoved(EntityUid uid, ChargerComponent component, EntRemovedFromContainerMessage args)
@@ -79,7 +124,7 @@ private void OnRemoved(EntityUid uid, ChargerComponent component, EntRemovedFrom
         if (args.Container.ID != component.SlotId)
             return;
 
-        UpdateStatus(uid, component);
+        StopChargingBattery(uid, component, args.Entity);
     }
 
     /// <summary>
@@ -112,6 +157,11 @@ private void OnEntityStorageInsertAttempt(EntityUid uid, ChargerComponent compon
             args.Cancelled = true;
     }
 
+    private void OnUpdateStatus(EntityUid uid, ChargerComponent component, ref ChargerUpdateStatusEvent args)
+    {
+        UpdateStatus(uid, component);
+    }
+
     private void UpdateStatus(EntityUid uid, ChargerComponent component)
     {
         var status = GetStatus(uid, component);
@@ -126,15 +176,6 @@ private void UpdateStatus(EntityUid uid, ChargerComponent component)
 
         component.Status = status;
 
-        if (component.Status == CellChargerStatus.Charging)
-        {
-            AddComp<ActiveChargerComponent>(uid);
-        }
-        else
-        {
-            RemComp<ActiveChargerComponent>(uid);
-        }
-
         switch (component.Status)
         {
             case CellChargerStatus.Off:
@@ -146,7 +187,7 @@ private void UpdateStatus(EntityUid uid, ChargerComponent component)
                 _appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Empty, appearance);
                 break;
             case CellChargerStatus.Charging:
-                receiver.Load = component.ChargeRate;
+                receiver.Load = component.ChargeRate; //does not scale with multiple slotted batteries
                 _appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Charging, appearance);
                 break;
             case CellChargerStatus.Charged:
@@ -157,6 +198,42 @@ private void UpdateStatus(EntityUid uid, ChargerComponent component)
                 throw new ArgumentOutOfRangeException();
         }
     }
+    
+    private void OnEmpPulse(EntityUid uid, ChargerComponent component, ref EmpPulseEvent args)
+    {
+        // we don't care if we haven't been disabled
+        if (!args.Disabled)
+            return;
+
+        // if the recharger is hit by an emp pulse,
+        // stop recharging contained batteries to save resources
+        if (!_container.TryGetContainer(uid, component.SlotId, out var container))
+            return;
+
+        foreach (var containedEntity in container.ContainedEntities)
+        {
+            if (!SearchForBattery(containedEntity, out _, out _))
+                continue;
+
+            StopChargingBattery(uid, component, containedEntity);
+        }
+    }
+
+    private void OnEmpDisabledRemoved(EntityUid uid, ChargerComponent component, ref EmpDisabledRemoved args)
+    {
+        // if an emp disable subsides,
+        // attempt to start charging all batteries
+        if (!_container.TryGetContainer(uid, component.SlotId, out var container))
+            return;
+
+        foreach (var containedEntity in container.ContainedEntities)
+        {
+            if (!SearchForBattery(containedEntity, out _, out _))
+                continue;
+
+            StartChargingBattery(uid, component, containedEntity);
+        }
+    }
 
     private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
     {
@@ -178,13 +255,28 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
         if (container.ContainedEntities.Count == 0)
             return CellChargerStatus.Empty;
 
-        if (!SearchForBattery(container.ContainedEntities[0], out _, out var heldBattery))
-            return CellChargerStatus.Off;
+        var statusOut = CellChargerStatus.Off;
 
-        if (Math.Abs(heldBattery.MaxCharge - heldBattery.CurrentCharge) < 0.01)
-            return CellChargerStatus.Charged;
+        foreach (var containedEntity in container.ContainedEntities)
+        {
+            // if none of the slotted items are actually batteries, represent the charger as off
+            if (!SearchForBattery(containedEntity, out _, out _))
+                continue;
 
-        return CellChargerStatus.Charging;
+            // if all batteries are either EMP'd or fully charged, represent the charger as fully charged
+            statusOut = CellChargerStatus.Charged;
+            if (HasComp<EmpDisabledComponent>(containedEntity))
+                continue;
+
+            if (!HasComp<ChargingComponent>(containedEntity))
+                continue;
+
+            // if we have atleast one battery being charged, represent the charger as charging;
+            statusOut = CellChargerStatus.Charging;
+            break;
+        }
+
+        return statusOut;
     }
 
     private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerComponent component, float frameTime)
@@ -201,11 +293,11 @@ private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerCompone
         if (!SearchForBattery(targetEntity, out var batteryUid, out var heldBattery))
             return;
 
-        _battery.SetCharge(batteryUid.Value, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
+        _battery.TrySetCharge(batteryUid.Value, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
         // Just so the sprite won't be set to 99.99999% visibility
         if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01)
         {
-            _battery.SetCharge(batteryUid.Value, heldBattery.MaxCharge, heldBattery);
+            _battery.TrySetCharge(batteryUid.Value, heldBattery.MaxCharge, heldBattery);
         }
 
         UpdateStatus(uid, component);
@@ -223,3 +315,6 @@ private bool SearchForBattery(EntityUid uid, [NotNullWhen(true)] out EntityUid?
         return true;
     }
 }
+
+[ByRefEvent]
+public record struct ChargerUpdateStatusEvent();
\ No newline at end of file
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 048fda23553..2157a53a53d 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Power.Components;
+using Content.Server.Emp;
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Examine;
@@ -11,6 +12,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Utility;
+using Content.Shared.Emp;
 
 namespace Content.Server.Power.EntitySystems
 {
@@ -38,6 +40,9 @@ public override void Initialize()
             SubscribeLocalEvent<ApcPowerReceiverComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
             SubscribeLocalEvent<PowerSwitchComponent, GetVerbsEvent<AlternativeVerb>>(AddSwitchPowerVerb);
 
+            SubscribeLocalEvent<ApcPowerReceiverComponent, EmpPulseEvent>(OnEmpPulse);
+            SubscribeLocalEvent<ApcPowerReceiverComponent, EmpDisabledRemoved>(OnEmpEnd);
+
             _recQuery = GetEntityQuery<ApcPowerReceiverComponent>();
             _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
@@ -131,7 +136,7 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G
             {
                 Act = () =>
                 {
-                    TogglePower(uid, user: args.User);
+                    TryTogglePower(uid, user: args.User);
                 },
                 Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
                 Text = Loc.GetString("power-switch-component-toggle-verb"),
@@ -192,5 +197,36 @@ public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerRece
 
             return !receiver.PowerDisabled; // i.e. PowerEnabled
         }
+
+        public bool TryTogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerReceiverComponent? receiver = null, EntityUid? user = null)
+        {
+            if (HasComp<EmpDisabledComponent>(uid))
+                return false;
+
+            return TogglePower(uid, playSwitchSound, receiver, user);
+        }
+
+        public void SetLoad(ApcPowerReceiverComponent comp, float load)
+        {
+            comp.Load = load;
+        }
+
+        private void OnEmpPulse(EntityUid uid, ApcPowerReceiverComponent component, ref EmpPulseEvent args)
+        {
+            if (!component.PowerDisabled)
+            {
+                args.Affected = true;
+                args.Disabled = true;
+                TogglePower(uid, false);
+            }
+        }
+
+        private void OnEmpEnd(EntityUid uid, ApcPowerReceiverComponent component, ref EmpDisabledRemoved args)
+        {
+            if (component.PowerDisabled)
+            {
+                TogglePower(uid, false);
+            }
+        }
     }
 }
diff --git a/Content.Server/Power/PowerWireAction.cs b/Content.Server/Power/PowerWireAction.cs
index 785eac91dba..374c1c41acb 100644
--- a/Content.Server/Power/PowerWireAction.cs
+++ b/Content.Server/Power/PowerWireAction.cs
@@ -1,6 +1,7 @@
 using Content.Server.Electrocution;
 using Content.Server.Power.Components;
 using Content.Server.Wires;
+using Content.Shared.Emp;
 using Content.Shared.Power;
 using Content.Shared.Wires;
 
@@ -78,6 +79,9 @@ private void SetPower(EntityUid owner, bool pulsed)
                 return;
             }
 
+            if (EntityManager.TryGetComponent<EmpDisabledComponent>(owner, out var emp))
+                return;
+
             power.PowerDisabled = false;
         }
     }
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/AcceptPsionicsEui.cs b/Content.Server/Psionics/AcceptPsionicsEui.cs
index 7c652664c64..80fd8946f28 100644
--- a/Content.Server/Psionics/AcceptPsionicsEui.cs
+++ b/Content.Server/Psionics/AcceptPsionicsEui.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Psionics;
 using Content.Shared.Eui;
 using Content.Server.EUI;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs
index 1731c7a9bf5..d6067717c94 100644
--- a/Content.Server/Psionics/Dreams/DreamSystem.cs
+++ b/Content.Server/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/Psionics/Glimmer/GlimmerCommands.cs
index d17f1c04565..9e05886adca 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
@@ -14,7 +14,7 @@ public sealed class GlimmerShowCommand : IConsoleCommand
     public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var entMan = IoCManager.Resolve<IEntityManager>();
-        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().GlimmerOutput.ToString());
+        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer.ToString());
     }
 }
 
@@ -27,13 +27,11 @@ public sealed class GlimmerSetCommand : IConsoleCommand
 
     public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        if (args.Length != 1)
-            return;
-
-        if (!int.TryParse(args[0], out var glimmerValue))
+        if (args.Length != 1
+            || !int.TryParse(args[0], out var glimmerValue))
             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/Psionics/Glimmer/GlimmerReactiveSystem.cs
index 584b1a61e2c..f828874aacb 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Psionics.Audio;
+using Content.Server.Audio;
 using Content.Server.Power.Components;
 using Content.Server.Electrocution;
 using Content.Server.Lightning;
@@ -20,7 +20,6 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Psionics.Glimmer
@@ -36,13 +35,12 @@ public sealed class GlimmerReactiveSystem : EntitySystem
         [Dependency] private readonly LightningSystem _lightning = default!;
         [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
-        [Dependency] private readonly AnchorableSystem _anchorableSystem = default!;
         [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!;
         [Dependency] private readonly GhostSystem _ghostSystem = default!;
         [Dependency] private readonly RevenantSystem _revenantSystem = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly SharedPointLightSystem _pointLightSystem = default!;
+        private ISawmill _sawmill = default!;
 
         public float Accumulator = 0;
         public const float UpdateFrequency = 15f;
@@ -75,35 +73,28 @@ private void UpdateEntityState(EntityUid uid, SharedGlimmerReactiveComponent com
         {
             var isEnabled = true;
 
-            if (component.RequiresApcPower)
-                if (TryComp(uid, out ApcPowerReceiverComponent? apcPower))
-                    isEnabled = apcPower.Powered;
+            if (component.RequiresApcPower
+                && TryComp(uid, out ApcPowerReceiverComponent? apcPower))
+                isEnabled = apcPower.Powered;
 
             _appearanceSystem.SetData(uid, GlimmerReactiveVisuals.GlimmerTier, isEnabled ? currentGlimmerTier : GlimmerTier.Minimal);
 
-            // update ambient sound
+            // Update ambient sound
             if (TryComp(uid, out GlimmerSoundComponent? glimmerSound)
                 && TryComp(uid, out AmbientSoundComponent? ambientSoundComponent)
-                && glimmerSound.GetSound(currentGlimmerTier, out SoundSpecifier? spec))
+                && glimmerSound.GetSound(currentGlimmerTier, out SoundSpecifier? spec)
+                && spec != null)
+                _sharedAmbientSoundSystem.SetSound(uid, spec, ambientSoundComponent);
+
+            // Update point light
+            if (component.ModulatesPointLight
+                && _pointLightSystem.TryGetLight(uid, out var pointLight))
             {
-                if (spec != null)
-                    _sharedAmbientSoundSystem.SetSound(uid, spec, ambientSoundComponent);
+                _pointLightSystem.SetEnabled(uid, isEnabled ? currentGlimmerTier != GlimmerTier.Minimal : false, pointLight);
+                _pointLightSystem.SetEnergy(uid, pointLight.Energy + glimmerTierDelta * component.GlimmerToLightEnergyFactor, pointLight);
+                _pointLightSystem.SetRadius(uid, pointLight.Radius + glimmerTierDelta * component.GlimmerToLightRadiusFactor, pointLight);
             }
 
-            if (component.ModulatesPointLight) //SharedPointLightComponent is now being fetched via TryGetLight.
-                if (_pointLightSystem.TryGetLight(uid, out var pointLight))
-                {
-                    _pointLightSystem.SetEnabled(uid, isEnabled ? currentGlimmerTier != GlimmerTier.Minimal : false, pointLight);
-                    // The light energy and radius are kept updated even when off
-                    // to prevent the need to store additional state.
-                    //
-                    // Note that this doesn't handle edge cases where the
-                    // PointLightComponent is removed while the
-                    // GlimmerReactiveComponent is still present.
-                    _pointLightSystem.SetEnergy(uid, pointLight.Energy + glimmerTierDelta * component.GlimmerToLightEnergyFactor, pointLight);
-                    _pointLightSystem.SetRadius(uid, pointLight.Radius + glimmerTierDelta * component.GlimmerToLightRadiusFactor, pointLight);
-                }
-
         }
 
         /// <summary>
@@ -114,7 +105,7 @@ private void UpdateEntityState(EntityUid uid, SharedGlimmerReactiveComponent com
         private void OnMapInit(EntityUid uid, SharedGlimmerReactiveComponent component, MapInitEvent args)
         {
             if (component.RequiresApcPower && !HasComp<ApcPowerReceiverComponent>(uid))
-                Logger.Warning($"{ToPrettyString(uid)} had RequiresApcPower set to true but no ApcPowerReceiverComponent was found on init.");
+                _sawmill.Warning($"{ToPrettyString(uid)} had RequiresApcPower set to true but no ApcPowerReceiverComponent was found on init.");
 
             UpdateEntityState(uid, component, LastGlimmerTier, (int) LastGlimmerTier);
         }
@@ -154,7 +145,8 @@ private void OnTierChanged(EntityUid uid, SharedGlimmerReactiveComponent compone
 
                 receiver.PowerDisabled = false;
                 receiver.NeedsPower = false;
-            } else
+            }
+            else
             {
                 receiver.NeedsPower = true;
             }
@@ -162,13 +154,10 @@ private void OnTierChanged(EntityUid uid, SharedGlimmerReactiveComponent compone
 
         private void AddShockVerb(EntityUid uid, SharedGlimmerReactiveComponent component, GetVerbsEvent<AlternativeVerb> args)
         {
-            if(!args.CanAccess || !args.CanInteract)
-                return;
-
-            if (!TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
-                return;
-
-            if (receiver.NeedsPower)
+            if (!args.CanAccess
+                || !args.CanInteract
+                || !TryComp<ApcPowerReceiverComponent>(uid, out var receiver)
+                || receiver.NeedsPower)
                 return;
 
             AlternativeVerb verb = new()
@@ -176,9 +165,9 @@ 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")),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
                 Text = Loc.GetString("power-switch-component-toggle-verb"),
                 Priority = -3
             };
@@ -187,10 +176,8 @@ private void AddShockVerb(EntityUid uid, SharedGlimmerReactiveComponent componen
 
         private void OnDamageChanged(EntityUid uid, SharedGlimmerReactiveComponent component, DamageChangedEvent args)
         {
-            if (args.Origin == null)
-                return;
-
-            if (!_random.Prob(_glimmerSystem.GlimmerOutput / 1000))
+            if (args.Origin == null
+                || !_random.Prob((float) _glimmerSystem.Glimmer / 1000))
                 return;
 
             var tier = _glimmerSystem.GetGlimmerTier();
@@ -207,39 +194,35 @@ 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);
         }
 
         private void OnUnanchorAttempt(EntityUid uid, SharedGlimmerReactiveComponent component, UnanchorAttemptEvent args)
         {
-            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);
-                args.Cancel();
-            }
+            if (_glimmerSystem.GetGlimmerTier() < GlimmerTier.Dangerous)
+                return;
+
+            _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
+            _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
+            args.Cancel();
         }
 
         public void BeamRandomNearProber(EntityUid prober, int targets, float range = 10f)
         {
             List<EntityUid> targetList = new();
-            foreach (var target in _entityLookupSystem.GetComponentsInRange<StatusEffectsComponent>(_transformSystem.GetMapCoordinates(prober), range))
-            {
-                if (target.AllowedEffects.Contains("Electrocution"))
-                    targetList.Add(target.Owner);
-            }
+            foreach (var (target, status) in _entityLookupSystem.GetEntitiesInRange<StatusEffectsComponent>(_transformSystem.GetMapCoordinates(prober), range))
+                if (status.AllowedEffects.Contains("Electrocution"))
+                    targetList.Add(target);
 
-            foreach(var reactive in _entityLookupSystem.GetComponentsInRange<SharedGlimmerReactiveComponent>(_transformSystem.GetMapCoordinates(prober), range))
-            {
-                targetList.Add(reactive.Owner);
-            }
+            foreach (var reactive in _entityLookupSystem.GetEntitiesInRange<SharedGlimmerReactiveComponent>(_transformSystem.GetMapCoordinates(prober), range))
+                targetList.Add(reactive);
 
             _random.Shuffle(targetList);
             foreach (var target in targetList)
@@ -254,10 +237,9 @@ public void BeamRandomNearProber(EntityUid prober, int targets, float range = 10
 
         private void Beam(EntityUid prober, EntityUid target, GlimmerTier tier, bool obeyCD = true)
         {
-            if (obeyCD && BeamCooldown != 0)
-                return;
-
-            if (Deleted(prober) || Deleted(target))
+            if (obeyCD && BeamCooldown != 0
+                || Deleted(prober)
+                || Deleted(target))
                 return;
 
             var lxform = Transform(prober);
@@ -265,7 +247,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;
@@ -290,47 +272,27 @@ private void Beam(EntityUid prober, EntityUid target, GlimmerTier tier, bool obe
 
         private void AnchorOrExplode(EntityUid uid)
         {
-            var xform = Transform(uid);
-            if (xform.Anchored)
-                return;
-
-            if (!TryComp<PhysicsComponent>(uid, out var physics))
-                return;
-
-            var coordinates = xform.Coordinates;
-            var gridUid = xform.GridUid;
-
-            if (_mapManager.TryGetGrid(gridUid, out var grid))
-            {
-                var tileIndices = grid.TileIndicesFor(coordinates);
+            if (Transform(uid).GridUid is null)
+                _destructibleSystem.DestroyEntity(uid);
 
-                if (_anchorableSystem.TileFree(grid, tileIndices, physics.CollisionLayer, physics.CollisionMask) &&
-                    _transformSystem.AnchorEntity(uid, xform))
-                {
-                    return;
-                }
-            }
-
-            // Wasn't able to get a grid or a free tile, so explode.
-            _destructibleSystem.DestroyEntity(uid);
+            if (HasComp<AnchorableComponent>(uid))
+                _transformSystem.AnchorEntity(uid, Transform(uid));
         }
 
         private void OnMeleeThrowOnHitAttempt(Entity<SharedGlimmerReactiveComponent> ent, ref AttemptMeleeThrowOnHitEvent args)
         {
-            var (uid, _) = ent;
-
             if (_glimmerSystem.GetGlimmerTier() < GlimmerTier.Dangerous)
                 return;
 
             args.Cancelled = true;
             args.Handled = true;
 
-            _lightning.ShootRandomLightnings(uid, 10, 2, "SuperchargedLightning", 2, false);
+            _lightning.ShootRandomLightnings(ent, 10, 2, "SuperchargedLightning", 2, false);
 
             // Check if the parent of the user is alive, which will be the case if the user is an item and is being held.
             var zapTarget = _transformSystem.GetParentUid(args.User);
             if (TryComp<MindContainerComponent>(zapTarget, out _))
-                _electrocutionSystem.TryDoElectrocution(zapTarget, uid, 5, TimeSpan.FromSeconds(3), true,
+                _electrocutionSystem.TryDoElectrocution(zapTarget, ent, 5, TimeSpan.FromSeconds(3), true,
                     ignoreInsulation: true);
         }
 
@@ -357,7 +319,8 @@ public override void Update(float frameTime)
                 var currentGlimmerTier = _glimmerSystem.GetGlimmerTier();
 
                 var reactives = EntityQuery<SharedGlimmerReactiveComponent>();
-                if (currentGlimmerTier != LastGlimmerTier) {
+                if (currentGlimmerTier != LastGlimmerTier)
+                {
                     var glimmerTierDelta = (int) currentGlimmerTier - (int) LastGlimmerTier;
                     var ev = new GlimmerTierChangedEvent(LastGlimmerTier, currentGlimmerTier, glimmerTierDelta);
 
@@ -374,11 +337,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);
-                    //}
-                } else if (GhostsVisible == true)
+                    foreach (var reactive in reactives)
+                        BeamRandomNearProber(reactive.Owner, 1, 12);
+                }
+                else if (GhostsVisible == true)
                 {
                     _ghostSystem.MakeVisible(false);
                     _revenantSystem.MakeVisible(false);
diff --git a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
index f0a682961a3..57c74398b08 100644
--- a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -1,7 +1,9 @@
+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;
 
 namespace Content.Server.Psionics.Glimmer
 {
@@ -11,6 +13,7 @@ namespace Content.Server.Psionics.Glimmer
     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!;
 
@@ -18,40 +21,58 @@ public sealed class PassiveGlimmerReductionSystem : EntitySystem
         public List<int> GlimmerValues = new();
 
         public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(6);
+
+        private int _updateIncrementor;
         public TimeSpan NextUpdateTime = default!;
         public TimeSpan LastUpdateTime = default!;
 
-        private float _glimmerLinearDecay;
-        private bool _enabled;
+        private float _glimmerLostPerSecond;
 
         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);
+            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);
-            if (!_enabled)
-                return;
 
             var curTime = _timing.CurTime;
             if (NextUpdateTime > curTime)
                 return;
 
-            var glimmerDecay = _glimmerLinearDecay / (60 / TargetUpdatePeriod.Seconds);
 
-            _glimmerSystem.DeltaGlimmerOutput(-glimmerDecay);
+            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);
 
-            GlimmerValues.Add((int) Math.Round(_glimmerSystem.GlimmerOutput));
+                _updateIncrementor = 0;
+            }
 
             NextUpdateTime = curTime + TargetUpdatePeriod;
             LastUpdateTime = curTime;
         }
 
-        private void UpdatePassiveGlimmer(float value) => _glimmerLinearDecay = value;
+        private void UpdatePassiveGlimmer(float value) => _glimmerLostPerSecond = value;
     }
 }
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
index 34cdba29bb2..c7db2a5229f 100644
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
@@ -23,25 +23,5 @@ public sealed partial class GlimmerSourceComponent : Component
         /// </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
index 76ff5a823b3..8694147dc0e 100644
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -1,9 +1,7 @@
 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
@@ -24,18 +22,6 @@ public override void Initialize()
 
             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)
@@ -59,75 +45,32 @@ private void OnAnomalyPulse(EntityUid uid, GlimmerSourceComponent component, ref
             // component.
 
             if (TryComp<AnomalyComponent>(uid, out var anomaly))
-                _glimmerSystem.DeltaGlimmerOutput(5f * anomaly.Severity);
+                _glimmerSystem.Glimmer += (int) (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;
+            _glimmerSystem.Glimmer += 100;
         }
 
         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--;
+                    || !source.Active)
                     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));
-                    }
+                        _glimmerSystem.Glimmer++;
                     else
-                    {
-                        _glimmerSystem.DeltaGlimmerInput(-(_glimmerSystem.GlimmerOutput > glimmerEquilibrium
-                        ? MathF.Pow(_glimmerSystem.GetGlimmerOutputInteger() - source.GlimmerExponentOffset + glimmerSources, 2) : 1f)
-                        * (_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
-                    }
+                        _glimmerSystem.Glimmer--;
                 }
             }
         }
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index c21444139d1..31e6b89f13d 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/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/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
similarity index 89%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
index 376414eedce..859ceb7b83a 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
+++ b/Content.Server/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/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
similarity index 94%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
index f71605238ae..cec755e3260 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
+++ b/Content.Server/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/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
similarity index 76%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
rename to Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
index 87d3f250b1e..5352f5737f2 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
+++ b/Content.Server/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/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
index e874296a4c3..9499497cd1d 100644
--- a/Content.Server/Psionics/PotentialPsionicComponent.cs
+++ b/Content.Server/Psionics/PotentialPsionicComponent.cs
@@ -3,15 +3,8 @@ 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;
+        public float Chance = 0.04f;
 
         /// <summary>
         /// YORO (you only reroll once)
diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs
index 76c9022151e..959251d1fb7 100644
--- a/Content.Server/Psionics/PsionicsCommands.cs
+++ b/Content.Server/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/Psionics/PsionicsSystem.cs
index 6799b0bd3f5..fb5d18f2843 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -1,10 +1,11 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.StatusEffect;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Damage.Events;
 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;
@@ -35,9 +36,7 @@ public override void Update(float frameTime)
         {
             base.Update(frameTime);
             foreach (var roller in _rollers)
-            {
                 RollPsionics(roller.uid, roller.component, false);
-            }
             _rollers.Clear();
         }
         public override void Initialize()
@@ -45,10 +44,9 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<PotentialPsionicComponent, MapInitEvent>(OnStartup);
             SubscribeLocalEvent<AntiPsionicWeaponComponent, MeleeHitEvent>(OnMeleeHit);
-            SubscribeLocalEvent<AntiPsionicWeaponComponent, StaminaMeleeHitEvent>(OnStamHit);
+            SubscribeLocalEvent<AntiPsionicWeaponComponent, TakeStaminaDamageEvent>(OnStamHit);
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
         }
 
@@ -82,20 +80,12 @@ 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)
-                return;
-
-            if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
-                return;
-
-            if (_npcFactonSystem.ContainsFaction(uid, "GlimmerMonster", factions))
+            if (!component.Removable
+                || !TryComp<NpcFactionMemberComponent>(uid, out var factions)
+                || _npcFactonSystem.ContainsFaction(uid, "GlimmerMonster", factions))
                 return;
 
             _npcFactonSystem.AddFaction(uid, "PsionicInterloper");
@@ -109,51 +99,42 @@ private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove
             _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
         }
 
-        private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, StaminaMeleeHitEvent args)
+        private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, TakeStaminaDamageEvent args)
         {
-            var bonus = false;
-            foreach (var stam in args.HitList)
-            {
-                if (HasComp<PsionicComponent>(stam.Entity))
-                    bonus = true;
-            }
-
-            if (!bonus)
-                return;
-
-
-            args.FlatModifier += component.PsychicStaminaDamage;
+            if (HasComp<PsionicComponent>(args.Target))
+                args.FlatModifier += component.PsychicStaminaDamage;
         }
 
         public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, bool applyGlimmer = true, float multiplier = 1f)
         {
-            if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled))
+            if (HasComp<PsionicComponent>(uid)
+                || !_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)
         {
-            if (!Resolve(uid, ref psionic, false))
-                return;
-
-            if (psionic.Rerolled)
+            if (!Resolve(uid, ref psionic, false)
+                || psionic.Rerolled)
                 return;
 
             RollPsionics(uid, psionic, multiplier: bonusMuliplier);
diff --git a/Content.Server/Radiation/Systems/GeigerSystem.cs b/Content.Server/Radiation/Systems/GeigerSystem.cs
index f889336a068..06e5911cb7c 100644
--- a/Content.Server/Radiation/Systems/GeigerSystem.cs
+++ b/Content.Server/Radiation/Systems/GeigerSystem.cs
@@ -6,8 +6,8 @@
 using Content.Shared.Radiation.Components;
 using Content.Shared.Radiation.Systems;
 using Robust.Server.Audio;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.Player;
 
 namespace Content.Server.Radiation.Systems;
 
@@ -152,19 +152,19 @@ private void UpdateSound(EntityUid uid, GeigerComponent? component = null)
 
         component.Stream = _audio.Stop(component.Stream);
 
-        if (!component.Sounds.TryGetValue(component.DangerLevel, out var sounds))
-            return;
-
-        if (component.User == null)
-            return;
-
-        if (!_player.TryGetSessionByEntity(component.User.Value, out var session))
-            return;
-
-        var sound = _audio.GetSound(sounds);
-        var param = sounds.Params.WithLoop(true).WithVolume(-4f);
-
-        component.Stream = _audio.PlayGlobal(sound, session, param)?.Entity;
+        if (component.Sounds.TryGetValue(component.DangerLevel, out var sounds))
+        {
+            var sound = _audio.GetSound(sounds);
+
+            if (component.LocalSoundOnly
+                && component.User is not null
+                && _player.TryGetSessionByEntity(component.User.Value, out var session))
+            {
+                component.Stream = _audio.PlayGlobal(sound, session, component.AudioParameters)?.Entity;
+                return;
+            }
+            component.Stream = _audio.PlayEntity(sound, Filter.Pvs(uid), uid, true, component.AudioParameters)?.Entity;
+        }
     }
 
     public static GeigerDangerLevel RadsToLevel(float rads)
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/Shower/ShowerSystem.cs b/Content.Server/Shower/ShowerSystem.cs
new file mode 100644
index 00000000000..44034d5fa98
--- /dev/null
+++ b/Content.Server/Shower/ShowerSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Showers;
+
+namespace Content.Server.Shower;
+
+public sealed class ShowerSystem : SharedShowerSystem
+{
+
+}
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index cc57c34c475..7ede2342428 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Silicons.Borgs.Components;
+using Content.Server.Silicons.Borgs.Components;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Silicons.Borgs;
@@ -190,6 +191,10 @@ private void ProvideItems(EntityUid chassis, EntityUid uid, BorgChassisComponent
             if (!component.ItemsCreated)
             {
                 item = Spawn(itemProto, xform.Coordinates);
+                if (TryComp<BorgJetpackComponent>(uid, out var module))
+                {
+                    module.JetpackUid = item;
+                }
             }
             else
             {
diff --git a/Content.Server/Silicons/Borgs/Components/BorgJetpackComponent.cs b/Content.Server/Silicons/Borgs/Components/BorgJetpackComponent.cs
new file mode 100644
index 00000000000..3a71dd3a501
--- /dev/null
+++ b/Content.Server/Silicons/Borgs/Components/BorgJetpackComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Silicons.Borgs.Components;
+
+/// <summary>
+/// Server side indicator for a jetpack module. Used as conditional for inserting in canisters.
+/// </summary>
+[RegisterComponent]
+public sealed partial class BorgJetpackComponent : Component
+{
+    public EntityUid? JetpackUid = null;
+}
\ No newline at end of file
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/Standing/LayingDownSystem.cs b/Content.Server/Standing/LayingDownSystem.cs
index 69787ae8308..73a929fdfc4 100644
--- a/Content.Server/Standing/LayingDownSystem.cs
+++ b/Content.Server/Standing/LayingDownSystem.cs
@@ -48,7 +48,7 @@ private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component
         if (TryComp<StandingStateComponent>(uid, out var standingState) && standingState.Standing)
             return;
 
-        args.ModifySpeed(component.DownedSpeedMultiplier, component.DownedSpeedMultiplier);
+        args.ModifySpeed(component.DownedSpeedMultiplier, component.DownedSpeedMultiplier, bypassImmunity: true);
     }
 
     private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args)
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs b/Content.Server/StationEvents/Components/FreeProberRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs
rename to Content.Server/StationEvents/Components/FreeProberRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerEventComponent.cs b/Content.Server/StationEvents/Components/GlimmerEventComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerEventComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerEventComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs b/Content.Server/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs b/Content.Server/StationEvents/Components/GlimmerWispRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerWispRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs b/Content.Server/StationEvents/Components/MassMindSwapRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs
rename to Content.Server/StationEvents/Components/MassMindSwapRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs b/Content.Server/StationEvents/Components/MundaneDischargeRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs
rename to Content.Server/StationEvents/Components/MundaneDischargeRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs
rename to Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericStormRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs
rename to Content.Server/StationEvents/Components/NoosphericStormRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericZapRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs
rename to Content.Server/StationEvents/Components/NoosphericZapRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs b/Content.Server/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs
rename to Content.Server/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs
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/Nyanotrasen/StationEvents/Events/FreeProberRule.cs b/Content.Server/StationEvents/Events/FreeProberRule.cs
similarity index 96%
rename from Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
rename to Content.Server/StationEvents/Events/FreeProberRule.cs
index 46dff726e55..0aa8ecc47cc 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
+++ b/Content.Server/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/StationEvents/Events/GlimmerEventSystem.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
rename to Content.Server/StationEvents/Events/GlimmerEventSystem.cs
index 078826604eb..a3d36ae7157 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
+++ b/Content.Server/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/GlimmerRandomSentienceRule.cs b/Content.Server/StationEvents/Events/GlimmerRandomSentienceRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs
rename to Content.Server/StationEvents/Events/GlimmerRandomSentienceRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs b/Content.Server/StationEvents/Events/GlimmerRevenantSpawnRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs
rename to Content.Server/StationEvents/Events/GlimmerRevenantSpawnRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/StationEvents/Events/GlimmerWispSpawnRule.cs
similarity index 98%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
rename to Content.Server/StationEvents/Events/GlimmerWispSpawnRule.cs
index 89b5a176f24..66eea988aeb 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
+++ b/Content.Server/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/StationEvents/Events/MassMindSwapRule.cs
similarity index 89%
rename from Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
rename to Content.Server/StationEvents/Events/MassMindSwapRule.cs
index 3be2eed6387..63944563269 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
+++ b/Content.Server/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/MundaneDischargeRule.cs b/Content.Server/StationEvents/Events/MundaneDischargeRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/MundaneDischargeRule.cs
rename to Content.Server/StationEvents/Events/MundaneDischargeRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/StationEvents/Events/NoosphericFryRule.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
rename to Content.Server/StationEvents/Events/NoosphericFryRule.cs
index d7880af9032..c04543d2195 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
+++ b/Content.Server/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/StationEvents/Events/NoosphericStormRule.cs
similarity index 87%
rename from Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
rename to Content.Server/StationEvents/Events/NoosphericStormRule.cs
index 021c9591022..175318e15bd 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/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/StationEvents/Events/NoosphericZapRule.cs
similarity index 72%
rename from Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
rename to Content.Server/StationEvents/Events/NoosphericZapRule.cs
index a11faa06933..82c3d72b139 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/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/StationEvents/Events/PsionicCatGotYourTongueRule.cs
similarity index 97%
rename from Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
rename to Content.Server/StationEvents/Events/PsionicCatGotYourTongueRule.cs
index 753b2e25729..63e0a435cb0 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
+++ b/Content.Server/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/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/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 410ba9f7540..ec3d33157ab 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Emp;
 using Content.Server.Power.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DeviceNetwork;
@@ -59,9 +58,6 @@ public override void Initialize()
         SubscribeLocalEvent<SurveillanceCameraComponent, SurveillanceCameraSetupSetName>(OnSetName);
         SubscribeLocalEvent<SurveillanceCameraComponent, SurveillanceCameraSetupSetNetwork>(OnSetNetwork);
         SubscribeLocalEvent<SurveillanceCameraComponent, GetVerbsEvent<AlternativeVerb>>(AddVerbs);
-
-        SubscribeLocalEvent<SurveillanceCameraComponent, EmpPulseEvent>(OnEmpPulse);
-        SubscribeLocalEvent<SurveillanceCameraComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
     }
 
     private void OnPacketReceived(EntityUid uid, SurveillanceCameraComponent component, DeviceNetworkPacketEvent args)
@@ -400,21 +396,6 @@ private void UpdateVisuals(EntityUid uid, SurveillanceCameraComponent? component
 
         _appearance.SetData(uid, SurveillanceCameraVisualsKey.Key, key, appearance);
     }
-
-    private void OnEmpPulse(EntityUid uid, SurveillanceCameraComponent component, ref EmpPulseEvent args)
-    {
-        if (component.Active)
-        {
-            args.Affected = true;
-            args.Disabled = true;
-            SetActive(uid, false);
-        }
-    }
-
-    private void OnEmpDisabledRemoved(EntityUid uid, SurveillanceCameraComponent component, ref EmpDisabledRemoved args)
-    {
-        SetActive(uid, true);
-    }
 }
 
 public sealed class OnSurveillanceCameraViewerAddEvent : EntityEventArgs
diff --git a/Content.Server/Traits/Assorted/LayingDownModifierComponent.cs b/Content.Server/Traits/Assorted/LayingDownModifierComponent.cs
new file mode 100644
index 00000000000..22660ff4487
--- /dev/null
+++ b/Content.Server/Traits/Assorted/LayingDownModifierComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///     This is used for traits that modify values related to the Laying Down system.
+/// </summary>
+[RegisterComponent]
+public sealed partial class LayingDownModifierComponent : Component
+{
+    /// <summary>
+    ///     What to multiply the cooldown of laying down and standing up by.
+    /// </summary>
+    [DataField]
+    public float LayingDownCooldownMultiplier = 1f;
+
+    /// <summary>
+    ///     What to multiply the speed multiplier when lying down by.
+    /// </summary>
+    [DataField]
+    public float DownedSpeedMultiplierMultiplier = 1f;
+}
diff --git a/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs b/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
new file mode 100644
index 00000000000..dc6dcd2de3b
--- /dev/null
+++ b/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Traits.Assorted;
+using Content.Server.Standing;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed class LayingDownModifierSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<LayingDownModifierComponent, ComponentStartup>(OnStartup);
+    }
+
+    private void OnStartup(EntityUid uid, LayingDownModifierComponent component, ComponentStartup args)
+    {
+        if (!TryComp<LayingDownComponent>(uid, out var layingDown))
+            return;
+
+        layingDown.Cooldown *= component.LayingDownCooldownMultiplier;
+        layingDown.DownedSpeedMultiplier *= component.DownedSpeedMultiplierMultiplier;
+    }
+}
diff --git a/Content.Server/Traits/Assorted/LiquorLifelineComponent.cs b/Content.Server/Traits/Assorted/LiquorLifelineComponent.cs
new file mode 100644
index 00000000000..124d0fa3d72
--- /dev/null
+++ b/Content.Server/Traits/Assorted/LiquorLifelineComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Damage;
+
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///   This is used for the Liquor Lifeline trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class LiquorLifelineComponent : Component
+{
+}
diff --git a/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs b/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs
new file mode 100644
index 00000000000..49618548d3f
--- /dev/null
+++ b/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Body.Components;
+
+namespace Content.Server.Traits.Assorted;
+
+public sealed class LiquorLifelineSystem : EntitySystem
+{
+    [Dependency] private readonly BodySystem _bodySystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<LiquorLifelineComponent, ComponentInit>(OnSpawn);
+    }
+
+    private void OnSpawn(Entity<LiquorLifelineComponent> entity, ref ComponentInit args)
+    {
+        if (!TryComp<BodyComponent>(entity, out var body))
+            return;
+
+        if (!_bodySystem.TryGetBodyOrganComponents<MetabolizerComponent>(entity, out var metabolizers, body))
+            return;
+
+        foreach (var (metabolizer, _) in metabolizers)
+        {
+            if (metabolizer.MetabolizerTypes is null
+                || metabolizer.MetabolismGroups is null)
+                continue;
+
+            foreach (var metabolismGroup in metabolizer.MetabolismGroups)
+            {
+                // Add the LiquorLifeline metabolizer type to the liver and equivalent organs.
+                if (metabolismGroup.Id == "Alcohol")
+                    metabolizer.MetabolizerTypes.Add("LiquorLifeline");
+            }
+        }
+    }
+}
diff --git a/Content.Server/Traits/Assorted/OniDamageModifierComponent.cs b/Content.Server/Traits/Assorted/OniDamageModifierComponent.cs
new file mode 100644
index 00000000000..d6cf032aabd
--- /dev/null
+++ b/Content.Server/Traits/Assorted/OniDamageModifierComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Damage;
+
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///     This is used for traits that modify Oni damage modifiers.
+/// </summary>
+[RegisterComponent]
+public sealed partial class OniDamageModifierComponent : Component
+{
+    /// <summary>
+    ///     Which damage modifiers to override.
+    /// </summary>
+    [DataField("modifiers", required: true)]
+    public DamageModifierSet MeleeModifierReplacers = default!;
+}
diff --git a/Content.Server/Traits/Assorted/OniDamageModifierSystem.cs b/Content.Server/Traits/Assorted/OniDamageModifierSystem.cs
new file mode 100644
index 00000000000..9d701053769
--- /dev/null
+++ b/Content.Server/Traits/Assorted/OniDamageModifierSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Abilities.Oni;
+using Content.Shared.Damage;
+
+namespace Content.Server.Traits.Assorted;
+
+public sealed class OniDamageModifierSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<OniDamageModifierComponent, ComponentStartup>(OnStartup);
+    }
+
+    private void OnStartup(EntityUid uid, OniDamageModifierComponent component, ComponentStartup args)
+    {
+        if (!TryComp<OniComponent>(uid, out var oni))
+            return;
+
+        foreach (var (key, value) in component.MeleeModifierReplacers.Coefficients)
+        {
+            oni.MeleeModifiers.Coefficients[key] = value;
+
+        }
+
+        foreach (var (key, value) in component.MeleeModifierReplacers.FlatReduction)
+        {
+            oni.MeleeModifiers.FlatReduction[key] = value;
+
+        }
+    }
+}
diff --git a/Content.Server/Traits/Assorted/SelfAwareComponent.cs b/Content.Server/Traits/Assorted/SelfAwareComponent.cs
new file mode 100644
index 00000000000..03f5cd15502
--- /dev/null
+++ b/Content.Server/Traits/Assorted/SelfAwareComponent.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///     This is used for the Self-Aware trait to enhance the information received from HealthExaminableSystem.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SelfAwareComponent : Component
+{
+    // <summary>
+    //     Damage types that an entity is able to precisely analyze like a health analyzer when they examine themselves.
+    // </summary>
+    [DataField(required: true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<DamageTypePrototype>))]
+    public HashSet<string> AnalyzableTypes = default!;
+
+    // <summary>
+    //     Damage groups that an entity is able to detect the presence of when they examine themselves.
+    // </summary>
+    [DataField(required: true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<DamageGroupPrototype>))]
+    public HashSet<string> DetectableGroups = default!;
+
+    // <summary>
+    //     The thresholds for determining the examine text of DetectableGroups for certain amounts of damage.
+    //     These are calculated as a percentage of the entity's critical threshold.
+    // </summary>
+    public List<FixedPoint2> Thresholds = new()
+        { FixedPoint2.New(0.10), FixedPoint2.New(0.25), FixedPoint2.New(0.40), FixedPoint2.New(0.60) };
+}
diff --git a/Content.Server/Traits/Assorted/SingerSystem.cs b/Content.Server/Traits/Assorted/SingerSystem.cs
new file mode 100644
index 00000000000..7b560957b6e
--- /dev/null
+++ b/Content.Server/Traits/Assorted/SingerSystem.cs
@@ -0,0 +1,161 @@
+using Content.Server.Instruments;
+using Content.Server.Speech.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Damage;
+using Content.Shared.Damage.ForceSay;
+using Content.Shared.FixedPoint;
+using Content.Shared.Instruments;
+using Content.Shared.Inventory;
+using Content.Shared.Inventory.Events;
+using Content.Shared.Mobs;
+using Content.Shared.Popups;
+using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
+using Content.Shared.Traits.Assorted.Components;
+using Content.Shared.Traits.Assorted.Prototypes;
+using Content.Shared.Traits.Assorted.Systems;
+using Content.Shared.UserInterface;
+using Content.Shared.Zombies;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Traits.Assorted;
+
+public sealed class SingerSystem : SharedSingerSystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly InstrumentSystem _instrument = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GotEquippedEvent>(OnEquip);
+        SubscribeLocalEvent<InstrumentComponent, MobStateChangedEvent>(OnMobStateChangedEvent);
+        SubscribeLocalEvent<InstrumentComponent, KnockedDownEvent>(OnKnockedDown);
+        SubscribeLocalEvent<InstrumentComponent, StunnedEvent>(OnStunned);
+        SubscribeLocalEvent<InstrumentComponent, SleepStateChangedEvent>(OnSleep);
+        SubscribeLocalEvent<InstrumentComponent, StatusEffectAddedEvent>(OnStatusEffect);
+        SubscribeLocalEvent<InstrumentComponent, DamageChangedEvent>(OnDamageChanged);
+        // This is intended to intercept and cancel the UI event before it reaches ActivatableUISystem.
+        SubscribeLocalEvent<SingerComponent, OpenUiActionEvent>(OnInstrumentOpen, before: [typeof(ActivatableUISystem)]);
+    }
+
+    protected override SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid)
+    {
+        return EnsureComp<InstrumentComponent>(uid);
+    }
+
+    protected override void SetUpSwappableInstrument(EntityUid uid, SingerInstrumentPrototype singer)
+    {
+        if (singer.InstrumentList.Count <= 1)
+            return;
+
+        var swappableComp = EnsureComp<SwappableInstrumentComponent>(uid);
+        swappableComp.InstrumentList = singer.InstrumentList;
+    }
+
+    private void OnEquip(GotEquippedEvent args)
+    {
+        // Check if an item that makes the singer mumble is equipped to their face
+        // (not their pockets!). As of writing, this should just be the muzzle.
+        if (TryComp<AddAccentClothingComponent>(args.Equipment, out var accent) &&
+            accent.ReplacementPrototype == "mumble" &&
+            args.Slot == "mask")
+        {
+            CloseMidiUi(args.Equipee);
+        }
+    }
+
+    private void OnMobStateChangedEvent(EntityUid uid, SharedInstrumentComponent component, MobStateChangedEvent args)
+    {
+        if (args.NewMobState is MobState.Critical or MobState.Dead)
+            CloseMidiUi(args.Target);
+    }
+
+    private void OnKnockedDown(EntityUid uid, SharedInstrumentComponent component, ref KnockedDownEvent args)
+    {
+        CloseMidiUi(uid);
+    }
+
+    private void OnStunned(EntityUid uid, SharedInstrumentComponent component, ref StunnedEvent args)
+    {
+        CloseMidiUi(uid);
+    }
+
+    private void OnSleep(EntityUid uid, SharedInstrumentComponent component, ref SleepStateChangedEvent args)
+    {
+        if (args.FellAsleep)
+            CloseMidiUi(uid);
+    }
+
+    private void OnStatusEffect(EntityUid uid, SharedInstrumentComponent component, StatusEffectAddedEvent args)
+    {
+        if (args.Key == "Muted")
+            CloseMidiUi(uid);
+    }
+
+    /// <summary>
+    /// Almost a copy of Content.Server.Damage.ForceSay.DamageForceSaySystem.OnDamageChanged.
+    /// Done so because DamageForceSaySystem doesn't output an event, and my understanding is
+    /// that we don't want to change upstream code more than necessary to avoid merge conflicts
+    /// and maintenance overhead. It still reuses the values from DamageForceSayComponent, so
+    /// any tweaks to that will keep ForceSay consistent with singing interruptions.
+    /// </summary>
+    private void OnDamageChanged(EntityUid uid, SharedInstrumentComponent instrumentComponent, DamageChangedEvent args)
+    {
+        if (!TryComp<DamageForceSayComponent>(uid, out var component) ||
+            args.DamageDelta == null ||
+            !args.DamageIncreased ||
+            args.DamageDelta.GetTotal() < component.DamageThreshold ||
+            component.ValidDamageGroups == null)
+            return;
+
+        var totalApplicableDamage = FixedPoint2.Zero;
+        foreach (var (group, value) in args.DamageDelta.GetDamagePerGroup(ProtoMan))
+        {
+            if (!component.ValidDamageGroups.Contains(group))
+                continue;
+
+            totalApplicableDamage += value;
+        }
+
+        if (totalApplicableDamage >= component.DamageThreshold)
+            CloseMidiUi(uid);
+    }
+
+    /// <summary>
+    /// Prevent the player from opening the MIDI UI under some circumstances.
+    /// </summary>
+    private void OnInstrumentOpen(EntityUid uid, SingerComponent component, OpenUiActionEvent args)
+    {
+        // CanSpeak covers all reasons you can't talk, including being incapacitated
+        // (crit/dead), asleep, or for any reason mute inclding glimmer or a mime's vow.
+        // TODO why the fuck is any of this hardcoded?
+        var canNotSpeak = !_actionBlocker.CanSpeak(uid);
+        var zombified = TryComp<ZombieComponent>(uid, out var _);
+        var muzzled = _inventory.TryGetSlotEntity(uid, "mask", out var maskUid) &&
+                      TryComp<AddAccentClothingComponent>(maskUid, out var accent) &&
+                      accent.ReplacementPrototype == "mumble";
+
+        // Set this event as handled when the singer should be incapable of singing in order
+        // to stop the ActivatableUISystem event from opening the MIDI UI.
+        args.Handled = canNotSpeak || muzzled || zombified;
+
+        // Tell the user that they can not sing.
+        if (args.Handled)
+            _popup.PopupEntity(Loc.GetString("no-sing-while-no-speak"), uid, uid, PopupType.Medium);
+    }
+
+    public override void CloseMidiUi(EntityUid uid)
+    {
+        if (HasComp<ActiveInstrumentComponent>(uid) &&
+            TryComp<ActorComponent>(uid, out var actor))
+        {
+            _instrument.ToggleInstrumentUi(uid, actor.PlayerSession);
+        }
+    }
+}
diff --git a/Content.Server/Traits/BloodDeficiencyComponent.cs b/Content.Server/Traits/BloodDeficiencyComponent.cs
new file mode 100644
index 00000000000..616f60cd834
--- /dev/null
+++ b/Content.Server/Traits/BloodDeficiencyComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///     This is used for the Blood Deficiency trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class BloodDeficiencyComponent : Component
+{
+    // <summary>
+    //     How much reagent of blood should be removed in each update interval?
+    // </summary>
+    [DataField(required: true)]
+    public float BloodLossAmount;
+}
diff --git a/Content.Server/Traits/BloodDeficiencySystem.cs b/Content.Server/Traits/BloodDeficiencySystem.cs
new file mode 100644
index 00000000000..f1ae4909956
--- /dev/null
+++ b/Content.Server/Traits/BloodDeficiencySystem.cs
@@ -0,0 +1,23 @@
+using Content.Server.Body.Systems;
+using Content.Server.Body.Components;
+using Content.Shared.Damage;
+
+namespace Content.Server.Traits.Assorted;
+
+public sealed class BloodDeficiencySystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<BloodDeficiencyComponent, ComponentStartup>(OnStartup);
+    }
+
+    private void OnStartup(EntityUid uid, BloodDeficiencyComponent component, ComponentStartup args)
+    {
+        if (!TryComp<BloodstreamComponent>(uid, out var bloodstream))
+            return;
+
+        bloodstream.HasBloodDeficiency = true;
+        bloodstream.BloodDeficiencyLossAmount = component.BloodLossAmount;
+    }
+}
diff --git a/Content.Server/Traits/HemophiliaComponent.cs b/Content.Server/Traits/HemophiliaComponent.cs
new file mode 100644
index 00000000000..e8f1f57c6e5
--- /dev/null
+++ b/Content.Server/Traits/HemophiliaComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Damage;
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///   This is used for the Hemophilia trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class HemophiliaComponent : Component
+{
+    // <summary>
+    //   What the BleedReductionAmount should be multiplied by.
+    // </summary>
+    [DataField(required: true)]
+    public float BleedReductionModifier = 1f;
+
+    /// <summary>
+    ///   The damage increase from this trait.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageModifierSet DamageModifiers = default!;
+}
diff --git a/Content.Server/Traits/HemophiliaSystem.cs b/Content.Server/Traits/HemophiliaSystem.cs
new file mode 100644
index 00000000000..c70c7de37c0
--- /dev/null
+++ b/Content.Server/Traits/HemophiliaSystem.cs
@@ -0,0 +1,28 @@
+using Content.Server.Body.Systems;
+using Content.Server.Body.Components;
+using Content.Shared.Damage;
+
+namespace Content.Server.Traits.Assorted;
+
+public sealed class HemophiliaSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<HemophiliaComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<HemophiliaComponent, DamageModifyEvent>(OnDamageModify);
+    }
+
+    private void OnStartup(EntityUid uid, HemophiliaComponent component, ComponentStartup args)
+    {
+        if (!TryComp<BloodstreamComponent>(uid, out var bloodstream))
+            return;
+
+        bloodstream.BleedReductionAmount *= component.BleedReductionModifier;
+    }
+
+    private void OnDamageModify(EntityUid uid, HemophiliaComponent component, DamageModifyEvent args)
+    {
+        args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, component.DamageModifiers);
+    }
+}
diff --git a/Content.Server/Vampire/BloodSuckedComponent.cs b/Content.Server/Vampire/BloodSuckedComponent.cs
new file mode 100644
index 00000000000..d7e402cd98a
--- /dev/null
+++ b/Content.Server/Vampire/BloodSuckedComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Server.Vampiric
+{
+    /// <summary>
+    /// For entities who have been succed.
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class BloodSuckedComponent : Component
+    {}
+}
diff --git a/Content.Server/Vampire/BloodSuckerComponent.cs b/Content.Server/Vampire/BloodSuckerComponent.cs
new file mode 100644
index 00000000000..f5619d1cb49
--- /dev/null
+++ b/Content.Server/Vampire/BloodSuckerComponent.cs
@@ -0,0 +1,44 @@
+namespace Content.Server.Vampiric
+{
+    [RegisterComponent]
+    public sealed partial class BloodSuckerComponent : Component
+    {
+        /// <summary>
+        /// How much to succ each time we succ.
+        /// </summary>
+        [DataField("unitsToSucc")]
+        public float UnitsToSucc = 20f;
+
+        /// <summary>
+        /// The time (in seconds) that it takes to succ an entity.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public TimeSpan Delay = TimeSpan.FromSeconds(4);
+
+        // ***INJECT WHEN SUCC***
+
+        /// <summary>
+        /// Whether to inject chems into a chemstream when we suck something.
+        /// </summary>
+        [DataField("injectWhenSucc")]
+        public bool InjectWhenSucc = false;
+
+        /// <summary>
+        /// How many units of our injected chem to inject.
+        /// </summary>
+        [DataField("unitsToInject")]
+        public float UnitsToInject = 5;
+
+        /// <summary>
+        /// Which reagent to inject.
+        /// </summary>
+        [DataField("injectReagent")]
+        public string InjectReagent = "";
+
+        /// <summary>
+        /// Whether we need to web the thing up first...
+        /// </summary>
+        [DataField("webRequired")]
+        public bool WebRequired = false;
+    }
+}
diff --git a/Content.Server/Vampire/BloodSuckerSystem.cs b/Content.Server/Vampire/BloodSuckerSystem.cs
new file mode 100644
index 00000000000..a63334a8943
--- /dev/null
+++ b/Content.Server/Vampire/BloodSuckerSystem.cs
@@ -0,0 +1,213 @@
+using Content.Shared.Verbs;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Interaction;
+using Content.Shared.Inventory;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Vampiric;
+using Content.Server.Atmos.Components;
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Popups;
+using Content.Server.HealthExaminable;
+using Content.Server.DoAfter;
+using Content.Server.Nutrition.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Vampiric
+{
+    public sealed class BloodSuckerSystem : EntitySystem
+    {
+        [Dependency] private readonly BodySystem _bodySystem = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solutionSystem = default!;
+        [Dependency] private readonly PopupSystem _popups = default!;
+        [Dependency] private readonly DoAfterSystem _doAfter = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly StomachSystem _stomachSystem = default!;
+        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+        [Dependency] private readonly InventorySystem _inventorySystem = default!;
+        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<BloodSuckerComponent, GetVerbsEvent<InnateVerb>>(AddSuccVerb);
+            SubscribeLocalEvent<BloodSuckedComponent, HealthBeingExaminedEvent>(OnHealthExamined);
+            SubscribeLocalEvent<BloodSuckedComponent, DamageChangedEvent>(OnDamageChanged);
+            SubscribeLocalEvent<BloodSuckerComponent, BloodSuckDoAfterEvent>(OnDoAfter);
+        }
+
+        private void AddSuccVerb(EntityUid uid, BloodSuckerComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            if (args.User == args.Target)
+                return;
+            if (component.WebRequired)
+                return; // handled elsewhere
+            if (!TryComp<BloodstreamComponent>(args.Target, out var bloodstream))
+                return;
+            if (!args.CanAccess)
+                return;
+
+            InnateVerb verb = new()
+            {
+                Act = () =>
+                {
+                    StartSuccDoAfter(uid, args.Target, component, bloodstream); // start doafter
+                },
+                Text = Loc.GetString("action-name-suck-blood"),
+                Icon = new SpriteSpecifier.Texture(new ("/Textures/Nyanotrasen/Icons/verbiconfangs.png")),
+                Priority = 2
+            };
+            args.Verbs.Add(verb);
+        }
+
+        private void OnHealthExamined(EntityUid uid, BloodSuckedComponent component, HealthBeingExaminedEvent args)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkup(Loc.GetString("bloodsucked-health-examine", ("target", uid)));
+        }
+
+        private void OnDamageChanged(EntityUid uid, BloodSuckedComponent component, DamageChangedEvent args)
+        {
+            if (args.DamageIncreased)
+                return;
+
+            if (_prototypeManager.TryIndex<DamageGroupPrototype>("Brute", out var brute) && args.Damageable.Damage.TryGetDamageInGroup(brute, out var bruteTotal)
+                && _prototypeManager.TryIndex<DamageGroupPrototype>("Airloss", out var airloss) && args.Damageable.Damage.TryGetDamageInGroup(airloss, out var airlossTotal))
+            {
+                if (bruteTotal == 0 && airlossTotal == 0)
+                    RemComp<BloodSuckedComponent>(uid);
+            }
+        }
+
+        private void OnDoAfter(EntityUid uid, BloodSuckerComponent component, BloodSuckDoAfterEvent args)
+        {
+            if (args.Cancelled || args.Handled || args.Args.Target == null)
+                return;
+
+            args.Handled = TrySucc(uid, args.Args.Target.Value);
+        }
+
+        public void StartSuccDoAfter(EntityUid bloodsucker, EntityUid victim, BloodSuckerComponent? bloodSuckerComponent = null, BloodstreamComponent? stream = null, bool doChecks = true)
+        {
+            if (!Resolve(bloodsucker, ref bloodSuckerComponent))
+                return;
+
+            if (!Resolve(victim, ref stream))
+                return;
+
+            if (doChecks)
+            {
+                if (!_interactionSystem.InRangeUnobstructed(bloodsucker, victim))
+                {
+                    return;
+                }
+
+                if (_inventorySystem.TryGetSlotEntity(victim, "head", out var headUid) && HasComp<PressureProtectionComponent>(headUid))
+                {
+                    _popups.PopupEntity(Loc.GetString("bloodsucker-fail-helmet", ("helmet", headUid)), victim, bloodsucker, Shared.Popups.PopupType.Medium);
+                    return;
+                }
+
+                if (_inventorySystem.TryGetSlotEntity(bloodsucker, "mask", out var maskUid) &&
+                    EntityManager.TryGetComponent<IngestionBlockerComponent>(maskUid, out var blocker) &&
+                    blocker.Enabled)
+                {
+                    _popups.PopupEntity(Loc.GetString("bloodsucker-fail-mask", ("mask", maskUid)), victim, bloodsucker, Shared.Popups.PopupType.Medium);
+                    return;
+                }
+            }
+
+            if (stream.BloodReagent != "Blood")
+            {
+                _popups.PopupEntity(Loc.GetString("bloodsucker-fail-not-blood", ("target", victim)), victim, bloodsucker, Shared.Popups.PopupType.Medium);
+                return;
+            }
+
+            if (_solutionSystem.PercentFull(stream.Owner) != 0)
+                _popups.PopupEntity(Loc.GetString("bloodsucker-fail-no-blood", ("target", victim)), victim, bloodsucker, Shared.Popups.PopupType.Medium);
+
+            _popups.PopupEntity(Loc.GetString("bloodsucker-doafter-start-victim", ("sucker", bloodsucker)), victim, victim, Shared.Popups.PopupType.LargeCaution);
+            _popups.PopupEntity(Loc.GetString("bloodsucker-doafter-start", ("target", victim)), victim, bloodsucker, Shared.Popups.PopupType.Medium);
+
+            var ev = new BloodSuckDoAfterEvent();
+            var args = new DoAfterArgs(EntityManager, bloodsucker, bloodSuckerComponent.Delay, ev, bloodsucker, target: victim)
+            {
+                BreakOnTargetMove = true,
+                BreakOnUserMove = false,
+                DistanceThreshold = 2f,
+                NeedHand = false
+            };
+
+            _doAfter.TryStartDoAfter(args);
+        }
+
+        public bool TrySucc(EntityUid bloodsucker, EntityUid victim, BloodSuckerComponent? bloodsuckerComp = null)
+        {
+            // Is bloodsucker a bloodsucker?
+            if (!Resolve(bloodsucker, ref bloodsuckerComp))
+                return false;
+
+            // Does victim have a bloodstream?
+            if (!TryComp<BloodstreamComponent>(victim, out var bloodstream))
+                return false;
+
+            // No blood left, yikes.
+            if (_bloodstreamSystem.GetBloodLevelPercentage(victim, bloodstream) == 0.0f)
+                return false;
+
+            // Does bloodsucker have a stomach?
+            var stomachList = _bodySystem.GetBodyOrganComponents<StomachComponent>(bloodsucker);
+            if (stomachList.Count == 0)
+                return false;
+
+            if (!_solutionSystem.TryGetSolution(stomachList[0].Comp.Owner, StomachSystem.DefaultSolutionName, out var stomachSolution))
+                return false;
+
+            // Are we too full?
+
+            if (_solutionSystem.PercentFull(bloodsucker) >= 1)
+            {
+                _popups.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"), bloodsucker, bloodsucker, Shared.Popups.PopupType.MediumCaution);
+                return false;
+            }
+
+            _adminLogger.Add(Shared.Database.LogType.MeleeHit, Shared.Database.LogImpact.Medium, $"{ToPrettyString(bloodsucker):player} sucked blood from {ToPrettyString(victim):target}");
+
+            // All good, succ time.
+            _audio.PlayPvs("/Audio/Items/drink.ogg", bloodsucker);
+            _popups.PopupEntity(Loc.GetString("bloodsucker-blood-sucked-victim", ("sucker", bloodsucker)), victim, victim, Shared.Popups.PopupType.LargeCaution);
+            _popups.PopupEntity(Loc.GetString("bloodsucker-blood-sucked", ("target", victim)), bloodsucker, bloodsucker, Shared.Popups.PopupType.Medium);
+            EnsureComp<BloodSuckedComponent>(victim);
+
+            // Make everything actually ingest.
+            if (bloodstream.BloodSolution == null)
+                return false;
+
+            var temp = _solutionSystem.SplitSolution(bloodstream.BloodSolution.Value, bloodsuckerComp.UnitsToSucc);
+            _stomachSystem.TryTransferSolution(stomachList[0].Comp.Owner, temp, stomachList[0].Comp);
+
+            // Add a little pierce
+            DamageSpecifier damage = new();
+            damage.DamageDict.Add("Piercing", 1); // Slowly accumulate enough to gib after like half an hour
+
+            _damageableSystem.TryChangeDamage(victim, damage, true, true);
+
+            //I'm not porting the nocturine gland, this code is deprecated, and will be reworked at a later date.
+            //if (bloodsuckerComp.InjectWhenSucc && _solutionSystem.TryGetInjectableSolution(victim, out var injectable))
+            //{
+            //    _solutionSystem.TryAddReagent(victim, injectable, bloodsuckerComp.InjectReagent, bloodsuckerComp.UnitsToInject, out var acceptedQuantity);
+            //}
+            return true;
+        }
+
+        private record struct BloodSuckData()
+        {}
+    }
+}
diff --git a/Content.Server/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs b/Content.Server/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs
new file mode 100644
index 00000000000..1a3c9b1588a
--- /dev/null
+++ b/Content.Server/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs
@@ -0,0 +1,23 @@
+namespace Content.Server.Vampiric
+{
+    [RegisterComponent]
+    /// <summary>
+    /// Item that gives a bloodsucker injection glands (for poison, usually)
+    /// </summary>
+    public sealed partial class BloodSuckerGlandInjectorComponent : Component
+    {
+        public bool Used = false;
+
+        /// <summary>
+        /// How many units of our injected chem to inject.
+        /// </summary>
+        [DataField("unitsToInject")]
+        public float UnitsToInject = 5;
+
+        /// <summary>
+        /// Which reagent to inject.
+        /// </summary>
+        [DataField("injectReagent")]
+        public string InjectReagent = "";
+    }
+}
diff --git a/Content.Server/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs b/Content.Server/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs
new file mode 100644
index 00000000000..d2a92f24be6
--- /dev/null
+++ b/Content.Server/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.Popups;
+using Content.Shared.Interaction;
+
+namespace Content.Server.Vampiric
+{
+    public sealed class BloodSuckerGlandInjectorSystem : EntitySystem
+    {
+        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<BloodSuckerGlandInjectorComponent, AfterInteractEvent>(OnAfterInteract);
+        }
+
+        private void OnAfterInteract(EntityUid uid, BloodSuckerGlandInjectorComponent component, AfterInteractEvent args)
+        {
+            if (component.Used)
+                return;
+
+            if (!args.CanReach)
+                return;
+
+            if (!TryComp<BloodSuckerComponent>(args.Target, out var bloodSuckerComponent))
+                return;
+
+            // They already have one.
+            if (bloodSuckerComponent.InjectWhenSucc)
+                return;
+
+            bloodSuckerComponent.InjectWhenSucc = true;
+            bloodSuckerComponent.InjectReagent = component.InjectReagent;
+            bloodSuckerComponent.UnitsToInject = component.UnitsToInject;
+            component.Used = true;
+            QueueDel(uid);
+
+            _popupSystem.PopupEntity(Loc.GetString("bloodsucker-glands-throb"), args.Target.Value, args.Target.Value);
+        }
+    }
+}
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 7c9aed188fe..36fa69313e3 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -49,7 +49,6 @@ public override void Initialize()
             SubscribeLocalEvent<VendingMachineComponent, GotEmaggedEvent>(OnEmagged);
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamage);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
-            SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse);
 
             SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
 
@@ -496,15 +495,5 @@ private void OnPriceCalculation(EntityUid uid, VendingMachineRestockComponent co
 
             args.Price += priceSets.Max();
         }
-
-        private void OnEmpPulse(EntityUid uid, VendingMachineComponent component, ref EmpPulseEvent args)
-        {
-            if (!component.Broken && this.IsPowered(uid, EntityManager))
-            {
-                args.Affected = true;
-                args.Disabled = true;
-                component.NextEmpEject = _timing.CurTime;
-            }
-        }
     }
 }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 22840cde8f5..d63dd093eec 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -57,6 +57,9 @@ private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component,
             return;
 
         _damageExamine.AddDamageExamine(args.Message, damageSpec, Loc.GetString("damage-melee"));
+
+        if (damageSpec * component.HeavyDamageBaseModifier != damageSpec)
+            _damageExamine.AddDamageExamine(args.Message, damageSpec * component.HeavyDamageBaseModifier, Loc.GetString("damage-melee-heavy"));
     }
 
     protected override bool ArcRaySuccessful(EntityUid targetUid, Vector2 position, Angle angle, Angle arcWidth, float range, MapId mapId,
@@ -132,7 +135,7 @@ protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         if (attemptEvent.Cancelled)
             return false;
 
-        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode) * _contests.MassContest(user, target);
+        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode);
 
         if (_random.Prob(chance))
         {
@@ -212,7 +215,11 @@ private float CalculateDisarmChance(EntityUid disarmer, EntityUid disarmed, Enti
             chance += malus.Malus;
         }
 
-        return Math.Clamp(chance, 0f, 1f);
+        return Math.Clamp(chance
+                        * _contests.MassContest(disarmer, disarmed, false, 0.5f)
+                        * _contests.StaminaContest(disarmer, disarmed, false, 0.5f)
+                        * _contests.HealthContest(disarmer, disarmed, false, 0.5f),
+                        0f, 1f);
     }
 
     public override void DoLunge(EntityUid user, EntityUid weapon, Angle angle, Vector2 localPos, string? animation, bool predicted = true)
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..32aa08c4664 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
@@ -142,7 +144,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
             melee.AltDisarm = false;
             melee.Range = 1.2f;
             melee.Angle = 0.0f;
-            melee.HitSound = zombiecomp.BiteSound;
+            melee.SoundHit = zombiecomp.BiteSound;
 
             if (mobState.CurrentState == MobState.Alive)
             {
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index 417b77855cc..c994d83d9c5 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -89,6 +89,9 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "Mail", // Nyanotrasen - Mail, see Resources/Prototypes/Nyanotrasen/Access/cargo.yml
         "Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
         "Zookeeper",  // DeltaV - Add Zookeeper access
+        "ChiefJustice",  // DeltaV - Add Chief Justice access
+        "Justice",  // DeltaV - Add Justice access
+        "Prosecutor", // Delta V - Add Prosecutor access
     };
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/DispelPowerActionEvent.cs b/Content.Shared/Actions/Events/DispelPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/DispelPowerActionEvent.cs
rename to Content.Shared/Actions/Events/DispelPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/EatMouseActionEvent.cs b/Content.Shared/Actions/Events/EatMouseActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/EatMouseActionEvent.cs
rename to Content.Shared/Actions/Events/EatMouseActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs b/Content.Shared/Actions/Events/HairballActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs
rename to Content.Shared/Actions/Events/HairballActionEvent.cs
diff --git a/Content.Shared/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Actions/Events/MassSleepPowerActionEvent.cs
new file mode 100644
index 00000000000..6666ee48d6c
--- /dev/null
+++ b/Content.Shared/Actions/Events/MassSleepPowerActionEvent.cs
@@ -0,0 +1,2 @@
+namespace Content.Shared.Actions.Events;
+public sealed partial class MassSleepPowerActionEvent : WorldTargetActionEvent {}
diff --git a/Content.Shared/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Actions/Events/MetapsionicPowerActionEvent.cs
new file mode 100644
index 00000000000..b28801efe74
--- /dev/null
+++ b/Content.Shared/Actions/Events/MetapsionicPowerActionEvent.cs
@@ -0,0 +1,2 @@
+namespace Content.Shared.Actions.Events;
+public sealed partial class MetapsionicPowerActionEvent : InstantActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MindSwapPowerActionEvent.cs b/Content.Shared/Actions/Events/MindSwapPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/MindSwapPowerActionEvent.cs
rename to Content.Shared/Actions/Events/MindSwapPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/NoosphericZapPowerActionEvent.cs b/Content.Shared/Actions/Events/NoosphericZapPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/NoosphericZapPowerActionEvent.cs
rename to Content.Shared/Actions/Events/NoosphericZapPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PsionicInvisibilityPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicInvisibilityPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/PsionicInvisibilityPowerActionEvent.cs
rename to Content.Shared/Actions/Events/PsionicInvisibilityPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PsionicRegenerationPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicRegenerationPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/PsionicRegenerationPowerActionEvent.cs
rename to Content.Shared/Actions/Events/PsionicRegenerationPowerActionEvent.cs
diff --git a/Content.Shared/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Actions/Events/PyrokinesisPowerActionEvent.cs
new file mode 100644
index 00000000000..896ec0bb63d
--- /dev/null
+++ b/Content.Shared/Actions/Events/PyrokinesisPowerActionEvent.cs
@@ -0,0 +1,2 @@
+namespace Content.Shared.Actions.Events;
+public sealed partial class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs b/Content.Shared/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs
rename to Content.Shared/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/TelegnosisPowerActionEvent.cs b/Content.Shared/Actions/Events/TelegnosisPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/TelegnosisPowerActionEvent.cs
rename to Content.Shared/Actions/Events/TelegnosisPowerActionEvent.cs
diff --git a/Content.Shared/Arachne/ArachneComponent.cs b/Content.Shared/Arachne/ArachneComponent.cs
new file mode 100644
index 00000000000..04c369cc456
--- /dev/null
+++ b/Content.Shared/Arachne/ArachneComponent.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Arachne
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class ArachneComponent : Component
+    {
+        [DataField("cocoonDelay")]
+        public float CocoonDelay = 12f;
+
+        [DataField("cocoonKnockdownMultiplier")]
+        public float CocoonKnockdownMultiplier = 0.5f;
+
+        /// <summary>
+        /// Blood reagent required to web up a mob.
+        /// </summary>
+
+        [DataField("webBloodReagent")]
+        public string WebBloodReagent = "Blood";
+    }
+}
diff --git a/Content.Shared/Arachne/Events.cs b/Content.Shared/Arachne/Events.cs
new file mode 100644
index 00000000000..02001286ac6
--- /dev/null
+++ b/Content.Shared/Arachne/Events.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+using Content.Shared.DoAfter;
+
+namespace Content.Shared.Arachne
+{
+    [Serializable, NetSerializable]
+    public sealed partial class ArachneCocoonDoAfterEvent : SimpleDoAfterEvent
+    {
+    }
+}
diff --git a/Content.Shared/Arachne/WebComponent.cs b/Content.Shared/Arachne/WebComponent.cs
new file mode 100644
index 00000000000..c8284f39434
--- /dev/null
+++ b/Content.Shared/Arachne/WebComponent.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Arachne
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class WebComponent : Component
+    {}
+}
diff --git a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
index 242686e78bd..b3c44a1fb6f 100644
--- a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
+++ b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
@@ -1,29 +1,86 @@
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+using Content.Shared.Cuffs.Components;
 
 namespace Content.Shared.Atmos.Rotting;
 
 public abstract class SharedRottingSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+
     public const int MaxStages = 3;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<PerishableComponent, MapInitEvent>(OnPerishableMapInit);
+        SubscribeLocalEvent<PerishableComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<PerishableComponent, ExaminedEvent>(OnPerishableExamined);
+
+        SubscribeLocalEvent<RottingComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<RottingComponent, MobStateChangedEvent>(OnRottingMobStateChanged);
+        SubscribeLocalEvent<RottingComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<RottingComponent, ExaminedEvent>(OnExamined);
     }
 
-    /// <summary>
-    /// Return the rot stage, usually from 0 to 2 inclusive.
-    /// </summary>
-    public int RotStage(EntityUid uid, RottingComponent? comp = null, PerishableComponent? perishable = null)
+    private void OnPerishableMapInit(EntityUid uid, PerishableComponent component, MapInitEvent args)
     {
-        if (!Resolve(uid, ref comp, ref perishable))
-            return 0;
+        component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
+    }
 
-        return (int) (comp.TotalRotTime.TotalSeconds / perishable.RotAfter.TotalSeconds);
+    private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
+    {
+        if (args.NewMobState != MobState.Dead && args.OldMobState != MobState.Dead)
+            return;
+
+        if (HasComp<RottingComponent>(uid))
+            return;
+
+        component.RotAccumulator = TimeSpan.Zero;
+        component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
+    }
+
+    private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref ExaminedEvent args)
+    {
+        int stage = PerishStage(perishable, MaxStages);
+        if (stage < 1 || stage > MaxStages)
+        {
+            // We dont push an examined string if it hasen't started "perishing" or it's already rotting
+            return;
+        }
+
+        var isMob = HasComp<MobStateComponent>(perishable);
+        var description = "perishable-" + stage + (!isMob ? "-nonmob" : string.Empty);
+        args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
+    }
+
+    private void OnShutdown(EntityUid uid, RottingComponent component, ComponentShutdown args)
+    {
+        if (TryComp<PerishableComponent>(uid, out var perishable))
+        {
+            perishable.RotNextUpdate = TimeSpan.Zero;
+        }
+    }
+
+    private void OnRottingMobStateChanged(EntityUid uid, RottingComponent component, MobStateChangedEvent args)
+    {
+        if (args.NewMobState == MobState.Dead)
+            return;
+        RemCompDeferred(uid, component);
+    }
+
+    private void OnRejuvenate(EntityUid uid, RottingComponent component, RejuvenateEvent args)
+    {
+        RemCompDeferred<RottingComponent>(uid);
     }
 
     private void OnExamined(EntityUid uid, RottingComponent component, ExaminedEvent args)
@@ -42,6 +99,55 @@ private void OnExamined(EntityUid uid, RottingComponent component, ExaminedEvent
         args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(uid, EntityManager))));
     }
 
+    /// <summary>
+    /// Return an integer from 0 to maxStage representing how close to rotting an entity is. Used to
+    /// generate examine messages for items that are starting to rot.
+    /// </summary>
+    public int PerishStage(Entity<PerishableComponent> perishable, int maxStages)
+    {
+        if (perishable.Comp.RotAfter.TotalSeconds == 0 || perishable.Comp.RotAccumulator.TotalSeconds == 0)
+            return 0;
+        return (int)(1 + maxStages * perishable.Comp.RotAccumulator.TotalSeconds / perishable.Comp.RotAfter.TotalSeconds);
+    }
+
+    public bool IsRotProgressing(EntityUid uid, PerishableComponent? perishable)
+    {
+        // things don't perish by default.
+        if (!Resolve(uid, ref perishable, false))
+            return false;
+
+        // only dead things or inanimate objects can rot
+        if (TryComp<MobStateComponent>(uid, out var mobState) && !_mobState.IsDead(uid, mobState))
+            return false;
+
+        if (_container.TryGetOuterContainer(uid, Transform(uid), out var container) &&
+            HasComp<AntiRottingContainerComponent>(container.Owner))
+        {
+            return false;
+        }
+
+        if (TryComp<CuffableComponent>(uid, out var cuffed) && cuffed.CuffedHandCount > 0)
+        {
+            if (TryComp<HandcuffComponent>(cuffed.LastAddedCuffs, out var cuffcomp))
+            {
+                if (cuffcomp.NoRot)
+                {
+                    return false;
+                }
+            }
+        }
+
+        var ev = new IsRottingEvent();
+        RaiseLocalEvent(uid, ref ev);
+
+        return !ev.Handled;
+    }
+
+    public bool IsRotten(EntityUid uid, RottingComponent? rotting = null)
+    {
+        return Resolve(uid, ref rotting, false);
+    }
+
     public void ReduceAccumulator(EntityUid uid, TimeSpan time)
     {
         if (!TryComp<PerishableComponent>(uid, out var perishable))
@@ -63,4 +169,15 @@ public void ReduceAccumulator(EntityUid uid, TimeSpan time)
         else
             rotting.TotalRotTime = total - perishable.RotAfter;
     }
+
+    /// <summary>
+    /// Return the rot stage, usually from 0 to 2 inclusive.
+    /// </summary>
+    public int RotStage(EntityUid uid, RottingComponent? comp = null, PerishableComponent? perishable = null)
+    {
+        if (!Resolve(uid, ref comp, ref perishable))
+            return 0;
+
+        return (int) (comp.TotalRotTime.TotalSeconds / perishable.RotAfter.TotalSeconds);
+    }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 1e06c6bef44..21de8620f7c 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -361,7 +361,7 @@ public static readonly CVarDef<bool>
         ///     How many traits a character can have at most.
         /// </summary>
         public static readonly CVarDef<int> GameTraitsMax =
-            CVarDef.Create("game.traits_max", 7, CVar.REPLICATED);
+            CVarDef.Create("game.traits_max", 10, CVar.REPLICATED);
 
         /// <summary>
         ///     How many points a character should start with.
@@ -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.
@@ -2291,6 +2291,55 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<float> StationGoalsChance =
             CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
+            
+
+        #region CPR System
+        /// <summary>
+        ///     Controls whether the entire CPR system runs. When false, nobody can perform CPR. You should probably remove the trait too
+        ///     if you are wishing to permanently disable the system on your server.
+        /// </summary>
+        public static readonly CVarDef<bool> EnableCPR =
+            CVarDef.Create("cpr.enable", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles whether or not CPR reduces rot timers(As an abstraction of delaying brain death, the IRL actual purpose of CPR)
+        /// </summary>
+        public static readonly CVarDef<bool> CPRReducesRot =
+            CVarDef.Create("cpr.reduces_rot", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles whether or not CPR heals airloss, included for completeness sake. I'm not going to stop you if your intention is to make CPR do nothing.
+        ///     I guess it might be funny to troll your players with? I won't judge.
+        /// </summary>
+        public static readonly CVarDef<bool> CPRHealsAirloss =
+            CVarDef.Create("cpr.heals_airloss", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     The chance for a patient to be resuscitated when CPR is successfully performed.
+        ///     Setting this above 0 isn't very realistic, but people who see CPR in movies and TV will expect CPR to work this way.
+        /// </summary>
+        public static readonly CVarDef<float> CPRResuscitationChance =
+            CVarDef.Create("cpr.resuscitation_chance", 0.05f, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     By default, CPR reduces rot timers by an amount of seconds equal to the time spent performing CPR. This is an optional multiplier that can increase or decrease the amount
+        ///     of rot reduction. Set it to 2 for if you want 3 seconds of CPR to reduce 6 seconds of rot.
+        /// </summary>
+        /// <remarks>
+        ///     If you're wondering why there isn't a CVar for setting the duration of the doafter, that's because it's not actually possible to have a timespan in cvar form
+        ///     Curiously, it's also not possible for **shared** systems to set variable timespans. Which is where this system lives.
+        /// </remarks>
+        public static readonly CVarDef<float> CPRRotReductionMultiplier =
+            CVarDef.Create("cpr.rot_reduction_multiplier", 1f, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     By default, CPR heals airloss by 1 point for every second spent performing CPR. Just like above, this directly multiplies the healing amount.
+        ///     Set it to 2 to get 6 points of airloss healing for every 3 seconds of CPR.
+        /// </summary>
+        public static readonly CVarDef<float> CPRAirlossReductionMultiplier =
+            CVarDef.Create("cpr.airloss_reduction_multiplier", 1f, CVar.REPLICATED | CVar.SERVER);
+            
+        #endregion
 
         #region Contests System
 
diff --git a/Content.Shared/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs
rename to Content.Shared/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs
diff --git a/Content.Shared/Nyanotrasen/Chapel/SacrificeDoAfterEvent.cs b/Content.Shared/Chapel/SacrificeDoAfterEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Chapel/SacrificeDoAfterEvent.cs
rename to Content.Shared/Chapel/SacrificeDoAfterEvent.cs
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 8f6e8046aa4..521f5ace99d 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
+using Content.Shared.Traits.Assorted.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics;
@@ -216,7 +217,11 @@ public bool TryClimb(
         if (ev.Cancelled)
             return false;
 
-        var args = new DoAfterArgs(EntityManager, user, comp.ClimbDelay, new ClimbDoAfterEvent(),
+        var climbDelay = comp.ClimbDelay;
+        if (user == entityToMove && TryComp<ClimbDelayModifierComponent>(user, out var delayModifier))
+            climbDelay *= delayModifier.ClimbDelayMultiplier;
+
+        var args = new DoAfterArgs(EntityManager, user, climbDelay, new ClimbDoAfterEvent(),
             entityToMove,
             target: climbable,
             used: entityToMove)
diff --git a/Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs b/Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs
new file mode 100644
index 00000000000..095b0daf384
--- /dev/null
+++ b/Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs
@@ -0,0 +1,35 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+///   Indicates that the clothing entity emits sound when it moves.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmitsSoundOnMoveComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true), AutoNetworkedField]
+    public SoundSpecifier SoundCollection = default!;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("requiresGravity"), AutoNetworkedField]
+    public bool RequiresGravity = true;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public EntityCoordinates LastPosition = EntityCoordinates.Invalid;
+
+    /// <summary>
+    ///   The distance moved since the played sound.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float SoundDistance = 0f;
+
+    /// <summary>
+    ///   Whether this item is equipped in a inventory item slot.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public bool IsSlotValid = true;
+}
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 087e2ecedab..bef4e46e963 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -28,6 +28,10 @@ public abstract class ClothingSystem : EntitySystem
     [ValidatePrototypeId<TagPrototype>]
     private const string NoseTag = "HidesNose";
 
+    [ValidatePrototypeId<TagPrototype>]
+
+    private const string BeardTag = "HidesBeard";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -65,11 +69,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;
 
@@ -106,7 +105,7 @@ private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, st
         {
             if (_tagSystem.HasTag(item, tag))
             {
-                if (tag == NoseTag) //Special check needs to be made for NoseTag, due to masks being toggleable
+                if (tag == NoseTag || tag == BeardTag) // Special check for NoseTag or BeardTag, due to masks being toggleable
                 {
                     if (TryComp(item, out MaskComponent? mask) && TryComp(item, out ClothingComponent? clothing))
                     {
@@ -139,6 +138,8 @@ protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component,
             ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Hair, HairTag);
         if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, NoseTag))
             ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Snout, NoseTag);
+        if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, BeardTag))
+            ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.FacialHair, BeardTag);
     }
 
     protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent component, GotUnequippedEvent args)
@@ -148,6 +149,8 @@ protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent componen
             ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Hair, HairTag);
         if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, NoseTag))
             ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Snout, NoseTag);
+        if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, BeardTag))
+            ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.FacialHair, BeardTag);
     }
 
     private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args)
@@ -166,6 +169,7 @@ private void OnMaskToggled(Entity<ClothingComponent> ent, ref ItemMaskToggledEve
         //TODO: sprites for 'pulled down' state. defaults to invisible due to no sprite with this prefix
         SetEquippedPrefix(ent, args.IsToggled ? args.equippedPrefix : null, ent);
         ToggleVisualLayer(args.Wearer, HumanoidVisualLayers.Snout, NoseTag);
+        ToggleVisualLayer(args.Wearer, HumanoidVisualLayers.FacialHair, BeardTag);
     }
 
     private void OnPickedUp(Entity<ClothingComponent> ent, ref GettingPickedUpAttemptEvent args)
diff --git a/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs
new file mode 100644
index 00000000000..3224b5bca32
--- /dev/null
+++ b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs
@@ -0,0 +1,96 @@
+using System.Numerics;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Gravity;
+using Content.Shared.Inventory;
+using Content.Shared.Inventory.Events;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Movement.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Clothing.Systems;
+
+public sealed class EmitsSoundOnMoveSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedMapSystem _grid = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private EntityQuery<InputMoverComponent> _moverQuery;
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private EntityQuery<ClothingComponent> _clothingQuery;
+
+    public override void Initialize()
+    {
+        _moverQuery = GetEntityQuery<InputMoverComponent>();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        _clothingQuery = GetEntityQuery<ClothingComponent>();
+
+        SubscribeLocalEvent<EmitsSoundOnMoveComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<EmitsSoundOnMoveComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEquipped(EntityUid uid, EmitsSoundOnMoveComponent component, GotEquippedEvent args)
+    {
+        component.IsSlotValid = !args.SlotFlags.HasFlag(SlotFlags.POCKET);
+    }
+
+    private void OnUnequipped(EntityUid uid, EmitsSoundOnMoveComponent component, GotUnequippedEvent args)
+    {
+        component.IsSlotValid = true;
+    }
+
+    public override void Update(float frameTime)
+    {
+        var query = EntityQueryEnumerator<EmitsSoundOnMoveComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            UpdateSound(uid, comp);
+        }
+        query.Dispose();
+    }
+
+    private void UpdateSound(EntityUid uid, EmitsSoundOnMoveComponent component)
+    {
+        if (!_physicsQuery.TryGetComponent(uid, out var physics))
+            return;
+
+        // Space does not transmit sound
+        if (Transform(uid).GridUid == null)
+            return;
+
+        if (component.RequiresGravity && _gravity.IsWeightless(uid, physics, Transform(uid)))
+            return;
+
+        var parent = Transform(uid).ParentUid;
+
+        var isWorn = parent is { Valid: true } &&
+                     _clothingQuery.TryGetComponent(uid, out var clothing)
+                     && clothing.InSlot != null
+                     && component.IsSlotValid;
+        // If this entity is worn by another entity, use that entity's coordinates
+        var coordinates = isWorn ? Transform(parent).Coordinates : Transform(uid).Coordinates;
+        var distanceNeeded = (isWorn && _moverQuery.TryGetComponent(parent, out var mover) && mover.Sprinting)
+            ? 1.5f // The parent is a mob that is currently sprinting
+            : 2f; // The parent is not a mob or is not sprinting
+
+        if (!coordinates.TryDistance(EntityManager, component.LastPosition, out var distance) || distance > distanceNeeded)
+            component.SoundDistance = distanceNeeded;
+        else
+            component.SoundDistance += distance;
+
+        component.LastPosition = coordinates;
+        if (component.SoundDistance < distanceNeeded)
+            return;
+        component.SoundDistance -= distanceNeeded;
+
+        var sound = component.SoundCollection;
+        var audioParams = sound.Params
+            .WithVolume(sound.Params.Volume)
+            .WithVariation(sound.Params.Variation ?? 0f);
+
+        _audio.PlayPredicted(sound, uid, uid, audioParams);
+    }
+}
diff --git a/Content.Shared/Damage/Events/StaminaMeleeHitEvent.cs b/Content.Shared/Damage/Events/TakeStaminaDamageEvent.cs
similarity index 67%
rename from Content.Shared/Damage/Events/StaminaMeleeHitEvent.cs
rename to Content.Shared/Damage/Events/TakeStaminaDamageEvent.cs
index c5ed0ddb602..6fca9dc2ef3 100644
--- a/Content.Shared/Damage/Events/StaminaMeleeHitEvent.cs
+++ b/Content.Shared/Damage/Events/TakeStaminaDamageEvent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Damage.Components;
-using Robust.Shared.Collections;
+using Content.Shared.Inventory;
 
 namespace Content.Shared.Damage.Events;
 
@@ -7,12 +7,14 @@ namespace Content.Shared.Damage.Events;
 /// The components in the list are going to be hit,
 /// give opportunities to change the damage or other stuff.
 /// </summary>
-public sealed class StaminaMeleeHitEvent : HandledEntityEventArgs
+public sealed class TakeStaminaDamageEvent : HandledEntityEventArgs, IInventoryRelayEvent
 {
+    public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET;
+
     /// <summary>
     /// List of hit stamina components.
     /// </summary>
-    public List<(EntityUid Entity, StaminaComponent Component)> HitList;
+    public EntityUid Target;
 
     /// <summary>
     /// The multiplier. Generally, try to use *= or /= instead of overwriting.
@@ -24,8 +26,8 @@ public sealed class StaminaMeleeHitEvent : HandledEntityEventArgs
     /// </summary>
     public float FlatModifier = 0;
 
-    public StaminaMeleeHitEvent(List<(EntityUid Entity, StaminaComponent Component)> hitList)
+    public TakeStaminaDamageEvent(EntityUid target)
     {
-        HitList = hitList;
+        Target = target;
     }
 }
diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index de5338615ee..54a88205b2d 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -166,20 +166,20 @@ private void OnMeleeHit(EntityUid uid, StaminaDamageOnHitComponent component, Me
             toHit.Add((ent, stam));
         }
 
-        var hitEvent = new StaminaMeleeHitEvent(toHit);
-        RaiseLocalEvent(uid, hitEvent);
+        foreach (var (ent, comp) in toHit)
+        {
+            var hitEvent = new TakeStaminaDamageEvent(ent);
+            RaiseLocalEvent(uid, hitEvent);
 
-        if (hitEvent.Handled)
-            return;
+            if (hitEvent.Handled)
+                return;
 
-        var damage = component.Damage;
+            var damage = component.Damage;
 
-        damage *= hitEvent.Multiplier;
+            damage *= hitEvent.Multiplier;
 
-        damage += hitEvent.FlatModifier;
+            damage += hitEvent.FlatModifier;
 
-        foreach (var (ent, comp) in toHit)
-        {
             TakeStaminaDamage(ent, damage / toHit.Count, comp, source: args.User, with: args.Weapon, sound: component.Sound);
         }
     }
@@ -204,12 +204,27 @@ private void OnThrowHit(EntityUid uid, StaminaDamageOnCollideComponent component
 
     private void OnCollide(EntityUid uid, StaminaDamageOnCollideComponent component, EntityUid target)
     {
+        if (!TryComp<StaminaComponent>(target, out var stamComp))
+            return;
+
         var ev = new StaminaDamageOnHitAttemptEvent();
         RaiseLocalEvent(uid, ref ev);
         if (ev.Cancelled)
             return;
 
-        TakeStaminaDamage(target, component.Damage, source: uid, sound: component.Sound);
+        var hitEvent = new TakeStaminaDamageEvent(target);
+        RaiseLocalEvent(target, hitEvent);
+
+        if (hitEvent.Handled)
+            return;
+
+        var damage = component.Damage;
+
+        damage *= hitEvent.Multiplier;
+
+        damage += hitEvent.FlatModifier;
+
+        TakeStaminaDamage(target, damage, source: uid, sound: component.Sound);
     }
 
     private void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null)
@@ -245,7 +260,8 @@ public bool TryTakeStamina(EntityUid uid, float value, StaminaComponent? compone
     public void TakeStaminaDamage(EntityUid uid, float value, StaminaComponent? component = null,
         EntityUid? source = null, EntityUid? with = null, bool visual = true, SoundSpecifier? sound = null)
     {
-        if (!Resolve(uid, ref component, false))
+        if (!Resolve(uid, ref component, false)
+            || value == 0)
             return;
 
         var ev = new BeforeStaminaDamageEvent(value);
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/DeltaV/Harpy/HarpySingerComponent.cs b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs
deleted file mode 100644
index f2edeeb8726..00000000000
--- a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.DeltaV.Harpy
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class HarpySingerComponent : Component
-    {
-        [DataField("midiActionId", serverOnly: true,
-            customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MidiActionId = "ActionHarpyPlayMidi";
-
-        [DataField("midiAction", serverOnly: true)] // server only, as it uses a server-BUI event !type
-        public EntityUid? MidiAction;
-    }
-}
diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs
deleted file mode 100644
index 50e8b6302c0..00000000000
--- a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Actions;
-
-namespace Content.Shared.DeltaV.Harpy
-{
-    public class HarpySingerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<HarpySingerComponent, ComponentStartup>(OnStartup);
-            SubscribeLocalEvent<HarpySingerComponent, ComponentShutdown>(OnShutdown);
-        }
-
-        private void OnStartup(EntityUid uid, HarpySingerComponent component, ComponentStartup args)
-        {
-            _actionsSystem.AddAction(uid, ref component.MidiAction, component.MidiActionId);
-        }
-
-        private void OnShutdown(EntityUid uid, HarpySingerComponent component, ComponentShutdown args)
-        {
-            _actionsSystem.RemoveAction(uid, component.MidiAction);
-        }
-    }
-}
-
diff --git a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs b/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs
index f75fcee8d42..edab8530228 100644
--- a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs
+++ b/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs
@@ -16,11 +16,11 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<HarpySingerComponent, DidEquipEvent>(OnDidEquipEvent);
-        SubscribeLocalEvent<HarpySingerComponent, DidUnequipEvent>(OnDidUnequipEvent);
+        SubscribeLocalEvent<Traits.Assorted.Components.SingerComponent, DidEquipEvent>(OnDidEquipEvent);
+        SubscribeLocalEvent<Traits.Assorted.Components.SingerComponent, DidUnequipEvent>(OnDidUnequipEvent);
     }
 
-    private void OnDidEquipEvent(EntityUid uid, HarpySingerComponent component, DidEquipEvent args)
+    private void OnDidEquipEvent(EntityUid uid, Traits.Assorted.Components.SingerComponent component, DidEquipEvent args)
     {
         if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, HarpyWingsTag))
         {
@@ -29,7 +29,7 @@ private void OnDidEquipEvent(EntityUid uid, HarpySingerComponent component, DidE
         }
     }
 
-    private void OnDidUnequipEvent(EntityUid uid, HarpySingerComponent component, DidUnequipEvent args)
+    private void OnDidUnequipEvent(EntityUid uid, Traits.Assorted.Components.SingerComponent component, DidUnequipEvent args)
     {
         if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, HarpyWingsTag))
         {
diff --git a/Content.Shared/Flash/FlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
index c4f8074ceaf..c3beb9b23fc 100644
--- a/Content.Shared/Flash/FlashableComponent.cs
+++ b/Content.Shared/Flash/FlashableComponent.cs
@@ -10,6 +10,23 @@ public sealed partial class FlashableComponent : Component
         public float Duration;
         public TimeSpan LastFlash;
 
+        // <summary>
+        //   Chance to get EyeDamage on flash
+        // </summary>
+        [DataField]
+        public float EyeDamageChance;
+
+        // <summary>
+        //   How many EyeDamage when flashed? (If EyeDamageChance check passed)
+        // </summary>
+        [DataField]
+        public int EyeDamage;
+        
+        //   How much to modify the duration of flashes against this entity.
+        // </summary>
+        [DataField]
+        public float DurationMultiplier = 1f;
+
         [DataField]
         public CollisionGroup CollisionGroup = CollisionGroup.Opaque;
 
@@ -21,11 +38,17 @@ public sealed class FlashableComponentState : ComponentState
     {
         public float Duration { get; }
         public TimeSpan Time { get; }
+        public float EyeDamageChance { get; }
+        public int EyeDamage { get; }
+        public float DurationMultiplier { get; }
 
-        public FlashableComponentState(float duration, TimeSpan time)
+        public FlashableComponentState(float duration, TimeSpan time, float eyeDamageChance, int eyeDamage, float durationMultiplier)
         {
             Duration = duration;
             Time = time;
+            EyeDamageChance = eyeDamageChance;
+            EyeDamage = eyeDamage;
+            DurationMultiplier = durationMultiplier;
         }
     }
 
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 16fdbfc2f3e..2646ae5e695 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -13,7 +13,7 @@ public override void Initialize()
 
         private static void OnFlashableGetState(EntityUid uid, FlashableComponent component, ref ComponentGetState args)
         {
-            args.State = new FlashableComponentState(component.Duration, component.LastFlash);
+            args.State = new FlashableComponentState(component.Duration, component.LastFlash, component.EyeDamageChance, component.EyeDamage, component.DurationMultiplier);
         }
     }
 }
diff --git a/Content.Shared/Forensics/Events.cs b/Content.Shared/Forensics/Events.cs
index 7300b78d76b..7f85c35ad02 100644
--- a/Content.Shared/Forensics/Events.cs
+++ b/Content.Shared/Forensics/Events.cs
@@ -11,7 +11,7 @@ public sealed partial class ForensicScannerDoAfterEvent : SimpleDoAfterEvent
 [Serializable, NetSerializable]
 public sealed partial class ForensicPadDoAfterEvent : DoAfterEvent
 {
-    [DataField("sample", required: true)] public  string Sample = default!;
+    [DataField("sample", required: true)] public string Sample = default!;
 
     private ForensicPadDoAfterEvent()
     {
@@ -25,6 +25,9 @@ public ForensicPadDoAfterEvent(string sample)
     public override DoAfterEvent Clone() => this;
 }
 
+[Serializable, NetSerializable]
+public sealed partial class ScentTrackerDoAfterEvent : SimpleDoAfterEvent { }
+
 [Serializable, NetSerializable]
 public sealed partial class CleanForensicsDoAfterEvent : SimpleDoAfterEvent
 {
diff --git a/Content.Server/Forensics/Components/ForensicsComponent.cs b/Content.Shared/Forensics/ForensicsComponent.cs
similarity index 56%
rename from Content.Server/Forensics/Components/ForensicsComponent.cs
rename to Content.Shared/Forensics/ForensicsComponent.cs
index e4579c5f3aa..8c5be03603e 100644
--- a/Content.Server/Forensics/Components/ForensicsComponent.cs
+++ b/Content.Shared/Forensics/ForensicsComponent.cs
@@ -1,18 +1,23 @@
-namespace Content.Server.Forensics
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Forensics
 {
-    [RegisterComponent]
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
     public sealed partial class ForensicsComponent : Component
     {
-        [DataField("fingerprints")]
+        [DataField, AutoNetworkedField]
         public HashSet<string> Fingerprints = new();
 
-        [DataField("fibers")]
+        [DataField, AutoNetworkedField]
         public HashSet<string> Fibers = new();
 
-        [DataField("dnas")]
+        [DataField, AutoNetworkedField]
         public HashSet<string> DNAs = new();
 
-        [DataField("residues")]
+        [DataField, AutoNetworkedField]
+        public string Scent = String.Empty;
+
+        [DataField, AutoNetworkedField]
         public HashSet<string> Residues = new();
 
         /// <summary>
@@ -27,5 +32,11 @@ public sealed partial class ForensicsComponent : Component
         /// </summary>
         [DataField("canDnaBeCleaned")]
         public bool CanDnaBeCleaned = true;
+
+        /// <summary>
+        /// Moment in time next effect will be spawned
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public TimeSpan TargetTime = TimeSpan.Zero;
     }
 }
diff --git a/Content.Shared/Forensics/ScentTrackerComponent.cs b/Content.Shared/Forensics/ScentTrackerComponent.cs
new file mode 100644
index 00000000000..789ec90adb2
--- /dev/null
+++ b/Content.Shared/Forensics/ScentTrackerComponent.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Forensics
+{
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class ScentTrackerComponent : Component
+    {
+        /// <summary>
+        ///     The currently tracked scent.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public string Scent = String.Empty;
+
+        /// <summary>
+        ///     The time (in seconds) that it takes to sniff an entity.
+        /// </summary>
+        [DataField]
+        public float SniffDelay = 5.0f;
+    }
+}
diff --git a/Content.Shared/Humanoid/SkinColor.cs b/Content.Shared/Humanoid/SkinColor.cs
index 55fab4af5ba..dcc5c2d7645 100644
--- a/Content.Shared/Humanoid/SkinColor.cs
+++ b/Content.Shared/Humanoid/SkinColor.cs
@@ -136,7 +136,7 @@ public static Color TintedHues(Color color)
     /// <param name="skinColor">The skin color to blend with</param>
     /// <param name="blendFactor">Blending factor (0.0 to 1.0)</param>
     /// <returns>Tinted hue color</returns>
-    public static Color TintedHuesSkin(Color color, Color skinColor, float blendFactor = 0.5f)
+    public static Color TintedHuesSkin(Color color, Color skinColor, float blendFactor = 0.0f)
     {
         blendFactor = MathHelper.Clamp(blendFactor, 0.0f, 1.0f);
 
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/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index c43a5885077..3308e881c52 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Electrocution;
 using Content.Shared.Explosion;
 using Content.Shared.Eye.Blinding.Systems;
@@ -20,6 +21,7 @@ public partial class InventorySystem
     public void InitializeRelay()
     {
         SubscribeLocalEvent<InventoryComponent, DamageModifyEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, TakeStaminaDamageEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ElectrocutionAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SlipAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshMovementSpeedModifiersEvent>(RelayInventoryEvent);
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/Medical/CPR/Components/CPRTrainingComponent.cs b/Content.Shared/Medical/CPR/Components/CPRTrainingComponent.cs
new file mode 100644
index 00000000000..e01250858a1
--- /dev/null
+++ b/Content.Shared/Medical/CPR/Components/CPRTrainingComponent.cs
@@ -0,0 +1,33 @@
+using Robust.Shared.GameStates;
+using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Medical.CPR
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class CPRTrainingComponent : Component
+    {
+        [DataField]
+        public SoundSpecifier CPRSound = new SoundPathSpecifier("/Audio/Effects/CPR.ogg");
+
+        /// <summary>
+        /// How long the doafter for CPR takes
+        /// </summary>
+        [DataField]
+        public TimeSpan DoAfterDuration = TimeSpan.FromSeconds(3);
+
+        [DataField]
+        public int AirlossHeal = 6;
+
+        [DataField]
+        public float CrackRibsModifier = 1f;
+        public EntityUid? CPRPlayingStream;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class CPRDoAfterEvent : SimpleDoAfterEvent
+    {
+
+    }
+}
diff --git a/Content.Shared/Medical/CPR/Systems/CPRSystem.CVars.cs b/Content.Shared/Medical/CPR/Systems/CPRSystem.CVars.cs
new file mode 100644
index 00000000000..9840b8ffbd4
--- /dev/null
+++ b/Content.Shared/Medical/CPR/Systems/CPRSystem.CVars.cs
@@ -0,0 +1,27 @@
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.Medical.CPR
+{
+    public sealed partial class CPRSystem
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+        public bool EnableCPR { get; private set; }
+        public bool HealsAirloss { get; private set; }
+        public bool ReducesRot { get; private set; }
+        public float ResuscitationChance { get; private set; }
+        public float RotReductionMultiplier { get; private set; }
+        public float AirlossReductionMultiplier { get; private set; }
+
+        private void InitializeCVars()
+        {
+            Subs.CVar(_cfg, CCVars.EnableCPR, value => EnableCPR = value, true);
+            Subs.CVar(_cfg, CCVars.CPRHealsAirloss, value => HealsAirloss = value, true);
+            Subs.CVar(_cfg, CCVars.CPRReducesRot, value => ReducesRot = value, true);
+            Subs.CVar(_cfg, CCVars.CPRResuscitationChance, value => ResuscitationChance = value, true);
+            Subs.CVar(_cfg, CCVars.CPRRotReductionMultiplier, value => RotReductionMultiplier = value, true);
+            Subs.CVar(_cfg, CCVars.CPRAirlossReductionMultiplier, value => AirlossReductionMultiplier = value, true);
+        }
+    }
+}
diff --git a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
new file mode 100644
index 00000000000..799c0664a66
--- /dev/null
+++ b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
@@ -0,0 +1,132 @@
+using Content.Shared.Popups;
+using Content.Shared.Atmos.Rotting;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.Inventory;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+using Robust.Shared.Random;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Medical.CPR
+{
+    public sealed partial class CPRSystem : EntitySystem
+    {
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+        [Dependency] private readonly DamageableSystem _damageable = default!;
+        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+        [Dependency] private readonly IRobustRandom _robustRandom = default!;
+        [Dependency] private readonly SharedRottingSystem _rottingSystem = default!;
+        [Dependency] private readonly InventorySystem _inventory = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly INetManager _net = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+            InitializeCVars();
+            SubscribeLocalEvent<CPRTrainingComponent, GetVerbsEvent<InnateVerb>>(AddCPRVerb);
+            SubscribeLocalEvent<CPRTrainingComponent, CPRDoAfterEvent>(OnCPRDoAfter);
+        }
+
+        private void AddCPRVerb(EntityUid uid, CPRTrainingComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            if (!EnableCPR || !args.CanInteract || !args.CanAccess
+                || !TryComp<MobStateComponent>(args.Target, out var targetState)
+                || targetState.CurrentState == MobState.Alive)
+                return;
+
+            InnateVerb verb = new()
+            {
+                Act = () =>
+                {
+                    StartCPR(uid, args.Target, component);
+                },
+                Text = Loc.GetString("cpr-verb"),
+                Icon = new SpriteSpecifier.Rsi(new("Interface/Alerts/human_alive.rsi"), "health4"),
+                Priority = 2
+            };
+            args.Verbs.Add(verb);
+        }
+
+        private void StartCPR(EntityUid performer, EntityUid target, CPRTrainingComponent cprComponent)
+        {
+            if (HasComp<RottingComponent>(target))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("cpr-target-rotting", ("entity", target)), performer, performer);
+                return;
+            }
+
+            if (_inventory.TryGetSlotEntity(target, "outerClothing", out var outer))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("cpr-must-remove", ("clothing", outer)), performer, performer, PopupType.MediumCaution);
+                return;
+            }
+
+            if (_inventory.TryGetSlotEntity(target, "mask", out var mask))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("cpr-must-remove", ("clothing", mask)), performer, performer, PopupType.MediumCaution);
+                return;
+            }
+
+            if (_inventory.TryGetSlotEntity(performer, "mask", out var maskSelf))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("cpr-must-remove-own-mask", ("clothing", maskSelf)), performer, performer, PopupType.MediumCaution);
+                return;
+            }
+
+            if (_net.IsServer)
+            {
+                _popupSystem.PopupEntity(Loc.GetString("cpr-start-second-person", ("target", target)), target, performer, PopupType.Medium);
+                _popupSystem.PopupEntity(Loc.GetString("cpr-start-second-person-patient", ("user", performer)), target, target, PopupType.Medium);
+                cprComponent.CPRPlayingStream = _audio.PlayPvs(cprComponent.CPRSound, performer).Value.Entity;
+            }
+
+            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, performer, cprComponent.DoAfterDuration, new CPRDoAfterEvent(), performer, target, performer)
+            {
+                BreakOnTargetMove = true,
+                BreakOnUserMove = true,
+                NeedHand = true,
+                BlockDuplicate = true
+            });
+        }
+
+        private void OnCPRDoAfter(EntityUid performer, CPRTrainingComponent component, CPRDoAfterEvent args)
+        {
+            component.CPRPlayingStream = _audio.Stop(component.CPRPlayingStream);
+
+            if (args.Target == null)
+                return;
+
+            if (HealsAirloss)
+            {
+                // There is PROBABLY a better way to do this, by all means let me know
+                var healing = new DamageSpecifier()
+                {
+                    DamageDict = new()
+                    {
+                        { "Asphyxiation", -component.AirlossHeal * AirlossReductionMultiplier}
+                    }
+                };
+                _damageable.TryChangeDamage(args.Target, healing, true, origin: performer);
+            }
+
+            if (ReducesRot)
+                _rottingSystem.ReduceAccumulator((EntityUid) args.Target, component.DoAfterDuration * RotReductionMultiplier);
+
+            if (_robustRandom.Prob(ResuscitationChance)
+                && _mobThreshold.TryGetThresholdForState((EntityUid) args.Target, MobState.Dead, out var threshold)
+                && TryComp<DamageableComponent>(args.Target, out var damageableComponent)
+                && TryComp<MobStateComponent>(args.Target, out var state)
+                && damageableComponent.TotalDamage < threshold)
+            {
+                _mobStateSystem.ChangeMobState(args.Target.Value, MobState.Critical, state, performer);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Medical/PenLightComponent.cs b/Content.Shared/Medical/PenLightComponent.cs
new file mode 100644
index 00000000000..50dacae3dc8
--- /dev/null
+++ b/Content.Shared/Medical/PenLightComponent.cs
@@ -0,0 +1,33 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+namespace Content.Shared.Medical;
+
+/// <summary>
+///     This for penlights; a tool used to check for eye damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+public sealed partial class PenLightComponent : Component
+{
+    /// <summary>
+    ///     Cooldown Time, exams take a bit
+    /// </summary>
+    [AutoPausedField]
+    public TimeSpan? NextExamTime;
+
+    /// <summary>
+    ///     The min time between exams
+    /// </summary>
+    [DataField]
+    public TimeSpan ExamDelay = TimeSpan.FromSeconds(3);
+
+    /// <summary>
+    ///     How long the doafter for the exam takes
+    /// </summary>
+    [DataField(required: true)]
+    public float ExamSpeed { get; set; }
+
+}
+
+[Serializable, NetSerializable]
+public sealed partial class PenLightDoAfterEvent : SimpleDoAfterEvent { }
\ No newline at end of file
diff --git a/Content.Shared/Medical/PenLightUiKey.cs b/Content.Shared/Medical/PenLightUiKey.cs
new file mode 100644
index 00000000000..52fc6ce3401
--- /dev/null
+++ b/Content.Shared/Medical/PenLightUiKey.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Medical;
+
+[Serializable, NetSerializable]
+public enum PenLightUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/Medical/PenLightUserMessage.cs b/Content.Shared/Medical/PenLightUserMessage.cs
new file mode 100644
index 00000000000..42502b2171b
--- /dev/null
+++ b/Content.Shared/Medical/PenLightUserMessage.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Medical;
+[Serializable, NetSerializable]
+public sealed class PenLightUserMessage : BoundUserInterfaceMessage
+{
+    public readonly NetEntity? TargetEntity;
+    public bool? Blind;
+    public bool? Drunk;
+    public bool? EyeDamage;
+    public bool? Healthy;
+    public bool? SeeingRainbows;
+
+    public PenLightUserMessage(NetEntity? targetEntity, bool? blind, bool? drunk, bool? eyeDamage, bool? healthy, bool? seeingRainbows)
+    {
+        TargetEntity = targetEntity;
+        Blind = blind;
+        Drunk = drunk;
+        EyeDamage = eyeDamage;
+        Healthy = healthy;
+        SeeingRainbows = seeingRainbows;
+    }
+}
+
diff --git a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
index 7c793d5eb89..67a238cf60f 100644
--- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
+using Content.Shared.Traits.Assorted.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Movement.Systems
@@ -16,7 +17,11 @@ public void RefreshMovementSpeedModifiers(EntityUid uid, MovementSpeedModifierCo
             if (_timing.ApplyingState)
                 return;
 
-            var ev = new RefreshMovementSpeedModifiersEvent();
+            var isImmune = false;
+            if (HasComp<SpeedModifierImmunityComponent>(uid))
+                isImmune = true;
+
+            var ev = new RefreshMovementSpeedModifiersEvent(isImmune);
             RaiseLocalEvent(uid, ev);
 
             if (MathHelper.CloseTo(ev.WalkSpeedModifier, move.WalkSpeedModifier) &&
@@ -64,10 +69,24 @@ public sealed class RefreshMovementSpeedModifiersEvent : EntityEventArgs, IInven
         public float WalkSpeedModifier { get; private set; } = 1.0f;
         public float SprintSpeedModifier { get; private set; } = 1.0f;
 
-        public void ModifySpeed(float walk, float sprint)
+        /// <summary>
+        ///    Whether this entity is immune to most movement speed modifiers.
+        ///    Bypassable by setting bypassImmunity to true.
+        /// </summary
+        private bool IsImmune = false;
+
+        public void ModifySpeed(float walk, float sprint, bool bypassImmunity = false)
         {
+            if (IsImmune && !bypassImmunity)
+                return;
+
             WalkSpeedModifier *= walk;
             SprintSpeedModifier *= sprint;
         }
+
+        public RefreshMovementSpeedModifiersEvent(bool isImmune = false)
+        {
+            IsImmune = isImmune;
+        }
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
deleted file mode 100644
index b7c3c8ad2d6..00000000000
--- a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Shared.Actions.Events;
-public sealed partial class WideMetapsionicPowerActionEvent : InstantActionEvent { }
-public sealed partial class FocusedMetapsionicPowerActionEvent : EntityTargetActionEvent { }
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
deleted file mode 100644
index 2493be58fab..00000000000
--- a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Actions.Events;
-public sealed partial class PyrokinesisPowerActionEvent : WorldTargetActionEvent {}
-public sealed partial class PyrokinesisPrechargeActionEvent : InstantActionEvent {}
-
-
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
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/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
index c3702880375..ce86111fc4b 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
+++ b/Content.Shared/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/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index 518a28b0967..cd887866364 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/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/Psionics/Abilities/Dispel/DispellableComponent.cs
index 4bb5ee653d2..40352004187 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
+++ b/Content.Shared/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/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
new file mode 100644
index 00000000000..7d611c63dac
--- /dev/null
+++ b/Content.Shared/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/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
new file mode 100644
index 00000000000..e36a3c70e8a
--- /dev/null
+++ b/Content.Shared/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/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
index 2fbfe18327e..c9d0130221a 100644
--- a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -1,38 +1,21 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Audio;
+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 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;
+        public InstantActionComponent? MetapsionicPowerAction = null;
+        [DataField("metapsionicActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? MetapsionicActionId = "ActionMetapsionic";
 
-        [DataField("metapsionicFeedback")]
-        public string MetapsionicFeedback = "metapsionic-feedback";
+        [DataField("metapsionicActionEntity")]
+        public EntityUid? MetapsionicActionEntity;
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
index 94b73c41e38..6a3fc811c89 100644
--- a/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.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/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
index 997db65e1b1..0e91894b1dc 100644
--- a/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.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/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
index d9c36f5b22a..3e198aa9303 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.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/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/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
index 22d1b928553..9037b8bcdfe 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
+++ b/Content.Shared/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/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index 3184bf7de5b..895c5201c3a 100644
--- a/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicRegenerationPowerComponent : Component
@@ -12,13 +12,13 @@ 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;
         [DataField("soundUse")]
 
-        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg");
+        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Psionics/heartbeat_fast.ogg");
 
         [DataField("psionicRegenerationActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
@@ -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/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
index b95ead8ec1a..28425afdb4c 100644
--- a/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
@@ -1,45 +1,18 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Audio;
+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 PyrokinesisPowerComponent : Component
     {
-        [DataField("pyrokinesisPrechargeActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? PyrokinesisPrechargeActionId = "ActionPrechargePyrokinesis";
-
-        [DataField("pyrokinesisPrechargeActionEntity")]
-        public EntityUid? PyrokinesisPrechargeActionEntity;
-
+        public EntityTargetActionComponent? PyrokinesisPowerAction = null;
         [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/TelegnosisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index f1a71332b18..51958822a41 100644
--- a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 
-namespace Content.Shared.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/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
index bc18ff9f3c2..9d627cb42d8 100644
--- a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
@@ -1,8 +1,6 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class TelegnosticProjectionComponent : Component
-    {
-        public EntityUid OriginalEntity = default!;
-    }
-}
+    {}
+}
\ No newline at end of file
diff --git a/Content.Shared/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
index 88cf17a4a2f..cf9a50c6e18 100644
--- a/Content.Shared/Psionics/Events.cs
+++ b/Content.Shared/Psionics/Events.cs
@@ -21,60 +21,6 @@ public PsionicRegenerationDoAfterEvent(TimeSpan 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
index 9b8d20b295d..31af85bbb51 100644
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -11,39 +11,11 @@ namespace Content.Shared.Psionics.Glimmer
     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
+        private int _glimmer = 0;
+        public int Glimmer
         {
-            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; }
+            get { return _glimmer; }
+            set { _glimmer = _enabled ? Math.Clamp(value, 0, 1000) : 0; }
         }
         private bool _enabled;
         public override void Initialize()
@@ -56,118 +28,28 @@ public override void Initialize()
 
         private void Reset(RoundRestartCleanupEvent args)
         {
-            GlimmerInput = 0;
-            GlimmerOutput = 0;
+            Glimmer = 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.
+        /// 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(float? glimmer = null)
+        public GlimmerTier GetGlimmerTier(int? glimmer = null)
         {
             if (glimmer == null)
-                glimmer = GlimmerOutput;
+                glimmer = Glimmer;
 
-            return glimmer switch
+            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,
+                >= 50 and <= 99 => GlimmerTier.Low,
+                >= 100 and <= 299 => GlimmerTier.Moderate,
+                >= 300 and <= 499 => GlimmerTier.High,
+                >= 500 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]
diff --git a/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
index f09efc3064c..4cbb05c8395 100644
--- a/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
+++ b/Content.Shared/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/Psionics/Items/HeadCageComponent.cs
index c03241e47c7..acaa832860f 100644
--- a/Content.Shared/Psionics/Items/HeadCageComponent.cs
+++ b/Content.Shared/Psionics/Items/HeadCageComponent.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Robust.Shared.Audio;
 
-namespace Content.Shared.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/Psionics/Items/HeadCagedComponent.cs
index 0f826f7a05e..f8af46b8878 100644
--- a/Content.Shared/Psionics/Items/HeadCagedComponent.cs
+++ b/Content.Shared/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/Psionics/Items/PsionicItemsSystem.cs
index 950353c5dfb..f88acf61f3c 100644
--- a/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
+++ b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.StatusEffect;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     public sealed class PsionicItemsSystem : EntitySystem
     {
diff --git a/Content.Shared/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
index 6ef7bdc823b..5086b9f4977 100644
--- a/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
+++ b/Content.Shared/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/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index 748b8ddd92a..9091e03cfc3 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -1,6 +1,7 @@
+using Content.Shared.Actions;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent, NetworkedComponent]
     public sealed partial class PsionicComponent : Component
@@ -14,28 +15,6 @@ public sealed partial class PsionicComponent : Component
         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;
+        public HashSet<Component> ActivePowers = new();
     }
 }
diff --git a/Content.Shared/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Psionics/PsionicInsulationComponent.cs
index 4b999523bca..12370da5ae4 100644
--- a/Content.Shared/Psionics/PsionicInsulationComponent.cs
+++ b/Content.Shared/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/Psionics/PsionicsDisabledComponent.cs
index 00cf5506523..28e7157a9d2 100644
--- a/Content.Shared/Psionics/PsionicsDisabledComponent.cs
+++ b/Content.Shared/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/Psionics/SharedPsionicAbilitiesSystem.cs
index fda1ef4fd40..2739d5ba31a 100644
--- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/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/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/Radiation/Components/GeigerComponent.cs b/Content.Shared/Radiation/Components/GeigerComponent.cs
index 71edb70b37c..710d74d9b38 100644
--- a/Content.Shared/Radiation/Components/GeigerComponent.cs
+++ b/Content.Shared/Radiation/Components/GeigerComponent.cs
@@ -29,14 +29,12 @@ public sealed partial class GeigerComponent : Component
     /// <summary>
     ///     Should it shows examine message with current radiation level?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public bool ShowExamine;
 
     /// <summary>
     ///     Should it shows item control when equipped by player?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public bool ShowControl;
 
@@ -55,7 +53,7 @@ public sealed partial class GeigerComponent : Component
     /// <summary>
     ///     Current radiation level in rad per second.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float CurrentRadiation;
 
     /// <summary>
@@ -66,8 +64,6 @@ public sealed partial class GeigerComponent : Component
 
     /// <summary>
     ///     Current player that equipped geiger counter.
-    ///     Because sound is annoying, geiger counter clicks will play
-    ///     only for player that equipped it.
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
     public EntityUid? User;
@@ -83,6 +79,19 @@ public sealed partial class GeigerComponent : Component
     ///     Played only for current user.
     /// </summary>
     public EntityUid? Stream;
+
+    /// <summary>
+    ///     Controls whether the geiger counter plays only for the local player, or plays for everyone nearby.
+    ///     Useful for things like hardsuits with integrated geigers. Alternatively, to create stationary radiation alarm objects.
+    /// </summary>
+    [DataField]
+    public bool LocalSoundOnly = false;
+
+    /// <summary>
+    ///     Used for all geiger counter audio controls, allowing entities to override default audio parameters.
+    /// </summary>
+    [DataField]
+    public AudioParams AudioParameters;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Showers/SharedShowerSystem.cs b/Content.Shared/Showers/SharedShowerSystem.cs
new file mode 100644
index 00000000000..be3af6228f2
--- /dev/null
+++ b/Content.Shared/Showers/SharedShowerSystem.cs
@@ -0,0 +1,92 @@
+using Content.Shared.Interaction;
+using Content.Shared.Verbs;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Showers
+{
+    public abstract class SharedShowerSystem : EntitySystem
+    {
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ShowerComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<ShowerComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleShowerVerb);
+            SubscribeLocalEvent<ShowerComponent, ActivateInWorldEvent>(OnActivateInWorld);
+        }
+        private void OnMapInit(EntityUid uid, ShowerComponent component, MapInitEvent args)
+        {
+            if (_random.Prob(0.5f))
+                component.ToggleShower = true;
+            UpdateAppearance(uid);
+        }
+        private void OnToggleShowerVerb(EntityUid uid, ShowerComponent component, GetVerbsEvent<AlternativeVerb> args)
+        {
+            if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+                return;
+
+            AlternativeVerb toggleVerb = new()
+            {
+                Act = () => ToggleShowerHead(uid, args.User, component)
+            };
+
+            if (component.ToggleShower)
+            {
+                toggleVerb.Text = Loc.GetString("shower-turn-on");
+                toggleVerb.Icon =
+                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
+            }
+            else
+            {
+                toggleVerb.Text = Loc.GetString("shower-turn-off");
+                toggleVerb.Icon =
+                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
+            }
+            args.Verbs.Add(toggleVerb);
+        }
+        private void OnActivateInWorld(EntityUid uid, ShowerComponent comp, ActivateInWorldEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            args.Handled = true;
+            ToggleShowerHead(uid, args.User, comp);
+
+            _audio.PlayPvs(comp.EnableShowerSound, uid);
+        }
+        public void ToggleShowerHead(EntityUid uid, EntityUid? user = null, ShowerComponent? component = null, MetaDataComponent? meta = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            component.ToggleShower = !component.ToggleShower;
+
+            UpdateAppearance(uid, component);
+        }
+        private void UpdateAppearance(EntityUid uid, ShowerComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            _appearance.SetData(uid, ShowerVisuals.ShowerVisualState, component.ToggleShower ? ShowerVisualState.On : ShowerVisualState.Off);
+
+            if (component.ToggleShower)
+            {
+                if (component.PlayingStream == null)
+                {
+                    component.PlayingStream = _audio.PlayPvs(component.LoopingSound, uid, AudioParams.Default.WithLoop(true).WithMaxDistance(5)).Value.Entity;
+                }
+            }
+            else
+            {
+                component.PlayingStream = _audio.Stop(component.PlayingStream);
+                component.PlayingStream = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/Showers/ShowerComponent.cs b/Content.Shared/Showers/ShowerComponent.cs
new file mode 100644
index 00000000000..339205546bd
--- /dev/null
+++ b/Content.Shared/Showers/ShowerComponent.cs
@@ -0,0 +1,43 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Showers
+{
+    /// <summary>
+    /// showers that can be enabled
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class ShowerComponent : Component
+    {
+        /// <summary>
+        /// Toggles shower.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool ToggleShower;
+
+        [DataField("enableShowerSound")]
+        public SoundSpecifier EnableShowerSound = new SoundPathSpecifier("/Audio/Ambience/Objects/shower_enable.ogg");
+
+        public EntityUid? PlayingStream;
+
+        [DataField("loopingSound")]
+        public SoundSpecifier LoopingSound = new SoundPathSpecifier("/Audio/Ambience/Objects/shower_running.ogg");
+
+    }
+
+
+    [Serializable, NetSerializable]
+    public enum ShowerVisuals : byte
+    {
+        ShowerVisualState,
+    }
+
+    [Serializable, NetSerializable]
+    public enum ShowerVisualState : byte
+    {
+        Off,
+        On
+    }
+}
+
diff --git a/Content.Shared/Nyanotrasen/Soul/GolemMessages.cs b/Content.Shared/Soul/GolemMessages.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/GolemMessages.cs
rename to Content.Shared/Soul/GolemMessages.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/GunHeldByGolemComponent.cs b/Content.Shared/Soul/GunHeldByGolemComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/GunHeldByGolemComponent.cs
rename to Content.Shared/Soul/GunHeldByGolemComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/SharedGolemComponent.cs b/Content.Shared/Soul/SharedGolemComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/SharedGolemComponent.cs
rename to Content.Shared/Soul/SharedGolemComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/SharedGolemSystem.cs b/Content.Shared/Soul/SharedGolemSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/SharedGolemSystem.cs
rename to Content.Shared/Soul/SharedGolemSystem.cs
diff --git a/Content.Shared/Stunnable/StaminaDamageResistanceComponent.cs b/Content.Shared/Stunnable/StaminaDamageResistanceComponent.cs
new file mode 100644
index 00000000000..dc291bbe8ba
--- /dev/null
+++ b/Content.Shared/Stunnable/StaminaDamageResistanceComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stunnable;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StaminaDamageResistanceComponent : Component
+{
+    /// <summary>
+    ///     1 - no reduction, 0 - full reduction
+    /// </summary>
+    [DataField] public float Coefficient = 1;
+}
diff --git a/Content.Shared/Stunnable/StaminaDamageResistanceSystem.cs b/Content.Shared/Stunnable/StaminaDamageResistanceSystem.cs
new file mode 100644
index 00000000000..7632eed504d
--- /dev/null
+++ b/Content.Shared/Stunnable/StaminaDamageResistanceSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Damage.Events;
+using Content.Shared.Examine;
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Stunnable;
+
+public sealed partial class StaminaDamageResistanceSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StaminaDamageResistanceComponent, InventoryRelayedEvent<TakeStaminaDamageEvent>>(OnStaminaMeleeHit);
+        SubscribeLocalEvent<StaminaDamageResistanceComponent, ExaminedEvent>(OnExamine);
+    }
+
+    private void OnStaminaMeleeHit(Entity<StaminaDamageResistanceComponent> ent, ref InventoryRelayedEvent<TakeStaminaDamageEvent> args)
+    {
+        args.Args.Multiplier *= ent.Comp.Coefficient;
+    }
+    private void OnExamine(Entity<StaminaDamageResistanceComponent> ent, ref ExaminedEvent args)
+    {
+        var percentage = (1 - ent.Comp.Coefficient) * 100;
+        args.PushMarkup(Loc.GetString("armor-examine-stamina", ("num", percentage)));
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/Components/AdrenalineComponent.cs b/Content.Shared/Traits/Assorted/Components/AdrenalineComponent.cs
new file mode 100644
index 00000000000..a0c58edb106
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/AdrenalineComponent.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for any trait that modifies the Melee System implementation of Health Contest
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class AdrenalineComponent : Component
+{
+    /// <summary>
+    ///     When true, multiplies by the inverse of the resulting Contest.
+    /// </summary>
+    [DataField]
+    public bool Inverse { get; private set; } = false;
+
+    /// <summary>
+    ///     Used as the RangeModifier input for a Health Contest.
+    /// </summary>
+    [DataField]
+    public float RangeModifier { get; private set; } = 1;
+
+    /// <summary>
+    ///     Used as the BypassClamp input for a Health Contest.
+    /// </summary>
+    [DataField]
+    public bool BypassClamp { get; private set; } = false;
+}
\ No newline at end of file
diff --git a/Content.Shared/Traits/Assorted/Components/ClimbDelayModifierComponent.cs b/Content.Shared/Traits/Assorted/Components/ClimbDelayModifierComponent.cs
new file mode 100644
index 00000000000..c04657a4875
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/ClimbDelayModifierComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for any trait that modifies climbing speed.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ClimbDelayModifierComponent : Component
+{
+    /// <summary>
+    ///     What to multiply the climbing delay by.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ClimbDelayMultiplier = 1f;
+}
diff --git a/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs b/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs
new file mode 100644
index 00000000000..6cf11e3f7fb
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for any trait that modifies CritThreshold
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CritModifierComponent : Component
+{
+    /// <summary>
+    ///     The amount that an entity's critical threshold will be incremented by.
+    /// </summary>
+    [DataField]
+    public int CritThresholdModifier { get; private set; } = 0;
+}
\ No newline at end of file
diff --git a/Content.Shared/Traits/Assorted/Components/DeadModifierComponent.cs b/Content.Shared/Traits/Assorted/Components/DeadModifierComponent.cs
new file mode 100644
index 00000000000..b4ac1bf64fc
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/DeadModifierComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for any trait that modifies DeadThreshold
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DeadModifierComponent : Component
+{
+    /// <summary>
+    ///     The amount that an entity's DeadThreshold will be incremented by.
+    /// </summary>
+    [DataField]
+    public int DeadThresholdModifier { get; private set; } = 0;
+}
\ No newline at end of file
diff --git a/Content.Shared/Traits/Assorted/Components/PainToleranceComponent.cs b/Content.Shared/Traits/Assorted/Components/PainToleranceComponent.cs
new file mode 100644
index 00000000000..03b3bb116a8
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/PainToleranceComponent.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for any trait that modifies the Melee System implementation of Stamina Contest
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PainToleranceComponent : Component
+{
+    /// <summary>
+    ///     When true, multiplies by the inverse of the resulting Contest.
+    /// </summary>
+    [DataField]
+    public bool Inverse { get; private set; } = false;
+
+    /// <summary>
+    ///     Used as the RangeModifier input for a Stamina Contest.
+    /// </summary>
+    [DataField]
+    public float RangeModifier { get; private set; } = 1;
+
+    /// <summary>
+    ///     Used as the BypassClamp input for a Stamina Contest.
+    /// </summary>
+    [DataField]
+    public bool BypassClamp { get; private set; } = false;
+}
\ No newline at end of file
diff --git a/Content.Shared/Traits/Assorted/Components/SingerComponent.cs b/Content.Shared/Traits/Assorted/Components/SingerComponent.cs
new file mode 100644
index 00000000000..9c79166ef6c
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/SingerComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Traits.Assorted.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SingerComponent : Component
+{
+    // Traits are server-only, and is this is added via traits, it must be replicated to the client.
+    [DataField(required: true), AutoNetworkedField]
+    public ProtoId<SingerInstrumentPrototype> Proto = string.Empty;
+
+    [DataField(serverOnly: true)]
+    public EntityUid? MidiAction;
+}
diff --git a/Content.Shared/Traits/Assorted/Components/SpeedModifierImmunityComponent.cs b/Content.Shared/Traits/Assorted/Components/SpeedModifierImmunityComponent.cs
new file mode 100644
index 00000000000..e9bec98fd8b
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/SpeedModifierImmunityComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///   This is used to make an entity's movement speed constant and
+///   never affected by almost all movement speed modifiers.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SpeedModifierImmunityComponent : Component
+{
+}
diff --git a/Content.Shared/Traits/Assorted/Components/StaminaCritModifierComponent.cs b/Content.Shared/Traits/Assorted/Components/StaminaCritModifierComponent.cs
new file mode 100644
index 00000000000..28c8ab9b089
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/StaminaCritModifierComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for any trait that modifies stamina CritThreshold
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StaminaCritModifierComponent : Component
+{
+    /// <summary>
+    ///     The amount that an entity's stamina critical threshold will be incremented by.
+    /// </summary>
+    [DataField]
+    public int CritThresholdModifier { get; private set; } = 0;
+}
diff --git a/Content.Shared/Traits/Assorted/Components/TraitSpeedModifierComponent.cs b/Content.Shared/Traits/Assorted/Components/TraitSpeedModifierComponent.cs
new file mode 100644
index 00000000000..85dc52a21f5
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/TraitSpeedModifierComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///  This component is used for traits that modify movement speed.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TraitSpeedModifierComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public float WalkModifier = 1.0f;
+
+    [DataField, AutoNetworkedField]
+    public float SprintModifier = 1.0f;
+}
diff --git a/Content.Shared/Traits/Assorted/Prototypes/SingerInstrumentPrototype.cs b/Content.Shared/Traits/Assorted/Prototypes/SingerInstrumentPrototype.cs
new file mode 100644
index 00000000000..6a49854f6ea
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Prototypes/SingerInstrumentPrototype.cs
@@ -0,0 +1,35 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits.Assorted.Prototypes;
+
+[Prototype("SingerInstrument")]
+public sealed class SingerInstrumentPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    ///     Configuration for SwappableInstrumentComponent.
+    ///     string = display name of the instrument
+    ///     byte 1 = instrument midi program
+    ///     byte 2 = instrument midi bank
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<string, (byte, byte)> InstrumentList = new();
+
+    /// <summary>
+    ///     Instrument in <see cref="InstrumentList"/> that is used by default.
+    /// </summary>
+    [DataField(required: true)]
+    public string DefaultInstrument = string.Empty;
+
+    /// <summary>
+    ///     The BUI configuration for the instrument.
+    /// </summary>
+    [DataField]
+    public PrototypeData? MidiUi;
+
+    // The below is server only, as it uses a server-BUI event !type
+    [DataField(serverOnly: true, required: true)]
+    public EntProtoId MidiActionId;
+}
diff --git a/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs b/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs
new file mode 100644
index 00000000000..08d0f5c76d0
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs
@@ -0,0 +1,93 @@
+using Content.Shared.Actions;
+using Content.Shared.DeltaV.Harpy.Components;
+using Content.Shared.Instruments;
+using Content.Shared.Traits.Assorted.Components;
+using Content.Shared.Traits.Assorted.Prototypes;
+using Content.Shared.Zombies;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public abstract class SharedSingerSystem : EntitySystem
+{
+    [Dependency] protected readonly IPrototypeManager ProtoMan = default!;
+
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedInstrumentSystem _instrument = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EntityZombifiedEvent>(OnZombified);
+        SubscribeLocalEvent<SingerComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<SingerComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<SingerComponent, BoundUIClosedEvent>(OnBoundUIClosed);
+        SubscribeLocalEvent<SingerComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
+    }
+
+    private void OnStartup(Entity<SingerComponent> ent, ref ComponentStartup args)
+    {
+        if (!ProtoMan.TryIndex(ent.Comp.Proto, out var singer))
+            return;
+
+        _actionsSystem.AddAction(ent, ref ent.Comp.MidiAction, singer.MidiActionId);
+
+        var instrumentComp = EnsureInstrumentComp(ent);
+        var defaultData = singer.InstrumentList[singer.DefaultInstrument];
+        _instrument.SetInstrumentProgram(instrumentComp, defaultData.Item1, defaultData.Item2);
+        SetUpSwappableInstrument(ent, singer);
+
+        if (singer.MidiUi is {} uiData && !_ui.TryGetUi(ent, uiData.UiKey, out _))
+            _ui.AddUi(ent.Owner, uiData);
+    }
+
+    private void OnShutdown(Entity<SingerComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent, ent.Comp.MidiAction);
+    }
+
+    private void OnZombified(ref EntityZombifiedEvent args)
+    {
+        CloseMidiUi(args.Target);
+    }
+
+    private void OnBoundUIClosed(EntityUid uid, SingerComponent component, BoundUIClosedEvent args)
+    {
+        if (args.UiKey is not InstrumentUiKey)
+            return;
+
+        TryComp(uid, out AppearanceComponent? appearance);
+        _appearance.SetData(uid, HarpyVisualLayers.Singing, SingingVisualLayer.False, appearance);
+    }
+
+    private void OnBoundUIOpened(EntityUid uid, SingerComponent component, BoundUIOpenedEvent args)
+    {
+        if (args.UiKey is not InstrumentUiKey)
+            return;
+
+        TryComp(uid, out AppearanceComponent? appearance);
+        _appearance.SetData(uid, HarpyVisualLayers.Singing, SingingVisualLayer.True, appearance);
+    }
+
+    /// <summary>
+    ///     Closes the MIDI UI if it is open. Does nothing on client side.
+    /// </summary>
+    public virtual void CloseMidiUi(EntityUid uid)
+    {
+    }
+
+    /// <summary>
+    ///     Sets up the swappable instrument on the entity, only on the server.
+    /// </summary>
+    protected virtual void SetUpSwappableInstrument(EntityUid uid, SingerInstrumentPrototype singer)
+    {
+    }
+
+    /// <summary>
+    ///     Ensures an InstrumentComponent on the entity. Uses client-side comp on client and server-side comp on the server.
+    /// </summary>
+    protected abstract SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid);
+}
diff --git a/Content.Shared/Traits/Assorted/Systems/TraitSpeedModifierSystem.cs b/Content.Shared/Traits/Assorted/Systems/TraitSpeedModifierSystem.cs
new file mode 100644
index 00000000000..9817ebc1560
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/TraitSpeedModifierSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Traits.Assorted.Components;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed class TraitSpeedModifierSystem : EntitySystem
+{
+    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TraitSpeedModifierComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<TraitSpeedModifierComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+    }
+
+    private void OnRefreshMovementSpeed(EntityUid uid, TraitSpeedModifierComponent component, RefreshMovementSpeedModifiersEvent args)
+    {
+        args.ModifySpeed(component.WalkModifier, component.SprintModifier, bypassImmunity: true);
+    }
+
+    private void OnStartup(EntityUid uid, TraitSpeedModifierComponent component, ComponentStartup args)
+    {
+        if (!TryComp<MovementSpeedModifierComponent>(uid, out var move))
+            return;
+
+        _movement.RefreshMovementSpeedModifiers(uid, move);
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs b/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs
new file mode 100644
index 00000000000..85ecf151dd9
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs
@@ -0,0 +1,63 @@
+using Content.Shared.Contests;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Traits.Assorted.Components;
+using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Damage.Components;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed partial class TraitStatModifierSystem : EntitySystem
+{
+    [Dependency] private readonly ContestsSystem _contests = default!;
+    [Dependency] private readonly MobThresholdSystem _threshold = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<CritModifierComponent, ComponentStartup>(OnCritStartup);
+        SubscribeLocalEvent<DeadModifierComponent, ComponentStartup>(OnDeadStartup);
+        SubscribeLocalEvent<StaminaCritModifierComponent, ComponentStartup>(OnStaminaCritStartup);
+        SubscribeLocalEvent<AdrenalineComponent, GetMeleeDamageEvent>(OnAdrenalineGetDamage);
+        SubscribeLocalEvent<PainToleranceComponent, GetMeleeDamageEvent>(OnPainToleranceGetDamage);
+    }
+
+    private void OnCritStartup(EntityUid uid, CritModifierComponent component, ComponentStartup args)
+    {
+        if (!TryComp<MobThresholdsComponent>(uid, out var threshold))
+            return;
+
+        var critThreshold = _threshold.GetThresholdForState(uid, Mobs.MobState.Critical, threshold);
+        if (critThreshold != 0)
+            _threshold.SetMobStateThreshold(uid, critThreshold + component.CritThresholdModifier, Mobs.MobState.Critical);
+    }
+
+    private void OnDeadStartup(EntityUid uid, DeadModifierComponent component, ComponentStartup args)
+    {
+        if (!TryComp<MobThresholdsComponent>(uid, out var threshold))
+            return;
+
+        var deadThreshold = _threshold.GetThresholdForState(uid, Mobs.MobState.Dead, threshold);
+        if (deadThreshold != 0)
+            _threshold.SetMobStateThreshold(uid, deadThreshold + component.DeadThresholdModifier, Mobs.MobState.Dead);
+    }
+
+    private void OnStaminaCritStartup(EntityUid uid, StaminaCritModifierComponent component, ComponentStartup args)
+    {
+        if (!TryComp<StaminaComponent>(uid, out var stamina))
+            return;
+
+        stamina.CritThreshold += component.CritThresholdModifier;
+    }
+
+    private void OnAdrenalineGetDamage(EntityUid uid, AdrenalineComponent component, ref GetMeleeDamageEvent args)
+    {
+        var modifier = _contests.HealthContest(uid, component.BypassClamp, component.RangeModifier);
+        args.Damage *= component.Inverse ? 1 / modifier : modifier;
+    }
+
+    private void OnPainToleranceGetDamage(EntityUid uid, PainToleranceComponent component, ref GetMeleeDamageEvent args)
+    {
+        var modifier = _contests.StaminaContest(uid, component.BypassClamp, component.RangeModifier);
+        args.Damage *= component.Inverse ? 1 / modifier : modifier;
+    }
+}
diff --git a/Content.Shared/Vampiric/BloodSuckDoAfterEvent.cs b/Content.Shared/Vampiric/BloodSuckDoAfterEvent.cs
new file mode 100644
index 00000000000..6aadc258d73
--- /dev/null
+++ b/Content.Shared/Vampiric/BloodSuckDoAfterEvent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Serialization;
+using Content.Shared.DoAfter;
+
+namespace Content.Shared.Vampiric
+{
+    [Serializable, NetSerializable]
+    public sealed partial class BloodSuckDoAfterEvent : SimpleDoAfterEvent
+    {
+    }
+}
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
index 5bf74802026..350642105a5 100644
--- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -20,7 +20,7 @@ public sealed class MeleeSoundSystem : EntitySystem
     /// </summary>
     public void PlaySwingSound(EntityUid userUid, EntityUid weaponUid, MeleeWeaponComponent weaponComponent)
     {
-        _audio.PlayPredicted(weaponComponent.SwingSound, weaponUid, userUid);
+        _audio.PlayPredicted(weaponComponent.SoundSwing, weaponUid, userUid);
     }
 
     /// <summary>
@@ -32,8 +32,8 @@ public void PlaySwingSound(EntityUid userUid, EntityUid weaponUid, MeleeWeaponCo
     /// <param name="hitSoundOverride"> A sound can be supplied by the <see cref="MeleeHitEvent"/> itself to override everything else </param>
     public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damageType, SoundSpecifier? hitSoundOverride, MeleeWeaponComponent weaponComponent)
     {
-        var hitSound      = weaponComponent.HitSound;
-        var noDamageSound = weaponComponent.NoDamageSound;
+        var hitSound      = weaponComponent.SoundHit;
+        var noDamageSound = weaponComponent.SoundNoDamage;
 
         var playedSound = false;
 
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 85d2e4675f7..2708a07c6eb 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -18,13 +18,12 @@ public sealed partial class MeleeWeaponComponent : Component
     /// <summary>
     /// Does this entity do a disarm on alt attack.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool AltDisarm = true;
 
     /// <summary>
     /// Should the melee weapon's damage stats be examinable.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public bool Hidden;
 
@@ -32,14 +31,13 @@ public sealed partial class MeleeWeaponComponent : Component
     /// Next time this component is allowed to light attack. Heavy attacks are wound up and never have a cooldown.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
-    [ViewVariables(VVAccess.ReadWrite)]
     [AutoPausedField]
     public TimeSpan NextAttack;
 
     /// <summary>
     /// Starts attack cooldown when equipped if true.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public bool ResetOnHandSelected = true;
 
     /*
@@ -51,77 +49,97 @@ public sealed partial class MeleeWeaponComponent : Component
     /// <summary>
     /// How many times we can attack per second.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float AttackRate = 1f;
 
+    /// <summary>
+    ///     When power attacking, the swing speed (in attacks per second) is multiplied by this amount
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float HeavyRateModifier = 0.8f;
     /// <summary>
     /// Are we currently holding down the mouse for an attack.
     /// Used so we can't just hold the mouse button and attack constantly.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [AutoNetworkedField]
     public bool Attacking = false;
 
     /// <summary>
     /// If true, attacks will be repeated automatically without requiring the mouse button to be lifted.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool AutoAttack;
 
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
     [DataField(required: true)]
-    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [AutoNetworkedField]
     public DamageSpecifier Damage = default!;
 
-    [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 BluntStaminaDamageFactor = FixedPoint2.New(0.5f);
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 BluntStaminaDamageFactor = FixedPoint2.New(1f);
 
     /// <summary>
     /// Multiplies damage by this amount for single-target attacks.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField, AutoNetworkedField]
     public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1);
 
     // TODO: Temporarily 1.5 until interactionoutline is adjusted to use melee, then probably drop to 1.2
     /// <summary>
     /// Nearest edge range to hit an entity.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float Range = 1.5f;
 
+    /// <summary>
+    ///     Attack range for heavy swings
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float HeavyRangeModifier = 1f;
+
+    /// <summary>
+    ///     Weapon damage is multiplied by this amount for heavy swings
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float HeavyDamageBaseModifier = 1.2f;
+
     /// <summary>
     /// Total width of the angle for wide attacks.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField, AutoNetworkedField]
     public Angle Angle = Angle.FromDegrees(60);
 
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntProtoId Animation = "WeaponArcPunch";
 
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntProtoId WideAnimation = "WeaponArcSlash";
 
     /// <summary>
     /// Rotation of the animation.
     /// 0 degrees means the top faces the attacker.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField, AutoNetworkedField]
     public Angle WideAnimationRotation = Angle.Zero;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public bool SwingLeft;
 
+    [DataField, AutoNetworkedField]
+    public float HeavyStaminaCost = 20f;
+
+    [DataField, AutoNetworkedField]
+    public int MaxTargets = 5;
 
     // Sounds
 
     /// <summary>
     /// This gets played whenever a melee attack is done. This is predicted by the client.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("soundSwing"), AutoNetworkedField]
-    public SoundSpecifier SwingSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/punchmiss.ogg")
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier SoundSwing { get; set; } = new SoundPathSpecifier("/Audio/Weapons/punchmiss.ogg")
     {
         Params = AudioParams.Default.WithVolume(-3f).WithVariation(0.025f),
     };
@@ -130,16 +148,14 @@ public sealed partial class MeleeWeaponComponent : Component
     // then a player may doubt if the target actually took damage or not.
     // If overwatch and apex do this then we probably should too.
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("soundHit"), AutoNetworkedField]
-    public SoundSpecifier? HitSound;
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? SoundHit;
 
     /// <summary>
     /// Plays if no damage is done to the target entity.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("soundNoDamage"), AutoNetworkedField]
-    public SoundSpecifier NoDamageSound { get; set; } = new SoundCollectionSpecifier("WeakHit");
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier SoundNoDamage { get; set; } = new SoundCollectionSpecifier("WeakHit");
 }
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index e59b4a13fed..b5a537b7e15 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -4,7 +4,9 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
+using Content.Shared.Contests;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
@@ -12,7 +14,6 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
-using Content.Shared.Item;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
@@ -27,35 +28,30 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Robust.Shared.Toolshed.Syntax;
 using ItemToggleMeleeWeaponComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleMeleeWeaponComponent;
 
 namespace Content.Shared.Weapons.Melee;
 
 public abstract class SharedMeleeWeaponSystem : EntitySystem
 {
-    [Dependency] protected readonly ISharedAdminLogManager   AdminLogger     = default!;
-    [Dependency] protected readonly ActionBlockerSystem      Blocker         = default!;
-    [Dependency] protected readonly SharedCombatModeSystem   CombatMode      = default!;
-    [Dependency] protected readonly DamageableSystem         Damageable      = default!;
-    [Dependency] protected readonly SharedInteractionSystem  Interaction     = default!;
-    [Dependency] protected readonly IMapManager              MapManager      = default!;
-    [Dependency] protected readonly SharedPopupSystem        PopupSystem     = default!;
-    [Dependency] protected readonly IGameTiming              Timing          = default!;
-    [Dependency] protected readonly SharedTransformSystem    TransformSystem = default!;
-    [Dependency] private   readonly InventorySystem         _inventory       = default!;
-    [Dependency] private   readonly MeleeSoundSystem        _meleeSound      = default!;
-    [Dependency] private   readonly SharedPhysicsSystem     _physics         = default!;
-    [Dependency] private   readonly IPrototypeManager       _protoManager    = default!;
-    [Dependency] private   readonly StaminaSystem           _stamina         = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
+    [Dependency] protected readonly SharedCombatModeSystem CombatMode = default!;
+    [Dependency] protected readonly DamageableSystem Damageable = default!;
+    [Dependency] protected readonly SharedInteractionSystem Interaction = default!;
+    [Dependency] protected readonly IMapManager MapManager = default!;
+    [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
+    [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly MeleeSoundSystem _meleeSound = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly StaminaSystem _stamina = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
-    /// <summary>
-    /// Maximum amount of targets allowed for a wide-attack.
-    /// </summary>
-    public const int MaxTargets = 5;
-
     /// <summary>
     /// If an attack is released within this buffer it's assumed to be full damage.
     /// </summary>
@@ -80,8 +76,7 @@ public override void Initialize()
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent,
-                            MapInitEvent>                   (OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -252,7 +247,11 @@ public FixedPoint2 GetHeavyDamageModifier(EntityUid uid, EntityUid user, MeleeWe
         var ev = new GetHeavyDamageModifierEvent(uid, component.ClickDamageModifier, 1, user);
         RaiseLocalEvent(uid, ref ev);
 
-        return ev.DamageModifier * ev.Multipliers;
+        return ev.DamageModifier
+                * ev.Multipliers
+                * component.HeavyDamageBaseModifier
+                * _contests.StaminaContest(user, false, 2f) //Taking stamina damage reduces wide swing damage by up to 50%
+                / _contests.HealthContest(user, false, 0.8f); //Being injured grants up to 20% more wide swing damage
     }
 
     public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen(true)] out MeleeWeaponComponent? melee)
@@ -340,6 +339,8 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         if (!CombatMode.IsInCombatMode(user))
             return false;
 
+        var fireRateSwingModifier = 1f;
+
         switch (attack)
         {
             case LightAttackEvent light:
@@ -359,6 +360,9 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
                 if (!Blocker.CanAttack(user, disarmTarget, (weaponUid, weapon), true))
                     return false;
                 break;
+            case HeavyAttackEvent:
+                fireRateSwingModifier *= weapon.HeavyRateModifier;
+                break;
             default:
                 if (!Blocker.CanAttack(user, weapon: (weaponUid, weapon)))
                     return false;
@@ -366,7 +370,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         }
 
         // Windup time checked elsewhere.
-        var fireRate = TimeSpan.FromSeconds(1f / GetAttackRate(weaponUid, user, weapon));
+        var fireRate = TimeSpan.FromSeconds(1f / GetAttackRate(weaponUid, user, weapon) * fireRateSwingModifier);
         var swings = 0;
 
         // TODO: If we get autoattacks then probably need a shotcounter like guns so we can do timing properly.
@@ -436,8 +440,9 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
 
     protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
     {
-        // If I do not come back later to fix Light Attacks being Heavy Attacks you can throw me in the spider pit -Errant
-        var damage = GetDamage(meleeUid, user, component) * GetHeavyDamageModifier(meleeUid, user, component);
+        var damage = GetDamage(meleeUid, user, component)
+                    * _contests.StaminaContest(user) //Taking stamina damage reduces light attack damage by up to 25%
+                    / _contests.HealthContest(user, false, 0.8f); //Being injured grants up to 20% more damage;
         var target = GetEntity(ev.Target);
 
         // For consistency with wide attacks stuff needs damageable.
@@ -526,7 +531,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         }
     }
 
-    protected abstract void DoDamageEffect(List<EntityUid> targets, EntityUid? user,  TransformComponent targetXform);
+    protected abstract void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform);
 
     private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
     {
@@ -541,9 +546,9 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
 
         var userPos = TransformSystem.GetWorldPosition(userXform);
         var direction = targetMap.Position - userPos;
-        var distance = Math.Min(component.Range, direction.Length());
+        var distance = Math.Min(component.Range * component.HeavyRangeModifier, direction.Length());
 
-        var damage = GetDamage(meleeUid, user, component);
+        var damage = GetDamage(meleeUid, user, component) * GetHeavyDamageModifier(meleeUid, user, component);
         var entities = GetEntityList(ev.Entities);
 
         if (entities.Count == 0)
@@ -567,11 +572,9 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             return true;
         }
 
-        // Naughty input
-        if (entities.Count > MaxTargets)
-        {
-            entities.RemoveRange(MaxTargets, entities.Count - MaxTargets);
-        }
+        var maxTargets = component.MaxTargets;
+        if (entities.Count > maxTargets)
+            entities.RemoveRange(maxTargets, entities.Count - maxTargets);
 
         // Validate client
         for (var i = entities.Count - 1; i >= 0; i--)
@@ -666,6 +669,10 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             DoDamageEffect(targets, user, Transform(targets[0]));
         }
 
+        if (TryComp<StaminaComponent>(user, out var stamina))
+            _stamina.TakeStaminaDamage(user, component.HeavyStaminaCost, stamina);
+
+
         return true;
     }
 
@@ -785,20 +792,20 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 meleeWeapon.Damage = itemToggleMelee.ActivatedDamage;
             }
 
-            meleeWeapon.HitSound = itemToggleMelee.ActivatedSoundOnHit;
+            meleeWeapon.SoundHit = itemToggleMelee.ActivatedSoundOnHit;
 
             if (itemToggleMelee.ActivatedSoundOnHitNoDamage != null)
             {
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
-                itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.NoDamageSound;
-                meleeWeapon.NoDamageSound = itemToggleMelee.ActivatedSoundOnHitNoDamage;
+                itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.SoundNoDamage;
+                meleeWeapon.SoundNoDamage = itemToggleMelee.ActivatedSoundOnHitNoDamage;
             }
 
             if (itemToggleMelee.ActivatedSoundOnSwing != null)
             {
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
-                itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SwingSound;
-                meleeWeapon.SwingSound = itemToggleMelee.ActivatedSoundOnSwing;
+                itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SoundSwing;
+                meleeWeapon.SoundSwing = itemToggleMelee.ActivatedSoundOnSwing;
             }
 
             if (itemToggleMelee.DeactivatedSecret)
@@ -809,13 +816,13 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
             if (itemToggleMelee.DeactivatedDamage != null)
                 meleeWeapon.Damage = itemToggleMelee.DeactivatedDamage;
 
-            meleeWeapon.HitSound = itemToggleMelee.DeactivatedSoundOnHit;
+            meleeWeapon.SoundHit = itemToggleMelee.DeactivatedSoundOnHit;
 
             if (itemToggleMelee.DeactivatedSoundOnHitNoDamage != null)
-                meleeWeapon.NoDamageSound = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
+                meleeWeapon.SoundNoDamage = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
 
             if (itemToggleMelee.DeactivatedSoundOnSwing != null)
-                meleeWeapon.SwingSound = itemToggleMelee.DeactivatedSoundOnSwing;
+                meleeWeapon.SoundSwing = itemToggleMelee.DeactivatedSoundOnSwing;
 
             if (itemToggleMelee.DeactivatedSecret)
                 meleeWeapon.Hidden = true;
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/Ambience/Objects/prober_hum_dangerous.ogg b/Resources/Audio/Ambience/Objects/prober_hum_dangerous.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_dangerous.ogg
diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg b/Resources/Audio/Ambience/Objects/prober_hum_high.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_high.ogg
diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg b/Resources/Audio/Ambience/Objects/prober_hum_low.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_low.ogg
diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg b/Resources/Audio/Ambience/Objects/prober_hum_moderate.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_moderate.ogg
diff --git a/Resources/Audio/Ambience/Objects/shower_enable.ogg b/Resources/Audio/Ambience/Objects/shower_enable.ogg
new file mode 100644
index 00000000000..98f41fbffb1
Binary files /dev/null and b/Resources/Audio/Ambience/Objects/shower_enable.ogg differ
diff --git a/Resources/Audio/Ambience/Objects/shower_running.ogg b/Resources/Audio/Ambience/Objects/shower_running.ogg
new file mode 100644
index 00000000000..9114b0c7dab
Binary files /dev/null and b/Resources/Audio/Ambience/Objects/shower_running.ogg differ
diff --git a/Resources/Audio/DeltaV/Items/gavel.ogg b/Resources/Audio/DeltaV/Items/gavel.ogg
new file mode 100644
index 00000000000..c6061cbb3dd
Binary files /dev/null and b/Resources/Audio/DeltaV/Items/gavel.ogg differ
diff --git a/Resources/Audio/Effects/CPR.ogg b/Resources/Audio/Effects/CPR.ogg
new file mode 100644
index 00000000000..2c7cedd2033
Binary files /dev/null and b/Resources/Audio/Effects/CPR.ogg differ
diff --git a/Resources/Audio/Effects/silence.ogg b/Resources/Audio/Effects/silence.ogg
new file mode 100644
index 00000000000..91738108486
Binary files /dev/null and b/Resources/Audio/Effects/silence.ogg differ
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/Audio/Nyanotrasen/Psionics/attributions.yml b/Resources/Audio/Psionics/attributions.yml
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Psionics/attributions.yml
rename to Resources/Audio/Psionics/attributions.yml
diff --git a/Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg b/Resources/Audio/Psionics/heartbeat_fast.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg
rename to Resources/Audio/Psionics/heartbeat_fast.ogg
diff --git a/Resources/Audio/Voice/Vulpkanin/attritbutions.yml b/Resources/Audio/Voice/Vulpkanin/attritbutions.yml
new file mode 100644
index 00000000000..125f8a9b85b
--- /dev/null
+++ b/Resources/Audio/Voice/Vulpkanin/attritbutions.yml
@@ -0,0 +1,4 @@
+- files: [vulpscream1, vulpscream2, vulpscream3, vulpscream4, vulpscream5]
+  copyright: 'inspectorj'
+  license: https://www.soundsnap.com/licence
+  source: https://www.soundsnap.com
diff --git a/Resources/Audio/Voice/Vulpkanin/vulpscream1.ogg b/Resources/Audio/Voice/Vulpkanin/vulpscream1.ogg
new file mode 100644
index 00000000000..2f76639d13d
Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulpscream1.ogg differ
diff --git a/Resources/Audio/Voice/Vulpkanin/vulpscream2.ogg b/Resources/Audio/Voice/Vulpkanin/vulpscream2.ogg
new file mode 100644
index 00000000000..594e25f47e9
Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulpscream2.ogg differ
diff --git a/Resources/Audio/Voice/Vulpkanin/vulpscream3.ogg b/Resources/Audio/Voice/Vulpkanin/vulpscream3.ogg
new file mode 100644
index 00000000000..6d66c4a6e1f
Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulpscream3.ogg differ
diff --git a/Resources/Audio/Voice/Vulpkanin/vulpscream4.ogg b/Resources/Audio/Voice/Vulpkanin/vulpscream4.ogg
new file mode 100644
index 00000000000..594cc082bcf
Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulpscream4.ogg differ
diff --git a/Resources/Audio/Voice/Vulpkanin/vulpscream5.ogg b/Resources/Audio/Voice/Vulpkanin/vulpscream5.ogg
new file mode 100644
index 00000000000..fc755173b33
Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulpscream5.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9709714067f..ec7e988ab8b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4934,3 +4934,466 @@ Entries:
       message: Lamiae should now be rendered much better.
   id: 6217
   time: '2024-08-05T17:15:51.0000000+00:00'
+- author: gluesniffler
+  changes:
+    - type: Add
+      message: Added an unlockable PKA and Jetpack module to Salvage Cyborgs
+  id: 6218
+  time: '2024-08-06T01:14:31.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Arachne have been reimplemented!
+    - type: Add
+      message: Oneirophages are back!
+  id: 6219
+  time: '2024-08-06T04:52:32.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        CPR has been added to the game. People with CPR training can now perform
+        CPR on anyone who is in either crit or dead states. 
+    - type: Add
+      message: >-
+        CPR Training has been added to the game as a new positive trait. All
+        medical staff start with this trait for free. 
+  id: 6220
+  time: '2024-08-06T05:28:54.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add the Self-Aware trait, a 2-point trait that allows you to examine
+        your Brute/Burn damage numbers like a health analyzer, and estimate your
+        toxin/airloss damage.
+  id: 6221
+  time: '2024-08-06T08:05:59.0000000+00:00'
+- author: TJohnson
+  changes:
+    - type: Tweak
+      message: >-
+        Removed overlay restriction for vulps, you can now have as many overlay
+        markings as you want!
+  id: 6222
+  time: '2024-08-06T19:05:46.0000000+00:00'
+- author: whateverusername0
+  changes:
+    - type: Add
+      message: Added different stamina damage resistance to hardsuits.
+  id: 6223
+  time: '2024-08-06T19:08:48.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add the Blood Deficiency trait, a new negative trait that makes you
+        slowly lose blood over time. You must routinely receive blood loss
+        treatment to live, and even normally non-lethal bleeding can make you
+        start dying slowly.
+  id: 6224
+  time: '2024-08-06T19:12:34.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add three new 1-point traits for Onis that allow you to specialize in
+        Slash or Piercing damage or be a melee weapons generalist.
+  id: 6225
+  time: '2024-08-06T19:50:20.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add Parkour Training, a 3-point trait that makes you faster with
+        climbing tables and crawling.
+  id: 6226
+  time: '2024-08-06T20:37:00.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Tweak
+      message: >-
+        EMP Grenades can now disable basically any electrical device, and stack
+        in disable duration.
+  id: 6227
+  time: '2024-08-06T20:47:49.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        Admin tooling: added several admin commands to help manipulate entities'
+        languages.
+  id: 6228
+  time: '2024-08-06T21:22:11.0000000+00:00'
+- author: Tilkku
+  changes:
+    - type: Add
+      message: Added Pen Lights
+    - type: Add
+      message: Eye Examination
+  id: 6229
+  time: '2024-08-06T21:51:21.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Add
+      message: >-
+        Gloves now have unique fingerprints. Items can be traced back to gloves,
+        which can then be traced back to people.
+  id: 6230
+  time: '2024-08-06T22:03:36.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Fix
+      message: Passive blood regeneration now works again.
+  id: 6231
+  time: '2024-08-07T06:07:35.0000000+00:00'
+- author: Fansana
+  changes:
+    - type: Fix
+      message: Barotrauma admin log spam
+  id: 6232
+  time: '2024-08-07T17:31:55.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: Mr. Butlertron can now suffer for its crimes.
+  id: 6233
+  time: '2024-08-07T22:38:04.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        The following new markings have been added for Harpies: Bat Wings,
+        Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked Tail
+  id: 6234
+  time: '2024-08-07T23:11:41.0000000+00:00'
+- author: DangerRevolution
+  changes:
+    - type: Add
+      message: Readded Psionic Relay Orb
+  id: 6235
+  time: '2024-08-07T23:16:30.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add two new negative traits: Sluggish (+1) and Snail-Paced (+2) that
+        make you move slower, and climb tables slower.
+  id: 6236
+  time: '2024-08-07T23:38:33.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add the Hemophilia trait, a new negative trait for 1 point that makes
+        you bleed twice as long and makes you take 10% more Blunt damage.
+  id: 6237
+  time: '2024-08-07T23:39:52.0000000+00:00'
+- author: SleepyScarecrow
+  changes:
+    - type: Fix
+      message: Fixed the RegenMesh recipe
+  id: 6238
+  time: '2024-08-07T23:51:29.0000000+00:00'
+- author: dootythefrooty
+  changes:
+    - type: Add
+      message: >-
+        Added Bluespace Slips, a plant trait that teleports you randomly if you
+        slip.
+  id: 6239
+  time: '2024-08-07T23:54:13.0000000+00:00'
+- author: BlueHNT
+  changes:
+    - type: Tweak
+      message: >-
+        Tweaked the formatting for WelderRefinable refineResult to use
+        EntitySpawnEntry format
+  id: 6240
+  time: '2024-08-08T00:16:02.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: Moths can now once again be colorful.
+  id: 6241
+  time: '2024-08-08T00:18:08.0000000+00:00'
+- author: ShatteredSwords
+  changes:
+    - type: Tweak
+      message: Skeleton ghost role description has been adjusted to be less evil.
+  id: 6242
+  time: '2024-08-09T10:52:49.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Geiger Counters other than ones installed in Hardsuits now generate an
+        audible sound when active and exposed to radiation.
+    - type: Add
+      message: Wall mounted geiger counters have been added to the game.
+  id: 6243
+  time: '2024-08-09T11:13:13.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Dionas have been given a 25% slower movement speed. In exchange for
+        that, they gain absolute slip immunity and movement speed modifier
+        immunity. This makes them immune to slowdown from things like
+        duffelbags, hardsuits, and spider webs.
+    - type: Fix
+      message: >-
+        Sluggish and Snail-Paced will now properly apply their movement
+        penalties upon joining. 
+  id: 6244
+  time: '2024-08-09T17:28:01.0000000+00:00'
+- author: ODJ
+  changes:
+    - type: Tweak
+      message: >-
+        Melee Weapons now feel different across the board, from the Wrench to
+        the Chainsaw, try out their normal swings and their heavy attacks!
+  id: 6245
+  time: '2024-08-10T12:00:06.0000000+00:00'
+- author: Rane
+  changes:
+    - type: Tweak
+      message: >-
+        Renamed "Psionic Mantis" to "Mantis", as it was originally going to be
+        called. 
+  id: 6246
+  time: '2024-08-10T12:03:12.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add Liquor Lifeline (-3 points), a new positive trait that makes you
+        slowly heal Brute and Burn damage when drunk, healing more the drunker
+        you are. The trait also gives you the benefits of Alcohol Tolerance.
+    - type: Tweak
+      message: >-
+        The cost of the Alcohol Tolerance trait has been reduced from -2 points
+        to -1 point.
+    - type: Add
+      message: Dwarves receive the Liquor Lifeline trait for free.
+  id: 6247
+  time: '2024-08-10T20:59:22.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Being injured now lets you deal up to 20% more damage in melee combat to
+        simulate the adrenaline rush from taking a hit.
+    - type: Add
+      message: >-
+        Taking stamina damage now makes you deal less damage in melee. Up to 25%
+        less for Light Attacks, and 50% less for Power Attacks
+    - type: Add
+      message: >-
+        Wide Swing has been reworked as "Power Attack". Power attacks cost 20
+        stamina(by default) to perform, and their effects can differ from Light
+        attacks on a per-weapon basis. Individual weapons can also have
+        different stamina costs to power attack with.
+  id: 6248
+  time: '2024-08-10T21:30:42.0000000+00:00'
+- author: Rane
+  changes:
+    - type: Remove
+      message: >-
+        Removed the spammable hugging on click. Consider using emotes for this
+        instead.
+  id: 6249
+  time: '2024-08-10T21:34:22.0000000+00:00'
+- author: VMSolidus and Skubman
+  changes:
+    - type: Add
+      message: >-
+        11 new Physical Traits have been added to the game! 6 positive traits,
+        and 5 negative traits.
+  id: 6250
+  time: '2024-08-10T21:36:09.0000000+00:00'
+- author: BlueHNT
+  changes:
+    - type: Add
+      message: Added `HidesBeard` tag
+  id: 6251
+  time: '2024-08-10T21:36:49.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Tweak
+      message: The maximum trait limit has increased from 5 traits to 10 traits.
+  id: 6252
+  time: '2024-08-11T02:08:37.0000000+00:00'
+- author: Xavier
+  changes:
+    - type: Fix
+      message: Crew monitor not working properly, now displays correctly.
+  id: 6253
+  time: '2024-08-12T02:22:27.0000000+00:00'
+- author: DangerRevolution
+  changes:
+    - type: Add
+      message: Added the Explorer's Labcoat and a Hairflower into Loadouts.
+    - type: Fix
+      message: Fixed Epistemics being unable to take Survival Boxes
+    - type: Fix
+      message: >-
+        Fixed the NearSighted trait making you unable to take glasses in your
+        loadout
+    - type: Add
+      message: Added a variety of Cowboy Hats into loadouts.
+  id: 6254
+  time: '2024-08-12T02:22:58.0000000+00:00'
+- author: musicmanvr
+  changes:
+    - type: Add
+      message: Added the Home Run Bat for Syndicate operatives. Send your foes flying!
+  id: 6255
+  time: '2024-08-12T16:43:11.0000000+00:00'
+- author: Tilkku
+  changes:
+    - type: Add
+      message: Added showers
+  id: 6256
+  time: '2024-08-12T16:46:05.0000000+00:00'
+- author: gluesniffler
+  changes:
+    - type: Tweak
+      message: Changed hardsuit descriptions to be slightly less LRP.
+    - type: Tweak
+      message: Changed paramedic voidsuit from a softsuit to a hardsuit.
+  id: 6257
+  time: '2024-08-12T21:43:52.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Fix
+      message: Whitelist requirements work properly
+  id: 6258
+  time: '2024-08-13T17:08:24.0000000+00:00'
+- author: Skubman and leonardo-dabepis
+  changes:
+    - type: Add
+      message: Onis now get a unique speech bubble, a black bubble with horns.
+    - type: Add
+      message: >-
+        Onis have received a distinct speech style that reflects their strength.
+        Hear them 'grunt', 'bellow', 'blare', and 'rumble' as they talk.
+    - type: Tweak
+      message: >-
+        The Nekomimetic language description has been changed to mention Onis
+        speaking it.
+  id: 6259
+  time: '2024-08-13T17:12:15.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: A ton of new plushies has arrived
+    - type: Add
+      message: >-
+        Prize counter are here, get your prizes by winning games and getting
+        prize tickets! and find prize balls!!
+  id: 6260
+  time: '2024-08-13T17:16:52.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Onis have received eight new pointy ear markings in the 'Head (Side)'
+        section that can help them resemble tieflings, orcs, elves, goblins,
+        trolls, and more.
+    - type: Add
+      message: >-
+        Onis get two new tusk markings in the 'Snout' section, and a Two-Toed
+        feet marking in the 'Legs' section.
+    - type: Add
+      message: >-
+        Felinids, Onis, and Harpies can now select Human nose markings like the
+        schnozz, blobby nose, and nubby nose.
+    - type: Add
+      message: >-
+        Felinids and Onis can now select the Chest Scar and Top Surgery Scar
+        markings.
+    - type: Tweak
+      message: Default Onis now use the Double Curved horn and Upward Ears markings.
+  id: 6261
+  time: '2024-08-13T21:12:45.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: Fix missing Psionic Regeneration sound effect
+  id: 6262
+  time: '2024-08-14T02:12:43.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Vulpkanins receive the Voracious trait for free, giving them 2x
+        eating/drinking speed, but Vulpkanins get hungrier 25% faster.
+    - type: Tweak
+      message: >-
+        Vulpkanins gain a 30% Cold resistance, but their Heat vulnerability has
+        increased from 15% to 30%. Vulpkanins also receive 25% more Fire stacks,
+        amplifying the damage and duration of being on fire.
+    - type: Tweak
+      message: Flash duration against Vulpkanins has been increased by 50%.
+  id: 6263
+  time: '2024-08-14T05:30:37.0000000+00:00'
+- author: dootythefrooty
+  changes:
+    - type: Add
+      message: Added crowned, tall bull, and tall curved Oni horns.
+  id: 6264
+  time: '2024-08-14T09:05:24.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        Added a new positive trait - singer. It allows you to play midi songs
+        without an instrument, similarly to harpies.
+  id: 6265
+  time: '2024-08-15T06:06:25.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: Xenowears! new non-human related clothings.
+  id: 6266
+  time: '2024-08-15T06:24:07.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: >-
+        Forensics Scent Type and Vulpkanins can now track scents, better keep
+        yourself clean!
+    - type: Tweak
+      message: >-
+        Vulpkanins eyes are sensetive, please dont flash them with lights as
+        this could damage them.
+    - type: Add
+      message: Vulpkanins now has their own screams!
+  id: 6267
+  time: '2024-08-15T07:11:05.0000000+00:00'
+- author: DangerRevolution
+  changes:
+    - type: Add
+      message: Adds a new blindfold variant into loadouts.
+  id: 6268
+  time: '2024-08-16T12:43:33.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        16 new horns for Onis have been added, with three-tone variants and some
+        striped variants! The new horns include the Serket, Nepeta, Vantas,
+        Makara, and more.
+    - type: Add
+      message: >-
+        The Oni horns Double Curved and Double Curved Outwards have received
+        three-tone variants.
+  id: 6269
+  time: '2024-08-18T05:52:22.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: You no longer need to have a station record to publish news.
+  id: 6270
+  time: '2024-08-18T18:11:10.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 6e47a71e43f..40424a21e0e 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, angelofallars, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, Tmanzxd, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, angelofallars, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlueHNT, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clorl, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, dootythefrooty, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, Fansana, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, gluesniffler, GNF54, Golinth, GoodWheatley, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, Tmanzxd, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/abilities/arachne.ftl b/Resources/Locale/en-US/abilities/arachne.ftl
new file mode 100644
index 00000000000..6f6348d7212
--- /dev/null
+++ b/Resources/Locale/en-US/abilities/arachne.ftl
@@ -0,0 +1,13 @@
+action-name-spin-web = Spin Web
+action-desc-spin-web = Use your spinnerets to make a spider web in the current tile. Makes you hungrier and thirstier.
+action-name-spin-web-space = You can't spin a web in space!
+action-name-spin-web-blocked = There's no room for a web here.
+spin-web-action-hungry = You're too hungry to spin a web!
+spin-web-action-thirsty = You're too thirsty to spin a web!
+spin-web-start-second-person = You start spinning a web.
+spin-web-start-third-person = {CAPITALIZE(THE($spider))} starts spinning a web!
+cocoon-start-second-person = You start cocooning {THE($target)}.
+cocoon-start-third-person = {CAPITALIZE(THE($spider))} starts cocooning {THE($target)}.
+spun-web-second-person = You spin up a web.
+spun-web-third-person = {CAPITALIZE(THE($spider))} spins up a web!
+cocoon = Cocoon
diff --git a/Resources/Locale/en-US/abilities/bloodsucker.ftl b/Resources/Locale/en-US/abilities/bloodsucker.ftl
new file mode 100644
index 00000000000..d956eaff84e
--- /dev/null
+++ b/Resources/Locale/en-US/abilities/bloodsucker.ftl
@@ -0,0 +1,19 @@
+action-name-suck-blood = Suck Blood
+action-description-suck-blood = Suck the blood of the victim in your hand.
+
+bloodsucker-fail-helmet = You'd need to remove {THE($helmet)}.
+bloodsucker-fail-mask = You'd need to remove your mask!
+
+bloodsucker-fail-not-blood = { CAPITALIZE(SUBJECT($target)) } doesn't have delicious, nourishing mortal blood.
+bloodsucker-fail-no-blood = { CAPITALIZE(SUBJECT($target)) } has no blood in { POSS-ADJ($target) } body.
+bloodsucker-fail-no-blood-bloodsucked = { CAPITALIZE(SUBJECT($target)) } has been sucked dry.
+
+bloodsucker-blood-sucked = You suck some blood from {$target}.
+bloodsucker-doafter-start = You try to suck blood from {$target}.
+
+bloodsucker-doafter-start-victim = {CAPITALIZE(THE($sucker))} is trying to bite your neck!
+bloodsucker-blood-sucked-victim = {CAPITALIZE(THE($sucker))} sucks some of your blood!
+
+bloodsucked-health-examine = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } bite marks on { POSS-ADJ($target) } neck.[/color]
+
+bloodsucker-glands-throb = The glands behind your fangs feel a bit sore.
diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/abilities/psionic.ftl
similarity index 74%
rename from Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
rename to Resources/Locale/en-US/abilities/psionic.ftl
index c3a9641768f..91ae21233a3 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/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/armor/armor-examine.ftl b/Resources/Locale/en-US/armor/armor-examine.ftl
index d49a1373f28..6dc511e66e5 100644
--- a/Resources/Locale/en-US/armor/armor-examine.ftl
+++ b/Resources/Locale/en-US/armor/armor-examine.ftl
@@ -17,3 +17,4 @@ armor-damage-type-cold = Cold
 armor-damage-type-poison = Poison
 armor-damage-type-shock = Shock
 armor-damage-type-structural = Structural
+armor-examine-stamina = Reduces your stamina damage by [color=cyan]{$num}%[/color].
\ No newline at end of file
diff --git a/Resources/Locale/en-US/bloodstream/bloodstream.ftl b/Resources/Locale/en-US/bloodstream/bloodstream.ftl
index 7d8f98c3087..65e475f1ab4 100644
--- a/Resources/Locale/en-US/bloodstream/bloodstream.ftl
+++ b/Resources/Locale/en-US/bloodstream/bloodstream.ftl
@@ -3,3 +3,7 @@ bloodstream-component-bleeding = [color=red]{CAPITALIZE(SUBJECT($target))} {CONJ
 bloodstream-component-profusely-bleeding = [color=crimson]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} profusely bleeding![/color]
 
 bloodstream-component-wounds-cauterized = You feel your wounds painfully close!
+
+bloodstream-component-selfaware-looks-pale = [color=bisque]You feel dizzy from blood loss.[/color]
+bloodstream-component-selfaware-bleeding = [color=red]You are bleeding.[/color]
+bloodstream-component-selfaware-profusely-bleeding = [color=crimson]You are profusely bleeding![/color]
diff --git a/Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl b/Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl
new file mode 100644
index 00000000000..c38b8605f2b
--- /dev/null
+++ b/Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl
@@ -0,0 +1 @@
+teleporting-trait-component-slipped = You slip through bluespace!
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
index f5cda2f2a18..cfa1b1424d2 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
@@ -19,3 +19,8 @@ log-probe-scan = Downloaded logs from {$device}!
 log-probe-label-time = Time
 log-probe-label-accessor = Accessed by
 log-probe-label-number = #
+
+glimmer-monitor-program-name = Glimmer Monitor
+glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
+glimmer-monitor-interval = Interval
+glimmer-monitor-sync = Sync
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index f4b0e25374a..d2fd0f41840 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -117,6 +117,12 @@ chat-speech-verb-vox-1 = screeches
 chat-speech-verb-vox-2 = shrieks
 chat-speech-verb-vox-3 = croaks
 
+chat-speech-verb-name-oni = Oni
+chat-speech-verb-oni-1 = grunts
+chat-speech-verb-oni-2 = bellows
+chat-speech-verb-oni-3 = blares
+chat-speech-verb-oni-4 = rumbles
+
 chat-speech-verb-name-canine = Canine
 chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs
diff --git a/Resources/Locale/en-US/chemistry/reagent-effects.ftl b/Resources/Locale/en-US/chemistry/reagent-effects.ftl
index 537770b35a5..cb55db111d6 100644
--- a/Resources/Locale/en-US/chemistry/reagent-effects.ftl
+++ b/Resources/Locale/en-US/chemistry/reagent-effects.ftl
@@ -1 +1 @@
-effect-sleepy = You feel a bit sleepy.
+effect-sleepy = You feel a bit sleepy.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/damage/damage-examine.ftl b/Resources/Locale/en-US/damage/damage-examine.ftl
index 974b8fa9650..9e24d4d2f72 100644
--- a/Resources/Locale/en-US/damage/damage-examine.ftl
+++ b/Resources/Locale/en-US/damage/damage-examine.ftl
@@ -5,6 +5,7 @@ damage-examinable-verb-message = Examine the damage values.
 damage-hitscan = hitscan
 damage-projectile = projectile
 damage-melee = melee
+damage-melee-heavy = power attack
 damage-throw = throw
 
 damage-examine = It does the following damage:
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/deltav/devices/device-network.ftl b/Resources/Locale/en-US/deltav/devices/device-network.ftl
new file mode 100644
index 00000000000..644d2e240a8
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/devices/device-network.ftl
@@ -0,0 +1,2 @@
+device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras
+
diff --git a/Resources/Locale/en-US/deltav/headset/headset-component.ftl b/Resources/Locale/en-US/deltav/headset/headset-component.ftl
index d3c3f2e7356..9801bce3ab2 100644
--- a/Resources/Locale/en-US/deltav/headset/headset-component.ftl
+++ b/Resources/Locale/en-US/deltav/headset/headset-component.ftl
@@ -1 +1,3 @@
+chat-radio-justice = Justice
 chat-radio-prison = Prison
+
diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl
new file mode 100644
index 00000000000..530a1b0a5ae
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/job/department-desc.ftl
@@ -0,0 +1,2 @@
+department-Justice-description = Uphold justice on the station.
+
diff --git a/Resources/Locale/en-US/deltav/job/department.ftl b/Resources/Locale/en-US/deltav/job/department.ftl
index fc6d81e938c..2653e8f46cc 100644
--- a/Resources/Locale/en-US/deltav/job/department.ftl
+++ b/Resources/Locale/en-US/deltav/job/department.ftl
@@ -1,2 +1,4 @@
 department-Epistemics = Epistemics
 department-Logistics = Logistics
+department-Justice = Justice
+
diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl
index 5bc7be83118..9e99f5838e9 100644
--- a/Resources/Locale/en-US/deltav/job/job-description.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-description.ftl
@@ -1 +1,5 @@
 job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
+job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment.
+job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
+job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
+job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
index dc7940ba983..175da8ba693 100644
--- a/Resources/Locale/en-US/deltav/job/job-names.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -1 +1,6 @@
 job-name-medical-borg = Medical Cyborg
+job-name-chief-justice = Chief Justice
+job-name-clerk = Clerk
+job-name-prosecutor = Prosecutor
+job-name-lawyer = Attorney
+job-name-courier = Courier
diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl
new file mode 100644
index 00000000000..f1c0ade32a5
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl
@@ -0,0 +1,2 @@
+job-supervisors-cj = the chief justice
+
diff --git a/Resources/Locale/en-US/deltav/misc/pda.ftl b/Resources/Locale/en-US/deltav/misc/pda.ftl
new file mode 100644
index 00000000000..a64a4e34231
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/misc/pda.ftl
@@ -0,0 +1,4 @@
+ent-HoSPDA = head of security pda
+    .desc = Smells like donuts and gunpowder residue.
+ent-LawyerPDA = attorney pda
+    .desc = For attornies to poach dubious clients.
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
index 7b2d06a04e7..8d2571920ff 100644
--- a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -30,3 +30,7 @@ station-beacon-boxing-ring = Boxing
 station-beacon-park = Park
 
 station-beacon-corpsman = Corpsman
+
+station-beacon-justice = Justice
+station-beacon-chiefjustice = Chief Justice
+station-beacon-prosecutor = Prosecutor
diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
index 8c591e771f1..cfa5279baa0 100644
--- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
@@ -1,2 +1,5 @@
 stamp-component-stamped-name-lawyer = Lawyer
-stamp-component-stamped-name-psychologist = Psychologist
\ No newline at end of file
+stamp-component-stamped-name-psychologist = Psychologist
+stamp-component-stamped-name-notary = NOTARY
+stamp-component-stamped-name-chiefjustice = Chief Justice
+
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
index 84245872f54..3ebfe8bf1b1 100644
--- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -1,3 +1,6 @@
-id-card-access-level-orders = Orders
-id-card-access-level-mantis = Psionic Mantis
+id-card-access-level-orders = Orders
+id-card-access-level-mantis = Mantis
+id-card-access-level-chief-justice = Chief Justice
+id-card-access-level-prosecutor = Prosecutor
+id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/forensics/scent.ftl b/Resources/Locale/en-US/forensics/scent.ftl
new file mode 100644
index 00000000000..083237f7f73
--- /dev/null
+++ b/Resources/Locale/en-US/forensics/scent.ftl
@@ -0,0 +1,10 @@
+track-scent = Track scent
+stop-track-scent = Stop tracking scent
+
+start-tracking-scent = {CAPITALIZE($user)} start tracking the scent of the {CAPITALIZE($target)}
+stopped-tracking-scent = You stopped tracking the scent
+
+tracking-scent = You are now tracking the {CAPITALIZE($target)} scent
+no-scent = There no scent to track
+
+examined-scent = [color=#ffff00]Has the scent you're tracking.[/color]
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index 096180014fe..9260db903fc 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -161,7 +161,7 @@ ghost-role-information-skeleton-biker-name = Skeleton Biker
 ghost-role-information-skeleton-biker-description = Ride around on your sweet ride.
 
 ghost-role-information-closet-skeleton-name = Closet Skeleton
-ghost-role-information-closet-skeleton-description = You are a closet skeleton! You are mysterious force of chaos! You can either join the crew and use your skeletal antics to help them, or be a a prankster, and hinder their efforts!
+ghost-role-information-closet-skeleton-description = You are a closet skeleton! You are a primordial force of chaos with no allegiance! You can either join the crew and use your skeletal antics to help them, or be a a prankster, and hinder their efforts!
 
 ghost-role-information-onestar-mecha-name = Onestar Mecha
 ghost-role-information-onestar-mecha-description = You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby...
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 75670b2bf72..ca6be1257e4 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -350,3 +350,21 @@ reagent-effect-guidebook-missing =
         [1] Causes
         *[other] cause
     } an unknown effect as nobody has written this effect yet
+
+reagent-effect-guidebook-change-glimmer-reaction-effect =
+    { $chance ->
+        [1] Modifies
+        *[other] modify
+    } the glimmer count by {$count} points
+
+reagent-effect-guidebook-chem-remove-psionic =
+    { $chance ->
+        [1] Removes
+        *[other] remove
+    } psionic powers
+
+reagent-effect-guidebook-chem-reroll-psionic =
+    { $chance ->
+        [1] Allows
+        *[other] allow
+    } a chance to get a different psionic power
\ No newline at end of file
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 72746dbf51f..968d3b20038 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -70,3 +70,7 @@ guide-entry-space-ninja = Space Ninja
 
 guide-entry-writing = Writing
 guide-entry-glossary = Glossary
+
+guide-entry-altars-golemancy = Altars and Golemancy
+guide-entry-psionics = Psionics
+guide-entry-reverse-engineering = Reverse Engineering
diff --git a/Resources/Locale/en-US/health-examinable/health-examinable-selfaware.ftl b/Resources/Locale/en-US/health-examinable/health-examinable-selfaware.ftl
new file mode 100644
index 00000000000..897c3f718de
--- /dev/null
+++ b/Resources/Locale/en-US/health-examinable/health-examinable-selfaware.ftl
@@ -0,0 +1,22 @@
+health-examinable-selfaware-none = You feel healthy and well.
+
+health-examinable-selfaware-type-text = You have {$damageType}, around [bold]{$amount}[/bold].
+
+health-examinable-selfaware-type-Blunt = [color=red]Blunt[/color] trauma
+health-examinable-selfaware-type-Slash = [color=red]Slash[/color] wounds
+health-examinable-selfaware-type-Piercing = [color=red]Piercing[/color] wounds
+
+health-examinable-selfaware-type-Heat = [color=orange]Heat[/color] burns
+health-examinable-selfaware-type-Shock = [color=lightgoldenrodyellow]Shock[/color] burns
+health-examinable-selfaware-type-Cold = [color=lightblue]Cold[/color] burns
+health-examinable-selfaware-type-Caustic = [color=yellowgreen]Caustic[/color] burns
+
+health-examinable-selfaware-group-Toxin-10 = [color=green]You feel sick.[/color]
+health-examinable-selfaware-group-Toxin-25 = [color=green]You feel nauseated.[/color]
+health-examinable-selfaware-group-Toxin-40 = [color=green]You feel very unwell![/color]
+health-examinable-selfaware-group-Toxin-60 = [color=green]You feel gravely ill![/color]
+
+health-examinable-selfaware-group-Airloss-10 = [color=lightblue]You feel lightheaded.[/color]
+health-examinable-selfaware-group-Airloss-25 = [color=lightblue]You feel faint and woozy.[/color]
+health-examinable-selfaware-group-Airloss-40 = [color=lightblue]You're struggling to breathe![/color]
+health-examinable-selfaware-group-Airloss-60 = [color=lightblue]You're suffocating badly![/color]
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index bb56233ff14..a6eacf13c5d 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -77,12 +77,6 @@ comp-window-knock = *knock knock*
 
 fence-rattle-success = *rattle*
 
-## Hugging players
-
-hugging-success-generic = You hug {THE($target)}.
-hugging-success-generic-others = { CAPITALIZE(THE($user)) } hugs {THE($target)}.
-hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you.
-
 ## Other
 
 petting-success-tesla = You pet {THE($target)}, violating the laws of nature and physics.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index bcfdc9205de..19d2db94518 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -24,7 +24,8 @@ job-name-centcomoff = CentCom Official
 job-name-reporter = Reporter
 job-name-musician = Musician
 job-name-librarian = Librarian
-job-name-lawyer = Lawyer
+# DeltaV - Changed Lawyer to Attorney
+# job-name-lawyer = Lawyer
 job-name-mime = Mime
 job-name-ce = Chief Engineer
 job-name-janitor = Janitor
diff --git a/Resources/Locale/en-US/language/commands.ftl b/Resources/Locale/en-US/language/commands.ftl
index ba2b3160094..65959e3f28f 100644
--- a/Resources/Locale/en-US/language/commands.ftl
+++ b/Resources/Locale/en-US/language/commands.ftl
@@ -14,3 +14,21 @@ command-language-entry = {$id}. {$language} - {$name}
 
 command-language-invalid-number = The language number must be between 0 and {$total}. Alternatively, use the language name.
 command-language-invalid-language = The language {$id} does not exist or you cannot speak it.
+
+# toolshed
+
+command-description-language-add = Adds a new language to the piped entity. The two last arguments indicate whether it should be spoken/understood. Example: 'self language:add "Canilunzt" true true'
+command-description-language-rm = Removes a language from the piped entity. Works similarly to language:add. Example: 'self language:rm "GalacticCommon" true true'.
+command-description-language-lsspoken = Lists all languages the entity can speak. Example: 'self language:lsspoken'
+command-description-language-lsunderstood = Lists all languages the entity can understand. Example: 'self language:lssunderstood'
+
+command-description-translator-addlang = Adds a new target language to the piped translator entity. See language:add for details.
+command-description-translator-rmlang = Removes a target language from the piped translator entity. See language:rm for details.
+command-description-translator-addrequired = Adds a new required language to the piped translator entity. Example: 'ent 1234 translator:addrequired "GalacticCommon"'
+command-description-translator-rmrequired = Removes a required language from the piped translator entity. Example: 'ent 1234 translator:rmrequired "GalacticCommon"'
+command-description-translator-lsspoken = Lists all spoken languages for the piped translator entity. Example: 'ent 1234 translator:lsspoken'
+command-description-translator-lsunderstood = Lists all understood languages for the piped translator entity. Example: 'ent 1234 translator:lssunderstood'
+command-description-translator-lsrequired = Lists all required languages for the piped translator entity. Example: 'ent 1234 translator:lsrequired'
+
+command-language-error-this-will-not-work = This will not work.
+command-language-error-not-a-translator = Entity {$entity} is not a translator.
diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl
index d44b6648397..9d0947d5389 100644
--- a/Resources/Locale/en-US/language/languages.ftl
+++ b/Resources/Locale/en-US/language/languages.ftl
@@ -14,7 +14,7 @@ language-RootSpeak-name = Rootspeak
 language-RootSpeak-description = The strange whistling-style language spoken by the Diona.
 
 language-Nekomimetic-name = Nekomimetic
-language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids, it's somehow comprehensible.
+language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the Felinids and Oni, it's somehow comprehensible.
 
 language-Draconic-name = Draconic
 language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles.
diff --git a/Resources/Locale/en-US/loadouts/eyes.ftl b/Resources/Locale/en-US/loadouts/eyes.ftl
index e1ee7edce70..31d7f49fa03 100644
--- a/Resources/Locale/en-US/loadouts/eyes.ftl
+++ b/Resources/Locale/en-US/loadouts/eyes.ftl
@@ -1,2 +1,5 @@
 loadout-description-LoadoutEyesEyepatch = Eyewear, for the fashionista without an eye.
 loadout-description-LoadoutEyesBlindfold = Why would you want this?
+
+loadout-name-LoadoutItemBlindfoldFake = "blindfold"
+loadout-description-LoadoutItemBlindfoldFake = This product may not work as advertised.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/markings/goblin_markings.ftl b/Resources/Locale/en-US/markings/goblin_markings.ftl
new file mode 100644
index 00000000000..21b1afea238
--- /dev/null
+++ b/Resources/Locale/en-US/markings/goblin_markings.ftl
@@ -0,0 +1,9 @@
+# goblin tusks
+marking-GoblinTusksBasic = No Tusks
+marking-GoblinTusksBasic-goblin_tusks_none = No Tusks
+
+marking-GoblinTusksSmall = Small Tusks
+marking-GoblinTusksSmall-goblin_tusks_small = Small Tusks
+
+marking-GoblinTusksBig = Long Tusks
+marking-GoblinTusksBig-goblin_tusks_big = Long Tusks
diff --git a/Resources/Locale/en-US/markings/harpy.ftl b/Resources/Locale/en-US/markings/harpy.ftl
index 6d6ba75a936..724207c3ef8 100644
--- a/Resources/Locale/en-US/markings/harpy.ftl
+++ b/Resources/Locale/en-US/markings/harpy.ftl
@@ -40,6 +40,14 @@ marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
 marking-HarpyWingTipsClassic-harpy_wingtip_1 = Main
 marking-HarpyWingTipsClassic-harpy_wingtip_2 = Feathertips
 
+marking-HarpyWingBat = Bat Wings (Whitescale)
+marking-HarpyWingBat-bat_wings_tone_1 = Limbs
+marking-HarpyWingBat-bat_wings_tone_2 = Membrane
+
+marking-HarpyWingBionic = Simple Bionic Wings (Whitescale)
+marking-HarpyWingBionic-bionic_wings_tone_1 = Wings
+marking-HarpyWingBionic-bionic_wings_tone_2 = Lights (Unshaded)
+
 marking-HarpyEarsDefault = Feather Tufts
 marking-HarpyEarsDefault-harpy_ears_default = Tufts
 
@@ -65,6 +73,16 @@ marking-HarpyTailPeacock = Peacock Tail
 marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
 marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
 
+marking-HarpyTailHaven = Haven Tail (Whitescale)
+marking-HarpyTailHaven-haven_tone_1 = Outer Feathers
+marking-HarpyTailHaven-haven_tone_2 = Inner Feathers
+
+marking-HarpyTailForkedLong = Long Forked Tail (Whitescale)
+marking-HarpyTailForkedLong-forked_long = Tail
+
+marking-HarpyTailSwallow = Swallow Tail (Whitescale)
+marking-HarpyTailForkedLong-forked_long = Tail
+
 marking-HarpyChestDefault = Wing & Groin Under-Clothes
 marking-HarpyChestDefault-upper = Wing Under-Clothes
 marking-HarpyChestDefault-lower = Groin Under-Clothes
diff --git a/Resources/Locale/en-US/markings/oni.ftl b/Resources/Locale/en-US/markings/oni.ftl
new file mode 100644
index 00000000000..abc77e96d17
--- /dev/null
+++ b/Resources/Locale/en-US/markings/oni.ftl
@@ -0,0 +1,176 @@
+marking-OniHornTallCurved = Tall Curved
+marking-OniHornTallCurved-tall_curved = Tall Curved
+
+marking-OniHornTallCurved3Tone = Tall Curved (Three Tone)
+marking-OniHornTallCurved3Tone-tall_curved_3tone_1 = Bottom Third
+marking-OniHornTallCurved3Tone-tall_curved_3tone_2 = Middle Third
+marking-OniHornTallCurved3Tone-tall_curved_3tone_3 = Top Third
+
+marking-OniHornTallBull= Tall Bull
+marking-OniHornTallBull-tall_bull = Tall Bull
+
+marking-OniHornTallBull3Tone = Tall Bull (Three Tone)
+marking-OniHornTallBull3Tone-tall_bull_3tone_1 = Bottom Third
+marking-OniHornTallBull3Tone-tall_bull_3tone_2 = Middle Third
+marking-OniHornTallBull3Tone-tall_bull_3tone_3 = Top Third
+
+marking-OniHornCrowned = Crowned
+marking-OniHornCrowned-crowned = Crowned
+
+marking-OniHornSerket = Serket
+marking-OniHornSerket-serket = Serket
+
+marking-OniHornSerket3Tone = Serket (Three Tone)
+marking-OniHornSerket3Tone-serket_3tone_1 = Bottom Third
+marking-OniHornSerket3Tone-serket_3tone_2 = Middle Third
+marking-OniHornSerket3Tone-serket_3tone_3 = Top Third
+
+marking-OniHornPisces = Pisces
+marking-OniHornPisces-pisces = Pisces
+
+marking-OniHornPisces2Tone = Pisces (Striped)
+marking-OniHornPisces2Tone-pisces_2tone_1 = Even stripes
+marking-OniHornPisces2Tone-pisces_2tone_2 = Odd stripes
+
+marking-OniHornPisces3Tone = Pisces (Three Tone)
+marking-OniHornPisces3Tone-pisces_3tone_1 = Bottom Third
+marking-OniHornPisces3Tone-pisces_3tone_2 = Middle Third
+marking-OniHornPisces3Tone-pisces_3tone_3 = Top Third
+
+marking-OniHornVirgo = Virgo
+marking-OniHornVirgo-virgo = Virgo
+
+marking-OniHornVirgo3Tone = Virgo (Three Tone)
+marking-OniHornVirgo3Tone-virgo_3tone_1 = Bottom Third
+marking-OniHornVirgo3Tone-virgo_3tone_2 = Middle Third
+marking-OniHornVirgo3Tone-virgo_3tone_3 = Top Third
+
+marking-OniHornSagittarius = Sagittarius
+marking-OniHornSagittarius-sagittarius = Sagittarius
+
+marking-OniHornSagittarius3Tone = Sagittarius (Three Tone)
+marking-OniHornSagittarius3Tone-sagittarius_3tone_1 = Bottom Third
+marking-OniHornSagittarius3Tone-sagittarius_3tone_2 = Middle Third
+marking-OniHornSagittarius3Tone-sagittarius_3tone_3 = Top Third
+
+marking-OniHornVantas = Vantas
+marking-OniHornVantas-vantas = Vantas
+
+marking-OniHornVantas3Tone = Vantas (Three Tone)
+marking-OniHornVantas3Tone-vantas_3tone_1 = Bottom Third
+marking-OniHornVantas3Tone-vantas_3tone_2 = Middle Third
+marking-OniHornVantas3Tone-vantas_3tone_3 = Top Third
+
+marking-OniHornMakara = Makara
+marking-OniHornMakara-makara = Makara
+
+marking-OniHornMakara2Tone = Makara (Striped)
+marking-OniHornMakara2Tone-makara_2tone_1 = Even stripes
+marking-OniHornMakara2Tone-makara_2tone_2 = Odd stripes
+
+marking-OniHornMakara3Tone = Makara (Three Tone)
+marking-OniHornMakara3Tone-makara_3tone_1 = Bottom Third
+marking-OniHornMakara3Tone-makara_3tone_2 = Middle Third
+marking-OniHornMakara3Tone-makara_3tone_3 = Top Third
+
+marking-OniHornNepeta = Nepeta
+marking-OniHornNepeta-nepeta = Nepeta
+
+marking-OniHornNepeta3Tone = Nepeta (Three Tone)
+marking-OniHornNepeta3Tone-nepeta_3tone_1 = Bottom Third
+marking-OniHornNepeta3Tone-nepeta_3tone_2 = Middle Third
+marking-OniHornNepeta3Tone-nepeta_3tone_3 = Top Third
+
+marking-OniHornTaurus = Taurus
+marking-OniHornTaurus-taurus = Taurus
+
+marking-OniHornTaurus2Tone = Taurus (Striped)
+marking-OniHornTaurus2Tone-taurus_2tone_1 = Even stripes
+marking-OniHornTaurus2Tone-taurus_2tone_2 = Odd stripes
+
+marking-OniHornTaurus3Tone = Taurus (Three Tone)
+marking-OniHornTaurus3Tone-taurus_3tone_1 = Bottom Third
+marking-OniHornTaurus3Tone-taurus_3tone_2 = Middle Third
+marking-OniHornTaurus3Tone-taurus_3tone_3 = Top Third
+
+marking-OniHornAries = Aries
+marking-OniHornAries-aries = Aries
+
+marking-OniHornAries3Tone = Aries (Three Tone)
+marking-OniHornAries3Tone-aries_3tone_1 = Bottom Third
+marking-OniHornAries3Tone-aries_3tone_2 = Middle Third
+marking-OniHornAries3Tone-aries_3tone_3 = Top Third
+
+marking-OniHornTavris = Tavris
+marking-OniHornTavris-tavris = Tavris
+
+marking-OniHornTavris3Tone = Tavris (Three Tone)
+marking-OniHornTavris3Tone-tavris_3tone_1 = Bottom Third
+marking-OniHornTavris3Tone-tavris_3tone_2 = Middle Third
+marking-OniHornTavris3Tone-tavris_3tone_3 = Top Third
+
+marking-OniHornInclined = Inclined
+marking-OniHornInclined-inclined = Inclined
+
+marking-OniHornInclined3Tone = Inclined (Three Tone)
+marking-OniHornInclined3Tone-inclined_3tone_1 = Bottom Third
+marking-OniHornInclined3Tone-inclined_3tone_2 = Middle Third
+marking-OniHornInclined3Tone-inclined_3tone_3 = Top Third
+
+marking-OniHornWavy = Wavy
+marking-OniHornWavy-wavy = Wavy
+
+marking-OniHornWavy2Tone = Wavy (Striped)
+marking-OniHornWavy2Tone-wavy_2tone_1 = Even stripes
+marking-OniHornWavy2Tone-wavy_2tone_2 = Odd stripes
+
+marking-OniHornWavy3Tone = Wavy (Three Tone)
+marking-OniHornWavy3Tone-wavy_3tone_1 = Bottom Third
+marking-OniHornWavy3Tone-wavy_3tone_2 = Middle Third
+marking-OniHornWavy3Tone-wavy_3tone_3 = Top Third
+
+marking-OniHornAntlers = Antlers
+marking-OniHornAntlers-antlers_2tone_1 = Base
+marking-OniHornAntlers-antlers_2tone_2 = Wings
+
+marking-OniHornAntlers3Tone = Antlers (Three Tone)
+marking-OniHornAntlers3Tone-antlers_3tone_1 = Bottom Third
+marking-OniHornAntlers3Tone-antlers_3tone_2 = Middle Third
+marking-OniHornAntlers3Tone-antlers_3tone_3 = Top Third
+
+marking-OniHornUnicorn = Unicorn
+marking-OniHornUnicorn-unicorn = Unicorn
+
+marking-OniHornErebia = Erebia
+marking-OniHornErebia-erebia = Erebia
+
+marking-OniHornErebia3Tone = Erebia (Three Tone)
+marking-OniHornErebia3Tone-erebia_3tone_1 = Bottom Third
+marking-OniHornErebia3Tone-erebia_3tone_2 = Middle Third
+marking-OniHornErebia3Tone-erebia_3tone_3 = Top Third
+
+marking-OniHornErebiaRings = Erebia (Ringed)
+marking-OniHornErebiaRings-erebia = Erebia
+marking-OniHornErebiaRings-erebia_rings = Rings
+
+marking-OniHornDoubleThick = Double Thick
+marking-OniHornDoubleThick-double_thick = Double Thick
+
+marking-OniHornDoubleThick2Tone = Double Thick (Striped)
+marking-OniHornDoubleThick2Tone-double_thick_2tone_1 = Even stripes
+marking-OniHornDoubleThick2Tone-double_thick_2tone_2 = Odd stripes
+
+marking-OniHornDoubleThick3Tone = Double Thick (Three Tone)
+marking-OniHornDoubleThick3Tone-double_thick_3tone_1 = Bottom Third
+marking-OniHornDoubleThick3Tone-double_thick_3tone_2 = Middle Third
+marking-OniHornDoubleThick3Tone-double_thick_3tone_3 = Top Third
+
+marking-OniHornDoubleCurved3Tone = Double Curved (Three Tone)
+marking-OniHornDoubleCurved3Tone-double_curved_3tone_1 = Bottom Third
+marking-OniHornDoubleCurved3Tone-double_curved_3tone_2 = Middle Third
+marking-OniHornDoubleCurved3Tone-double_curved_3tone_3 = Top Third
+
+marking-OniHornDoubleCurvedOutwards3Tone = Double Curved Outwards (Three Tone)
+marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_1 = Bottom Third
+marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_2 = Middle Third
+marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_3 = Top Third
diff --git a/Resources/Locale/en-US/markings/oni_feet.ftl b/Resources/Locale/en-US/markings/oni_feet.ftl
new file mode 100644
index 00000000000..db35a69acdb
--- /dev/null
+++ b/Resources/Locale/en-US/markings/oni_feet.ftl
@@ -0,0 +1,2 @@
+marking-OniTwoToedFeet-two_toes= Two-Toed Feet
+marking-OniTwoToedFeet= Two-Toed Feet
diff --git a/Resources/Locale/en-US/markings/pointy_ears.ftl b/Resources/Locale/en-US/markings/pointy_ears.ftl
new file mode 100644
index 00000000000..637f216667f
--- /dev/null
+++ b/Resources/Locale/en-US/markings/pointy_ears.ftl
@@ -0,0 +1,26 @@
+marking-PointyEarsStandard-pointy_ears_standard = Standard Ears
+marking-PointyEarsStandard = Standard Ears
+
+marking-PointyEarsWide-pointy_ears_wide = Wide Ears
+marking-PointyEarsWide = Wide Ears
+
+marking-PointyEarsSmall-pointy_ears_small = Small Ears
+marking-PointyEarsSmall = Small Ears
+
+marking-PointyEarsUpwards-pointy_ears_upwards = Upward Ears
+marking-PointyEarsUpwards = Upward Ears
+
+marking-PointyEarsTall-pointy_ears_tall = Tall Ears
+marking-PointyEarsTall = Tall Ears
+
+marking-PointyEarsSlanted-pointy_ears_slanted = Slanted Ears
+marking-PointyEarsSlanted = Slanted Ears
+
+marking-PointyEarsThin-pointy_ears_thin = Thin Ears
+marking-PointyEarsThin = Thin Ears
+
+marking-PointyEarsLarge-pointy_ears_large = Large Ears
+marking-PointyEarsLarge = Large Ears
+
+marking-PointyEarsNone-pointy_ears_none = No Ears
+marking-PointyEarsNone = No Ears
diff --git a/Resources/Locale/en-US/medical/components/cpr-training-component.ftl b/Resources/Locale/en-US/medical/components/cpr-training-component.ftl
new file mode 100644
index 00000000000..7ed824a369f
--- /dev/null
+++ b/Resources/Locale/en-US/medical/components/cpr-training-component.ftl
@@ -0,0 +1,6 @@
+cpr-start-second-person = You start performing CPR on {CAPITALIZE($target)}.
+cpr-start-second-person-patient = {CAPITALIZE(THE($user))} starts performing CPR on you.
+cpr-must-remove = You must remove {THE($clothing)} from the patient.
+cpr-must-remove-own-mask = You must remove your {THE($clothing)}.
+cpr-target-rotting = {CAPITALIZE($entity)} is too far gone...
+cpr-verb = Perform CPR
diff --git a/Resources/Locale/en-US/medical/components/penlight.ftl b/Resources/Locale/en-US/medical/components/penlight.ftl
new file mode 100644
index 00000000000..f0639ad7381
--- /dev/null
+++ b/Resources/Locale/en-US/medical/components/penlight.ftl
@@ -0,0 +1,11 @@
+penlight-off = The pen light is off.
+pen-light-exam-title = Pen Light
+pen-light-window-entity-eyes-text = {$entityName}'s conditions:
+pen-light-window-no-patient-data-text = No patient data.
+pen-light-window-entity-unknown-text = unknown
+
+pen-light-exam-blind-text = The patient's eyes are glassy and unfocused. They can't follow the light at all.
+pen-light-exam-drunk-text = The patient's eyes are slow to follow the light, droopy.
+pen-light-exam-eyedamage-text = The patient's eyes are partially focused, though they struggle to look at the light for too long.
+pen-light-exam-hallucinating-text = The patient's eyes are wandering around, with dilated pupils. They don't focus on the light.
+pen-light-exam-healthy-text = The patient follows the light perfectly with no stuttering.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl
deleted file mode 100644
index 906466bc10f..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-glimmer-monitor-program-name = Glimmer Monitor
-glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
-glimmer-monitor-interval = Interval
-glimmer-monitor-sync = Sync
diff --git a/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl b/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl
index 19aeebee69e..8d0c96f13c5 100644
--- a/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl
@@ -1,21 +1,3 @@
-reagent-effect-guidebook-change-glimmer-reaction-effect =
-    { $chance ->
-        [1] Modifies
-        *[other] modify
-    } the glimmer count by {$count} points
-
-reagent-effect-guidebook-chem-remove-psionic =
-    { $chance ->
-        [1] Removes
-        *[other] remove
-    } psionic powers
-
-reagent-effect-guidebook-chem-reroll-psionic =
-    { $chance ->
-        [1] Allows
-        *[other] allow
-    } a chance to get a different psionic power
-
 ## Disease System support
 
 reagent-effect-guidebook-chem-miasma-pool =
diff --git a/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl b/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl
deleted file mode 100644
index 60166b82598..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-guide-entry-altars-golemancy = Altars and Golemancy
-guide-entry-psionics = Psionics
-guide-entry-reverse-engineering = Reverse Engineering
diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
index bc99a777f1a..8660d214615 100644
--- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
@@ -3,8 +3,8 @@ job-name-guard = Prison Guard
 job-name-mail-carrier = Courier
 job-name-martialartist =  Martial Artist
 job-name-prisoner = Prisoner
-job-name-mantis = Psionic Mantis
+job-name-mantis = Mantis
 
 # Role timers
 JobMailCarrier = Courier
-JobForensicMantis = Psionic Mantis
+JobForensicMantis = Mantis
diff --git a/Resources/Locale/en-US/nyanotrasen/paper/stamp-component.ftl b/Resources/Locale/en-US/nyanotrasen/paper/stamp-component.ftl
deleted file mode 100644
index 0434e6d26ac..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/paper/stamp-component.ftl
+++ /dev/null
@@ -1 +0,0 @@
-stamp-component-stamped-name-mantis = Psionic Mantis
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/nyanotrasen/reagents/toxins.ftl b/Resources/Locale/en-US/nyanotrasen/reagents/toxins.ftl
deleted file mode 100644
index 43e35c191c9..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/reagents/toxins.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-reagent-name-soulbreaker-toxin = soulbreaker toxin
-reagent-desc-soulbreaker-toxin = An anti-psionic about 4 times as powerful as mindbreaker toxin.
-
-reagent-name-lotophagoi-oil = lotophagoi oil
-reagent-desc-lotophagoi-oil = A super potent drug that is much better at inducing psionics than normal hallucinogens, but with worse side effects.
-
-reagent-name-ectoplasm = ectoplasm
-reagent-desc-ectoplasm = The physical component of semi-corporeal spirits.
diff --git a/Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl
deleted file mode 100644
index e07aa0a0322..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl
+++ /dev/null
@@ -1 +0,0 @@
-artifact-effect-hint-psionic = Noöspheric disturbance
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
new file mode 100644
index 00000000000..2bbacf2abca
--- /dev/null
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
@@ -0,0 +1,102 @@
+ent-ClothingHeadHelmetHardsuitBasic = basic vacsuit helmet
+    .desc = A common vacsuit helmet that provides little more than basic protection from vacuum.
+ent-ClothingHeadHelmetHardsuitAtmos = HpI-19t helmet
+    .desc = The Fotia's standard helmet, it features the same heat protection as the suit, along with some integrated protective gear for the wearer's head.
+ent-ClothingHeadHelmetHardsuitEngineering = HpI-19r helmet
+    .desc = The Lampsi's standard helmet, it features the same radiation protection as the suit, along with some integrated protective gear for the wearer's head.
+ent-ClothingHeadHelmetHardsuitSpatio = HpI-20s helmet
+    .desc = A lightweight helmet designed for the Kriti hardsuit, it allows for better mobility, along with some protection against radiation.
+ent-ClothingHeadHelmetHardsuitSalvage = HpI-20a helmet
+    .desc = A bulky helmet designed for the Lavrion hardsuit, it has reinforced plating to protect the wearer's head in wildlife encounters.
+ent-ClothingHeadHelmetHardsuitVoidParamed = ZhP-24m helmet
+    .desc = A lightweight helmet designed for use with the Sukunabikona hardsuit. Parts of the helmet are made of hard transparent plastics, allowing for better visibility.
+ent-ClothingHeadHelmetHardsuitMaxim = mysterious helmet
+    .desc = An old looking helmet, it seems rather sturdy and lightweight. It also has an ominous red and black color scheme.
+ent-ClothingHeadHelmetHardsuitSecurity = FPA-83s helmet
+    .desc = A bulky helmet deployed with the Baghatur tacsuit. Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility.
+ent-ClothingHeadHelmetHardsuitBrigmedic = FPA-84m helmet
+    .desc = A bulky helmet deployed with the Tsagaan tacsuit. Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility.
+ent-ClothingHeadHelmetHardsuitCombatStandard = FPA-85 helmet
+    .desc = A bulky helmet deployed with the Baghatur Mk.II tacsuit.
+    Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility.
+ent-ClothingHeadHelmetHardsuitCombatOfficer = FPA-85s helmet
+    .desc = { ent-ClothingHeadHelmetHardsuitCombatStandard.desc }
+ent-ClothingHeadHelmetHardsuitCombatMedical = FPA-86 helmet
+    .desc = A bulky helmet deployed with the Tsagaan Mk.II tacsuit.
+    Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility.
+ent-ClothingHeadHelmetHardsuitCombatCorpsman = FPA-86m helmet
+    .desc = { ent-ClothingHeadHelmetHardsuitCombatMedical.desc }
+ent-ClothingHeadHelmetHardsuitWarden = FPA-92s helmet
+    .desc = A modified riot-control helmet for use with the Sulde tacsuit. Offers better overall protection than standard tacsuits at the expense of mobility.
+ent-ClothingHeadHelmetHardsuitCombatRiot = FPA-93 helmet
+    .desc = A modified riot-control helmet for use with the Sulde Mk.II tacsuit.
+    Offers better overall protection than other models at the expense of mobility.
+ent-ClothingHeadHelmetHardsuitCombatWarden = FPA-93s helmet
+    .desc = { ent-ClothingHeadHelmetHardsuitCombatRiot.desc }
+ent-ClothingHeadHelmetHardsuitCap = NT-42c helmet
+    .desc = A special helmet for the Tengri tacsuit, despite its lightweight appearance, it provides good all-around protection to its wearer.
+ent-ClothingHeadHelmetHardsuitEngineeringWhite = HpI-24c helmet
+    .desc = A high-grade helmet used with the Daedalus hardsuit, it has a lighter construction than its standard counterparts, along with more radiation protection.
+ent-ClothingHeadHelmetHardsuitMedical = ZhP-25m helmet
+    .desc = An extraordinarily lightweight helmet designed for use with the Okuninushi hardsuit.
+    It is primarily made from transparent hard-plastics, providing complete freedom of vision.
+ent-ClothingHeadHelmetHardsuitRd = NT-45e helmet
+    .desc = A heavily armored helmet worn over the Sophia hardsuit. It boasts the same near-immunity to explosions, heat and radiation as the suit, but heavily restricts the wearer's mobility.
+ent-ClothingHeadHelmetHardsuitMystagogue = NT-45e helmet
+    .desc = { ent-ClothingHeadHelmetHardsuitRd.desc }
+ent-ClothingHeadHelmetHardsuitSecurityRed = FPA-98s helmet
+    .desc = A high quality helmet for the Dayicin tacsuit. It offers better overall protection than standard tacsuits without impacting mobility as much.
+ent-ClothingHeadHelmetHardsuitCombatAdvanced = FPA-99 helmet
+    .desc = A high quality helmet for the Dayicin Mk.II tacsuit.
+    Features a lightweight construction, offering the same protection as a standard tacsuit without impacting mobility as much.
+ent-ClothingHeadHelmetHardsuitCombatHoS = FPA-99s helmet
+    .desc = { ent-ClothingHeadHelmetHardsuitCombatAdvanced.desc }
+ent-ClothingHeadHelmetHardsuitLuxury = HpI-20c helmet
+    .desc = A modified helmet for the Minos hardsuit, fashioned after the Logistics Officer's colors. It's been modified for greater mobility at the expense of physical trauma protection.
+ent-ClothingHeadHelmetHardsuitSyndie = CSA-51a helmet
+    .desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blood red.
+ent-ClothingHeadHelmetHardsuitSyndieMedic = CSA-51m helmet
+    .desc = An armored helmet deployed over a Zhongyao tacsuit. features optic integrations for nearly every medical hud on the market.
+    Designed to enable the survival of combat medics in the most dangerous of environments.
+ent-ClothingHeadHelmetHardsuitSyndieElite = CSA-54UA helmet
+    .desc = An elite version of the Shanlin tacsuit's helmet, featuring improved armor and fireproofing.
+ent-ClothingHeadHelmetHardsuitSyndieCommander = CSA-54c helmet
+    .desc = A bulked up version of the Shanlin tacsuit's helmet, purpose-built for commanders of special operation squads. This one has been painted blood-red.
+ent-ClothingHeadHelmetHardsuitCybersun = CSA-80UA helmet
+    .desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit.
+ent-ClothingHeadHelmetHardsuitWizard = WZD-84 helmet
+    .desc = A bizarre, gem-encrusted helmet from unknown origins. It provides some protection to its wearer without restricting their movements.
+ent-ClothingHeadHelmetHardsuitLing = organic space helmet
+    .desc = A spaceworthy biomass of pressure and temperature resistant tissue.
+ent-ClothingHeadHelmetHardsuitPirateEVA = pirate helmet
+    .desc = A pirate vacsuit helmet, very heavy but provides good protection.
+    .suffix = Pirate
+ent-ClothingHeadHelmetHardsuitPirateCap = pirate captain's tacsuit helmet
+    .desc = A special hardsuit helmet, made for the captain of a pirate ship.
+    .suffix = Pirate
+ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = NTSA-122 helmet
+    .desc = A sturdy, lightweight helmet made by the special adquisitions department of Nanotrasen.
+ent-ClothingHeadHelmetHardsuitJuggernautReverseEngineered = NTSA-126 helmet
+    .desc = A very sturdy helmet made by the special acquisitions department of Nanotrasen, based on the "Juggernaut" tacsuit's design.
+ent-ClothingHeadHelmetHardsuitERTCentcomm = NT-444c helmet
+    .desc = A special tacsuit helmet worn by Central Command Officers.
+ent-ClothingHeadHelmetHardsuitERTLeader = NT-444l helmet
+    .desc = A special tacsuit helmet worn by leaders of an emergency response team.
+ent-ClothingHeadHelmetHardsuitERTEngineer = NT-444e helmet
+    .desc = A special hardsuit helmet worn by members of an engineering emergency response team.
+ent-ClothingHeadHelmetHardsuitERTMedical = NT-444m helmet
+    .desc = A special hardsuit helmet worn by members of a medical emergency response team.
+ent-ClothingHeadHelmetHardsuitERTSecurity = NT-444s helmet
+    .desc = A special tacsuit helmet worn by members of a engineering emergency response team.
+ent-ClothingHeadHelmetHardsuitERTJanitor = NT-444j helmet
+    .desc = A special hardsuit helmet worn by members of a janitorial emergency response team.
+ent-ClothingHeadHelmetCBURN = NT-444-CBRN helmet
+    .desc = A pressure resistant and fireproof hood worn by special cleanup units.
+ent-ClothingHeadHelmetHardsuitDeathsquad = NT-662ua helmet
+    .desc = A highly advanced, top of the line helmet used in special operations.
+ent-ClothingHeadHelmetHardsuitClown = clown vacsuit helmet
+    .desc = A colorful clown vacsuit helmet. On closer inspection, it appears to be a normal helmet painted with crayons, and a clown mask glued on top.
+ent-ClothingHeadHelmetHardsuitMime = mime vacsuit helmet
+    .desc = A mime vacsuit helmet. On closer inspection, it appears to be a normal helmet painted with crayons, and a mime mask glued on top.
+ent-ClothingHeadHelmetHardsuitSanta = DNK-31 helmet
+    .desc = A festive-looking hardsuit helmet that provides the jolly gift-giver protection from low-pressure environments.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
new file mode 100644
index 00000000000..84f03af5c92
--- /dev/null
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
@@ -0,0 +1,135 @@
+ent-ClothingOuterHardsuitBasic = basic vacsuit
+    .desc = A common, colonial-era vacsuit of indeterminate make and model. It's strictly better than nothing, but not by much.
+ent-ClothingOuterHardsuitAtmos = HpI-19t "Fotia" hardsuit
+    .desc = A standard-issue hardsuit produced by Hephaestus Industries, used by atmospheric technicians in low & high pressure environments.
+    The label indicates that its rated for high amounts of thermal exposure. It feels a bit heavy.
+ent-ClothingOuterHardsuitEngineering = HpI-19r "Lampsi" hardsuit
+    .desc = A standard-issue hardsuit produced by Hephaestus Industries, used by engineers in low & high pressure environments.
+    The label indicates that its rated for moderate amounts of radiation exposure. It feels a bit heavy.
+ent-ClothingOuterHardsuitSpatio = HpI-20s "Kriti" hardsuit
+    .desc = A standard-issue hardsuit produced by Hephaestus Industries, designed for industrial work in low pressure environments.
+    The label indicates that its rated for moderate amounts of radiation exposure, and it feels somewhat light.
+ent-ClothingOuterHardsuitSalvage = HpI-20a "Lavrion" hardsuit
+    .desc = A sturdy hardsuit produced by Hephaestus Industries, designed for industrial work in low pressure environments.
+    The labels indicate that it provides protection against most forms of damage. It feels heavy.
+ent-ClothingOuterHardsuitVoidParamed = ZhP-24m "Sukunabikona"
+    .desc = A standard-issue hardsuit manufactured by Zeng-Hu Pharmaceuticals, used by paramedics due to its lightweight frame.
+    The label mentions that it offers some protection against chemical spills.
+ent-ClothingOuterHardsuitMaxim = Mysterious tacsuit
+    .desc = An old looking tactical combat hardsuit. It has a faded red logo on it along with the words "Maxim".
+    It feels very sturdy and doesn't seem to have any weight... Though it has an ominous aura to it.
+ent-ClothingOuterHardsuitSecurity = FPA-83s - "Baghatur" tacsuit
+    .desc = A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, used by the Nanotrasen security force.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy.
+ent-ClothingOuterHardsuitBrigmedic = FPA-84m - "Tsagaan" tacsuit
+    .desc = A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, used by doctors in the Nanotrasen security force.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy.
+ent-ClothingOuterHardsuitCombatStandard = FPA-85 - "Baghatur Mk.II" tacsuit
+    .desc = A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy.
+ent-ClothingOuterHardsuitCombatOfficer = FPA-85s - "Baghatur Mk.II" tacsuit
+    .desc = A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, painted with the colors of station security.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy.
+ent-ClothingOuterHardsuitCombatMedical = FPA-86 - "Tsagaan Mk.II" tacsuit
+    .desc = A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy.
+ent-ClothingOuterHardsuitCombatCorpsman = FPA-86m - "Tsagaan Mk.II" tacsuit
+    .desc = A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, painted with the colors of station security & medical staff.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy.
+ent-ClothingOuterHardsuitWarden = FPA-92s - "Sulde" tacsuit
+    .desc = A specialized tactical combat hardsuit produced by Five-Points-Armory, often used by Wardens in Nanotrasen stations.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels VERY heavy.
+ent-ClothingOuterHardsuitCombatRiot = FPA-93 - "Sulde Mk.II" tacsuit
+    .desc = A specialized tactical combat hardsuit produced by Five-Points-Armory.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels VERY heavy.
+ent-ClothingOuterHardsuitCombatWarden = FPA-93s - "Sulde Mk.II" tacsuit
+    .desc = A specialized tactical combat hardsuit produced by Five-Points-Armory, painted with the colors of station security.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels VERY heavy.
+ent-ClothingOuterHardsuitCap = NT-42c - "Tengri" tacsuit
+    .desc = A formal, tactical combat hardsuit, made in collaboration by Nanotrasen's R&D department with Five-Points-Armory for station captains.
+    The labels indicate that it provides protection against most forms of damage. It feels somewhat light.
+ent-ClothingOuterHardsuitEngineeringWhite = HpI-24c "Daedalus" hardsuit
+    .desc = A specialized hardsuit produced by Hephaestus Industries, often purchased for use by Nanotrasen senior engineers.
+    The labels indicate that its rated for high amounts of radiation and pressure. It feels somewhat light.
+ent-ClothingOuterHardsuitMedical = ZhP-25m - "Okuninushi" hardsuit
+    .desc = A hardsuit produced by Zeng-hu Pharmaceuticals, often purchased for use by Nanotrasen senior medical doctors.
+    The labels claim it protects against damage from most chemical spills. It feels incredibly light.
+ent-ClothingOuterHardsuitRd = NT-45e - "Sophia" research hardsuit
+    .desc = The magnum opus of Nanotrasen's R&D division. The labels on this hardsuit claim that its near-immune to explosions, heat and radiation.
+    Somehow it also can shrink enough to fit in a bag. It feels VERY heavy.
+ent-ClothingOuterHardsuitMystagogue = NT-45e - "Sophia" research hardsuit
+    .desc = { ent-ClothingOuterHardsuitRd.desc }
+ent-ClothingOuterHardsuitSecurityRed = FPA-98s - "Dayicin" tacsuit
+    .desc = A top-of-the-line tactical combat hardsuit  produced by Five-Points-Armory, often purchased for use by Nanotrasen senior security officers.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light.
+ent-ClothingOuterHardsuitCombatAdvanced = FPA-99 - "Dayicin Mk.II" tacsuit
+    .desc = A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light.
+ent-ClothingOuterHardsuitCombatHoS = FPA-99s - "Dayicin Mk.II" tacsuit
+    .desc = A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory, painted with the colors of station security.
+    The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light.
+ent-ClothingOuterHardsuitLuxury = HpI-20c - "Minos" hardsuit
+    .desc = A modified mining hardsuit from Hephaestus Industries, fashioned after the Logistics Officer's colors.
+    The labels indicate that it provides slight protection against most forms of damage. It feels incredibly light.
+ent-ClothingOuterHardsuitSyndie = CSA-51a - "Shanlin" tacsuit
+    .desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
+    This one has been painted blood red. It feels incredibly light.
+ent-ClothingOuterHardsuitSyndieMedic = CSA-51m - "Zhongyao" tacsuit
+    .desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
+    Half of the suit is painted blood red, the rest bears galactic-standard medical markings. It feels incredibly light.
+ent-ClothingOuterHardsuitSyndieElite = CSA-54UA - "Shiwei" tacsuit
+    .desc = An "Up-Armored" tactical combat hardsuit produced by the Cybersun-Armaments Corporation.
+    The suit's tags indicate its rated for high exposure to radiation, heat and explosions, along with moderate physical trauma protection.
+    It feels incredibly light.
+ent-ClothingOuterHardsuitSyndieCommander = CSA-54c - "Tianming" tacsuit
+    .desc = A "Commander" tactical combat hardsuit produced by the Cybersun-Armaments Corporation. The suit's tags indicate that it protects greatly against all forms of damage.
+    This one has been painted blood red. It doesn't seem to have any weight.
+ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit
+    .desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
+    Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
+ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit
+    .desc = A bizarre gem-encrusted hardsuit. Famously used by members of the Wizard Federation in their operations.
+    Contrary to it's appearance, it can protect its wearer from space and considerable amounts of physical trauma, it feels somewhat light.
+ent-ClothingOuterHardsuitLing = organic vacsuit
+    .desc = A suit made of biomass tissue that is somehow capable of resisting the hazards of low pressure and temperature in space.
+ent-ClothingOuterHardsuitPirateEVA = pirate vacsuit
+    .desc = A worn-out heavy space suit of unknown origin that provides some basic protection from the cold harsh realities of deep space.
+    .suffix = Pirate
+ent-ClothingOuterHardsuitPirateCap = pirate captain's tacsuit
+    .desc = An ancient armored tactical combat hardsuit of unknown origin, provides basic protections from the cold harsh realities of deep space and physical trauma.
+    It doesn't seem to have any weight either. Perfect for defending against space scurvy and toolbox-wielding scallywags.
+ent-ClothingOuterHardsuitSyndieReverseEngineered = NTSA-122 tacsuit
+    .desc = A suit made by the special adquisitions department of Nanotrasen, the suit's tags indicate it provides moderate protection against most forms of damage.
+ent-ClothingOuterHardsuitJuggernautReverseEngineered = NTSA-126 tacsuit
+    .desc = A suit made by the special acquisitions department of Nanotrasen based on the "Juggernaut" design.
+    Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
+ent-ClothingOuterHardsuitERTCentcomm = NT-444c - "Ophanim" tacsuit
+    .desc = A highly advanced, tactical combat hardsuit used by Central Command Officers, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitERTLeader = NT-444l - "Michael" tacsuit
+    .desc = A highly advanced, tactical combat hardsuit used by Leaders of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitERTEngineer = NT-444e - "Uriel" hardsuit
+    .desc = A highly advanced hardsuit used by Engineers of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitERTMedical = NT-444m - "Raphael" hardsuit
+    .desc = A highly advanced hardsuit used by Doctors of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitERTSecurity = NT-444s - "Gabriel" tacsuit
+    .desc = A highly advanced, tactical combat hardsuit used by Security Officers of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitERTJanitor = NT-444j - "Sandalphon" hardsuit
+    .desc = A highly advanced hardsuit used by Janitors of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitDeathsquad = NT-662ua "Samael" tacsuit
+    .desc = A highly advanced, top of the line tactical combat hardsuit, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    You can barely make out the letters "NTIA-DAP" written on it. The armor appears to be lined with a very sturdy alloy, and doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitCBURN = NT-444-CBRN -"Jophiel" tacsuit
+    .desc = A tactical combat hardsuit used by the CBURN subdivision of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number.
+    The armor appears to be lined with a rather plain, but sturdy alloy, it doesn't seem to have any weight either.
+ent-ClothingOuterHardsuitClown = clown vacsuit
+    .desc = A custom-made clown vacsuit. On closer inspection, it appears to be a normal vacsuit with paint applied on top.
+ent-ClothingOuterHardsuitMime = mime vacsuit
+    .desc = A custom-made mime vacsuit. On closer inspection, it appears to be a normal vacsuit with suspenders and paint applied on top.
+ent-ClothingOuterHardsuitSanta = DNK-31 "Jolly" hardsuit
+    .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/nyanotrasen/paper/book-epistemics.ftl b/Resources/Locale/en-US/psionics/book-epistemics.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/paper/book-epistemics.ftl
rename to Resources/Locale/en-US/psionics/book-epistemics.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/prototypes/catalog/cargo/cargo-epistemics.ftl b/Resources/Locale/en-US/psionics/cargo-epistemics.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/prototypes/catalog/cargo/cargo-epistemics.ftl
rename to Resources/Locale/en-US/psionics/cargo-epistemics.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/death-gasp.ftl b/Resources/Locale/en-US/psionics/death-gasp.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/psionics/death-gasp.ftl
rename to Resources/Locale/en-US/psionics/death-gasp.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/prototypes/catalog/fills/crates/epistemics-crates.ftl b/Resources/Locale/en-US/psionics/epistemics-crates.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/prototypes/catalog/fills/crates/epistemics-crates.ftl
rename to Resources/Locale/en-US/psionics/epistemics-crates.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/station-events/events/noospheric-storm.ftl b/Resources/Locale/en-US/psionics/noospheric-storm.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/station-events/events/noospheric-storm.ftl
rename to Resources/Locale/en-US/psionics/noospheric-storm.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/objectives/conditions/conditions.ftl b/Resources/Locale/en-US/psionics/objectives.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/objectives/conditions/conditions.ftl
rename to Resources/Locale/en-US/psionics/objectives.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/research/oracle.ftl b/Resources/Locale/en-US/psionics/oracle.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/research/oracle.ftl
rename to Resources/Locale/en-US/psionics/oracle.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psionic-chat.ftl b/Resources/Locale/en-US/psionics/psionic-chat.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/psionics/psionic-chat.ftl
rename to Resources/Locale/en-US/psionics/psionic-chat.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psionic-commands.ftl b/Resources/Locale/en-US/psionics/psionic-commands.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/psionics/psionic-commands.ftl
rename to Resources/Locale/en-US/psionics/psionic-commands.ftl
diff --git a/Resources/Locale/en-US/psionics/stamp-component.ftl b/Resources/Locale/en-US/psionics/stamp-component.ftl
new file mode 100644
index 00000000000..381278f8cf9
--- /dev/null
+++ b/Resources/Locale/en-US/psionics/stamp-component.ftl
@@ -0,0 +1 @@
+stamp-component-stamped-name-mantis = Mantis
diff --git a/Resources/Locale/en-US/nyanotrasen/research/technologies.ftl b/Resources/Locale/en-US/psionics/technologies.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/research/technologies.ftl
rename to Resources/Locale/en-US/psionics/technologies.ftl
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index c4aab1879fe..aff0b36c560 100644
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -1,105 +1,104 @@
-reagent-physical-desc-skunky = skunky
-reagent-physical-desc-soapy = soapy
-reagent-physical-desc-ferrous = ferrous
-reagent-physical-desc-nothing = nothing
+reagent-physical-desc-abrasive = abrasive
+reagent-physical-desc-acidic = acidic
 reagent-physical-desc-acrid = acrid
-reagent-physical-desc-thick-and-grainy = thick and grainy
-reagent-physical-desc-necrotic = necrotic
-reagent-physical-desc-oily = oily
-reagent-physical-desc-glowing = glowing
-reagent-physical-desc-heterogeneous = heterogeneous
-reagent-physical-desc-mucus-like = mucus-like
-reagent-physical-desc-cold = cold
+reagent-physical-desc-alkaline = alkaline
+reagent-physical-desc-aromatic = aromatic
 reagent-physical-desc-bee-guts = bee guts
-reagent-physical-desc-tangy = tangy
-reagent-physical-desc-fizzy = fizzy
-reagent-physical-desc-fuzzy = fuzzy
-reagent-physical-desc-spicy = spicy
-reagent-physical-desc-abrasive = abrasive
-reagent-physical-desc-chalky = chalky
-reagent-physical-desc-roaring = roaring
-reagent-physical-desc-robust = robust
-reagent-physical-desc-sickly = sickly
-reagent-physical-desc-murky = murky
-reagent-physical-desc-bubbling = bubbling
-reagent-physical-desc-wormy = wormy
-reagent-physical-desc-frosty = frosty
 reagent-physical-desc-blazing = blazing
-reagent-physical-desc-translucent = translucent
-reagent-physical-desc-sugary = sugary
-reagent-physical-desc-putrid = putrid
-reagent-physical-desc-saucey = saucey
-reagent-physical-desc-salty = salty
-reagent-physical-desc-milky = milky
-reagent-physical-desc-refreshing = refreshing
-reagent-physical-desc-soothing = soothing
-reagent-physical-desc-starchy = starchy
-reagent-physical-desc-starry = starry
-reagent-physical-desc-tart = tart
-reagent-physical-desc-aromatic = aromatic
-reagent-physical-desc-thick = thick
-reagent-physical-desc-syrupy = syrupy
-reagent-physical-desc-grainy = grainy
-reagent-physical-desc-foamy = foamy
-reagent-physical-desc-tropical = tropical
-reagent-physical-desc-coarse = coarse
-reagent-physical-desc-opaque = opaque
-reagent-physical-desc-pulpy = pulpy
-reagent-physical-desc-reasonably-metallic = reasonably metallic
-reagent-physical-desc-metallic = metallic
-reagent-physical-desc-gaseous = gaseous
-reagent-physical-desc-ground-brass = ground brass
-reagent-physical-desc-dark-brown = dark brown
-reagent-physical-desc-crystalline = crystalline
-reagent-physical-desc-viscous = viscous
-reagent-physical-desc-shiny = shiny
-reagent-physical-desc-dark-red = dark-red
-reagent-physical-desc-ionizing = ionizing
-reagent-physical-desc-nondescript = nondescript
-reagent-physical-desc-burning = burning
-reagent-physical-desc-porous = porous
-reagent-physical-desc-powdery = powdery
-reagent-physical-desc-creamy = creamy
-reagent-physical-desc-sticky = sticky
+reagent-physical-desc-bubbling = bubbling
 reagent-physical-desc-bubbly = bubbly
-reagent-physical-desc-rocky = rocky
-reagent-physical-desc-lemony-fresh = lemony fresh
-reagent-physical-desc-soapy = soapy
-reagent-physical-desc-crisp = crisp
-reagent-physical-desc-citric = citric
-reagent-physical-desc-acidic = acidic
+reagent-physical-desc-burning = burning
 reagent-physical-desc-buzzy = buzzy
-reagent-physical-desc-fibrous = fibrous
-reagent-physical-desc-strong-smelling = strong smelling
-reagent-physical-desc-fizzy-and-creamy = fizzy and creamy
-reagent-physical-desc-overpowering = overpowering
-reagent-physical-desc-sour = sour
-reagent-physical-desc-pungent = pungent
-reagent-physical-desc-clumpy = clumpy
-reagent-physical-desc-strong-smelling = strong-smelling
-reagent-physical-desc-odorless = odorless
-reagent-physical-desc-gloopy = gloopy
+reagent-physical-desc-chalky = chalky
+reagent-physical-desc-chewy = chewy
+reagent-physical-desc-citric = citric
 reagent-physical-desc-cloudy = cloudy
-reagent-physical-desc-sweet = sweet
+reagent-physical-desc-clumpy = clumpy
+reagent-physical-desc-coarse = coarse
+reagent-physical-desc-cold = cold
+reagent-physical-desc-creamy = creamy
+reagent-physical-desc-crisp = crisp
+reagent-physical-desc-crystalline = crystalline
+reagent-physical-desc-dark-brown = dark brown
+reagent-physical-desc-dark-red = dark-red
 reagent-physical-desc-electric = electric
-reagent-physical-desc-chewy = chewy
-reagent-physical-desc-volatile = volatile
-reagent-physical-desc-inky = inky
+reagent-physical-desc-energizing = energizing
 reagent-physical-desc-enigmatic = enigmatic
-reagent-physical-desc-exotic-smelling = exotic smelling
 reagent-physical-desc-ethereal = ethereal
-reagent-physical-desc-glittery = glittery
-reagent-physical-desc-energizing = energizing
 reagent-physical-desc-exhilarating = exhilarating
-reagent-physical-desc-vibrant = vibrant
+reagent-physical-desc-exotic-smelling = exotic smelling
+reagent-physical-desc-ferrous = ferrous
+reagent-physical-desc-fibrous = fibrous
+reagent-physical-desc-fizzy = fizzy
+reagent-physical-desc-fizzy-and-creamy = fizzy and creamy
 reagent-physical-desc-fluffy = fluffy
+reagent-physical-desc-foamy = foamy
+reagent-physical-desc-frosty = frosty
 reagent-physical-desc-funny = funny
-reagent-physical-desc-alkaline = alkaline
-reagent-physical-desc-reflective = reflective
+reagent-physical-desc-fuzzy = fuzzy
+reagent-physical-desc-gaseous = gaseous
+reagent-physical-desc-glittery = glittery
+reagent-physical-desc-gloopy = gloopy
+reagent-physical-desc-glowing = glowing
+reagent-physical-desc-grainy = grainy
+reagent-physical-desc-ground-brass = ground brass
+reagent-physical-desc-heterogeneous = heterogeneous
 reagent-physical-desc-holy = holy
+reagent-physical-desc-inky = inky
+reagent-physical-desc-ionizing = ionizing
+reagent-physical-desc-lemony-fresh = lemony fresh
+reagent-physical-desc-metallic = metallic
+reagent-physical-desc-milky = milky
+reagent-physical-desc-mucus-like = mucus-like
+reagent-physical-desc-murky = murky
+reagent-physical-desc-necrotic = necrotic
+reagent-physical-desc-neural = neural
+reagent-physical-desc-nondescript = nondescript
+reagent-physical-desc-nothing = nothing
+reagent-physical-desc-odorless = odorless
+reagent-physical-desc-oily = oily
+reagent-physical-desc-opaque = opaque
+reagent-physical-desc-overpowering = overpowering
+reagent-physical-desc-porous = porous
+reagent-physical-desc-powdery = powdery
+reagent-physical-desc-pulpy = pulpy
+reagent-physical-desc-pungent = pungent
+reagent-physical-desc-putrid = putrid
+reagent-physical-desc-reasonably-metallic = reasonably metallic
+reagent-physical-desc-reflective = reflective
+reagent-physical-desc-refreshing = refreshing
+reagent-physical-desc-roaring = roaring
+reagent-physical-desc-robust = robust
+reagent-physical-desc-rocky = rocky
+reagent-physical-desc-salty = salty
+reagent-physical-desc-saucey = saucey
+reagent-physical-desc-shiny = shiny
+reagent-physical-desc-sickly = sickly
+reagent-physical-desc-skunky = skunky
 reagent-physical-desc-slimy = slimy
 reagent-physical-desc-neural = neural
 ## Floof
 reagent-physical-desc-earthy = earthy
 reagent-physical-desc-ethereal-brass = ethereal brass
-reagent-physical-desc-smooth = smooth
\ No newline at end of file
+reagent-physical-desc-smooth = smooth
+reagent-physical-desc-soapy = soapy
+reagent-physical-desc-soothing = soothing
+reagent-physical-desc-sour = sour
+reagent-physical-desc-spicy = spicy
+reagent-physical-desc-starchy = starchy
+reagent-physical-desc-starry = starry
+reagent-physical-desc-sticky = sticky
+reagent-physical-desc-strong-smelling = strong-smelling
+reagent-physical-desc-sugary = sugary
+reagent-physical-desc-sweet = sweet
+reagent-physical-desc-syrupy = syrupy
+reagent-physical-desc-tangy = tangy
+reagent-physical-desc-tart = tart
+reagent-physical-desc-thick = thick
+reagent-physical-desc-thick-and-grainy = thick and grainy
+reagent-physical-desc-translucent = translucent
+reagent-physical-desc-tropical = tropical
+reagent-physical-desc-vibrant = vibrant
+reagent-physical-desc-viscous = viscous
+reagent-physical-desc-volatile = volatile
+reagent-physical-desc-wormy = wormy
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index eb8422e66cf..fa2a813d1d6 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -75,3 +75,12 @@ reagent-desc-vestine = Has an adverse reaction within the body causing major jit
 
 reagent-name-tazinide = tazinide
 reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current.
+
+reagent-name-soulbreaker-toxin = soulbreaker toxin
+reagent-desc-soulbreaker-toxin = An anti-psionic about 4 times as powerful as mindbreaker toxin.
+
+reagent-name-lotophagoi-oil = lotophagoi oil
+reagent-desc-lotophagoi-oil = A super potent drug that is much better at inducing psionics than normal hallucinogens, but with worse side effects.
+
+reagent-name-ectoplasm = ectoplasm
+reagent-desc-ectoplasm = The physical component of semi-corporeal spirits.
diff --git a/Resources/Locale/en-US/nyanotrasen/reagents/psionic.ftl b/Resources/Locale/en-US/reagents/psionic.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/reagents/psionic.ftl
rename to Resources/Locale/en-US/reagents/psionic.ftl
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index a68f9e80b4e..96cb2039116 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -16,6 +16,7 @@ research-technology-shuttlecraft = Shuttlecraft
 research-technology-ripley-aplu = Ripley APLU
 research-technology-advanced-atmospherics = Advanced Atmospherics
 research-technology-advanced-tools = Advanced Tools
+research-technology-mechanized-salvaging = Mechanized Salvaging
 research-technology-super-powercells = Super Powercells
 research-technology-bluespace-storage = Bluespace Storage
 research-technology-portable-fission = Portable Fission
diff --git a/Resources/Locale/en-US/shower/shower-component.ftl b/Resources/Locale/en-US/shower/shower-component.ftl
new file mode 100644
index 00000000000..8713fb0c1f7
--- /dev/null
+++ b/Resources/Locale/en-US/shower/shower-component.ftl
@@ -0,0 +1,2 @@
+shower-turn-on = Turn On
+shower-turn-off = Turn Off
\ No newline at end of file
diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl
index f31b1fa0f00..79ce7fea6a1 100644
--- a/Resources/Locale/en-US/species/species.ftl
+++ b/Resources/Locale/en-US/species/species.ftl
@@ -6,6 +6,7 @@ species-name-reptilian = Reptilian
 species-name-slime = Slime Person
 species-name-diona = Diona
 species-name-arachnid = Arachnid
+species-name-arachne = Arachne
 species-name-moth = Moth Person
 species-name-skeleton = Skeleton
 species-name-vox = Vox
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 592cf59d2fe..67d221d9b61 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -421,3 +421,6 @@ uplink-barber-scissors-desc = A good tool to give your fellow agent a nice hairc
 
 uplink-backpack-syndicate-name = Syndicate backpack
 uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods
+
+uplink-home-run-bat-name = Home Run Bat
+uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!
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..20f786df5f3 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -8,15 +8,38 @@ trait-description-Narcolepsy = You fall asleep randomly
 trait-name-Pacifist = Pacifist
 trait-description-Pacifist = You cannot attack or hurt any living beings.
 
+trait-name-SelfAware = Self-Aware
+trait-description-SelfAware =
+    You possess a keen intuition of your body and senses.
+    You can accurately examine the severity of your wounds and burns like a health analyzer,
+    and can gauge if you have toxin or airloss damage.
+
 trait-name-LightweightDrunk = Lightweight Drunk
 trait-description-LightweightDrunk = Alcohol has a stronger effect on you
 
 trait-name-HeavyweightDrunk = Alcohol Tolerance
-trait-description-HeavyweightDrunk = Alcohol is afraid of you.
+trait-description-HeavyweightDrunk =
+    Alcohol is afraid of you.
+
+trait-name-LiquorLifeline = Liquor Lifeline
+trait-description-LiquorLifeline =
+    Forget the doctor — just hit the bar for your "ethanol prescription"!
+    While drunk, you slowly heal [color=red]Brute[/color], [color=orange]Heat[/color], [color=orange]Shock[/color], and [color=orange]Cold[/color] damage, scaling with how drunk you are.
+    You also gain the benefits of [color=lightblue]Alcohol Tolerance[/color].
 
 trait-name-Muted = Muted
 trait-description-Muted = You can't speak
 
+trait-name-BloodDeficiency = Blood Deficiency
+trait-description-BloodDeficiency =
+    Your body loses more blood than it can replenish.
+    You lose blood over time, and when left untreated you will eventually die from blood loss.
+
+trait-name-Hemophilia = Hemophilia
+trait-description-Hemophilia =
+    Your body's ability to form blood clots is impaired.
+    You bleed twice as long, and you have easy bruising, taking 10% more Blunt damage.
+
 trait-name-Paracusia = Paracusia
 trait-description-Paracusia = You hear sounds that aren't really there
 
@@ -35,22 +58,9 @@ trait-description-Stutter = You t-t-talk with a bit of a s-s-stutter...
 trait-name-Snoring = Snoring
 trait-description-Snoring = You will snore while sleeping.
 
-trait-name-LatentPsychic = Latent Psychic
-trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
-                                  Thus, you are eligible for potentially receiving psychic powers.
-                                  It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
-
-trait-name-PsionicInsulation = χ Waveform Misalignment
-trait-description-PsionicInsulation = 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-name-NaturalTelepath = Natural Telepath
-trait-description-NaturalTelepath = As a naturally occuring Telepath, you are capable of fluent telepathic communication, regardless of
-                                    whether or not you possess any notable psychic powers. This offers all of the same benefits and
-                                    drawbacks of Latent Psychic, except that you are guaranteed to start with full Telepathy. You may
-                                    still gain powers as normal for a Latent Psychic.
+trait-name-CPRTraining = CPR Training
+trait-description-CPRTraining = At some point in your life, you have received training in how to perform CPR.
+                                This trait is automatically given for free to medical doctors, and is intended for non-medical characters
 
 trait-name-NormalVisionHarpy = Trichromat Modification
 trait-description-NormalVisionHarpy = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue.
@@ -76,6 +86,64 @@ trait-description-Foreigner =
     For one reason or another you do not speak this station's primary language.
     Instead, you have a translator issued to you that only you can use.
 
+trait-name-WillToLive = Will To Live
+trait-description-WillToLive =
+    You have an unusually strong "will to live", and will resist death more than others.
+    Your damage threshold for becoming Dead is increased by 10 points.
+
+trait-name-WillToDie = Will To Die
+trait-description-WillToDie =
+    You have an unusually weak "will to live", and will succumb to injuries sooner than others.
+    Your damage threshold for becoming Dead is decreased by 15 points.
+
+trait-name-Tenacity = Tenacity
+trait-description-Tenacity =
+    Whether it be through raw grit, willpower, or subtle bionic augmentations, you are hardier than others.
+    Your damage threshold for becoming Critical is increased by 5 points.
+
+trait-name-GlassJaw = Glass Jaw
+trait-description-GlassJaw =
+    Your body is more fragile than others, resulting in a greater susceptibility to critical injuries
+    Your damage threshold for becoming Critical is decreased by 10 points.
+
+trait-name-HighAdrenaline = High Adrenaline
+trait-description-HighAdrenaline =
+    Whether by natural causes, genetic or bionic augmentation, you have a more potent adrenal gland.
+    When injured, your melee attacks deal up to 10% more damage, in addition to the natural bonuses from adrenaline.
+    The standard adrenaline bonuses to melee damage are up to a 20% increase.
+
+trait-name-AdrenalDysfunction = Adrenal Dysfunction
+trait-description-AdrenalDysfunction =
+    Your adrenal gland is completely nonfunctional, or potentially missing outright.
+    Your melee attacks do not benefit from Adrenaline when injured.
+    The standard adrenaline bonuses to melee damage are up to a 20% increase.
+
+trait-name-Masochism = Masochism
+trait-description-Masochism =
+    Deriving enjoyment from your own pain, you are not as inhibited by it as others.
+    You ignore the first 10% of stamina damage penalties to your melee attacks.
+
+trait-name-LowPainTolerance = Low Pain Tolerance
+trait-description-LowPainTolerance =
+    Your tolerance for pain is far below average, and its effects are more inhibiting.
+    Your melee damage is penalized by up to an additional 15% when taking stamina damage.
+
+trait-name-MartialArtist = Martial Artist
+trait-description-MartialArtist =
+    You have received formal training in unarmed combat, whether with Fists, Feet, or Claws.
+    Your unarmed melee attacks have a small range increase, and deal 50% more damage.
+    This does not apply to any form of armed melee, only the weapons you were naturally born with.
+
+trait-name-Vigor = Vigor
+trait-description-Vigor =
+    Whether by pure determination, fitness, or bionic augmentations, your endurance is enhanced.
+    Your stamina is increased by 10 points.
+
+trait-name-Lethargy = Lethargy
+trait-description-Lethargy =
+    You become tired faster than others, making you more vulnerable to exhaustion and fatigue.
+    Your stamina is decreased by 15 points.
+
 trait-name-SignLanguage = Sign Language
 trait-description-SignLanguage =
     You can understand and use Galactic Sign Language (GSL).
@@ -86,10 +154,25 @@ trait-description-Voracious =
     Nothing gets between you and your food.
     Your endless consumption of food and drinks is twice as fast.
 
+trait-name-ParkourTraining = Parkour Training
+trait-description-ParkourTraining =
+    Whether as a hobby, lifestyle, or professional training, you are trained in the discipline of parkour.
+    You're faster with climbing, crawling, lying down, and getting up.
+
+trait-name-Sluggish = Sluggish
+trait-description-Sluggish =
+    You navigate the world slower than others, perhaps due to a medical condition, inactivity, or age.
+    You move slower, and it takes longer for you to climb, lie down and get up.
+
+trait-name-SnailPaced = Snail-Paced
+trait-description-SnailPaced =
+    You walk at a snail's pace, perhaps due to a medical condition, mobility impairment, or age.
+    You move substantially slower, and it takes far longer for you to climb, lie down and get up.
+
 trait-name-LightStep = Light Step
 trait-description-LightStep =
     You move with a gentle step, making your footsteps quieter.
-    
+
 trait-name-CumProducer = Cock
 trait-description-CumProducer = You have a schlong between your legs.
 
@@ -98,3 +181,21 @@ trait-description-MilkProducer = You have a pair of large mammaries.
 
 trait-name-SquirtProducer = Pussy
 trait-description-SquirtProducer = You have a slit between your legs.
+
+trait-name-Swashbuckler = Swashbuckler
+trait-description-Swashbuckler =
+    You are an expert in swordsmanship, wielding swords, knives, and other blades with unrivaled finesse.
+    Your melee Slash bonus is increased to 35%, but your melee Blunt bonus is reduced to 20%.
+
+trait-name-Spearmaster = Spearmaster
+trait-description-Spearmaster =
+    You have an outstanding proficiency with spears, wielding them as an extension of your body.
+    Your melee Piercing bonus is increased to 35%, but your melee Blunt bonus is reduced to 20%.
+
+trait-name-WeaponsGeneralist = Weapons Generalist
+trait-description-WeaponsGeneralist =
+    You are a jack of all trades with melee weapons, enabling you to be versatile with your weapon arsenal.
+    Your melee damage bonus for all Brute damage types (Blunt, Slash, Piercing) becomes 25%.
+
+trait-name-Singer = Singer
+trait-description-Singer = You are naturally capable of singing simple melodies with your voice.
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
index 98dfa89fa9f..a139c2036e1 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
@@ -40,3 +40,6 @@ artifact-trigger-hint-regular-gases = Standard atmospheric gases
 artifact-trigger-hint-plasma = Gaseous plasma
 artifact-trigger-hint-land = Active deceleration
 artifact-trigger-hint-examine = Examination
+
+# Psionic Effects
+artifact-effect-hint-psionic = Noöspheric disturbance
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
index 022c647ba76..0afaa64934e 100644
--- a/Resources/Maps/hammurabi.yml
+++ b/Resources/Maps/hammurabi.yml
@@ -26862,7 +26862,7 @@ entities:
   - uid: 18085
     components:
     - type: MetaData
-      name: psionic mantis office/epistemics hall APC
+      name: mantis office/epistemics hall APC
     - type: Transform
       pos: -31.5,-37.5
       parent: 1
diff --git a/Resources/Migrations/eeMigration.yml b/Resources/Migrations/eeMigration.yml
new file mode 100644
index 00000000000..26713f6cbac
--- /dev/null
+++ b/Resources/Migrations/eeMigration.yml
@@ -0,0 +1,3 @@
+# 2024-06-08
+CrateFunPlushie: CrateFunToyBox
+CrateFunLizardPlushieBulk: CrateFunToyBox
diff --git a/Resources/Migrations/eeMigrations.yml b/Resources/Migrations/eeMigrations.yml
new file mode 100644
index 00000000000..682c3c412bf
--- /dev/null
+++ b/Resources/Migrations/eeMigrations.yml
@@ -0,0 +1,4 @@
+# 2024-03-08
+ClothingBackpackSatchelBrigmedicDeltaVFilled: ClothingBackpackSatchelBrigmedicFilled
+ClothingBackpackDuffelBrigmedicDeltaVFilled: ClothingBackpackDuffelBrigmedicFilled
+ClothingBackpackBrigmedicDeltaVFilled: ClothingBackpackBrigmedicFilled
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index 99ad59700e0..f402c7544a0 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -34,7 +34,7 @@
   - Atmospherics
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
   - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Mantis # DeltaV - Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
   - Paramedic # DeltaV - Add Paramedic access
   - Psychologist # DeltaV - Add Psychologist access
   - Boxer # DeltaV - Add Boxer access
@@ -44,4 +44,7 @@
   - Musician # DeltaV - Add Musician access
   - Reporter # DeltaV - Add Reporter access
   - Zookeeper # DeltaV - Add Zookeeper access
+  - Justice # DeltaV - Add Justice dept access
+  - ChiefJustice # DeltaV - Add Chief Justice access
+  - Prosecutor # DeltaV - Add Prosecutor access
   - Corpsman # DeltaV - Add Corpsman access
diff --git a/Resources/Prototypes/Access/research.yml b/Resources/Prototypes/Access/research.yml
index f0de2c93db4..3e3b0432b45 100644
--- a/Resources/Prototypes/Access/research.yml
+++ b/Resources/Prototypes/Access/research.yml
@@ -11,4 +11,4 @@
   tags:
   - ResearchDirector
   - Research
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Mantis # DeltaV - Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
new file mode 100644
index 00000000000..62a7fc014cd
--- /dev/null
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -0,0 +1,136 @@
+- type: entity
+  id: ActionDispel
+  name: action-name-dispel
+  description: action-description-dispel
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/dispel.png
+    useDelay: 45
+    checkCanAccess: false
+    range: 6
+    itemIconStyle: BigAction
+    canTargetSelf: false
+    event: !type:DispelPowerActionEvent
+
+- type: entity
+  id: ActionMassSleep
+  name: action-name-mass-sleep
+  description: action-description-mass-sleep
+  noSpawn: true
+  components:
+  - type: WorldTargetAction
+    icon: Interface/VerbIcons/mass_sleep.png
+    useDelay: 60
+    checkCanAccess: false
+    range: 8
+    itemIconStyle: BigAction
+    event: !type:MassSleepPowerActionEvent
+
+- type: entity
+  id: ActionMindSwap
+  name: action-name-mind-swap
+  description: action-description-mind-swap
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/mind_swap.png
+    useDelay: 240
+    checkCanAccess: false
+    range: 8
+    itemIconStyle: BigAction
+    event: !type:MindSwapPowerActionEvent
+
+- type: entity
+  id: ActionMindSwapReturn
+  name: action-name-mind-swap-return
+  description: action-description-mind-swap-return
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/mind_swap_return.png
+    useDelay: 20
+    checkCanInteract: false
+    event: !type:MindSwapPowerReturnActionEvent
+
+- type: entity
+  id: ActionNoosphericZap
+  name: action-name-noospheric-zap
+  description: action-description-noospheric-zap
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/noospheric_zap.png
+    useDelay: 100
+    range: 5
+    itemIconStyle: BigAction
+    event: !type:NoosphericZapPowerActionEvent
+
+- type: entity
+  id: ActionPyrokinesis
+  name: action-name-pyrokinesis
+  description: action-description-pyrokinesis
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/pyrokinesis.png
+    useDelay: 50
+    range: 6
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    event: !type:PyrokinesisPowerActionEvent
+
+- type: entity
+  id: ActionMetapsionic
+  name: action-name-metapsionic
+  description: action-description-metapsionic
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/metapsionic.png
+    useDelay: 45
+    event: !type:MetapsionicPowerActionEvent
+
+- type: entity
+  id: ActionPsionicRegeneration
+  name: action-name-psionic-regeneration
+  description: action-description-psionic-regeneration
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/psionic_regeneration.png
+    useDelay: 120
+    event: !type:PsionicRegenerationPowerActionEvent
+
+- type: entity
+  id: ActionTelegnosis
+  name: action-name-telegnosis
+  description: action-description-telegnosis
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/telegnosis.png
+    useDelay: 150
+    event: !type:TelegnosisPowerActionEvent
+
+- type: entity
+  id: ActionPsionicInvisibility
+  name: action-name-psionic-invisibility
+  description: action-description-psionic-invisibility
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/psionic_invisibility.png
+    useDelay: 120
+    event: !type:PsionicInvisibilityPowerActionEvent
+
+- type: entity
+  id: ActionPsionicInvisibilityUsed
+  name: action-name-psionic-invisibility-off
+  description: action-description-psionic-invisibility-off
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/psionic_invisibility_off.png
+    event: !type:RemovePsionicInvisibilityOffPowerActionEvent
+
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index f5dff1f453a..cf0a99f3bad 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -375,4 +375,4 @@
     useDelay: 40
     event:
       !type:FabricateActionEvent
-      fabrication: FoodGumball
+      fabrication: FoodGumball
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/dwarf.yml b/Resources/Prototypes/Body/Organs/dwarf.yml
index 8da0cb1666f..497bc190cd1 100644
--- a/Resources/Prototypes/Body/Organs/dwarf.yml
+++ b/Resources/Prototypes/Body/Organs/dwarf.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: OrganDwarfHeart
   parent: OrganHumanHeart
   name: dwarf heart
@@ -12,7 +12,7 @@
   name: dwarf liver
   components:
   - type: Metabolizer
-    metabolizerTypes: [Dwarf]
+    metabolizerTypes: [Dwarf, LiquorLifeline]
 
 - type: entity
   id: OrganDwarfStomach
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 61085f13b94..68bb4a6b849 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -88,26 +88,6 @@
   category: cargoproduct-category-name-fun
   group: market
 
-- type: cargoProduct
-  id: FunPlushies
-  icon:
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_h
-  product: CrateFunPlushie
-  cost: 1000
-  category: cargoproduct-category-name-fun
-  group: market
-
-- type: cargoProduct
-  id: FunLizardPlushies
-  icon:
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_lizard
-  product: CrateFunLizardPlushieBulk
-  cost: 500
-  category: cargoproduct-category-name-fun
-  group: market
-
 - type: cargoProduct
   id: FunBoardGames
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 7062b2eb155..f7191df9ab4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1700
+  cost: 1730
   category: cargoproduct-category-name-service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 4d33ec98a90..5faab3d7ad2 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -21,8 +21,23 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: MagazinePistol
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackBrigmedic
+  id: ClothingBackpackBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: EmergencyRollerBedSpawnFolded
+      - id: BodyBagFolded
+      - id: Portafib
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
+      - id: MagazinePistol
 
 - type: entity
   noSpawn: true
@@ -31,10 +46,11 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
+
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackMedical
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 3cac13ab53e..0dfcf774584 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -14,33 +14,38 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilled
+  parent: ClothingBackpackDuffelBrigmedic
+  id: ClothingBackpackDuffelBrigmedicFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: EmergencyRollerBedSpawnFolded
+      - id: BodyBagFolded
+      - id: Portafib
+    #  - id: Flash
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
+  id: ClothingBackpackDuffelSecurityFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
+      - id: MagazinePistol
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
+  parent: ClothingBackpackDuffelSecurity
+  id: ClothingBackpackDuffelSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index 89ae8fdf477..f74207ca18e 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -28,33 +28,37 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilled
+  parent: ClothingBackpackSatchelBrigmedic
+  id: ClothingBackpackSatchelBrigmedicFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: EmergencyRollerBedSpawnFolded
+      - id: BodyBagFolded
+      - id: Portafib
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
+  id: ClothingBackpackSatchelSecurityFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
+      - id: MagazinePistol
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
+  parent: ClothingBackpackSatchelSecurity
+  id: ClothingBackpackSatchelSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 28c5ea8dd47..b55bdd48322 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -1,50 +1,3 @@
-- type: entity
-  id: CrateFunPlushie
-  parent: CrateGenericSteel
-  name: plushie crate
-  description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
-  components:
-  - type: StorageFill
-    contents:
-      - id: PlushieBee
-      - id: PlushieNar
-      - id: PlushieCarp
-      - id: PlushieNuke
-      - id: PlushieSlime
-      - id: PlushieSnake
-      - id: PlushieLizard
-      - id: PlushieSpaceLizard
-      - id: PlushieVox
-      - id: PlushieRouny
-      - id: PlushieRatvar
-      - id: PlushieSharkBlue
-        orGroup: PlushieShark
-      - id: PlushieSharkGrey
-        orGroup: PlushieShark
-      - id: PlushieAtmosian
-      - id: PlushieDiona
-      - id: PlushieXeno
-      - id: PlushieHampter
-      - id: PlushieMoth
-      - id: PlushieMothRandom # Nyanotrasen - Random Moth Plushies
-        amount: 2
-      - id: PlushieArachind
-      - id: PlushiePenguin
-      - id: PlushieArachne
-
-- type: entity
-  id: CrateFunLizardPlushieBulk
-  parent: CrateGenericSteel
-  name: bulk lizard plushie crate
-  description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
-  components:
-  - type: StorageFill
-    contents:
-      - id: PlushieLizard
-        amount: 3
-      - id: PlushieSpaceLizard
-        amount: 2
-
 - type: entity
   id: CrateFunInstrumentsVariety
   parent: CrateGenericSteel
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index ac5cb47cc97..734bd485a2e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -44,7 +44,7 @@
   suffix: Prisoner EVA
   components:
   - type: StorageFill
-    contents:   
+    contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
         - id: ClothingHeadHelmetEVALarge
@@ -258,7 +258,6 @@
         - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitVoidParamed
-        - id: ClothingHeadHelmetVoidParamed
         - id: ClothingMaskBreathMedical
   - type: AccessReader
     access: [ [ "Paramedic" ] ]
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 9f5362af5bb..77b5c0a313c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -28,6 +28,7 @@
     ClothingLongcoatAL: 2 # Floofstation
     ClothingLongcoatBrown: 2 # Floofstation
     ClothingLongcoatBlack: 2 # Floofstation
+    ClothingClothWrap: 4
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 79305325bf7..9a1566dab99 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -88,6 +88,8 @@
     ClothingShoesBootsCowboyBlack: 1
     ClothingShoesBootsCowboyWhite: 1
     ClothingMaskNeckGaiterRed: 2
+    ClothingNeckBellCollar: 2
+    ClothingOuterUnathiRobe: 1
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 1f30c2cb7d2..a1a60e3fef0 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -101,6 +101,18 @@
         tags:
           - NukeOpsUplink
 
+- type: listing
+  id: BaseBallBatHomeRun
+  name: uplink-home-run-bat-name
+  description: uplink-home-run-bat-desc
+  productEntity: BaseBallBatHomeRun
+  icon:
+    entity: BaseBallBatHomeRun
+  cost:
+    Telecrystal: 16
+  categories:
+  - UplinkWeapons
+
 # Explosives
 
 - type: listing
diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml
index 259387b6d5c..316b8f02b53 100644
--- a/Resources/Prototypes/Chemistry/metabolizer_types.yml
+++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml
@@ -1,4 +1,4 @@
-# If your species wants to metabolize stuff differently,
+# If your species wants to metabolize stuff differently,
 # you'll likely have to tag its metabolizers with something other than Human.
 
 - type: metabolizerType
@@ -44,3 +44,11 @@
 - type: metabolizerType
   id: Arachnid
   name: arachnid
+
+- type: metabolizerType
+  id: Vampiric
+  name: vampiric
+
+- type: metabolizerType
+  id: LiquorLifeline
+  name: liquorlifeline
diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml
index fb40e9b658f..b01d22df3b7 100644
--- a/Resources/Prototypes/Damage/containers.yml
+++ b/Resources/Prototypes/Damage/containers.yml
@@ -52,3 +52,13 @@
   id: ShadowHaze
   supportedTypes:
     - Heat
+
+- type: damageContainer
+  id: HalfSpirit
+  supportedGroups:
+    - Burn
+    - Brute
+    - Airloss
+    - Immaterial
+  supportedTypes:
+    - Poison
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 31dd47a9e16..a6798e39cfe 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -336,3 +336,16 @@
   flatReductions:
     # can't punch the endoskeleton to death
     Blunt: 5
+
+- type: damageModifierSet
+  id: HalfSpirit
+  coefficients:
+    Cold: 0.5
+    Shock: 0.75
+    Blunt: 0.75
+    Slash: 0.75
+    Piercing: 0.75
+    Heat: 1.25
+    Holy: 1.5
+  flatReductions:
+    Cold: 3
diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml
new file mode 100644
index 00000000000..33a2844ed20
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Access/justice.yml
@@ -0,0 +1,20 @@
+- type: accessLevel
+  id: ChiefJustice
+  name: id-card-access-level-cj
+
+- type: accessLevel
+  id: Justice
+  name: id-card-access-level-justice
+  
+- type: accessLevel
+  id: Prosecutor
+  name: id-card-access-level-prosecutor
+
+- type: accessGroup
+  id: Justice
+  tags:
+  - Justice
+  - Prosecutor
+  - ChiefJustice
+  - Lawyer
+  
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
index df3f60a4f88..ad42935662b 100644
--- a/Resources/Prototypes/DeltaV/Access/misc.yml
+++ b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -47,3 +47,6 @@
     - Musician
     - Reporter
     - Zookeeper
+    - Justice
+    - Prosecutor
+
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/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
index 804a4727ee3..0fa57aa8803 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
@@ -16,3 +16,29 @@
     whitelist:
       components:
       - EncryptionKey
+
+- type: entity
+  name: justice encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyJustice
+  description: A box of spare encryption keys.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyJustice
+        amount: 4
+
+#- type: entity
+#  name: syndicate radio implanter box
+#  parent: BoxCardboard
+#  id: BoxSyndicateRadioImplanter
+#  description: Contains cranial radio implants favored by Syndicate agents.
+#  components:
+#  - type: Sprite
+#    layers:
+#    - state: box_of_doom
+#    - state: implant
+#  - type: StorageFill
+#    contents:
+#    - id: SyndicateRadioImplanter
+#      amount: 2
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
index b6140daae59..b8aff63ece5 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
@@ -74,3 +74,16 @@
         amount: 1
       - id: MailCarrierPDA
         amount: 1
+
+- type: entity
+  name: justice PDA box
+  parent: BoxPDA
+  id: BoxPDAJustice
+  description: A box of spare PDA microcomputers for the justice department.
+  components:
+  - type: StorageFill
+    contents:
+      - id: LawyerPDA
+        amount: 2
+      - id: ProsecutorPDA
+      - id: ClerkPDA
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml
new file mode 100644
index 00000000000..0f7eb99d45d
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: LockerChiefJustice
+  id: LockerChiefJusticeFilled
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingHeadsetAltJustice
+    - id: ClothingNeckCloakCJ
+    - id: ClothingUniformJumpsuitChiefJusticeFormal
+    - id: ClothingUniformJumpsuitChiefJusticeWhite
+    - id: PaperStationWarrant
+      amount: 10
+    - id: BoxPDAJustice
+    - id: BoxEncryptionKeyJustice
+    - id: ChiefJusticeIDCard
+    - id: DoorRemoteJustice
+    - id: Gavel
+    - id: RubberStampChiefJustice
+    - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+      prob: 0.3
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml
new file mode 100644
index 00000000000..9e48c28c706
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: LockerClerk
+  id: LockerClerkFilled
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterClerkVest
+    - id: PaperStationWarrant
+      amount: 10
+    - id: BoxEncryptionKeyJustice
+    - id: ClerkIDCard
+    - id: RubberStampNotary
+
diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml
index a2b8be8bf6a..b389378eb01 100644
--- a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml
@@ -1,7 +1,8 @@
 - type: damageModifierSet
   id: Vulpkanin
   coefficients:
-    Heat: 1.15
+    Heat: 1.30
+    Cold: 0.70
 
 - type: damageModifierSet
   id: Harpy
diff --git a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml
new file mode 100644
index 00000000000..34f213077c7
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml
@@ -0,0 +1,5 @@
+- type: deviceFrequency
+  id: SurveillanceCameraJustice
+  name: device-frequency-prototype-name-surveillance-camera-justice
+  frequency: 1420
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
deleted file mode 100644
index 2fbc17d2585..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackBrigmedic
-  id: ClothingBackpackBrigmedicDeltaVFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBagFolded
-      - id: Portafib
-    #  - id: Flash
-      - id: BruteAutoInjector
-        amount: 2
-      - id: BurnAutoInjector
-        amount: 2
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
deleted file mode 100644
index bcd12b5e1b1..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicDeltaVFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBagFolded
-      - id: Portafib
-    #  - id: Flash
-      - id: BruteAutoInjector
-        amount: 2
-      - id: BurnAutoInjector
-        amount: 2
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
deleted file mode 100644
index 31dc027a21e..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicDeltaVFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBagFolded
-      - id: Portafib
-    #  - id: Flash
-      - id: BruteAutoInjector
-        amount: 2
-      - id: BurnAutoInjector
-        amount: 2
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
index c65dd62312f..b32cab7b21a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -42,6 +42,45 @@
     sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetJustice
+  name: justice headset
+  description: This is used by the justice department.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyJustice
+      - EncryptionKeyPrison
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetAltJustice
+  name: chief justice's headset
+  description: The headset used by the chief justice.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyJustice
+      - EncryptionKeyPrison
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+      - EncryptionKeyCommand
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon_alt
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
     
 - type: entity
   parent: ClothingHeadset
@@ -75,3 +114,4 @@
     sprite: Clothing/Ears/Headsets/security.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
+    
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
index 1c5cef39af1..bdb5ad85d9a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
@@ -192,3 +192,15 @@
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCJToque
+  name: chief justice's toque
+  description: A standard-issue judicial hat. Wigs are old-fashioned anyway.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
index 5ff195cfda8..a5a9200b569 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
@@ -31,3 +31,15 @@
     sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi 
   - type: Clothing
     sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi  
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakCJ
+  name: chief justice's cloak
+  description: A hefty cloak adorned with a modest insignia and grand fur trim.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi
+  - type: StealTarget
+    stealGroup: HeadCloak
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
new file mode 100644
index 00000000000..7ec38bb1441
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
@@ -0,0 +1,13 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckProsecutorbadge
+  name: prosecutor badge
+  description: A badge to show that the owner is a 'legitimate' prosecutor who passed the NT bar exam required to practice law.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
+  - type: TypingIndicatorClothing
+    proto: lawyer
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
index e0a38b169f0..e0f3e7f298f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
@@ -123,3 +123,17 @@
     sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
   - type: TemperatureProtection
     coefficient: 0.1
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterChiefJustice
+  name: chief justice's robes
+  description: Heavy black robes with magenta and gold trim. It smells old.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
+  - type: TemperatureProtection
+    coefficient: 0.1
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml
index cdc79584076..445158f89b8 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml
@@ -37,3 +37,15 @@
         Heat: 0.9
   - type: ExplosionResistance
     damageCoefficient: 0.9
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterClerkVest
+  name: clerk's vest
+  description: a silken magenta vest with a pocket to put your notary stamp.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
index 4c027637645..9e80bc4ff2f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -93,3 +93,37 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtChiefJustice
+  name: chief justice's jumpskirt
+  description: A fancy black jumpskirt with a lace cravat to make it even more fancy. Proper judicial attire.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniform/Jumpskirt/cj.rsi
+    
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtClerk
+  name: clerk's dress skirt
+  description: A modest dress skirt for the person with the power to notarize anything.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtProsecutor
+  name: prosecutor's dress skirt
+  description: A red suit and skirt with a fancy cravat. Perfect for a prosecutor.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
index 8a0a500e6fa..9382502e740 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -244,6 +244,50 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChiefJustice
+  name: chief justice's jumpsuit
+  description: A fancy black jumpsuit with a lace cravat to make it even more fancy. Proper judicial attire.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChiefJusticeFormal
+  name: chief justice's formal jumpsuit
+  description: A fancy double-breasted suit with golden accoutrements. Sharp and authoritative.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChiefJusticeWhite
+  name: chief justice's white jumpsuit
+  description: A modest, white office shirt with hard-earned rank epaulets.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitClerk
+  name: clerk's suit
+  description: A modest suit for the person with the power to notarize anything.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitChemShirt
@@ -254,3 +298,15 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitProsecutor
+  name: prosecutor's suit
+  description: A red suit with a fancy cravat. Perfect for a prosecutor.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
index e662ecca743..12747abbcfb 100644
--- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
@@ -13,3 +13,55 @@
       state: medical
     - sprite: Mobs/Silicon/chassis.rsi
       state: medical_e
+
+- type: entity
+  id: SpawnPointChiefJustice
+  parent: SpawnPointJobBase
+  name: chiefjustice
+  components:
+  - type: SpawnPoint
+    job_id: ChiefJustice
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Markers/jobs.rsi
+      state: chiefjustice
+
+- type: entity
+  id: SpawnPointClerk
+  parent: SpawnPointJobBase
+  name: clerk
+  components:
+  - type: SpawnPoint
+    job_id: Clerk
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Markers/jobs.rsi
+      state: clerk
+
+- type: entity
+  id: SpawnPointProsecutor
+  parent: SpawnPointJobBase
+  name: prosecutor
+  components:
+  - type: SpawnPoint
+    job_id: Prosecutor
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Markers/jobs.rsi
+      state: prosecutor
+
+- type: entity
+  id: SpawnPointCourier
+  parent: SpawnPointJobBase
+  name: courier
+  components:
+  - type: SpawnPoint
+    job_id: Courier
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Markers/jobs.rsi
+      state: courier
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..718dc3ca559 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -5,11 +5,6 @@
   id: MobVulpkanin
   components:
     - type: CombatMode
-    - type: InteractionPopup
-      successChance: 1
-      interactSuccessString: hugging-success-generic
-      interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-      messagePerceivedByOthers: hugging-success-generic-others
     - type: MindContainer
       showExamineInfo: true
     - type: Input
@@ -24,6 +19,7 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
+    - type: PotentialPsionic
     - type: Respirator
       damage:
        types:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
index 0bcd71fbadb..07152d74ef0 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -8,6 +8,7 @@
   - type: HumanoidAppearance
     species: Vulpkanin
   - type: Hunger
+    baseDecayRate: 0.02083333332 # 25% more than default
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Inventory # Allows vulps to wear properly shaped helmets
     speciesId: vulpkanin
@@ -97,6 +98,11 @@
       Female: FemaleVulpkanin
       Unsexed: MaleVulpkanin
   - type: DogVision
+  - type: ScentTracker
+  - type: Flashable
+    eyeDamageChance: 0.3
+    eyeDamage: 1
+    durationMultiplier: 1.5
   - type: Wagging
   - type: LanguageKnowledge
     speaks:
@@ -105,6 +111,11 @@
     understands:
     - GalacticCommon
     - Canilunzt
+  - type: ConsumeDelayModifier
+    foodDelayMultiplier: 0.5
+    drinkDelayMultiplier: 0.5
+  - type: Flammable
+    fireStackIncreaseMultiplier: 1.25
 
 - type: entity
   save: false
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/door_remote.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml
new file mode 100644
index 00000000000..27fa0a36530
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: DoorRemoteDefault
+  id: DoorRemoteJustice
+  name: justice door remote
+  components:
+  - type: Sprite
+    layers:
+    - state: door_remotebase
+    - state: door_remotelightscolour
+      color: "#6b2833"
+    - state: door_remotescreencolour
+      color: "#6b2833"
+  - type: Access
+    groups:
+    - Justice
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml
index c41c235c136..67b723e4310 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml
@@ -1,3 +1,19 @@
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyJustice
+  name: justice encryption key
+  description: An encryption key used by the justice department.
+  components:
+  - type: EncryptionKey
+    channels:
+    - Justice
+    defaultChannel: Justice
+  - type: Sprite
+    layers:
+    - state: crypt_gray
+    - sprite: DeltaV/Objects/Devices/encryption_keys.rsi
+      state: justice_label
+
 - type: entity
   parent: EncryptionKey
   id: EncryptionKeyPrison
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index d9607390cd7..58d07f30a71 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
@@ -41,6 +40,123 @@
     scanningEndSound:
       path: "/Audio/Items/Medical/healthscanner.ogg"
 
+- type: entity
+  parent: BasePDA
+  id: ChiefJusticePDA
+  name: chief justice PDA
+  description: Whosoever bears this PDA is the law.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
+  - type: Pda
+    id: ChiefJusticeIDCard
+    state: pda-chiefjustice
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#470823"
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    state: pda-chiefjustice
+  - type: CartridgeLoader
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - CrimeAssistCartridge
+
+- type: entity
+  parent: BasePDA
+  id: ClerkPDA
+  name: clerk PDA
+  description: It has the stamp to prove it's been officially notarized!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
+  - type: Pda
+    id: ClerkIDCard
+    state: pda-clerk
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#611528"
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    state: pda-clerk
+  - type: CartridgeLoader
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - CrimeAssistCartridge
+      
+- type: entity
+  parent: BasePDA
+  id: ProsecutorPDA
+  name: prosecutor PDA
+  description: Sharp. Looks like it could prosecute you all on its own.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
+  - type: Pda
+    id: ProsecutorIDCard
+    state: pda-prosecutor
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#6f6192"
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    state: pda-prosecutor
+  - type: CartridgeLoader # DeltaV - Crime Assist
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - CrimeAssistCartridge
+
 - type: entity
   parent: SyndiPDA
   id: SyndiListeningPostPDA
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
index d1e26bf27fb..bd3975767ba 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -134,3 +134,28 @@
   components:
   - type: NavMapBeacon
     text: station-beacon-corpsman
+
+#Justice
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconJustice
+  suffix: Justice
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-justice
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconChiefJustice
+  suffix: Chief Justice
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-chiefjustice
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconProsecutor
+  suffix: Prosecutor
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-prosecutor
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
new file mode 100644
index 00000000000..53f4d188d40
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -0,0 +1,25 @@
+- type: entity
+  name: station warrant
+  parent: Paper
+  id: PaperStationWarrant
+  description: 'A paper warrant issued by the justice department.'
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: paper
+      color: "#e0bc99"
+    - state: paper_words
+      map: ["enum.PaperVisualLayers.Writing"]
+      color: "#e0bc99"
+      visible: false
+    - state: paper_stamp-generic
+      map: ["enum.PaperVisualLayers.Stamp"]
+      visible: false
+  - type: PaperVisuals
+    headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png"
+    headerMargin: 0.0, 0.0, 10.0, 16.0
+    backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
+    backgroundModulate: "#e0bc99"
+    backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
+    contentMargin: 32.0, 16.0, 32.0, 0.0
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
index 2494de534e4..764d053393e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
@@ -25,3 +25,33 @@
   - type: Sprite
     sprite: DeltaV/Objects/Misc/stamps.rsi
     state: stamp-lawyer
+
+- type: entity
+  name: notary stamp
+  parent: RubberStampBase
+  id: RubberStampNotary
+  description: An old-fashioned seal for marking important documents, made of polished bronze.
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-notary
+    stampedColor: "#a81f3d"
+    stampState: "paper_stamp-notary"
+  - type: Sprite
+    sprite: DeltaV/Objects/Misc/stamps.rsi
+    state: stamp-notary
+  - type: StealTarget
+    stealGroup: RubberStampNotary
+
+- type: entity
+  name: chief justice stamp
+  parent: RubberStampBase
+  id: RubberStampChiefJustice
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-chiefjustice
+    stampedColor: "#6b2833"
+    stampState: "paper_stamp-notary"
+  - type: Sprite
+    sprite: DeltaV/Objects/Misc/stamps.rsi
+    state: stamp-cj
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml
new file mode 100644
index 00000000000..52f5286e34a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: BaseItem
+  id: Gavel
+  name: gavel
+  description: A hardwood mallet made to keep order in the court.
+  components:
+    - type: Sprite
+      sprite: DeltaV/Objects/Specific/Justice/gavel.rsi
+      layers:
+        - state: icon
+    - type: MeleeWeapon
+      wideAnimationRotation: -90
+      damage:
+        types:
+          Blunt: 2
+    - type: Item
+      size: Small
+      sprite: DeltaV/Objects/Specific/Justice/gavel.rsi
+    - type: Tag
+      tags:
+        - Gavel
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml
new file mode 100644
index 00000000000..a74ae7a9ff7
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: BaseItem
+  id: GavelBlock
+  name: gavel block
+  description: A hardwood block that, when hit with a gavel, emits an aura of authority.
+  components:
+    - type: Sprite
+      sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi
+      layers:
+        - state: icon
+    - type: Item
+      size: Small
+    - type: Clickable
+    - type: EmitSoundOnInteractUsing
+      sound:
+        path: /Audio/DeltaV/Items/gavel.ogg
+      whitelist:
+        tags:
+          - Gavel
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml
new file mode 100644
index 00000000000..3e847b3a843
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: TrialTimer
+  parent: SignalTimer
+  name: trial timer
+  description: A fancy timer with a screen, designed to keep trials within their time limit.
+  components:
+  - type: SignalTimer
+    canEditLabel: true
+  - type: TextScreenVisuals
+    color: 	"#b03060"
+    textOffset: 1,8
+    timerOffset: 1,8
+    textLength: 5
+    rows: 1
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: DeltaV/Objects/Specific/Justice/trialtimer.rsi
+    state: trialtimer
+    noRot: true
+  - type: Construction
+    graph: Timer
+    node: screen
+
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
index fc9f2902ad0..f6e7bcf2577 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -15,6 +15,88 @@
   - type: AccessReader
     access: [["Mantis"]]
 
+- type: entity
+  parent: AirlockCommand
+  id: AirlockChiefJusticeLocked
+  suffix: Chief Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefJustice ]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockChiefJusticeGlassLocked
+  suffix: ChiefJustice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefJustice ]
+
+- type: entity
+  parent: AirlockJustice
+  id: AirlockJusticeLocked
+  suffix: Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJustice ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockJusticeGlassLocked
+  suffix: Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJustice ]
+
+- type: entity
+  parent: AirlockJustice
+  id: AirlockProsecutorLocked
+  suffix: Prosecutor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsProsecutor ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockProsecutorGlassLocked
+  suffix: Prosecutor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsProsecutor ]
+
+# Maintenance
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintChiefJusticeLocked
+  suffix: ChiefJustice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefJustice ]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintJusticeLocked
+  suffix: Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJustice ]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintProsecutorLocked
+  suffix: Prosecutor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsProsecutor ]
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockCorpsmanLocked
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
new file mode 100644
index 00000000000..93a8cec851a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -0,0 +1,22 @@
+- type: entity
+  parent: Airlock
+  id: AirlockJustice
+  suffix: Justice
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi
+  - type: PaintableAirlock
+    department: Justice
+
+# Glass
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockJusticeGlass
+  suffix: Justice
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi
+  - type: PaintableAirlock
+    department: Justice
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
index d27a8d8e70e..07938a3bf3c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -21,3 +21,39 @@
   components:
   - type: AccessReader
     access: [["Paramedic"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureChiefJusticeLocked
+  suffix: ChiefJustice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefJustice ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureJusticeLocked
+  suffix: Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJustice ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureProsecutorLocked
+  suffix: Prosecutor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsProsecutor ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureLawyerLocked
+  suffix: Lawyer, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
new file mode 100644
index 00000000000..b49002ab22b
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -0,0 +1,25 @@
+- type: entity
+  id: LockerChiefJustice
+  parent: LockerBaseSecure
+  name: chief justice's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: cj 
+    stateDoorOpen: cj_open
+    stateDoorClosed: cj_door
+  - type: AccessReader
+    access: [["ChiefJustice"]]
+    
+- type: entity
+  id: LockerClerk
+  parent: LockerBaseSecure
+  name: clerk's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: clerk
+    stateDoorOpen: clerk_open
+    stateDoorClosed: clerk_door
+  - type: AccessReader
+    access: [["Justice"]]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml
index 6129ff6c413..3b5329e230c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -17,3 +17,25 @@
   - type: Sprite
     sprite: DeltaV/Structures/Wallmounts/signs.rsi
     state: direction_mail
+
+- type: entity
+  parent: BaseSignDirectional
+  id: SignDirectionalJustice
+  name: justice department sign
+  description:  A direction sign, pointing out which way the Justice department is.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Wallmounts/signs.rsi
+    state: direction_justice
+
+- type: entity
+  parent: BaseSignDirectional
+  id: SignDirectionaCourt
+  name: court room sign
+  description:  A direction sign, pointing out which way the court room is.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Wallmounts/signs.rsi
+    state: direction_court
+
+
diff --git a/Resources/Prototypes/DeltaV/NPC/roboisseur.yml b/Resources/Prototypes/DeltaV/NPC/roboisseur.yml
index 2c0b3aee8a0..e7f0b5bcd09 100644
--- a/Resources/Prototypes/DeltaV/NPC/roboisseur.yml
+++ b/Resources/Prototypes/DeltaV/NPC/roboisseur.yml
@@ -4,12 +4,22 @@
   name: Mr. Butlertron
   description: It asks for food to deliver to exotic customers across the cosmos. Powered by the latest technology in bluespace food delivery.
   components:
+  - type: Anchorable
+  - type: Pullable
   - type: Sprite
     noRot: true
     drawdepth: Mobs
     sprite: DeltaV/Structures/Machines/roboisseur.rsi
     layers:
     - state: roboisseur-1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
   - type: Roboisseur
   - type: Speech
     speechSounds: Pai
diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml
index cf7d4f90d68..b3113308735 100644
--- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml
@@ -18,3 +18,12 @@
   sprite:
     sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi
     state: base
+
+- type: stealTargetGroup
+  id: RubberStampNotary
+  name: notary stamp
+  sprite:
+    sprite: DeltaV/Objects/Misc/stamps.rsi
+    state: stamp-notary
+
+
diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml
index 4fa25f26987..d27ec220fa4 100644
--- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml
+++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml
@@ -32,3 +32,16 @@
   - type: StealCondition
     stealGroup: WeaponEnergyGunMultiphase
     owner: job-name-hos
+
+- type: entity # Clerk steal objective.
+  noSpawn: true
+  parent: BaseTraitorStealObjective
+  id: ClerkNotaryStealObjective
+  components:
+  - type: NotJobRequirement
+    job: Clerk
+  - type: StealCondition
+    stealGroup: RubberStampNotary
+    owner: job-name-clerk
+
+
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
new file mode 100644
index 00000000000..2a879472e8c
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
@@ -0,0 +1,59 @@
+- type: job
+  id: ChiefJustice
+  name: job-name-chief-justice
+  description: job-description-chief-justice
+  playTimeTracker: JobChiefJustice
+  requirements:
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobClerk
+      min: 36000 # 10 hours
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobLawyer
+      min: 36000 # 10 hours
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobProsecutor
+      min: 36000 # 10 hours
+    - !type:CharacterOverallTimeRequirement
+      min: 90000 # 25 hours
+    - !type:WhitelistRequirement # whitelist requirement because I don't want any dingus judges
+  weight: 20
+  startingGear: CJGear
+  icon: "JobIconChiefJustice"
+  requireAdminNotify: true
+  supervisors: job-supervisors-captain
+  canBeAntag: false
+  access:
+  - Command
+  - ChiefJustice
+  - Justice
+  - Security
+  - Maintenance
+  - External
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
+  - !type:AddComponentSpecial
+    components:
+    - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic.
+      flatBonus: 0.025
+
+- type: startingGear
+  id: CJGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitChiefJustice
+    back: ClothingBackpackFilled # TODO- make Justice department bags
+    shoes: ClothingShoesLeather
+    head: ClothingHeadHatCJToque
+    outerClothing: ClothingOuterChiefJustice
+    id: ChiefJusticePDA
+    ears: ClothingHeadsetAltJustice
+    gloves: ClothingHandsGlovesColorWhite
+    # Todo - pocket1: Gavel
+  innerClothingSkirt: ClothingUniformJumpskirtChiefJustice
+  satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags
+  duffelbag: ClothingBackpackDuffelFilled
+
+
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
new file mode 100644
index 00000000000..c2032b67ebe
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
@@ -0,0 +1,41 @@
+- type: job
+  id: Clerk
+  name: job-name-clerk
+  description: job-description-clerk
+  playTimeTracker: JobClerk
+  antagAdvantage: 2
+  requirements:
+    - !type:CharacterDepartmentTimeRequirement
+      department: Security
+      min: 36000 # 10 hrs
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobLawyer
+      min: 36000 # 10 hours
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobProsecutor
+      min: 36000 # 10 hours
+
+
+  startingGear: ClerkGear
+  icon: "JobIconClerk"
+  requireAdminNotify: true
+  supervisors: job-supervisors-cj
+  canBeAntag: false
+  access:
+  - Justice
+  - Security
+  - Maintenance
+
+- type: startingGear
+  id: ClerkGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitClerk
+    back: ClothingBackpackFilled
+    shoes: ClothingShoesBootsLaceup
+    id: ClerkPDA
+    ears: ClothingHeadsetJustice
+  innerClothingSkirt: ClothingUniformJumpskirtClerk
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled
+
+
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml
new file mode 100644
index 00000000000..e0cebc4417a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml
@@ -0,0 +1,34 @@
+- type: job
+  id: Prosecutor
+  name: job-name-prosecutor
+  description: job-description-prosecutor
+  playTimeTracker: JobProsecutor
+  requirements:
+    - !type:CharacterOverallTimeRequirement
+      min: 36000 # 10 hrs
+  startingGear: ProsecutorGear
+  icon: "JobIconProsecutor"
+  supervisors: job-supervisors-cj
+  access:
+  - Prosecutor
+  - Justice
+  - Security
+  - Maintenance
+
+- type: startingGear
+  id: ProsecutorGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitProsecutor
+    neck: ClothingNeckProsecutorbadge
+    back: ClothingBackpackLawyerFilled
+    shoes: ClothingShoesBootsLaceup
+    id: ProsecutorPDA
+    ears: ClothingHeadsetSecurity
+    # TODO add copy of space law
+  inhand:
+    - BriefcaseBrownFilled
+  innerClothingSkirt: ClothingUniformJumpskirtProsecutor
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled
+
+
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
index daf7f1195c0..681cb95be71 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -26,13 +26,16 @@
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+    - type: CPRTraining
 
 - type: startingGear
   id: CorpsmanGear # see Prototypes/Roles/Jobs/Fun/misc_startinggear.yml for "BrigmedicGear"
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterArmorPlateCarrier
-    back: ClothingBackpackBrigmedicDeltaVFilled
+    back: ClothingBackpackBrigmedicFilled 
     shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical
@@ -42,5 +45,5 @@
     belt: ClothingBeltCorpsmanWebbingFilled
     pocket1: WeaponPistolMk58Nonlethal
   innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
-  satchel: ClothingBackpackSatchelBrigmedicDeltaVFilled
-  duffelbag: ClothingBackpackDuffelBrigmedicDeltaVFilled
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml
new file mode 100644
index 00000000000..c4d5fbfe20d
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml
@@ -0,0 +1,11 @@
+- type: department
+  id: Justice
+  description: department-justice-description
+  color: "#701442"
+  roles:
+  - ChiefJustice
+  - Clerk
+  - Prosecutor
+  - Lawyer
+
+
diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
index d3b983f01cd..4ab6f3eed45 100644
--- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
@@ -3,3 +3,6 @@
 
 - type: playTimeTracker
   id: JobMedicalBorg
+
+- type: playTimeTracker
+  id: JobCourier
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
index 63458928cc8..2a8e17ebc45 100644
--- a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
@@ -31,3 +31,12 @@
   id: VulpkaninHowls
   files:
   - /Audio/DeltaV/Voice/Vulpkanin/howl.ogg
+
+- type: soundCollection
+  id: VulpkaninScreams
+  files:
+  - /Audio/Voice/Vulpkanin/vulpscream1.ogg
+  - /Audio/Voice/Vulpkanin/vulpscream2.ogg
+  - /Audio/Voice/Vulpkanin/vulpscream3.ogg
+  - /Audio/Voice/Vulpkanin/vulpscream4.ogg
+  - /Audio/Voice/Vulpkanin/vulpscream5.ogg
diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
index 8a3cd4c47ce..e139279dd5c 100644
--- a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -62,9 +62,6 @@
       points: 1
       required: true
       defaultMarkings: [ VulpEar ]
-    Overlay:
-      points: 2
-      required: false
 
 - type: humanoidBaseSprite
   id: MobVulpkaninHead
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
index 949ac6a99e3..894e1586b40 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -4,3 +4,24 @@
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: MedicalBorg
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconChiefJustice
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: ChiefJustice
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconClerk
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: Clerk
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconProsecutor
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: Prosecutor #need prosecutor
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 011de6a7c52..119134dcf18 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -67,7 +67,7 @@
     variation: 0.125
   sounds:
     Scream:
-      collection: MaleScreams
+      collection: VulpkaninScreams
     Laugh:
       collection: MaleLaugh
     Sneeze:
@@ -105,7 +105,7 @@
     variation: 0.125
   sounds:
     Scream:
-      collection: FemaleScreams
+      collection: VulpkaninScreams
     Laugh:
       collection: FemaleLaugh
     Sneeze:
diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml
index 639eea09b3a..53490d90fac 100644
--- a/Resources/Prototypes/DeltaV/radio_channels.yml
+++ b/Resources/Prototypes/DeltaV/radio_channels.yml
@@ -1,6 +1,15 @@
+- type: radioChannel
+  id: Justice
+  name: chat-radio-justice
+  keycode: "j"
+  frequency: 1420
+  color: "#701442"
+
 - type: radioChannel
   id: Prison
   name: chat-radio-prison
   keycode: 'p'
   frequency: 1601
-  color: "#FFA500"
\ No newline at end of file
+  color: "#FFA500"
+
+
diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
index 6a1efcfa695..36ea3e56a4e 100644
--- a/Resources/Prototypes/DeltaV/tags.yml
+++ b/Resources/Prototypes/DeltaV/tags.yml
@@ -15,6 +15,12 @@
 - type: Tag
   id: ForensicBeltEquip
 
+- type: Tag
+  id: Gavel
+
+- type: Tag
+  id: GasPipeHalf #Craftable Musket
+
 - type: Tag
   id: HandLabeler
 
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 9af8edb0028..0f6c4acfcb5 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -234,3 +234,36 @@
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
   - type: FlashImmunity
+
+- type: entity #Fake goggles, the latest in anti-valid hunting technology
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesThermalBudget
+  name: red goggles
+  description: These don't have any real function, but they do look cool!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/thermal.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/thermal.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesChemicalBudget
+  name: purple goggles
+  description: These don't have any real function, but they do look cool!
+  components:
+    - type: Sprite
+      sprite: Clothing/Eyes/Glasses/science.rsi
+    - type: Clothing
+      sprite: Clothing/Eyes/Glasses/science.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesMesonBudget
+  name: green goggles
+  description: These don't have any real function, but they do look cool!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/meson.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/meson.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
index 06ff3471727..431459f792e 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
@@ -26,3 +26,14 @@
     graph: Blindfold
     node: blindfold
   - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldFake
+  name: blindfold
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Misc/blindfold.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Misc/blindfold.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 963bcdedd78..c3c6a617a03 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -54,26 +54,6 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/cosmonaut.rsi
 
-#Paramedic Void Helmet
-- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadHelmetVoidParamed
-  name: paramedic void helmet
-  description: A void helmet made for paramedics.
-  components:
-  - type: BreathMask
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/paramedhelm.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/paramedhelm.rsi
-  - type: TemperatureProtection
-    coefficient: 0.1
-  - type: Armor
-    modifiers:
-      coefficients:
-        Heat: 0.90
-        Radiation: 0.75
-
 #Ancient Void Helmet
 - type: entity
   parent: ClothingHeadEVAHelmetBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index f1489b0ddd6..6985fe7ec39 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -156,6 +156,25 @@
         Piercing: 0.9
         Heat: 0.9
 
+#Paramedic Void Helmet
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitVoidParamed
+  name: paramedic void helmet
+  description: A void helmet made for paramedics.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/paramedhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/paramedhelm.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Heat: 0.90
+        Radiation: 0.75
+
+
 #Security Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
index 7b4ab078911..efdec875e69 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
@@ -74,3 +74,25 @@
     sprite: Clothing/Neck/mantles/qmmantle.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/qmmantle.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckOldMantle
+  name: old wrap
+  description: A tattered fabric wrap, faded over the years. Smells faintly of cigars.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/mantles/oldmantle.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/mantles/oldmantle.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckUnathiMantle
+  name: hide mantle
+  description: A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/mantles/unathimantle.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/mantles/unathimantle.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 51325c0bbbd..11921b9a50d 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -79,3 +79,17 @@
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckBellCollar
+  name: bell collar
+  description: A way to inform others about your presence, or just to annoy everyone around you!
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/bellcollar.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/bellcollar.rsi
+  - type: EmitsSoundOnMove
+    soundCollection:
+      collection: FootstepJester
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 9a1f1427402..eb580d64996 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -1,7 +1,6 @@
 # Numbers for armor here largely taken from /tg/.
 # NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day.
 
-#Basic armor vest
 - type: entity
   parent: ClothingOuterBaseMedium
   id: ClothingOuterArmorBasic
@@ -138,6 +137,9 @@
         Radiation: 0
         Caustic: 0.75
   - type: GroupExamine
+  - type: Tag
+    tags:
+      - FullBodyOuter
 
 - type: entity
   parent: ClothingOuterArmorHeavy
@@ -234,6 +236,9 @@
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: GroupExamine
+  - type: Tag
+    tags:
+      - FullBodyOuter
 
 - type: entity
   parent: ClothingOuterBaseLarge
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 8f4312e7711..358f91d2971 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -138,9 +138,15 @@
     - Hardsuit
     - WhitelistChameleon
     - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
+    - FullBodyOuter
   - type: Clothing
     equipDelay: 2.5 # Hardsuits are heavy and take a while to put on/off.
     unequipDelay: 2.5
+  - type: Geiger
+    attachedToSuit: true
+    localSoundOnly: true
+  - type: StaminaDamageResistance
+    coefficient: 0.75 # 25%
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index e0d8e7290da..ba889285a16 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -100,6 +100,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitEngineering
+  - type: StaminaDamageResistance
+    coefficient: 0.75 # 25%
 
 #Spationaut Hardsuit
 - type: entity
@@ -161,6 +163,38 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSalvage
 
+#Paramedic Voidsuit
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitVoidParamed
+  name: paramedic hardsuit
+  description: A hardsuit made for paramedics.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
+  - type: TemperatureProtection
+    coefficient: 0.1
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Heat: 0.90
+        Radiation: 0.75
+        Caustic: 0.5
+  - type: StealTarget
+    stealGroup: ClothingOuterHardsuitVoidParamed
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+  - type: HeldSpeedModifier
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitVoidParamed
+
+
 - type: entity
   parent: ClothingOuterHardsuitBase
   id: ClothingOuterHardsuitMaxim
@@ -221,6 +255,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSecurity
+  - type: StaminaDamageResistance
+    coefficient: 0.75 # 25%
 
 #Brigmedic Hardsuit
 - type: entity
@@ -248,6 +284,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic
+  - type: StaminaDamageResistance
+    coefficient: 0.75 # 25%
 
 #Warden's Hardsuit
 - type: entity
@@ -278,6 +316,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWarden
+  - type: StaminaDamageResistance
+    coefficient: 0.65 # 35%
 
 #Captain's Hardsuit
 - type: entity
@@ -310,6 +350,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCap
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Chief Engineer's Hardsuit
 - type: entity
@@ -345,6 +387,8 @@
   - type: ClothingGrantComponent
     component:
     - type: SupermatterImmune
+  - type: StaminaDamageResistance
+    coefficient: 0.65 # 35%
 
 #Chief Medical Officer's Hardsuit
 - type: entity
@@ -412,6 +456,8 @@
     price: 750
   - type: StealTarget
     stealGroup: ClothingOuterHardsuitRd
+  - type: StaminaDamageResistance
+    coefficient: 0.75 # 25% as in "shock resistance" :trollface:
 
 #Head of Security's Hardsuit
 - type: entity
@@ -443,6 +489,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Luxury Mining Hardsuit
 - type: entity
@@ -520,6 +568,8 @@
     - Hardsuit
     - WhitelistChameleon
     - HidesHarpyWings
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 # Syndicate Medic Hardsuit
 - type: entity
@@ -539,6 +589,8 @@
     - Hardsuit
     - WhitelistChameleon
     - HidesHarpyWings
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Syndicate Elite Hardsuit
 - type: entity
@@ -575,6 +627,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Syndicate Commander Hardsuit
 - type: entity
@@ -607,6 +661,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Cybersun Juggernaut Hardsuit
 - type: entity
@@ -639,6 +695,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCybersun
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Wizard Hardsuit
 - type: entity
@@ -671,6 +729,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWizard
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Ling Space Suit
 - type: entity
@@ -766,6 +826,8 @@
     clothingPrototype: ClothingHeadHelmetHardsuitPirateCap
   - type: StaticPrice
     price: 0
+  - type: StaminaDamageResistance
+    coefficient: 0.75 # 25%
 
 #CENTCOMM / ERT HARDSUITS
 #ERT Leader Hardsuit
@@ -781,6 +843,8 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #ERT Chaplain Hardsuit
 - type: entity
@@ -795,6 +859,8 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #ERT Engineer Hardsuit
 - type: entity
@@ -809,6 +875,8 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #ERT Medic Hardsuit
 - type: entity
@@ -823,6 +891,8 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTMedical
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #ERT Security Hardsuit
 - type: entity
@@ -841,6 +911,8 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #ERT Janitor Hardsuit
 - type: entity
@@ -855,6 +927,8 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTJanitor
+  - type: StaminaDamageResistance
+    coefficient: 0.5 # 50%
 
 #Deathsquad
 - type: entity
@@ -889,6 +963,8 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
+  - type: StaminaDamageResistance
+    coefficient: 0.1 # 90%
 
 #CBURN Hardsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index d17fb275c13..4b2c3c9c3ff 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -377,3 +377,14 @@
     sprite: Clothing/OuterClothing/Misc/red_racoon.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/red_racoon.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterUnathiRobe
+  name: roughspun robes
+  description: A traditional Unathi garment.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/unathirobe.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/unathirobe.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index b81b3d1e7f0..115202813c7 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -2,8 +2,8 @@
 - type: entity
   parent: ClothingOuterEVASuitBase
   id: ClothingOuterHardsuitEVA
-  name: EVA suit
-  description: A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies.
+  name: vacsuit
+  description: A lightweight vacsuit with the basic ability to protect the wearer from the vacuum of space during emergencies.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/eva.rsi
@@ -20,7 +20,7 @@
 - type: entity
   parent: ClothingOuterEVASuitBase
   id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate
-  name: syndicate EVA suit
+  name: syndicate vacsuit
   description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'"
   components:
   - type: Sprite
@@ -38,8 +38,8 @@
 - type: entity
   parent: ClothingOuterEVASuitBase
   id: ClothingOuterSuitEmergency
-  name: emergency EVA suit
-  description: An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to bide you time from the harsh vaccuum of space.
+  name: emergency vacsuit
+  description: An emergency vacsuit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to bide you time from the harsh vaccuum of space.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/eva_emergency.rsi
@@ -62,7 +62,7 @@
 - type: entity
   parent: ClothingOuterEVASuitBase
   id:  ClothingOuterHardsuitEVAPrisoner
-  name: prisoner EVA suit
+  name: prisoner vacsuit
   description: A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies.
   components:
   - type: Sprite
@@ -80,8 +80,8 @@
 - type: entity
   parent: ClothingOuterEVASuitBase
   id: ClothingOuterHardsuitAncientEVA
-  name: NTSRA voidsuit #Nanotrasen Space Research Association
-  description: An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits.
+  name: NTSRA vacsuit #Nanotrasen Space Research Association
+  description: An ancient vacsuit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern vacsuits.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/ancient_voidsuit.rsi
@@ -91,40 +91,3 @@
     walkModifier: 0.85
     sprintModifier: 0.85
   - type: HeldSpeedModifier
-
-#Paramedic Voidsuit
-#Despite having resistances and looking like a hardsuit, this parents off the EVA suit so it goes here.
-- type: entity
-  parent: ClothingOuterEVASuitBase
-  id: ClothingOuterHardsuitVoidParamed
-  name: paramedic void suit
-  description: A void suit made for paramedics.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.5
-    lowPressureMultiplier: 1000
-  - type: ClothingSpeedModifier
-    walkModifier: 0.9
-    sprintModifier: 0.9
-  - type: HeldSpeedModifier
-  - type: TemperatureProtection
-    coefficient: 0.1
-  - type: Armor
-    modifiers:
-      coefficients:
-        Heat: 0.90
-        Radiation: 0.75
-        Caustic: 0.5
-  - type: GroupExamine
-  - type: StealTarget
-    stealGroup: ClothingOuterHardsuitVoidParamed
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetVoidParamed
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index d6cd5295731..9f0a01cc481 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -25,6 +25,7 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+    - FullBodyOuter
     - HidesHarpyWings
 
 - type: entity
@@ -38,6 +39,17 @@
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: ExplosionResistance
+    damageCoefficient: 0.15
+  - type: GroupExamine
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
+    - FullBodyOuter
 
 - type: entity
   parent: ClothingOuterBaseLarge
@@ -97,6 +109,7 @@
     - type: GroupExamine
     - type: Tag
       tags:
+        - FullBodyOuter
         - WhitelistChameleon
         - HidesHarpyWings
 
@@ -124,6 +137,7 @@
       toggleable-clothing: !type:ContainerSlot {}
   - type: Tag
     tags:
+      - FullBodyOuter
       - WhitelistChameleon
       - HidesHarpyWings
 
@@ -177,6 +191,9 @@
     sprite: Clothing/OuterClothing/Suits/chicken.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/chicken.rsi
+  - type: Tag
+    tags:
+      - FullBodyOuter
 
 - type: entity
   parent: ClothingOuterBase
@@ -202,6 +219,9 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+  - type: Tag
+    tags:
+      - FullBodyOuter
 
 - type: entity
   parent: ClothingOuterBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
index b867abfeed3..784084652c1 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -51,6 +51,15 @@
     sprite: Clothing/OuterClothing/Vests/detvest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/detvest.rsi
+  - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
+    modifiers:
+      coefficients:
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
+        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
 
 #Hazard vest
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index aa4a7b50e65..160c606cc41 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -248,6 +248,7 @@
         Slash: 0.75
         Piercing: 0.75
         Heat: 0.75
+        Caustic: 0.75 #not the full 90% from ss13 because of the head
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -417,12 +418,12 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSec
-  - type: Armor # DeltaV - adds resists to coat
+  - type: Armor
     modifiers:
       coefficients:
         Blunt: 0.85
         Slash: 0.85
-        Piercing: 0.85 # DeltaV - not as resistant as pre-rebase, but still better than nothing
+        Piercing: 0.85 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
         Heat: 0.75
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/clothwarps.yml b/Resources/Prototypes/Entities/Clothing/clothwarps.yml
new file mode 100644
index 00000000000..eadeaa0b286
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/clothwarps.yml
@@ -0,0 +1,38 @@
+- type: entity
+  parent: Clothing
+  id: ClothingClothWrap
+  name: cloth wraps
+  description: A roll of treated canvas used for wrapping claws or paws.
+  components:
+  - type: Item
+    size: Small
+    storedRotation: -90
+  - type: Sprite
+    state: icon
+    sprite: Clothing/Shoes/Misc/clothWrap.rsi
+  - type: Clothing
+    slots:
+    - gloves
+    - FEET
+    sprite: Clothing/Shoes/Misc/clothWrap.rsi
+  - type: Construction
+    graph: ClothingClothWrap
+    node: shoes
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: MaterialCloth1
+      amount: 1
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index d12b85cde41..96b5f7aa8c5 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -12,6 +12,7 @@
       rarePrototypes:
         - FoamBlade
         - PlushieGhost
+        - PlushieAbductorAgent
       rareChance: 0.03
       prototypes:
         - PlushieBee
@@ -37,6 +38,37 @@
         - PlushieMothRandom # Nyanotrasen Random Moth Plushies
         - PlushieArachind
         - PlushieArachne
+        - PlushieAbductor
+        - PlushieGnome
+        - PlushieLoveable
+        - PlushieDeer
+        - PlushieIpc
+        - PlushieGrey
+        - PlushieRedFox
+        - PlushiePurpleFox
+        - PlushiePinkFox
+        - PlushieOrangeFox
+        - PlushieMarbleFox
+        - PlushieCrimsonFox
+        - PlushieCoffeeFox
+        - PlushieBlueFox
+        - PlushieBlackFox
+        - PlushieVulp
+        - PlushieCorgi
+        - PlushieGirlyCorgi
+        - PlushieRobotCorgi
+        - PlushieCatBlack
+        - PlushieCatGrey
+        - PlushieCatOrange
+        - PlushieCatSiames
+        - PlushieCatTabby
+        - PlushieCatTuxedo
+        - PlushieCatWhite
+        - PlushieRatvar
+        - PlushieNar
+        - PlushieTrystan
+        - PlushieSlips
+        - PlushieJester
       chance: 0.5
       offset: 0.2
 
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
index 697781be939..2629d836516 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
@@ -253,6 +253,56 @@
     - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
       state: peacock_tail_eyes
 
+- type: marking
+  id: HarpyTailHaven
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: haven_tone_1
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: haven_tone_2
+
+- type: marking
+  id: HarpyTailForkedLong
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: forked_long
+
+- type: marking
+  id: HarpyTailSwallow
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: swallow_tail
+
 - type: marking
   id: HarpyWing2ToneClassic
   bodyPart: RArm
@@ -310,6 +360,29 @@
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_wingtip_2
 
+- type: marking
+  id: HarpyWingBat
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bat_wings_tone_1
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bat_wings_tone_2
+
+- type: marking
+  id: HarpyWingBionic
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bionic_wings_tone_1
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bionic_wings_tone_2
+      shader: unshaded
+
 - type: marking
   id: HarpyChestDefault
   bodyPart: Chest
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
index 51fc2fd15a2..bfca2ff488a 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
@@ -4,7 +4,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: schnozz
@@ -15,7 +15,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: nubby
@@ -26,7 +26,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: droop
@@ -37,7 +37,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: blob
@@ -48,7 +48,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy]
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: uppie
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml
new file mode 100644
index 00000000000..0ff03df1a0d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml
@@ -0,0 +1,13 @@
+- type: marking
+  id: OniTwoToedFeet
+  bodyPart: RFoot # Can't be LFoot to avoid visual glitches
+  markingCategory: Legs
+  speciesRestriction: [Oni]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#454545"
+  sprites:
+  - sprite: Mobs/Customization/oni_feet.rsi
+    state: two_toes
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml
new file mode 100644
index 00000000000..88d4ee493db
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml
@@ -0,0 +1,525 @@
+- type: marking
+  id: OniHornTallCurved
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_curved
+- type: marking
+  id: OniHornTallCurved3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_curved_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_curved_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_curved_3tone_3
+- type: marking
+  id: OniHornTallBull
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_bull
+- type: marking
+  id: OniHornTallBull3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_bull_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_bull_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: tall_bull_3tone_3
+- type: marking
+  id: OniHornCrowned
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: crowned
+
+- type: marking
+  id: OniHornSerket
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: serket
+
+- type: marking
+  id: OniHornSerket3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: serket_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: serket_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: serket_3tone_3
+
+- type: marking
+  id: OniHornPisces
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: pisces
+
+- type: marking
+  id: OniHornPisces2Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: pisces_2tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: pisces_2tone_2
+
+- type: marking
+  id: OniHornPisces3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: pisces_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: pisces_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: pisces_3tone_3
+
+- type: marking
+  id: OniHornVirgo
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: virgo
+
+- type: marking
+  id: OniHornVirgo3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: virgo_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: virgo_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: virgo_3tone_3
+
+- type: marking
+  id: OniHornSagittarius
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: sagittarius
+
+- type: marking
+  id: OniHornSagittarius3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: sagittarius_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: sagittarius_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: sagittarius_3tone_3
+
+- type: marking
+  id: OniHornVantas
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: vantas
+
+- type: marking
+  id: OniHornVantas3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: vantas_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: vantas_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: vantas_3tone_3
+
+- type: marking
+  id: OniHornMakara
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: makara
+
+- type: marking
+  id: OniHornMakara2Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: makara_2tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: makara_2tone_2
+
+- type: marking
+  id: OniHornMakara3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: makara_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: makara_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
+    state: makara_3tone_3
+
+- type: marking
+  id: OniHornNepeta
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: nepeta
+
+- type: marking
+  id: OniHornNepeta3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: nepeta_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: nepeta_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: nepeta_3tone_3
+
+- type: marking
+  id: OniHornTaurus
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: taurus
+
+- type: marking
+  id: OniHornTaurus2Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: taurus_2tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: taurus_2tone_2
+
+- type: marking
+  id: OniHornTaurus3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: taurus_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: taurus_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: taurus_3tone_3
+
+- type: marking
+  id: OniHornAries
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: aries
+
+- type: marking
+  id: OniHornAries3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: aries_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: aries_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: aries_3tone_3
+
+- type: marking
+  id: OniHornTavris
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: tavris
+
+- type: marking
+  id: OniHornTavris3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: tavris_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: tavris_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: tavris_3tone_3
+
+- type: marking
+  id: OniHornInclined
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: inclined
+
+- type: marking
+  id: OniHornInclined3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: inclined_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: inclined_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: inclined_3tone_3
+
+- type: marking
+  id: OniHornWavy
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: wavy
+
+- type: marking
+  id: OniHornWavy2Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: wavy_2tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: wavy_2tone_2
+
+- type: marking
+  id: OniHornWavy3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: wavy_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: wavy_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: wavy_3tone_3
+
+- type: marking
+  id: OniHornAntlers
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: antlers_2tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: antlers_2tone_2
+
+- type: marking
+  id: OniHornAntlers3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: antlers_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: antlers_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: antlers_3tone_3
+
+- type: marking
+  id: OniHornUnicorn
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: unicorn
+
+- type: marking
+  id: OniHornErebia
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: erebia
+
+- type: marking
+  id: OniHornErebia3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: erebia_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: erebia_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: erebia_3tone_3
+
+- type: marking
+  id: OniHornErebiaRings
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: erebia
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: erebia_rings
+
+- type: marking
+  id: OniHornDoubleThick
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_thick
+
+- type: marking
+  id: OniHornDoubleThick2Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_thick_2tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_thick_2tone_2
+
+- type: marking
+  id: OniHornDoubleThick3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_thick_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_thick_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_thick_3tone_3
+
+- type: marking
+  id: OniHornDoubleCurved3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_curved_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_curved_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_curved_3tone_3
+
+- type: marking
+  id: OniHornDoubleCurvedOutwards3Tone
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_curved_outwards_3tone_1
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_curved_outwards_3tone_2
+  - sprite: Mobs/Customization/Oni/oni_horns.rsi
+    state: double_curved_outwards_3tone_3
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
new file mode 100644
index 00000000000..10016fb9851
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
@@ -0,0 +1,89 @@
+- type: marking
+  id: PointyEarsStandard
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_standard
+
+- type: marking
+  id: PointyEarsWide
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_wide
+
+- type: marking
+  id: PointyEarsSmall
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_small
+
+- type: marking
+  id: PointyEarsUpwards
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_upwards
+
+- type: marking
+  id: PointyEarsTall
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_tall
+
+- type: marking
+  id: PointyEarsSlanted
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_slanted
+
+- type: marking
+  id: PointyEarsThin
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_thin
+
+- type: marking
+  id: PointyEarsLarge
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_large
+
+- type: marking
+  id: PointyEarsNone
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  forcedColoring: true
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: Mobs/Customization/pointy_ears.rsi
+    state: pointy_ears_none
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
index f4186295900..79e0a0ff012 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -22,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -33,7 +33,7 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid,  Oni]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -44,7 +44,7 @@
   id: ScarChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Felinid, Oni]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml
new file mode 100644
index 00000000000..e2b74b44847
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml
@@ -0,0 +1,27 @@
+- type: marking
+  id: GoblinTusksSmall
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Oni]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#d9d9d9"
+  sprites:
+  - sprite: Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_small
+
+- type: marking
+  id: GoblinTusksBig
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Oni]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#d9d9d9"
+  sprites:
+  - sprite: Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_big
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/arachne.yml b/Resources/Prototypes/Entities/Mobs/Player/arachne.yml
new file mode 100644
index 00000000000..cd4123fa80d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Player/arachne.yml
@@ -0,0 +1,30 @@
+- type: entity
+  save: false
+  name: Urist McArachne
+  parent: MobArachneBase
+  id: MobArachne
+  components:
+  - type: CombatMode
+  - type: MindContainer
+    showExamineInfo: true
+  - type: Input
+    context: "human"
+  - type: MobMover
+  - type: InputMover
+  - type: Respirator
+    damage:
+      types:
+        Asphyxiation: 1.0
+    damageRecovery:
+      types:
+        Asphyxiation: -1.0
+  - type: Alerts
+  - type: Actions
+  - type: Eye
+  - type: CameraRecoil
+  - type: Examiner
+  - type: CanHostGuardian
+  - type: NpcFactionMember
+    factions:
+    - NanoTrasen
+  - type: PotentialPsionic
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..fa6aa98d93c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
@@ -5,11 +5,6 @@
   id: MobHarpy
   components:
   - type: CombatMode
-  - type: InteractionPopup
-    successChance: 1
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
   - type: MindContainer
     showExamineInfo: true
   - type: Input
@@ -26,3 +21,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..d2a3225c070 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -3,11 +3,7 @@
   parent: BaseMobSkeletonPerson
   id: MobSkeletonPerson
   components:
-  - type: InteractionPopup
-    successChance: 1
-    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/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
new file mode 100644
index 00000000000..2f6437dc14e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
@@ -0,0 +1,220 @@
+- type: entity
+  save: false
+  name: Urist McArachne
+  parent: BaseMobHuman
+  id: MobArachneBase
+  abstract: true
+  components:
+  - type: Sprite
+    # Arachne are one of the species that needs a manual visual layers setup.
+    layers:
+    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      sprite: Mobs/Species/arachne.rsi
+      state: spider_body
+    - map: [ "enum.HumanoidVisualLayers.Chest" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: torso_m
+    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+      sprite: Mobs/Species/arachne.rsi
+      state: spider_body_front
+    - map: [ "enum.HumanoidVisualLayers.Head" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: head_m
+    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      color: "#008800"
+      sprite: Mobs/Species/eyes.rsi
+      state: eyes
+    - map: [ "enum.HumanoidVisualLayers.RArm" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: r_arm
+    - map: [ "enum.HumanoidVisualLayers.LArm" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_arm
+    - shader: StencilClear
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_leg
+    - shader: StencilMask
+      map: [ "enum.HumanoidVisualLayers.StencilMask" ]
+      sprite: Mobs/Customization/anytaur_masking_helpers.rsi
+      state: unisex_full
+      visible: false
+    - map: [ "jumpsuit" ]
+    - map: [ "enum.HumanoidVisualLayers.LHand" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_hand
+    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: r_hand
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+    - map: [ "id" ]
+    - map: [ "gloves" ]
+    - map: [ "shoes" ]
+    - map: [ "ears" ]
+    - map: [ "outerClothing" ]
+    - map: [ "eyes" ]
+    - map: [ "belt" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.Hair" ]
+      state: bald
+      sprite: Mobs/Customization/human_hair.rsi
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "pocket1" ]
+    - map: [ "pocket2" ]
+    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      sprite: Mobs/Customization/masking_helpers.rsi
+      state: none
+      visible: false
+    - map: [ "clownedon" ] # Dynamically generated
+      sprite: "Effects/creampie.rsi"
+      state: "creampie_human"
+      visible: false
+  - type: HumanoidAppearance
+    species: Arachne
+  - type: Fixtures
+    fixtures: # TODO: This needs a second fixture just for mob collisions.
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.40
+        density: 140
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Body
+    prototype: Arachne
+    requiredLegs: 8
+  - type: Speech
+    speechSounds: Alto
+  - type: Inventory
+    templateId: anytaur
+  - type: Tag
+    tags:
+    - CanPilot
+    - ShoesRequiredStepTriggerImmune
+    - DoorBumpOpener
+  - type: Bloodstream
+    bloodReagent: DemonsBlood
+  - type: BloodSucker
+    webRequired: true
+  - type: Arachne
+  - type: DamageVisuals
+    thresholds: [ 20, 40, 100 ]
+    targetLayers:
+      - "enum.HumanoidVisualLayers.Chest"
+      - "enum.HumanoidVisualLayers.Head"
+      - "enum.HumanoidVisualLayers.LArm"
+      - "enum.HumanoidVisualLayers.RArm"
+  - type: MovedByPressure
+    pressureResistance: 4
+  - type: Barotrauma
+    damage:
+      types:
+        Blunt: 0.05 #per second, scales with pressure and other constants. Reduced Damage. This allows medicine to heal faster than damage.
+  - type: MovementAlwaysTouching
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3.0
+    baseSprintSpeed : 5.0
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Generic_mob_burning
+    alternateState: arachne_standing
+    fireStackAlternateState: 3
+  - type: Spider
+  - type: IgnoreSpiderWeb
+
+- type: entity
+  save: false
+  name: Urist McHands
+  parent: MobHumanDummy
+  id: MobArachneDummy
+  noSpawn: true
+  description: A dummy arachne meant to be used in character setup.
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      sprite: Mobs/Species/arachne.rsi
+      state: spider_body
+    - map: [ "enum.HumanoidVisualLayers.Chest" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: torso_m
+    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+      sprite: Mobs/Species/arachne.rsi
+      state: spider_body_front
+    - map: [ "enum.HumanoidVisualLayers.Head" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: head_m
+    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      color: "#008800"
+      sprite: Mobs/Species/eyes.rsi
+      state: eyes
+    - map: [ "enum.HumanoidVisualLayers.RArm" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: r_arm
+    - map: [ "enum.HumanoidVisualLayers.LArm" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_arm
+    - shader: StencilClear
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_leg
+    - shader: StencilMask
+      map: [ "enum.HumanoidVisualLayers.StencilMask" ]
+      sprite: Mobs/Customization/anytaur_masking_helpers.rsi
+      state: unisex_full
+      visible: false
+    - map: [ "jumpsuit" ]
+    - map: [ "enum.HumanoidVisualLayers.LHand" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_hand
+    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: r_hand
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+    - map: [ "id" ]
+    - map: [ "gloves" ]
+    - map: [ "shoes" ]
+    - map: [ "ears" ]
+    - map: [ "outerClothing" ]
+    - map: [ "eyes" ]
+    - map: [ "belt" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.Hair" ]
+      state: bald
+      sprite: Mobs/Customization/human_hair.rsi
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "pocket1" ]
+    - map: [ "pocket2" ]
+    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      sprite: Mobs/Customization/masking_helpers.rsi
+      state: none
+      visible: false
+  - type: Inventory
+    templateId: anytaur
+  - type: HumanoidAppearance
+    species: Arachne
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index c4906f6f975..d812433b44a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -178,13 +178,9 @@
   - type: StandingState
   - type: Fingerprint
   - type: Dna
+  - type: Scent
   - type: MindContainer
     showExamineInfo: true
-  - type: InteractionPopup
-    successChance: 1
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
   - type: CanHostGuardian
   - type: NpcFactionMember
     factions:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index e1628c620a2..42383d9a426 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -109,6 +109,11 @@
     understands:
     - GalacticCommon
     - RootSpeak
+  - type: TraitSpeedModifier
+    sprintModifier: 0.75
+    walkModifier: 0.75
+  - type: SpeedModifierImmunity
+  - type: NoSlip
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index b38ea2634fd..055c6522ddc 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -58,6 +58,8 @@
     understands:
     - GalacticCommon
     - SolCommon
+  - type: LightweightDrunk
+    boozeStrengthMultiplier: 0.5
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
index 05d70e8adc5..f4055170b4c 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -5,30 +5,8 @@
   id: MobHarpyBase
   abstract: true
   components:
-  - type: HarpySinger
-  - type: Instrument
-    allowPercussion: false
-    program: 52
-  - type: SwappableInstrument
-    instrumentList:
-      "Voice": {52: 0}
-      "Trumpet": {56: 0}
-      "Electric": {27: 0}
-      "Bass": {33: 0}
-      "Rock": {29: 0}
-      "Acoustic": {24: 0}
-      "Flute": {73: 0}
-      "Sax": {66: 0}
-  - type: UserInterface
-    interfaces:
-      - key: enum.InstrumentUiKey.Key
-        type: InstrumentBoundUserInterface
-      - key: enum.VoiceMaskUIKey.Key
-        type: VoiceMaskBoundUserInterface
-      - key: enum.HumanoidMarkingModifierKey.Key
-        type: HumanoidMarkingModifierBoundUserInterface
-      - key: enum.StrippingUiKey.Key
-        type: StrippableBoundUserInterface
+  - type: Singer
+    proto: HarpySinger
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -140,6 +118,7 @@
     understands:
     - GalacticCommon
     - SolCommon
+
 - type: entity
   save: false
   name: Urist McHands
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/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index fc35fae1af8..a6752286dd2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -47,6 +47,15 @@
   components:
   - type: Sprite
     state: icon
+  - type: MeleeWeapon
+    bluntStaminaDamageFactor: 2.0
+    damage:
+      types:
+        Blunt: 7.5
+    heavyRangeModifier: 1.5
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 25
   - type: DamageOnLand
     damage:
       types:
@@ -54,7 +63,7 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 4
+        Blunt: 5
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
index e3944296ea7..b7934160641 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -294,3 +294,27 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefJustice
+  suffix: ChiefJustice, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefJustice"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsJustice
+  suffix: Justice, Locked
+  components:
+  - type: AccessReader
+    access: [["Justice"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsProsecutor
+  suffix: Prosecutor, Locked
+  components:
+  - type: AccessReader
+    access: [["Prosecutor"]]
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index d270c93e50a..49ef98d7690 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -67,6 +67,7 @@
     - Common
     - Command
     - Engineering
+    - Justice # Delta V- adds Justice department
     - Medical
     - Science
     - Security
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 0f68afefe69..6126ae92b00 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -151,6 +151,12 @@
   - type: Pda
     id: MedicalInternIDCard
     state: pda-internmed
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#717059"
     accentVColor: "#447987"
@@ -174,13 +180,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 +437,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
@@ -534,6 +538,12 @@
   - type: Pda
     id: CMOIDCard
     state: pda-cmo
+    penSlot: # Fancy Pen Light
+      startingItem: CMOPenLight
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
@@ -550,6 +560,12 @@
   - type: Pda
     id: MedicalIDCard
     state: pda-medical
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#447987"
@@ -568,6 +584,12 @@
   - type: Pda
     id: ParamedicIDCard
     state: pda-paramedic
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#2a4b5b"
@@ -583,6 +605,12 @@
   - type: Pda
     id: ChemistIDCard
     state: pda-chemistry
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#B34200"
@@ -646,13 +674,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 +695,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 +715,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
@@ -917,6 +942,12 @@
   - type: Pda
     id: PsychologistIDCard
     state: pda-medical
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#447987"
@@ -985,13 +1016,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
@@ -1002,19 +1032,24 @@
   - type: Pda
     id: BrigmedicIDCard
     state: pda-brigmedic
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#d7d7d0"
     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
@@ -1079,6 +1114,12 @@
   - type: Pda
     id: SeniorPhysicianIDCard
     state: pda-seniorphysician
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
@@ -1100,13 +1141,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
@@ -1129,6 +1169,12 @@
   - type: Pda
     id: SyndicateIDCard
     state: pda-syndi-agent
+    penSlot: # Pen Lights
+      startingItem: PenLightBase
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#891417"
   - type: Icon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
index fab8b56b06f..947a973bbf6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -14,6 +14,19 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/eguitar.rsi
     state: icon
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg
+    range: 1.85
+    damage:
+      types:
+        Blunt: 6
+        Shock: 1
+    bluntStaminaDamageFactor: 1.5
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 75
   - type: Item
     size: Normal
     sprite: Objects/Fun/Instruments/eguitar.rsi
@@ -43,6 +56,19 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/bassguitar.rsi
     state: icon
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg
+    range: 1.85
+    damage:
+      types:
+        Blunt: 6
+        Shock: 1
+    bluntStaminaDamageFactor: 1.5
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 75
   - type: Item
     size: Normal
     sprite: Objects/Fun/Instruments/bassguitar.rsi
@@ -71,6 +97,27 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/rockguitar.rsi
     state: icon
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg
+    range: 1.85
+    attackRate: 1.25
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Blunt: 6
+        Shock: 1
+    bluntStaminaDamageFactor: 1.5
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 15
+    angle: 160
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 2
+        Shock: 1
   - type: Item
     size: Normal
     sprite: Objects/Fun/Instruments/rockguitar.rsi
@@ -82,18 +129,6 @@
   - type: Tag
     tags:
     - StringInstrument
-  - type: MeleeWeapon
-    wideAnimationRotation: 45
-    damage:
-      types:
-        Blunt: 6
-        Slash: 2
-  - type: Wieldable
-  - type: IncreaseDamageOnWield #they don't call it an axe for nothing
-    damage:
-      types:
-        Blunt: 4
-        Slash: 2
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -145,14 +180,20 @@
       types:
         Blunt: 20
   - type: MeleeWeapon
+    range: 1.5
     wideAnimationRotation: 45
     damage:
       types:
-        Blunt: 5
+        Blunt: 7
+    bluntStaminaDamageFactor: 2
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 75
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 15
+        Blunt: 2
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -186,10 +227,15 @@
   - type: MeleeWeapon
     soundHit:
       path: /Audio/SimpleStation14/Weapons/Melee/banjohit.ogg
+    range: 1.5
     damage:
       types:
         Blunt: 7
-    bluntStaminaDamageFactor: 1.5
+    bluntStaminaDamageFactor: 2
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 75
 
 - type: entity
   parent: BaseHandheldInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml
new file mode 100644
index 00000000000..695e45a2e64
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml
@@ -0,0 +1,395 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: PrizeTicketBase
+  description: A prize ticket, ready to be redeemed at a prize counter.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/prizeticket.rsi
+  - type: Item
+    sprite: Objects/Fun/prizeticket.rsi
+    size: Tiny
+  - type: StaticPrice
+    price: 0
+  - type: Tag
+    tags:
+    - Sheet
+    - PrizeTicket
+
+- type: entity
+  parent: PrizeTicketBase
+  id: PrizeTicket
+  name: prize ticket
+  suffix: Full
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      PrizeTicket: 1
+  - type: Stack
+    count: 100
+    stackType: PrizeTicket
+    baseLayer: base
+    layerStates:
+    - ticket
+    - ticket_2
+    - ticket_3
+    - ticket_4
+  - type: Sprite
+    state: ticket_4
+    layers:
+    - state: ticket_4
+      map: ["base"]
+  - type: Item
+    heldPrefix: prize ticket
+  - type: Appearance
+
+- type: entity
+  parent: PrizeTicket
+  id: PrizeTicket10
+  name: prize ticket
+  suffix: 10
+  components:
+  - type: Sprite
+    state: ticket
+  - type: Stack
+    stackType: PrizeTicket
+    count: 10
+
+- type: entity
+  parent: PrizeTicket
+  id: PrizeTicket30
+  name: prize ticket
+  suffix: 30
+  components:
+  - type: Sprite
+    state: ticket
+  - type: Stack
+    stackType: PrizeTicket
+    count: 30
+
+- type: entity
+  parent: PrizeTicket
+  id: PrizeTicket60
+  name: prize ticket
+  suffix: 60
+  components:
+  - type: Sprite
+    state: ticket
+  - type: Stack
+    stackType: PrizeTicket
+    count: 60
+
+- type: entity
+  parent: PrizeTicket
+  id: PrizeTicket1
+  name: prize ticket
+  suffix: Single
+  components:
+  - type: Sprite
+    state: ticket
+  - type: Stack
+    stackType: PrizeTicket
+    count: 1
+
+- type: entity
+  parent: PresentRandom
+  id: PrizeBall
+  name: prize ball
+  description: I wounder whats inside!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/prizeticket.rsi
+    layers:
+      - state: prizeball
+  - type: SpawnItemsOnUse
+    items:
+      - id: PresentTrash
+      - id: PrizeTicket10
+        orGroup: Prize
+      # Common
+      - id: PrizeTicket30
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieMothRandom
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieMothMusician
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieMothBartender
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieBee
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieHampter
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieRouny
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieLamp
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieArachind
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieLizard
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieLizardMirrored
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieSpaceLizard
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieDiona
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieSharkBlue
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieSharkPink
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieSharkGrey
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCarp
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieMagicarp
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieHolocarp
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieSlime
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieSnake
+        prob: 0.80
+        orGroup: Prize
+      - id: ToyMouse
+        prob: 0.80
+        orGroup: Prize
+      - id: ToyRubberDuck
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieVox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieAtmosian
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushiePenguin
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieHuman
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieArachne
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieGnome
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieLoveable
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieDeer
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieIpc
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieGrey
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieRedFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushiePurpleFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushiePinkFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieOrangeFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieMarbleFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCrimsonFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCoffeeFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieBlueFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieBlackFox
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieVulp
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCorgi
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieGirlyCorgi
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieRobotCorgi
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatBlack
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatGrey
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatOrange
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatSiames
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatTabby
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatTuxedo
+        prob: 0.80
+        orGroup: Prize
+      - id: PlushieCatWhite
+        prob: 0.80
+        orGroup: Prize
+      - id: ToyAi
+        prob: 0.80
+        orGroup: Prize
+      - id: ToyIan
+        prob: 0.80
+        orGroup: Prize
+      - id: BalloonNT
+        prob: 0.80
+        orGroup: Prize
+      - id: BalloonCorgi
+        prob: 0.80
+        orGroup: Prize
+      - id: CrayonBox
+        prob: 0.80
+        orGroup: Prize
+      - id: BasePetRock
+        prob: 0.80
+        orGroup: Prize
+      # Uncommon
+      - id: PrizeTicket60
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieGhost
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieRGBee
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieRatvar
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieNar
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieRainbowCarp
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieXeno
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieJester
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieSlips
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieAbductor
+        prob: 0.50
+        orGroup: Prize
+      - id: PlushieTrystan
+        prob: 0.50
+        orGroup: Prize
+      - id: FoamCrossbow
+        prob: 0.50
+        orGroup: Prize
+      - id: RevolverCapGun
+        prob: 0.50
+        orGroup: Prize
+      - id: PonderingOrb
+        prob: 0.50
+        orGroup: Prize
+      - id: ToyAmongPequeno
+        prob: 0.50
+        orGroup: Prize
+      - id: FoamCutlass
+        prob: 0.50
+        orGroup: Prize
+      - id: ToyHammer
+        prob: 0.50
+        orGroup: Prize
+      - id: WhoopieCushion
+        prob: 0.50
+        orGroup: Prize
+      - id: PlasticBanana
+        prob: 0.50
+        orGroup: Prize
+      - id: WeaponWaterPistol
+        prob: 0.50
+        orGroup: Prize
+      - id: WeaponWaterBlaster
+        prob: 0.50
+        orGroup: Prize
+      - id: NewtonCradle
+        prob: 0.50
+        orGroup: Prize
+      - id: SnapPopBox
+        prob: 0.50
+        orGroup: Prize
+      - id: CrazyGlue
+        prob: 0.50
+        orGroup: Prize
+      - id: MrChips
+        prob: 0.50
+        orGroup: Prize
+      - id: MrDips
+        prob: 0.50
+        orGroup: Prize
+      # Rare
+      - id: PlushieAbductorAgent
+        prob: 0.30
+        orGroup: Prize
+      - id: PlushieNuke
+        prob: 0.30
+        orGroup: Prize
+      - id: ToyNuke
+        prob: 0.30
+        orGroup: Prize
+      - id: FoamBlade
+        prob: 0.30
+        orGroup: Prize
+      - id: BalloonSyn
+        prob: 0.30
+        orGroup: Prize
+      - id: SingularityToy
+        prob: 0.30
+        orGroup: Prize
+      - id: TeslaToy
+        prob: 0.30
+        orGroup: Prize
+      - id: ToySword
+        prob: 0.30
+        orGroup: Prize
+      - id: ThronglerToy
+        prob: 0.30
+        orGroup: Prize
+        
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
index 01a15d2e5bd..068039e0c56 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
@@ -40,3 +40,92 @@
     sprite: Objects/Fun/mrdips.rsi
     layers:
     - state: icon
+
+## PET ROCK!
+
+- type: entity
+  id: PetRockCarrier
+  parent: HappyHonk
+  name: pet rock carrier
+  description: Your new and only best friend home!
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/Happyhonk/rock_carrier.rsi
+    state: box
+  - type: Item
+    sprite: Objects/Storage/Happyhonk/rock_carrier.rsi
+    heldPrefix: box
+  - type: StorageFill
+    contents:
+      - id: PetRock
+        prob: 0.8
+        orGroup: Rock
+      - id: PetRockFred
+        prob: 0.1
+        orGroup: Rock
+      - id: PetRockRoxie
+        prob: 0.1
+        orGroup: Rock
+
+- type: entity
+  parent: [BaseItem, MrChips]
+  id: BasePetRock
+  name: pet rock
+  description: Your new and only best friend!
+  abstract: true
+  components:
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 1
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          Ash:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  parent: BasePetRock
+  id: PetRock
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/petrock.rsi
+    layers:
+    - state: rock
+
+- type: entity
+  parent: BasePetRock
+  id: PetRockFred
+  name: fred
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/petrock.rsi
+    layers:
+    - state: fred
+
+- type: entity
+  parent: BasePetRock
+  id: PetRockRoxie
+  name: roxie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/petrock.rsi
+    layers:
+    - state: roxie
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 094f434c39c..1fea59a926c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -628,6 +628,16 @@
   - type: Sprite
     sprite: Objects/Fun/ducky.rsi
     state: icon
+  - type: MeleeWeapon
+    attackRate: 1.5
+    range: 1.3
+    damage:
+      types:
+        Blunt: 0.1
+    heavyDamageBaseModifier: 2
+    heavyStaminaCost: 5
+    maxTargets: 8
+    angle: 25
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/ducky.rsi
@@ -809,6 +819,368 @@
     useSound:
       path: /Audio/Voice/Moth/moth_chitter.ogg
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieJester #Weh!
+  name: jester plushie
+  description: A dubious little creature getting up to mischief.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: plushie_jester
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieSlips
+  name: janitor plushie
+  description: The silent cleaner, the one that you dont hear say "Weh"!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: plushie_slips
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Effects/silence.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Effects/silence.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Effects/silence.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/silence.ogg
+  - type: Tag
+    tags:
+    - Soap
+  - type: Slippery
+    paralyzeTime: 0.7
+    launchForwardsMultiplier: 0.5
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
+        layer:
+        - SlipLayer
+        hard: false
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
+        density: 10
+        mask:
+        - ItemMask
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieGnome
+  name: gnome plushie
+  description: A stuffed toy that resembles a gnome! or a drawf...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: gnome
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieLoveable
+  name: loveable plushie
+  description: A stuffed toy that resembles... a creature.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: loveable
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieDeer
+  name: deer plushie
+  description: A stuffed toy that resembles a deer!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: deer
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieIpc
+  name: ipc plushie
+  description: A stuffed toy that resembles a ipc!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: ipc
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieGrey
+  name: grey plushie
+  description: A stuffed toy that resembles a grey!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: grey
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieAbductor
+  name: abductor plushie
+  description: A stuffed toy that resembles an abductor!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: abductor
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieAbductorAgent
+  name: abductor agent plushie
+  description: A stuffed toy that resembles an abductor agent!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: abductor_agent
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieRedFox
+  name: red fox plushie
+  description: A cute plushie that look like a red foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: red
+
+- type: entity
+  parent: BasePlushie
+  id: PlushiePurpleFox
+  name: purple fox plushie
+  description: A cute plushie that look like a purple foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: purple
+
+- type: entity
+  parent: BasePlushie
+  id: PlushiePinkFox
+  name: pink fox plushie
+  description: A cute plushie that look like a pink foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: pink
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieOrangeFox
+  name: orange fox plushie
+  description: A cute plushie that look like a orange foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: orange
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieMarbleFox
+  name: marble fox plushie
+  description: A cute plushie that look like a marble foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: marble
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieCrimsonFox
+  name: crimson fox plushie
+  description: A cute plushie that look like a crimson foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: crimson
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieCoffeeFox
+  name: coffee fox plushie
+  description: A cute plushie that look like a coffee foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: coffee
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieBlueFox
+  name: blue fox plushie
+  description: A cute plushie that look like a blue foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: blue
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieBlackFox
+  name: black fox plushie
+  description: A cute plushie that look like a black foxxo!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/foxplushie.rsi
+    state: black
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieVulp
+  name: vulpkanin plushie
+  description: A vulpkanin plushie, at least you can hug this one without the risk to get bitten.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: plushie_vulp
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
+
+- type: entity
+  parent: PlushieVulp
+  id: PlushieTrystan
+  name: office vulp plushie
+  description: The ones who yeeps!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: plushie_trystan
+
+- type: entity
+  parent: PlushieVulp
+  id: PlushieCorgi
+  name: corgi plushie
+  description: The ian plushie edition!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/corgiplushie.rsi
+    state: corgi
+
+- type: entity
+  parent: PlushieVulp
+  id: PlushieGirlyCorgi
+  name: girly corgi plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/corgiplushie.rsi
+    state: girlycorgi
+
+- type: entity
+  parent: PlushieVulp
+  id: PlushieRobotCorgi
+  name: robot corgi plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/corgiplushie.rsi
+    state: robotcorgi
+
+- type: entity
+  parent: BasePlushie
+  id: BasePlushieCat
+  description: A stuffed toy that resembles a cute kitty!
+  abstract: true
+  components:
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatBlack
+  name: black cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: black
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatGrey
+  name: grey cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: grey
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatOrange
+  name: orange cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: orange
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatSiames
+  name: siames cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: siames
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatTabby
+  name: tabby cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: tabby
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatTuxedo
+  name: tuxedo cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: tuxedo
+
+- type: entity
+  parent: BasePlushieCat
+  id: PlushieCatWhite
+  name: white cat plushie
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/catplushie.rsi
+    state: white
+
 ## Cheapo Figurines
 
 - type: entity
@@ -1528,3 +1900,31 @@
 #      params:
 #        volume: -9
 #        maxDistance: 3
+
+- type: entity
+  name: The Throngler
+  parent: ToyHammer
+  id: ThronglerToy
+  suffix: Toy
+  description: Why would you make this?
+  components:
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/Throngler2.rsi
+      state: icon
+    - type: StaminaDamageOnHit
+      damage: 0.8
+    - type: MeleeWeapon
+      wideAnimationRotation: -135
+      attackRate: 10
+      damage:
+        types:
+          Blunt: 0
+      soundHit:
+        path: /Audio/Effects/explosion_small1.ogg
+      soundNoDamage:
+        path: /Audio/Effects/explosion_small1.ogg
+    - type: Item
+      size: Ginormous
+      sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi
+    - type: DisarmMalus
+      malus: 0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 5fcb006cfa5..6cdc066cf10 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -89,7 +89,7 @@
     color: "#bbeeff"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -120,8 +120,8 @@
     color: "#96cdef"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - PartRodMetal1
+    - id: SheetGlass1
+    - id: PartRodMetal1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -152,8 +152,8 @@
     color: "#FF72E7"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetPlasma1
+    - id: SheetGlass1
+    - id: SheetPlasma1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -186,8 +186,8 @@
     color: "#8eff7a"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetUranium1
+    - id: SheetGlass1
+    - id: SheetUranium1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -221,8 +221,8 @@
     color: "#e0aa36"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetBrass1
+    - id: SheetGlass1
+    - id: SheetBrass1
   - type: DamageUserOnTrigger
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index 762204701cb..760a0bafb68 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -9,6 +9,18 @@
   - type: Storage
     grid:
     - 0,0,5,3
+  - type: MeleeWeapon
+    bluntStaminaDamageFactor: 3.0
+    attackRate: 0.9
+    range: 1.75
+    damage:
+      types:
+        Blunt: 3.5
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 0.8
+    heavyDamageBaseModifier: 2
+    heavyStaminaCost: 5
+    maxTargets: 8
   - type: Tag
     tags:
     - Briefcase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
index b7c73f5e0cc..f8dbabd07a1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -7,9 +7,16 @@
   - type: Sharp
   - type: MeleeWeapon
     attackRate: 1.5
+    range: 1.3
     damage:
       types:
-        Slash: 5
+        Slash: 4
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 0.8
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 5
+    maxTargets: 3
+    angle: 75
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite
@@ -28,4 +35,4 @@
   - type: SpaceGarbage
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index bae33f27f17..f1802e426fb 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -38,9 +38,16 @@
     hasSafety: true
   - type: MeleeWeapon
     wideAnimationRotation: 180
+    attackRate: 0.8
+    bluntStaminaDamageFactor: 2.5
+    range: 1.75
     damage:
       types:
-        Blunt: 10
+        Blunt: 8
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 2
+    heavyStaminaCost: 15
+    maxTargets: 8
     soundHit:
       path: /Audio/Weapons/smash.ogg
   - type: Tool
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index f797ad5cead..7041be7b206 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -449,7 +449,7 @@
 - type: entity
   parent: IDCardStandard
   id: LawyerIDCard
-  name: lawyer ID card
+  name: attorney ID card # DeltaV - Changed Lawyer to Attorney
   components:
   - type: Sprite
     layers:
@@ -462,6 +462,55 @@
   - type: PresetIdCard
     job: Lawyer
 
+- type: entity
+  parent: IDCardStandard
+  id: ChiefJusticeIDCard
+  name: chief justice ID card
+  components:
+    - type: PresetIdCard
+      job: ChiefJustice
+    - type: Sprite
+      layers:
+      - state: default
+      - state: department
+        color: "#878787"
+      - state: subdepartment
+        color: "#CB0000"
+      - state: lawyer
+
+
+- type: entity
+  parent: IDCardStandard
+  id: ClerkIDCard
+  name: clerk ID card
+  components:
+    - type: PresetIdCard
+      job: Clerk
+    - type: Sprite
+      layers:
+      - state: default
+      - state: department
+        color: "#878787"
+      - state: subdepartment
+        color: "#CB0000"
+      - state: lawyer
+
+- type: entity
+  parent: IDCardStandard
+  id: ProsecutorIDCard
+  name: presecutor ID card
+  components:
+    - type: PresetIdCard
+      job: Prosecutor
+    - type: Sprite
+      layers:
+      - state: default
+      - state: department
+        color: "#878787"
+      - state: subdepartment
+        color: "#CB0000"
+      - state: lawyer
+
 - type: entity
   parent: IDCardStandard
   id: HoPIDCard
@@ -822,6 +871,9 @@
     - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
     - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
     - JobIconForensicMantis  # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+    - JobIconClerk # Delta V - Added justice dept
+    - JobIconChiefJustice # Delta V - Added justice dept
+    - JobIconProsecutor # Delta V - Added justice dept
     - JobIconVisitor
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
@@ -1084,3 +1136,4 @@
     - state: senior
   - type: PresetIdCard
     job: SeniorOfficer
+
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index c8089cd22d3..b18a0feaa52 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -68,7 +68,7 @@
   - type: SpaceGarbage
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
 
 - type: entity
   parent: BaseLightbulb
@@ -276,8 +276,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalCyan
+    - id: SheetGlass1
+    - id: ShardCrystalCyan
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -296,8 +296,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalBlue
+    - id: SheetGlass1
+    - id: ShardCrystalBlue
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -316,8 +316,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalPink
+    - id: SheetGlass1
+    - id: ShardCrystalPink
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -336,8 +336,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalOrange
+    - id: SheetGlass1
+    - id: ShardCrystalOrange
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -356,8 +356,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalRed
+    - id: SheetGlass1
+    - id: ShardCrystalRed
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -376,5 +376,5 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalGreen
+    - id: SheetGlass1
+    - id: ShardCrystalGreen
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 1162a3ec71b..9ab53cebc96 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -45,8 +45,12 @@
   - type: MeleeWeapon # Nyanotrasen - Bibles do Holy damage
     damage:
       types:
-        Blunt: 3
-        Holy: 10
+        Blunt: 4
+        Holy: 20
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1
+    heavyStaminaCost: 5
+    maxTargets: 3
   - type: Tag
     tags:
     - Book
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml b/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
index 7450d7845e8..9b3be6d7780 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
@@ -18,3 +18,22 @@
   - type: GuideHelp
     guides:
     - Forensics
+
+- type: entity
+  id: ScentTrackEffect
+  noSpawn: true
+  components:
+  - type: TimedDespawn
+    lifetime: 1
+  - type: Sprite
+    noRot: true
+    drawdepth: Effects
+    sprite: Effects/chemsmoke.rsi
+    state: chemsmoke
+    scale: "0.08, 0.08"
+    color: "#ffff00"
+  - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: AnimationPlayer
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 727c75c8794..37b8daddc27 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -16,7 +16,14 @@
     swingLeft: true
     damage:
       types:
-        Slash: 6
+        Slash: 3.5
+        Blunt: 3
+    heavyRateModifier: 1
+    heavyRangeModifier: 1
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 5
+    angle: 100
   - type: Item
     sprite: Objects/Tools/Hydroponics/hoe.rsi
 
@@ -34,9 +41,16 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: 90
+    attackRate: 0.8
     damage:
       types:
-        Slash: 7
+        Pierce: 7
+    heavyRateModifier: 0.9
+    heavyRangeModifier: 1.25
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
   - type: Item
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     storedRotation: -90
@@ -53,9 +67,16 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: 135
+    range: 1.85
     damage:
       types:
-        Slash: 10
+        Slash: 7
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 1.25
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 120
   - type: Item
     size: Normal
   - type: Clothing
@@ -81,10 +102,13 @@
   - type: MeleeWeapon
     wideAnimationRotation: 135
     swingLeft: true
+    attackRate: 1.25
+    range: 1.25
     damage:
       types:
-        Slash: 8
-        Piercing: 2
+        Slash: 10
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
 
@@ -104,14 +128,19 @@
     wideAnimationRotation: 45
     damage:
       types:
-        Blunt: 8
-        Piercing: 2 # I guess you can stab it into them?
+        Blunt: 6
+        Slash: 2 # I guess you can stab it into them?
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 1.25
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    angle: 80
     soundHit:
       collection: MetalThud
   - type: Item
     sprite: Objects/Tools/Hydroponics/spade.rsi
   - type: Shovel
-    speedModifier: 0.75 # slower at digging than a full-sized shovel
+    speedModifier: 0.85 # slower at digging than a full-sized shovel
 
 - type: entity
   name: plant bag
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index b192401c8b8..de5c33671a8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -8,9 +8,17 @@
     sprite: Objects/Specific/Janitorial/mop.rsi
     state: mop
   - type: MeleeWeapon
+    range: 1.85
     damage:
       types:
-        Blunt: 10
+        Blunt: 2
+    bluntStaminaDamageFactor: 3
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 1.25
+    heavyDamageBaseModifier: 1.25
+    heavyStaminaCost: 10
+    maxTargets: 2
+    angle: 180
     soundHit:
       collection: MetalThud
   - type: Spillable
@@ -48,9 +56,17 @@
       sprite: Objects/Specific/Janitorial/advmop.rsi
       state: advmop
     - type: MeleeWeapon
+      range: 1.85
       damage:
         types:
-          Blunt: 10
+          Blunt: 2
+      bluntStaminaDamageFactor: 3
+      heavyRateModifier: 0.8
+      heavyRangeModifier: 1.25
+      heavyDamageBaseModifier: 1.25
+      heavyStaminaCost: 10
+      maxTargets: 2
+      angle: 180
       soundHit:
          collection: MetalThud
     - type: Spillable
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index aa0cf461872..c81768da4d3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -50,9 +50,15 @@
     - 0,0,1,0
     - 1,1,1,1
   - type: MeleeWeapon
+    attackRate: 0.75
+    range: 1.3
     damage:
       types:
-        Piercing: 10
+        Piercing: 8
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
     soundHit:
       path: /Audio/Items/drill_hit.ogg
   - type: StaticPrice
@@ -80,10 +86,16 @@
   - type: MeleeWeapon
     wideAnimationRotation: 90
     swingLeft: true
-    attackRate: 1.5
+    attackRate: 1.25
+    range: 1.25
     damage:
       types:
-        Slash: 8
+        Slash: 7.5
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.25
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
 
@@ -111,7 +123,7 @@
   - type: MeleeWeapon
     damage:
       types:
-        Slash: 12
+        Slash: 8
 
 - type: entity
   name: laser scalpel
@@ -121,6 +133,11 @@
   components:
   - type: Sprite
     state: laser
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 6.5
+        Heat: 1
   - type: Item
     heldPrefix: laser
 
@@ -179,7 +196,19 @@
     qualities:
       - Sawing
     speed: 1.0
-# No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
+  - type: MeleeWeapon
+    attackRate: 0.75
+    range: 1.35
+    damage:
+      types:
+        Blunt: 2.5
+        Slash: 6.5
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.0
+    heavyStaminaCost: 20
+    maxTargets: 8
+    angle: 20
+# ~~No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.~~ No, I'm going to saw through your bones.
 
 - type: entity
   name: choppa
@@ -192,9 +221,17 @@
   - type: Item
     heldPrefix: improv
   - type: MeleeWeapon
+    attackRate: 0.85
     damage:
-      groups:
-        Brute: 10
+      types:
+        Blunt: 3
+        Slash: 7
+    bluntStaminaDamageFactor: 3
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.0
+    heavyStaminaCost: 20
+    maxTargets: 8
+    angle: 20
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Tool
@@ -214,9 +251,18 @@
     heldPrefix: electric
     storedRotation: 90
   - type: MeleeWeapon
+    attackRate: 1.15
+    range: 1.4
+    bluntStaminaDamageFactor: 3.0
     damage:
-      groups:
-        Brute: 15
+      types:
+        Blunt: 4.5
+        Slash: 5.5
+    heavyRateModifier: 0.5
+    heavyDamageBaseModifier: 1
+    heavyStaminaCost: 15
+    maxTargets: 8
+    angle: 360
     soundHit:
       path: /Audio/Items/drill_hit.ogg
   - type: Tool
@@ -236,10 +282,18 @@
     heldPrefix: advanced
     storedRotation: 90
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1.25
+    range: 1.4
+    bluntStaminaDamageFactor: 5.0
     damage:
-      groups:
-        Brute: 15
+      types:
+        Blunt: 4.5
+        Slash: 7.5
+    heavyRateModifier: 0.5
+    heavyDamageBaseModifier: 1
+    heavyStaminaCost: 15
+    maxTargets: 8
+    angle: 360
     soundHit:
       path: /Audio/Items/drill_hit.ogg
   - type: Tool
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
new file mode 100644
index 00000000000..79c475900aa
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: PonderingOrb
+  id: PonderingOrbTelepathic
+  name: telepathic relay orb
+  description: Relays messages intercepted from Psionics.
+  components:
+  - type: TelepathicRepeater
+  - type: Psionic
+  - type: Speech
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index d37523bd735..a7cf7ad5c80 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -210,6 +210,34 @@
     - Crowbar
     - RadioHandheld
 
+- type: entity
+  id: BorgModuleJetpack
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: jetpack cyborg module
+  description: A piece of tech that gives cyborgs new abilities. Needs to be loaded by a cyborg before you can refill the jetpack.
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-jetpack
+  - type: BorgJetpack
+  - type: ItemBorgModule
+    items:
+    - JetpackMicroFilled
+
+- type: entity
+  id: BorgModulePka
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: proto kinetic accelerator cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-pka
+  - type: ItemBorgModule
+    items:
+    - WeaponProtoKineticAccelerator
+
 - type: entity
   id: BorgModuleGrapplingGun
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 16be537891f..9504ec144a8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -58,6 +58,9 @@
       - Service
       - Theatre
       - Zookeeper #Delta V: Add Zookeeper Access
+      - ChiefJustice  #Delta V: Add Chief Justice Access
+      - Prosecutor  #Delta V: Add Prosecutor Access
+      - Justice  #Delta V: Add Justice Access
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index d22e9190921..2b75a7e3dd9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -54,6 +54,14 @@
         shader: unshaded
         visible: false
         map: [ "light" ]
+  - type: MeleeWeapon
+    attackRate: 0.8
+    bluntStaminaDamageFactor: 1.5
+    damage:
+      types:
+        Blunt: 6
+    soundHit:
+      collection: MetalThud
   - type: Item
     sprite: Objects/Tools/flashlight.rsi
     storedRotation: -90
@@ -108,9 +116,15 @@
         map: [ "light" ]
   - type: MeleeWeapon
     wideAnimationRotation: 90
+    attackRate: 0.8
     damage:
       types:
-        Blunt: 10
+        Blunt: 6.5
+    bluntStaminaDamageFactor: 1.5
+    heavyRateModifier: 0.9
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
     soundHit:
       collection: MetalThud
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 2f281e141a1..f739de251cb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -34,9 +34,16 @@
   - type: MeleeWeapon
     wideAnimationRotation: 45
     attackRate: 0.8
+    range: 1.75
     damage:
       types:
-        Blunt: 10
+        Blunt: 8
+    bluntStaminaDamageFactor: 2.5
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 15
+    maxTargets: 1
+    angle: 140
   - type: PhysicalComposition
     materialComposition:
       Steel: 185
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 8e2b7597970..36d2f1308fb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -44,9 +44,18 @@
         changeSound: /Audio/Items/change_jaws.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 90
+    attackRate: 0.75
+    range: 1.75
     damage:
       types:
         Blunt: 10
+        Slash: 2
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 10
+    maxTargets: 1
+    angle: 20
     soundHit:
       collection: MetalThud
 
@@ -87,4 +96,5 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 14
+        Blunt: 12
+        Slash: 2
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index d0ac9c7a78a..a4c103847fe 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -295,3 +295,43 @@
       moles:
         - 1.025689525 # oxygen
         - 1.025689525 # nitrogen
+
+#Empty micro - Used in the Cyborg module, visually the same as mini jetpack.
+- type: entity
+  id: JetpackMicro
+  parent: BaseJetpack
+  name: micro jetpack
+  suffix: Empty
+  components:
+    - type: Item
+      sprite: Objects/Tanks/Jetpacks/mini.rsi
+    - type: Sprite
+      sprite: Objects/Tanks/Jetpacks/mini.rsi
+    - type: Clothing
+      sprite: Objects/Tanks/Jetpacks/mini.rsi
+      slots:
+        - Back
+        - suitStorage
+        - Belt
+    - type: GasTank
+      outputPressure: 42.6
+      air:
+        volume: 0.75
+
+
+# Filled micro
+- type: entity
+  id: JetpackMicroFilled
+  parent: JetpackMicro
+  name: micro jetpack
+  suffix: Filled
+  components:
+  - type: GasTank
+    outputPressure: 42.6
+    air:
+      # 2 minutes of thrust
+      volume: 0.75
+      temperature: 293.15
+      moles:
+        - 0.153853429 # oxygen
+        - 0.153853429 # nitrogen
diff --git a/Resources/Prototypes/Entities/Objects/Tools/penlight.yml b/Resources/Prototypes/Entities/Objects/Tools/penlight.yml
new file mode 100644
index 00000000000..7f8a9b262c0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Tools/penlight.yml
@@ -0,0 +1,90 @@
+- type: entity
+  name: Pen Light
+  parent: Pen
+  id: PenLightBase
+  description: A pen-sized light, used by medical staff.
+  components:
+    - type: HandheldLight
+      addPrefix: false
+    - type: Sprite
+      sprite: Objects/Tools/penlight.rsi
+      layers:
+        - state: world
+        - state: world-on
+          shader: unshaded
+          visible: false
+          map: [ "light" ]
+    - type: Item
+      sprite: Objects/Tools/penlight.rsi
+      heldPrefix: off
+    - type: PointLight
+      enabled: false
+      mask: /Textures/Effects/LightMasks/cone.png
+      autoRot: true
+      radius: 2
+      netsync: false
+    - type: PenLight
+      examSpeed: 3 #time in seconds
+    - type: Appearance
+    - type: UserInterface
+      interfaces:
+      - key: enum.PenLightUiKey.Key
+        type: PenLightBoundUserInterface
+    - type: ToggleableLightVisuals
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot {}
+    - type: PowerCellSlot
+      cellSlotId: cell_slot
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellSmall
+    - type: Tag
+      tags:
+      - Flashlight
+      - Write
+      - Pen
+
+- type: entity
+  name: Chief Medical Officer's Pen Light
+  parent: PenLightBase
+  id: CMOPenLight
+  description: A pen-sized light, this one belonging to the Chief Medical Officer. When you get promoted you get a better pen.
+  components:
+    - type: HandheldLight
+      addPrefix: false
+    - type: Sprite
+      sprite: Objects/Tools/cmopenlight.rsi
+      layers:
+        - state: world
+        - state: world-on
+          shader: unshaded
+          visible: false
+          map: [ "light" ]
+    - type: Item
+      sprite: Objects/Tools/cmopenlight.rsi
+      heldPrefix: off
+    - type: PointLight
+      enabled: false
+      mask: /Textures/Effects/LightMasks/cone.png
+      autoRot: true
+      radius: 2
+      netsync: false
+    - type: PenLight
+      examSpeed: 1.5 #time in seconds
+    - type: Appearance
+    - type: ToggleableLightVisuals
+    - type: PowerCellSlot
+      cellSlotId: cell_slot
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellSmall
+    - type: Tag
+      tags:
+      - Flashlight
+      - Write
+      - Pen
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 9e35443cd4b..6702ae39d69 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -21,9 +21,15 @@
   - type: Item
     size: Ginormous
   - type: MeleeWeapon
+    attackRate: 0.9
+    range: 1.75
     damage:
       types:
-        Blunt: 12
+        Blunt: 9
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.8
+    heavyStaminaCost: 10
+    angle: 80.5
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
   - type: Tag
@@ -134,7 +140,7 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 20
+        Blunt: 11.5
 
 - type: entity
   name: golden toolbox
@@ -147,6 +153,10 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 12
 
 - type: entity
   id: ToolboxThief
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index d135b2f29bb..a6926f1d8c3 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -31,10 +31,16 @@
     - state: cutters-cutty-thingy
   - type: MeleeWeapon
     wideAnimationRotation: -90
+    attackRate: 0.9
+    range: 1.6
     damage:
       types:
-        Piercing: 2
-    attackRate: 2 #open and close that shit on their arm like hell! because you sure aren't doing any damage with this
+        Blunt: 6.5
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 4
+    angle: 60
     soundHit:
       path: "/Audio/Items/wirecutter.ogg"
   - type: Tool
@@ -91,10 +97,15 @@
     storedRotation: -90
   - type: MeleeWeapon
     wideAnimationRotation: -90
-    attackRate: 1
+    attackRate: 1.35
     damage:
       types:
         Piercing: 6
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
   - type: Tool
@@ -146,10 +157,16 @@
       state: storage
   - type: MeleeWeapon
     wideAnimationRotation: 135
-    attackRate: 1.5
+    attackRate: 0.9
+    range: 1.6
     damage:
       types:
-        Blunt: 4.5
+        Blunt: 6.5
+    bluntStaminaDamageFactor: 1.5
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 5
+    angle: 100
     soundHit:
       collection: MetalThud
   - type: Tool
@@ -198,9 +215,12 @@
       state: storage
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 1.25
     damage:
       types:
-        Blunt: 8
+        Blunt: 6
+    bluntStaminaDamageFactor: 2
+    heavyStaminaCost: 5
     soundHit:
       collection: MetalThud
   - type: Tool
@@ -252,6 +272,16 @@
     - state: icon
     - state: green-unlit
       shader: unshaded
+  - type: MeleeWeapon
+    attackRate: 0.75
+    damage:
+      types:
+        Shock: 2
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
   - type: Item
     size: Small
   - type: Clothing
@@ -391,10 +421,16 @@
     price: 100
   - type: MeleeWeapon
     wideAnimationRotation: -90
-    attackRate: 1.5
+    attackRate: 0.9
+    range: 1.4
     damage:
       types:
-        Piercing: 10
+        Piercing: 8
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
 
@@ -600,9 +636,16 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: 45
+    attackRate: 0.8
+    range: 2.0
     damage:
       types:
-        Blunt: 14
+        Blunt: 8
+    bluntStaminaDamageFactor: 1.5
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 10
+    angle: 100
     soundHit:
       collection: MetalThud
   - type: Item
@@ -642,9 +685,16 @@
     - Belt
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 0.9
     damage:
       types:
         Blunt: 7
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.5
+    heavyStaminaCost: 5
+    maxTargets: 1
+    angle: 20
     soundHit:
       collection: MetalThud
   - type: Tool
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index e141f35caeb..8214ec56f34 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -55,7 +55,7 @@
       collection: MetalThud
     activatedDamage:
         types:
-            Heat: 8
+            Heat: 7
   - type: ItemToggleSize
     activatedSize: Large
   - type: ItemToggleHot
@@ -75,7 +75,7 @@
     wideAnimationRotation: -90
     damage:
       types:
-        Blunt: 5 #i mean... i GUESS you could use it like that
+        Blunt: 6 #i mean... i GUESS you could use it like that
     soundHit:
       collection: MetalThud
   - type: RefillableSolution
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/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 834d35a5297..8780d377e05 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -9,17 +9,24 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    range: 1.6
     damage:
       types:
-        Blunt: 10
+        Blunt: 7.5
         Structural: 5
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.5
+    heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 15
+    maxTargets: 2
+    angle: 120
     soundHit:
       collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 5
+        Blunt: 4
         Structural: 10
   - type: Item
     size: Normal
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
index bfdd94add6c..b2727b334c6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -15,7 +15,6 @@
     state: icon
   - type: MeleeWeapon
     autoAttack: true
-    angle: 0
     wideAnimationRotation: -135
     attackRate: 4
     damage:
@@ -23,6 +22,11 @@
         Slash: 2
         Blunt: 2
         Structural: 4
+    heavyRateModifier: 0.5
+    heavyDamageBaseModifier: 1.0
+    heavyStaminaCost: 15
+    maxTargets: 20
+    angle: 160
     soundHit:
       path: /Audio/Weapons/chainsaw.ogg
       params:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index ecb6479de70..5e9d789b658 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -10,10 +10,14 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
-    attackRate: 1.5
+    attackRate: 1.25
+    range: 1.4
     damage:
       types:
-        Slash: 12
+        Slash: 8
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
   - type: Item
     size: Normal
   - type: Clothing
@@ -35,9 +39,14 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 0.75
+    range: 1.75
     damage:
       types:
-        Slash: 16
+        Slash: 12
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    maxTargets: 6
+    angle: 90
   - type: Item
     size: Normal
   - type: Clothing
@@ -62,19 +71,24 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 0.75
+    range: 1.75
     damage:
       types:
-        Blunt: 10
-        Slash: 10
+        Blunt: 2
+        Slash: 13
         Structural: 5
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 100
     soundHit:
       collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 5
-        Slash: 5
+        Blunt: 2
+        Slash: 3
         Structural: 10
   - type: Item
     size: Ginormous
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index bc376df5eab..0cbc824365d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -35,8 +35,8 @@
         variation: 0.125
     activatedDamage:
         types:
-            Slash: 15
-            Heat: 15
+            Slash: 8
+            Heat: 10
             Structural: 20
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_sword.rsi
@@ -49,7 +49,7 @@
         map: [ "blade" ]
   - type: MeleeWeapon
     wideAnimationRotation: -135
-    attackRate: 1
+    attackRate: 1.25
     damage:
       types:
         Blunt: 4.5
@@ -106,8 +106,8 @@
         variation: 0.250
     activatedDamage:
         types:
-            Slash: 10
-            Heat: 10
+            Slash: 4
+            Heat: 8
     deactivatedSecret: true
   - type: ItemToggleActiveSound
     activeSound:
@@ -245,8 +245,8 @@
         variation: 0.250
     activatedDamage:
         types:
-            Slash: 12
-            Heat: 12
+            Slash: 8
+            Heat: 13
             Structural: 15
   - type: ItemToggleActiveSound
     activeSound:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 93765ec40c3..b30a2855796 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -18,16 +18,20 @@
     damage:
       types:
         # axes are kinda like sharp hammers, you know?
-        Blunt: 5
-        Slash: 10
+        Blunt: 4
+        Slash: 6
         Structural: 10
+    heavyDamageBaseModifier: 1.0
+    heavyStaminaCost: 10
+    angle: 100
     soundHit:
       collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Slash: 10
+        Blunt: 2
+        Slash: 5
         Structural: 40
   - type: Item
     size: Ginormous
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
new file mode 100644
index 00000000000..5cb5795c8a5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
@@ -0,0 +1,34 @@
+- type: entity
+  parent: BaseBallBat
+  id: BaseBallBatHomeRun
+  name: home run bat
+  description: Heavy metal bat with an extra kick.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/home_run_bat.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 11
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.5
+    heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 25
+    maxTargets: 2
+    angle: 120
+    soundHit:
+      collection: ExplosionSmall
+  - type: MeleeRequiresWield # You can't hit a home run with one hand, jimbo.
+  - type: MeleeThrowOnHit
+    speed: 30
+    lifetime: 5
+  - type: Item
+    size: Large
+  - type: Tool
+    speed: 0.5 # it's very heavy, it rolls slower than a wooden bat
+  - type: UseDelay
+    delay: 2
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 350 # it's not made of wood
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 9cd1bb29408..68f8863d116 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -12,9 +12,16 @@
       - Knife
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 1.25
+    range: 1.4
     damage:
       types:
-        Slash: 10
+        Slash: 8
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 3
+    angle: 40
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite
@@ -60,10 +67,11 @@
     state: butch
   - type: MeleeWeapon
     wideAnimationRotation: -115
-    attackRate: 1.5
+    attackRate: 1
     damage:
       types:
-        Slash: 13
+        Slash: 8
+        Blunt: 1
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
@@ -87,15 +95,16 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1.5
+    range: 1.4
     damage:
       types:
-        Slash: 12
+        Slash: 9
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit
     damage:
       types:
-        Slash: 10
+        Slash: 9
   - type: Item
     sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
@@ -110,6 +119,13 @@
   - type: Sprite
     sprite: Objects/Weapons/Melee/survival_knife.rsi
     state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 1.25
+    range: 1.5
+    damage:
+      types:
+        Slash: 8
   - type: Item
     sprite: Objects/Weapons/Melee/survival_knife.rsi
 
@@ -124,9 +140,10 @@
     state: icon
   - type: MeleeWeapon
     attackRate: 1.0
+    range: 1.75
     damage:
       types:
-        Slash: 15
+        Slash: 10
   - type: Item
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
@@ -186,7 +203,8 @@
     sprite: Objects/Weapons/Melee/shiv.rsi
     state: icon
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1.75
+    range: 0.75
     damage:
       types:
         Slash: 5.5
@@ -205,7 +223,6 @@
     graph: ReinforcedShiv
     node: icon
   - type: MeleeWeapon
-    attackRate: 1.5
     damage:
       types:
         Slash: 7 #each "tier" grants an additional 2 damage
@@ -224,10 +241,9 @@
     graph: PlasmaShiv
     node: icon
   - type: MeleeWeapon
-    attackRate: 1.5
     damage:
       types:
-        Slash: 9
+        Slash: 8.5
   - type: Item
     sprite: Objects/Weapons/Melee/plasma_shiv.rsi
   - type: Sprite
@@ -243,10 +259,9 @@
     graph: UraniumShiv
     node: icon
   - type: MeleeWeapon
-    attackRate: 1.5
     damage:
       types:
-        Slash: 7
+        Slash: 6.5
         Radiation: 4
   - type: Item
     sprite: Objects/Weapons/Melee/uranium_shiv.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index ccf45bf59aa..a1addba2625 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -43,12 +43,18 @@
     capacity: 1
     count: 1
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 0.75
+    range: 1.75
     wideAnimationRotation: -135
     damage:
       types:
-        Blunt: 10
-        Slash: 5
+        Blunt: 8
+        Slash: 4
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 120
     soundHit:
       collection: MetalThud
   - type: Wieldable
@@ -79,10 +85,16 @@
   - type: MeleeWeapon
     autoAttack: true
     wideAnimationRotation: -135
-    attackRate: 2
+    attackRate: 1.25
+    range: 1.4
     damage:
       types:
-        Slash: 15
+        Slash: 9
+    heavyRateModifier: 0.9
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 2
+    angle: 20
   - type: Tag
     tags:
     - Knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 324d4ee878e..6ba659ccb40 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -11,21 +11,27 @@
     sprite: Objects/Weapons/Melee/pickaxe.rsi
     state: pickaxe
   - type: MeleeWeapon
-    attackRate: 0.7
+    attackRate: 0.75
+    range: 1.75
     wideAnimationRotation: -135
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
       params:
         volume: -3
     damage:
-      groups:
-        Brute: 5
+      types:
+        Blunt: 6
+        Pierce: 3
+    bluntStaminaDamageFactor: 2.0
+    heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 5
+    maxTargets: 2
+    angle: 60
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
-      groups:
-        Brute: 10
       types:
+        Blunt: 5
         Structural: 30
   - type: Item
     size: Normal
@@ -52,16 +58,24 @@
     state: handdrill
   - type: MeleeWeapon
     autoAttack: true
-    angle: 0
     wideAnimationRotation: -90
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
-    attackRate: 3.5
+    attackRate: 0.5
+    range: 1.4
     damage:
-      groups:
-        Brute: 3
       types:
+        Blunt: 9
+        Slash: 3
         Structural: 12
+    bluntStaminaDamageFactor: 4.0
+    heavyRateModifier: 1
+    heavyRangeModifier: 2
+    heavyDamageBaseModifier: 1
+    heavyStaminaCost: 10
+    maxTargets: 3
+    angle: 20
+
   - type: ReverseEngineering # Nyano
     difficulty: 2
     recipes:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
index 0c75015d9aa..ecc84e50073 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -9,10 +9,18 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 0.8
+    range: 1.75
     damage:
       types:
-        Blunt: 10
+        Blunt: 6
         Structural: 10
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 15
+    maxTargets: 10
+    angle: 120
     soundHit:
       collection: MetalThud
   - type: Wieldable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 0def916ddc7..576d0b2a0ce 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -35,17 +35,24 @@
       visible: false
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    range: 1.75
     damage:
       types:
-        Piercing: 12
-    angle: 0
+        Piercing: 7
+        Slash: 1
+    heavyRateModifier: 0.75
+    heavyRangeModifier: 1.25
+    heavyDamageBaseModifier: 1.0
+    heavyStaminaCost: 5
+    maxTargets: 3
+    angle: 20
     animation: WeaponArcThrust
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 15
+        Piercing: 10
   - type: Item
     size: Ginormous
   - type: Clothing
@@ -75,7 +82,8 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Piercing: 4
+        Piercing: 3
+        Slash: 3
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -124,11 +132,12 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Piercing: 15
+        Piercing: 8.5
+        Slash: 1
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 18
+        Piercing: 12
   - type: Construction
     graph: SpearReinforced
 
@@ -144,11 +153,12 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Piercing: 18
+        Piercing: 9.5
+        Slash: 1.5
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 21
+        Piercing: 14
   - type: Construction
     graph: SpearPlasma
 
@@ -164,13 +174,13 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Piercing: 10
+        Piercing: 8
         Radiation: 8
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 12
-        Radiation: 9
+        Piercing: 8
+        Radiation: 8
   - type: Construction
     graph: SpearUranium
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index b0b166f6ce8..d8955b4defe 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -30,16 +30,23 @@
     energyPerUse: 70
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 0.8
+    range: 1.4
     damage:
       types:
-        Blunt: 9
+        Blunt: 7.5
+    bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.8
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
+    maxTargets: 3
     angle: 60
     animation: WeaponArcThrust
   - type: StaminaDamageOnHit
-    damage: 20
+    damage: 22
     sound: /Audio/Weapons/egloves.ogg
   - type: StaminaDamageOnCollide
-    damage: 20
+    damage: 22
     sound: /Audio/Weapons/egloves.ogg
   - type: Battery
     maxCharge: 360
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 17e31e5893c..82b99ce37e3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -10,12 +10,19 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
-    attackRate: 1.5
+    attackRate: 1.25
+    range: 1.75
     soundHit:
       path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
     damage:
       types:
         Slash: 17 #cmon, it has to be at least BETTER than the rest.
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 1
+    heavyDamageBaseModifier: 1
+    heavyStaminaCost: 5
+    maxTargets: 7
+    angle: 80
   - type: Reflect
     enabled: true
     reflectProb: .5
@@ -43,11 +50,18 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 1.5
     soundHit:
       path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
     damage:
       types:
-        Slash: 15
+        Slash: 12
+    heavyRateModifier: 0.5
+    heavyRangeModifier: 3 #Superior Japanese folded steel
+    heavyDamageBaseModifier: 1.25
+    heavyStaminaCost: 10
+    maxTargets: 1
+    angle: 20
   - type: Item
     size: Normal
     sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
@@ -66,7 +80,7 @@
     wideAnimationRotation: -60
     damage:
       types:
-        Slash: 30
+        Slash: 25
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/energykatana.rsi
@@ -99,9 +113,15 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 0.8
     damage:
       types:
         Slash: 15
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 1.25
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    angle: 80
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -121,10 +141,19 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
-    attackRate: 0.75
+    attackRate: 0.65
+    range: 1.85
     damage:
       types:
-        Slash: 20
+        Slash: 19
+        Blunt: 1
+    bluntStaminaDamageFactor: 25.0
+    heavyRateModifier: 0.5
+    heavyRangeModifier: 1
+    heavyDamageBaseModifier: 1
+    heavyStaminaCost: 20
+    maxTargets: 10
+    angle: 200
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -150,9 +179,16 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 1.25
     damage:
       types:
-        Slash: 16
+        Slash: 12
+    heavyRateModifier: 0.8
+    heavyRangeModifier: 1.2
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
+    maxTargets: 3
+    angle: 40
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
index 6b24c96e309..123de813cbd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
@@ -12,16 +12,23 @@
     sprite: Objects/Weapons/Melee/white_cane.rsi
   - type: MeleeWeapon
     wideAnimationRotation: 45
+    attackRate: 0.9
+    range: 1.6
     damage:
       types:
-        Blunt: 5
-  - type: StaminaDamageOnHit
-    damage: 5
+        Blunt: 6
+    bluntStaminaDamageFactor: 2.5
+    heavyRateModifier: 0.5
+    heavyRangeModifier: 1.75
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 0
+    maxTargets: 1
+    angle: 20
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 3
+        Blunt: 2
   - type: UseDelay
     delay: 1
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 1cad73e30ea..f25023b4541 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -314,7 +314,7 @@
     sprite: Objects/Weapons/Grenades/empgrenade.rsi
   - type: EmpOnTrigger
     range: 4
-    energyConsumption: 50000
+    energyConsumption: 2700000
   - type: DeleteOnTrigger
   - type: Appearance
   - type: TimerTriggerVisuals
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 9ac737e9cbb..a952713dd5f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -35,6 +35,10 @@
       types:
         Blunt: 7
     bluntStaminaDamageFactor: 2.0
+    heavyRateModifier: 0.75
+    heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 5
+    maxTargets: 3
     angle: 60
     animation: WeaponArcSlash
   - type: StaminaDamageOnHit
@@ -93,12 +97,16 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    attackRate: 0.8
     damage:
       types:
-        Blunt: 20
+        Blunt: 15
     soundHit:
       collection: MetalThud
-    bluntStaminaDamageFactor: 1.5
+    bluntStaminaDamageFactor: 2
+    heavyRateModifier: 1
+    heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 10
   - type: Item
     size: Normal
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 23943307ad9..f12bd2b553e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -11,7 +11,7 @@
     layoutId: AirlockService
 
 - type: entity
-  parent: AirlockServiceLocked
+  parent: AirlockJustice # DeltaV - Lawyer is in Justice Dept
   id: AirlockLawyerLocked
   suffix: Lawyer, Locked
   components:
@@ -421,8 +421,8 @@
     layoutId: AirlockService
 
 - type: entity
-  parent: AirlockServiceGlassLocked
-  id: AirlockLawyerGlassLocked
+  parent: AirlockJusticeGlass
+  id: AirlockLawyerGlassLocked # DeltaV - Lawyer is in Justice Dept
   suffix: Lawyer, Locked
   components:
   - type: ContainerFill
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
index dfb37f49869..2cb30277d20 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -13,6 +13,7 @@
     science:     Structures/Doors/Airlocks/Standard/science.rsi
     security:    Structures/Doors/Airlocks/Standard/security.rsi
     virology:    Structures/Doors/Airlocks/Standard/virology.rsi
+    justice:     DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi # Delta V - Add Justice Dept
 
 - type: AirlockGroup
   id: Glass
@@ -28,6 +29,7 @@
     medical:     Structures/Doors/Airlocks/Glass/medical.rsi
     security:    Structures/Doors/Airlocks/Glass/security.rsi
     virology:    Structures/Doors/Airlocks/Glass/virology.rsi
+    justice:     DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Delta V - Add Justice Dept
 
 - type: AirlockGroup
   id: Windoor
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 6c50b334091..1d0a25ed852 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -52,7 +52,7 @@
   suffix: Filled
   components:
   - type: StaticPrice
-    price: 5
+    price: 15
   - type: StorageFill
     contents:
       - id: ClothingNeckLGBTPin
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/shower.yml b/Resources/Prototypes/Entities/Structures/Furniture/shower.yml
new file mode 100644
index 00000000000..694202efdc6
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Furniture/shower.yml
@@ -0,0 +1,46 @@
+- type: entity
+  name: shower
+  id: Shower
+  description: A shower, complete with bluespace water.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+    - type: Sprite
+      sprite: Structures/Furniture/shower.rsi
+      drawdepth: WallMountedItems
+      layers:
+      - state: shower
+        map: ["enabled", "enum.ShowerVisualState.Off" ]
+    - type: Appearance
+    - type: Rotatable
+    - type: Transform
+      noRot: false
+    - type: Clickable
+    - type: Shower
+    - type: Physics
+      bodyType: Static
+      canCollide: false
+    - type: InteractionOutline
+    - type: Damageable
+    - type: Construction
+      graph: Shower
+      node: shower
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - type: GenericVisualizer
+      visuals:
+        enum.ShowerVisuals.ShowerVisualState:
+          ShowerVisualState.Off:
+            On: { state: shower_on }
+            Off: { state: shower }
+
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 98f4a9afb0c..59690e56ebd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -72,65 +72,15 @@
     rewardMinAmount: 0
     rewardMaxAmount: 0
     possibleRewards:
-    - ToyMouse
-    - ToyAi
-    - ToyNuke
-    - ToyGriffin
-    - ToyHonk
-    - ToyIan
-    - ToyMarauder
-    - ToyMauler
-    - ToyGygax
-    - ToyOdysseus
-    - ToyOwlman
-    - ToyDeathRipley
-    - ToyPhazon
-    - ToyFireRipley
-    - ToyReticence
-    - ToyRipley
-    - ToySeraph
-    - ToyDurand
-    - ToySkeleton
-    - FoamCrossbow
-    - RevolverCapGun
-    - PlushieHampter
-    - PlushieLizard
-    - PlushieAtmosian
-    - PlushieSpaceLizard
-    - PlushieNuke
-    - PlushieCarp
-    - PlushieMagicarp
-    - PlushieHolocarp
-    - PlushieRainbowCarp
-    - PlushieRatvar
-    - PlushieNar
-    - PlushieSnake
-    - PlushieArachind
-    - Basketball
-    - Football
-    - PlushieRouny
-    - PlushieBee
-    - PlushieSlime
-    - BalloonNT
-    - BalloonCorgi
-    - ToySword
-    - CrayonBox
-    - BoxDonkSoftBox
-    - BoxCartridgeCap
-    - HarmonicaInstrument
-    - OcarinaInstrument
-    - RecorderInstrument
-    - GunpetInstrument
-    - BirdToyInstrument
-    - PlushieXeno
-    - BeachBall
-    - PlushieMoth
-    - PlushieHampter
-    - ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
-    - ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
-    - PlushiePenguin
-    - PlushieHuman
-    - ClothingHeadHatCowboyRed
+    - PrizeBall
+    - PrizeTicket10
+    - PrizeTicket10
+    - PrizeTicket10
+    - PrizeTicket10
+    - PrizeTicket10
+    - PrizeTicket30
+    - PrizeTicket30
+    - PrizeTicket60
   - type: WiresPanel
   - type: Wires
     layoutId: Arcade
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index a42fb14d31f..42d48098536 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -596,6 +596,8 @@
     - BorgModuleAdvancedTool
     - BorgModuleGPS
     - BorgModuleRCD
+    - BorgModuleJetpack
+    - BorgModulePka
     - BorgModuleArtifact
     - BorgModuleAnomaly
     - BorgModuleGardening
@@ -1321,3 +1323,141 @@
     staticRecipes:
     - MaterialSheetMeat
     - SheetPaper
+
+- type: entity
+  parent: BaseLathe
+  id: PrizeCounter
+  name: prize counter
+  description: Claim your prize and win some toys and cute plushies!
+  components:
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 3
+    enabled: false
+    sound:
+      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
+  - type: LitOnPowered
+  - type: ApcPowerReceiver
+    powerLoad: 200
+    priority: Low
+  # - type: Advertise
+  #   pack: CuddlyCritterAds # TODO Change this
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#4b93ad"
+  - type: Transform
+    noRot: false
+  - type: Sprite
+    sprite: Structures/Machines/prizecounter.rsi
+    snapCardinals: true
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes:
+      - PrizeBall
+      - PlushieMothRandom
+      - PlushieMothMusician
+      - PlushieMothBartender
+      - PlushieBee
+      - PlushieHampter
+      - PlushieRouny
+      - PlushieLamp
+      - PlushieArachind
+      - PlushieLizard
+      - PlushieSpaceLizard
+      - PlushieSharkBlue
+      - PlushieSharkPink
+      - PlushieSharkGrey
+      - PlushieCarp
+      - PlushieMagicarp
+      - PlushieHolocarp
+      - PlushieSlime
+      - PlushieSnake
+      - ToyMouse
+      - ToyRubberDuck
+      - PlushieVox
+      - PlushieAtmosian
+      - PlushiePenguin
+      - PlushieHuman
+      - PlushieArachne
+      - PlushieGnome
+      - PlushieLoveable
+      - PlushieDeer
+      - PlushieIpc
+      - PlushieGrey
+      - PlushieRedFox
+      - PlushiePurpleFox
+      - PlushiePinkFox
+      - PlushieOrangeFox
+      - PlushieMarbleFox
+      - PlushieCrimsonFox
+      - PlushieCoffeeFox
+      - PlushieBlueFox
+      - PlushieBlackFox
+      - PlushieVulp
+      - PlushieCorgi
+      - PlushieGirlyCorgi
+      - PlushieRobotCorgi
+      - PlushieCatBlack
+      - PlushieCatGrey
+      - PlushieCatOrange
+      - PlushieCatSiames
+      - PlushieCatTabby
+      - PlushieCatTuxedo
+      - PlushieCatWhite
+      - ToyAi
+      - ToyIan
+      - BalloonNT
+      - BalloonCorgi
+      - CrayonBox
+      - PetRockCarrier
+      - PlushieXeno
+      - FoamCrossbow
+      - RevolverCapGun
+      - PonderingOrb
+      - ToyAmongPequeno
+      - FoamCutlass
+      - WhoopieCushion
+      - ToyHammer
+      - PlasticBanana
+      - WeaponWaterPistol
+      - WeaponWaterBlaster
+      - NewtonCradle
+      - SnapPopBox
+      - MrDips
+      - MrChips
+      - CrazyGlue
+      - PlushieRatvar
+      - PlushieNar
+  - type: EmagLatheRecipes
+    emagStaticRecipes:
+      - PlushieGhost
+      - PlushieRGBee
+      - PlushieRainbowCarp
+      - PlushieJester
+      - PlushieSlips
+      - PlushieTrystan
+      - PlushieAbductor
+      - PlushieAbductorAgent
+      - PlushieNuke
+      - ToyNuke
+      - FoamBlade
+      - BalloonSyn
+      - SingularityToy
+      - TeslaToy
+      - ToySword
+      - ThronglerToy
+  - type: MaterialStorage
+    whitelist:
+      tags:
+        - PrizeTicket
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
index 6cc1fc79814..2a7d827522e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
@@ -80,3 +80,85 @@
       - EncryptionKeySecurity
       - EncryptionKeyService
       - EncryptionKeyCommand
+      - EncryptionKeyJustice #DeltaV - Justice dept
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledCommon
+  suffix: Common
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledCargo
+  suffix: Cargo
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCargo
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledEngineering
+  suffix: Engineering
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyEngineering
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledMedical
+  suffix: Medical
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyMedical
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledScience
+  suffix: Science
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyScience
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledSecurity
+  suffix: Security
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySecurity
+      - EncryptionKeyJustice #DeltaV - Justice dept
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledService
+  suffix: Service
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyService
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledCommand
+  suffix: Command
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommand
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/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index cd44f5f585a..52b008c7f2c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -98,6 +98,7 @@
         whitelist:
           components:
             - GasTank
+            - BorgJetpack
     - type: StaticPrice
       price: 1000
     - type: AccessReader
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/radalarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/radalarm.yml
new file mode 100644
index 00000000000..44bbe3e6170
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/radalarm.yml
@@ -0,0 +1,51 @@
+- type: entity
+  id: GeigerCounterWallMount
+  name: wall-mounted Geiger counter
+  description: A stationary device that emits a warning tone when it detects radiation pulses.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+    - type: InteractionOutline
+    - type: Clickable
+    - type: Rotatable
+      rotateWhileAnchored: false
+      rotateWhilePulling: true
+    - type: WallMount
+    - type: Transform
+      noRot: false
+      anchored: true
+    - type: Sprite
+      noRot: true
+      drawdepth: WallMountedItems
+      sprite: Structures/Wallmounts/radalarm.rsi
+      layers:
+        - state: geiger_base
+        - state: geiger_on_idle
+          map: ["enum.GeigerLayers.Screen"]
+          shader: unshaded
+          visible: false
+    - type: Geiger
+      showControl: true
+      showExamine: true
+      localSoundOnly: false
+      audioParameters:
+        volume: -4
+        maxDistance: 10
+        rolloffFactor: 4
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.GeigerVisuals.IsEnabled:
+          GeigerLayers.Screen:
+            True: { visible: True }
+            False: { visible: False }
+        enum.GeigerVisuals.DangerLevel:
+          GeigerLayers.Screen:
+            None: {state: geiger_on_idle}
+            Low: {state: geiger_on_low}
+            Med: {state: geiger_on_med}
+            High: {state: geiger_on_high}
+            Extreme: {state: geiger_on_ext}
+
diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml
deleted file mode 100644
index fca2cd88c9d..00000000000
--- a/Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Cosmetic Goggles FloofStation
-- type: entity
-  parent: ClothingEyesBase
-  id: ClothingEyesGlassesThermalBudget
-  name: red goggles
-  description: These don't have any real function, but they do look cool!
-  components:
-  - type: Sprite
-    sprite: Clothing/Eyes/Glasses/thermal.rsi
-  - type: Clothing
-    sprite: Clothing/Eyes/Glasses/thermal.rsi
-
-- type: entity
-  parent: ClothingEyesBase
-  id: ClothingEyesGlassesChemicalBudget
-  name: purple goggles
-  description: These don't have any real function, but they do look cool!
-  components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/science.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/science.rsi
-
-- type: entity
-  parent: ClothingEyesBase
-  id: ClothingEyesGlassesMesonBudget
-  name: green goggles 
-  description: These don't have any real function, but they do look cool!
-  components:
-  - type: Sprite
-    sprite: Clothing/Eyes/Glasses/meson.rsi
-  - type: Clothing
-    sprite: Clothing/Eyes/Glasses/meson.rsi
diff --git a/Resources/Prototypes/Floof/Loadouts/eyes.yml b/Resources/Prototypes/Floof/Loadouts/eyes.yml
deleted file mode 100644
index a3e2948739a..00000000000
--- a/Resources/Prototypes/Floof/Loadouts/eyes.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Cosmetic Goggles FloofStation
-
-- type: loadout
-  id: LoadoutEyesThermalBudget
-  category: Eyes
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingEyesGlassesThermalBudget
-
-- type: loadout
-  id: LoadoutEyesChemicalBudget
-  category: Eyes
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingEyesGlassesChemicalBudget
-
-
-- type: loadout
-  id: LoadoutEyesMesonBudget
-  category: Eyes
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingEyesGlassesMesonBudget
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 7863224436c..ca885117449 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -413,6 +413,22 @@
 #    - id: MobClownSpider
 #      prob: 0.05
 
+- type: entity
+  id: OneirophageSpawn
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+  - type: StationEvent
+    id: VentCritters
+    earliestStart: 15
+    minimumPlayers: 15
+    weight: 4
+    duration: 60
+  - type: VentCrittersRule
+    entries:
+    - id: MobGiantSpiderVampireAngry
+      prob: 0.01
+
 - type: entity
   id: ZombieOutbreak
   parent: BaseGameRule
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/InventoryTemplates/anytaur_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/anytaur_inventory_template.yml
new file mode 100644
index 00000000000..0dd5961aef3
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/anytaur_inventory_template.yml
@@ -0,0 +1,112 @@
+- type: inventoryTemplate
+  id: anytaur
+  slots:
+    - name: jumpsuit
+      slotTexture: uniform
+      slotFlags: INNERCLOTHING
+      stripTime: 5
+      uiWindowPos: 0,2
+      strippingWindowPos: 0,2
+      displayName: Jumpsuit
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      slotGroup: MainHotbar
+      stripTime: 6
+      uiWindowPos: 1,2
+      strippingWindowPos: 1,2
+      displayName: Suit
+      blacklist:
+        tags:
+          - FullBodyOuter
+    - name: gloves
+      slotTexture: gloves
+      slotFlags: GLOVES
+      uiWindowPos: 2,2
+      strippingWindowPos: 2,2
+      displayName: Gloves
+    - name: neck
+      slotTexture: neck
+      slotFlags: NECK
+      uiWindowPos: 0,1
+      strippingWindowPos: 0,1
+      displayName: Neck
+    - name: mask
+      slotTexture: mask
+      slotFlags: MASK
+      uiWindowPos: 1,1
+      strippingWindowPos: 1,1
+      displayName: Mask
+    - name: eyes
+      slotTexture: glasses
+      slotFlags: EYES
+      stripTime: 2
+      uiWindowPos: 0,0
+      strippingWindowPos: 0,0
+      displayName: Eyes
+    - name: ears
+      slotTexture: ears
+      slotFlags: EARS
+      stripTime: 2
+      uiWindowPos: 2,0
+      strippingWindowPos: 2,1
+      displayName: Ears
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      uiWindowPos: 1,0
+      strippingWindowPos: 1,0
+      displayName: Head
+    - name: pocket1
+      slotTexture: pocket
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      stripTime: 2
+      uiWindowPos: 0,3
+      strippingWindowPos: 0,3
+      dependsOn: jumpsuit
+      displayName: Pocket 1
+      stripHidden: true
+    - name: pocket2
+      slotTexture: pocket
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      stripTime: 2
+      uiWindowPos: 2,3
+      strippingWindowPos: 2,3
+      dependsOn: jumpsuit
+      displayName: Pocket 2
+      stripHidden: true
+    - name: suitstorage
+      slotTexture: suit_storage
+      slotFlags:   SUITSTORAGE
+      stripTime: 2
+      uiWindowPos: 2,0
+      strippingWindowPos: 2,0
+      dependsOn: outerClothing
+      displayName: Suit Storage
+    - name: id
+      slotTexture: id
+      slotFlags: IDCARD
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 2,1
+      strippingWindowPos: 2,4
+      dependsOn: jumpsuit
+      displayName: ID
+    - name: belt
+      slotTexture: belt
+      slotFlags: BELT
+      slotGroup: SecondHotbar
+      stripTime: 5
+      uiWindowPos: 3,1
+      strippingWindowPos: 1,3
+      displayName: Belt
+    - name: back
+      slotTexture: back
+      slotFlags: BACK
+      slotGroup: SecondHotbar
+      stripTime: 5
+      uiWindowPos: 3,0
+      strippingWindowPos: 0,4
+      displayName: Back
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index ac3a60ec547..381704de0b3 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -46,7 +46,7 @@
   items:
     - ClothingOuterCoatRnd
 
-#- type: loadout
+#- type: loadout - Floofstation
 #  id: LoadoutScienceOuterLabcoat
 #  category: Jobs
 #  cost: 2
@@ -75,7 +75,7 @@
   items:
     - ClothingOuterCoatLabSeniorResearcher
 
-- type: loadout # Floofstation
+- type: loadout
   id: LoadoutScienceOuterExplorerLabcoat
   category: Jobs
   cost: 2
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index f1c64730378..527c9391c0a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -9,11 +9,9 @@
       inverted: true
       species:
         - Harpy
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - SecurityCadet
-        - Warden
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingUniformJumpsuitSecBlue
 
@@ -27,11 +25,9 @@
       inverted: true
       species:
         - Harpy
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - SecurityCadet
-        - Warden
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingUniformJumpsuitSecGrey
 
@@ -41,11 +37,9 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - SecurityCadet
-        - Warden
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingUniformJumpskirtSecGrey
 
@@ -55,11 +49,9 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - SecurityCadet
-        - Warden
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingUniformJumpskirtSecBlue
 
@@ -198,19 +190,16 @@
 - type: loadout
   id: LoadoutUniformJumpsuitSecFormal
   category: Jobs
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterSpeciesRequirement
       inverted: true
       species:
         - Harpy
-    - !type:CharacterJobRequirement
-      jobs:
-        - Detective
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingUniformJumpsuitSecFormal
 
@@ -224,14 +213,12 @@
       inverted: true
       species:
         - Harpy
-    - !type:CharacterJobRequirement
-      jobs:
-        - Detective
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingUniformJumpsuitSecSummer
+  
 # Mask
 - type: loadout
   id: LoadoutSecurityMaskGasSwat
@@ -257,92 +244,176 @@
       species:
         - Diona
         - Harpy
-    - !type:CharacterJobRequirement
-      jobs:
-        - Detective
-        - SecurityOfficer
-        - SecurityCadet
-        - Warden
-        - HeadOfSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingShoesBootsJack
 
+- type: loadout
+  id: LoadoutClothingShoesBootsCombat
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Diona
+        - Harpy
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingShoesBootsCombat
+
 # Eyes
 - type: loadout
   id: LoadoutSecurityEyesHudSecurity
   category: Jobs
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingEyesHudSecurity
 
+- type: loadout
+  id: ClothingEyesGlassesSunglasses
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingEyesGlassesSunglasses
+
 - type: loadout
   id: LoadoutSecurityEyesEyepatchHudSecurity
   category: Jobs
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingEyesEyepatchHudSecurity
 
 - type: loadout
   id: LoadoutSecurityEyesHudSecurityPrescription
   category: Jobs
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
     - !type:CharacterTraitRequirement
       traits:
         - Nearsighted
   items:
     - ClothingEyesPrescriptionHudSecurity
 
+- type: loadout
+  id: LoadoutClothingEyesGlassesSecurity
+  category: Jobs
+  cost: 4
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingEyesGlassesSecurity
+
+#Backpack
+#Will need to add a backpack category later on, that will be part of an starting inventory loadout refactor.
+
 # Head
 - type: loadout
   id: LoadoutSecurityHeadHatBeret
   category: Jobs
   cost: 1
   exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingHeadHatBeretSecurity
+
+- type: loadout
+  id: LoadoutClothingHeadHelmetBasic
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingHeadHelmetBasic
+
+- type: loadout
+  id: LoadoutClothingHeadHatBeretBrigmedic
+  category: Jobs
+  cost: 1
+  exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
         - Brigmedic
   items:
-    - ClothingHeadHatBeretSecurity
+    - ClothingHeadHatBeretBrigmedic
 
 - type: loadout
-  id: LoadoutSecurityHeadHelmetInsulated
+  id: LoadoutClothingHeadHatBeretCorpsman
   category: Jobs
-  cost: 3
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Brigmedic
+  items:
+    - ClothingHeadHatBeretCorpsman
+
+- type: loadout
+  id: LoadoutClothingHeadHatBeretWarden
+  category: Jobs
+  cost: 1
+  exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
-        - SecurityOfficer
         - Warden
+  items:
+    - ClothingHeadHatBeretWarden
+
+- type: loadout
+  id: LoadoutClothingHeadHatBeretHoS
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
         - HeadOfSecurity
-        - Brigmedic
+  items:
+    - ClothingHeadHatBeretHoS
+
+- type: loadout
+  id: LoadoutSecurityHeadHelmetInsulated
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
   items:
     - ClothingHeadHelmetInsulated
 
@@ -352,33 +423,230 @@
   category: Jobs
   cost: 1
   exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingBeltSecurityWebbingFilled
+
+- type: loadout
+  id: LoadoutClothingBeltCorpsmanWebbing
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Brigmedic
+  items:
+    - ClothingBeltCorpsmanWebbingFilled
+
+- type: loadout
+  id: LoadoutClothingBeltSecurity
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingBeltSecurity
+
+#Gloves
+
+- type: loadout
+  id: LoadoutClothingHandsGlovesNitrile
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Brigmedic
+  items:
+    - ClothingHandsGlovesNitrile
+
+- type: loadout
+  id: LoadoutClothingOuterArmorPlateCarrier
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingOuterArmorPlateCarrier
+
+- type: loadout
+  id: LoadoutClothingOuterArmorDuraVest
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingOuterArmorDuraVest
+
+- type: loadout
+  id: LoadoutClothingOuterCoatDetective
+  category: Jobs
+  cost: 2
+  exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
         - Detective
-        - SecurityOfficer
-        - SecurityCadet
+  items:
+    - ClothingOuterCoatDetective
+
+- type: loadout
+  id: LoadoutOuterVestDetective
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+  items:
+    - ClothingOuterVestDetective
+
+- type: loadout
+  id: LoadoutClothingOuterCoatWarden
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
         - Warden
+  items:
+    - ClothingOuterCoatWarden
+
+- type: loadout
+  id: LoadoutClothingOuterCoatHoSTrench
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
         - HeadOfSecurity
   items:
-    - ClothingBeltSecurityWebbingFilled
+    - ClothingOuterCoatHoSTrench
 
+- type: loadout
+  id: LoadoutClothingOuterWinterHoS
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingOuterWinterHoS
+
+# Neck
+- type: loadout
+  id: LoadoutClothingNeckCloakHos
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingNeckCloakHos
+
+- type: loadout
+  id: LoadoutClothingNeckMantleHOS
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingNeckMantleHOS
+
+- type: loadout
+  id: LoadoutBedsheetBrigmedic
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Brigmedic
+  items:
+    - BedsheetBrigmedic
+    
+  
 # Equipment
 - type: loadout
   id: LoadoutSecurityCombatKnife
   category: Jobs
-  cost: 1
+  cost: 2
   requirements:
-    - !type:CharacterSpeciesRequirement
-      species:
-        - Diona
-        - Harpy
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
   items:
     - CombatKnife
 
+- type: loadout
+  id: LoadoutSecurityFlash
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - Flash
+
+- type: loadout
+  id: LoadoutSecurityDisabler
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - WeaponDisabler
+
+- type: loadout
+  id: LoadoutMagazinePistolRubber
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - MagazinePistolRubber
+
+- type: loadout
+  id: LoadoutSpeedLoaderMagnumRubber
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+  items:
+    - SpeedLoaderMagnumRubber
+
 # TODO: Make this replace the secoff handgun and make it cheaper
 # # Species
 # - type: loadout
diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml
index 02d411be078..8278c3ed49f 100644
--- a/Resources/Prototypes/Loadouts/eyes.yml
+++ b/Resources/Prototypes/Loadouts/eyes.yml
@@ -50,3 +50,11 @@
   exclusive: true
   items:
     - ClothingEyesGlassesSunglasses
+
+- type: loadout
+  id: LoadoutItemBlindfoldFake
+  category: Eyes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingEyesBlindfoldFake
\ No newline at end of file
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
index 946b6b8d2b5..1b47e307b7d 100644
--- a/Resources/Prototypes/Loadouts/head.yml
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -155,6 +155,14 @@
   items:
     - ClothingHeadHatBellhop
 
+- type: loadout
+  id: LoadoutHeadPoppy
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - FoodPoppy
+
 # Color Hats
 - type: loadout
   id: LoadoutHeadHatBluesoft
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
index 46437193fee..87ba2e71d42 100644
--- a/Resources/Prototypes/Loadouts/items.yml
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -468,6 +468,20 @@
          - Brigmedic
 
 #Misc Items
+- type: loadout
+  id: LoadoutItemFlash
+  category: Items
+  cost: 1
+  items:
+    - Flash
+  requirements:
+    - !type:CharacterDepartmentRequirement
+       departments:
+         - Security
+    - !type:CharacterJobRequirement
+       jobs:
+         - Brigmedic
+
 - type: loadout
   id: LoadoutItemPAI
   category: Items
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
index c7fc7003653..3e0227d1dae 100644
--- a/Resources/Prototypes/Loadouts/neck.yml
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -6,6 +6,30 @@
   items:
     - ClothingNeckHeadphones
 
+- type: loadout
+  id: LoadoutNeckBellCollar
+  category: Neck
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingNeckBellCollar
+
+- type: loadout
+  id: LoadoutNeckOldMantle
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckOldMantle
+
+- type: loadout
+  id: LoadoutNeckUnathiMantle
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckUnathiMantle
+
 # Scarves
 - type: loadout
   id: LoadoutNeckScarfStripedRed
@@ -120,7 +144,6 @@
   items:
     - ClothingNeckTieGreen
 
-
 #Pride Accessories
 - type: loadout
   id: LoadoutItemsPrideLGBTPin
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index 470cac29834..e67ca70b392 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -341,7 +341,6 @@
   items:
     - ClothingUnderSocksCoder
 
-# Socks
 - type: loadout
   id: LoadoutShoesUnderSocksBee
   category: Shoes
@@ -355,3 +354,11 @@
         - Harpy
   items:
     - ClothingUnderSocksBee
+
+- type: loadout
+  id: LoadoutShoesClothWrap
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingClothWrap
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index 793f328b7a0..cab8f4a1f4e 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -18,167 +18,4 @@
     charges: 1
     icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon }
     useDelay: 30
-    event: !type:HairballActionEvent
-
-- type: entity
-  id: ActionDispel
-  name: action-name-dispel
-  description: action-description-dispel
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/dispel.png
-    useDelay: 45
-    checkCanAccess: false
-    range: 6
-    itemIconStyle: BigAction
-    canTargetSelf: false
-    event: !type:DispelPowerActionEvent
-
-- type: entity
-  id: ActionRegenerativeStasis
-  name: action-name-regenerative-stasis
-  description: action-description-regenerative-stasis
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
-    useDelay: 60
-    checkCanAccess: false
-    range: 8
-    itemIconStyle: BigAction
-    event: !type:RegenerativeStasisPowerActionEvent
-
-- type: entity
-  id: ActionMindSwap
-  name: action-name-mind-swap
-  description: action-description-mind-swap
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/mind_swap.png
-    useDelay: 240
-    checkCanAccess: false
-    range: 8
-    itemIconStyle: BigAction
-    event: !type:MindSwapPowerActionEvent
-
-- type: entity
-  id: ActionMindSwapReturn
-  name: action-name-mind-swap-return
-  description: action-description-mind-swap-return
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
-    useDelay: 20
-    checkCanInteract: false
-    event: !type:MindSwapPowerReturnActionEvent
-
-- type: entity
-  id: ActionNoosphericZap
-  name: action-name-noospheric-zap
-  description: action-description-noospheric-zap
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
-    useDelay: 100
-    range: 5
-    itemIconStyle: BigAction
-    event: !type:NoosphericZapPowerActionEvent
-
-- type: entity
-  id: ActionPyrokinesis
-  name: action-name-pyrokinesis
-  description: action-description-pyrokinesis
-  noSpawn: true
-  components:
-  - type: WorldTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
-    useDelay: 1
-    range: 15
-    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
-  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
-
-- type: entity
-  id: ActionPsionicRegeneration
-  name: action-name-psionic-regeneration
-  description: action-description-psionic-regeneration
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
-    useDelay: 120
-    event: !type:PsionicRegenerationPowerActionEvent
-
-- type: entity
-  id: ActionTelegnosis
-  name: action-name-telegnosis
-  description: action-description-telegnosis
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/telegnosis.png
-    useDelay: 150
-    event: !type:TelegnosisPowerActionEvent
-
-- type: entity
-  id: ActionPsionicInvisibility
-  name: action-name-psionic-invisibility
-  description: action-description-psionic-invisibility
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
-    useDelay: 120
-    event: !type:PsionicInvisibilityPowerActionEvent
-
-- type: entity
-  id: ActionPsionicInvisibilityUsed
-  name: action-name-psionic-invisibility-off
-  description: action-description-psionic-invisibility-off
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
-    event: !type:RemovePsionicInvisibilityOffPowerActionEvent
-
+    event: !type:HairballActionEvent
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml
new file mode 100644
index 00000000000..23934b3ebcc
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml
@@ -0,0 +1,22 @@
+- type: entity
+  id: OrganVampiricHumanoidStomach
+  parent: OrganHumanStomach
+  components:
+  - type: Metabolizer
+    # mm yummy
+    maxReagents: 3
+    metabolizerTypes: [Vampiric]
+    groups:
+    - id: Food
+    - id: Drink
+
+- type: entity
+  id: OrganVampiricStomach
+  parent: OrganAnimalStomach
+  components:
+  - type: Metabolizer
+    maxReagents: 3
+    metabolizerTypes: [Vampiric]
+    groups:
+    - id: Food
+    - id: Drink
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
index a900f7524e7..7e71227dbcb 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
@@ -24,13 +24,33 @@
       - ReagentId: DemonsBlood
         Quantity: 10
 
+- type: entity
+  id: ThoraxSpider
+  name: "spider thorax" #for arachne, actual spiders should get a cephalothorax that combines with head.
+  parent: PartSpider
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Moth/parts.rsi # placeholder sprite
+    state: "torso_m"
+  - type: Icon
+    sprite: Mobs/Species/Moth/parts.rsi
+    state: "torso_m"
+  - type: BodyPart #"Other" type
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: DemonsBlood
+        Quantity: 20
+
 - type: entity
   id: RightLegSpider
   name: "right spider leg"
   parent: PartSpider
   components:
   - type: Sprite
-    sprite: Objects/Consumable/Food/meat.rsi
+    sprite: Objects/Consumable/Food/meat.rsi # placeholder sprite
     state: spiderleg
   - type: Icon
     sprite: Objects/Consumable/Food/meat.rsi
@@ -48,7 +68,7 @@
   parent: PartSpider
   components:
   - type: Sprite
-    sprite: Objects/Consumable/Food/meat.rsi
+    sprite: Objects/Consumable/Food/meat.rsi # placeholder sprite
     state: spiderleg
   - type: Icon
     sprite: Objects/Consumable/Food/meat.rsi
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
new file mode 100644
index 00000000000..553391484e2
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
@@ -0,0 +1,63 @@
+- type: body
+  id: Arachne
+  name: "arachne"
+  root: torso
+  slots:
+    head:
+      part: HeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - left arm
+      - right arm
+      - thorax
+      organs:
+        heart: OrganHumanHeart
+        lungs: OrganHumanLungs
+        stomach: OrganVampiricHumanoidStomach
+        liver:  OrganHumanLiver
+        kidneys: OrganHumanKidneys
+    right arm:
+      part: RightArmHuman
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmHuman
+      connections:
+      - left hand
+    right hand:
+      part: RightHandHuman
+    left hand:
+      part: LeftHandHuman
+    thorax:
+      part: ThoraxSpider
+      connections:
+        - left foreleg
+        - left second leg
+        - left third leg
+        - left hind leg
+        - right foreleg
+        - right second leg
+        - right third leg
+        - right hind leg
+    left foreleg:
+      part: LeftLegSpider
+    left second leg:
+      part: LeftLegSpider
+    left third leg:
+      part: LeftLegSpider
+    left hind leg:
+      part: LeftLegSpider
+    right foreleg:
+      part: RightLegSpider
+    right second leg:
+      part: RightLegSpider
+    right third leg:
+      part: RightLegSpider
+    right hind leg:
+      part: RightLegSpider
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/Body/Prototypes/vampiricanimal.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml
new file mode 100644
index 00000000000..3f4cdb06de1
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml
@@ -0,0 +1,43 @@
+- type: body
+  id: VampiricAnimal
+  name: "vampiric animal"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganVampiricStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
+
+- type: body
+  id: VampiricAnimalLarge
+  name: "large vampiric animal"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganVampiricHumanoidStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
index 4f2ac846efa..8847f8d03a9 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMantis
-  name: psionic mantis' belt # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' belt
   description: Perfect for storing all of your equipment.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
index 6c96d3a56dd..1a83a14bd57 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -19,7 +19,7 @@
   parent: ClothingHeadHelmetHardsuitSyndie
   id: ClothingHeadHelmetHardsuitSyndieReverseEngineered
   noSpawn: true
-  name: SA-123 combat hardsuit helmet
+  name: SA-122 combat hardsuit helmet
   description: An advanced hardsuit helmet designed for work in special operations.
   components:
   - type: Sprite
@@ -31,7 +31,7 @@
   parent: ClothingHeadHelmetHardsuitCybersun
   id: ClothingHeadHelmetHardsuitJuggernautReverseEngineered
   noSpawn: true
-  name: SA-127 combat hardsuit helmet
+  name: SA-126 combat hardsuit helmet
   description: An assault hardsuit helmet featuring a top-secret translucent polymer.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
index 781e42c1728..deaca17558a 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,14 +120,11 @@
         Slash: 0.85
         Piercing: 0.95
         Radiation: 0.95
-  - type: GuideHelp
-    guides:
-    - Psionics
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatFezMantis
-  name: psionic mantis' fez # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' fez
   description: A fine red fez with a gold tassel.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml
index a16f6cd2212..75f8c7ddd01 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatMantis
-  name: psionic mantis' jacket # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' jacket
   description: Modeled after an ancient infantry uniform, this jacket may guard you against the unknown in your journey for the truth.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml
index b83cd75fc11..748ae0e9a4d 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -47,7 +47,7 @@
 - type: entity
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterCoatMantis
-  name: psionic mantis' winter coat # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' winter coat
   description: Solve cold cases in style.
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/boots.yml
index 4b1cec27f6c..207abcba801 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/boots.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesBootsMantis
-  name: psionic mantis' boots # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' boots
   description: Soft, comfortable, and good for rough terrain.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
index 11f6d32b5c3..b238ef7b063 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -72,7 +72,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitMantis
-  name: psionic mantis' uniform # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' uniform
   description: Modeled after an ancient infantry uniform, this uniform has superior mobility for tense situations.
   components:
   - type: Sprite
@@ -83,7 +83,7 @@
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformSkirtMantis
-  name: psionic mantis' jumpskirt # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' jumpskirt
   description: Adapted from an ancient infantry uniform, this jumpskirt has superior mobility for tense situations.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
index 2652a89127e..046a324e6f6 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
@@ -51,23 +51,23 @@
       - state: prisoner
   # - type: MidRoundAntagSpawnLocation # When MidRoundAntag?
 
-# - type: entity
-#   id: SpawnPointGhostVampSpider
-#   name: ghost role spawn point
-#   suffix: Vampire spider
-#   parent: MarkerBase
-#   noSpawn: true
-#   components:
-#   - type: GhostRoleMobSpawner
-#     prototype: MobGiantSpiderVampireAngry
-#   - type: GhostRole
-#     makeSentient: true
-#     name: ghost-role-information-giant-spider-vampire-name
-#     description: ghost-role-information-giant-spider-vampire-description
-#     rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat.
-#   - type: Sprite
-#     sprite: Markers/jobs.rsi
-#     layers:
-#       - state: green
-#       - sprite: Mobs/Animals/bat.rsi
-#         state: bat
+- type: entity
+  id: SpawnPointGhostVampSpider
+  name: ghost role spawn point
+  suffix: Vampire spider
+  parent: MarkerBase
+  noSpawn: true
+  components:
+  - type: GhostRoleMobSpawner
+    prototype: MobGiantSpiderVampireAngry
+  - type: GhostRole
+    makeSentient: true
+    name: ghost-role-information-giant-spider-vampire-name
+    description: ghost-role-information-giant-spider-vampire-description
+    rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat.
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+      - state: green
+      - sprite: Mobs/Animals/bat.rsi
+        state: bat
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml
index ebe73808e53..62a24bd75b9 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml
@@ -65,7 +65,7 @@
 - type: entity
   id: SpawnPointForensicMantis
   parent: SpawnPointJobBase
-  name: psionic mantis # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis
   components:
   - type: SpawnPoint
     job_id: ForensicMantis
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
index 5daf2e15e56..462b3254f1e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
@@ -70,143 +70,130 @@
   - type: Produce
   - type: NoSlip
 
-# - type: entity
-#   name: oneirophage
-#   parent: SimpleMobBase
-#   id: MobGiantSpiderVampire
-#   description: The 'dream-eater' spider, rumored to be one of the potential genetic sources for arachne.
-#   components:
-#   - type: Sprite
-#     drawdepth: Mobs
-#     layers:
-#     - map: ["enum.DamageStateVisualLayers.Base"]
-#       state: viper
-#       sprite: Mobs/Animals/spider.rsi
-#   - type: Physics
-#   - type: Fixtures
-#     fixtures:
-#       fix1:
-#         shape:
-#           !type:PhysShapeCircle
-#           radius: 0.35
-#         density: 130
-#         mask:
-#         - SmallMobMask
-#         layer:
-#         - SmallMobLayer
-#   - type: Appearance
-#   - type: DamageStateVisuals
-#     states:
-#       Alive:
-#         Base: viper
-#       Critical:
-#         Base: viper_dead
-#       Dead:
-#         Base: viper_dead
-#   - type: Butcherable
-#     spawned:
-#     - id: FoodMeatSpider
-#       amount: 2
-#   - type: CombatMode
-#   - type: ReplacementAccent
-#     accent: xeno
-#   - type: InteractionPopup
-#     successChance: 0.5
-#     interactSuccessString: petting-success-tarantula
-#     interactFailureString: petting-failure-generic
-#   - type: Puller
-#     needsHands: false
-#   - type: Arachne
-#     cocoonDelay: 8
-#   - type: SolutionContainerManager
-#     solutions:
-#       melee:
-#         reagents:
-#         - ReagentId: Nocturine
-#           Quantity: 20
-#   - type: MeleeChemicalInjector
-#     solution: melee
-#     transferAmount: 3.5
-#   - type: SolutionRegeneration
-#     solution: melee
-#     generated:
-#       reagents:
-#         - ReagentId: Nocturine
-#           Quantity: 0.15
-#   - type: BloodSucker
-#     unitsToSucc: 35
-#     injectWhenSucc: true
-#     injectReagent: Cryptobiolin
-#     unitsToInject: 10
-#     webRequired: true
-#   - type: Bloodstream
-#     bloodReagent: DemonsBlood
-#   - type: Body
-#     prototype: VampiricAnimalLarge
-#   - type: PotentialPsionic
-#   - type: Psionic
-#     removable: false
-#   - type: MetapsionicPower
-#   - type: MeleeWeapon
-#     hidden: true
-#     angle: 0
-#     animation: WeaponArcBite
-#     damage:
-#       types:
-#         Piercing: 8
-#   - type: AntiPsionicWeapon
-#     punish: false
-#     modifiers:
-#       coefficients:
-#         Piercing: 2.25
-#   - type: Damageable
-#     damageContainer: HalfSpirit
-#     damageModifierSet: HalfSpirit
-#   - type: StatusEffects
-#     allowed:
-#       - Stun
-#       - KnockedDown
-#       - SlowedDown
-#       - Stutter
-#       - SeeingRainbows
-#       - Electrocution
-#       - Drunk
-#       - SlurredSpeech
-#       - PressureImmunity
-#       - Muted
-#       - ForcedSleep
-#       - TemporaryBlindness
-#       - Pacified
-#       - PsionicsDisabled
-#       - PsionicallyInsulated
-#   - type: Tag
-#     tags:
-#       - Oneirophage
-#   - type: MovementAlwaysTouching
-#   - type: PsionicInvisibleContacts
-#     whitelist:
-#       tags:
-#         - ArachneWeb
+- type: entity
+  name: oneirophage
+  parent: MobGiantSpider
+  id: MobGiantSpiderVampire
+  description: The 'dream-eater' spider, rumored to be one of the potential genetic sources for arachne.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
+      state: viper
+      sprite: Mobs/Animals/spider.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: viper-moving
+    noMovementLayers:
+      movement:
+        state: viper
+  - type: Appearance
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: viper
+      Critical:
+        Base: viper_dead
+      Dead:
+        Base: viper_dead
+  - type: ReplacementAccent
+    accent: xeno
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-tarantula
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/snake_hiss.ogg
+  - type: Puller
+    needsHands: false
+  - type: Arachne
+    cocoonDelay: 8
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        reagents:
+        - ReagentId: Nocturine
+          Quantity: 20
+  - type: MeleeChemicalInjector
+    solution: melee
+    transferAmount: 3.5
+  - type: SolutionRegeneration
+    solution: melee
+    generated:
+      reagents:
+        - ReagentId: Nocturine
+          Quantity: 0.15
+  - type: BloodSucker
+    unitsToSucc: 35
+    injectWhenSucc: true
+    injectReagent: Cryptobiolin
+    unitsToInject: 10
+    webRequired: true
+  - type: Bloodstream
+    bloodReagent: DemonsBlood
+  - type: Body
+    prototype: VampiricAnimalLarge
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+  - type: MetapsionicPower
+  - type: AntiPsionicWeapon
+    punish: false
+    modifiers:
+      coefficients:
+        Piercing: 2.25
+  - type: Damageable
+    damageContainer: HalfSpirit
+    damageModifierSet: HalfSpirit
+  - type: StatusEffects
+    allowed:
+      - Stun
+      - KnockedDown
+      - SlowedDown
+      - Stutter
+      - SeeingRainbows
+      - Electrocution
+      - Drunk
+      - SlurredSpeech
+      - PressureImmunity
+      - Muted
+      - ForcedSleep
+      - TemporaryBlindness
+      - Pacified
+      - PsionicsDisabled
+      - PsionicallyInsulated
+  - type: Tag
+    tags:
+      - Oneirophage
+  - type: MovementAlwaysTouching
+  - type: PsionicInvisibleContacts
+    whitelist:
+      tags:
+        - ArachneWeb
 
-# - type: entity
-#   name: oneirophage
-#   parent: MobGiantSpiderVampire
-#   id: MobGiantSpiderVampireAngry
-#   suffix: Angry
-#   components:
-#     - type: NpcFactionMember
-#       factions:
-#         - SimpleHostile
-#     - type: InputMover
-#     - type: MobMover
-#     - type: HTN
-#       rootTask: SimpleHostileCompound
-#     - type: GhostRole
-#       makeSentient: true
-#       name: ghost-role-information-giant-spider-vampire-name
-#       description: ghost-role-information-giant-spider-vampire-description
-#       rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat.
-#     - type: GhostTakeoverAvailable
+- type: entity
+  name: oneirophage
+  parent: MobGiantSpiderVampire
+  id: MobGiantSpiderVampireAngry
+  suffix: Angry
+  components:
+    - type: NpcFactionMember
+      factions:
+        - SimpleHostile
+    - type: InputMover
+    - type: MobMover
+    - type: HTN
+      rootTask:
+        task: SimpleHostileCompound
+    - type: GhostRole
+      makeSentient: true
+      name: ghost-role-information-giant-spider-vampire-name
+      description: ghost-role-information-giant-spider-vampire-description
+      rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat.
+    - type: GhostTakeoverAvailable
 
 - type: entity
   parent: SimpleMobBase
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
index 1166d8a29f5..e1c867691a1 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -5,11 +5,6 @@
   id: MobOni
   components:
   - type: CombatMode
-  - type: InteractionPopup
-    successChance: 1
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
   - type: MindContainer
     showExamineInfo: true
   - type: Input
@@ -32,3 +27,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..9b79c556707 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -5,11 +5,6 @@
   id: MobFelinid
   components:
   - type: CombatMode
-  - type: InteractionPopup
-    successChance: 1
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
   - type: MindContainer
     showExamineInfo: true
   - type: Input
@@ -49,3 +44,5 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+  - type: PotentialPsionic
+
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index e93117b1aad..c1655287fdc 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -6,6 +6,7 @@
   components:
   - type: Speech
     speechSounds: Baritone
+    speechVerb: Oni
   - type: HumanoidAppearance
     species: Oni
   - type: Sprite
@@ -35,6 +36,8 @@
         - MobLayer
   - type: Stamina
     critThreshold: 115
+  - type: TypingIndicator
+    proto: oni
   - type: LanguageKnowledge
     speaks:
     - GalacticCommon
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
index 94efc40530c..4338b836854 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -82,7 +82,7 @@
 - type: entity
   parent: IDCardStandard
   id: ForensicMantisIDCard
-  name: psionic mantis ID card # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis ID card
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index 4e6115ba339..aa81d3be256 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
@@ -99,7 +98,7 @@
 - type: entity
   parent: BasePDA
   id: ForensicMantisPDA
-  name: psionic mantis PDA # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis PDA
   description: Smells like illegal substances.
   components:
   - type: Pda
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/paper.yml
index 22361c9aef6..b381aaa0c7e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/paper.yml
@@ -1,5 +1,5 @@
 - type: entity
-  name: psionic mantis' seal # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' seal
   parent: RubberStampBase
   id: RubberStampMantis
   suffix: DO NOT MAP
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
index 72f0cb741c7..7f1b26d9cbf 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
@@ -569,41 +569,130 @@
   components:
   - type: Mail
     contents:
-      # These are all grouped up now to guarantee at least one item received.
-      # The downside is you're not going to get half a dozen plushies anymore.
+    - id: PlushieMothRandom
+      orGroup: Prize
+    - id: PlushieMothMusician
+      orGroup: Prize
+    - id: PlushieMothBartender
+      orGroup: Prize
     - id: PlushieBee
-      orGroup: Plushie
-    - id: PlushieRGBee
-      prob: 0.5
-      orGroup: Plushie
-    - id: PlushieNuke
-      orGroup: Plushie
+      orGroup: Prize
+    - id: PlushieHampter
+      orGroup: Prize
     - id: PlushieRouny
-      orGroup: Plushie
+      orGroup: Prize
+    - id: PlushieLamp
+      orGroup: Prize
+    - id: PlushieArachind
+      orGroup: Prize
     - id: PlushieLizard
-      orGroup: Plushie
+      orGroup: Prize
+    - id: PlushieLizardMirrored
+      orGroup: Prize
     - id: PlushieSpaceLizard
-      orGroup: Plushie
-    - id: PlushieRatvar
-      orGroup: Plushie
-    - id: PlushieNar
-      orGroup: Plushie
+      orGroup: Prize
+    - id: PlushieDiona
+      orGroup: Prize
+    - id: PlushieSharkBlue
+      orGroup: Prize
+    - id: PlushieSharkPink
+      orGroup: Prize
+    - id: PlushieSharkGrey
+      orGroup: Prize
     - id: PlushieCarp
-      orGroup: Plushie
+      orGroup: Prize
+    - id: PlushieMagicarp
+      orGroup: Prize
+    - id: PlushieHolocarp
+      orGroup: Prize
     - id: PlushieSlime
-      orGroup: Plushie
+      orGroup: Prize
     - id: PlushieSnake
-      orGroup: Plushie
-    - id: PlushieMothRandom
-      orGroup: Plushie
-    - id: PlushieMoth
-      orGroup: Plushie
-    - id: PlushieMothMusician
-      prob: 0.5
-      orGroup: Plushie
-    - id: PlushieMothBartender
-      prob: 0.5
-      orGroup: Plushie
+      orGroup: Prize
+    - id: PlushieVox
+      orGroup: Prize
+    - id: PlushieAtmosian
+      orGroup: Prize
+    - id: PlushiePenguin
+      orGroup: Prize
+    - id: PlushieHuman
+      orGroup: Prize
+    - id: PlushieArachne
+      orGroup: Prize
+    - id: PlushieGnome
+      orGroup: Prize
+    - id: PlushieLoveable
+      orGroup: Prize
+    - id: PlushieDeer
+      orGroup: Prize
+    - id: PlushieIpc
+      orGroup: Prize
+    - id: PlushieGrey
+      orGroup: Prize
+    - id: PlushieRedFox
+      orGroup: Prize
+    - id: PlushiePurpleFox
+      orGroup: Prize
+    - id: PlushiePinkFox
+      orGroup: Prize
+    - id: PlushieOrangeFox
+      orGroup: Prize
+    - id: PlushieMarbleFox
+      orGroup: Prize
+    - id: PlushieCrimsonFox
+      orGroup: Prize
+    - id: PlushieCoffeeFox
+      orGroup: Prize
+    - id: PlushieBlueFox
+      orGroup: Prize
+    - id: PlushieBlackFox
+      orGroup: Prize
+    - id: PlushieVulp
+      orGroup: Prize
+    - id: PlushieCorgi
+      orGroup: Prize
+    - id: PlushieGirlyCorgi
+      orGroup: Prize
+    - id: PlushieRobotCorgi
+      orGroup: Prize
+    - id: PlushieCatBlack
+      orGroup: Prize
+    - id: PlushieCatGrey
+      orGroup: Prize
+    - id: PlushieCatOrange
+      orGroup: Prize
+    - id: PlushieCatSiames
+      orGroup: Prize
+    - id: PlushieCatTabby
+      orGroup: Prize
+    - id: PlushieCatTuxedo
+      orGroup: Prize
+    - id: PlushieCatWhite
+      orGroup: Prize
+    - id: PlushieGhost
+      orGroup: Prize
+    - id: PlushieRGBee
+      orGroup: Prize
+    - id: PlushieRatvar
+      orGroup: Prize
+    - id: PlushieNar
+      orGroup: Prize
+    - id: PlushieRainbowCarp
+      orGroup: Prize
+    - id: PlushieXeno
+      orGroup: Prize
+    - id: PlushieJester
+      orGroup: Prize
+    - id: PlushieSlips
+      orGroup: Prize
+    - id: PlushieAbductor
+      orGroup: Prize
+    - id: PlushieTrystan
+      orGroup: Prize
+    - id: PlushieAbductorAgent
+      orGroup: Prize
+    - id: PlushieNuke
+      orGroup: Prize
 
 - type: entity
   noSpawn: true
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..102000f8b26 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
@@ -73,22 +67,22 @@
   - type: AmbientSound
     range: 6
     volume: -6
-    sound: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
+    sound: /Audio/Ambience/Objects/prober_hum_low.ogg
   - type: AmbientOnPowered
   - type: GlimmerSound
     glimmerTier:
       Minimal:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
+        path: /Audio/Ambience/Objects/prober_hum_low.ogg
       Low:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
+        path: /Audio/Ambience/Objects/prober_hum_low.ogg
       Moderate:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg
+        path: /Audio/Ambience/Objects/prober_hum_moderate.ogg
       High:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg
+        path: /Audio/Ambience/Objects/prober_hum_high.ogg
       Dangerous:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
+        path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
       Critical:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
+        path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
 
 - type: entity
   parent: BaseMachinePowered
@@ -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/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 2744f965e07..fe25a9cc53c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -2,7 +2,7 @@
   id: LockerForensicMantis
   parent: LockerDetective
   suffix: Empty
-  name: psionic mantis' cabinet # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  name: mantis' cabinet
   description: You'll never know what's inside until you collapse the quantum superposition of all possible mysteries.
   components:
   # Because it holds a traitor objective, StrongMetallic,
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Webbing/webs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Webbing/webs.yml
new file mode 100644
index 00000000000..e483ea5da71
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Webbing/webs.yml
@@ -0,0 +1,93 @@
+- type: entity
+  id: CocoonedHumanoid
+  name: cocooned humanoid
+  description: Unlucky.
+  placement:
+    mode: SnapgridCenter
+    snap:
+      - Wall
+  components:
+  - type: Sprite
+    layers:
+      - sprite: Nyanotrasen/Structures/cocoon.rsi
+        state: cocoon_large1
+        map: [ "enum.DamageStateVisualLayers.Base" ]
+  - type: RandomSprite
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          cocoon_large1: ""
+      - enum.DamageStateVisualLayers.Base: #your guess for why randomsprite requires an arbitrary layer is as good as mine friend
+          cocoon_large2: ""
+      - enum.DamageStateVisualLayers.Base:
+          cocoon_large3: ""
+  - type: Cocoon
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Transform
+    noRot: true
+  - type: Damageable
+    damageModifierSet: Web
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.4,0.25,0.1"
+        density: 20
+        mask:
+        - SmallMobMask
+        layer:
+        - SmallMobLayer
+  - type: Physics
+    bodyType: Dynamic
+  - type: Pullable
+  - type: AntiRottingContainer
+  - type: ItemSlots
+    slots:
+      body_slot:
+        name: Body
+        locked: true
+        ejectOnBreak: true
+  - type: Butcherable
+    butcheringType: Knife
+    butcherDelay: 12
+    spawned:
+    - id: MaterialCloth1
+      amount: 1
+      prob: 0.5 #This doesn't cost hunger so should at least make it not worth it time-wise
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      body_slot: !type:ContainerSlot
+
+- type: entity
+  id: CocoonSmall
+  parent: CocoonedHumanoid
+  name: cocoon
+  description: What could be inside...?
+  placement:
+    mode: SnapgridCenter
+    snap:
+      - Wall
+  components:
+  - type: Sprite
+    layers:
+      - sprite: Nyanotrasen/Structures/cocoon.rsi
+        state: cocoon1
+        map: [ "enum.DamageStateVisualLayers.Base" ]
+  - type: RandomSprite
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          cocoon1: ""
+      - enum.DamageStateVisualLayers.Base: #your guess for why randomsprite requires an arbitrary layer is as good as mine friend
+          cocoon2: ""
+      - enum.DamageStateVisualLayers.Base:
+          cocoon3: ""
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/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 11ec7441b8e..3d5fde348ca 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -17,7 +17,7 @@
   access:
   - Research
   - Maintenance
-  - Mantis
+  - Mantis # DeltaV - Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
   special:
   - !type:AddComponentSpecial
     components:
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index a6a63b29526..ba5e5661f9f 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -30,7 +30,14 @@
     HeadTop:
       points: 1
       required: true
-      defaultMarkings: [ OniHornSingleCurved ]
+      defaultMarkings: [ OniHornDoubleCurved ]
+    HeadSide:
+      points: 1
+      required: false
+      defaultMarkings: [ PointyEarsUpwards ]
+    Snout:
+      points: 2
+      required: false
     Chest:
       points: 1
       required: false
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/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index e93c9c319da..59952784339 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -190,7 +190,7 @@
 
 - type: stealTargetGroup
   id: ClothingOuterHardsuitVoidParamed
-  name: paramedic void suit
+  name: paramedic hardsuit
   sprite:
     sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
     state: icon
diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml
index c5e893397a3..ab8ac25a4ad 100644
--- a/Resources/Prototypes/Palettes/departmental.yml
+++ b/Resources/Prototypes/Palettes/departmental.yml
@@ -1,4 +1,4 @@
-- type: palette
+- type: palette
   id: Departmental
   name: Departmental
   colors:
@@ -10,6 +10,7 @@
     bar: "#79150096"
     epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science
     logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo
+    justice: "#6b2833DD" #DeltaV - Added Justice Department
     janitor: "#8c347f96"
     chemistry: "#fa750096"
     virology: "#43990996"
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 12f5a80185a..e31087c309e 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -164,41 +164,95 @@
         conditions:
         - !type:ReagentThreshold
           min: 15
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
         damage:
           types:
             Poison: 1
-      # dwarves take less toxin damage and heal a marginal amount of brute
-      - !type:HealthChange
+      - !type:ChemVomit
+        probability: 0.04
         conditions:
         - !type:ReagentThreshold
-          min: 15
+          reagent: Ethanol
+          min: 12
+        # dwarves immune to vomiting from alcohol
         - !type:OrganType
           type: Dwarf
-        damage:
+          shouldHave: false
+      # Drunken Resilience
+      - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: LiquorLifeline
+        - !type:ReagentThreshold
+          reagent: Ethanol
+          min: 0.10
+          max: 0.49
+        damage:   # NOTE: all damage sets for LiquorLifeline are halved due to
+          groups: # LightweightDrunkComponent making ethanol half as potent
+            Brute: -0.4
           types:
-            Poison: 0.2
+            Heat: -0.13
+            Shock: -0.13
+            Cold: -0.13
       - !type:HealthChange
         conditions:
+        - !type:OrganType
+          type: LiquorLifeline
         - !type:ReagentThreshold
-          min: 15
+          reagent: Ethanol
+          min: 0.50
+          max: 6.99
+        damage:
+          groups:
+            Brute: -0.8
+          types:
+            Heat: -0.26
+            Shock: -0.26
+            Cold: -0.26
+      - !type:HealthChange
+        conditions:
         - !type:OrganType
-          type: Dwarf
+          type: LiquorLifeline
+        - !type:ReagentThreshold
+          reagent: Ethanol
+          min: 7.00
+          max: 10.99
         damage:
           groups:
-            Brute: -1
-      - !type:ChemVomit
-        probability: 0.04
+            Brute: -1.6
+          types:
+            Heat: -0.53
+            Shock: -0.53
+            Cold: -0.53
+      - !type:HealthChange
         conditions:
+        - !type:OrganType
+          type: LiquorLifeline
         - !type:ReagentThreshold
           reagent: Ethanol
-          min: 12
-        # dwarves immune to vomiting from alcohol
+          min: 11
+          max: 14.99
+        damage:
+          groups:
+            Brute: -3.2
+          types:
+            Heat: -1.06
+            Shock: -1.06
+            Cold: -1.06
+      - !type:HealthChange
+        conditions:
         - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+          type: LiquorLifeline
+        - !type:ReagentThreshold
+          reagent: Ethanol
+          min: 15 # Overdose threshold
+        damage:
+          groups:
+            Brute: -4.8
+            Burn: -4.8
+          types:
+            Heat: -1.60
+            Shock: -1.60
+            Cold: -1.60
       - !type:Drunk
         boozePower: 2
 
diff --git a/Resources/Prototypes/Reagents/Materials/prizeticket.yml b/Resources/Prototypes/Reagents/Materials/prizeticket.yml
new file mode 100644
index 00000000000..cde81626c84
--- /dev/null
+++ b/Resources/Prototypes/Reagents/Materials/prizeticket.yml
@@ -0,0 +1,6 @@
+- type: material
+  id: PrizeTicket
+  stackEntity: PrizeTicket1
+  name: prize ticket
+  icon: { sprite: Objects/Fun/prizeticket.rsi, state: ticket }
+  price: 0
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index 0c53ae10fd1..5c0cef314ca 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -23,6 +23,29 @@
           - !type:OrganType
             type: Human
             shouldHave: false
+      - !type:SatiateHunger
+        factor: 0.5
+        conditions:
+        - !type:OrganType
+          type: Vampiric
+      - !type:AdjustReagent
+        conditions:
+        - !type:OrganType
+          type: Vampiric
+        reagent: Water
+        amount: 0.15
+      - !type:AdjustReagent
+        conditions:
+        - !type:OrganType
+          type: Vampiric
+        reagent: Protein
+        amount: 0.15
+      - !type:AdjustReagent
+        conditions:
+        - !type:OrganType
+          type: Vampiric
+        reagent: Omnizine
+        amount: 0.2
     Food:
       effects:
         - !type:AdjustReagent
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml
new file mode 100644
index 00000000000..864d8f18d20
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml
@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: ClothingClothWrap
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: shoes
+          steps:
+          - material: Cloth
+            amount: 2
+            doAfter: 1
+    - node: shoes
+      entity: ClothingClothWrap
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shower.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shower.yml
new file mode 100644
index 00000000000..eb0618473b8
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shower.yml
@@ -0,0 +1,29 @@
+- type: constructionGraph
+  id: Shower
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: shower
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Steel
+              amount: 5
+              doAfter: 1
+    - node: shower
+      entity: Shower
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 5
+            - !type:EmptyAllContainers {}
+            - !type:DestroyEntity {}
+          conditions:
+            - !type:EntityAnchored
+              anchored: false
+          steps:
+            - tool: Welding
+              doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index f1eb270af73..54218d28226 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -96,3 +96,14 @@
   description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child.
   icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: cloth wraps
+  id: ClothingClothWrap
+  graph: ClothingClothWrap
+  startNode: start
+  targetNode: shoes
+  category: construction-category-clothing
+  description: A roll of treated canvas used for wrapping claws or paws.
+  icon: { sprite: Clothing/Shoes/Misc/clothWrap.rsi, state: icon }
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 5f7ec9c92d8..3ed0c9b9611 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -596,6 +596,24 @@
     - !type:TileNotBlocked
 
 #bathroom
+- type: construction
+  name: shower
+  id: Shower
+  graph: Shower
+  startNode: start
+  targetNode: shower
+  category: construction-category-furniture
+  description: A shower, complete with bluespace water.
+  icon:
+    sprite: Structures/Furniture/shower.rsi
+    state: shower
+    objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: toilet
   id: ToiletEmpty
@@ -732,7 +750,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsBlack
   name: black curtains
@@ -762,7 +780,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsCyan
   name: cyan curtains
@@ -777,7 +795,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsGreen
   name: green curtains
@@ -792,7 +810,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsOrange
   name: orange curtains
@@ -807,7 +825,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsPink
   name: pink curtains
@@ -822,7 +840,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsPurple
   name: purple curtains
@@ -837,7 +855,7 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: true
-    
+
 - type: construction
   id: CurtainsRed
   name: red curtains
diff --git a/Resources/Prototypes/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml
new file mode 100644
index 00000000000..e893c178358
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml
@@ -0,0 +1,729 @@
+- type: latheRecipe
+  id: PrizeBall
+  result: PrizeBall
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 30
+
+- type: latheRecipe
+  id: PlushieMothRandom
+  result: PlushieMothRandom
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieMothMusician
+  result: PlushieMothMusician
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieMothBartender
+  result: PlushieMothBartender
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieBee
+  result: PlushieBee
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieHampter
+  result: PlushieHampter
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieRouny
+  result: PlushieRouny
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieLamp
+  result: PlushieLamp
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieArachind
+  result: PlushieArachind
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieLizard
+  result: PlushieLizard
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieSpaceLizard
+  result: PlushieSpaceLizard
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieSharkBlue
+  result: PlushieSharkBlue
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieSharkPink
+  result: PlushieSharkPink
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieSharkGrey
+  result: PlushieSharkGrey
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCarp
+  result: PlushieCarp
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieMagicarp
+  result: PlushieMagicarp
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieHolocarp
+  result: PlushieHolocarp
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieSlime
+  result: PlushieSlime
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieSnake
+  result: PlushieSnake
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: ToyMouse
+  result: ToyMouse
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: ToyRubberDuck
+  result: ToyRubberDuck
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieVox
+  result: PlushieVox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieAtmosian
+  result: PlushieAtmosian
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushiePenguin
+  result: PlushiePenguin
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieHuman
+  result: PlushieHuman
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieArachne
+  result: PlushieArachne
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieGnome
+  result: PlushieGnome
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieLoveable
+  result: PlushieLoveable
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieDeer
+  result: PlushieDeer
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieIpc
+  result: PlushieIpc
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieGrey
+  result: PlushieGrey
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieRedFox
+  result: PlushieRedFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushiePurpleFox
+  result: PlushiePurpleFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushiePinkFox
+  result: PlushiePinkFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieOrangeFox
+  result: PlushieOrangeFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieMarbleFox
+  result: PlushieMarbleFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCrimsonFox
+  result: PlushieCrimsonFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCoffeeFox
+  result: PlushieCoffeeFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieBlueFox
+  result: PlushieBlueFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieBlackFox
+  result: PlushieBlackFox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieVulp
+  result: PlushieVulp
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCorgi
+  result: PlushieCorgi
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieGirlyCorgi
+  result: PlushieGirlyCorgi
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieRobotCorgi
+  result: PlushieRobotCorgi
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatBlack
+  result: PlushieCatBlack
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatGrey
+  result: PlushieCatGrey
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatOrange
+  result: PlushieCatOrange
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatSiames
+  result: PlushieCatSiames
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatTabby
+  result: PlushieCatTabby
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatTuxedo
+  result: PlushieCatTuxedo
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieCatWhite
+  result: PlushieCatWhite
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: ToyAi
+  result: ToyAi
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 30
+
+- type: latheRecipe
+  id: ToyIan
+  result: ToyIan
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 30
+
+- type: latheRecipe
+  id: BalloonNT
+  result: BalloonNT
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 30
+
+- type: latheRecipe
+  id: BalloonCorgi
+  result: BalloonCorgi
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 30
+
+- type: latheRecipe
+  id: CrayonBox
+  result: CrayonBox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 20
+
+- type: latheRecipe
+  id: PetRockCarrier
+  result: PetRockCarrier
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 50
+
+- type: latheRecipe
+  id: PlushieXeno
+  result: PlushieXeno
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: FoamCrossbow
+  result: FoamCrossbow
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: RevolverCapGun
+  result: RevolverCapGun
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PonderingOrb
+  result: PonderingOrb
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: ToyAmongPequeno
+  result: ToyAmongPequeno
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: FoamCutlass
+  result: FoamCutlass
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: ToyHammer
+  result: ToyHammer
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: WhoopieCushion
+  result: WhoopieCushion
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlasticBanana
+  result: PlasticBanana
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: WeaponWaterPistol
+  result: WeaponWaterPistol
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: WeaponWaterBlaster
+  result: WeaponWaterBlaster
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: NewtonCradle
+  result: NewtonCradle
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: SnapPopBox
+  result: SnapPopBox
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: MrDips
+  result: MrDips
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: MrChips
+  result: MrChips
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: CrazyGlue
+  result: CrazyGlue
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieRatvar
+  result: PlushieRatvar
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+- type: latheRecipe
+  id: PlushieNar
+  result: PlushieNar
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 80
+
+# EMAG
+
+- type: latheRecipe
+  id: PlushieGhost
+  result: PlushieGhost
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieRGBee
+  result: PlushieRGBee
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieRainbowCarp
+  result: PlushieRainbowCarp
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieJester
+  result: PlushieJester
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieSlips
+  result: PlushieSlips
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieTrystan
+  result: PlushieTrystan
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieAbductor
+  result: PlushieAbductor
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieAbductorAgent
+  result: PlushieAbductorAgent
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: PlushieNuke
+  result: PlushieNuke
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: ToyNuke
+  result: ToyNuke
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: FoamBlade
+  result: FoamBlade
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 150
+
+- type: latheRecipe
+  id: BalloonSyn
+  result: BalloonSyn
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 100
+
+- type: latheRecipe
+  id: SingularityToy
+  result: SingularityToy
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 150
+
+- type: latheRecipe
+  id: TeslaToy
+  result: TeslaToy
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 150
+
+- type: latheRecipe
+  id: ToySword
+  result: ToySword
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 200
+
+- type: latheRecipe
+  id: ThronglerToy
+  result: ThronglerToy
+  applyMaterialDiscount: false
+  completetime: 0.1
+  materials:
+    PrizeTicket: 500
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index f42e2851c78..bf6f479703e 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -612,3 +612,27 @@
     Steel: 250
     Glass: 250
     Plastic: 250
+
+- type: latheRecipe
+  id: BorgModulePka
+  result: BorgModulePka
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 1000
+    Glass: 500
+    Plastic: 500
+    Silver: 100
+
+- type: latheRecipe
+  id: BorgModuleJetpack
+  result: BorgModuleJetpack
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+    Gold: 100
+    Plasma: 1000
+
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index edcc9c66364..33377f52520 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -179,6 +179,19 @@
     - BorgModuleAdvancedTool
     - BorgModuleRCD
 
+- type: technology
+  id: MechanizedSalvaging
+  name: research-technology-mechanized-salvaging
+  icon:
+    sprite: Mobs/Silicon/chassis.rsi
+    state: miner
+  discipline: Industrial
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - BorgModulePka
+  - BorgModuleJetpack
+
 # Tier 3
 
 - type: technology
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 4a3ff4309b8..42c901d938a 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -39,4 +39,4 @@
   - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement
     department: Command
     min: 14400 # Floofstation - 4 hours
-  - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+  - !type:CharacterWhitelistRequirement
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 087479abd31..b7e3cc22233 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -6,7 +6,7 @@
   antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access
   startingGear: LawyerGear
   icon: "JobIconLawyer"
-  supervisors: job-supervisors-hop
+  supervisors: job-supervisors-cj  # Delta V - Change supervisor to chief justice
   access:
   - Service
   - Lawyer
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/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index bd0d7d2ad4a..50ea396219d 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -10,6 +10,10 @@
   - Medical
   - Chemistry
   - Maintenance
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: CPRTraining
 
 - type: startingGear
   id: ChemistGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 02f399ee8db..39b3dca3569 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -36,6 +36,7 @@
     components:
     - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic.
       flatBonus: 0.025
+    - type: CPRTraining
 
 - type: startingGear
   id: CMOGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index b51337e89c7..0946b6ba200 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -12,6 +12,10 @@
   extendedAccess:
   - Chemistry
   - Paramedic # DeltaV - Add Paramedic access
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: CPRTraining
 
 - type: startingGear
   id: DoctorGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index affad1827e9..983712d3a9b 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -10,6 +10,10 @@
   access:
   - Medical
   - Maintenance
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: CPRTraining
 
 - type: startingGear
   id: MedicalInternGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 69f90741c98..18ecce1cc12 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -14,6 +14,10 @@
   - Paramedic # DeltaV - Add Paramedic access
   extendedAccess:
   - Chemistry
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: CPRTraining
 
 - type: startingGear
   id: ParamedicGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
index 4cca9e57bc1..2ab0726baab 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -15,6 +15,10 @@
   - Medical
   - Maintenance
   - Chemistry
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: CPRTraining
 
 - type: startingGear
   id: SeniorPhysicianGear
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index e6de7e4cac3..870fd2fcd34 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 - 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/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 83534425097..1609969f7e6 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -23,7 +23,7 @@
   - Clown
   - HeadOfPersonnel
   - Janitor
-  - Lawyer
+  # - Lawyer # DeltaV - Move Lawyer into Justice
   - Librarian
   - Mime
   - Musician
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index 35b92357702..27043cfbfe4 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -37,12 +37,18 @@
 - type: playTimeTracker
   id: JobChiefEngineer
 
+- type: playTimeTracker
+  id: JobChiefJustice
+
 - type: playTimeTracker
   id: JobChiefMedicalOfficer
 
 - type: playTimeTracker
   id: JobClown
 
+- type: playTimeTracker
+  id: JobClerk
+
 - type: playTimeTracker
   id: JobDetective
 
@@ -100,6 +106,9 @@
 - type: playTimeTracker
   id: JobPsychologist
 
+- type: playTimeTracker
+  id: JobProsecutor
+
 - type: playTimeTracker
   id: JobQuartermaster
 
diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml
new file mode 100644
index 00000000000..bd73f2fb8a8
--- /dev/null
+++ b/Resources/Prototypes/Species/arachne.yml
@@ -0,0 +1,50 @@
+- type: species
+  id: Arachne
+  name: species-name-arachne
+  roundStart: false
+  prototype: MobArachne
+  sprites: MobArachneSprites
+  markingLimits: MobArachneMarkingLimits
+  dollPrototype: MobArachneDummy
+  skinColoration: HumanToned
+  sexes:
+    - Female
+  minAge: 60
+  youngAge: 150
+  oldAge: 400
+  maxAge: 666
+
+- type: markingPoints
+  id: MobArachneMarkingLimits
+  points:
+    Hair:
+      points: 1
+      required: false
+    Tail:
+      points: 1
+      required: false
+    Chest:
+      points: 1
+      required: false
+    Arms:
+      points: 2
+      required: false
+
+
+- type: speciesBaseSprites
+  id: MobArachneSprites
+  sprites:
+    Head: MobHumanHead
+    Hair: MobHumanoidAnyMarking
+    Chest: MobHumanTorso
+    Eyes: MobArachneEyes
+    LArm: MobHumanLArm
+    RArm: MobHumanRArm
+    LHand: MobHumanLHand
+    RHand: MobHumanRHand
+
+- type: humanoidBaseSprite
+  id: MobArachneEyes
+  baseSprite:
+    sprite: Mobs/Species/eyes.rsi
+    state: eyes
diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
index 49f8839cac3..99ec35da2e1 100644
--- a/Resources/Prototypes/Species/human.yml
+++ b/Resources/Prototypes/Species/human.yml
@@ -33,6 +33,7 @@
     RFoot: MobHumanRFoot
     Tail: MobHumanoidAnyMarking # Nyanotrasen - Felinid
     HeadTop: MobHumanoidAnyMarking # Nyanotrasen - Felinid & Oni
+    HeadSide: MobHumanoidAnyMarking
 
 - type: markingPoints
   id: MobHumanMarkingLimits
diff --git a/Resources/Prototypes/Stacks/prizeticket.yml b/Resources/Prototypes/Stacks/prizeticket.yml
new file mode 100644
index 00000000000..1b84c81632c
--- /dev/null
+++ b/Resources/Prototypes/Stacks/prizeticket.yml
@@ -0,0 +1,7 @@
+- type: stack
+  id: PrizeTicket
+  name: prize ticket
+  icon: { sprite: Objects/Fun/prizeticket.rsi, state: ticket }
+  spawn: PrizeTicket1
+  maxCount: 100
+  itemSize: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index 30c677dd2c9..96ad930bd51 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -121,8 +121,8 @@
   parent: JobIcon
   id: JobIconLawyer
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: Lawyer
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice
+    state: Lawyer # DeltaV - Move Lawyer into Justice
 
 - type: statusIcon
   parent: JobIcon
diff --git a/Resources/Prototypes/Traits/Misc/singer_types.yml b/Resources/Prototypes/Traits/Misc/singer_types.yml
new file mode 100644
index 00000000000..28e4712ee99
--- /dev/null
+++ b/Resources/Prototypes/Traits/Misc/singer_types.yml
@@ -0,0 +1,26 @@
+- type: SingerInstrument
+  id: HarpySinger
+  instrumentList:
+    "Voice": {52: 0}
+    "Trumpet": {56: 0}
+    "Electric": {27: 0}
+    "Bass": {33: 0}
+    "Rock": {29: 0}
+    "Acoustic": {24: 0}
+    "Flute": {73: 0}
+    "Sax": {66: 0}
+  defaultInstrument: "Voice"
+  midiUi:
+    key: enum.InstrumentUiKey.Key
+    type: InstrumentBoundUserInterface
+  midiActionId: ActionHarpyPlayMidi
+
+- type: SingerInstrument
+  id: NormalSinger
+  instrumentList:
+    "Voice": {52: 0}
+  defaultInstrument: "Voice"
+  midiUi:
+    key: enum.InstrumentUiKey.Key
+    type: InstrumentBoundUserInterface
+  midiActionId: ActionHarpyPlayMidi # TODO: custom action maybe?
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/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index eb96d37e01a..ca2453e41a1 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -94,3 +94,80 @@
         - MedicalBorg
   components:
     - type: Snoring
+
+- type: trait
+  id: Sluggish
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ParkourTraining
+        - SnailPaced
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Diona
+  components:
+    - type: TraitSpeedModifier
+      sprintModifier: 0.85
+      walkModifier: 0.85
+    - type: ClimbDelayModifier
+      climbDelayMultiplier: 1.35
+    - type: LayingDownModifier
+      layingDownCooldownMultiplier: 1.2
+
+- type: trait
+  id: SnailPaced
+  category: Physical
+  points: 2
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ParkourTraining
+        - Sluggish
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Diona
+  components:
+    - type: TraitSpeedModifier
+      sprintModifier: 0.7
+      walkModifier: 0.7
+    - type: ClimbDelayModifier
+      climbDelayMultiplier: 1.66
+    - type: LayingDownModifier
+      layingDownCooldownMultiplier: 1.6
+
+- type: trait
+  id: BloodDeficiency
+  category: Physical
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+  components:
+    - type: BloodDeficiency  # 0.07 = start taking bloodloss damage at around ~21.4 minutes,
+      bloodLossAmount: 0.07  # then become crit ~10 minutes later
+
+- type: trait
+  id: Hemophilia
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+  components:
+    - type: Hemophilia
+      bleedReductionModifier: 0.5
+      damageModifiers:
+        coefficients:
+          Blunt: 1.1
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
index 2dcc30cd97c..5e1e4e4b3f8 100644
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -1,4 +1,4 @@
-- type: trait
+- type: trait
   id: LightweightDrunk
   category: Physical
   requirements:
@@ -11,6 +11,11 @@
       inverted: true
       traits:
         - HeavyweightDrunk
+        - LiquorLifeline
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Dwarf
   components:
     - type: LightweightDrunk
       boozeStrengthMultiplier: 2
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
new file mode 100644
index 00000000000..85d074ffe95
--- /dev/null
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -0,0 +1,208 @@
+- type: trait
+  id: WillToLive
+  category: Physical
+  points: -2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - WillToDie
+  components:
+    - type: DeadModifier
+      deadThresholdModifier: 10
+
+- type: trait
+  id: WillToDie
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - WillToLive
+  components:
+    - type: DeadModifier
+      deadThresholdModifier: -15
+
+- type: trait
+  id: Tenacity
+  category: Physical
+  points: -2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - GlassJaw
+  components:
+    - type: CritModifier
+      critThresholdModifier: 5
+
+- type: trait
+  id: GlassJaw
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Tenacity
+  components:
+    - type: CritModifier
+      critThresholdModifier: -10
+
+- type: trait
+  id: Vigor
+  category: Physical
+  points: -3
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Lethargy
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Oni
+  components:
+    - type: StaminaCritModifier
+      critThresholdModifier: 10
+
+- type: trait
+  id: Lethargy
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Vigor
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Felinid
+  components:
+    - type: StaminaCritModifier
+      critThresholdModifier: -15
+
+- type: trait
+  id: HighAdrenaline
+  category: Physical
+  points: -3
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - AdrenalDysfunction
+  components:
+    - type: Adrenaline
+      rangeModifier: 0.4
+      inverse: true
+
+- type: trait
+  id: AdrenalDysfunction
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - HighAdrenaline
+  components:
+    - type: Adrenaline
+      rangeModifier: 0.8
+
+- type: trait
+  id: Masochism
+  category: Physical
+  points: -3
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - LowPainTolerance
+  components:
+    - type: PainTolerance
+      rangeModifier: 0.4
+      inverse: true
+
+- type: trait
+  id: LowPainTolerance
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Masochism
+  components:
+    - type: PainTolerance
+      rangeModifier: 0.6
+
+- type: trait
+  id: MartialArtist
+  category: Physical
+  points: -2
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+      - Borg
+      - MedicalBorg
+      - Boxer
+  components:
+    - type: Boxer
+      modifiers:
+        coefficients:
+          Blunt: 1.5
+          Slash: 1.5
+          Piercing: 1.5
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/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index 16b628a56d8..7856a68ab34 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -1,7 +1,65 @@
+- type: trait
+  id: CPRTraining
+  category: Mental
+  points: -2
+  components:
+    - type: CPRTraining
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - MedicalIntern
+        - Paramedic
+        - ChiefMedicalOfficer
+        - Brigmedic
+
+- type: trait
+  id: SelfAware
+  category: Mental
+  points: -2
+  components:
+    - type: SelfAware
+      analyzableTypes:
+      - Blunt
+      - Slash
+      - Piercing
+      - Heat
+      - Shock
+      - Cold
+      - Caustic
+      detectableGroups:
+      - Airloss
+      - Toxin
+
 - type: trait
   id: HeavyweightDrunk
   category: Physical
-  points: -2
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - LightweightDrunk
+        - LiquorLifeline
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Dwarf
+  components:
+    - type: LightweightDrunk
+      boozeStrengthMultiplier: 0.5
+
+- type: trait
+  id: LiquorLifeline
+  category: Physical
+  points: -3
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
@@ -12,7 +70,13 @@
       inverted: true
       traits:
         - LightweightDrunk
+        - HeavyweightDrunk
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Dwarf
   components:
+    - type: LiquorLifeline
     - type: LightweightDrunk
       boozeStrengthMultiplier: 0.5
 
@@ -51,6 +115,32 @@
     - type: ConsumeDelayModifier
       foodDelayMultiplier: 0.5
       drinkDelayMultiplier: 0.5
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Vulpkanin
+
+- type: trait
+  id: ParkourTraining
+  category: Physical
+  points: -3
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Sluggish
+        - SnailPaced
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Diona
+  components:
+    - type: ClimbDelayModifier
+      climbDelayMultiplier: 0.70
+    - type: LayingDownModifier
+      layingDownCooldownMultiplier: 0.8
+      downedSpeedMultiplierMultiplier: 1.25
 
 - type: trait
   id: LightStep
@@ -65,3 +155,16 @@
       inverted: true
       species:
         - Felinid
+
+- type: trait
+  id: Singer
+  category: Auditory
+  points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Harpy
+  components:
+    - type: Singer
+      proto: NormalSinger
diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml
new file mode 100644
index 00000000000..2c298252289
--- /dev/null
+++ b/Resources/Prototypes/Traits/species.yml
@@ -0,0 +1,62 @@
+- type: trait
+  id: Swashbuckler
+  category: Physical
+  points: -1
+  components:
+  - type: OniDamageModifier
+    modifiers:
+      coefficients:
+        Blunt: 1.2
+        Slash: 1.35
+        Piercing: 1.2
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species:
+        - Oni
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Spearmaster
+        - WeaponsGeneralist
+
+- type: trait
+  id: Spearmaster
+  category: Physical
+  points: -1
+  components:
+  - type: OniDamageModifier
+    modifiers:
+      coefficients:
+        Blunt: 1.2
+        Slash: 1.2
+        Piercing: 1.35
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species:
+        - Oni
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Swashbuckler
+        - WeaponsGeneralist
+
+- type: trait
+  id: WeaponsGeneralist
+  category: Physical
+  points: -1
+  components:
+  - type: OniDamageModifier
+    modifiers:
+      coefficients:
+        Blunt: 1.25
+        Slash: 1.25
+        Piercing: 1.25
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species:
+        - Oni
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Swashbuckler
+        - Spearmaster
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index 9879cefb75d..3f0a4c10fce 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -1,4 +1,4 @@
-- type: speechVerb
+- type: speechVerb
   id: Default
   name: chat-speech-verb-name-default
   speechVerbStrings:
@@ -94,6 +94,15 @@
   - chat-speech-verb-vox-2
   - chat-speech-verb-vox-3
 
+- type: speechVerb
+  id: Oni
+  name: chat-speech-verb-name-oni
+  speechVerbStrings:
+  - chat-speech-verb-oni-1
+  - chat-speech-verb-oni-2
+  - chat-speech-verb-oni-3
+  - chat-speech-verb-oni-4
+
 - type: speechVerb
   id: Plant
   name: chat-speech-verb-name-plant
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index f0de473f3c7..50e1d69c791 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -16,6 +16,9 @@
 - type: Tag
   id: AppraisalTool
 
+- type: Tag
+  id: ArachneWeb
+
 - type: Tag
   id: ArtifactFragment
 
@@ -602,6 +605,9 @@
 - type: Tag
   id: Fruit
 
+- type: Tag
+  id: FullBodyOuter
+
 - type: Tag
   id: Galaxythistle
 
@@ -698,6 +704,9 @@
 - type: Tag
   id: HidesNose # for non-standard noses.
 
+- type: Tag
+  id: HidesBeard # for full coverage helmet / masks where beard shouldn't show
+
 - type: Tag
   id: HighRiskItem
 
@@ -922,6 +931,9 @@
 - type: Tag
   id: Ointment
 
+- type: Tag
+  id: Oneirophage
+
 - type: Tag
   id: Ore
 
@@ -1024,6 +1036,9 @@
 - type: Tag
   id: PrisonUniform
 
+- type: Tag
+  id: PrizeTicket
+
 - type: Tag
   id: ProximitySensor
 
diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml
index 7271770ef50..7e8c92787fe 100644
--- a/Resources/Prototypes/typing_indicator.yml
+++ b/Resources/Prototypes/typing_indicator.yml
@@ -48,3 +48,8 @@
   id: slime
   typingState: slime0
   offset: 0, 0.125
+
+- type: typingIndicator
+  id: oni
+  typingState: oni0
+  offset: 0, 0.0625
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>
diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt
index a0db2163061..ca95d2166fb 100644
--- a/Resources/ServerInfo/Rules.txt
+++ b/Resources/ServerInfo/Rules.txt
@@ -1,7 +1,7 @@
-[color=#ff0000]WARNING: You MUST be at least 18 years of age to play on Floof Station.[/color] 
+[color=#ff0000]WARNING: You MUST be at least 18 years of age to play on Floof Station.[/color]
 [color=#ff0000]Any user suspected of being under the age of 18 WILL be removed until they are of age.[/color]
 
-[color=#ffff00]Intentionally disconnecting, responding with hostility, or refusing to respond when an admin privately messages you in-game will be met with an appeal-only ban. Additionally, abusing the AHelp relay by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), using it as a chatroom, or sending messages of no substance will result in your removal.[/color] 
+[color=#ffff00]Intentionally disconnecting, responding with hostility, or refusing to respond when an admin privately messages you in-game will be met with an appeal-only ban. Additionally, abusing the AHelp relay by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), using it as a chatroom, or sending messages of no substance will result in your removal.[/color]
 [color=#ffff00]All AHelp messages are relayed to the Floof Station Discord.[/color]
 
 [color=#ffff00]The usage of any third-party applications/scripts/client modifications or any other applicable software to gain an advantage, avoid intended game/server mechanics, or to harm server infrastructure is strictlyprohibited, as is the abuse of glitches, exploits and bugs. Any and all instances of this will be met with an appeal-only ban.[/color]
@@ -19,14 +19,14 @@ Any extended discussion regarding interpretation of the rules should be avoided
 
 [color=#ffff00]2.[/color] Floof Station is an English-based community; use English as your primary method of communication within the game.
 
-[color=#ffff00]3.[/color] Erotic Roleplay (ERP), erotic content, and 18+ sexual content are allowed, so long that all parties involved consent to it. 
+[color=#ffff00]3.[/color] Erotic Roleplay (ERP), erotic content, and 18+ sexual content are allowed, so long that all parties involved consent to it.
 For more information about this, consult the ERP guidelines and rules in the Game Server Rules section at point 8.
 
 [color=#ffff00]4. Be civil:[/color]
 [color=#a4885c]4.1[/color] Do not spam or advertise in our server.
 [color=#a4885c]4.2[/color] Do not flame and do not be toxic.
-[color=#a4885c]4.3[/color] Be polite and respectful towards other members, and avoid making others uneasy or uncomfortable.  
-[color=#a4885c]4.4[/color] DO NOT BE AN ASSHOLE. Do not intentionally make the round worse for other people for your own amusement. 
+[color=#a4885c]4.3[/color] Be polite and respectful towards other members, and avoid making others uneasy or uncomfortable.
+[color=#a4885c]4.4[/color] DO NOT BE AN ASSHOLE. Do not intentionally make the round worse for other people for your own amusement.
 For example: repeatedly and persistently harassing a character, being an intense nuisance to the quiet of the station, or causing substantial damage through vandalism.
 [color=#a4885c]4.5[/color] We have a zero tolerance policy for any form of bigotry, discrimination, toxicity, and harassment. Failure to comply with this rule will result in community removal.
 Slurs and terms used to mock or denigrate players or their in-game characters in a discriminatory, hateful manner, are also strictly prohibited.
@@ -41,7 +41,7 @@ Slurs and terms used to mock or denigrate players or their in-game characters in
 Lack of administrator response does not constitute approval.
 [color=#a4885c]1.4[/color] Clowns, Mimes, and other "prankster" roles do not get an exemption from the above, and should NOT use their job as an excuse to be a major disturbance.
 [color=#a4885c]1.5[/color] AFK (a.k.a. SSD) and catatonic players are considered to have the same rights as any other crewmate.
-[color=#a4885c]1.6[/color] If a player is dead and catatonic (not SSD), they are not required to be revived and should be stored in the morgue. 
+[color=#a4885c]1.6[/color] If a player is dead and catatonic (not SSD), they are not required to be revived and should be stored in the morgue.
 [color=#a4885c]1.7[/color] You should not biomass grind dead and catatonic crew, unless the body belongs to a person who got cloned (thus, recycling is allowed), or during an emergency.
 [color=#a4885c]1.8[/color] If a player is alive and catatonic, they may be brought to their relevant department or cryostorage as necessary.
 [color=#a4885c]1.9[/color] For the sake of privacy and respect towards the other members of the community, by reason of the nature of the server, and by motive of potential metagaming, livestreaming rounds is strictly forbidden.
@@ -75,12 +75,12 @@ However, it is still forbidden to break any rule on the basis of friendships and
 [color=#a4885c]5.1[/color] Your character is a separate entity from you, the player. Your character's actions, feelings, and knowledge in-game should be based solely on the character's experiences rather than your own as the player.
 [color=#a4885c]5.2[/color] Do not escalate situations needlessly. Very few things are deserving of a fight to the death, or the loss of life of somebody. Brawls and self defense are permitted, but do NOT put someone in critical state without a VERY valid reason to it (roleplay-based or not).
 [color=#a4885c]5.3[/color] If a fight results in someone being critically injured, seek medical help for them - and if they die, do not destroy or otherwise hide their body. This falls under self-antagonistic behavior.
-[color=#a4885c]5.4[/color] Do NOT grief, attack or kill crew-aligned ghost roles such as familiars or station pets without a valid motive or provocation. Pest ghost roles such as mice however, are always fair game for attacking. 
+[color=#a4885c]5.4[/color] Do NOT grief, attack or kill crew-aligned ghost roles such as familiars or station pets without a valid motive or provocation. Pest ghost roles such as mice however, are always fair game for attacking.
 [color=#a4885c]5.5[/color] Some awakened pest roles (e.g. sentient mothroach) may be considered crew pets and fall under this rule.
 [color=#a4885c]5.6[/color] Respect other people's consent, dignity and boundaries. If somebody asks you to stop bothering  them LOOC, do so. If someone keeps bothering you despite telling them off LOOC, please AHelp it.
 [color=#a4885c]5.7[/color] Non-security personnel should not seek to kill or detain unrelated threats, unless they themselves or other crew in the direct vicinity are in current, immediate danger from it. Crew may neutralize threats when they present themselves or if they are relevant to the crew member in question, but are not to pursue them if and once routed from their current area.
 [color=#a4885c]5.8[/color] Certain severe emergencies or antagonist roles allow for normal crew to actively defend station and attempt to kill or subdue the antagonist. Such as: nuclear operatives, a zombie outbreak, a space dragon attack, or any other critical situation (such as all Command or/and Security being dead) requiring the crew to take matters in their own hands.
-[color=#a4885c]5.9[/color] By picking the prisoner role, you have chosen to roleplay as a prisoner, NOT an antagonist, and should not act so in any capacity. While you may be allowed to escape, you must receive admin approval to do so, and ideally you should only seek to do so with excellent reasoning and roleplay (e.g. abusive security personnel or badly damaged permanent brig). 
+[color=#a4885c]5.9[/color] By picking the prisoner role, you have chosen to roleplay as a prisoner, NOT an antagonist, and should not act so in any capacity. While you may be allowed to escape, you must receive admin approval to do so, and ideally you should only seek to do so with excellent reasoning and roleplay (e.g. abusive security personnel or badly damaged permanent brig).
 Lack of administrator response does not constitute approval.
 [color=#a4885c]5.10[/color] Try to avoid engaging in public roleplay (both verbal or/and in action) that may make other people overly uneasy or uncomfortable, unless you got very valid gameplay or roleplay reasons to it. Public meant as in: any radio channel (including the telepath channel), out loud speech or overt actions in actual public physical locations, or doing so on camera.
 While it may make sometimes for amazing roleplay, not everybody may have the sensitivity to be able to hear your character recanting some dark, depressing tale or to see them doing something inherently twisted or disturbing. You can find more on this in the ERP Rules and Guidelines section.
@@ -91,7 +91,7 @@ While it may make sometimes for amazing roleplay, not everybody may have the sen
 [color=#a4885c]6.3[/color] Manufacturing weapons, bombs, or deadly poisons before you know of any reason you would need them for (or without an excellent roleplay reason to it) is powergaming behavior.
 [color=#a4885c]6.4[/color] Hiding Traitor objective items, or preemptively securing them with higher security than usually required or than would make logical sense, violates our powergaming and roleplay guidelines.
 [color=#a4885c]6.5[/color] Do NOT, under any circumstances, hide the nuclear fission explosive, authentication disk, or other sensitive items in an impossible to see/access location.
-[color=#a4885c]6.6[/color] While it is allowed for the crew to know the details around the various antagonist functions (traitor items being such, PDAs having uplinks, listening posts existing, etc.), Security is strictly forbidden from acting on that information without valid reason and suspicion, and it is always to presume innocence until proven guilty. 
+[color=#a4885c]6.6[/color] While it is allowed for the crew to know the details around the various antagonist functions (traitor items being such, PDAs having uplinks, listening posts existing, etc.), Security is strictly forbidden from acting on that information without valid reason and suspicion, and it is always to presume innocence until proven guilty.
 For example, it is to be avoided to check PDAs, implants and headsets unless the person is strongly suspected to be a syndicate agent, and there is evidence to back this up.
 
 [color=#ffff00]7. Follow end-of-round (EOR) rules:[/color]
@@ -102,7 +102,7 @@ For example, it is to be avoided to check PDAs, implants and headsets unless the
 [color=#a4885c]8.1[/color] Be very mindful of In Character and Out of Character consent, as they are NOT the same thing. Whilst a player may agree for their character to be subjected to a nonconsensual act, engaging in ERP with someone against their OOC consent is strictly forbidden. This applies both to actual player characters, and ghost role characters, people and creatures.
 If your OOC consent is not respected, immediately contact an administrator or moderator.
 [color=#a4885c]8.2[/color] Extreme acts such as killing, severely maiming, nonconning, abuse, or even round removal are allowed, so long that all the participants consented OOC.
-Ideally, if this is done with IC consent, have a form signed by all parties involved, where you state consent to the action, and have it stamped by a lawyer or the HoP. 
+Ideally, if this is done with IC consent, have a form signed by all parties involved, where you state consent to the action, and have it stamped by a lawyer or the HoP.
 [color=#a4885c]8.3[/color] Keep in mind that by performing actions without IC consent (or actions that go against space law), you are not immune to and will be opening yourself to IC punishment. Expect to be potentially apprehended, prosecuted and sentenced to the full extent of the law, if found to have committed the crime you did.
 [color=#a4885c]8.4[/color] Try to make ABUNDANTLY clear in your consent menu essential information such as whether you are interested in ERP or not, your limits and preferences, your OOC stance on nonconsensual acts towards your character, your OOC or/and IC stance on extreme acts such as death or maiming, and so on so forth.
 [color=#a4885c]8.5[/color] DO NOT use ERP as bait, unless done with OOC consent of all parties involved. Much as it would be very believable and make for some amazing roleplay for an Agent to try and seduce a target into the bedroom to then murder them in cold blood on the spot or kidnap them, priority is given to the fun, comfort and enjoyment of all players.
@@ -113,22 +113,25 @@ To be more specific, this meaning: do not go missing from minute one, not even b
 However, so long it is roleplayed well enough and there is no immediate urgency, leeway is given (so long you are ready to face the IC consequences to this). Much larger leeway is given during Extended and Greenshift rounds, due to their nature of being meant specifically for people to relax and get off.
 [color=#a4885c]8.7[/color] Do not spam or pollute radio channels (including the telepath channel) with smut. Mind you, this does NOT mean that you are not allowed to speak or discuss of such. Just, that it should not become a cringy spamfest of people shitposting/hornyposting.
 Or in other words: try not to turn them into the equivalent of a bathroom stall. Have at least a minimum bit of decency and respect towards other people.
-[color=#a4885c]8.8[/color] Do not go overboard with hornyposting about a specific person, if said person does not have access to the channel they are being spoken about in, and if you don't have OOC consent from said person to do so. 
+[color=#a4885c]8.8[/color] Do not go overboard with hornyposting about a specific person, if said person does not have access to the channel they are being spoken about in, and if you don't have OOC consent from said person to do so.
 Pushing it too far, can easily result in what is effectively sexual harassment, and be something very degradading, objectifying and humiliating to the person.
-[color=#a4885c]8.9[/color] Do not engage in nor discuss of particularly extreme or out there sexual fetishes in public. Public meant as in: any radio channel (including the telepath channel), out loud speech or overt actions in actual public physical locations, or doing so on camera. 
+[color=#a4885c]8.9[/color] Do not engage in nor discuss of particularly extreme or out there sexual fetishes in public. Public meant as in: any radio channel (including the telepath channel), out loud speech or overt actions in actual public physical locations, or doing so on camera.
 What you like to do in the privacy of your bedroom is your business and prerogative. But do not force other people into having to witness or hear of something exceptionally outrageous that would turn the stomach of any ordinary person, or at the very least make them extremely uncomfortable.
 Or in other words: respect other people's boundaries and tastes.
-[color=#a4885c]8.10[/color] On the other hand, do not kinkshame somebody for something that they might be into, no matter how extreme. Unless of course, they are into being kinkshamed, or you are doing so in a playful, jokey, friendly manner for banter. 
+[color=#a4885c]8.10[/color] On the other hand, do not kinkshame somebody for something that they might be into, no matter how extreme. Unless of course, they are into being kinkshamed, or you are doing so in a playful, jokey, friendly manner for banter.
 Again, respect other people's boundaries and tastes.
 [color=#a4885c]8.11[/color] Use the subtle - command if you are engaging in ERP involving extreme kinks. The regular emote * action can be heard through walls. While this normally does not pose a major issue, unless you mind your privacy, it can become one if you are potentially exposing passerbys to your very unusual, outlandish fetishes.
 [color=#a4885c]8.12[/color] Roleplaying a character as underage is strictly forbidden. So is talk of such activities.
 [color=#a4885c]8.13[/color] Engaging in ERP with a feral, nonsentient creature (this meaning: one that is not being player controlled), is forbidden. So is talk of such activities.
 
-[color=#ff0000]Command, Security, and Antagonist Rules:[/color]
+[color=#a4885c]11.[/color] Psionics
+    - Players that have psionic powers are allowed to use them at-will to accomplish their roleplay goals. It should be noted that in-character consequences can happen as a result of their use, including being stripped of psionic powers or even death.
+    - As a mantis, it is not your goal to hunt down psionics. Do not mindbreak others against their will solely because they have psionic powers.
 
+[color=#ff0000]Command, Security, and Antagonist Rules:[/color]
 [color=#ffff00]1. Follow Command and Security Guidelines:[/color]
-[color=#a4885c]1.1[/color] Security and Command roles are expected to know and perform their jobs to the best of their ability, and to have extensive knowledge in regards to the duties, management and operations of their departments. These roles often heavily impact the round and require careful and conscientious roleplay. 
-As such, their roleplay quality is held to a much higher standard, especially in the event a player was to play a character in such a role committing a crime or being disruptive. 
+[color=#a4885c]1.1[/color] Security and Command roles are expected to know and perform their jobs to the best of their ability, and to have extensive knowledge in regards to the duties, management and operations of their departments. These roles often heavily impact the round and require careful and conscientious roleplay.
+As such, their roleplay quality is held to a much higher standard, especially in the event a player was to play a character in such a role committing a crime or being disruptive.
 If you cannot meet these requirements, do NOT take these roles.
 [color=#a4885c]1.2[/color] Both Security and Command are required to read and follow Floof Station Space Law, Standard Operating Procedure, Alert Procedure, and Company Policy to the best of their ability.
 [color=#a4885c]1.3[/color] Abusing your position or using it to make arbitrary or obviously malicious choices to the detriment of the entire station and/or its inhabitants is prohibited, without beyond excellent roleplay reason to it, and especially without administrator permission.
@@ -146,11 +149,11 @@ The criminal should always be tried first, and executed or/and given a DNR order
 [color=#a4885c]1.14[/color] Do not mindbreak others against their will solely because they have psionic powers. Only do so when the individual is either a proven antagonist (and even then, it is strongly encouraged not to do so unless absolutely necessary, such as them having a power that makes their containment exceedingly difficult), or proven to be misusing their powers to the detriment of the safety of the station.
 
 [color=#ffff00]2. Follow antagonist guidelines:[/color]
-[color=#a4885c]2.1[/color] Antagonists exist to move the round forward and make things interesting and fun for everyone involved. The point is NOT to “greentext” or win over people by pulling every meta trick in the book. The real victory, is in achieving your goals in a fun, interesting, or unique way. As such, “play to win” gameplay void of any roleplay aspect is not only heavily discouraged, but may also lead to negative notes or even suspensions, if deemed to be causing a negative impact on the community and be detrimental to everybody’s fun. 
-The same of course, is to be applied to roles in opposition to antagonists, such as Security and Command. 
+[color=#a4885c]2.1[/color] Antagonists exist to move the round forward and make things interesting and fun for everyone involved. The point is NOT to “greentext” or win over people by pulling every meta trick in the book. The real victory, is in achieving your goals in a fun, interesting, or unique way. As such, “play to win” gameplay void of any roleplay aspect is not only heavily discouraged, but may also lead to negative notes or even suspensions, if deemed to be causing a negative impact on the community and be detrimental to everybody’s fun.
+The same of course, is to be applied to roles in opposition to antagonists, such as Security and Command.
 We are all here to roleplay, relax and have fun, not to have a competition on who’s the best or the most “robust”. The objectives are meant to me a means to an end, a way to craft and tell a compelling narrative, a fun story for the shift.
-[color=#a4885c]2.2[/color] The damage that antagonists can cause MUST be proportional to their objectives, and contribute towards achieving them in some way. 
-Round ending levels of damage (plasma/tritium/frezon flooding, atmospherics distro sabotage, singuloose and teslaloose, mass spacing, mass murder, sabotaging or destroying power in an irreparable or extremely difficult to repair manner, etc.) are rarely if ever proportional to most of antagonist objectives (some exceptions for example being nuclear operatives, dragons, or zombies), and rarely anywhere remotely fun. Thus, they should be avoided, unless you got some EXTREMELY good justification and explanation. 
+[color=#a4885c]2.2[/color] The damage that antagonists can cause MUST be proportional to their objectives, and contribute towards achieving them in some way.
+Round ending levels of damage (plasma/tritium/frezon flooding, atmospherics distro sabotage, singuloose and teslaloose, mass spacing, mass murder, sabotaging or destroying power in an irreparable or extremely difficult to repair manner, etc.) are rarely if ever proportional to most of antagonist objectives (some exceptions for example being nuclear operatives, dragons, or zombies), and rarely anywhere remotely fun. Thus, they should be avoided, unless you got some EXTREMELY good justification and explanation.
 Furthermore, after round start, a grace period of 30 minutes is in effect, during which you are not allowed to perform any action that result in round ending levels of damage.
 If you are concerned as to whether or not what you're about to do is allowed, feel free to AHelp and ask an admin for clarification. Lack of administrator response does not constitute approval.
 [color=#a4885c]2.3[/color] Stealth and pacifism are HEAVILY encouraged and to be considered preferable wherever and whenever applicable. If you can get rid of a person without having to round remove them, or obtain an item without having to destroy an entire part of the station, please, consider doing so.
@@ -160,9 +163,9 @@ If you are concerned as to whether or not what you're about to do is allowed, fe
 However of course, do keep in mind that not all antagonist roles can be (easily) reasoned with, such as zombies or cults.
 [color=#a4885c]2.7[/color] Heavily damaging/spacing or camping arrivals/evac/cryo, unnecessarily extending the round, and actions that call the round to an end prematurely (as well as other similar lame tactics and behaviors), are strictly forbidden.
 [color=#a4885c]2.8[/color] As a non-sentient or partially sentient antagonist, you are expected to have only a limited understanding of space stations and their mechanics. Slimes, zombies, and spiders should not be targeting the gravity generator or the AME, nor should they be unnecessarily spacing the station.
-[color=#a4885c]2.9[/color] Ghost roles have their own independent rules that must be followed, in addition to the already established antagonist guidelines for antagonist ghost roles, and the general game server rules for non-antagonist ones. 
+[color=#a4885c]2.9[/color] Ghost roles have their own independent rules that must be followed, in addition to the already established antagonist guidelines for antagonist ghost roles, and the general game server rules for non-antagonist ones.
 As a rule of thumb for ghost roles in general: do not be overly disruptive and a detriment to the fun. You may go on a rampage and kill a lot of people as a dragon because that is what you are meant to do, or sow a bit of chaos as a skeleton. But do not go out of your way as a mouse or Pun Pun to disturb people's privacy and ERP, or to persistently harass and annoy people or break things for no reason.
 [color=#a4885c]2.10[/color] Neutral ghost roles (such as skeletons or sentient artifacts), while having the freedom of being either friendly or hostile (and until or unless proven the latter, crew is expected to be friendly in return), in reason of not having a defined set of objectives, are expected not to go too overboard if choosing to be hostile, and limit themselves to being just a nuisance at worst.
-[color=#a4885c]2.11[/color] Hostile ghost roles, while do also have the liberty of being friendly if they so wished or desired, if deemed too big of a potential threat by the station inhabitants, can be terminated at any time the crew sees fit. 
-However, it is strongly encouraged for the crew to act hostile within reason; and for such ghost roles not to powergame by acting friendly one minute, and be hostile the next, the moment a great opportunity presents itself. 
+[color=#a4885c]2.11[/color] Hostile ghost roles, while do also have the liberty of being friendly if they so wished or desired, if deemed too big of a potential threat by the station inhabitants, can be terminated at any time the crew sees fit.
+However, it is strongly encouraged for the crew to act hostile within reason; and for such ghost roles not to powergame by acting friendly one minute, and be hostile the next, the moment a great opportunity presents itself.
 Furthermore, though roleplaying a creature as one would be expecting it to behave is also strongly encouraged, due to the inherent nature of such roles often having as a main objective to kill as many living things as possible, certain core antagonist guidelines are a bit relaxed (specifically and in particular those relating to killing).
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
similarity index 95%
rename from Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
index 4ec7339a888..a42fdeb8102 100644
--- a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
@@ -1,26 +1,26 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..2190dc844db
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/icon.png
new file mode 100644
index 00000000000..17904840397
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-left.png
new file mode 100644
index 00000000000..2d727adbb21
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-right.png
new file mode 100644
index 00000000000..0e2c555c5c1
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
new file mode 100644
index 00000000000..464e2e4a352
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by mnemotechnician (GitHub)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..d317412c9dd
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/icon.png
new file mode 100644
index 00000000000..4cf647611dc
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json
new file mode 100644
index 00000000000..909b986cade
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/suit.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..5df12ac9933
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/icon.png
new file mode 100644
index 00000000000..d59144a0524
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json
new file mode 100644
index 00000000000..909b986cade
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/suit.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..f470372379d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/icon.png
new file mode 100644
index 00000000000..54fd0c07413
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json
new file mode 100644
index 00000000000..d66d07b5d5e
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/suit.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-FEET.png
new file mode 100644
index 00000000000..4a3104fead9
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-HAND.png
new file mode 100644
index 00000000000..b78a810df85
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/icon.png
new file mode 100644
index 00000000000..8f531e890c1
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json
new file mode 100644
index 00000000000..02cbb7ef9a0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/feet.dmi / https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/hands.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png
new file mode 100644
index 00000000000..9522966b6c7
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png
new file mode 100644
index 00000000000..0633bb36441
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png
new file mode 100644
index 00000000000..0ce0c363f81
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png
new file mode 100644
index 00000000000..2142eee0392
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json
new file mode 100644
index 00000000000..116c0e53e70
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 | Modified by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_alt"
+    },
+    {
+      "name": "equipped-EARS",
+      "directions": 4
+    },
+    {
+      "name": "alt-equipped-EARS",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..2fc2172afa7
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png
new file mode 100644
index 00000000000..3a06285c67c
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png
new file mode 100644
index 00000000000..60426ff87fd
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png
new file mode 100644
index 00000000000..d6ed79e225a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json
new file mode 100644
index 00000000000..9d421b646b5
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Spritework by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..49bc499a870
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png
new file mode 100644
index 00000000000..ce23046a1fc
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png
new file mode 100644
index 00000000000..80531e8b56f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png
new file mode 100644
index 00000000000..0bd0f37f115
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json
new file mode 100644
index 00000000000..a0670a97c96
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Spritework by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..ce4e527400f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png
new file mode 100644
index 00000000000..d3f712e8d76
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json
new file mode 100644
index 00000000000..7f12698657f
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..9a881bf0dd0
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png
new file mode 100644
index 00000000000..7fd93b7fd5b
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json
new file mode 100644
index 00000000000..a04b75dd785
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..7d77d8b53f9
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png
new file mode 100644
index 00000000000..eb6ff72244d
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png
new file mode 100644
index 00000000000..f7b9b21ebdb
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png
new file mode 100644
index 00000000000..5d366f23d98
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json
new file mode 100644
index 00000000000..11ac46694ce
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..a5575e393cc
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png
new file mode 100644
index 00000000000..443dbf1af97
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png
new file mode 100644
index 00000000000..cf49f4588a6
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png
new file mode 100644
index 00000000000..c2e88069f8a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json
new file mode 100644
index 00000000000..11ac46694ce
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..24c2af227bb
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png
new file mode 100644
index 00000000000..77371a3ba8c
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png
new file mode 100644
index 00000000000..9b19bead358
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png
new file mode 100644
index 00000000000..571ae1697c9
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json
new file mode 100644
index 00000000000..faf5084407b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..64e6927cf64
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png
new file mode 100644
index 00000000000..58a60bc768a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png
new file mode 100644
index 00000000000..5dcb8e026ee
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png
new file mode 100644
index 00000000000..5e7d3774518
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json
new file mode 100644
index 00000000000..faf5084407b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a1ae36f2102
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png
new file mode 100644
index 00000000000..5130d57e8cf
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png
new file mode 100644
index 00000000000..d04680f3ca6
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png
new file mode 100644
index 00000000000..af7f24e84e4
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json
new file mode 100644
index 00000000000..322f9da00e0
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Heavily modified by leonardo_dabepis (Discord), original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b2e475bdbe1
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png
new file mode 100644
index 00000000000..03f703a26cc
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png
new file mode 100644
index 00000000000..9b19bead358
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png
new file mode 100644
index 00000000000..571ae1697c9
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json
new file mode 100644
index 00000000000..faf5084407b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e735c5a2b21
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png
new file mode 100644
index 00000000000..bf6ed67bc86
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png
new file mode 100644
index 00000000000..aa334048316
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png
new file mode 100644
index 00000000000..deb205205ab
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json
new file mode 100644
index 00000000000..04451512800
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9caa2e705e7
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png
new file mode 100644
index 00000000000..0f2a20fa1ab
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png
new file mode 100644
index 00000000000..4e73693046f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png
new file mode 100644
index 00000000000..567d302dc52
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json
new file mode 100644
index 00000000000..04451512800
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..330926db8c1
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png
new file mode 100644
index 00000000000..337c3132ca4
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png
new file mode 100644
index 00000000000..5dcb8e026ee
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png
new file mode 100644
index 00000000000..5e7d3774518
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json
new file mode 100644
index 00000000000..faf5084407b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "sprites by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f21dce44e2f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png
new file mode 100644
index 00000000000..0d2266c7ff7
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png
new file mode 100644
index 00000000000..d04680f3ca6
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png
new file mode 100644
index 00000000000..af7f24e84e4
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json
new file mode 100644
index 00000000000..322f9da00e0
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Heavily modified by leonardo_dabepis (Discord), original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png
new file mode 100644
index 00000000000..6cba0e4a93f
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png differ
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png
new file mode 100644
index 00000000000..90e01b97cdf
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png differ
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png
new file mode 100644
index 00000000000..9ef5c305272
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png differ
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png
new file mode 100644
index 00000000000..997b29b2a44
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png differ
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
index 3f3c6b04e25..09d18e3ab7c 100644
--- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord)",
     "size": {
         "x": 8,
         "y": 8
@@ -27,6 +27,18 @@
         },
         {
             "name": "MedicalBorg"
+        },
+        {
+            "name": "ChiefJustice"
+        },
+        {
+            "name": "Clerk"
+        },
+        {
+            "name": "Prosecutor"
+        },
+        {
+            "name": "Lawyer"
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg
new file mode 100644
index 00000000000..74e0876fb9a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="256"
+   height="64"
+   viewBox="0 0 256 64"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="paper_heading_warrant.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   inkscape:export-filename="paper_heading_warrant.svg.192dpi.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8">
+    <rect
+       x="17.577076"
+       y="28.370017"
+       width="242.07025"
+       height="53.347968"
+       id="rect1" />
+    <rect
+       x="12.500253"
+       y="14.598581"
+       width="334.51892"
+       height="47.488827"
+       id="rect348" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview6"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-page="true"
+     inkscape:zoom="3.2428602"
+     inkscape:cx="96.828103"
+     inkscape:cy="12.180605"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <path
+     style="display:inline;fill:none;stroke:none;stroke-opacity:1"
+     id="path3"
+     d="m 36.349804,15.970893 c -1.609666,1.682892 -3.239328,3.380564 -4.350593,5.451429 -0.32296,0.601844 -0.572613,1.240239 -0.85892,1.860359 -1.400384,4.621583 -1.594226,9.481555 -2.110038,14.254133 1.735502,0.584751 -1.162417,1.23911 -0.69407,1.565358 0.55773,0.388513 2.014759,1.258466 1.954479,0.581434 -0.10399,-1.167953 -1.497738,-1.809745 -2.150567,-2.78378 -2.243126,-3.346794 -3.690142,-6.31455 -5.596872,-9.900352 C 20.039611,21.977809 17.714464,16.867199 15.5617,11.685594 14.740871,9.7098962 13.837037,7.490287 13.195381,5.423014 12.989717,4.7604083 12.846221,4.0800827 12.671641,3.4086171 10.068103,3.1217034 13.356085,1.8379318 12.82476,1.4619705 12.109758,0.95604123 10.84711,-0.26097696 10.385968,0.48369709 9.8995281,1.2692244 11.549812,1.9221809 12.064688,2.689371 c 0.937154,1.3964062 4.631506,7.586736 5.278323,8.662222 3.101744,5.085038 6.539251,9.960405 10.406182,14.494119 1.122527,1.316086 2.253277,2.630243 3.482446,3.847326 2.900958,2.872433 4.269559,3.697639 7.496096,6.058287 5.297561,3.269168 2.241478,1.456899 9.231048,5.329486 0,0 -2.681341,-2.15501 -2.681341,-2.15501 v 0 c -0.02806,1.497166 0.03809,0.16754 -3.480095,-1.959452 C 38.544079,34.628014 37.14706,33.800865 34.221757,30.947733 32.973819,29.730584 31.823585,28.415479 30.683533,27.096736 26.793378,22.596841 23.337047,17.747033 20.271261,12.651243 18.602678,9.7966349 16.991301,6.9080112 15.273169,4.0829489 14.806457,3.3155501 14.507503,2.380656 13.800883,1.8262109 12.558583,0.85144843 11.106791,0.11142326 9.6019245,-0.36695703 8.8877503,-0.59398508 9.5891894,2.7437562 9.4568524,1.8765298 9.652289,2.5681647 9.8162957,3.2694624 10.043162,3.9514344 c 0.691016,2.0772267 1.680512,4.3863387 2.535742,6.3652866 2.241114,5.185795 4.618789,10.312712 7.093949,15.390666 1.829232,3.544094 3.243301,6.476683 5.325319,9.834536 0.598604,0.965421 1.07486,2.067935 1.94479,2.798403 1.350693,1.134157 2.929831,2.016545 4.567931,2.670234 0.601428,0.240002 0.638588,-2.107992 0.722013,-1.803483 0.390932,-4.750736 0.532785,-9.59608 2.01531,-14.166143 0.283977,-0.60384 0.530966,-1.226502 0.851932,-1.811521 1.120221,-2.041807 2.760311,-3.718468 4.435565,-5.306192 z" />
+  <path
+     style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+     id="path4"
+     d="M 70.823431,18.999312 C 66.770923,17.946627 62.804725,16.609648 58.879849,15.15917 53.789302,13.124058 48.835438,10.741062 43.497442,9.3933232 38.47117,8.1242889 37.65125,8.1591106 32.69028,7.5163597 28.302003,7.073289 23.872195,7.0232054 19.487647,7.5418612 c -1.623519,0.192049 -4.216324,0.6034149 -5.802335,1.2938894 -0.580667,0.2527952 -1.062924,0.6888474 -1.594386,1.033271 -0.184503,0.4494574 -0.531318,0.8630264 -0.55351,1.3483734 -0.02517,0.550404 0.173886,1.105436 0.418748,1.599016 1.561229,3.147036 4.906203,3.972512 8.161331,4.234892 1.564632,0.126118 3.13597,-0.146981 4.703955,-0.220472 1.838114,-0.339548 3.68784,-0.621346 5.514342,-1.018645 1.651616,-0.359259 11.66312,-2.929624 12.992803,-3.227302 4.532726,-1.014748 9.854947,-2.00383 14.489129,-2.518315 2.073856,-0.230239 4.162681,-0.2960629 6.244021,-0.4440943 3.35897,0.1483451 6.068417,-0.027461 9.247676,1.1158203 0.695361,0.250056 1.428503,0.621132 1.841922,1.233618 0.387657,0.574317 0.756462,1.469298 0.371293,2.045286 -1.544539,2.309734 -7.692412,3.799209 -9.387289,4.382468 -6.84916,1.918773 -13.868645,3.085643 -20.849315,4.393786 -5.845524,1.095423 -4.49892,0.8401 -9.756758,1.93796 0,0 0.07301,0.01957 0.07301,0.01957 v 0 c 10.385912,-1.914343 20.839553,-3.55202 31.071435,-6.207054 2.127297,-0.680239 4.332892,-1.152053 6.38189,-2.040718 1.254783,-0.544209 2.667815,-1.100137 3.448822,-2.222934 0.403705,-0.580378 0.05194,-1.585228 -0.46283,-2.069814 C 75.093201,11.31768 73.749057,10.945164 72.515945,10.52569 69.194396,9.3957774 67.013675,9.6035838 63.461142,9.4615437 61.409944,9.6176517 59.351243,9.69515 57.307548,9.9298677 52.83425,10.443625 47.179169,11.487397 42.812516,12.446601 c -1.205568,0.264822 -11.592576,2.862678 -13.137269,3.188592 -1.856073,0.391612 -3.735451,0.663228 -5.603176,0.994843 -1.98728,0.08057 -5.472692,0.561513 -7.625882,-0.299145 -1.682419,-0.672484 -3.947972,-2.799397 -3.877074,-4.837054 0.01684,-0.483854 0.339545,-0.906809 0.509318,-1.360214 0.495489,-0.3540622 0.935187,-0.803422 1.486468,-1.0621872 1.523973,-0.7153366 4.089551,-1.1375975 5.657505,-1.3326964 4.340816,-0.5401234 8.730136,-0.487809 13.077568,-0.059013 3.619165,0.4679871 6.064099,0.6678996 9.566448,1.544515 5.304179,1.3276026 10.215293,3.7199586 15.271356,5.7360916 4.47262,1.655747 9.006582,3.133178 13.635655,4.293531 z"
+     inkscape:label="stroke2" />
+  <path
+     style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+     id="path5"
+     d="m 66.075194,17.780704 c 2.907457,0.913484 6.185544,1.605093 9.290174,2.141671 1.429259,0.171123 3.205254,0.443882 4.657526,0.383456 1.989779,-0.08279 4.040423,-0.594125 5.793426,-1.551787 0.382368,-0.208887 0.720167,-0.490626 1.080251,-0.73594 0.01571,0.13487 1.02365,-1.066004 0.608173,-1.308051 -2.010422,-1.171224 -5.461381,-0.252741 -7.554144,0.219237 -1.988896,0.594483 -1.080141,0.265726 -2.740185,0.946905 0,0 0.07301,0.01956 0.07301,0.01956 v 0 c 2.01492,-0.548139 0.958734,-0.269331 3.169776,-0.831796 2.070356,-0.430226 3.709309,-0.740215 5.841629,-0.674059 0.09726,0.003 0.25175,-0.02039 0.282959,0.07177 0.192753,0.569215 -0.332564,0.945854 -0.624632,1.30364 -0.356125,0.246375 -0.688521,0.531191 -1.068376,0.739123 -1.745902,0.955702 -3.813814,1.462071 -5.793828,1.551678 -1.419414,0.06424 -3.151433,-0.193468 -4.550828,-0.354865 -3.09464,-0.529267 -6.152676,-1.184105 -9.156371,-2.10582 z"
+     inkscape:label="stroke1" />
+  <path
+     style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+     id="path6"
+     d="m 182.98619,18.999312 c 4.05251,-1.052685 8.01871,-2.389664 11.94359,-3.840142 5.09054,-2.035112 10.04441,-4.418108 15.3824,-5.7658468 5.02628,-1.2690343 5.8462,-1.2342126 10.80717,-1.8769635 4.38827,-0.4430707 8.81808,-0.4931543 13.20263,0.025501 1.62352,0.192049 4.21632,0.6034149 5.80233,1.2938894 0.58067,0.2527952 1.06293,0.6888474 1.59439,1.033271 0.1845,0.4494569 0.53132,0.8630259 0.55351,1.3483729 0.0252,0.550404 -0.17389,1.105436 -0.41875,1.599016 -1.56123,3.147036 -4.9062,3.972512 -8.16133,4.234892 -1.56463,0.126118 -3.13597,-0.146981 -4.70395,-0.220472 -1.83812,-0.339548 -3.68784,-0.621346 -5.51435,-1.018645 -1.65161,-0.359258 -11.66312,-2.929623 -12.9928,-3.227301 -4.53273,-1.014748 -9.85495,-2.00383 -14.48913,-2.518315 -2.07385,-0.230239 -4.16268,-0.2960629 -6.24402,-0.4440943 -3.35897,0.1483451 -6.06842,-0.027461 -9.24768,1.1158203 -0.69536,0.250056 -1.4285,0.621132 -1.84192,1.233618 -0.38765,0.574317 -0.75646,1.469298 -0.37129,2.045286 1.54454,2.309734 7.69241,3.799209 9.38729,4.382468 6.84916,1.918773 13.86864,3.085643 20.84931,4.393786 5.84553,1.095423 4.49892,0.8401 9.75676,1.93796 0,0 -0.073,0.01957 -0.073,0.01957 v 0 c -10.38591,-1.914343 -20.83955,-3.55202 -31.07143,-6.207054 -2.1273,-0.680239 -4.3329,-1.152053 -6.38189,-2.040718 -1.25479,-0.544209 -2.66782,-1.100137 -3.44883,-2.222934 -0.4037,-0.580378 -0.0519,-1.585228 0.46283,-2.069814 0.9484,-0.892783 2.29255,-1.265299 3.52566,-1.684773 3.32155,-1.1299126 5.50227,-0.9221062 9.0548,-1.0641463 2.0512,0.156108 4.1099,0.2336063 6.1536,0.468324 4.4733,0.5137573 10.12838,1.5575293 14.49503,2.5167333 1.20557,0.264822 11.59258,2.862678 13.13727,3.188592 1.85607,0.391612 3.73545,0.663228 5.60317,0.994843 1.98728,0.08057 5.4727,0.561513 7.62589,-0.299145 1.68242,-0.672484 3.94797,-2.799397 3.87707,-4.837054 -0.0168,-0.483854 -0.33954,-0.906809 -0.50932,-1.360214 -0.49549,-0.3540622 -0.93518,-0.803422 -1.48647,-1.0621872 -1.52397,-0.7153366 -4.08955,-1.1375975 -5.6575,-1.3326964 -4.34082,-0.5401234 -8.73014,-0.487809 -13.07757,-0.059013 -3.61916,0.4679871 -6.0641,0.6678996 -9.56645,1.544515 -5.30418,1.3276026 -10.21529,3.7199586 -15.27135,5.7360916 -4.47262,1.655747 -9.00658,3.133178 -13.63566,4.293531 z"
+     inkscape:label="stroke2_r" />
+  <path
+     style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+     id="path7"
+     d="m 188.98404,17.780704 c -2.90745,0.913484 -6.18554,1.605093 -9.29017,2.141671 -1.42926,0.171123 -3.20525,0.443882 -4.65753,0.383456 -1.98978,-0.08279 -4.04042,-0.594125 -5.79342,-1.551787 -0.38237,-0.208887 -0.72017,-0.490626 -1.08025,-0.73594 -0.0157,0.13487 -1.02365,-1.066004 -0.60818,-1.308051 2.01043,-1.171224 5.46138,-0.252741 7.55415,0.219237 1.98889,0.594483 1.08014,0.265726 2.74018,0.946905 0,0 -0.073,0.01956 -0.073,0.01956 v 0 c -2.01492,-0.548139 -0.95873,-0.269331 -3.16977,-0.831796 -2.07036,-0.430226 -3.70931,-0.740215 -5.84163,-0.674059 -0.0973,0.003 -0.25175,-0.02039 -0.28296,0.07177 -0.19275,0.569215 0.33256,0.945854 0.62463,1.30364 0.35613,0.246375 0.68852,0.531191 1.06838,0.739123 1.7459,0.955702 3.81381,1.462071 5.79382,1.551678 1.41942,0.06424 3.15144,-0.193468 4.55083,-0.354865 3.09464,-0.529267 6.15268,-1.184105 9.15637,-2.10582 z"
+     inkscape:label="stroke1_r" />
+  <path
+     sodipodi:type="star"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+     id="path8"
+     inkscape:flatsided="false"
+     sodipodi:sides="6"
+     sodipodi:cx="128.28181"
+     sodipodi:cy="19.427294"
+     sodipodi:r1="7.4008741"
+     sodipodi:r2="3.7004371"
+     sodipodi:arg1="-1.5707963"
+     sodipodi:arg2="-1.0471976"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 128.28181,12.02642 1.85022,4.196201 4.55913,-0.495764 -2.70891,3.700437 2.70891,3.700437 -4.55913,-0.495765 -1.85022,4.196202 -1.85021,-4.196202 -4.55913,0.495765 2.70891,-3.700437 -2.70891,-3.700437 4.55913,0.495764 z"
+     transform="translate(0,-3.700437)" />
+  <path
+     d="m 84.776722,56.010245 c -0.410666,0 -0.746666,-0.186667 -0.746666,-3.397331 l 0.522666,-11.498657 c 0.07467,-1.269332 0.07467,-2.463998 0.224,-2.911997 0.149333,-0.485333 0.336,-0.485333 0.559999,-0.485333 h 0.03733 c 0.149333,0 0.261333,0 0.410666,-0.112 0.186666,-0.112 0.261333,-0.298666 0.261333,-0.485333 v -5.562662 c 0,-0.410666 -0.336,-0.746666 -0.746666,-0.746666 h -6.271995 c -0.410666,0 -0.746666,0.336 -0.746666,0.746666 v 5.413329 c 0,0.224 0.112,0.410666 0.224,0.522666 0.149333,0.149333 0.336,0.224 0.522666,0.224 0.373333,0 0.784,0.821333 0.784,2.575998 0,0.261333 0,0.522666 -0.03733,0.821332 l -0.522666,10.303992 c 0,0.149333 -0.112,0.261333 -0.224,0.261333 -0.112,0 -0.186666,-0.07467 -0.223999,-0.149333 L 75.107397,37.86626 c -0.112,-0.336 -0.410667,-0.485333 -0.709333,-0.485333 -0.298666,0 -0.56,0.149333 -0.709333,0.485333 l -3.73333,13.701322 c -0.03733,0.112 -0.112,0.149333 -0.186666,0.149333 -0.149334,0 -0.261334,-0.112 -0.261334,-0.224 L 68.984735,41.114257 c 0,-0.223999 -0.03733,-0.410666 -0.03733,-0.634666 0,-0.933332 0.149333,-1.903998 0.261333,-2.277331 0.149333,-0.485333 0.336,-0.485333 0.56,-0.485333 h 0.03733 c 0.149333,0 0.261333,0 0.410666,-0.112 0.186667,-0.112 0.261333,-0.298666 0.261333,-0.485333 v -5.562662 c 0,-0.410666 -0.335999,-0.746666 -0.746666,-0.746666 h -6.271994 c -0.410667,0 -0.746666,0.336 -0.746666,0.746666 v 5.413329 c 0,0.224 0.112,0.410666 0.223999,0.522666 0.149334,0.149333 0.336,0.224 0.522667,0.224 0.410666,0 0.671999,1.418665 0.746666,3.39733 l 0.522666,11.498657 c 0,1.605332 -0.07467,2.463998 -0.224,2.911998 -0.112,0.410666 -0.298666,0.447999 -0.485333,0.447999 H 63.83274 c -0.112,0 -0.224,0.03733 -0.336,0.112 -0.149333,0.149334 -0.224,0.336 -0.224,0.522667 v 5.562661 c 0,0.410667 0.336,0.746666 0.709333,0.746666 h 5.450662 c 0.895999,0 1.679998,-0.559999 1.978665,-1.418665 l 2.762664,-10.079991 c 0.03733,-0.112 0.149333,-0.149334 0.224,-0.149334 0.112,0 0.186667,0.03733 0.224,0.149334 l 2.762664,10.079991 c 0.261333,0.858666 1.045333,1.418665 1.941332,1.418665 h 5.450662 c 0.410666,0 0.709333,-0.335999 0.709333,-0.746666 v -5.450662 c 0,-0.186666 -0.07467,-0.373333 -0.186667,-0.522666 -0.149333,-0.112 -0.336,-0.186666 -0.522666,-0.186666 z m 21.167988,0 c -0.26133,0 -0.52267,-0.224 -0.56,-0.448 l -3.136,-17.210652 v -0.112 c 0,-0.298666 0.18667,-0.522666 0.48533,-0.522666 0.26134,0 0.48534,-0.224 0.48534,-0.485333 v -5.637329 c 0,-0.410666 -0.336,-0.783999 -0.784,-0.783999 H 91.758054 c -0.448,0 -0.784,0.373333 -0.784,0.783999 v 5.637329 c 0,0.261333 0.149333,0.485333 0.410667,0.485333 h 0.07467 c 0.261333,0 0.485333,0.186666 0.485333,0.522666 v 0.112 l -3.135997,17.210652 c -0.03733,0.224 -0.298667,0.448 -0.56,0.448 H 87.76339 c -0.335999,0 -0.559999,0.261333 -0.559999,0.559999 v 5.562662 c 0,0.410666 0.336,0.783999 0.783999,0.783999 h 6.122662 c 0.447999,0 0.821332,-0.373333 0.821332,-0.783999 v -5.562662 c 0,-0.298666 -0.261333,-0.559999 -0.559999,-0.559999 -0.336,0 -0.56,-0.298667 -0.56,-0.597333 v -0.112 l 0.373333,-2.090665 c 0.03733,-0.261333 0.298667,-0.485333 0.56,-0.485333 h 4.703996 c 0.261333,0 0.522666,0.224 0.559996,0.485333 l 0.37334,2.090665 v 0.112 c 0,0.298666 -0.224,0.597333 -0.560003,0.597333 h -0.07467 c -0.261333,0 -0.485333,0.261333 -0.485333,0.522666 v 5.599995 c 0,0.410666 0.373333,0.783999 0.821333,0.783999 h 6.12266 c 0.448,0 0.784,-0.373333 0.784,-0.783999 v -5.562662 c 0,-0.298666 -0.224,-0.559999 -0.56,-0.559999 z M 95.528717,47.946252 c -0.149333,0 -0.298666,-0.149334 -0.298666,-0.298667 v -0.07467 l 1.642665,-9.183993 c 0.03733,-0.112 0.149333,-0.186666 0.224,-0.186666 0.112,0 0.186666,0.07467 0.224,0.186666 l 1.642665,9.183993 v 0.07467 c 0,0.149333 -0.149333,0.298667 -0.298667,0.298667 z m 31.098643,7.46666 c -0.18667,-1.119999 -0.37334,-3.919997 -2.09067,-5.823995 -0.14933,-0.149333 -0.224,-0.336 -0.224,-0.485333 0,-0.186667 0.112,-0.373333 0.336,-0.448 2.576,-0.970666 3.136,-3.17333 3.136,-5.263995 v -6.197328 c 0,-3.509331 -2.87467,-6.383995 -6.384,-6.383995 h -11.83465 c -0.41067,0 -0.70934,0.336 -0.70934,0.746666 v 5.450662 c 0,0.373333 0.29867,0.709333 0.70934,0.709333 0.41066,0 0.74666,0.149333 0.74666,3.39733 v 11.498657 c 0,2.575998 -0.336,3.397331 -0.74666,3.397331 h -0.0747 c -0.37333,0 -0.63467,0.373333 -0.63467,0.746666 v 5.413328 c 0,0.410667 0.29867,0.746666 0.70934,0.746666 h 6.27199 c 0.41067,0 0.74667,-0.335999 0.74667,-0.746666 v -5.450662 c 0,-0.410666 -0.336,-0.709332 -0.74667,-0.709332 -0.48533,0 -0.74667,-2.277332 -0.74667,-5.525329 0,-0.373333 0.336,-0.709333 0.70934,-0.709333 h 1.71733 c 2.83733,0 3.472,2.613331 3.84533,5.562662 v 0.07467 c 0,0.298666 -0.224,0.597333 -0.52267,0.597333 h -0.0373 c -0.29867,0 -0.52267,0.224 -0.52267,0.522666 v 5.599995 c 0,0.410666 0.336,0.783999 0.784,0.783999 h 6.16 c 0.41066,0 0.784,-0.373333 0.784,-0.783999 v -5.599995 c 0,-0.298666 -0.26134,-0.522666 -0.56,-0.522666 h -0.112 c -0.336,0 -0.63467,-0.298667 -0.70933,-0.597333 z m -11.536,-14.298655 c 0,-3.247997 0.41067,-3.39733 0.896,-3.39733 h 5.936 c 0.59733,0 1.04533,0.485333 1.04533,1.082666 v 5.151995 c 0,0.56 -0.448,1.045333 -1.04533,1.045333 h -6.12266 c -0.37334,0 -0.70934,-0.298667 -0.70934,-0.672 z m 32.55463,14.298655 c -0.18667,-1.119999 -0.37333,-3.919997 -2.09067,-5.823995 -0.14933,-0.149333 -0.22399,-0.336 -0.22399,-0.485333 0,-0.186667 0.112,-0.373333 0.33599,-0.448 2.576,-0.970666 3.136,-3.17333 3.136,-5.263995 v -6.197328 c 0,-3.509331 -2.87466,-6.383995 -6.38399,-6.383995 h -11.83466 c -0.41067,0 -0.70933,0.336 -0.70933,0.746666 v 5.450662 c 0,0.373333 0.29866,0.709333 0.70933,0.709333 0.41067,0 0.74667,0.149333 0.74667,3.39733 v 11.498657 c 0,2.575998 -0.336,3.397331 -0.74667,3.397331 H 130.51 c -0.37333,0 -0.63466,0.373333 -0.63466,0.746666 v 5.413328 c 0,0.410667 0.29866,0.746666 0.70933,0.746666 h 6.272 c 0.41066,0 0.74666,-0.335999 0.74666,-0.746666 v -5.450662 c 0,-0.410666 -0.336,-0.709332 -0.74666,-0.709332 -0.48534,0 -0.74667,-2.277332 -0.74667,-5.525329 0,-0.373333 0.336,-0.709333 0.70933,-0.709333 h 1.71733 c 2.83734,0 3.472,2.613331 3.84533,5.562662 v 0.07467 c 0,0.298666 -0.224,0.597333 -0.52266,0.597333 h -0.0373 c -0.29866,0 -0.52266,0.224 -0.52266,0.522666 v 5.599995 c 0,0.410666 0.336,0.783999 0.784,0.783999 h 6.15999 c 0.41067,0 0.784,-0.373333 0.784,-0.783999 v -5.599995 c 0,-0.298666 -0.26133,-0.522666 -0.56,-0.522666 h -0.112 c -0.336,0 -0.63466,-0.298667 -0.70933,-0.597333 z M 136.11,41.114257 c 0,-3.247997 0.41067,-3.39733 0.896,-3.39733 h 5.93599 c 0.59734,0 1.04534,0.485333 1.04534,1.082666 v 5.151995 c 0,0.56 -0.448,1.045333 -1.04534,1.045333 h -6.12266 c -0.37333,0 -0.70933,-0.298667 -0.70933,-0.672 z m 33.37598,14.895988 c -0.26133,0 -0.52267,-0.224 -0.56,-0.448 l -3.136,-17.210652 v -0.112 c 0,-0.298666 0.18667,-0.522666 0.48534,-0.522666 0.26133,0 0.48533,-0.224 0.48533,-0.485333 v -5.637329 c 0,-0.410666 -0.336,-0.783999 -0.784,-0.783999 h -10.67733 c -0.44799,0 -0.78399,0.373333 -0.78399,0.783999 v 5.637329 c 0,0.261333 0.14933,0.485333 0.41066,0.485333 h 0.0747 c 0.26133,0 0.48533,0.186666 0.48533,0.522666 v 0.112 l -3.136,17.210652 c -0.0373,0.224 -0.29866,0.448 -0.56,0.448 h -0.48533 c -0.336,0 -0.56,0.261333 -0.56,0.559999 v 5.562662 c 0,0.410666 0.336,0.783999 0.784,0.783999 h 6.12266 c 0.448,0 0.82134,-0.373333 0.82134,-0.783999 v -5.562662 c 0,-0.298666 -0.26134,-0.559999 -0.56,-0.559999 -0.336,0 -0.56,-0.298667 -0.56,-0.597333 v -0.112 l 0.37333,-2.090665 c 0.0373,-0.261333 0.29867,-0.485333 0.56,-0.485333 h 4.70399 c 0.26134,0 0.52267,0.224 0.56,0.485333 l 0.37334,2.090665 v 0.112 c 0,0.298666 -0.224,0.597333 -0.56,0.597333 h -0.0747 c -0.26133,0 -0.48533,0.261333 -0.48533,0.522666 v 5.599995 c 0,0.410666 0.37333,0.783999 0.82133,0.783999 h 6.12266 c 0.448,0 0.784,-0.373333 0.784,-0.783999 v -5.562662 c 0,-0.298666 -0.224,-0.559999 -0.56,-0.559999 z m -10.41599,-8.063993 c -0.14933,0 -0.29867,-0.149334 -0.29867,-0.298667 v -0.07467 l 1.64267,-9.183993 c 0.0373,-0.112 0.14933,-0.186666 0.224,-0.186666 0.112,0 0.18666,0.07467 0.224,0.186666 l 1.64266,9.183993 v 0.07467 c 0,0.149333 -0.14933,0.298667 -0.29866,0.298667 z m 33.18932,-10.229325 c 0.18667,0 0.37333,-0.07467 0.52267,-0.224 0.112,-0.112 0.18666,-0.298666 0.18666,-0.485333 v -5.450662 c 0,-0.410666 -0.29866,-0.746666 -0.70933,-0.746666 h -6.272 c -0.41066,0 -0.74666,0.336 -0.74666,0.746666 v 5.562662 c 0,0.186667 0.0747,0.373333 0.224,0.485333 0.14933,0.112 0.29866,0.112 0.448,0.112 h 0.0373 c 0.224,0 0.41067,0 0.56,0.485333 0.14933,0.447999 0.224,1.306665 0.224,2.911997 v 10.229325 c 0,0.112 -0.0747,0.186667 -0.18667,0.186667 -0.0373,0 -0.112,-0.03733 -0.14933,-0.112 l -6.12266,-19.56265 c -0.224,-0.634667 -0.82133,-1.045333 -1.49333,-1.045333 h -5.67466 c -0.41067,0 -0.74667,0.336 -0.74667,0.746666 v 5.562662 c 0,0.186667 0.0747,0.373333 0.224,0.485333 0.14933,0.112 0.29867,0.112 0.448,0.112 h 0.0373 c 0.224,0 0.41067,0 0.56,0.485333 0.112,0.447999 0.224,1.306665 0.224,2.911997 v 11.498657 c 0,2.538665 -0.336,3.397331 -0.74666,3.397331 -0.224,0 -0.41067,0.07467 -0.52267,0.186666 -0.14933,0.149333 -0.224,0.336 -0.224,0.522666 v 5.450662 c 0,0.410667 0.336,0.746666 0.74667,0.746666 h 6.27199 c 0.37333,0 0.70933,-0.335999 0.70933,-0.746666 v -5.562661 c 0,-0.186667 -0.0747,-0.373333 -0.224,-0.485333 -0.14933,-0.112 -0.26133,-0.112 -0.41066,-0.112 h -0.0373 c -0.224,0 -0.41066,0 -0.56,-0.485333 -0.14933,-0.448 -0.224,-1.306666 -0.224,-2.911998 V 42.27159 c 0,-0.112 0.0747,-0.149333 0.18667,-0.149333 0.0373,0 0.112,0 0.14933,0.07467 l 6.12267,19.67465 c 0.22399,0.634666 0.82133,1.045332 1.49333,1.045332 h 5.67466 c 0.41067,0 0.70933,-0.335999 0.70933,-0.746666 v -5.562661 c 0,-0.186667 -0.0747,-0.373333 -0.224,-0.485333 -0.14933,-0.112 -0.26133,-0.112 -0.41066,-0.112 h -0.0373 c -0.224,0 -0.41066,0 -0.56,-0.485333 -0.14933,-0.448 -0.224,-1.306666 -0.224,-2.911998 V 41.114257 c 0,-3.247997 0.336,-3.39733 0.74667,-3.39733 z m 3.21065,-6.906661 c -0.41067,0 -0.784,0.336 -0.784,0.783999 v 6.794661 c 0,0.448 0.37333,0.821333 0.784,0.821333 h 3.28533 c 0.37333,0 0.70933,-0.336 0.70933,-0.746666 0,-0.410666 0.336,-0.746666 0.74667,-0.746666 h 0.82133 c 0.672,0 1.15734,0.149333 1.15734,3.39733 v 11.498657 c 0,2.501331 -0.336,3.397331 -0.70934,3.397331 -0.41066,0 -0.74666,0.298666 -0.74666,0.709332 v 5.450662 c 0,0.410667 0.336,0.746666 0.74666,0.746666 h 6.23466 c 0.41067,0 0.74667,-0.335999 0.74667,-0.746666 v -5.450662 c 0,-0.410666 -0.336,-0.709332 -0.74667,-0.709332 -0.41066,0 -0.70933,-0.186667 -0.70933,-3.397331 V 41.114257 c 0,-3.247997 0.48533,-3.39733 1.12,-3.39733 h 0.85867 c 0.41066,0 0.74666,0.336 0.74666,0.746666 0,0.410666 0.29867,0.746666 0.70933,0.746666 h 3.248 c 0.448,0 0.82133,-0.373333 0.82133,-0.821333 v -6.794661 c 0,-0.447999 -0.37333,-0.783999 -0.82133,-0.783999 z"
+     id="text1"
+     style="font-size:37.3333px;font-family:'SAN ANDREAS';-inkscape-font-specification:'SAN ANDREAS';text-align:center;white-space:pre;fill:#000000"
+     transform="translate(-10.484572,-7.0925043)"
+     aria-label="WARRANT"
+     inkscape:label="text1" />
+  <path
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     d="M 34.537413,59.206993 H 217.40067"
+     id="path1" />
+</svg>
diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png
new file mode 100644
index 00000000000..d13d8cf76b7
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png differ
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml
rename to Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png.yml
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png
new file mode 100644
index 00000000000..b69ced20cf5
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png differ
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png
new file mode 100644
index 00000000000..5e6ce9fece5
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png differ
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
index 7e31fd29114..a7534b9ee5b 100644
--- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
@@ -7,12 +7,21 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "chiefjustice"
+    },
+    {
+      "name": "clerk"
+    },
     {
       "name": "nyanogladiator"
     },
     {
       "name": "nyanoprisonguard"
     },
+    {
+      "name": "prosecutor"
+    },
     {
       "name": "nyanomailcarrier"
     },
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png
new file mode 100644
index 00000000000..e384f90fb1b
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png
new file mode 100644
index 00000000000..962d09200d0
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json
index 440000d647b..eb55c2b4e71 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json
@@ -1,13 +1,14 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by DangerRevolution for Space Station 14.",
+  "license": "CC0-1.0",
+  "copyright": "justice_label by leonardo_dabepis (Discord) | prisoner_label, crypt_orange Created by DangerRevolution for Space Station 14.",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {"name": "prisoner_label"},
+    {"name": "justice_label"},
+    {"name": "prisoner_label"},    
 	{"name": "crypt_orange"}
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
index 24d83ed6a04..176af077199 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at  https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at  https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-chiefjustice and pda-clerk by leonardo_dabepis (Discord) | pda-prosecutor by Timemaster99 (Discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -31,6 +31,15 @@
     },
     {
       "name": "pda-corpsman"
+    },
+    {
+      "name": "pda-chiefjustice"
+    },
+    {
+      "name": "pda-clerk"
+    },
+    {
+      "name": "pda-prosecutor"
     }
   ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png
new file mode 100644
index 00000000000..ec2543a97c4
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png
new file mode 100644
index 00000000000..6f690e235d8
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png
new file mode 100644
index 00000000000..e44dcea1b57
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json
index 75c5548e647..5e2c34d5304 100644
--- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
index 31a3b1bee37..d17e01e8bd9 100644
--- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name.",
+    "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99 (Discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,8 +10,14 @@
         {
             "name": "stamp-lawyer"
         },
+        {
+            "name": "stamp-notary"
+        },
         {
             "name": "stamp-psychologist"
+        },
+        {
+            "name": "stamp-cj"
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png
new file mode 100644
index 00000000000..3ca58c4bc60
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png
new file mode 100644
index 00000000000..b726cab3d3a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png
new file mode 100644
index 00000000000..3cf56d45371
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png
new file mode 100644
index 00000000000..a41d27bcc71
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png
new file mode 100644
index 00000000000..cbabf3b291a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json
new file mode 100644
index 00000000000..39ff0ed9d9b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495. In-hand sprites edited by Timemaster99 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png
new file mode 100644
index 00000000000..c1254bb8086
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json
new file mode 100644
index 00000000000..5abad9b4225
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json
new file mode 100644
index 00000000000..8081065c329
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "trialtimer"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png
new file mode 100644
index 00000000000..34c8f1b90a9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png
new file mode 100644
index 00000000000..056fcc5c141
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png
new file mode 100644
index 00000000000..6857f2a2415
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png
new file mode 100644
index 00000000000..04842eb1c7e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png
new file mode 100644
index 00000000000..c78d01c42d0
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png
new file mode 100644
index 00000000000..fd27f05b3a2
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png
new file mode 100644
index 00000000000..2a71f76d5d0
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png
new file mode 100644
index 00000000000..7c56263f839
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png
new file mode 100644
index 00000000000..817f2fb3f95
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json
new file mode 100644
index 00000000000..e4c020ff61d
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json
@@ -0,0 +1,195 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png
new file mode 100644
index 00000000000..10d823bfe8d
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png
new file mode 100644
index 00000000000..540ccf3de45
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png
new file mode 100644
index 00000000000..84933bd5ed9
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png
new file mode 100644
index 00000000000..db7be0bc4a0
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png
new file mode 100644
index 00000000000..24eb2aedc22
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png
new file mode 100644
index 00000000000..fc90acd637a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png
new file mode 100644
index 00000000000..dd67e88a315
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png
new file mode 100644
index 00000000000..fb5d774588a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png
new file mode 100644
index 00000000000..f16a028dee5
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png
new file mode 100644
index 00000000000..630eabb976e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png
new file mode 100644
index 00000000000..a0040dfdc73
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png
new file mode 100644
index 00000000000..35efd5f6ddb
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png
new file mode 100644
index 00000000000..6857f2a2415
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png
new file mode 100644
index 00000000000..64e00a086dc
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png
new file mode 100644
index 00000000000..c78d01c42d0
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png
new file mode 100644
index 00000000000..2a33b5d48af
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png
new file mode 100644
index 00000000000..2a71f76d5d0
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png
new file mode 100644
index 00000000000..7c56263f839
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png
new file mode 100644
index 00000000000..817f2fb3f95
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json
new file mode 100644
index 00000000000..e4c020ff61d
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json
@@ -0,0 +1,195 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png
new file mode 100644
index 00000000000..0c731ca7960
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png
new file mode 100644
index 00000000000..e8e146a32d9
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png
new file mode 100644
index 00000000000..84933bd5ed9
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png
new file mode 100644
index 00000000000..db7be0bc4a0
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png
new file mode 100644
index 00000000000..24eb2aedc22
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png
new file mode 100644
index 00000000000..fc90acd637a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png
new file mode 100644
index 00000000000..dd67e88a315
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png
new file mode 100644
index 00000000000..fb5d774588a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png
new file mode 100644
index 00000000000..f16a028dee5
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png
new file mode 100644
index 00000000000..630eabb976e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png
new file mode 100644
index 00000000000..a0040dfdc73
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png
new file mode 100644
index 00000000000..dcb76fc2635
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png
new file mode 100644
index 00000000000..ef94a9998f3
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json
index 0d38f6d8592..ab3feb6715c 100644
--- a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers",
+    "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,14 @@
         {
             "name": "direction_mail",
             "directions": 4
+        },
+        {
+            "name": "direction_court",
+            "directions": 4
+        },
+        {
+            "name": "direction_justice",
+            "directions": 4
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json
index 98dd3b20607..1ec1219b0f8 100644
--- a/Resources/Textures/Effects/speech.rsi/meta.json
+++ b/Resources/Textures/Effects/speech.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Oni sprites made by angelofallars and leonardo-dabepis (Github)",
     "states": [
         {
             "name": "alien0",
@@ -422,6 +422,23 @@
                     0.4
                 ]
             ]
+        },
+        {
+            "name": "oni0",
+            "delays": [
+                [
+                    0.2,
+                    0.3,
+                    0.3,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "oni1"
+        },
+        {
+            "name": "oni2"
         }
     ]
 }
diff --git a/Resources/Textures/Effects/speech.rsi/oni0.png b/Resources/Textures/Effects/speech.rsi/oni0.png
new file mode 100644
index 00000000000..cae529b35c2
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/oni0.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/oni1.png b/Resources/Textures/Effects/speech.rsi/oni1.png
new file mode 100644
index 00000000000..03da318f1d9
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/oni1.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/oni2.png b/Resources/Textures/Effects/speech.rsi/oni2.png
new file mode 100644
index 00000000000..c4d5c8ef5ec
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/oni2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png b/Resources/Textures/Interface/VerbIcons/dispel.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png
rename to Resources/Textures/Interface/VerbIcons/dispel.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml b/Resources/Textures/Interface/VerbIcons/dispel.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml
rename to Resources/Textures/Interface/VerbIcons/dispel.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt b/Resources/Textures/Interface/VerbIcons/license.txt
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt
rename to Resources/Textures/Interface/VerbIcons/license.txt
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png b/Resources/Textures/Interface/VerbIcons/mass_sleep.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png
rename to Resources/Textures/Interface/VerbIcons/mass_sleep.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml b/Resources/Textures/Interface/VerbIcons/mass_sleep.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml
rename to Resources/Textures/Interface/VerbIcons/mass_sleep.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png b/Resources/Textures/Interface/VerbIcons/metapsionic.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png
rename to Resources/Textures/Interface/VerbIcons/metapsionic.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml b/Resources/Textures/Interface/VerbIcons/metapsionic.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml
rename to Resources/Textures/Interface/VerbIcons/metapsionic.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png b/Resources/Textures/Interface/VerbIcons/mind_swap.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png
rename to Resources/Textures/Interface/VerbIcons/mind_swap.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml b/Resources/Textures/Interface/VerbIcons/mind_swap.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml
rename to Resources/Textures/Interface/VerbIcons/mind_swap.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png b/Resources/Textures/Interface/VerbIcons/mind_swap_return.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
rename to Resources/Textures/Interface/VerbIcons/mind_swap_return.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml b/Resources/Textures/Interface/VerbIcons/mind_swap_return.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml
rename to Resources/Textures/Interface/VerbIcons/mind_swap_return.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png b/Resources/Textures/Interface/VerbIcons/noospheric_zap.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
rename to Resources/Textures/Interface/VerbIcons/noospheric_zap.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml b/Resources/Textures/Interface/VerbIcons/noospheric_zap.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml
rename to Resources/Textures/Interface/VerbIcons/noospheric_zap.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png b/Resources/Textures/Interface/VerbIcons/psionic_invisibility.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml b/Resources/Textures/Interface/VerbIcons/psionic_invisibility.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png b/Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml b/Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png b/Resources/Textures/Interface/VerbIcons/psionic_regeneration.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
rename to Resources/Textures/Interface/VerbIcons/psionic_regeneration.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml b/Resources/Textures/Interface/VerbIcons/psionic_regeneration.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml
rename to Resources/Textures/Interface/VerbIcons/psionic_regeneration.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png b/Resources/Textures/Interface/VerbIcons/pyrokinesis.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
rename to Resources/Textures/Interface/VerbIcons/pyrokinesis.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml b/Resources/Textures/Interface/VerbIcons/pyrokinesis.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml
rename to Resources/Textures/Interface/VerbIcons/pyrokinesis.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png b/Resources/Textures/Interface/VerbIcons/telegnosis.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png
rename to Resources/Textures/Interface/VerbIcons/telegnosis.png
diff --git a/Resources/Textures/Interface/VerbIcons/telegnosis.png.yml b/Resources/Textures/Interface/VerbIcons/telegnosis.png.yml
new file mode 100644
index 00000000000..5c43e233050
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/telegnosis.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png
new file mode 100644
index 00000000000..280768b40af
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png
new file mode 100644
index 00000000000..e818e7dd11e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png
new file mode 100644
index 00000000000..fe98ec53eb2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
index f33401617c0..94795a626ea 100644
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus",
+    "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus, haven & forked_long & swallow by @Kilath",
     "size": {
         "x": 32,
         "y": 32
@@ -22,6 +22,22 @@
         {
             "name": "whitescale_forked_tailfin",
             "directions": 4
+        },
+        {
+            "name": "haven_tone_1",
+            "directions": 4
+        },
+        {
+            "name": "haven_tone_2",
+            "directions": 4
+        },
+        {
+            "name": "forked_long",
+            "directions": 4
+        },
+        {
+            "name": "swallow_tail",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png
new file mode 100644
index 00000000000..f9187b66f84
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png
new file mode 100644
index 00000000000..a147739cc90
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png
new file mode 100644
index 00000000000..b2170ff803c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png
new file mode 100644
index 00000000000..752d6cc9a20
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png
new file mode 100644
index 00000000000..528b5cbfa04
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
index 7737af0afc2..c8bf28767a8 100644
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "classicharpy Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/285f6f86ac41a6246f250993486effeab8581c2c, edited by @raistlin_jag | harpyfolded, harpy, and owl by @stillxicarus",
+    "copyright": "classicharpy Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/285f6f86ac41a6246f250993486effeab8581c2c, edited by @raistlin_jag | harpyfolded, harpy, and owl by @stillxicarus, bat wings by @Kilath",
     "states": [
         {
             "name": "huescale_harpy",
@@ -78,6 +78,22 @@
         {
             "name": "whitescale_harpy_wing_owl",
             "directions": 4
+        },
+        {
+            "name": "bat_wings_tone_1",
+            "directions": 4
+        },
+        {
+            "name": "bat_wings_tone_2",
+            "directions": 4
+        },
+        {
+            "name": "bionic_wings_tone_1",
+            "directions": 4
+        },
+        {
+            "name": "bionic_wings_tone_2",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png
new file mode 100644
index 00000000000..a6241e92d2d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png
new file mode 100644
index 00000000000..36cdefd238c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png
new file mode 100644
index 00000000000..05dd0eb54af
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png
new file mode 100644
index 00000000000..0b80c2dfedf
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png
new file mode 100644
index 00000000000..3c35f7720cb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries.png
new file mode 100644
index 00000000000..a18dff8b1ed
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png
new file mode 100644
index 00000000000..af46b769e81
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png
new file mode 100644
index 00000000000..2e3131634ea
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png
new file mode 100644
index 00000000000..1a6a2deee4b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png
new file mode 100644
index 00000000000..7341aaf74ed
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png
new file mode 100644
index 00000000000..bee9c5b581e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png
new file mode 100644
index 00000000000..574c2419331
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png
new file mode 100644
index 00000000000..0b041de7a6b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png
new file mode 100644
index 00000000000..95bb26cacfc
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png
new file mode 100644
index 00000000000..652beba012b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png
new file mode 100644
index 00000000000..c3d342bb552
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png
new file mode 100644
index 00000000000..55749ac8747
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png
new file mode 100644
index 00000000000..bc13cf5b61c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png
new file mode 100644
index 00000000000..97c251cbc6e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png
new file mode 100644
index 00000000000..49bd7c55fb5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png
new file mode 100644
index 00000000000..21a856102f9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png
new file mode 100644
index 00000000000..91180efbcc4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia.png
new file mode 100644
index 00000000000..ad78a14ade9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png
new file mode 100644
index 00000000000..fa8a079b3ce
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png
new file mode 100644
index 00000000000..bd601509cf7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png
new file mode 100644
index 00000000000..b6fcc64aa1b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png
new file mode 100644
index 00000000000..7f6126db6aa
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined.png
new file mode 100644
index 00000000000..e034dc0cd29
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png
new file mode 100644
index 00000000000..42d9b8416df
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png
new file mode 100644
index 00000000000..d0064183729
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png
new file mode 100644
index 00000000000..41d85c81ad6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json
new file mode 100644
index 00000000000..d68c9cb5acb
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json
@@ -0,0 +1,307 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "crowned by dootythefrooty, serket/pisces/virgo/sagittarius/vantas/nepeta/taurus/aries/tavris/inclined/wavy/antlers/unicorn/erebia/double_thick by angelofallars (github), double_curved/double_curved_outwards made by Rane modified by angelofallars (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "crowned",
+            "directions": 4
+        },
+        {
+            "name": "serket",
+            "directions": 4
+        },
+        {
+            "name": "serket_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "serket_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "serket_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "pisces",
+            "directions": 4
+        },
+        {
+            "name": "pisces_2tone_1",
+            "directions": 4
+        },
+        {
+            "name": "pisces_2tone_2",
+            "directions": 4
+        },
+        {
+            "name": "pisces_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "pisces_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "pisces_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "virgo",
+            "directions": 4
+        },
+        {
+            "name": "virgo_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "virgo_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "virgo_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "sagittarius",
+            "directions": 4
+        },
+        {
+            "name": "sagittarius_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "sagittarius_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "sagittarius_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "vantas",
+            "directions": 4
+        },
+        {
+            "name": "vantas_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "vantas_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "vantas_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "nepeta",
+            "directions": 4
+        },
+        {
+            "name": "nepeta_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "nepeta_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "nepeta_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "taurus",
+            "directions": 4
+        },
+        {
+            "name": "taurus_2tone_1",
+            "directions": 4
+        },
+        {
+            "name": "taurus_2tone_2",
+            "directions": 4
+        },
+        {
+            "name": "taurus_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "taurus_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "taurus_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "aries",
+            "directions": 4
+        },
+        {
+            "name": "aries_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "aries_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "aries_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "tavris",
+            "directions": 4
+        },
+        {
+            "name": "tavris_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "tavris_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "tavris_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "inclined",
+            "directions": 4
+        },
+        {
+            "name": "inclined_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "inclined_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "inclined_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "wavy",
+            "directions": 4
+        },
+        {
+            "name": "wavy_2tone_1",
+            "directions": 4
+        },
+        {
+            "name": "wavy_2tone_2",
+            "directions": 4
+        },
+        {
+            "name": "wavy_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "wavy_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "wavy_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "antlers_2tone_1",
+            "directions": 4
+        },
+        {
+            "name": "antlers_2tone_2",
+            "directions": 4
+        },
+        {
+            "name": "antlers_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "antlers_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "antlers_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "unicorn",
+            "directions": 4
+        },
+        {
+            "name": "erebia",
+            "directions": 4
+        },
+        {
+            "name": "erebia_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "erebia_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "erebia_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "erebia_rings",
+            "directions": 4
+        },
+        {
+            "name": "double_thick",
+            "directions": 4
+        },
+        {
+            "name": "double_thick_2tone_1",
+            "directions": 4
+        },
+        {
+            "name": "double_thick_2tone_2",
+            "directions": 4
+        },
+        {
+            "name": "double_thick_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "double_thick_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "double_thick_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "double_curved_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "double_curved_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "double_curved_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "double_curved_outwards_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "double_curved_outwards_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "double_curved_outwards_3tone_3",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png
new file mode 100644
index 00000000000..91d81f87a97
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png
new file mode 100644
index 00000000000..853ffb71d18
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png
new file mode 100644
index 00000000000..cc826595b41
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png
new file mode 100644
index 00000000000..4b1bdcb9a94
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces.png
new file mode 100644
index 00000000000..ddf6c337c8b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png
new file mode 100644
index 00000000000..33988ad80fb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png
new file mode 100644
index 00000000000..6f1d022df0a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png
new file mode 100644
index 00000000000..49bd7c55fb5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png
new file mode 100644
index 00000000000..a8c77f44af9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png
new file mode 100644
index 00000000000..ebece5a5dd3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png
new file mode 100644
index 00000000000..077c22535d4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png
new file mode 100644
index 00000000000..ba9dd0d7bbb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png
new file mode 100644
index 00000000000..20d31023640
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png
new file mode 100644
index 00000000000..1d9ccc5db29
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket.png
new file mode 100644
index 00000000000..a027a092645
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png
new file mode 100644
index 00000000000..114766c8867
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png
new file mode 100644
index 00000000000..0cbfc6c57e0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png
new file mode 100644
index 00000000000..6a998514c69
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus.png
new file mode 100644
index 00000000000..7df87b9aabb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png
new file mode 100644
index 00000000000..53d2a24fff0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png
new file mode 100644
index 00000000000..c614e1a5381
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png
new file mode 100644
index 00000000000..0dafd8e5e49
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png
new file mode 100644
index 00000000000..423d306dba2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png
new file mode 100644
index 00000000000..bdca7edf4cb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris.png
new file mode 100644
index 00000000000..2543ce6cf02
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png
new file mode 100644
index 00000000000..27930db2027
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png
new file mode 100644
index 00000000000..18143a00f4e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png
new file mode 100644
index 00000000000..04e3524befa
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png
new file mode 100644
index 00000000000..61834769015
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas.png
new file mode 100644
index 00000000000..12507d019ea
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png
new file mode 100644
index 00000000000..385f516a286
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png
new file mode 100644
index 00000000000..d66d97804aa
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png
new file mode 100644
index 00000000000..2396cbea6f2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo.png
new file mode 100644
index 00000000000..143525b7cde
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png
new file mode 100644
index 00000000000..4e66e19989e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png
new file mode 100644
index 00000000000..009c1830367
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png
new file mode 100644
index 00000000000..10ccb2bb110
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy.png
new file mode 100644
index 00000000000..7d503ac470b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png
new file mode 100644
index 00000000000..0cc88a280fd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png
new file mode 100644
index 00000000000..14b0972d1c6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png
new file mode 100644
index 00000000000..89cc5506f7e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png
new file mode 100644
index 00000000000..4eec76fed93
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png
new file mode 100644
index 00000000000..8c48c771a5c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png
new file mode 100644
index 00000000000..b616e392be3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png
new file mode 100644
index 00000000000..6d571687713
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png
new file mode 100644
index 00000000000..29984a83ced
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png
new file mode 100644
index 00000000000..5f2299ed3d6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png
new file mode 100644
index 00000000000..e2dfa02bb8c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png
new file mode 100644
index 00000000000..f2e1934d9d4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json
new file mode 100644
index 00000000000..66b6d33feb6
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json
@@ -0,0 +1,67 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tall_curved & tall_bull by dootythefrooty, makara by angelofallars (github)",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "tall_curved",
+            "directions": 4
+        },
+        {
+            "name": "tall_curved_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "tall_curved_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "tall_curved_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "tall_bull",
+            "directions": 4
+        },
+        {
+            "name": "tall_bull_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "tall_bull_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "tall_bull_3tone_3",
+            "directions": 4
+        },
+        {
+            "name": "makara",
+            "directions": 4
+        },
+        {
+            "name": "makara_2tone_1",
+            "directions": 4
+        },
+        {
+            "name": "makara_2tone_2",
+            "directions": 4
+        },
+        {
+            "name": "makara_3tone_1",
+            "directions": 4
+        },
+        {
+            "name": "makara_3tone_2",
+            "directions": 4
+        },
+        {
+            "name": "makara_3tone_3",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png
new file mode 100644
index 00000000000..203476e9332
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png
new file mode 100644
index 00000000000..7f198aa91b7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png
new file mode 100644
index 00000000000..57e6a5f605f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png
new file mode 100644
index 00000000000..cd427ae1179
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png
new file mode 100644
index 00000000000..b32391a95e8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png
new file mode 100644
index 00000000000..560776c3896
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png
new file mode 100644
index 00000000000..c0a01147865
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png
new file mode 100644
index 00000000000..b7e9a583904
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_full.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_full.png
new file mode 100644
index 00000000000..acb96562e73
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_full.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_none.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_none.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_none.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_top.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_top.png
new file mode 100644
index 00000000000..acb96562e73
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/female_top.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/full.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/full.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/full.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_full.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_full.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_full.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_none.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_none.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_none.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_top.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_top.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/male_top.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/meta.json b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/meta.json
new file mode 100644
index 00000000000..b44be570c4f
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+    "version": 1,
+    "copyright": "Rane",
+    "license": "CC-BY-SA-3.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "female_none",
+            "directions": 4
+        },
+        {
+            "name": "female_full",
+            "directions": 4
+        },
+        {
+            "name": "female_top",
+            "directions": 4
+        },
+        {
+            "name": "male_none",
+            "directions": 4
+        },
+        {
+            "name": "male_full",
+            "directions": 4
+        },
+        {
+            "name": "male_top",
+            "directions": 4
+        },
+        {
+            "name": "full",
+            "directions": 4
+        },
+        {
+            "name": "none",
+            "directions": 4
+        },
+        {
+            "name": "top",
+            "directions": 4
+        },
+        {
+            "name": "unisex_full",
+            "directions": 4
+        },
+        {
+            "name": "unisex_none",
+            "directions": 4
+        },
+        {
+            "name": "unisex_top",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/none.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/none.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/none.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/top.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/top.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/top.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_full.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_full.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_full.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_none.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_none.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_none.png differ
diff --git a/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_top.png b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_top.png
new file mode 100644
index 00000000000..20ccfaa8db4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi/unisex_top.png differ
diff --git a/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png
new file mode 100644
index 00000000000..fb706ac649e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png differ
diff --git a/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png
new file mode 100644
index 00000000000..c8b755b2283
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png differ
diff --git a/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png
new file mode 100644
index 00000000000..2b0a11239ad
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json
new file mode 100644
index 00000000000..0983b297549
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_tusks_small",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_big",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_none",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json b/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json
new file mode 100644
index 00000000000..c0792d54004
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by angelofallars (github), two toes based off of Reptilian ( https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi )",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "two_toes",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png
new file mode 100644
index 00000000000..898f115fe35
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json
new file mode 100644
index 00000000000..776d9505af0
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by angelofallars (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pointy_ears_standard",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_wide",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_small",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_thin",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_upwards",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_tall",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_slanted",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_large",
+      "directions": 4
+    },
+    {
+      "name": "pointy_ears_none",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png
new file mode 100644
index 00000000000..55c6e6c26d4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png
new file mode 100644
index 00000000000..967ff66c8bd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png
new file mode 100644
index 00000000000..93c7ee9a8c5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png
new file mode 100644
index 00000000000..c6cdebef005
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png
new file mode 100644
index 00000000000..38d7137e61b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png
new file mode 100644
index 00000000000..f42a86613a9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png
new file mode 100644
index 00000000000..a910e67f6d0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png
new file mode 100644
index 00000000000..8454708d9e4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png differ
diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png
new file mode 100644
index 00000000000..2a643bf6c61
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png differ
diff --git a/Resources/Textures/Mobs/Customization/spidereyes.rsi/eyes.png b/Resources/Textures/Mobs/Customization/spidereyes.rsi/eyes.png
new file mode 100644
index 00000000000..0f253476944
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/spidereyes.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Customization/spidereyes.rsi/meta.json b/Resources/Textures/Mobs/Customization/spidereyes.rsi/meta.json
new file mode 100644
index 00000000000..0eb61ec1dde
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/spidereyes.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+   "copyright" : "@Rane#7518",
+   "license" : "CC-BY-SA-3.0",
+   "size" : {
+      "x" : 32,
+      "y" : 32
+   },
+   "states" : [
+      {
+         "directions" : 4,
+         "name" : "eyes"
+      }
+   ],
+   "version" : 1
+}
diff --git a/Resources/Textures/Mobs/Species/arachne.rsi/meta.json b/Resources/Textures/Mobs/Species/arachne.rsi/meta.json
new file mode 100644
index 00000000000..a985b24cca3
--- /dev/null
+++ b/Resources/Textures/Mobs/Species/arachne.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-4.0",
+  "copyright": "Created by @kes#0001, colored by Woods#1999",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+     "name": "spider_body",
+     "directions": 4
+    },
+    {
+     "name": "spider_body_front",
+     "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Species/arachne.rsi/spider_body.png b/Resources/Textures/Mobs/Species/arachne.rsi/spider_body.png
new file mode 100644
index 00000000000..d1432cc3fd6
Binary files /dev/null and b/Resources/Textures/Mobs/Species/arachne.rsi/spider_body.png differ
diff --git a/Resources/Textures/Mobs/Species/arachne.rsi/spider_body_front.png b/Resources/Textures/Mobs/Species/arachne.rsi/spider_body_front.png
new file mode 100644
index 00000000000..0171f16fe38
Binary files /dev/null and b/Resources/Textures/Mobs/Species/arachne.rsi/spider_body_front.png differ
diff --git a/Resources/Textures/Mobs/Species/eyes.rsi/eyes.png b/Resources/Textures/Mobs/Species/eyes.rsi/eyes.png
new file mode 100644
index 00000000000..b6250e22b38
Binary files /dev/null and b/Resources/Textures/Mobs/Species/eyes.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Species/eyes.rsi/meta.json b/Resources/Textures/Mobs/Species/eyes.rsi/meta.json
new file mode 100644
index 00000000000..a98aba406f1
--- /dev/null
+++ b/Resources/Textures/Mobs/Species/eyes.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by @Rane#7518",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+     "name": "eyes",
+     "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon1.png b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon1.png
new file mode 100644
index 00000000000..27741fdf314
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon2.png b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon2.png
new file mode 100644
index 00000000000..252be2398af
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon3.png b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon3.png
new file mode 100644
index 00000000000..ca9cbb79bbe
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large1.png b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large1.png
new file mode 100644
index 00000000000..f9431f64285
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large2.png b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large2.png
new file mode 100644
index 00000000000..885bb7b3c93
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large3.png b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large3.png
new file mode 100644
index 00000000000..9a033961ffa
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/meta.json b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/meta.json
new file mode 100644
index 00000000000..08cfb264df9
--- /dev/null
+++ b/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+   "copyright" : "Taken from https://github.com/tgstation/tgstation",
+   "license" : "CC-BY-SA-3.0",
+   "size" : {
+      "x" : 32,
+      "y" : 32
+   },
+   "states" : [
+      {
+         "directions" : 1,
+         "name" : "cocoon1"
+      },
+      {
+         "directions" : 1,
+         "name" : "cocoon2"
+      },
+      {
+         "directions" : 1,
+         "name" : "cocoon3"
+      },
+      {
+         "directions" : 1,
+         "name" : "cocoon_large1"
+      },
+      {
+         "directions" : 1,
+         "name" : "cocoon_large2"
+      },
+      {
+         "directions" : 1,
+         "name" : "cocoon_large3"
+      }
+   ],
+   "version" : 1
+}
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/black.png b/Resources/Textures/Objects/Fun/catplushie.rsi/black.png
new file mode 100644
index 00000000000..e62cb62916e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/black.png differ
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/grey.png b/Resources/Textures/Objects/Fun/catplushie.rsi/grey.png
new file mode 100644
index 00000000000..b941adbf781
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/grey.png differ
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/meta.json b/Resources/Textures/Objects/Fun/catplushie.rsi/meta.json
new file mode 100644
index 00000000000..878f438f4ec
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/catplushie.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "black"
+        },
+        {
+            "name": "grey"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "siames"
+        },
+        {
+            "name": "tabby"
+        },
+        {
+            "name": "tuxedo"
+        },
+        {
+            "name": "white"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/orange.png b/Resources/Textures/Objects/Fun/catplushie.rsi/orange.png
new file mode 100644
index 00000000000..0f4cad131f7
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/orange.png differ
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/siames.png b/Resources/Textures/Objects/Fun/catplushie.rsi/siames.png
new file mode 100644
index 00000000000..6f27a86343a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/siames.png differ
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/tabby.png b/Resources/Textures/Objects/Fun/catplushie.rsi/tabby.png
new file mode 100644
index 00000000000..38575cc0de2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/tabby.png differ
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/tuxedo.png b/Resources/Textures/Objects/Fun/catplushie.rsi/tuxedo.png
new file mode 100644
index 00000000000..327f8b455ea
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/tuxedo.png differ
diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/white.png b/Resources/Textures/Objects/Fun/catplushie.rsi/white.png
new file mode 100644
index 00000000000..e16a9ed29db
Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/white.png differ
diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/corgi.png b/Resources/Textures/Objects/Fun/corgiplushie.rsi/corgi.png
new file mode 100644
index 00000000000..83eaa3bb860
Binary files /dev/null and b/Resources/Textures/Objects/Fun/corgiplushie.rsi/corgi.png differ
diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/girlycorgi.png b/Resources/Textures/Objects/Fun/corgiplushie.rsi/girlycorgi.png
new file mode 100644
index 00000000000..bf8be50eeaf
Binary files /dev/null and b/Resources/Textures/Objects/Fun/corgiplushie.rsi/girlycorgi.png differ
diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/meta.json b/Resources/Textures/Objects/Fun/corgiplushie.rsi/meta.json
new file mode 100644
index 00000000000..06c0cf9ed4a
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/corgiplushie.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "corgi"
+        },
+        {
+            "name": "girlycorgi"
+        },
+        {
+            "name": "robotcorgi"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/robotcorgi.png b/Resources/Textures/Objects/Fun/corgiplushie.rsi/robotcorgi.png
new file mode 100644
index 00000000000..a8dfdfb3f32
Binary files /dev/null and b/Resources/Textures/Objects/Fun/corgiplushie.rsi/robotcorgi.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/black.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/black.png
new file mode 100644
index 00000000000..b314043924a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/black.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/blue.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/blue.png
new file mode 100644
index 00000000000..ccc9b2d7e4a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/blue.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/coffee.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/coffee.png
new file mode 100644
index 00000000000..81650c1b6f6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/coffee.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/crimson.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/crimson.png
new file mode 100644
index 00000000000..02575061768
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/crimson.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/marble.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/marble.png
new file mode 100644
index 00000000000..b6f1cb9032d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/marble.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/meta.json b/Resources/Textures/Objects/Fun/foxplushie.rsi/meta.json
new file mode 100644
index 00000000000..5842b1ad07a
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/foxplushie.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "black"
+        },
+        {
+            "name": "blue"
+        },
+        {
+            "name": "coffee"
+        },
+        {
+            "name": "crimson"
+        },
+        {
+            "name": "marble"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "pink"
+        },
+        {
+            "name": "purple"
+        },
+        {
+            "name": "red"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/orange.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/orange.png
new file mode 100644
index 00000000000..5bd3098c0d2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/orange.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/pink.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/pink.png
new file mode 100644
index 00000000000..c07cdac4e7f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/pink.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/purple.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/purple.png
new file mode 100644
index 00000000000..18aa47315d6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/purple.png differ
diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/red.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/red.png
new file mode 100644
index 00000000000..966108f7abe
Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/red.png differ
diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/fred.png b/Resources/Textures/Objects/Fun/petrock.rsi/fred.png
new file mode 100644
index 00000000000..daa36c12fce
Binary files /dev/null and b/Resources/Textures/Objects/Fun/petrock.rsi/fred.png differ
diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/meta.json b/Resources/Textures/Objects/Fun/petrock.rsi/meta.json
new file mode 100644
index 00000000000..d39a58e623d
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/petrock.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "rock"
+        },
+        {
+            "name": "fred"
+        },
+        {
+            "name": "roxie"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/rock.png b/Resources/Textures/Objects/Fun/petrock.rsi/rock.png
new file mode 100644
index 00000000000..4f97dfeba6f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/petrock.rsi/rock.png differ
diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/roxie.png b/Resources/Textures/Objects/Fun/petrock.rsi/roxie.png
new file mode 100644
index 00000000000..f0a2f48c6d6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/petrock.rsi/roxie.png differ
diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/meta.json b/Resources/Textures/Objects/Fun/prizeticket.rsi/meta.json
new file mode 100644
index 00000000000..bf0f0d3224d
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/prizeticket.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "ticket"
+    },
+    {
+      "name": "ticket_2"
+    },
+    {
+      "name": "ticket_3"
+    },
+    {
+      "name": "ticket_4"
+    },
+    {
+      "name": "prizeball"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/prizeball.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/prizeball.png
new file mode 100644
index 00000000000..fd8290de147
Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/prizeball.png differ
diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket.png
new file mode 100644
index 00000000000..c52f243e9f5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket.png differ
diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_2.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_2.png
new file mode 100644
index 00000000000..7e59f474e6a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_2.png differ
diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_3.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_3.png
new file mode 100644
index 00000000000..00b58dcdf22
Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_3.png differ
diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_4.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_4.png
new file mode 100644
index 00000000000..fd4b9f5e6e4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_4.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/abductor.png b/Resources/Textures/Objects/Fun/toys.rsi/abductor.png
new file mode 100644
index 00000000000..f3efecc00e1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/abductor.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/abductor_agent.png b/Resources/Textures/Objects/Fun/toys.rsi/abductor_agent.png
new file mode 100644
index 00000000000..59aefaca07e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/abductor_agent.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/deer.png b/Resources/Textures/Objects/Fun/toys.rsi/deer.png
new file mode 100644
index 00000000000..d9bc621422f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/deer.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/gnome.png b/Resources/Textures/Objects/Fun/toys.rsi/gnome.png
new file mode 100644
index 00000000000..7fdb97a688d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/gnome.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/grey.png b/Resources/Textures/Objects/Fun/toys.rsi/grey.png
new file mode 100644
index 00000000000..6253fb8ca45
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/grey.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ipc.png b/Resources/Textures/Objects/Fun/toys.rsi/ipc.png
new file mode 100644
index 00000000000..ed8aac5cea8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ipc.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/loveable.png b/Resources/Textures/Objects/Fun/toys.rsi/loveable.png
new file mode 100644
index 00000000000..0011a2e8311
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/loveable.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index cae7880e414..24345aadf38 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,358 +1,391 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "plushie_ratvar"
-    },
-    {
-      "name": "plushie_penguin"
-    },
-    {
-      "name": "plushie_moth"
-    },
-    {
-      "name": "plushie_rouny",
-      "directions": 4
-    },
-    {
-      "name": "plushie_spacelizard"
-    },
-    {
-      "name": "carpplush"
-    },
-    {
-      "name": "holoplush",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "magicplush"
-    },
-    {
-      "name": "rainbowcarpplush"
-    },
-    {
-      "name": "narplush"
-    },
-    {
-      "name": "plushie_h"
-    },
-    {
-      "name": "bee-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "bee-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "bee-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "plushie_hampter"
-    },
-    {
-      "name": "plushie_arachnid"
-    },
-    {
-      "name": "plushie_lizard"
-    },
-    {
-      "name": "plushie_lizard_mirrored"
-    },
-    {
-      "name": "plushie_lamp"
-    },
-    {
-      "name": "plushie_nuke"
-    },
-    {
-      "name": "plushie_atmosian"
-    },
-    {
-      "name": "plushie_slime"
-    },
-    {
-      "name": "plushie_snake"
-    },
-    {
-      "name": "plushie_vox"
-    },
-    {
-      "name": "plushie_diona"
-    },
-    {
-      "name": "plushie_arachne"
-    },
-    {
-      "name": "plushie_human"
-    },
-    {
-      "name": "plushie_diona1"
-    },
-    {
-      "name": "plushie_xeno"
-    },
-    {
-      "name": "carpplush-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "carpplush-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "AI"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "bolt-closed"
-    },
-    {
-      "name": "bolt-open"
-    },
-    {
-      "name": "foamblade"
-    },
-    {
-      "name": "foamcrossbow"
-    },
-    {
-      "name": "foamdart"
-    },
-    {
-      "name": "foambox"
-    },
-    {
-      "name": "ian"
-    },
-    {
-      "name": "nuketoy"
-    },
-    {
-      "name": "snappop"
-    },
-    {
-      "name": "spbox"
-    },
-    {
-      "name": "toy_mouse"
-    },
-    {
-      "name": "mouse-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "capbullet"
-    },
-    {
-      "name": "foamcrossbow-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "foamcrossbow-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "capgun-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "capgun-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "foamblade-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "foamblade-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "corgib-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "corgib-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "ntb-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "ntb-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "synb-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "synb-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "synb"
-    },
-    {
-      "name": "ntb"
-    },
-    {
-      "name": "corgib"
-    },
-    {
-      "name": "football"
-    },
-    {
-      "name": "footb-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "footb-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "basketball"
-    },
-    {
-      "name": "bask-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bask-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "singularitytoy",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "orb",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "orb-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "orb-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "beachball"
-    },
-    {
-      "name": "beachb-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "beachb-inhand-right",
-      "directions": 4
-    }
-  ]
-}
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), plushie_jester - plushie_trystan - plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise Station",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "plushie_jester"
+        },
+        {
+            "name": "plushie_slips"
+        },
+        {
+            "name": "plushie_trystan"
+        },
+        {
+            "name": "plushie_vulp"
+        },
+        {
+            "name": "ipc"
+        },
+        {
+            "name": "deer"
+        },
+        {
+            "name": "grey"
+        },
+        {
+            "name": "loveable"
+        },
+        {
+            "name": "abductor"
+        },
+        {
+            "name": "abductor_agent"
+        },
+        {
+            "name": "gnome"
+        },
+        {
+            "name": "plushie_ratvar"
+        },
+        {
+            "name": "plushie_penguin"
+        },
+        {
+            "name": "plushie_moth"
+        },
+        {
+            "name": "plushie_rouny",
+            "directions": 4
+        },
+        {
+            "name": "plushie_spacelizard"
+        },
+        {
+            "name": "carpplush"
+        },
+        {
+            "name": "holoplush",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "magicplush"
+        },
+        {
+            "name": "rainbowcarpplush"
+        },
+        {
+            "name": "narplush"
+        },
+        {
+            "name": "plushie_h"
+        },
+        {
+            "name": "bee-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "bee-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "bee-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plushie_hampter"
+        },
+        {
+            "name": "plushie_arachnid"
+        },
+        {
+            "name": "plushie_lizard"
+        },
+        {
+            "name": "plushie_lizard_mirrored"
+        },
+        {
+            "name": "plushie_lamp"
+        },
+        {
+            "name": "plushie_nuke"
+        },
+        {
+            "name": "plushie_atmosian"
+        },
+        {
+            "name": "plushie_slime"
+        },
+        {
+            "name": "plushie_snake"
+        },
+        {
+            "name": "plushie_vox"
+        },
+        {
+            "name": "plushie_diona"
+        },
+        {
+            "name": "plushie_arachne"
+        },
+        {
+            "name": "plushie_human"
+        },
+        {
+            "name": "plushie_diona1"
+        },
+        {
+            "name": "plushie_xeno"
+        },
+        {
+            "name": "carpplush-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "carpplush-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "AI"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-closed"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "foamblade"
+        },
+        {
+            "name": "foamcrossbow"
+        },
+        {
+            "name": "foamdart"
+        },
+        {
+            "name": "foambox"
+        },
+        {
+            "name": "ian"
+        },
+        {
+            "name": "nuketoy"
+        },
+        {
+            "name": "snappop"
+        },
+        {
+            "name": "spbox"
+        },
+        {
+            "name": "toy_mouse"
+        },
+        {
+            "name": "mouse-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "capbullet"
+        },
+        {
+            "name": "foamcrossbow-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "foamcrossbow-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "capgun-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "capgun-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "foamblade-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "foamblade-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "corgib-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "corgib-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "ntb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ntb-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "synb-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "synb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "synb"
+        },
+        {
+            "name": "ntb"
+        },
+        {
+            "name": "corgib"
+        },
+        {
+            "name": "football"
+        },
+        {
+            "name": "footb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "footb-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "basketball"
+        },
+        {
+            "name": "bask-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "bask-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "singularitytoy",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "orb",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "orb-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "orb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "beachball"
+        },
+        {
+            "name": "beachb-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "beachb-inhand-right",
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_jester.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_jester.png
new file mode 100644
index 00000000000..267331f72fb
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_jester.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_slips.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_slips.png
new file mode 100644
index 00000000000..55b389ab568
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_slips.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_trystan.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_trystan.png
new file mode 100644
index 00000000000..e822d59265b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_trystan.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_vulp.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_vulp.png
new file mode 100644
index 00000000000..5b715fe7346
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_vulp.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index b57f9844bc7..dc7906e8590 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -260,6 +260,9 @@
     {
       "name": "paper_stamp-psychologist"
     },
+    {
+      "name": "paper_stamp-notary"
+    },
     {
       "name": "paper_stamp-signature"
     }
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png
new file mode 100644
index 00000000000..603351ace58
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png
new file mode 100644
index 00000000000..ec7033ec2fe
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-pka.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-pka.png
new file mode 100644
index 00000000000..db086b229e9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-pka.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 24992441359..ce8f8187b7d 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -61,6 +61,9 @@
     {
       "name": "icon-harvesting"
     },
+    {
+      "name": "icon-jetpack"
+    },
     {
       "name": "icon-light-replacer"
     },
@@ -79,6 +82,9 @@
     {
       "name": "icon-pen"
     },
+    {
+      "name": "icon-pka"
+    },
     {
       "name": "icon-radiation"
     },
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png
new file mode 100644
index 00000000000..dc458a0a3ff
Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png
new file mode 100644
index 00000000000..49b15d7ac2b
Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png
new file mode 100644
index 00000000000..46c6bc82135
Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png differ
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png
new file mode 100644
index 00000000000..645491fe141
Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png differ
diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/meta.json
new file mode 100644
index 00000000000..0241de806c0
--- /dev/null
+++ b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ghostprince",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "box"
+    },
+    {
+      "name": "box-open"
+    },
+    {
+      "name": "box-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "box-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Tools/cmopenlight.rsi/meta.json b/Resources/Textures/Objects/Tools/cmopenlight.rsi/meta.json
new file mode 100644
index 00000000000..8f4b8ba253f
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/cmopenlight.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "MistakeNot4892, https://github.com/NebulaSS13/Nebula/blob/dev/icons/obj/lighting/penlight.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "world"
+        },
+        {
+            "name": "world-on"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/cmopenlight.rsi/world-on.png b/Resources/Textures/Objects/Tools/cmopenlight.rsi/world-on.png
new file mode 100644
index 00000000000..fbd87cad203
Binary files /dev/null and b/Resources/Textures/Objects/Tools/cmopenlight.rsi/world-on.png differ
diff --git a/Resources/Textures/Objects/Tools/cmopenlight.rsi/world.png b/Resources/Textures/Objects/Tools/cmopenlight.rsi/world.png
new file mode 100644
index 00000000000..40edaedd9e5
Binary files /dev/null and b/Resources/Textures/Objects/Tools/cmopenlight.rsi/world.png differ
diff --git a/Resources/Textures/Objects/Tools/penlight.rsi/meta.json b/Resources/Textures/Objects/Tools/penlight.rsi/meta.json
new file mode 100644
index 00000000000..8f4b8ba253f
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/penlight.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "MistakeNot4892, https://github.com/NebulaSS13/Nebula/blob/dev/icons/obj/lighting/penlight.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "world"
+        },
+        {
+            "name": "world-on"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/penlight.rsi/world-on.png b/Resources/Textures/Objects/Tools/penlight.rsi/world-on.png
new file mode 100644
index 00000000000..afb10cdad4e
Binary files /dev/null and b/Resources/Textures/Objects/Tools/penlight.rsi/world-on.png differ
diff --git a/Resources/Textures/Objects/Tools/penlight.rsi/world.png b/Resources/Textures/Objects/Tools/penlight.rsi/world.png
new file mode 100644
index 00000000000..4cf616bf959
Binary files /dev/null and b/Resources/Textures/Objects/Tools/penlight.rsi/world.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..0f42b7f1472
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/icon.png
new file mode 100644
index 00000000000..33eec9258c6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png
new file mode 100644
index 00000000000..e5705afdbff
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png
new file mode 100644
index 00000000000..c846a248398
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/meta.json
new file mode 100644
index 00000000000..9fc426bdc68
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Homerun bat variant modified by Mike, Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..2ca1fd0a79c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..9bc7096335c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Structures/Furniture/shower.rsi/meta.json b/Resources/Textures/Structures/Furniture/shower.rsi/meta.json
new file mode 100644
index 00000000000..8e48a41e2f3
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/shower.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Dakodragon, DiscordID: 56038550335922176",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "shower",
+            "directions": 4
+        },
+        {
+            "name": "shower_on",
+            "directions": 4,
+            "delays": [
+                [ 0.3, 0.3, 0.3 ],
+                [ 0.3, 0.3, 0.3 ],
+                [ 0.3, 0.3, 0.3 ],
+                [ 0.3, 0.3, 0.3 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Furniture/shower.rsi/shower.png b/Resources/Textures/Structures/Furniture/shower.rsi/shower.png
new file mode 100644
index 00000000000..4ebce554d1c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/shower.rsi/shower.png differ
diff --git a/Resources/Textures/Structures/Furniture/shower.rsi/shower_on.png b/Resources/Textures/Structures/Furniture/shower.rsi/shower_on.png
new file mode 100644
index 00000000000..bf1737c0bb1
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/shower.rsi/shower_on.png differ
diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/icon.png b/Resources/Textures/Structures/Machines/prizecounter.rsi/icon.png
new file mode 100644
index 00000000000..4a2e7df7335
Binary files /dev/null and b/Resources/Textures/Structures/Machines/prizecounter.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/meta.json b/Resources/Textures/Structures/Machines/prizecounter.rsi/meta.json
new file mode 100644
index 00000000000..c8a01ff8d86
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/prizecounter.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "unlit"
+    },
+    {
+      "name": "panel"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/panel.png b/Resources/Textures/Structures/Machines/prizecounter.rsi/panel.png
new file mode 100644
index 00000000000..65dce282de0
Binary files /dev/null and b/Resources/Textures/Structures/Machines/prizecounter.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/unlit.png b/Resources/Textures/Structures/Machines/prizecounter.rsi/unlit.png
new file mode 100644
index 00000000000..45074c1ac4a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/prizecounter.rsi/unlit.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj.png b/Resources/Textures/Structures/Storage/closet.rsi/cj.png
new file mode 100644
index 00000000000..c57b4b88990
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/cj.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png
new file mode 100644
index 00000000000..f406e398073
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png
new file mode 100644
index 00000000000..8ba72a5bccf
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk.png
new file mode 100644
index 00000000000..d941ab4bf54
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/clerk.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png
new file mode 100644
index 00000000000..e31a6468b9a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png
new file mode 100644
index 00000000000..ab865e6cbe5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index c52bc13540e..d3802637c05 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e",
+  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), CJ and Clerk lockers edited by Timemaster99 (Discord), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -163,6 +163,24 @@
     {
       "name": "chemical_door"
     },
+    {
+      "name": "cj"
+    },
+    {
+      "name": "cj_door"
+    },
+    {
+      "name": "cj_open"
+    },
+    {
+      "name": "clerk"
+    },
+    {
+      "name": "clerk_door"
+    },
+    {
+      "name": "clerk_open"
+    },
     {
       "name": "cmo"
     },
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_base.png b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_base.png
new file mode 100644
index 00000000000..778c4277350
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_ext.png b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_ext.png
new file mode 100644
index 00000000000..7b7f3f4e767
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_ext.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_high.png b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_high.png
new file mode 100644
index 00000000000..7b7f3f4e767
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_high.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_idle.png b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_idle.png
new file mode 100644
index 00000000000..4038e100886
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_idle.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_low.png b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_low.png
new file mode 100644
index 00000000000..a09613ad524
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_low.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_med.png b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_med.png
new file mode 100644
index 00000000000..33d354a6a6e
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_med.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/radalarm.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/meta.json
new file mode 100644
index 00000000000..2ef22994bc0
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/radalarm.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by @dootythefrooty (Discord)",
+    "states": [
+        {
+            "name": "geiger_base",
+            "directions": 4
+        },
+        {
+            "name": "geiger_on_idle",
+            "directions": 4
+        },
+        {
+            "name": "geiger_on_low",
+            "directions": 4
+        },
+        {
+            "name": "geiger_on_med",
+            "directions": 4
+        },
+        {
+            "name": "geiger_on_high",
+            "directions": 4
+        },
+        {
+            "name": "geiger_on_ext",
+            "directions": 4
+        }
+    ]
+}
diff --git a/flake.lock b/flake.lock
index 7baaa468ea5..40a98aa9f96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717352157,
-        "narHash": "sha256-hbBzucWOhwxt3QzeAyUojtD6/aHH81JssDfhFfmqOy0=",
+        "lastModified": 1723382296,
+        "narHash": "sha256-55jPcSyBPG77QysozW12H0VA0E56PJYS+duYndDUNLg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44f538ab12e2726af450877a5529f4fd88ddb0fb",
+        "rev": "a5d81094146e6b042c4e5f4c5e179c5c35c3ae28",
         "type": "github"
       },
       "original": {