From a1b588fec4248665953eab2c24fc3241e85e58c6 Mon Sep 17 00:00:00 2001
From: spess-empyrean <spessempyrean@gmail.com>
Date: Wed, 15 Jan 2025 02:39:30 -0600
Subject: [PATCH 01/64] Ports "Fix animation looping bugs" from wizden.

---
 Content.Client/Jittering/JitteringSystem.cs               | 3 +++
 Content.Client/Light/EntitySystems/LightBehaviorSystem.cs | 3 +++
 Content.Client/Light/EntitySystems/RotatingLightSystem.cs | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs
index aafaf318bb9..cd3e5065ffc 100644
--- a/Content.Client/Jittering/JitteringSystem.cs
+++ b/Content.Client/Jittering/JitteringSystem.cs
@@ -48,6 +48,9 @@ private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, A
             if (args.Key != _jitterAnimationKey || jittering.LifeStage >= ComponentLifeStage.Stopping)
                 return;
 
+            if (!args.Finished)
+                return;
+
             if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)
                 && TryComp(uid, out SpriteComponent? sprite))
                 _animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
index 11f69165cf6..ca19d8522c5 100644
--- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
@@ -19,6 +19,9 @@ public override void Initialize()
 
     private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent component, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         var container = component.Animations.FirstOrDefault(x => x.FullKey == args.Key);
 
         if (container == null)
diff --git a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs
index 842c13dedfe..5c2c4e4c875 100644
--- a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs
@@ -69,6 +69,9 @@ private void OnAfterAutoHandleState(EntityUid uid, RotatingLightComponent comp,
 
     private void OnAnimationComplete(EntityUid uid, RotatingLightComponent comp, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         PlayAnimation(uid, comp);
     }
 

From 182820fdb2b1ab09ac72de640242a2230ce821ea Mon Sep 17 00:00:00 2001
From: spess-empyrean <spessempyrean@gmail.com>
Date: Wed, 15 Jan 2025 02:54:47 -0600
Subject: [PATCH 02/64] Ports "Refactor LightBehaviorSystem" from wizden

---
 .../Components/LightBehaviourComponent.cs     | 163 ++----------------
 .../EntitySystems/ExpendableLightSystem.cs    |   5 +-
 .../EntitySystems/LightBehaviorSystem.cs      | 136 ++++++++++++++-
 Content.Client/Light/HandheldLightSystem.cs   |  12 +-
 .../Items/VoidTorch/VoidTorchSystem.cs        |   7 +-
 5 files changed, 154 insertions(+), 169 deletions(-)

diff --git a/Content.Client/Light/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs
index 7e8bf82a29e..bcdb890c013 100644
--- a/Content.Client/Light/Components/LightBehaviourComponent.cs
+++ b/Content.Client/Light/Components/LightBehaviourComponent.cs
@@ -68,7 +68,7 @@ public void UpdatePlaybackValues(Animation owner)
 
             if (MinDuration > 0)
             {
-                MaxTime = (float) _random.NextDouble() * (MaxDuration - MinDuration) + MinDuration;
+                MaxTime = (float)_random.NextDouble() * (MaxDuration - MinDuration) + MinDuration;
             }
             else
             {
@@ -192,11 +192,11 @@ public override (int KeyFrameIndex, float FramePlayingTime) AdvancePlayback(
             {
                 if (interpolateValue < 0.5f)
                 {
-                    ApplyInterpolation(StartValue, EndValue, interpolateValue*2);
+                    ApplyInterpolation(StartValue, EndValue, interpolateValue * 2);
                 }
                 else
                 {
-                    ApplyInterpolation(EndValue, StartValue, (interpolateValue-0.5f)*2);
+                    ApplyInterpolation(EndValue, StartValue, (interpolateValue - 0.5f) * 2);
                 }
             }
             else
@@ -238,9 +238,9 @@ public sealed partial class RandomizeBehaviour : LightBehaviourAnimationTrack
 
         public override void OnInitialize()
         {
-            _randomValue1 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
-            _randomValue2 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
-            _randomValue3 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
+            _randomValue1 = (float)InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
+            _randomValue2 = (float)InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
+            _randomValue3 = (float)InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
         }
 
         public override void OnStart()
@@ -258,7 +258,7 @@ public override void OnStart()
             }
 
             _randomValue3 = _randomValue4;
-            _randomValue4 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
+            _randomValue4 = (float)InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble());
         }
 
         public override (int KeyFrameIndex, float FramePlayingTime) AdvancePlayback(
@@ -362,7 +362,7 @@ public sealed partial class LightBehaviourComponent : SharedLightBehaviourCompon
         [Dependency] private readonly IEntityManager _entMan = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
 
-        private const string KeyPrefix = nameof(LightBehaviourComponent);
+        public const string KeyPrefix = nameof(LightBehaviourComponent);
 
         public sealed class AnimationContainer
         {
@@ -387,7 +387,7 @@ public AnimationContainer(int key, Animation animation, LightBehaviourAnimationT
         public readonly List<AnimationContainer> Animations = new();
 
         [ViewVariables(VVAccess.ReadOnly)]
-        private Dictionary<string, object> _originalPropertyValues = new();
+        public Dictionary<string, object> OriginalPropertyValues = new();
 
         void ISerializationHooks.AfterDeserialization()
         {
@@ -397,155 +397,12 @@ void ISerializationHooks.AfterDeserialization()
             {
                 var animation = new Animation()
                 {
-                    AnimationTracks = {behaviour}
+                    AnimationTracks = { behaviour }
                 };
 
                 Animations.Add(new AnimationContainer(key, animation, behaviour));
                 key++;
             }
         }
-
-        /// <summary>
-        /// If we disable all the light behaviours we want to be able to revert the light to its original state.
-        /// </summary>
-        private void CopyLightSettings(EntityUid uid, string property)
-        {
-            if (_entMan.TryGetComponent(uid, out PointLightComponent? light))
-            {
-                var propertyValue = AnimationHelper.GetAnimatableProperty(light, property);
-                if (propertyValue != null)
-                {
-                    _originalPropertyValues.Add(property, propertyValue);
-                }
-            }
-            else
-            {
-                Logger.Warning($"{_entMan.GetComponent<MetaDataComponent>(uid).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!");
-            }
-        }
-
-        /// <summary>
-        /// Start animating a light behaviour with the specified ID. If the specified ID is empty, it will start animating all light behaviour entries.
-        /// If specified light behaviours are already animating, calling this does nothing.
-        /// Multiple light behaviours can have the same ID.
-        /// </summary>
-        public void StartLightBehaviour(string id = "")
-        {
-            var uid = Owner;
-            if (!_entMan.TryGetComponent(uid, out AnimationPlayerComponent? animation))
-            {
-                return;
-            }
-
-            var animations = _entMan.System<AnimationPlayerSystem>();
-
-            foreach (var container in Animations)
-            {
-                if (container.LightBehaviour.ID == id || id == string.Empty)
-                {
-                    if (!animations.HasRunningAnimation(uid, animation, KeyPrefix + container.Key))
-                    {
-                        CopyLightSettings(uid, container.LightBehaviour.Property);
-                        container.LightBehaviour.UpdatePlaybackValues(container.Animation);
-                        animations.Play(uid, animation, container.Animation, KeyPrefix + container.Key);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// If any light behaviour with the specified ID is animating, then stop it.
-        /// If no ID is specified then all light behaviours will be stopped.
-        /// Multiple light behaviours can have the same ID.
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="removeBehaviour">Should the behaviour(s) also be removed permanently?</param>
-        /// <param name="resetToOriginalSettings">Should the light have its original settings applied?</param>
-        public void StopLightBehaviour(string id = "", bool removeBehaviour = false, bool resetToOriginalSettings = false)
-        {
-            var uid = Owner;
-            if (!_entMan.TryGetComponent(uid, out AnimationPlayerComponent? animation))
-            {
-                return;
-            }
-
-            var toRemove = new List<AnimationContainer>();
-            var animations = _entMan.System<AnimationPlayerSystem>();
-
-            foreach (var container in Animations)
-            {
-                if (container.LightBehaviour.ID == id || id == string.Empty)
-                {
-                    if (animations.HasRunningAnimation(uid, animation, KeyPrefix + container.Key))
-                    {
-                        animations.Stop(uid, animation, KeyPrefix + container.Key);
-                    }
-
-                    if (removeBehaviour)
-                    {
-                        toRemove.Add(container);
-                    }
-                }
-            }
-
-            foreach (var container in toRemove)
-            {
-                Animations.Remove(container);
-            }
-
-            if (resetToOriginalSettings && _entMan.TryGetComponent(uid, out PointLightComponent? light))
-            {
-                foreach (var (property, value) in _originalPropertyValues)
-                {
-                    AnimationHelper.SetAnimatableProperty(light, property, value);
-                }
-            }
-
-            _originalPropertyValues.Clear();
-        }
-
-        /// <summary>
-        /// Checks if at least one behaviour is running.
-        /// </summary>
-        /// <returns>Whether at least one behaviour is running, false if none is.</returns>
-        public bool HasRunningBehaviours()
-        {
-            var uid = Owner;
-            if (!_entMan.TryGetComponent(uid, out AnimationPlayerComponent? animation))
-            {
-                return false;
-            }
-
-            var animations = _entMan.System<AnimationPlayerSystem>();
-            return Animations.Any(container => animations.HasRunningAnimation(uid, animation, KeyPrefix + container.Key));
-        }
-
-        /// <summary>
-        /// Add a new light behaviour to the component and start it immediately unless otherwise specified.
-        /// </summary>
-        public void AddNewLightBehaviour(LightBehaviourAnimationTrack behaviour, bool playImmediately = true)
-        {
-            var key = 0;
-
-            while (Animations.Any(x => x.Key == key))
-            {
-                key++;
-            }
-
-            var animation = new Animation()
-            {
-                AnimationTracks = {behaviour}
-            };
-
-            behaviour.Initialize(Owner, _random, _entMan);
-
-            var container = new AnimationContainer(key, animation, behaviour);
-            Animations.Add(container);
-
-            if (playImmediately)
-            {
-                StartLightBehaviour(behaviour.ID);
-            }
-        }
     }
 }
diff --git a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs
index 80774067301..4d52b0933d4 100644
--- a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs
@@ -11,6 +11,7 @@ public sealed class ExpendableLightSystem : VisualizerSystem<ExpendableLightComp
 {
     [Dependency] private readonly PointLightSystem _pointLightSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly LightBehaviorSystem _lightBehavior = default!;
 
     public override void Initialize()
     {
@@ -32,11 +33,11 @@ protected override void OnAppearanceChange(EntityUid uid, ExpendableLightCompone
         if (AppearanceSystem.TryGetData<string>(uid, ExpendableLightVisuals.Behavior, out var lightBehaviourID, args.Component)
         &&  TryComp<LightBehaviourComponent>(uid, out var lightBehaviour))
         {
-            lightBehaviour.StopLightBehaviour();
+            _lightBehavior.StopLightBehaviour((uid, lightBehaviour));
 
             if (!string.IsNullOrEmpty(lightBehaviourID))
             {
-                lightBehaviour.StartLightBehaviour(lightBehaviourID);
+                _lightBehavior.StartLightBehaviour((uid, lightBehaviour), lightBehaviourID);
             }
             else if (TryComp<PointLightComponent>(uid, out var light))
             {
diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
index ca19d8522c5..9301c31d3ea 100644
--- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
@@ -1,7 +1,9 @@
 using System.Linq;
 using Content.Client.Light.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.Animations;
 using Robust.Shared.Random;
+using Robust.Shared.Animations;
 
 namespace Content.Client.Light.EntitySystems;
 
@@ -36,23 +38,145 @@ private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent
         }
     }
 
-    private void OnLightStartup(EntityUid uid, LightBehaviourComponent component, ComponentStartup args)
+    private void OnLightStartup(Entity<LightBehaviourComponent> entity, ref ComponentStartup args)
     {
         // TODO: Do NOT ensure component here. And use eventbus events instead...
-        EnsureComp<AnimationPlayerComponent>(uid);
+        EnsureComp<AnimationPlayerComponent>(entity);
 
-        foreach (var container in component.Animations)
+        foreach (var container in entity.Comp.Animations)
         {
-            container.LightBehaviour.Initialize(uid, _random, EntityManager);
+            container.LightBehaviour.Initialize(entity, _random, EntityManager);
         }
 
         // we need to initialize all behaviours before starting any
-        foreach (var container in component.Animations)
+        foreach (var container in entity.Comp.Animations)
         {
             if (container.LightBehaviour.Enabled)
             {
-                component.StartLightBehaviour(container.LightBehaviour.ID);
+                StartLightBehaviour(entity, container.LightBehaviour.ID);
             }
         }
     }
+
+    /// <summary>
+    /// If we disable all the light behaviours we want to be able to revert the light to its original state.
+    /// </summary>
+    private void CopyLightSettings(Entity<LightBehaviourComponent> entity, string property)
+    {
+        if (EntityManager.TryGetComponent(entity, out PointLightComponent? light))
+        {
+            var propertyValue = AnimationHelper.GetAnimatableProperty(light, property);
+            if (propertyValue != null)
+            {
+                entity.Comp.OriginalPropertyValues.Add(property, propertyValue);
+            }
+        }
+        else
+        {
+            Log.Warning($"{EntityManager.GetComponent<MetaDataComponent>(entity).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!");
+        }
+    }
+    /// <summary>
+    /// Start animating a light behaviour with the specified ID. If the specified ID is empty, it will start animating all light behaviour entries.
+    /// If specified light behaviours are already animating, calling this does nothing.
+    /// Multiple light behaviours can have the same ID.
+    /// </summary>
+    public void StartLightBehaviour(Entity<LightBehaviourComponent> entity, string id = "")
+    {
+        if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
+        {
+            return;
+        }
+        foreach (var container in entity.Comp.Animations)
+        {
+            if (container.LightBehaviour.ID == id || id == string.Empty)
+            {
+                if (!_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
+                {
+                    CopyLightSettings(entity, container.LightBehaviour.Property);
+                    container.LightBehaviour.UpdatePlaybackValues(container.Animation);
+                    _player.Play(entity, container.Animation, LightBehaviourComponent.KeyPrefix + container.Key);
+                }
+            }
+        }
+    }
+    /// <summary>
+    /// If any light behaviour with the specified ID is animating, then stop it.
+    /// If no ID is specified then all light behaviours will be stopped.
+    /// Multiple light behaviours can have the same ID.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="removeBehaviour">Should the behaviour(s) also be removed permanently?</param>
+    /// <param name="resetToOriginalSettings">Should the light have its original settings applied?</param>
+    public void StopLightBehaviour(Entity<LightBehaviourComponent> entity, string id = "", bool removeBehaviour = false, bool resetToOriginalSettings = false)
+    {
+        if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
+        {
+            return;
+        }
+        var comp = entity.Comp;
+        var toRemove = new List<LightBehaviourComponent.AnimationContainer>();
+        foreach (var container in comp.Animations)
+        {
+            if (container.LightBehaviour.ID == id || id == string.Empty)
+            {
+                if (_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
+                {
+                    _player.Stop(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key);
+                }
+                if (removeBehaviour)
+                {
+                    toRemove.Add(container);
+                }
+            }
+        }
+        foreach (var container in toRemove)
+        {
+            comp.Animations.Remove(container);
+        }
+        if (resetToOriginalSettings && EntityManager.TryGetComponent(entity, out PointLightComponent? light))
+        {
+            foreach (var (property, value) in comp.OriginalPropertyValues)
+            {
+                AnimationHelper.SetAnimatableProperty(light, property, value);
+            }
+        }
+        comp.OriginalPropertyValues.Clear();
+    }
+    /// <summary>
+    /// Checks if at least one behaviour is running.
+    /// </summary>
+    /// <returns>Whether at least one behaviour is running, false if none is.</returns>
+    public bool HasRunningBehaviours(Entity<LightBehaviourComponent> entity)
+    {
+        //var uid = Owner;
+        if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
+        {
+            return false;
+        }
+        return entity.Comp.Animations.Any(container => _player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key));
+    }
+    /// <summary>
+    /// Add a new light behaviour to the component and start it immediately unless otherwise specified.
+    /// </summary>
+    public void AddNewLightBehaviour(Entity<LightBehaviourComponent> entity, LightBehaviourAnimationTrack behaviour, bool playImmediately = true)
+    {
+        var key = 0;
+        var comp = entity.Comp;
+        while (comp.Animations.Any(x => x.Key == key))
+        {
+            key++;
+        }
+        var animation = new Animation()
+        {
+            AnimationTracks = { behaviour }
+        };
+        behaviour.Initialize(entity.Owner, _random, EntityManager);
+        var container = new LightBehaviourComponent.AnimationContainer(key, animation, behaviour);
+        comp.Animations.Add(container);
+        if (playImmediately)
+        {
+            StartLightBehaviour(entity, behaviour.ID);
+        }
+    }
 }
diff --git a/Content.Client/Light/HandheldLightSystem.cs b/Content.Client/Light/HandheldLightSystem.cs
index 7f18223811d..ddd99c7c483 100644
--- a/Content.Client/Light/HandheldLightSystem.cs
+++ b/Content.Client/Light/HandheldLightSystem.cs
@@ -3,15 +3,15 @@
 using Content.Shared.Light;
 using Content.Shared.Light.Components;
 using Content.Shared.Toggleable;
-using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Shared.Animations;
+using Content.Client.Light.EntitySystems;
 
 namespace Content.Client.Light;
 
 public sealed class HandheldLightSystem : SharedHandheldLightSystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly LightBehaviorSystem _lightBehavior = default!;
 
     public override void Initialize()
     {
@@ -41,9 +41,9 @@ private void OnAppearanceChange(EntityUid uid, HandheldLightComponent? component
         if (TryComp<LightBehaviourComponent>(uid, out var lightBehaviour))
         {
             // Reset any running behaviour to reset the animated properties back to the original value, to avoid conflicts between resets
-            if (lightBehaviour.HasRunningBehaviours())
+            if (_lightBehavior.HasRunningBehaviours((uid, lightBehaviour)))
             {
-                lightBehaviour.StopLightBehaviour(resetToOriginalSettings: true);
+                _lightBehavior.StopLightBehaviour((uid, lightBehaviour), resetToOriginalSettings: true);
             }
 
             if (!enabled)
@@ -56,10 +56,10 @@ private void OnAppearanceChange(EntityUid uid, HandheldLightComponent? component
                 case HandheldLightPowerStates.FullPower:
                     break; // We just needed to reset all behaviours
                 case HandheldLightPowerStates.LowPower:
-                    lightBehaviour.StartLightBehaviour(component.RadiatingBehaviourId);
+                    _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.RadiatingBehaviourId);
                     break;
                 case HandheldLightPowerStates.Dying:
-                    lightBehaviour.StartLightBehaviour(component.BlinkingBehaviourId);
+                    _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.BlinkingBehaviourId);
                     break;
             }
         }
diff --git a/Content.Client/WhiteDream/BloodCult/Items/VoidTorch/VoidTorchSystem.cs b/Content.Client/WhiteDream/BloodCult/Items/VoidTorch/VoidTorchSystem.cs
index 8b92fb7da89..3e0d1cfa161 100644
--- a/Content.Client/WhiteDream/BloodCult/Items/VoidTorch/VoidTorchSystem.cs
+++ b/Content.Client/WhiteDream/BloodCult/Items/VoidTorch/VoidTorchSystem.cs
@@ -1,4 +1,5 @@
 using Content.Client.Light.Components;
+using Content.Client.Light.EntitySystems;
 using Content.Shared.WhiteDream.BloodCult;
 using Content.Shared.WhiteDream.BloodCult.Items.VoidTorch;
 using Robust.Client.GameObjects;
@@ -7,6 +8,8 @@ namespace Content.Client.WhiteDream.BloodCult.Items.VoidTorch;
 
 public sealed class VoidTorchSystem : VisualizerSystem<VoidTorchComponent>
 {
+    [Dependency] private readonly LightBehaviorSystem _lightBehavior = default!;
+
     protected override void OnAppearanceChange(EntityUid uid,
         VoidTorchComponent component,
         ref AppearanceChangeEvent args)
@@ -17,7 +20,7 @@ protected override void OnAppearanceChange(EntityUid uid,
             || !TryComp<LightBehaviourComponent>(uid, out var lightBehaviour))
             return;
 
-        lightBehaviour.StopLightBehaviour();
-        lightBehaviour.StartLightBehaviour(state ? component.TurnOnLightBehaviour : component.TurnOffLightBehaviour);
+        _lightBehavior.StopLightBehaviour((uid, lightBehaviour));
+        _lightBehavior.StartLightBehaviour((uid, lightBehaviour), state ? component.TurnOnLightBehaviour : component.TurnOffLightBehaviour);
     }
 }

From 1885d33f38919c1fc6c504447affc61dc7b9b693 Mon Sep 17 00:00:00 2001
From: spess-empyrean <spessempyrean@gmail.com>
Date: Wed, 15 Jan 2025 15:41:46 -0600
Subject: [PATCH 03/64] Apply suggestions from code review

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: spess-empyrean <spessempyrean@gmail.com>
---
 .../EntitySystems/LightBehaviorSystem.cs      | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
index 9301c31d3ea..789e6e1d207 100644
--- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
@@ -84,20 +84,17 @@ private void CopyLightSettings(Entity<LightBehaviourComponent> entity, string pr
     public void StartLightBehaviour(Entity<LightBehaviourComponent> entity, string id = "")
     {
         if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
-        {
             return;
-        }
+
         foreach (var container in entity.Comp.Animations)
         {
-            if (container.LightBehaviour.ID == id || id == string.Empty)
-            {
-                if (!_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
-                {
-                    CopyLightSettings(entity, container.LightBehaviour.Property);
-                    container.LightBehaviour.UpdatePlaybackValues(container.Animation);
-                    _player.Play(entity, container.Animation, LightBehaviourComponent.KeyPrefix + container.Key);
-                }
-            }
+            if (container.LightBehaviour.ID != id || id != string.Empty
+                || _player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
+                continue;
+                
+            CopyLightSettings(entity, container.LightBehaviour.Property);
+            container.LightBehaviour.UpdatePlaybackValues(container.Animation);
+            _player.Play(entity, container.Animation, LightBehaviourComponent.KeyPrefix + container.Key);
         }
     }
     /// <summary>
@@ -118,17 +115,14 @@ public void StopLightBehaviour(Entity<LightBehaviourComponent> entity, string id
         var toRemove = new List<LightBehaviourComponent.AnimationContainer>();
         foreach (var container in comp.Animations)
         {
-            if (container.LightBehaviour.ID == id || id == string.Empty)
-            {
-                if (_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
-                {
-                    _player.Stop(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key);
-                }
-                if (removeBehaviour)
-                {
-                    toRemove.Add(container);
-                }
-            }
+            if (container.LightBehaviour.ID != id || id != string.Empty)
+                continue;
+
+            if (_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
+                _player.Stop(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key);
+                    
+            if (removeBehaviour)
+                toRemove.Add(container);
         }
         foreach (var container in toRemove)
         {

From 558578399f24a1e6c0bb3818d123795e4350662e Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Thu, 16 Jan 2025 18:51:41 +0800
Subject: [PATCH 04/64] increase brain eat delay and show popup when trying to
 eat brain

---
 .../Nutrition/Components/FoodComponent.cs     |  6 +++++
 .../Nutrition/EntitySystems/FoodSystem.cs     | 27 +++++++++++++++++--
 .../nutrition/components/food-component.ftl   |  5 ++++
 Resources/Prototypes/Body/Organs/diona.yml    |  4 +++
 Resources/Prototypes/Body/Organs/human.yml    |  6 ++++-
 .../_Shitmed/Body/Organs/Animal/animal.yml    |  4 +++
 6 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl

diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index cfb69f53f0c..a8fe7517c4d 100644
--- a/Content.Server/Nutrition/Components/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -69,6 +69,12 @@ public sealed partial class FoodComponent : Component
     [DataField]
     public float ForceFeedDelay = 3;
 
+    /// <summary>
+    /// Shitmed Change: Whether to show a popup to everyone in range when attempting to eat this food.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool PopupOnEatAttempt = false;
+
     /// <summary>
     /// For mobs that are food, requires killing them before eating.
     /// </summary>
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index f99cecc8e7a..82e4865b040 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -24,6 +24,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups; // Shitmed Change
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
@@ -164,10 +165,14 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             return (false, true);
         }
 
+        // Shitmed Change
+        EntityUid? userName = null;
+
         var forceFeed = user != target;
         if (forceFeed)
         {
-            var userName = Identity.Entity(user, EntityManager);
+            // Shitmed Change
+            userName = Identity.Entity(user, EntityManager);
             _popup.PopupEntity(
                 Loc.GetString("food-system-force-feed", ("user", userName)),
                 user,
@@ -204,7 +209,25 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             NeedHand = forceFeed
         };
 
-        _doAfter.TryStartDoAfter(doAfterArgs);
+        // Shitmed Change - track success of doafter to prevent popup on doafter cancel
+        var doAfterSuccess = _doAfter.TryStartDoAfter(doAfterArgs);
+
+        // Shitmed Change
+        if (foodComp.PopupOnEatAttempt && doAfterSuccess)
+        {
+            userName ??= Identity.Entity(user, EntityManager);
+            var foodName = Identity.Entity(food, EntityManager);
+            _popup.PopupPredicted(
+                !forceFeed
+                ? Loc.GetString("food-system-eat-popup", ("user", userName), ("food", foodName))
+                : Loc.GetString("food-system-force-feed-popup", ("user", userName), ("target", Identity.Entity(target, EntityManager)), ("food", foodName)),
+                user, target, PopupType.SmallCaution);
+
+            if (!forceFeed)
+                _popup.PopupEntity(Loc.GetString("food-system-eat-popup-self", ("user", userName), ("food", foodName)),
+                    user, target, PopupType.SmallCaution);
+        }
+
         return (true, true);
     }
 
diff --git a/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl b/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
new file mode 100644
index 00000000000..91c04c9ee28
--- /dev/null
+++ b/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
@@ -0,0 +1,5 @@
+## System
+
+food-system-eat-popup = {CAPITALIZE(THE($user))} is trying to eat {THE($food)}!
+food-system-eat-popup-self = You start trying to eat {THE($food)}!
+food-system-force-feed-popup = {CAPITALIZE(THE($user))} is trying to feed {THE($target)} {THE($food)}!
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index fb6c819493b..ce47ff123d9 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -42,6 +42,10 @@
     state: brain
   - type: Organ # Shitmed
     slotId: brain
+  - type: Food # Shitmed Change
+    delay: 5
+    forceFeedDelay: 6
+    popupOnEatAttempt: true
   - type: Brain # Shitmed
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 788e582f714..f3532b5ec4a 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -45,6 +45,10 @@
     state: brain
   - type: Organ
     slotId: brain # Shitmed Change
+  - type: Food # Shitmed Change
+    delay: 5
+    forceFeedDelay: 6
+    popupOnEatAttempt: true
   - type: Input
     context: "ghost"
   - type: Brain
@@ -73,7 +77,7 @@
     entries:
       Burger: Brain
       Taco: Brain
-  
+
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
index e45e2b28bdf..178968841f2 100644
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
@@ -8,6 +8,10 @@
     state: brain
   - type: Organ
     slotId: brain
+  - type: Food
+    delay: 5
+    forceFeedDelay: 6
+    popupOnEatAttempt: true
   - type: Input
     context: "ghost"
   - type: Brain

From dd5ee5a5be7473f744216903fe1d9fcb83becc45 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Thu, 16 Jan 2025 19:44:26 +0800
Subject: [PATCH 05/64] add popup for eat success

---
 .../Nutrition/Components/FoodComponent.cs     |  4 ++--
 .../Nutrition/EntitySystems/FoodSystem.cs     | 20 +++++++++++++++----
 .../nutrition/components/food-component.ftl   |  8 +++++---
 Resources/Prototypes/Body/Organs/diona.yml    |  2 +-
 Resources/Prototypes/Body/Organs/human.yml    |  2 +-
 .../_Shitmed/Body/Organs/Animal/animal.yml    |  2 +-
 6 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index a8fe7517c4d..de325ba35a4 100644
--- a/Content.Server/Nutrition/Components/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -70,10 +70,10 @@ public sealed partial class FoodComponent : Component
     public float ForceFeedDelay = 3;
 
     /// <summary>
-    /// Shitmed Change: Whether to show a popup to everyone in range when attempting to eat this food.
+    /// Shitmed Change: Whether to show a popup to everyone in range when attempting to eat this food, and upon successful eating.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool PopupOnEatAttempt = false;
+    public bool PopupOnEat = false;
 
     /// <summary>
     /// For mobs that are food, requires killing them before eating.
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 82e4865b040..1f80aeb3454 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -30,6 +30,7 @@
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player; // Shitmed Change
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Shared.CCVar;
@@ -213,18 +214,18 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
         var doAfterSuccess = _doAfter.TryStartDoAfter(doAfterArgs);
 
         // Shitmed Change
-        if (foodComp.PopupOnEatAttempt && doAfterSuccess)
+        if (foodComp.PopupOnEat && doAfterSuccess)
         {
             userName ??= Identity.Entity(user, EntityManager);
             var foodName = Identity.Entity(food, EntityManager);
             _popup.PopupPredicted(
                 !forceFeed
-                ? Loc.GetString("food-system-eat-popup", ("user", userName), ("food", foodName))
-                : Loc.GetString("food-system-force-feed-popup", ("user", userName), ("target", Identity.Entity(target, EntityManager)), ("food", foodName)),
+                ? Loc.GetString("food-system-eat-broadcasted", ("user", userName), ("food", foodName))
+                : Loc.GetString("food-system-force-feed-broadcasted", ("user", userName), ("target", Identity.Entity(target, EntityManager)), ("food", foodName)),
                 user, target, PopupType.SmallCaution);
 
             if (!forceFeed)
-                _popup.PopupEntity(Loc.GetString("food-system-eat-popup-self", ("user", userName), ("food", foodName)),
+                _popup.PopupEntity(Loc.GetString("food-system-eat-broadcasted-self", ("user", userName), ("food", foodName)),
                     user, target, PopupType.SmallCaution);
         }
 
@@ -304,6 +305,12 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
 
             _popup.PopupEntity(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)), args.User, args.User);
 
+            // Shitmed change
+            if (entity.Comp.PopupOnEat)
+                _popup.PopupEntity(Loc.GetString("food-system-force-feed-broadcasted-success", ("user", userName), ("target", targetName), ("food", Identity.Entity(entity.Owner, EntityManager))),
+                    args.User, Filter.Pvs(args.User, entityManager: EntityManager).RemovePlayersByAttachedEntity([args.User, args.Target.Value]),
+                    true, PopupType.MediumCaution);
+
             // log successful force feed
             _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity.Owner):food}");
         }
@@ -311,6 +318,11 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         {
             _popup.PopupEntity(Loc.GetString(entity.Comp.EatMessage, ("food", entity.Owner), ("flavors", flavors)), args.User, args.User);
 
+            // Shitmed change
+            if (entity.Comp.PopupOnEat)
+                _popup.PopupPredicted(Loc.GetString("food-system-eat-broadcasted-success", ("user", Identity.Entity(args.User, EntityManager)), ("food", Identity.Entity(entity.Owner, EntityManager))),
+                    args.User, args.User, PopupType.MediumCaution);
+
             // log successful voluntary eating
             _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity.Owner):food}");
         }
diff --git a/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl b/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
index 91c04c9ee28..ebd3273b18b 100644
--- a/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
+++ b/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
@@ -1,5 +1,7 @@
 ## System
 
-food-system-eat-popup = {CAPITALIZE(THE($user))} is trying to eat {THE($food)}!
-food-system-eat-popup-self = You start trying to eat {THE($food)}!
-food-system-force-feed-popup = {CAPITALIZE(THE($user))} is trying to feed {THE($target)} {THE($food)}!
+food-system-eat-broadcasted = {CAPITALIZE(THE($user))} is trying to eat {THE($food)}!
+food-system-eat-broadcasted-self = You start trying to eat {THE($food)}!
+food-system-force-feed-broadcasted = {CAPITALIZE(THE($user))} is trying to feed {THE($target)} {THE($food)}!
+food-system-force-feed-broadcasted-success = {CAPITALIZE(THE($user))} forced {THE($target)} to eat {THE($food)}!
+food-system-eat-broadcasted-success = {CAPITALIZE(THE($user))} ate {THE($food)}!
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index ce47ff123d9..17b9704fe96 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -45,7 +45,7 @@
   - type: Food # Shitmed Change
     delay: 5
     forceFeedDelay: 6
-    popupOnEatAttempt: true
+    popupOnEat: true
   - type: Brain # Shitmed
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index f3532b5ec4a..92dd537d561 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -48,7 +48,7 @@
   - type: Food # Shitmed Change
     delay: 5
     forceFeedDelay: 6
-    popupOnEatAttempt: true
+    popupOnEat: true
   - type: Input
     context: "ghost"
   - type: Brain
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
index 178968841f2..b7a40d18a79 100644
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
@@ -11,7 +11,7 @@
   - type: Food
     delay: 5
     forceFeedDelay: 6
-    popupOnEatAttempt: true
+    popupOnEat: true
   - type: Input
     context: "ghost"
   - type: Brain

From c8093166fa45e67898f234c05579ae77f4c76ab6 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Thu, 16 Jan 2025 19:56:04 +0800
Subject: [PATCH 06/64] Fix a funny bug trying to send popup into food instead
 of target

---
 Content.Server/Nutrition/EntitySystems/FoodSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 1f80aeb3454..7eb3a715c06 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -301,7 +301,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         {
             var targetName = Identity.Entity(args.Target.Value, EntityManager);
             var userName = Identity.Entity(args.User, EntityManager);
-            _popup.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName), ("flavors", flavors)), entity.Owner, entity.Owner);
+            _popup.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName), ("flavors", flavors)), args.Target.Value, args.Target.Value);
 
             _popup.PopupEntity(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)), args.User, args.User);
 

From 36a9789a4dccac1f2c8ce814581f09f57b401b12 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Thu, 16 Jan 2025 22:29:23 +0800
Subject: [PATCH 07/64] add movement cost to plastic flaps

---
 Resources/Locale/en-US/traits/traits.ftl              |  2 +-
 .../Prototypes/Entities/Structures/plastic_flaps.yml  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 92fa6f74a22..03e7e47aad3 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -224,7 +224,7 @@ trait-description-Voracious =
     Nothing gets between you and your food.
     Your endless consumption of food and drinks is twice as fast.
 
--terrain-example = [color=gray](e.g. spider web, slime puddle, kudzu, space glue)[/color]
+-terrain-example = [color=gray](e.g. plastic flaps, spider web, slime puddle, kudzu)[/color]
 -slippery-example = [color=gray](e.g. banana peel, water puddle, soap, space lube)[/color]
 
 trait-name-ParkourTraining = Parkour Training
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index 5d5ff390bac..ea1ed8362dd 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -42,7 +42,10 @@
   - type: StaticPrice
     price: 83
   - type: RequireProjectileTarget
-  
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.4
+    sprintSpeedModifier: 0.4
+
 - type: entity
   id: PlasticFlapsClear
   parent: PlasticFlapsBase
@@ -97,6 +100,9 @@
   - type: Airtight
   - type: StaticPrice
     price: 100
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.3
+    sprintSpeedModifier: 0.3
 
 - type: entity
   id: PlasticFlapsAirtightOpaque
@@ -116,3 +122,6 @@
   - type: Airtight
   - type: StaticPrice
     price: 100
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.3
+    sprintSpeedModifier: 0.3

From 3fa788c928868eaa70eff7281d1fdca2e2b40e13 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Thu, 25 Jul 2024 01:23:52 -0400
Subject: [PATCH 08/64] Fix Ripley control panel (#30325)

---
 Content.Client/Mech/Ui/MechMenu.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs
index 6f39bc386ee..7ce863b7cd7 100644
--- a/Content.Client/Mech/Ui/MechMenu.xaml.cs
+++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs
@@ -12,7 +12,7 @@ public sealed partial class MechMenu : FancyWindow
 {
     [Dependency] private readonly IEntityManager _ent = default!;
 
-    private readonly EntityUid _mech;
+    private EntityUid _mech;
 
     public event Action<EntityUid>? OnRemoveButtonPressed;
 
@@ -25,6 +25,7 @@ public MechMenu()
     public void SetEntity(EntityUid uid)
     {
         MechView.SetEntity(uid);
+        _mech = uid;
     }
 
     public void UpdateMechStats()

From 672c537811bf3b11f6b10362a23e6303215eb3ba Mon Sep 17 00:00:00 2001
From: JIPDawg <51352440+JIPDawg@users.noreply.github.com>
Date: Thu, 19 Sep 2024 23:09:00 -0500
Subject: [PATCH 09/64] Make small clamp use 2% battery instead of recharging
 2% battery. (#32320)

Make small clamp user 2% battery instead of recharge 2% battery.

Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
---
 .../Entities/Objects/Specific/Mech/mecha_equipment.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
index c489dec1c56..a97ca0f017b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
@@ -39,7 +39,7 @@
   - type: MechGrabber
     maxContents: 4
     grabDelay: 3
-    grabEnergyDelta: 20
+    grabEnergyDelta: -20
   - type: Tag
     tags:
     - SmallMech

From 3d6c151e6f8185f3e0599a3f14a90eddcaacec13 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Wed, 2 Oct 2024 05:22:09 +0200
Subject: [PATCH 10/64] fix voice mask chameleon menu (#32546)

---
 Resources/Prototypes/Entities/Clothing/Masks/specific.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index 90c648c9d88..d8da80611cf 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -35,6 +35,8 @@
       - Snout
     - type: UserInterface
       interfaces:
+        enum.ChameleonUiKey.Key:
+          type: ChameleonBoundUserInterface
         enum.VoiceMaskUIKey.Key:
           type: VoiceMaskBoundUserInterface
 

From 5cf5f8907935a67f40c537a092bb84e41468195d Mon Sep 17 00:00:00 2001
From: chavonadelal <156101927+chavonadelal@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:10:53 +0300
Subject: [PATCH 11/64] Wires ui tooltip localization (#32284)

* Wires ui tooltip localization

* Corrections after review
---
 Content.Client/Wires/UI/WiresMenu.cs                     | 9 +--------
 .../Locale/en-US/wires/components/wires-component.ftl    | 6 ++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index 2eaa9cc1309..01c88bcd0c6 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -586,17 +586,10 @@ public StatusLight(StatusLightData data, IResourceCache resourceCache)
 
         private sealed class HelpPopup : Popup
         {
-            private const string Text = "Click on the gold contacts with a multitool in hand to pulse their wire.\n" +
-                                        "Click on the wires with a pair of wirecutters in hand to cut/mend them.\n\n" +
-                                        "The lights at the top show the state of the machine, " +
-                                        "messing with wires will probably do stuff to them.\n" +
-                                        "Wire layouts are different each round, " +
-                                        "but consistent between machines of the same type.";
-
             public HelpPopup()
             {
                 var label = new RichTextLabel();
-                label.SetMessage(Text);
+                label.SetMessage(Loc.GetString("wires-menu-help-popup"));
                 AddChild(new PanelContainer
                 {
                     StyleClasses = {ExamineSystem.StyleClassEntityTooltip},
diff --git a/Resources/Locale/en-US/wires/components/wires-component.ftl b/Resources/Locale/en-US/wires/components/wires-component.ftl
index be27c270bb4..e98e5c21cab 100644
--- a/Resources/Locale/en-US/wires/components/wires-component.ftl
+++ b/Resources/Locale/en-US/wires/components/wires-component.ftl
@@ -10,3 +10,9 @@ wires-component-ui-on-receive-message-cannot-mend-uncut-wire = You can't mend a
 
 wires-menu-name-label = Wires
 wires-menu-dead-beef-text = DEAD-BEEF
+wires-menu-help-popup =
+    Click on the gold contacts with a multitool in hand to pulse their wire.
+    Click on the wires with a pair of wirecutters in hand to cut/mend them.
+
+    The lights at the top show the state of the machine, messing with wires will probably do stuff to them.
+    Wire layouts are different each round, but consistent between machines of the same type.

From aae88528840fdab7a6d50eb1d237b8c69841431f Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Mon, 29 Jul 2024 23:04:17 -0400
Subject: [PATCH 12/64] Fix ACC wire light not appearing (#30453)

---
 Content.Server/Access/LogWireAction.cs    | 2 +-
 Content.Shared/Access/SharedAccessWire.cs | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Access/LogWireAction.cs b/Content.Server/Access/LogWireAction.cs
index 1e97d5c9d67..837cf420d5e 100644
--- a/Content.Server/Access/LogWireAction.cs
+++ b/Content.Server/Access/LogWireAction.cs
@@ -25,7 +25,7 @@ public sealed partial class LogWireAction : ComponentWireAction<AccessReaderComp
         return comp.LoggingDisabled ? StatusLightState.Off : StatusLightState.On;
     }
 
-    public override object StatusKey => AccessWireActionKey.Status;
+    public override object StatusKey => LogWireActionKey.Status;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Access/SharedAccessWire.cs b/Content.Shared/Access/SharedAccessWire.cs
index d5d1b48c708..a0bb316028f 100644
--- a/Content.Shared/Access/SharedAccessWire.cs
+++ b/Content.Shared/Access/SharedAccessWire.cs
@@ -10,3 +10,12 @@ public enum AccessWireActionKey : byte
     Pulsed,
     PulseCancel
 }
+
+[Serializable, NetSerializable]
+public enum LogWireActionKey : byte
+{
+    Key,
+    Status,
+    Pulsed,
+    PulseCancel
+}

From 2b170b825583d5769bd232b1155e6b6fa567a998 Mon Sep 17 00:00:00 2001
From: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Date: Sat, 28 Dec 2024 17:33:15 -0600
Subject: [PATCH 13/64] UI improvements for holopads (#34055)

* Initial commit

* Minor update
---
 Content.Client/Holopad/HolopadWindow.xaml     | 31 +++++++++++++------
 Content.Client/Holopad/HolopadWindow.xaml.cs  | 12 +++++--
 Content.Server/Telephone/TelephoneSystem.cs   |  5 +--
 .../Telephone/SharedTelephoneSystem.cs        | 17 ++++++++++
 .../Telephone/TelephoneComponent.cs           |  3 +-
 Resources/Locale/en-US/holopad/holopad.ftl    |  2 ++
 .../Locale/en-US/telephone/telephone.ftl      |  4 ++-
 7 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/Content.Client/Holopad/HolopadWindow.xaml b/Content.Client/Holopad/HolopadWindow.xaml
index 9c3dfab1ea6..882f918158a 100644
--- a/Content.Client/Holopad/HolopadWindow.xaml
+++ b/Content.Client/Holopad/HolopadWindow.xaml
@@ -27,7 +27,11 @@
                 <!-- Header text -->
                 <BoxContainer MinHeight="60" Orientation="Vertical" VerticalAlignment="Center">
                     <Label Name="CallStatusText" Margin="10 5 10 0" ReservesSpace="False"/>
-                    <RichTextLabel Name="CallerIdText" HorizontalAlignment="Center" Margin="0 0 0 0" ReservesSpace="False"/>
+                    <BoxContainer Name="CallerIdContainer" Orientation="Vertical" ReservesSpace="False">
+                        <RichTextLabel Name="CallerIdText" HorizontalAlignment="Center" Margin="0 0 0 0"/>
+                        <Label Text="{Loc 'holopad-window-relay-label'}" Margin="10 5 10 0" ReservesSpace="False"/>
+                        <RichTextLabel Name="HolopadIdText" HorizontalAlignment="Center" Margin="0 0 0 10"/>
+                    </BoxContainer>
                 </BoxContainer>
 
                 <!-- Controls (the answer call button is absent when the phone is not ringing) -->
@@ -68,18 +72,25 @@
                     <PanelContainer Name="HolopadContactListHeaderPanel">
                         <Label Text="{Loc 'holopad-window-select-contact-from-list'}" HorizontalAlignment="Center" Margin="0 3 0 3"/>
                     </PanelContainer>
-                
+
                     <PanelContainer Name="HolopadContactListPanel">
-                        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="8, 8, 8, 8" MinHeight="256">
+                        <BoxContainer Orientation="Vertical">
+
+                            <!-- Contact filter -->
+                            <LineEdit Name="SearchLineEdit" HorizontalExpand="True" Margin="4, 4, 4, 0"
+                                      PlaceHolder="{Loc holopad-window-filter-line-placeholder}" />
 
-                            <!-- If there is no data yet, this will be displayed -->
-                            <BoxContainer Name="FetchingAvailableHolopadsContainer" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="True" ReservesSpace="False">
-                                <Label Text="{Loc 'holopad-window-fetching-contacts-list'}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </BoxContainer>
+                            <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="8, 8, 8, 8" MinHeight="256">
 
-                            <!-- Container for the contacts -->
-                            <BoxContainer Name="ContactsList" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 0"/>
-                        </ScrollContainer>
+                                <!-- If there is no data yet, this will be displayed -->
+                                <BoxContainer Name="FetchingAvailableHolopadsContainer" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="True" ReservesSpace="False">
+                                    <Label Text="{Loc 'holopad-window-fetching-contacts-list'}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </BoxContainer>
+
+                                <!-- Container for the contacts -->
+                                <BoxContainer Name="ContactsList" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 0"/>
+                            </ScrollContainer>
+                        </BoxContainer>
                     </PanelContainer>
                 </BoxContainer>
 
diff --git a/Content.Client/Holopad/HolopadWindow.xaml.cs b/Content.Client/Holopad/HolopadWindow.xaml.cs
index bcab0d43df1..25982b901c2 100644
--- a/Content.Client/Holopad/HolopadWindow.xaml.cs
+++ b/Content.Client/Holopad/HolopadWindow.xaml.cs
@@ -171,8 +171,10 @@ public void UpdateState(Dictionary<NetEntity, string> holopads)
 
         // Caller ID text
         var callerId = _telephoneSystem.GetFormattedCallerIdForEntity(telephone.LastCallerId.Item1, telephone.LastCallerId.Item2, Color.LightGray, "Default", 11);
+        var holoapdId = _telephoneSystem.GetFormattedDeviceIdForEntity(telephone.LastCallerId.Item3, Color.LightGray, "Default", 11);
 
         CallerIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId));
+        HolopadIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(holoapdId));
         LockOutIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId));
 
         // Sort holopads alphabetically
@@ -236,10 +238,13 @@ private void UpdateAppearance()
         // Make / update required children
         foreach (var child in ContactsList.Children)
         {
-            if (child is not HolopadContactButton)
+            if (child is not HolopadContactButton contactButton)
                 continue;
 
-            var contactButton = (HolopadContactButton)child;
+            var passesFilter = string.IsNullOrEmpty(SearchLineEdit.Text) ||
+                               contactButton.Text?.Contains(SearchLineEdit.Text, StringComparison.CurrentCultureIgnoreCase) == true;
+
+            contactButton.Visible = passesFilter;
             contactButton.Disabled = (_currentState != TelephoneState.Idle || lockButtons);
         }
 
@@ -290,7 +295,7 @@ private void UpdateAppearance()
         FetchingAvailableHolopadsContainer.Visible = (ContactsList.ChildCount == 0);
         ActiveCallControlsContainer.Visible = (_currentState != TelephoneState.Idle || _currentUiKey == HolopadUiKey.AiRequestWindow);
         CallPlacementControlsContainer.Visible = !ActiveCallControlsContainer.Visible;
-        CallerIdText.Visible = (_currentState == TelephoneState.Ringing);
+        CallerIdContainer.Visible = (_currentState == TelephoneState.Ringing);
         AnswerCallButton.Visible = (_currentState == TelephoneState.Ringing);
     }
 
@@ -316,6 +321,7 @@ public HolopadContactButton()
             HorizontalExpand = true;
             SetHeight = 32;
             Margin = new Thickness(0f, 1f, 0f, 1f);
+            ReservesSpace = false;
         }
 
         public void UpdateValues(NetEntity netEntity, string label)
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index b81a72ad230..b8337c766cc 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -151,7 +151,7 @@ public override void Update(float frameTime)
 
                     break;
 
-                // Try to hang up if their has been no recent in-call activity 
+                // Try to hang up if there has been no recent in-call activity
                 case TelephoneState.InCall:
                     if (_timing.CurTime > telephone.StateStartTime + TimeSpan.FromSeconds(telephone.IdlingTimeout))
                         EndTelephoneCalls(entity);
@@ -214,7 +214,8 @@ private bool TryCallTelephone(Entity<TelephoneComponent> source, Entity<Telephon
         source.Comp.LinkedTelephones.Add(receiver);
         source.Comp.Muted = options?.MuteSource == true;
 
-        receiver.Comp.LastCallerId = GetNameAndJobOfCallingEntity(user); // This will be networked when the state changes
+        var callerInfo = GetNameAndJobOfCallingEntity(user);
+        receiver.Comp.LastCallerId = (callerInfo.Item1, callerInfo.Item2, Name(source)); // This will be networked when the state changes
         receiver.Comp.LinkedTelephones.Add(source);
         receiver.Comp.Muted = options?.MuteReceiver == true;
 
diff --git a/Content.Shared/Telephone/SharedTelephoneSystem.cs b/Content.Shared/Telephone/SharedTelephoneSystem.cs
index ab423623cb5..78a72d59a55 100644
--- a/Content.Shared/Telephone/SharedTelephoneSystem.cs
+++ b/Content.Shared/Telephone/SharedTelephoneSystem.cs
@@ -36,4 +36,21 @@ public string GetFormattedCallerIdForEntity(string? presumedName, string? presum
 
         return callerId;
     }
+
+    public string GetFormattedDeviceIdForEntity(string? deviceName, Color fontColor, string fontType = "Default", int fontSize = 12)
+    {
+        if (deviceName == null)
+        {
+            return Loc.GetString("chat-telephone-unknown-device",
+                ("color", fontColor),
+                ("fontType", fontType),
+                ("fontSize", fontSize));
+        }
+
+        return Loc.GetString("chat-telephone-device-id",
+            ("deviceName", deviceName),
+            ("color", fontColor),
+            ("fontType", fontType),
+            ("fontSize", fontSize));
+    }
 }
diff --git a/Content.Shared/Telephone/TelephoneComponent.cs b/Content.Shared/Telephone/TelephoneComponent.cs
index 733ddfbdce2..c08f8b9af37 100644
--- a/Content.Shared/Telephone/TelephoneComponent.cs
+++ b/Content.Shared/Telephone/TelephoneComponent.cs
@@ -127,9 +127,10 @@ public sealed partial class TelephoneComponent : Component
 
     /// <summary>
     /// The presumed name and/or job of the last person to call this telephone
+    /// and the name of the device that they used to do so
     /// </summary>
     [ViewVariables, AutoNetworkedField]
-    public (string?, string?) LastCallerId;
+    public (string?, string?, string?) LastCallerId;
 }
 
 #region: Telephone events
diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl
index 47c5fbe25cf..7c890ee27ac 100644
--- a/Resources/Locale/en-US/holopad/holopad.ftl
+++ b/Resources/Locale/en-US/holopad/holopad.ftl
@@ -6,6 +6,7 @@ holopad-window-options = [color=darkgray][font size=10][italic]Please select an
 # Call status
 holopad-window-no-calls-in-progress = No holo-calls in progress
 holopad-window-incoming-call = Incoming holo-call from:
+holopad-window-relay-label = Originating at:
 holopad-window-outgoing-call = Attempting to establish a connection...
 holopad-window-call-in-progress = Holo-call in progress
 holopad-window-call-ending = Disconnecting...
@@ -28,6 +29,7 @@ holopad-window-access-denied = Access denied
 holopad-window-select-contact-from-list = Select a contact to initiate a holo-call
 holopad-window-fetching-contacts-list = No holopads are currently contactable
 holopad-window-contact-label = {CAPITALIZE($label)}
+holopad-window-filter-line-placeholder = Search for a contact
 
 # Flavor
 holopad-window-flavor-left = ⚠ Do not enter while projector is active
diff --git a/Resources/Locale/en-US/telephone/telephone.ftl b/Resources/Locale/en-US/telephone/telephone.ftl
index 915d54843ff..b1b27768e6e 100644
--- a/Resources/Locale/en-US/telephone/telephone.ftl
+++ b/Resources/Locale/en-US/telephone/telephone.ftl
@@ -5,4 +5,6 @@ chat-telephone-message-wrap-bold = [color={$color}][bold]{$name}[/bold] {$verb},
 # Caller ID
 chat-telephone-unknown-caller = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown caller[/bolditalic][/font][/color]
 chat-telephone-caller-id-with-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)} ({CAPITALIZE($callerJob)})[/bold][/font][/color]
-chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color]
\ No newline at end of file
+chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color]
+chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown device[/bolditalic][/font][/color]
+chat-telephone-device-id = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($deviceName)}[/bold][/font][/color]

From ee12c0f9a5c4711d0ef55bd546bd4f1d686e8cb9 Mon Sep 17 00:00:00 2001
From: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Date: Tue, 31 Dec 2024 04:52:08 -0600
Subject: [PATCH 14/64] Holopads no longer log broadcasted speech and emotes in
 the chat (#34114)

Initial commit
---
 Content.Server/Holopad/HolopadSystem.cs     | 7 +++++--
 Content.Server/Telephone/TelephoneSystem.cs | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index ad531b6d2d7..826a74c48d7 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -382,7 +382,10 @@ private void OnEmote(Entity<HolopadUserComponent> entity, ref EmoteEvent args)
             if (TryComp<TelephoneComponent>(linkedHolopad, out var linkedHolopadTelephone) && linkedHolopadTelephone.Muted)
                 continue;
 
-            foreach (var receiver in GetLinkedHolopads(linkedHolopad))
+            var receivingHolopads = GetLinkedHolopads(linkedHolopad);
+            var range = receivingHolopads.Count > 1 ? ChatTransmitRange.HideChat : ChatTransmitRange.GhostRangeLimit;
+
+            foreach (var receiver in receivingHolopads)
             {
                 if (receiver.Comp.Hologram == null)
                     continue;
@@ -392,7 +395,7 @@ private void OnEmote(Entity<HolopadUserComponent> entity, ref EmoteEvent args)
                 var name = Loc.GetString("holopad-hologram-name", ("name", ent));
 
                 // Force the emote, because if the user can do it, the hologram can too
-                _chatSystem.TryEmoteWithChat(receiver.Comp.Hologram.Value, args.Emote, ChatTransmitRange.Normal, false, name, true, true);
+                _chatSystem.TryEmoteWithChat(receiver.Comp.Hologram.Value, args.Emote, range, false, name, true, true);
             }
         }
     }
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index b8337c766cc..a13ebd16fda 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -108,8 +108,10 @@ private void OnTelephoneMessageReceived(Entity<TelephoneComponent> entity, ref T
             ("speaker", Name(entity)),
             ("originalName", nameEv.VoiceName));
 
+        var range = args.TelephoneSource.Comp.LinkedTelephones.Count > 1 ? ChatTransmitRange.HideChat : ChatTransmitRange.GhostRangeLimit;
         var volume = entity.Comp.SpeakerVolume == TelephoneVolume.Speak ? InGameICChatType.Speak : InGameICChatType.Whisper;
-        _chat.TrySendInGameICMessage(entity, args.Message, volume, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
+
+        _chat.TrySendInGameICMessage(entity, args.Message, volume, range, nameOverride: name, checkRadioPrefix: false);
     }
 
     #endregion

From e2de6443a3274bfd742d6d1b953b34768cc290be Mon Sep 17 00:00:00 2001
From: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Date: Thu, 2 Jan 2025 05:27:18 -0600
Subject: [PATCH 15/64] Fix layout on wires UI (#33714)

Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead.

Lights with less than 4 characters of text weren't aligned right, now they are.
---
 Content.Server/Holopad/HolopadSystem.cs | 26 +++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 826a74c48d7..f3fcc2a9f68 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -183,11 +183,15 @@ private void OnHolopadStartBroadcast(Entity<HolopadComponent> source, ref Holopa
         // AI broadcasting
         if (TryComp<StationAiHeldComponent>(args.Actor, out var stationAiHeld))
         {
+            // Link the AI to the holopad they are broadcasting from
+            LinkHolopadToUser(source, args.Actor);
+
             if (!_stationAiSystem.TryGetStationAiCore((args.Actor, stationAiHeld), out var stationAiCore) ||
                 stationAiCore.Value.Comp.RemoteEntity == null ||
                 !TryComp<HolopadComponent>(stationAiCore, out var stationAiCoreHolopad))
                 return;
 
+            // Execute the broadcast, but have it originate from the AI core
             ExecuteBroadcast((stationAiCore.Value, stationAiCoreHolopad), args.Actor);
 
             // Switch the AI's perspective from free roaming to the target holopad
@@ -612,11 +616,25 @@ private void ShutDownHolopad(Entity<HolopadComponent> entity)
             DeleteHologram(entity.Comp.Hologram.Value, entity);
 
         if (entity.Comp.User != null)
-            UnlinkHolopadFromUser(entity, entity.Comp.User.Value);
-
-        if (TryComp<StationAiCoreComponent>(entity, out var stationAiCore))
         {
-            _stationAiSystem.SwitchRemoteEntityMode((entity.Owner, stationAiCore), true);
+            // Check if the associated holopad user is an AI
+            if (TryComp<StationAiHeldComponent>(entity.Comp.User, out var stationAiHeld) &&
+                _stationAiSystem.TryGetStationAiCore((entity.Comp.User.Value, stationAiHeld), out var stationAiCore))
+            {
+                // Return the AI eye to free roaming
+                _stationAiSystem.SwitchRemoteEntityMode(stationAiCore.Value, true);
+
+                // If the AI core is still broadcasting, end its calls
+                if (entity.Owner != stationAiCore.Value.Owner &&
+                    TryComp<TelephoneComponent>(stationAiCore, out var stationAiCoreTelephone) &&
+                    _telephoneSystem.IsTelephoneEngaged((stationAiCore.Value.Owner, stationAiCoreTelephone)))
+                {
+                    _telephoneSystem.EndTelephoneCalls((stationAiCore.Value.Owner, stationAiCoreTelephone));
+                }
+            }
+
+            UnlinkHolopadFromUser(entity, entity.Comp.User.Value);
+        }
 
             if (TryComp<TelephoneComponent>(entity, out var stationAiCoreTelphone) &&
                 stationAiCoreTelphone.CurrentState != TelephoneState.EndingCall && stationAiCoreTelphone.CurrentState != TelephoneState.Idle)

From 2f763f711018c4eab8cdb7babdb9ac93f5689bf9 Mon Sep 17 00:00:00 2001
From: Kanashi-Panda <lliamrtmc@gmail.com>
Date: Mon, 16 Sep 2024 17:35:57 -0700
Subject: [PATCH 16/64] Crayons buffed to 45 uses (#32061)

* Buffs crayons to 45 uses

* Update Resources/Prototypes/Entities/Objects/Fun/crayons.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Resources/Prototypes/Entities/Objects/Fun/crayons.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 4aab2efdb97..9db8e6d2aa1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -21,7 +21,7 @@
       enum.CrayonUiKey.Key:
         type: CrayonBoundUserInterface
   - type: Crayon
-    capacity: 15
+    capacity: 25
   - type: Food
   - type: SolutionContainerManager
     solutions:

From 882ce26862892655078ea2e85d56f90d3777d05c Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Mon, 22 Jul 2024 19:22:59 -0700
Subject: [PATCH 17/64] fix crayon (#30263)

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Client/Crayon/UI/CrayonWindow.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index b97786cd41a..6ef282d219a 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -89,6 +89,7 @@ private void ButtonOnPressed(ButtonEventArgs obj)
             if (obj.Button.Name == null) return;
 
             _selected = obj.Button.Name;
+            OnSelected?.Invoke(_selected);
             RefreshList();
         }
 

From 26ffe940b56e98d7d2ebce84da343245bf998aad Mon Sep 17 00:00:00 2001
From: Saphire Lattice <lattice@saphi.re>
Date: Sat, 16 Nov 2024 10:25:06 +0700
Subject: [PATCH 18/64] Improve crayon UI to not be stuck in 1996 (#33101)

* Improve crayon UI to not be stuck in 1996

* Make a horrifying crayon spaghetti

* Crayon

* Undeprecate the crayon, describe the crayon
---
 .../Crayon/UI/CrayonBoundUserInterface.cs     |  12 +-
 Content.Client/Crayon/UI/CrayonWindow.xaml    |  11 +-
 Content.Client/Crayon/UI/CrayonWindow.xaml.cs | 138 ++++-
 Content.Server/Crayon/CrayonSystem.cs         |   2 +
 .../Crayon/SharedCrayonComponent.cs           |  44 +-
 .../Locale/en-US/crayon/crayon-component.ftl  |   7 +
 Resources/Prototypes/Decals/crayons.yml       | 552 +++++++++---------
 7 files changed, 449 insertions(+), 317 deletions(-)

diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index e5be0b1811f..44501767dd4 100644
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -31,7 +31,7 @@ protected override void Open()
         private void PopulateCrayons()
         {
             var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
-            _menu?.Populate(crayonDecals);
+            _menu?.Populate(crayonDecals.ToList());
         }
 
         public override void OnProtoReload(PrototypesReloadedEventArgs args)
@@ -44,6 +44,16 @@ public override void OnProtoReload(PrototypesReloadedEventArgs args)
             PopulateCrayons();
         }
 
+        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        {
+            base.ReceiveMessage(message);
+
+            if (_menu is null || message is not CrayonUsedMessage crayonMessage)
+                return;
+
+            _menu.AdvanceState(crayonMessage.DrawnDecal);
+        }
+
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml b/Content.Client/Crayon/UI/CrayonWindow.xaml
index 7729318ae7f..7acb22551b7 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml
@@ -1,14 +1,13 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'crayon-window-title'}"
-            MinSize="250 300"
-            SetSize="250 300">
+            MinSize="450 500"
+            SetSize="450 500">
     <BoxContainer Orientation="Vertical">
         <ColorSelectorSliders Name="ColorSelector" Visible="False" />
-        <LineEdit Name="Search" />
+        <LineEdit Name="Search" Margin="0 0 0 8" PlaceHolder="{Loc 'crayon-window-placeholder'}" />
         <ScrollContainer VerticalExpand="True">
-            <GridContainer Name="Grid" Columns="6">
-                <!-- Crayon decals get added here by code -->
-            </GridContainer>
+            <BoxContainer Name="Grids" Orientation="Vertical">
+            </BoxContainer>
         </ScrollContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 6ef282d219a..88475562c67 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.Linq;
 using Content.Client.Stylesheets;
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -18,7 +20,12 @@ namespace Content.Client.Crayon.UI
     [GenerateTypedNameReferences]
     public sealed partial class CrayonWindow : DefaultWindow
     {
-        private Dictionary<string, Texture>? _decals;
+        [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
+        private readonly SpriteSystem _spriteSystem = default!;
+
+        private Dictionary<string, List<(string Name, Texture Texture)>>? _decals;
+        private List<string>? _allDecals;
+        private string? _autoSelected;
         private string? _selected;
         private Color _color;
 
@@ -28,8 +35,10 @@ public sealed partial class CrayonWindow : DefaultWindow
         public CrayonWindow()
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+            _spriteSystem = _entitySystem.GetEntitySystem<SpriteSystem>();
 
-            Search.OnTextChanged += _ => RefreshList();
+            Search.OnTextChanged += SearchChanged;
             ColorSelector.OnColorChanged += SelectColor;
         }
 
@@ -44,51 +53,94 @@ private void SelectColor(Color color)
         private void RefreshList()
         {
             // Clear
-            Grid.DisposeAllChildren();
-            if (_decals == null)
+            Grids.DisposeAllChildren();
+
+            if (_decals == null || _allDecals == null)
                 return;
 
             var filter = Search.Text;
-            foreach (var (decal, tex) in _decals)
+            var comma = filter.IndexOf(',');
+            var first = (comma == -1 ? filter : filter[..comma]).Trim();
+
+            var names = _decals.Keys.ToList();
+            names.Sort((a, b) => a == "random" ? 1 : b == "random" ? -1 : a.CompareTo(b));
+
+            if (_autoSelected != null && first != _autoSelected && _allDecals.Contains(first))
+            {
+                _selected = first;
+                _autoSelected = _selected;
+                OnSelected?.Invoke(_selected);
+            }
+
+            foreach (var categoryName in names)
             {
-                if (!decal.Contains(filter))
+                var locName = Loc.GetString("crayon-category-" + categoryName);
+                var category = _decals[categoryName].Where(d => locName.Contains(first) || d.Name.Contains(first)).ToList();
+
+                if (category.Count == 0)
                     continue;
 
-                var button = new TextureButton()
+                var label = new Label
                 {
-                    TextureNormal = tex,
-                    Name = decal,
-                    ToolTip = decal,
-                    Modulate = _color,
+                    Text = locName
                 };
-                button.OnPressed += ButtonOnPressed;
-                if (_selected == decal)
+
+                var grid = new GridContainer
                 {
-                    var panelContainer = new PanelContainer()
+                    Columns = 6,
+                    Margin = new Thickness(0, 0, 0, 16)
+                };
+
+                Grids.AddChild(label);
+                Grids.AddChild(grid);
+
+                foreach (var (name, texture) in category)
+                {
+                    var button = new TextureButton()
                     {
-                        PanelOverride = new StyleBoxFlat()
-                        {
-                            BackgroundColor = StyleNano.ButtonColorDefault,
-                        },
-                        Children =
-                        {
-                            button,
-                        },
+                        TextureNormal = texture,
+                        Name = name,
+                        ToolTip = name,
+                        Modulate = _color,
+                        Scale = new System.Numerics.Vector2(2, 2)
                     };
-                    Grid.AddChild(panelContainer);
-                }
-                else
-                {
-                    Grid.AddChild(button);
+                    button.OnPressed += ButtonOnPressed;
+
+                    if (_selected == name)
+                    {
+                        var panelContainer = new PanelContainer()
+                        {
+                            PanelOverride = new StyleBoxFlat()
+                            {
+                                BackgroundColor = StyleNano.ButtonColorDefault,
+                            },
+                            Children =
+                            {
+                                button,
+                            },
+                        };
+                        grid.AddChild(panelContainer);
+                    }
+                    else
+                    {
+                        grid.AddChild(button);
+                    }
                 }
             }
         }
 
+        private void SearchChanged(LineEdit.LineEditEventArgs obj)
+        {
+            _autoSelected = ""; // Placeholder to kick off the auto-select in refreshlist()
+            RefreshList();
+        }
+
         private void ButtonOnPressed(ButtonEventArgs obj)
         {
             if (obj.Button.Name == null) return;
 
             _selected = obj.Button.Name;
+            _autoSelected = null;
             OnSelected?.Invoke(_selected);
             RefreshList();
         }
@@ -107,12 +159,38 @@ public void UpdateState(CrayonBoundUserInterfaceState state)
             RefreshList();
         }
 
-        public void Populate(IEnumerable<DecalPrototype> prototypes)
+        public void AdvanceState(string drawnDecal)
         {
-            _decals = new Dictionary<string, Texture>();
+            var filter = Search.Text;
+            if (!filter.Contains(',') || !filter.Contains(drawnDecal))
+                return;
+
+            var first = filter[..filter.IndexOf(',')].Trim();
+
+            if (first.Equals(drawnDecal, StringComparison.InvariantCultureIgnoreCase))
+            {
+                Search.Text = filter[(filter.IndexOf(',') + 1)..].Trim();
+                _autoSelected = first;
+            }
+
+            RefreshList();
+        }
+
+        public void Populate(List<DecalPrototype> prototypes)
+        {
+            _decals = [];
+            _allDecals = [];
+
+            prototypes.Sort((a, b) => a.ID.CompareTo(b.ID));
+
             foreach (var decalPrototype in prototypes)
             {
-                _decals.Add(decalPrototype.ID, decalPrototype.Sprite.Frame0());
+                var category = "random";
+                if (decalPrototype.Tags.Count > 1 && decalPrototype.Tags[1].StartsWith("crayon-"))
+                    category = decalPrototype.Tags[1].Replace("crayon-", "");
+                var list = _decals.GetOrNew(category);
+                list.Add((decalPrototype.ID, _spriteSystem.Frame0(decalPrototype.Sprite)));
+                _allDecals.Add(decalPrototype.ID);
             }
 
             RefreshList();
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index 07a13d8a34a..4257c436c23 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -82,6 +82,8 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft
 
         if (component.DeleteEmpty && component.Charges <= 0)
             UseUpCrayon(uid, args.User);
+        else
+            _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
     }
 
     private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args)
diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
index f8e88b218de..a9c21988ea6 100644
--- a/Content.Shared/Crayon/SharedCrayonComponent.cs
+++ b/Content.Shared/Crayon/SharedCrayonComponent.cs
@@ -3,12 +3,23 @@
 
 namespace Content.Shared.Crayon
 {
+
+    /// <summary>
+    /// Component holding the state of a crayon-like component
+    /// </summary>
     [NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))]
     public abstract partial class SharedCrayonComponent : Component
     {
+        /// <summary>
+        /// The ID of currently selected decal prototype that will be placed when the crayon is used
+        /// </summary>
         public string SelectedState { get; set; } = string.Empty;
 
-        [DataField("color")] public Color Color;
+        /// <summary>
+        /// Color with which the crayon will draw
+        /// </summary>
+        [DataField("color")]
+        public Color Color;
 
         [Serializable, NetSerializable]
         public enum CrayonUiKey : byte
@@ -17,6 +28,9 @@ public enum CrayonUiKey : byte
         }
     }
 
+    /// <summary>
+    /// Used by the client to notify the server about the selected decal ID
+    /// </summary>
     [Serializable, NetSerializable]
     public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
     {
@@ -27,6 +41,9 @@ public CrayonSelectMessage(string selected)
         }
     }
 
+    /// <summary>
+    /// Sets the color of the crayon, used by Rainbow Crayon
+    /// </summary>
     [Serializable, NetSerializable]
     public sealed class CrayonColorMessage : BoundUserInterfaceMessage
     {
@@ -37,13 +54,25 @@ public CrayonColorMessage(Color color)
         }
     }
 
+    /// <summary>
+    /// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
+    /// Allows the client UI to advance forward in the client-only ephemeral queue,
+    /// preventing the crayon from becoming a magic text storage device.
+    /// </summary>
     [Serializable, NetSerializable]
-    public enum CrayonVisuals
+    public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
     {
-        State,
-        Color
+        public readonly string DrawnDecal;
+
+        public CrayonUsedMessage(string drawn)
+        {
+            DrawnDecal = drawn;
+        }
     }
 
+    /// <summary>
+    /// Component state, describes how many charges are left in the crayon in the near-hand UI
+    /// </summary>
     [Serializable, NetSerializable]
     public sealed class CrayonComponentState : ComponentState
     {
@@ -60,10 +89,17 @@ public CrayonComponentState(Color color, string state, int charges, int capacity
             Capacity = capacity;
         }
     }
+
+    /// <summary>
+    /// The state of the crayon UI as sent by the server
+    /// </summary>
     [Serializable, NetSerializable]
     public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
     {
         public string Selected;
+        /// <summary>
+        /// Whether or not the color can be selected
+        /// </summary>
         public bool SelectableColor;
         public Color Color;
 
diff --git a/Resources/Locale/en-US/crayon/crayon-component.ftl b/Resources/Locale/en-US/crayon/crayon-component.ftl
index 444ffa4c45e..e13bf76941c 100644
--- a/Resources/Locale/en-US/crayon/crayon-component.ftl
+++ b/Resources/Locale/en-US/crayon/crayon-component.ftl
@@ -8,3 +8,10 @@ crayon-interact-invalid-location = Can't reach there!
 
 ## UI
 crayon-window-title = Crayon
+crayon-window-placeholder = Search, or queue a comma-separated list of names
+crayon-category-1-brushes = Brushes
+crayon-category-2-alphanum = Numbers and letters
+crayon-category-3-symbols = Symbols
+crayon-category-4-info = Signs
+crayon-category-5-graffiti = Graffiti
+crayon-category-random = Random
diff --git a/Resources/Prototypes/Decals/crayons.yml b/Resources/Prototypes/Decals/crayons.yml
index 3be2ec24261..a15619d483c 100644
--- a/Resources/Prototypes/Decals/crayons.yml
+++ b/Resources/Prototypes/Decals/crayons.yml
@@ -1,6 +1,6 @@
 - type: decal
   id: 0
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -10,7 +10,7 @@
 
 - type: decal
   id: 1
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -20,7 +20,7 @@
 
 - type: decal
   id: 2
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -30,7 +30,7 @@
 
 - type: decal
   id: 3
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -40,7 +40,7 @@
 
 - type: decal
   id: 4
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -50,7 +50,7 @@
 
 - type: decal
   id: 5
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -60,7 +60,7 @@
 
 - type: decal
   id: 6
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -70,7 +70,7 @@
 
 - type: decal
   id: 7
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -80,7 +80,7 @@
 
 - type: decal
   id: 8
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -90,7 +90,7 @@
 
 - type: decal
   id: 9
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -100,7 +100,7 @@
 
 - type: decal
   id: Blasto
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -110,7 +110,7 @@
 
 - type: decal
   id: Clandestine
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -120,7 +120,7 @@
 
 - type: decal
   id: Cyber
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -130,7 +130,7 @@
 
 - type: decal
   id: Diablo
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -140,7 +140,7 @@
 
 - type: decal
   id: Donk
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -150,7 +150,7 @@
 
 - type: decal
   id: Gene
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -160,7 +160,7 @@
 
 - type: decal
   id: Gib
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -170,7 +170,7 @@
 
 - type: decal
   id: Max
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -180,7 +180,7 @@
 
 - type: decal
   id: Newton
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -190,7 +190,7 @@
 
 - type: decal
   id: North
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -200,7 +200,7 @@
 
 - type: decal
   id: Omni
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -210,7 +210,7 @@
 
 - type: decal
   id: Osiron
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -220,7 +220,7 @@
 
 - type: decal
   id: Prima
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -230,7 +230,7 @@
 
 - type: decal
   id: Psyke
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -240,7 +240,7 @@
 
 - type: decal
   id: Sirius
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -250,7 +250,7 @@
 
 - type: decal
   id: Tunnel
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -260,7 +260,7 @@
 
 - type: decal
   id: Waffle
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -268,19 +268,9 @@
     sprite: Effects/crayondecals.rsi
     state: Waffle
 
-- type: decal
-  id: a
-  tags: ["crayon"]
-  defaultCleanable: true
-  defaultCustomColor: true
-  defaultSnap: false
-  sprite:
-    sprite: Effects/crayondecals.rsi
-    state: a
-
 - type: decal
   id: ampersand
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -290,7 +280,7 @@
 
 - type: decal
   id: amyjon
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -300,7 +290,7 @@
 
 - type: decal
   id: arrow
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -308,16 +298,6 @@
     sprite: Effects/crayondecals.rsi
     state: arrow
 
-- type: decal
-  id: b
-  tags: ["crayon"]
-  defaultCleanable: true
-  defaultCustomColor: true
-  defaultSnap: false
-  sprite:
-    sprite: Effects/crayondecals.rsi
-    state: b
-
 - type: decal
   id: beepsky
   tags: ["crayon"]
@@ -330,7 +310,7 @@
 
 - type: decal
   id: biohazard
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -370,7 +350,7 @@
 
 - type: decal
   id: brush
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-1-brushes"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -378,16 +358,6 @@
     sprite: Effects/crayondecals.rsi
     state: brush
 
-- type: decal
-  id: c
-  tags: ["crayon"]
-  defaultCleanable: true
-  defaultCustomColor: true
-  defaultSnap: false
-  sprite:
-    sprite: Effects/crayondecals.rsi
-    state: c
-
 - type: decal
   id: carp
   tags: ["crayon"]
@@ -410,7 +380,7 @@
 
 - type: decal
   id: chevron
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -440,7 +410,7 @@
 
 - type: decal
   id: comma
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -460,7 +430,7 @@
 
 - type: decal
   id: credit
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -470,7 +440,7 @@
 
 - type: decal
   id: cyka
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -478,19 +448,9 @@
     sprite: Effects/crayondecals.rsi
     state: cyka
 
-- type: decal
-  id: d
-  tags: ["crayon"]
-  defaultCleanable: true
-  defaultCustomColor: true
-  defaultSnap: false
-  sprite:
-    sprite: Effects/crayondecals.rsi
-    state: d
-
 - type: decal
   id: danger
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -510,7 +470,7 @@
 
 - type: decal
   id: dot
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -528,19 +488,9 @@
     sprite: Effects/crayondecals.rsi
     state: dwarf
 
-- type: decal
-  id: e
-  tags: ["crayon"]
-  defaultCleanable: true
-  defaultCustomColor: true
-  defaultSnap: false
-  sprite:
-    sprite: Effects/crayondecals.rsi
-    state: e
-
 - type: decal
   id: electricdanger
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -550,7 +500,7 @@
 
 - type: decal
   id: end
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -560,7 +510,7 @@
 
 - type: decal
   id: engie
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -570,7 +520,7 @@
 
 - type: decal
   id: equals
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -580,7 +530,7 @@
 
 - type: decal
   id: evac
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -590,7 +540,7 @@
 
 - type: decal
   id: exclamationmark
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -598,16 +548,6 @@
     sprite: Effects/crayondecals.rsi
     state: exclamationmark
 
-- type: decal
-  id: f
-  tags: ["crayon"]
-  defaultCleanable: true
-  defaultCustomColor: true
-  defaultSnap: false
-  sprite:
-    sprite: Effects/crayondecals.rsi
-    state: f
-
 - type: decal
   id: face
   tags: ["crayon"]
@@ -630,7 +570,7 @@
 
 - type: decal
   id: firedanger
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -640,7 +580,7 @@
 
 - type: decal
   id: food
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -659,598 +599,658 @@
     state: footprint
 
 - type: decal
-  id: g
+  id: ghost
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: g
+    state: ghost
 
 - type: decal
-  id: ghost
+  id: guy
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: ghost
+    state: guy
 
 - type: decal
-  id: guy
-  tags: ["crayon"]
+  id: heart
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: guy
+    state: heart
 
 - type: decal
-  id: h
-  tags: ["crayon"]
+  id: largebrush
+  tags: ["crayon", "crayon-1-brushes"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: h
+    state: largebrush
 
 - type: decal
-  id: heart
-  tags: ["crayon"]
+  id: like
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: heart
+    state: like
 
 - type: decal
-  id: i
-  tags: ["crayon"]
+  id: line
+  tags: ["crayon", "crayon-1-brushes"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: i
+    state: line
 
 - type: decal
-  id: j
-  tags: ["crayon"]
+  id: matt
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: j
+    state: matt
 
 - type: decal
-  id: k
-  tags: ["crayon"]
+  id: med
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: k
+    state: med
 
 - type: decal
-  id: l
-  tags: ["crayon"]
+  id: minus
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: l
+    state: minus
 
 - type: decal
-  id: largebrush
-  tags: ["crayon"]
+  id: nay
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: largebrush
+    state: nay
 
 - type: decal
-  id: like
+  id: pawprint
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: like
+    state: pawprint
 
 - type: decal
-  id: line
-  tags: ["crayon"]
+  id: peace
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: line
+    state: peace
 
 - type: decal
-  id: m
-  tags: ["crayon"]
+  id: percent
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: m
+    state: percent
 
 - type: decal
-  id: matt
-  tags: ["crayon"]
+  id: plus
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: matt
+    state: plus
 
 - type: decal
-  id: med
-  tags: ["crayon"]
+  id: pound
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: med
+    state: pound
 
 - type: decal
-  id: minus
-  tags: ["crayon"]
+  id: prolizard
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: minus
+    state: prolizard
 
 - type: decal
-  id: n
-  tags: ["crayon"]
+  id: questionmark
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: n
+    state: questionmark
 
 - type: decal
-  id: nay
-  tags: ["crayon"]
+  id: radiation
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: nay
+    state: radiation
 
 - type: decal
-  id: o
-  tags: ["crayon"]
+  id: revolution
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: o
+    state: revolution
 
 - type: decal
-  id: p
-  tags: ["crayon"]
+  id: rune1
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: p
+    state: rune1
 
 - type: decal
-  id: pawprint
-  tags: ["crayon"]
+  id: rune2
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: pawprint
+    state: rune2
 
 - type: decal
-  id: peace
-  tags: ["crayon"]
+  id: rune3
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: peace
+    state: rune3
 
 - type: decal
-  id: percent
-  tags: ["crayon"]
+  id: rune4
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: percent
+    state: rune4
 
 - type: decal
-  id: plus
-  tags: ["crayon"]
+  id: rune5
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: plus
+    state: rune5
 
 - type: decal
-  id: pound
-  tags: ["crayon"]
+  id: rune6
+  tags: ["crayon", "crayon-5-graffiti"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: pound
+    state: rune6
 
 - type: decal
-  id: prolizard
-  tags: ["crayon"]
+  id: safe
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: prolizard
+    state: safe
 
 - type: decal
-  id: q
+  id: scroll
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: q
+    state: scroll
 
 - type: decal
-  id: questionmark
-  tags: ["crayon"]
+  id: shop
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: questionmark
+    state: shop
 
 - type: decal
-  id: r
-  tags: ["crayon"]
+  id: shortline
+  tags: ["crayon", "crayon-1-brushes"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: r
+    state: shortline
 
 - type: decal
-  id: radiation
+  id: shotgun
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: radiation
+    state: shotgun
 
 - type: decal
-  id: revolution
-  tags: ["crayon"]
+  id: skull
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: revolution
+    state: skull
 
 - type: decal
-  id: rune1
-  tags: ["crayon"]
+  id: slash
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: rune1
+    state: slash
 
 - type: decal
-  id: rune2
-  tags: ["crayon"]
+  id: smallbrush
+  tags: ["crayon", "crayon-1-brushes"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: rune2
+    state: smallbrush
 
 - type: decal
-  id: rune3
+  id: snake
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: rune3
+    state: snake
 
 - type: decal
-  id: rune4
-  tags: ["crayon"]
+  id: space
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: rune4
+    state: space
 
 - type: decal
-  id: rune5
+  id: splatter
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: rune5
+    state: splatter
 
 - type: decal
-  id: rune6
-  tags: ["crayon"]
+  id: star
+  tags: ["crayon", "crayon-3-symbols"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: rune6
+    state: star
 
 - type: decal
-  id: s
+  id: stickman
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: s
+    state: stickman
 
 - type: decal
-  id: safe
+  id: taser
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: safe
+    state: taser
 
 - type: decal
-  id: scroll
-  tags: ["crayon"]
+  id: thinline
+  tags: ["crayon", "crayon-1-brushes"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: scroll
+    state: thinline
 
 - type: decal
-  id: shop
+  id: toilet
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: shop
+    state: toilet
 
 - type: decal
-  id: shortline
+  id: toolbox
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: shortline
+    state: toolbox
 
 - type: decal
-  id: shotgun
-  tags: ["crayon"]
+  id: trade
+  tags: ["crayon", "crayon-4-info"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: shotgun
+    state: trade
 
 - type: decal
-  id: skull
+  id: uboa
   tags: ["crayon"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: skull
+    state: uboa
 
 - type: decal
-  id: slash
-  tags: ["crayon"]
+  id: a
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: slash
+    state: a
 
 - type: decal
-  id: smallbrush
-  tags: ["crayon"]
+  id: b
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: smallbrush
+    state: b
 
 - type: decal
-  id: snake
-  tags: ["crayon"]
+  id: c
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: snake
+    state: c
 
 - type: decal
-  id: space
-  tags: ["crayon"]
+  id: d
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: space
+    state: d
 
 - type: decal
-  id: splatter
-  tags: ["crayon"]
+  id: e
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: splatter
+    state: e
 
 - type: decal
-  id: star
-  tags: ["crayon"]
+  id: f
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: star
+    state: f
 
 - type: decal
-  id: stickman
-  tags: ["crayon"]
+  id: g
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: stickman
+    state: g
 
 - type: decal
-  id: t
-  tags: ["crayon"]
+  id: h
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: t
+    state: h
 
 - type: decal
-  id: taser
-  tags: ["crayon"]
+  id: i
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: taser
+    state: i
 
 - type: decal
-  id: thinline
-  tags: ["crayon"]
+  id: j
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: thinline
+    state: j
 
 - type: decal
-  id: toilet
-  tags: ["crayon"]
+  id: k
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: toilet
+    state: k
 
 - type: decal
-  id: toolbox
-  tags: ["crayon"]
+  id: l
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: toolbox
+    state: l
 
 - type: decal
-  id: trade
-  tags: ["crayon"]
+  id: m
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: trade
+    state: m
 
 - type: decal
-  id: u
-  tags: ["crayon"]
+  id: n
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: u
+    state: n
 
 - type: decal
-  id: uboa
-  tags: ["crayon"]
+  id: o
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
   sprite:
     sprite: Effects/crayondecals.rsi
-    state: uboa
+    state: o
+
+- type: decal
+  id: p
+  tags: ["crayon", "crayon-2-alphanum"]
+  defaultCleanable: true
+  defaultCustomColor: true
+  defaultSnap: false
+  sprite:
+    sprite: Effects/crayondecals.rsi
+    state: p
+
+- type: decal
+  id: q
+  tags: ["crayon", "crayon-2-alphanum"]
+  defaultCleanable: true
+  defaultCustomColor: true
+  defaultSnap: false
+  sprite:
+    sprite: Effects/crayondecals.rsi
+    state: q
+
+- type: decal
+  id: r
+  tags: ["crayon", "crayon-2-alphanum"]
+  defaultCleanable: true
+  defaultCustomColor: true
+  defaultSnap: false
+  sprite:
+    sprite: Effects/crayondecals.rsi
+    state: r
+
+- type: decal
+  id: s
+  tags: ["crayon", "crayon-2-alphanum"]
+  defaultCleanable: true
+  defaultCustomColor: true
+  defaultSnap: false
+  sprite:
+    sprite: Effects/crayondecals.rsi
+    state: s
+
+- type: decal
+  id: t
+  tags: ["crayon", "crayon-2-alphanum"]
+  defaultCleanable: true
+  defaultCustomColor: true
+  defaultSnap: false
+  sprite:
+    sprite: Effects/crayondecals.rsi
+    state: t
+
+- type: decal
+  id: u
+  tags: ["crayon", "crayon-2-alphanum"]
+  defaultCleanable: true
+  defaultCustomColor: true
+  defaultSnap: false
+  sprite:
+    sprite: Effects/crayondecals.rsi
+    state: u
 
 - type: decal
   id: v
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -1260,7 +1260,7 @@
 
 - type: decal
   id: w
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -1270,7 +1270,7 @@
 
 - type: decal
   id: x
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -1280,7 +1280,7 @@
 
 - type: decal
   id: y
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false
@@ -1290,7 +1290,7 @@
 
 - type: decal
   id: z
-  tags: ["crayon"]
+  tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
   defaultSnap: false

From 4f863f05e13e89dfbb50b5a20751eff1af0946aa Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Mon, 18 Sep 2023 10:13:12 +0400
Subject: [PATCH 19/64] fix bloodred boots (#20309)

---
 .../Entities/Clothing/Shoes/magboots.yml      | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index bb2b163f080..f2789866745 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -1,8 +1,9 @@
 - type: entity
   parent: [ClothingShoesBase, BaseToggleClothing]
-  id: ClothingShoesBootsMag
+  id: ClothingShoesBootsMagBase
   name: magboots
   description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  abstract: true
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/magboots.rsi
@@ -13,8 +14,7 @@
     sprite: Clothing/Shoes/Boots/magboots.rsi
   - type: ToggleClothing
     action: ActionToggleMagboots
-  - type: ToggleVerb
-    text: toggle-magboots-verb-get-data-text
+    mustEquip: false
   - type: ComponentToggler
     components:
     - type: NoSlip
@@ -35,6 +35,10 @@
     tags:
     - WhitelistChameleon
 
+- type: entity
+  parent: [ClothingShoesBootsMagBase]
+  id: ClothingShoesBootsMag
+
 - type: entity
   parent: ClothingShoesBootsMag
   id: ClothingShoesBootsMagAdv
@@ -85,7 +89,7 @@
     price: 3000
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ClothingShoesBootsMagBase, BaseJetpack]
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
   description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters.
@@ -105,12 +109,43 @@
       volume: 0.75
       temperature: 293.15
       moles:
-      - 0.153853429 # oxygen
-      - 0.153853429 # nitrogen
+        - 0.153853429 # oxygen
+        - 0.153853429 # nitrogen
+  - type: ActivatableUI
+    key: enum.SharedGasTankUiKey.Key
+  - type: UserInterface
+    interfaces:
+      - key: enum.SharedGasTankUiKey.Key
+        type: GasTankBoundUserInterface
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 20
+  - type: Jetpack
+    moleUsage: 0.00085
+  - type: CanMoveInAir
+  - type: InputMover
+    toParent: true
+  - type: MovementSpeedModifier
+    weightlessAcceleration: 1
+    weightlessFriction: 0.3
+    weightlessModifier: 1.2
+  - type: Tag
+    tags:
+      - WhitelistChameleon
   - type: Item
     sprite: null
     size: Normal
 
+- type: entity
+  id: ActionBaseToggleMagboots
+  name: Toggle Magboots
+  description: Toggles the magboots on and off.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    itemIconStyle: NoItem
+    event: !type:ToggleMagbootsEvent
+
 - type: entity
   id: ActionToggleMagboots
   name: Toggle Magboots

From a8537eb024e374c15e86b52a7733d54c70342976 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:07:15 -0400
Subject: [PATCH 20/64] Fix all prisoner/AI/borg spawnpoint issues

---
 .../ContainerSpawnPointSystem.cs              | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index bc37d93dec5..fc96b8170f1 100644
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -12,17 +12,17 @@ namespace Content.Server.Spawners.EntitySystems;
 
 public sealed class ContainerSpawnPointSystem : EntitySystem
 {
+    [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly ContainerSystem _container = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<PlayerSpawningEvent>(HandlePlayerSpawning, before: [ typeof(SpawnPointSystem) ]);
+        SubscribeLocalEvent<PlayerSpawningEvent>(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem) });
     }
 
     public void HandlePlayerSpawning(PlayerSpawningEvent args)
@@ -30,14 +30,13 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
         if (args.SpawnResult != null)
             return;
 
-        JobPrototype? jobProto = null;
+        // DeltaV - Ignore these two desired spawn types
+        if (args.DesiredSpawnPointType is SpawnPointType.Observer or SpawnPointType.LateJoin)
+            return;
 
         // If it's just a spawn pref check if it's for cryo (silly).
         if (args.HumanoidCharacterProfile?.SpawnPriority != SpawnPriorityPreference.Cryosleep &&
-            (!_proto.TryIndex(args.Job?.Prototype, out jobProto) || jobProto.JobEntity == null))
-            return;
-
-        if (jobProto == null && !_proto.TryIndex(args.Job?.Prototype, out jobProto))
+            (!_proto.TryIndex(args.Job?.Prototype, out var jobProto) || jobProto.JobEntity == null))
             return;
 
         var query = EntityQueryEnumerator<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>();
@@ -49,12 +48,11 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
                 continue;
 
             // DeltaV - Custom override for override spawnpoints, only used for prisoners currently. This shouldn't run for any other jobs
-            if (args.DesiredSpawnPointType == SpawnPointType.Job
-                && spawnPoint.SpawnType == SpawnPointType.Job
-                && args.Job is not null
-                && spawnPoint.Job is not ""
-                && spawnPoint.Job == args.Job.Prototype)
+            if (args.DesiredSpawnPointType == SpawnPointType.Job)
             {
+                if (spawnPoint.SpawnType != SpawnPointType.Job || spawnPoint.Job != args.Job?.Prototype)
+                    continue;
+
                 possibleContainers.Add((uid, spawnPoint, container, xform));
                 continue;
             }
@@ -68,9 +66,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
                 continue;
             }
 
-            if (_gameTicker.RunLevel == GameRunLevel.InRound
-                && spawnPoint.SpawnType == SpawnPointType.LateJoin
-                && jobProto.JobEntity == null)
+            if (_gameTicker.RunLevel == GameRunLevel.InRound && spawnPoint.SpawnType == SpawnPointType.LateJoin)
                 possibleContainers.Add((uid, spawnPoint, container, xform));
 
             if (_gameTicker.RunLevel != GameRunLevel.InRound &&

From 3f0f797fa50b346eeea2793b4619a3669ab7b06d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:14:11 -0400
Subject: [PATCH 21/64] Sort crayons properly.

---
 Resources/Prototypes/Decals/crayons.yml | 72 ++++++++++++-------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/Resources/Prototypes/Decals/crayons.yml b/Resources/Prototypes/Decals/crayons.yml
index a15619d483c..91f942e6800 100644
--- a/Resources/Prototypes/Decals/crayons.yml
+++ b/Resources/Prototypes/Decals/crayons.yml
@@ -1,5 +1,5 @@
 - type: decal
-  id: 0
+  id: alphanumeric_0
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -9,7 +9,7 @@
     state: 0
 
 - type: decal
-  id: 1
+  id: alphanumeric_1
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -19,7 +19,7 @@
     state: 1
 
 - type: decal
-  id: 2
+  id: alphanumeric_2
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -29,7 +29,7 @@
     state: 2
 
 - type: decal
-  id: 3
+  id: alphanumeric_3
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -39,7 +39,7 @@
     state: 3
 
 - type: decal
-  id: 4
+  id: alphanumeric_4
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -49,7 +49,7 @@
     state: 4
 
 - type: decal
-  id: 5
+  id: alphanumeric_5
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -59,7 +59,7 @@
     state: 5
 
 - type: decal
-  id: 6
+  id: alphanumeric_6
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -69,7 +69,7 @@
     state: 6
 
 - type: decal
-  id: 7
+  id: alphanumeric_7
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -79,7 +79,7 @@
     state: 7
 
 - type: decal
-  id: 8
+  id: alphanumeric_8
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -89,7 +89,7 @@
     state: 8
 
 - type: decal
-  id: 9
+  id: alphanumeric_9
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1039,7 +1039,7 @@
     state: uboa
 
 - type: decal
-  id: a
+  id: alphanumeric_a
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1049,7 +1049,7 @@
     state: a
 
 - type: decal
-  id: b
+  id: alphanumeric_b
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1059,7 +1059,7 @@
     state: b
 
 - type: decal
-  id: c
+  id: alphanumeric_c
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1069,7 +1069,7 @@
     state: c
 
 - type: decal
-  id: d
+  id: alphanumeric_d
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1079,7 +1079,7 @@
     state: d
 
 - type: decal
-  id: e
+  id: alphanumeric_e
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1089,7 +1089,7 @@
     state: e
 
 - type: decal
-  id: f
+  id: alphanumeric_f
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1099,7 +1099,7 @@
     state: f
 
 - type: decal
-  id: g
+  id: alphanumeric_g
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1109,7 +1109,7 @@
     state: g
 
 - type: decal
-  id: h
+  id: alphanumeric_h
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1119,7 +1119,7 @@
     state: h
 
 - type: decal
-  id: i
+  id: alphanumeric_i
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1129,7 +1129,7 @@
     state: i
 
 - type: decal
-  id: j
+  id: alphanumeric_j
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1139,7 +1139,7 @@
     state: j
 
 - type: decal
-  id: k
+  id: alphanumeric_k
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1149,7 +1149,7 @@
     state: k
 
 - type: decal
-  id: l
+  id: alphanumeric_l
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1159,7 +1159,7 @@
     state: l
 
 - type: decal
-  id: m
+  id: alphanumeric_m
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1169,7 +1169,7 @@
     state: m
 
 - type: decal
-  id: n
+  id: alphanumeric_n
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1179,7 +1179,7 @@
     state: n
 
 - type: decal
-  id: o
+  id: alphanumeric_o
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1189,7 +1189,7 @@
     state: o
 
 - type: decal
-  id: p
+  id: alphanumeric_p
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1199,7 +1199,7 @@
     state: p
 
 - type: decal
-  id: q
+  id: alphanumeric_q
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1209,7 +1209,7 @@
     state: q
 
 - type: decal
-  id: r
+  id: alphanumeric_r
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1219,7 +1219,7 @@
     state: r
 
 - type: decal
-  id: s
+  id: alphanumeric_s
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1229,7 +1229,7 @@
     state: s
 
 - type: decal
-  id: t
+  id: alphanumeric_t
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1239,7 +1239,7 @@
     state: t
 
 - type: decal
-  id: u
+  id: alphanumeric_u
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1249,7 +1249,7 @@
     state: u
 
 - type: decal
-  id: v
+  id: alphanumeric_v
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1259,7 +1259,7 @@
     state: v
 
 - type: decal
-  id: w
+  id: alphanumeric_w
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1269,7 +1269,7 @@
     state: w
 
 - type: decal
-  id: x
+  id: alphanumeric_x
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1279,7 +1279,7 @@
     state: x
 
 - type: decal
-  id: y
+  id: alphanumeric_y
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true
@@ -1289,7 +1289,7 @@
     state: y
 
 - type: decal
-  id: z
+  id: alphanumeric_z
   tags: ["crayon", "crayon-2-alphanum"]
   defaultCleanable: true
   defaultCustomColor: true

From e1bf09b36bfa9e6694219d156a111d2cc02b46cf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:18:30 -0400
Subject: [PATCH 22/64] !

---
 Content.Server/Holopad/HolopadSystem.cs | 47 ++++++++++++++-----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index f3fcc2a9f68..c5e6c15b516 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Labels.Components;
 using Content.Shared.Silicons.StationAi;
+using Content.Shared.Speech;
 using Content.Shared.Telephone;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
@@ -18,8 +19,6 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Shared.Chat;
-
 
 namespace Content.Server.Holopad;
 
@@ -153,8 +152,7 @@ private void OnHolopadEndCall(Entity<HolopadComponent> entity, ref HolopadEndCal
         if (IsHolopadControlLocked(entity, args.Actor))
             return;
 
-        if (entityTelephone.CurrentState != TelephoneState.EndingCall && entityTelephone.CurrentState != TelephoneState.Idle)
-            _telephoneSystem.EndTelephoneCalls((entity, entityTelephone));
+        _telephoneSystem.EndTelephoneCalls((entity, entityTelephone));
 
         // If the user is an AI, end all calls originating from its
         // associated core to ensure that any broadcasts will end
@@ -162,8 +160,7 @@ private void OnHolopadEndCall(Entity<HolopadComponent> entity, ref HolopadEndCal
             !_stationAiSystem.TryGetStationAiCore((args.Actor, stationAiHeld), out var stationAiCore))
             return;
 
-        if (TryComp<TelephoneComponent>(stationAiCore, out var telephone) &&
-            telephone.CurrentState != TelephoneState.EndingCall && telephone.CurrentState != TelephoneState.Idle)
+        if (TryComp<TelephoneComponent>(stationAiCore, out var telephone))
             _telephoneSystem.EndTelephoneCalls((stationAiCore.Value, telephone));
     }
 
@@ -221,7 +218,8 @@ private void OnHolopadStationAiRequest(Entity<HolopadComponent> entity, ref Holo
         {
             var receiver = new Entity<TelephoneComponent>(receiverUid, receiverTelephone);
 
-            if (!_telephoneSystem.IsSourceAbleToReachReceiver(source, receiver))
+            // Check if the core can reach the call source, rather than the other way around
+            if (!_telephoneSystem.IsSourceAbleToReachReceiver(receiver, source))
                 continue;
 
             if (_telephoneSystem.IsTelephoneEngaged(receiver))
@@ -236,10 +234,9 @@ private void OnHolopadStationAiRequest(Entity<HolopadComponent> entity, ref Holo
                 LinkHolopadToUser(entity, args.Actor);
         }
 
-        if (!reachableAiCores.Any())
-            return;
-
-        _telephoneSystem.BroadcastCallToTelephones(source, reachableAiCores, args.Actor);
+        // Ignore range so that holopads that ignore other devices on the same grid can request the AI
+        var options = new TelephoneCallOptions { IgnoreRange = true };
+        _telephoneSystem.BroadcastCallToTelephones(source, reachableAiCores, args.Actor, options);
     }
 
     #endregion
@@ -360,6 +357,9 @@ private void OnHolopadUserInit(Entity<HolopadUserComponent> entity, ref Componen
 
     private void OnHolopadShutdown(Entity<HolopadComponent> entity, ref ComponentShutdown args)
     {
+        if (TryComp<TelephoneComponent>(entity, out var telphone) && _telephoneSystem.IsTelephoneEngaged((entity.Owner, telphone)))
+            _telephoneSystem.EndTelephoneCalls((entity, telphone));
+
         ShutDownHolopad(entity);
         SetHolopadAmbientState(entity, false);
     }
@@ -529,16 +529,23 @@ private void GenerateHologram(Entity<HolopadComponent> entity)
             entity.Comp.HologramProtoId == null)
             return;
 
-        var uid = Spawn(entity.Comp.HologramProtoId, Transform(entity).Coordinates);
+        var hologramUid = Spawn(entity.Comp.HologramProtoId, Transform(entity).Coordinates);
 
         // Safeguard - spawned holograms must have this component
-        if (!TryComp<HolopadHologramComponent>(uid, out var component))
+        if (!TryComp<HolopadHologramComponent>(hologramUid, out var holopadHologram))
         {
-            Del(uid);
+            Del(hologramUid);
             return;
         }
 
-        entity.Comp.Hologram = new Entity<HolopadHologramComponent>(uid, component);
+        entity.Comp.Hologram = new Entity<HolopadHologramComponent>(hologramUid, holopadHologram);
+
+        // Relay speech preferentially through the hologram
+        if (TryComp<SpeechComponent>(hologramUid, out var hologramSpeech) &&
+            TryComp<TelephoneComponent>(entity, out var entityTelephone))
+        {
+            _telephoneSystem.SetSpeakerForTelephone((entity, entityTelephone), (hologramUid, hologramSpeech));
+        }
     }
 
     private void DeleteHologram(Entity<HolopadHologramComponent> hologram, Entity<HolopadComponent> attachedHolopad)
@@ -636,11 +643,6 @@ private void ShutDownHolopad(Entity<HolopadComponent> entity)
             UnlinkHolopadFromUser(entity, entity.Comp.User.Value);
         }
 
-            if (TryComp<TelephoneComponent>(entity, out var stationAiCoreTelphone) &&
-                stationAiCoreTelphone.CurrentState != TelephoneState.EndingCall && stationAiCoreTelphone.CurrentState != TelephoneState.Idle)
-                _telephoneSystem.EndTelephoneCalls((entity, stationAiCoreTelphone));
-        }
-
         Dirty(entity);
     }
 
@@ -691,8 +693,12 @@ private void ActivateProjector(Entity<HolopadComponent> entity, EntityUid user)
 
         var source = new Entity<TelephoneComponent>(stationAiCore.Value, stationAiTelephone);
 
+        // Check if the AI is unable to activate the projector (unlikely this will ever pass; its just a safeguard)
         if (!_telephoneSystem.IsSourceInRangeOfReceiver(source, receiver))
+        {
+            _popupSystem.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-activate-projector"), receiver, user);
             return;
+        }
 
         // Terminate any calls that the core is hosting and immediately connect to the receiver
         _telephoneSystem.TerminateTelephoneCalls(source);
@@ -737,7 +743,6 @@ private void ExecuteBroadcast(Entity<HolopadComponent> source, EntityUid user)
             var receiverTelephoneEntity = new Entity<TelephoneComponent>(receiver, receiverTelephone);
 
             if (sourceTelephoneEntity == receiverTelephoneEntity ||
-                receiverTelephone.UnlistedNumber ||
                 !_telephoneSystem.IsSourceAbleToReachReceiver(sourceTelephoneEntity, receiverTelephoneEntity))
                 continue;
 

From 25c1da6e3f5c39e527cafd30e9f0ac47294e42df Mon Sep 17 00:00:00 2001
From: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Date: Thu, 2 Jan 2025 05:41:12 -0600
Subject: [PATCH 23/64] Speech is relayed by holopad holograms (#33978)

* Initial commit

* Corrected a field attribute
---
 Content.Server/Telephone/TelephoneSystem.cs      | 16 ++++++++++++----
 Content.Shared/Telephone/TelephoneComponent.cs   | 12 ++++++++++--
 Resources/Locale/en-US/telephone/telephone.ftl   |  3 +++
 .../Entities/Structures/Machines/holopad.yml     |  5 +++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index a13ebd16fda..e90bfbf6c52 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -104,14 +104,17 @@ private void OnTelephoneMessageReceived(Entity<TelephoneComponent> entity, ref T
         var nameEv = new TransformSpeakerNameEvent(args.MessageSource, Name(args.MessageSource));
         RaiseLocalEvent(args.MessageSource, nameEv);
 
-        var name = Loc.GetString("speech-name-relay",
-            ("speaker", Name(entity)),
-            ("originalName", nameEv.VoiceName));
+        // Determine if speech should be relayed via the telephone itself or a designated speaker
+        var speaker = entity.Comp.Speaker != null ? entity.Comp.Speaker.Value.Owner : entity.Owner;
+
+        var name = Loc.GetString("chat-telephone-name-relay",
+            ("originalName", nameEv.VoiceName),
+            ("speaker", Name(speaker)));
 
         var range = args.TelephoneSource.Comp.LinkedTelephones.Count > 1 ? ChatTransmitRange.HideChat : ChatTransmitRange.GhostRangeLimit;
         var volume = entity.Comp.SpeakerVolume == TelephoneVolume.Speak ? InGameICChatType.Speak : InGameICChatType.Whisper;
 
-        _chat.TrySendInGameICMessage(entity, args.Message, volume, range, nameOverride: name, checkRadioPrefix: false);
+        _chat.TrySendInGameICMessage(speaker, args.Message, volume, range, nameOverride: name, checkRadioPrefix: false);
     }
 
     #endregion
@@ -404,6 +407,11 @@ private void SetTelephoneMicrophoneState(Entity<TelephoneComponent> entity, bool
         }
     }
 
+    public void SetSpeakerForTelephone(Entity<TelephoneComponent> entity, Entity<SpeechComponent>? speaker)
+    {
+        entity.Comp.Speaker = speaker;
+    }
+
     private (string?, string?) GetNameAndJobOfCallingEntity(EntityUid uid)
     {
         string? presumedName = null;
diff --git a/Content.Shared/Telephone/TelephoneComponent.cs b/Content.Shared/Telephone/TelephoneComponent.cs
index c08f8b9af37..c24840ce01a 100644
--- a/Content.Shared/Telephone/TelephoneComponent.cs
+++ b/Content.Shared/Telephone/TelephoneComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Chat;
+using Content.Shared.Speech;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -92,6 +93,12 @@ public sealed partial class TelephoneComponent : Component
     [DataField]
     public bool UnlistedNumber = false;
 
+    /// <summary>
+    /// Speech is relayed through this entity instead of the telephone
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public Entity<SpeechComponent>? Speaker = null;
+
     /// <summary>
     /// Telephone number for this device
     /// </summary>
@@ -182,7 +189,8 @@ public record struct TelephoneCallEndedEvent();
 [Serializable, NetSerializable]
 public struct TelephoneCallOptions
 {
-    public bool ForceConnect;   // The source immediately starts a call with the receiver, potentially interrupting a call that is already in progress 
+    public bool IgnoreRange;    // The source can always reach its target
+    public bool ForceConnect;   // The source immediately starts a call with the receiver, potentially interrupting a call that is already in progress
     public bool ForceJoin;      // The source smoothly joins a call in progress, or starts a normal call with the receiver if there is none
     public bool MuteSource;     // Chatter from the source is not transmitted - could be used for eavesdropping when combined with 'ForceJoin'
     public bool MuteReceiver;   // Chatter from the receiver is not transmitted - useful for broadcasting messages to multiple receivers
@@ -214,7 +222,7 @@ public enum TelephoneVolume : byte
 [Serializable, NetSerializable]
 public enum TelephoneRange : byte
 {
-    Grid,       // Can only reach telephones that are on the same grid 
+    Grid,       // Can only reach telephones that are on the same grid
     Map,        // Can reach any telephone that is on the same map
     Unlimited,  // Can reach any telephone, across any distance
 }
diff --git a/Resources/Locale/en-US/telephone/telephone.ftl b/Resources/Locale/en-US/telephone/telephone.ftl
index b1b27768e6e..6685a67c8e2 100644
--- a/Resources/Locale/en-US/telephone/telephone.ftl
+++ b/Resources/Locale/en-US/telephone/telephone.ftl
@@ -8,3 +8,6 @@ chat-telephone-caller-id-with-job = [color={$color}][font={$fontType} size={$fon
 chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color]
 chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown device[/bolditalic][/font][/color]
 chat-telephone-device-id = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($deviceName)}[/bold][/font][/color]
+
+# Chat text
+chat-telephone-name-relay = {$originalName} ({$speaker})
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
index f4327cfd03b..84ecb085530 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -149,6 +149,7 @@
 # These are spawned by holopads
 - type: entity
   id: HolopadHologram
+  name: hologram
   categories: [ HideSpawnMenu ]
   suffix: DO NOT MAP    
   components:
@@ -163,6 +164,10 @@
   - type: Appearance
   - type: TypingIndicator
     proto: robot
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Borg
+    speechBubbleOffset: 0.45
   - type: HolopadHologram
     rsiPath: Structures/Machines/holopad.rsi
     rsiState: icon_in_call

From 3efbb58f03d4ace06444407f96027aab3211f4ec Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:19:29 -0400
Subject: [PATCH 24/64] Imports

---
 Content.Server/Holopad/HolopadSystem.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index c5e6c15b516..3ad7875f224 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -19,6 +19,8 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Chat;
+
 
 namespace Content.Server.Holopad;
 

From ded7a46c3dcbf944182c205435814a403636596b Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:25:31 -0400
Subject: [PATCH 25/64] No base

---
 .../Prototypes/Entities/Clothing/Shoes/magboots.yml    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index f2789866745..45d5a4956ab 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -136,16 +136,6 @@
     sprite: null
     size: Normal
 
-- type: entity
-  id: ActionBaseToggleMagboots
-  name: Toggle Magboots
-  description: Toggles the magboots on and off.
-  noSpawn: true
-  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    event: !type:ToggleMagbootsEvent
-
 - type: entity
   id: ActionToggleMagboots
   name: Toggle Magboots

From 4a6b71df50983c11bfc159d4dd541039629ba087 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:26:10 -0400
Subject: [PATCH 26/64] Remove extra whitespace

---
 Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 45d5a4956ab..83bf99909f3 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -144,4 +144,4 @@
   components:
   - type: InstantAction
     itemIconStyle: BigItem
-    event: !type:ToggleActionEvent
+    event: !type:ToggleActionEvent
\ No newline at end of file

From 04d0d4af2dd6ebb539b559922f0334865d03b68d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:43:05 -0400
Subject: [PATCH 27/64] Fix YML fail due to outdated UserInterfaceComponent

---
 Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 83bf99909f3..f5c2d775ba0 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -115,7 +115,7 @@
     key: enum.SharedGasTankUiKey.Key
   - type: UserInterface
     interfaces:
-      - key: enum.SharedGasTankUiKey.Key
+      enum.SharedGasTankUiKey.Key:
         type: GasTankBoundUserInterface
   - type: Explosive
     explosionType: Default

From e4094b1909feaf31ffe8bd140a9d00289213a69b Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 26 May 2024 16:07:16 -0400
Subject: [PATCH 28/64] fix borg ui mispredict opening (#28305)

move borg ui junk to shared
---
 .../ActivatableUIRequiresLockSystem.cs        | 43 -------------------
 Content.Server/Silicons/Borgs/BorgSystem.cs   |  2 +-
 Content.Server/Wires/WiresSystem.cs           | 23 ----------
 .../ActivatableUIRequiresLockComponent.cs     | 10 +++--
 Content.Shared/Lock/LockSystem.cs             | 26 +++++++++++
 .../ActivatableUIRequiresPanelComponent.cs    |  8 ++--
 Content.Shared/Wires/SharedWiresSystem.cs     | 22 ++++++++++
 7 files changed, 60 insertions(+), 74 deletions(-)
 delete mode 100644 Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs
 rename {Content.Server/Lock/Components => Content.Shared/Lock}/ActivatableUIRequiresLockComponent.cs (66%)
 rename {Content.Server => Content.Shared}/Wires/ActivatableUIRequiresPanelComponent.cs (71%)

diff --git a/Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs b/Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs
deleted file mode 100644
index 04f8e2eb54c..00000000000
--- a/Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.Lock.Components;
-using Content.Server.Popups;
-using Content.Shared.UserInterface;
-using Content.Shared.Lock;
-using Content.Server.UserInterface;
-using ActivatableUISystem = Content.Shared.UserInterface.ActivatableUISystem;
-
-namespace Content.Server.Lock.EntitySystems;
-public sealed class ActivatableUIRequiresLockSystem : EntitySystem
-{
-    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
-        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
-    }
-
-    private void OnUIOpenAttempt(EntityUid uid, ActivatableUIRequiresLockComponent component, ActivatableUIOpenAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.requireLocked)
-        {
-            args.Cancel();
-            if (lockComp.Locked)
-                _popupSystem.PopupEntity(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
-        }
-    }
-
-    private void LockToggled(EntityUid uid, ActivatableUIRequiresLockComponent component, LockToggledEvent args)
-    {
-        if (!TryComp<LockComponent>(uid, out var lockComp) || lockComp.Locked == component.requireLocked)
-            return;
-
-        _activatableUI.CloseAll(uid);
-    }
-}
-
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 25a5f4c96e2..c4f840eed1e 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Hands.Systems;
 using Content.Server.PowerCell;
-using Content.Shared.UserInterface;
 using Content.Shared.Access.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Database;
@@ -202,6 +201,7 @@ private void OnPowerCellSlotEmpty(EntityUid uid, BorgChassisComponent component,
         Toggle.TryDeactivate(uid);
         UpdateUI(uid, component);
     }
+    
     private void OnGetDeadIC(EntityUid uid, BorgChassisComponent component, ref GetCharactedDeadIcEvent args)
     {
         args.Dead = true;
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index 526a14b1ab4..44348dc5de8 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
 using Content.Server.Power.Components;
-using Content.Server.UserInterface;
 using Content.Shared.DoAfter;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
@@ -12,20 +11,17 @@
 using Content.Shared.Popups;
 using Content.Shared.Power;
 using Content.Shared.Tools.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using ActivatableUISystem = Content.Shared.UserInterface.ActivatableUISystem;
 
 namespace Content.Server.Wires;
 
 public sealed class WiresSystem : SharedWiresSystem
 {
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
-    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
@@ -53,8 +49,6 @@ public override void Initialize()
         SubscribeLocalEvent<WiresComponent, TimedWireEvent>(OnTimedWire);
         SubscribeLocalEvent<WiresComponent, PowerChangedEvent>(OnWiresPowered);
         SubscribeLocalEvent<WiresComponent, WireDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenActivatableUI);
-        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, PanelChangedEvent>(OnActivatableUIPanelChanged);
         SubscribeLocalEvent<WiresPanelSecurityComponent, WiresPanelSecurityEvent>(SetWiresPanelSecurity);
     }
 
@@ -474,23 +468,6 @@ private void OnPanelChanged(Entity<WiresComponent> ent, ref PanelChangedEvent ar
         _uiSystem.CloseUi(ent.Owner, WiresUiKey.Key);
     }
 
-    private void OnAttemptOpenActivatableUI(EntityUid uid, ActivatableUIRequiresPanelComponent component, ActivatableUIOpenAttemptEvent args)
-    {
-        if (args.Cancelled || !TryComp<WiresPanelComponent>(uid, out var wires))
-            return;
-
-        if (component.RequireOpen != wires.Open)
-            args.Cancel();
-    }
-
-    private void OnActivatableUIPanelChanged(EntityUid uid, ActivatableUIRequiresPanelComponent component, ref PanelChangedEvent args)
-    {
-        if (args.Open == component.RequireOpen)
-            return;
-
-        _activatableUI.CloseAll(uid);
-    }
-
     private void OnMapInit(EntityUid uid, WiresComponent component, MapInitEvent args)
     {
         if (!string.IsNullOrEmpty(component.LayoutId))
diff --git a/Content.Server/Lock/Components/ActivatableUIRequiresLockComponent.cs b/Content.Shared/Lock/ActivatableUIRequiresLockComponent.cs
similarity index 66%
rename from Content.Server/Lock/Components/ActivatableUIRequiresLockComponent.cs
rename to Content.Shared/Lock/ActivatableUIRequiresLockComponent.cs
index dac677c1c27..7d701ffd874 100644
--- a/Content.Server/Lock/Components/ActivatableUIRequiresLockComponent.cs
+++ b/Content.Shared/Lock/ActivatableUIRequiresLockComponent.cs
@@ -1,15 +1,17 @@
-namespace Content.Server.Lock.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
 
 /// <summary>
 /// This is used for activatable UIs that require the entity to have a lock in a certain state.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
 public sealed partial class ActivatableUIRequiresLockComponent : Component
 {
     /// <summary>
     /// TRUE: the lock must be locked to access the UI.
     /// FALSE: the lock must be unlocked to access the UI.
     /// </summary>
-    [DataField("requireLocked"), ViewVariables(VVAccess.ReadWrite)]
-    public bool requireLocked = false;
+    [DataField]
+    public bool RequireLocked;
 }
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 9c1d1a1c789..25b49946099 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
+using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
 using JetBrains.Annotations;
@@ -25,6 +26,7 @@ namespace Content.Shared.Lock;
 public sealed class LockSystem : EntitySystem
 {
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _sharedPopupSystem = default!;
@@ -48,6 +50,9 @@ public override void Initialize()
         SubscribeLocalEvent<LockedWiresPanelComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
         SubscribeLocalEvent<LockedWiresPanelComponent, AttemptChangePanelEvent>(OnAttemptChangePanel);
         SubscribeLocalEvent<LockedAnchorableComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
+
+        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
+        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
     }
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
@@ -355,5 +360,26 @@ private void OnUnanchorAttempt(Entity<LockedAnchorableComponent> ent, ref Unanch
             args.User);
         args.Cancel();
     }
+
+    private void OnUIOpenAttempt(EntityUid uid, ActivatableUIRequiresLockComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.RequireLocked)
+        {
+            args.Cancel();
+            if (lockComp.Locked)
+                _sharedPopupSystem.PopupEntity(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
+        }
+    }
+
+    private void LockToggled(EntityUid uid, ActivatableUIRequiresLockComponent component, LockToggledEvent args)
+    {
+        if (!TryComp<LockComponent>(uid, out var lockComp) || lockComp.Locked == component.RequireLocked)
+            return;
+
+        _activatableUI.CloseAll(uid);
+    }
 }
 
diff --git a/Content.Server/Wires/ActivatableUIRequiresPanelComponent.cs b/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
similarity index 71%
rename from Content.Server/Wires/ActivatableUIRequiresPanelComponent.cs
rename to Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
index f92df3d3d59..6e8fff6e49c 100644
--- a/Content.Server/Wires/ActivatableUIRequiresPanelComponent.cs
+++ b/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
@@ -1,15 +1,17 @@
-namespace Content.Server.Wires;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Wires;
 
 /// <summary>
 /// This is used for activatable UIs that require the entity to have a panel in a certain state.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedWiresSystem))]
 public sealed partial class ActivatableUIRequiresPanelComponent : Component
 {
     /// <summary>
     /// TRUE: the panel must be open to access the UI.
     /// FALSE: the panel must be closed to access the UI.
     /// </summary>
-    [DataField("requireOpen"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool RequireOpen = true;
 }
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index 7ef2230e7a0..c4f860e165c 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Tools.Systems;
+using Content.Shared.UserInterface;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Wires;
@@ -10,6 +11,7 @@ namespace Content.Shared.Wires;
 public abstract class SharedWiresSystem : EntitySystem
 {
     [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedToolSystem Tool = default!;
@@ -22,6 +24,9 @@ public override void Initialize()
         SubscribeLocalEvent<WiresPanelComponent, WirePanelDoAfterEvent>(OnPanelDoAfter);
         SubscribeLocalEvent<WiresPanelComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<WiresPanelComponent, ExaminedEvent>(OnExamine);
+
+        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenActivatableUI);
+        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, PanelChangedEvent>(OnActivatableUIPanelChanged);
     }
 
     private void OnStartup(Entity<WiresPanelComponent> ent, ref ComponentStartup args)
@@ -147,6 +152,23 @@ public bool IsPanelOpen(Entity<WiresPanelComponent?> entity, EntityUid? tool = n
 
         return entity.Comp.Open;
     }
+
+    private void OnAttemptOpenActivatableUI(EntityUid uid, ActivatableUIRequiresPanelComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (args.Cancelled || !TryComp<WiresPanelComponent>(uid, out var wires))
+            return;
+
+        if (component.RequireOpen != wires.Open)
+            args.Cancel();
+    }
+
+    private void OnActivatableUIPanelChanged(EntityUid uid, ActivatableUIRequiresPanelComponent component, ref PanelChangedEvent args)
+    {
+        if (args.Open == component.RequireOpen)
+            return;
+
+        _activatableUI.CloseAll(uid);
+    }
 }
 
 /// <summary>

From 8a375c63f251af2325da807ebcc59009c8518554 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:51:21 -0400
Subject: [PATCH 29/64] Fix yml

---
 Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index f5c2d775ba0..ceba20644d9 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -14,7 +14,6 @@
     sprite: Clothing/Shoes/Boots/magboots.rsi
   - type: ToggleClothing
     action: ActionToggleMagboots
-    mustEquip: false
   - type: ComponentToggler
     components:
     - type: NoSlip

From 303d94da6fa930ba22e7c2eaf1c8749985fe1b1e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 19:55:55 -0400
Subject: [PATCH 30/64] Add popup to ActivatableUIRequiresPanel

---
 Content.Shared/Wires/SharedWiresSystem.cs              | 10 ++++++++++
 .../en-US/components/base-computer-ui-component.ftl    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index c4f860e165c..82b048a72fc 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -2,9 +2,12 @@
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Popups;
 using Content.Shared.Tools.Systems;
 using Content.Shared.UserInterface;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+
 
 namespace Content.Shared.Wires;
 
@@ -15,6 +18,8 @@ public abstract class SharedWiresSystem : EntitySystem
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedToolSystem Tool = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
 
     public override void Initialize()
     {
@@ -159,7 +164,12 @@ private void OnAttemptOpenActivatableUI(EntityUid uid, ActivatableUIRequiresPane
             return;
 
         if (component.RequireOpen != wires.Open)
+        {
+            if (_netManager.IsServer)
+                _popup.PopupCursor(Loc.GetString("base-computer-ui-component-not-opened", ("machine", uid)));
+
             args.Cancel();
+        }
     }
 
     private void OnActivatableUIPanelChanged(EntityUid uid, ActivatableUIRequiresPanelComponent component, ref PanelChangedEvent args)
diff --git a/Resources/Locale/en-US/components/base-computer-ui-component.ftl b/Resources/Locale/en-US/components/base-computer-ui-component.ftl
index 731609ea0ec..c5a336fbc88 100644
--- a/Resources/Locale/en-US/components/base-computer-ui-component.ftl
+++ b/Resources/Locale/en-US/components/base-computer-ui-component.ftl
@@ -1 +1,2 @@
 base-computer-ui-component-not-powered = {CAPITALIZE(THE($machine))} is not powered.
+base-computer-ui-component-not-opened = {CAPITALIZE(THE($machine))} does not have an open panel.

From f2c01dc71fd57f56c1524e28a03d2951dcd23365 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 08:04:25 +0800
Subject: [PATCH 31/64] increasse flaps slow even more

---
 Resources/Prototypes/Entities/Structures/plastic_flaps.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index ea1ed8362dd..0e81ffbac80 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -123,5 +123,5 @@
   - type: StaticPrice
     price: 100
   - type: SpeedModifierContacts
-    walkSpeedModifier: 0.3
-    sprintSpeedModifier: 0.3
+    walkSpeedModifier: 0.25
+    sprintSpeedModifier: 0.25

From 662ad8a9523cae198b6816f836503250bda9465e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 16 Jan 2025 20:13:45 -0400
Subject: [PATCH 32/64] Fix popup prediction

---
 Content.Shared/Wires/SharedWiresSystem.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index 82b048a72fc..19300d3b03d 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -165,9 +165,7 @@ private void OnAttemptOpenActivatableUI(EntityUid uid, ActivatableUIRequiresPane
 
         if (component.RequireOpen != wires.Open)
         {
-            if (_netManager.IsServer)
-                _popup.PopupCursor(Loc.GetString("base-computer-ui-component-not-opened", ("machine", uid)));
-
+            _popup.PopupPredicted(Loc.GetString("base-computer-ui-component-not-opened", ("machine", uid)), uid, uid);
             args.Cancel();
         }
     }

From 0c6ff0011ac64d75e42e5374a8fc569f87a5ecf3 Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 08:16:27 +0800
Subject: [PATCH 33/64] Arachne Standing Up Fix (#1571)

# Description

Arachne can now stand up after lying down again.

## Media

Arachne with 8 registered legs lying down and standing up


https://github.com/user-attachments/assets/b7b5c83b-b741-4d4f-88b6-1133834104de

## Technical Details

I don't even really understand what I'm about to say, just trying to
explain the issue for documentation purposes.

`LayingDownSystem.TryStandUp` checks if the entity's
`BodyComponent.LegEntities` element count is less than
`BodyComponent.RequiredLegs`, which for Arachne is 8.


https://github.com/Simple-Station/Einstein-Engines/blob/78347d76fb50908888c77df5e3b935b773297620/Content.Shared/Standing/SharedLayingDownSystem.cs#L141-L151

However, due to some issues with the part slot naming,
`BodyComponent.LegEntities` for Arachne has no elements, because of
Shitmed being hardcoded and being built with the expectation that all
slot IDs start with "{body part symmetry} {part type}" like "left leg"
and "right leg", from `GetSlotFromBodyPart`. This means that Arachne
legs which were not following the format were not registered after being
inserted into the thorax part's container.


https://github.com/Simple-Station/Einstein-Engines/blob/78347d76fb50908888c77df5e3b935b773297620/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs#L1044-L1060

This is where the function is used:


https://github.com/Simple-Station/Einstein-Engines/blob/78347d76fb50908888c77df5e3b935b773297620/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs#L216-L236

For the left foreleg for example, the container ID (`slotId`) is
`body_part_slot_right foreleg` but the result of
`PartSlotContainerIdPrefix + GetSlotFromBodyPart(part)` is
`body_part_slot_right leg`, and slotId does not contain `right leg` so
the check fails.

This is resolved by renaming `left foreleg` to `left leg (fore)`, `right
hind leg` to `right leg (hind)` , so on and so forth.

For unconventional body parts like a thorax, you need to explicitly set
the `BodyPart.SlotId` field to override `GetSlotFromBodyPart` returning
`other`, when it should return `thorax` to pass the slotId check. This
will make sure the thorax is registered and thus can recursively
register the legs attached to it.

## Changelog

:cl: Skubman
- fix: Arachne can now stand up after lying down.
---
 .../Entities/Body/Parts/spider.yml            |  1 +
 .../Entities/Body/Prototypes/arachne.yml      | 33 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
index fbd45804dd2..b52a91c1182 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
@@ -36,6 +36,7 @@
     sprite: Mobs/Species/Moth/parts.rsi
     state: "torso_m"
   - type: BodyPart #"Other" type
+    slotId: thorax
   - type: Extractable
     juiceSolution:
       reagents:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
index d8eb35629bf..ea399ea341f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
@@ -38,27 +38,28 @@
     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:
+        # The slots needs to start with (symmetry) (part) or they're not gonna be registered
+        - left leg (fore)
+        - left leg (second)
+        - left leg (third)
+        - left leg (hind)
+        - right leg (fore)
+        - right leg (second)
+        - right leg (third)
+        - right leg (hind)
+    left leg (fore):
       part: LeftLegSpider
-    left second leg:
+    left leg (second):
       part: LeftLegSpider
-    left third leg:
+    left leg (third):
       part: LeftLegSpider
-    left hind leg:
+    left leg (hind):
       part: LeftLegSpider
-    right foreleg:
+    right leg (fore):
       part: RightLegSpider
-    right second leg:
+    right leg (second):
       part: RightLegSpider
-    right third leg:
+    right leg (third):
       part: RightLegSpider
-    right hind leg:
+    right leg (hind):
       part: RightLegSpider

From b07d6e1d42645b5fe237912ed0b3cb816c788c81 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 00:16:55 +0000
Subject: [PATCH 34/64] Automatic Changelog Update (#1571)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9b922a4c36c..c1ce062b274 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9996,3 +9996,10 @@ Entries:
   id: 6703
   time: '2025-01-16T07:21:22.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1557
+- author: Skubman
+  changes:
+    - type: Fix
+      message: Arachne can now stand up after lying down.
+  id: 6704
+  time: '2025-01-17T00:16:28.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1571

From 7ce802313f9d39176b7f0389cc66ce9bae5c0fb1 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 00:27:23 +0000
Subject: [PATCH 35/64] Automatic Changelog Update (#1572)

---
 Resources/Changelog/Changelog.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c1ce062b274..64730897f4b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10003,3 +10003,32 @@ Entries:
   id: 6704
   time: '2025-01-17T00:16:28.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1571
+- author: sleepyyapril
+  changes:
+    - type: Add
+      message: >-
+        Added a popup for when the UI cannot be open due to the maintenance
+        panel being closed.
+    - type: Fix
+      message: Fixed Ripley control panel.
+    - type: Fix
+      message: Fixed Ripley giving battery instead of taking.
+    - type: Fix
+      message: Hopefully fixed wire light not appearing.
+    - type: Fix
+      message: Fixed crayons not placing the decal you want.
+    - type: Fix
+      message: Fixed bloodred boots not acting as a jetpack or magboots.
+    - type: Fix
+      message: Fixed voicemask chameleon menu.
+    - type: Fix
+      message: Fixed spawnpoint issues. (hopefully)
+    - type: Tweak
+      message: >-
+        The crayons menu now has letters and numbers always next to each other,
+        sorted.
+    - type: Tweak
+      message: Crayon UI has been improved, including a search feature.
+  id: 6705
+  time: '2025-01-17T00:27:00.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1572

From b49b9600022e1311b6f32d7431741f8414357cfd Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 00:29:41 +0000
Subject: [PATCH 36/64] Automatic Changelog Update (#1552)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 64730897f4b..f2adbb3abcd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10032,3 +10032,10 @@ Entries:
   id: 6705
   time: '2025-01-17T00:27:00.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1572
+- author: spess-empyrean
+  changes:
+    - type: Fix
+      message: Fixed some errors with looping behaviors like jitter.
+  id: 6706
+  time: '2025-01-17T00:29:16.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1552

From ed5e26b6ff6f964e1118faf4f10627cd476d6f57 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 08:35:51 +0800
Subject: [PATCH 37/64] update trait examples for slips/difficult terrain

---
 Resources/Locale/en-US/traits/traits.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 03e7e47aad3..592e8b32bcf 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -224,8 +224,8 @@ trait-description-Voracious =
     Nothing gets between you and your food.
     Your endless consumption of food and drinks is twice as fast.
 
--terrain-example = [color=gray](e.g. plastic flaps, spider web, slime puddle, kudzu)[/color]
--slippery-example = [color=gray](e.g. banana peel, water puddle, soap, space lube)[/color]
+-terrain-example = [color=gray](e.g. plastic flaps, spider webs, slime puddles, kudzu)[/color]
+-slippery-example = [color=gray](e.g. banana peels, water puddles, soap, space lube)[/color]
 
 trait-name-ParkourTraining = Parkour Training
 trait-description-ParkourTraining =

From 354da0eebeac95f221cbbe164c8535ba396953f2 Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 09:25:54 +0800
Subject: [PATCH 38/64] Update
 Content.Server/Nutrition/Components/FoodComponent.cs

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Skubman <ba.fallaria@gmail.com>
---
 Content.Server/Nutrition/Components/FoodComponent.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index de325ba35a4..db31e30073b 100644
--- a/Content.Server/Nutrition/Components/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -72,8 +72,8 @@ public sealed partial class FoodComponent : Component
     /// <summary>
     /// Shitmed Change: Whether to show a popup to everyone in range when attempting to eat this food, and upon successful eating.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool PopupOnEat = false;
+    [DataField]
+    public bool PopupOnEat;
 
     /// <summary>
     /// For mobs that are food, requires killing them before eating.

From 89101e3d58e77357894acbab5ab3e53557356f12 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:54:16 +0000
Subject: [PATCH 39/64] Automatic Changelog Update (#1573)

---
 Resources/Changelog/Changelog.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f2adbb3abcd..c180f95f24b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10039,3 +10039,14 @@ Entries:
   id: 6706
   time: '2025-01-17T00:29:16.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1552
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Plastic flaps are now considered Difficult Terrain, and will slow you
+        down substantially when crawling through them. Note that the slows of
+        all Difficult Terrain are halved by the Parkour Training trait, and
+        increased by the Bad Knees trait.
+  id: 6707
+  time: '2025-01-17T01:53:16.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1573

From 3a1c2dd072f387edaa4c36462634b6a0a3ccc820 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:54:47 +0000
Subject: [PATCH 40/64] Automatic Changelog Update (#1563)

---
 Resources/Changelog/Changelog.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c180f95f24b..df4db6da927 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10050,3 +10050,21 @@ Entries:
   id: 6707
   time: '2025-01-17T01:53:16.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1573
+- author: Skubman
+  changes:
+    - type: Tweak
+      message: >-
+        Eating a brain now takes 5 seconds (from 1 second), and feeding someone
+        a brain takes 6 seconds.
+    - type: Add
+      message: >-
+        Attempting or succeeding to eat a brain now shows a red popup message to
+        everyone else in range, e.g. "Urist McHands is trying to eat the brain!"
+        / "Urist McHands ate the brain!".
+    - type: Fix
+      message: >-
+        Fixed a bug where players after being force-fed were not shown a popup
+        showing the food's flavors.
+  id: 6708
+  time: '2025-01-17T01:53:42.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1563

From 638071c48fe3ac7c727a1294de3b6d5d8136e79f Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 16 Jan 2025 21:03:49 -0500
Subject: [PATCH 41/64] Glimmer Rework 1: "Swingy Glimmer" (#1480)

# Description

This PR brings back a feature that was present in the Psionic Refactor
Version 1, which ultimately never made it into the game. I have
substantially reworked the underlying math behind Glimmer, such that it
operates on a Logistic Curve described by this equation:


![GlimmerEquation](https://github.com/user-attachments/assets/b079c0f6-5944-408f-adf6-170b8472d6c2)

Instead of 0 being the "Normal" amount of glimmer, the "Normal" amount
is the "seemingly arbitrary" number 502.941. This number is measured
first by taking the derivative of the Glimmer Equation, and then solving
for the derivative equal to 1. Above this constant, glimmer grows
exponentially more difficult to increase. Below this constant, glimmer
grows exponentially easier to increase. It will thus constantly attempt
to trend towards the "Glimmer Equilibrium".

Probers, Drainers, Anomalies, and Glimmer Mites all cause glimmer to
"Fluctuate", either up or down the graph. This gives a glimmer that
swings constantly to both high and low values, with more violent swings
being caused by having more probers/anomalies etc. A great deal of math
functions have been implemented that allow for various uses for glimmer
measurements, and psionic powers can even have their effects modified by
said measurements.

The most significant part of this rework is what's facing Epistemics.
It's essentially no longer possible for Probers to cause a round-ending
chain of events known as "Glimmerloose". You can ALWAYS recover from
high glimmer, no matter how high it gets. As a counterpart to this,
Probers have had the math behind their research point generation
reworked. Research output follows an inverse log base 4 curve. Which can
be found here: https://www.desmos.com/calculator/q183tseun8

I wouldn't drop this massive update on people without a way for them to
understand what's going on. So this PR also features the return(and
expansion of), the much-demanded Psionics Guidebook.

<details><summary><h1>Media</h1></summary>
<p>

Psionics Guidebook

![image](https://github.com/user-attachments/assets/6449f518-bdce-4ba5-a9f5-9f87b5c424c9)


![image](https://github.com/user-attachments/assets/5cf5d5a1-8567-40ae-a020-af074cf9abe3)

</p>
</details>

# Changelog

:cl: VMSolidus, Gollee
- add: Glimmer has been substantially reworked. Please read the new
Psionics Guidebook for more information. In short: "500 is the new
normal glimmer. Stop panicking if Sophia says the glimmer is 500. Call
code white if it gets to 750 and stays above that level."
- add: The much-requested Psionics Guidebook has returned, now with all
new up-to-date information.
- remove: Removed "GLIMMERLOOSE". It's no longer possible for glimmer to
start a chain of events that ends the round if epistemics isn't
destroyed. You can ALWAYS recover from high glimmer now.
- tweak: All glimmer events have had their thresholds tweaked to reflect
the fact that 500 is the new "Normal" amount of glimmer.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Cartridges/GlimmerMonitorUiFragment.xaml  |   1 +
 .../GlimmerMonitorUiFragment.xaml.cs          |  16 +-
 .../AnomalyPowerSystem.EntitySpawn.cs         |   2 +-
 .../Abilities/HealOtherPowerSystem.cs         |  14 +-
 .../Abilities/Psionics/AnomalyPowerSystem.cs  |   4 +-
 .../PsionicAbilitiesSystem.Functions.cs       |   4 +-
 .../Chapel/SacrificialAltarSystem.cs          |   2 +-
 Content.Server/Chat/TelepathicChatSystem.cs   |   8 +-
 .../ChangeGlimmerReactionEffect.cs            |   6 +-
 .../RaiseGlimmerConditionComponent.cs         |   8 +-
 .../Systems/RaiseGlimmerConditionSystem.cs    |   6 +-
 .../SophicScribe/SophicScribeSystem.cs        |   8 +-
 .../Psionics/Glimmer/GlimmerCommands.cs       |  11 +-
 .../Psionics/Glimmer/GlimmerReactiveSystem.cs | 590 +++++++++---------
 .../Glimmer/PassiveGlimmerReductionSystem.cs  | 105 ++--
 .../Structures/GlimmerSourceComponent.cs      |  59 +-
 .../Structures/GlimmerStructuresSystem.cs     | 164 +++--
 Content.Server/Psionics/PsionicsSystem.cs     |   3 +-
 .../Research/Oracle/OracleSystem.cs           |   2 +-
 .../Components/NoosphericFryRuleComponent.cs  |   5 +
 .../StationEvents/EventManagerSystem.cs       |   4 +-
 .../StationEvents/Events/FreeProberRule.cs    |   2 +-
 .../Events/GlimmerEventSystem.cs              |  42 +-
 .../StationEvents/Events/NoosphericFryRule.cs |   4 +-
 .../Events/NoosphericStormRule.cs             |   5 +-
 .../Systems/ArtifactAnalyzerSystem.cs         |   2 +-
 Content.Shared/CCVar/CCVars.cs                |   8 +-
 .../Chapel/SacrificialAltarComponent.cs       |   2 +-
 .../Psionics/Glimmer/GlimmerSystem.cs         | 199 ++++--
 .../Psionics/SharedPsionicAbilitiesSystem.cs  |   4 +-
 Resources/Locale/en-US/guidebook/psionics.ftl |   4 +
 .../DeltaV/Entities/Mobs/NPCs/familiars.yml   |   1 +
 .../Entities/Mobs/NPCs/elemental.yml          |   2 +-
 .../Entities/Mobs/NPCs/glimmer_creatures.yml  |   1 +
 .../Entities/Mobs/NPCs/revenant.yml           |   1 +
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |   1 +
 .../Entities/Mobs/Player/familiars.yml        |   2 +
 .../Entities/Mobs/Player/guardian.yml         |   2 +
 .../Entities/Objects/Misc/books.yml           |  23 +
 .../Objects/Specific/Medical/healing.yml      |   4 +
 .../Objects/Specific/Research/misc.yml        |   4 +-
 .../Machines/metempsychoticMachine.yml        |   2 +
 .../Entities/Structures/Specific/oracle.yml   |   3 +
 Resources/Prototypes/Guidebook/psionics.yml   |  35 ++
 Resources/Prototypes/Guidebook/science.yml    |   7 -
 Resources/Prototypes/Guidebook/ss14.yml       |   1 +
 .../Prototypes/Loadouts/Generic/head.yml      |   1 +
 .../Loadouts/Jobs/Epistemics/acolyte.yml      |   1 +
 .../Loadouts/Jobs/Epistemics/cataloger.yml    |   1 +
 .../Loadouts/Jobs/Epistemics/chaplain.yml     |   1 +
 .../Loadouts/Jobs/Epistemics/golemancer.yml   |   1 +
 .../Loadouts/Jobs/Epistemics/mystagogue.yml   |   1 +
 .../Loadouts/Jobs/Epistemics/mystic.yml       |   1 +
 .../Loadouts/Jobs/Epistemics/noviciate.yml    |   1 +
 .../Jobs/Epistemics/psionicMantis.yml         |   2 +
 .../Loadouts/Jobs/Security/uncategorized.yml  |   1 +
 .../Catalog/Fills/Boxes/ammunition.yml        |   3 +
 .../Clothing/Head/hardsuit-helmets.yml        |   2 +
 .../Entities/Clothing/Head/hats.yml           |   5 +
 .../Entities/Clothing/psionic_clothing.yml    |   8 +
 .../Entities/Mobs/Player/special.yml          |   2 +
 .../Objects/Specific/Medical/pills.yml        |   6 +
 .../Guns/Ammunition/Cartridges/shotgun.yml    |   4 +-
 .../Structures/Research/glimmer_prober.yml    |   9 +
 .../Structures/Research/sophicscribe.yml      |   3 +
 .../Nyanotrasen/GameRules/events.yml          |  31 +-
 .../Nyanotrasen/Guidebook/epistemics.yml      |   5 -
 .../Roles/Jobs/Epistemics/forensicmantis.yml  |   2 +-
 .../Roles/Jobs/Civilian/chaplain.yml          |   1 +
 .../Roles/Jobs/Civilian/librarian.yml         |   2 +-
 .../Roles/Jobs/Science/research_assistant.yml |   1 +
 .../Roles/Jobs/Science/research_director.yml  |   3 +-
 .../Roles/Jobs/Science/roboticist.yml         |   1 +
 .../Roles/Jobs/Science/scientist.yml          |   1 +
 .../Roles/Jobs/Science/senior_researcher.yml  |   1 +
 .../Psionics}/Altar.xml                       |   0
 .../ServerInfo/Guidebook/Psionics/Glimmer.xml |  76 +++
 .../GlimmerCreatures.xml                      |   0
 .../Guidebook/Psionics/Mindbreaking.xml       |  16 +
 .../Guidebook/Psionics/PsionicInsulation.xml  |  12 +
 .../Guidebook/Psionics/Psionics.xml           |  62 ++
 81 files changed, 1060 insertions(+), 590 deletions(-)
 create mode 100644 Resources/Locale/en-US/guidebook/psionics.ftl
 create mode 100644 Resources/Prototypes/Guidebook/psionics.yml
 rename Resources/ServerInfo/{Nyanotrasen/Guidebook/Epistemics => Guidebook/Psionics}/Altar.xml (100%)
 create mode 100644 Resources/ServerInfo/Guidebook/Psionics/Glimmer.xml
 rename Resources/ServerInfo/Guidebook/{DeltaV/Epistemics => Psionics}/GlimmerCreatures.xml (100%)
 create mode 100644 Resources/ServerInfo/Guidebook/Psionics/Mindbreaking.xml
 create mode 100644 Resources/ServerInfo/Guidebook/Psionics/PsionicInsulation.xml
 create mode 100644 Resources/ServerInfo/Guidebook/Psionics/Psionics.xml

diff --git a/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
index e09a422ddf7..7dcd993f807 100644
--- a/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
@@ -3,6 +3,7 @@
     <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/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
index 3325c0d379e..175f009ce58 100644
--- a/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
@@ -26,12 +26,14 @@ public GlimmerMonitorUiFragment()
         VerticalExpand = true;
 
         var intervalGroup = new ButtonGroup();
+        IntervalButton6s.Group = intervalGroup;
         IntervalButton1.Group = intervalGroup;
         IntervalButton5.Group = intervalGroup;
         IntervalButton10.Group = intervalGroup;
 
-        IntervalButton1.Pressed = true;
+        IntervalButton6s.Pressed = true;
 
+        IntervalButton6s.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton1.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton5.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton10.OnPressed += _ => UpdateState(_cachedValues);
@@ -62,14 +64,12 @@ private List<int> FormatGlimmerValues(List<int> glimmerValues)
     {
         var returnList = glimmerValues;
 
-        if (IntervalButton5.Pressed)
-        {
-            returnList = GetAveragedList(glimmerValues, 5);
-        }
-        else if (IntervalButton10.Pressed)
-        {
+        if (IntervalButton1.Pressed)
             returnList = GetAveragedList(glimmerValues, 10);
-        }
+        else if (IntervalButton5.Pressed)
+            returnList = GetAveragedList(glimmerValues, 50);
+        else if (IntervalButton10.Pressed)
+            returnList = GetAveragedList(glimmerValues, 100);
 
         return ClipToFifteen(returnList);
     }
diff --git a/Content.Server/Abilities/Psionics/Abilities/AnomalyPowerSystem.EntitySpawn.cs b/Content.Server/Abilities/Psionics/Abilities/AnomalyPowerSystem.EntitySpawn.cs
index 456f2784863..239ea23d1d1 100644
--- a/Content.Server/Abilities/Psionics/Abilities/AnomalyPowerSystem.EntitySpawn.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/AnomalyPowerSystem.EntitySpawn.cs
@@ -66,7 +66,7 @@ private void SpawnEntities(EntityUid uid, PsionicComponent component, EntitySpaw
                         component.CurrentDampening,
                         component.CurrentAmplification,
                         entry.Settings,
-                        _glimmerSystem.Glimmer / 1000,
+                        _glimmerSystem.GlimmerOutput / 1000,
                         component.CurrentAmplification,
                         component.CurrentAmplification);
 
diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
index 0c44a680ff1..5b6c4b777f1 100644
--- a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -55,21 +55,21 @@ private void OnPowerUsed(EntityUid uid, PsionicComponent component, PsionicHealO
         else ActivatePower(uid, component, args);
 
         if (args.PopupText is not null
-            && _glimmer.Glimmer > args.GlimmerPopupThreshold * args.ModifiedDampening)
+            && _glimmer.GlimmerOutput > args.GlimmerPopupThreshold * args.ModifiedDampening)
             _popupSystem.PopupEntity(Loc.GetString(args.PopupText, ("entity", uid)), uid,
                 Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
                 true,
                 args.PopupType);
 
         if (args.PlaySound
-            && _glimmer.Glimmer > args.GlimmerSoundThreshold * args.ModifiedDampening)
+            && _glimmer.GlimmerOutput > args.GlimmerSoundThreshold * args.ModifiedDampening)
             _audioSystem.PlayPvs(args.SoundUse, uid, args.AudioParams);
 
         // Sanitize the Glimmer inputs because otherwise the game will crash if someone makes MaxGlimmer lower than MinGlimmer.
-        var minGlimmer = (int) Math.Round(MathF.MinMagnitude(args.MinGlimmer, args.MaxGlimmer)
-            * args.ModifiedAmplification - args.ModifiedDampening);
-        var maxGlimmer = (int) Math.Round(MathF.MaxMagnitude(args.MinGlimmer, args.MaxGlimmer)
-            * args.ModifiedAmplification - args.ModifiedDampening);
+        var minGlimmer = MathF.MinMagnitude(args.MinGlimmer, args.MaxGlimmer)
+            * args.ModifiedAmplification - args.ModifiedDampening;
+        var maxGlimmer = MathF.MaxMagnitude(args.MinGlimmer, args.MaxGlimmer)
+            * args.ModifiedAmplification - args.ModifiedDampening;
 
         _psionics.LogPowerUsed(uid, args.PowerName, minGlimmer, maxGlimmer);
         args.Handled = true;
@@ -89,7 +89,7 @@ private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHe
         var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid, target: args.Target)
         {
             BreakOnMove = args.BreakOnMove,
-            Hidden = _glimmer.Glimmer > args.GlimmerDoAfterVisibilityThreshold * args.ModifiedDampening,
+            Hidden = _glimmer.GlimmerOutput > args.GlimmerDoAfterVisibilityThreshold * args.ModifiedDampening,
         };
 
         if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId))
diff --git a/Content.Server/Abilities/Psionics/AnomalyPowerSystem.cs b/Content.Server/Abilities/Psionics/AnomalyPowerSystem.cs
index ff9910c400d..e697f6ad9ce 100644
--- a/Content.Server/Abilities/Psionics/AnomalyPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/AnomalyPowerSystem.cs
@@ -52,7 +52,7 @@ private void OnPowerUsed(EntityUid uid, PsionicComponent component, AnomalyPower
         if (!_psionics.OnAttemptPowerUse(args.Performer, args.Settings.PowerName, args.Settings.ManaCost, args.Settings.CheckInsulation))
             return;
 
-        var overcharged = args.Settings.DoSupercritical ? _glimmerSystem.Glimmer * component.CurrentAmplification
+        var overcharged = args.Settings.DoSupercritical ? _glimmerSystem.GlimmerOutput * component.CurrentAmplification
             > Math.Min(args.Settings.SupercriticalThreshold * component.CurrentDampening, args.Settings.MaxSupercriticalThreshold)
             : false;
 
@@ -84,7 +84,7 @@ public void DoAnomalySounds(EntityUid uid, PsionicComponent component, AnomalyPo
         }
 
         if (args.Settings.PulseSound is null
-            || _glimmerSystem.Glimmer < args.Settings.GlimmerSoundThreshold * component.CurrentDampening)
+            || _glimmerSystem.GlimmerOutput < args.Settings.GlimmerSoundThreshold * component.CurrentDampening)
             return;
 
         _audio.PlayEntity(args.Settings.PulseSound, uid, uid);
diff --git a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.Functions.cs b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.Functions.cs
index 3db2a2bae4e..19b805d78f8 100644
--- a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.Functions.cs
+++ b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.Functions.cs
@@ -464,7 +464,7 @@ public override void OnAddPsionic(
 public sealed partial class PsionicModifyGlimmer : PsionicPowerFunction
 {
     [DataField]
-    public int GlimmerModifier;
+    public float GlimmerModifier;
 
     public override void OnAddPsionic(
         EntityUid uid,
@@ -477,7 +477,7 @@ public override void OnAddPsionic(
         PsionicPowerPrototype proto)
     {
         var glimmerSystem = entityManager.System<GlimmerSystem>();
-        glimmerSystem.Glimmer += GlimmerModifier;
+        glimmerSystem.DeltaGlimmerInput(GlimmerModifier);
     }
 }
 
diff --git a/Content.Server/Chapel/SacrificialAltarSystem.cs b/Content.Server/Chapel/SacrificialAltarSystem.cs
index f674f263f7a..b0d82847641 100644
--- a/Content.Server/Chapel/SacrificialAltarSystem.cs
+++ b/Content.Server/Chapel/SacrificialAltarSystem.cs
@@ -48,7 +48,7 @@ private void OnDoAfter(Entity<SacrificialAltarComponent> ent, ref SacrificeDoAft
         _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(args.Args.User):player} sacrificed {ToPrettyString(target):target} on {ToPrettyString(ent):altar}");
 
         // lower glimmer by a random amount
-        _glimmer.Glimmer -= (int) (ent.Comp.GlimmerReduction * psionic.CurrentAmplification);
+        _glimmer.DeltaGlimmerInput(ent.Comp.GlimmerReduction * psionic.CurrentAmplification);
 
         if (ent.Comp.RewardPool is not null && _random.Prob(ent.Comp.BaseItemChance * psionic.CurrentDampening))
         {
diff --git a/Content.Server/Chat/TelepathicChatSystem.cs b/Content.Server/Chat/TelepathicChatSystem.cs
index e0844b3eee2..6f8fe684a9e 100644
--- a/Content.Server/Chat/TelepathicChatSystem.cs
+++ b/Content.Server/Chat/TelepathicChatSystem.cs
@@ -117,11 +117,11 @@ public void SendTelepathicChat(EntityUid source, string message, bool hideChat)
         }
 
         if (_random.Prob(0.1f))
-            _glimmerSystem.Glimmer++;
+            _glimmerSystem.DeltaGlimmerInput(1);
 
-        if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.Glimmer / 1500, 1)))
+        if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.GlimmerOutput / 1500, 1)))
         {
-            float obfuscation = 0.25f + (float) _glimmerSystem.Glimmer / 2000;
+            float obfuscation = 0.25f + (float) _glimmerSystem.GlimmerOutput / 2000;
             var obfuscated = ObfuscateMessageReadability(message, obfuscation);
             _chatManager.ChatMessageToMany(ChatChannel.Telepathic, obfuscated, messageWrap, source, hideChat, false, GetDreamers(clients.normal.Concat(clients.psychog)), Color.PaleVioletRed);
         }
@@ -149,4 +149,4 @@ private string ObfuscateMessageReadability(string message, float chance)
 
         return modifiedMessage.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs b/Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs
index 36c9e62b9d3..d15f20f9669 100644
--- a/Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs
@@ -15,8 +15,8 @@ public sealed partial class ChangeGlimmerReactionEffect : EntityEffect
     /// <summary>
     ///     Added to glimmer when reaction occurs.
     /// </summary>
-    [DataField("count")]
-    public int Count = 1;
+    [DataField]
+    public float Count = 1;
 
     public override void Effect(EntityEffectBaseArgs args)
     {
@@ -25,6 +25,6 @@ public override void Effect(EntityEffectBaseArgs args)
 
         var glimmerSystem = args.EntityManager.EntitySysManager.GetEntitySystem<GlimmerSystem>();
 
-        glimmerSystem.Glimmer += Count;
+        glimmerSystem.DeltaGlimmerInput(Count);
     }
 }
diff --git a/Content.Server/Nyanotrasen/Objectives/Components/RaiseGlimmerConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/RaiseGlimmerConditionComponent.cs
index 387067a626e..43d2b04d060 100644
--- a/Content.Server/Nyanotrasen/Objectives/Components/RaiseGlimmerConditionComponent.cs
+++ b/Content.Server/Nyanotrasen/Objectives/Components/RaiseGlimmerConditionComponent.cs
@@ -3,11 +3,11 @@
 namespace Content.Server.Objectives.Components;
 
 /// <summary>
-/// Requires that the player dies to be complete.
+///     Requires that the player ensures glimmer remain above a specific amount.
 /// </summary>
 [RegisterComponent, Access(typeof(RaiseGlimmerConditionSystem))]
 public sealed partial class RaiseGlimmerConditionComponent : Component
 {
-    [DataField("target"), ViewVariables(VVAccess.ReadWrite)]
-    public int Target;
-}
\ No newline at end of file
+    [DataField]
+    public float Target;
+}
diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs
index d7aae44afa7..3b6b9dfbf1c 100644
--- a/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs
+++ b/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs
@@ -8,6 +8,7 @@ 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();
@@ -30,10 +31,9 @@ private void OnGetProgress(EntityUid uid, RaiseGlimmerConditionComponent comp, r
             args.Progress = GetProgress(comp.Target);
         }
 
-        private float GetProgress(int target)
+        private float GetProgress(float target)
         {
-            var glimmer = _sysMan.GetEntitySystem<GlimmerSystem>().Glimmer;
-            var progress = Math.Min((float) glimmer / (float) target, 1f);
+            var progress = Math.Min(_glimmer.GlimmerOutput / target, 1f);
             return progress;
         }
     }
diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
index d29a191f88a..e468c838aab 100644
--- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
@@ -24,7 +24,7 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        if (_glimmerSystem.Glimmer == 0)
+        if (_glimmerSystem.GlimmerOutput == 0)
             return; // yes, return. Glimmer value is global.
 
         var curTime = _timing.CurTime;
@@ -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", _glimmerSystem.Glimmer));
+            var message = Loc.GetString("glimmer-report", ("level", _glimmerSystem.GlimmerOutput));
             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", _glimmerSystem.Glimmer)), InGameICChatType.Speak, true);
+        _chat.TrySendInGameICMessage(uid, Loc.GetString("glimmer-report", ("level", _glimmerSystem.GlimmerOutput)), 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", _glimmerSystem.Glimmer));
+            var message = Loc.GetString(args.Message, ("decrease", args.GlimmerBurned), ("level", _glimmerSystem.GlimmerOutput));
             var channel = _prototypeManager.Index<RadioChannelPrototype>("Common");
             _radioSystem.SendRadioMessage(speaker, message, channel, speaker);
         }
diff --git a/Content.Server/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
index 9e05886adca..634c61db853 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
@@ -14,13 +14,16 @@ public sealed class GlimmerShowCommand : IConsoleCommand
     public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var entMan = IoCManager.Resolve<IEntityManager>();
-        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer.ToString());
+        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().GlimmerOutput.ToString("#.##"));
     }
 }
 
 [AdminCommand(AdminFlags.Debug)]
 public sealed class GlimmerSetCommand : IConsoleCommand
 {
+    // SetGlimmerOutput cannot accept inputs greater than or equal to this number. The equation spits out imaginary number solutions past this point.
+    private const int MaxGlimmer = 1000;
+
     public string Command => "glimmerset";
     public string Description => Loc.GetString("command-glimmerset-description");
     public string Help => Loc.GetString("command-glimmerset-help");
@@ -28,10 +31,12 @@ public sealed class GlimmerSetCommand : IConsoleCommand
     public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1
-            || !int.TryParse(args[0], out var glimmerValue))
+            || !float.TryParse(args[0], out var glimmerValue)
+            || glimmerValue >= MaxGlimmer || glimmerValue < 0)
             return;
 
         var entMan = IoCManager.Resolve<IEntityManager>();
-        entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer = glimmerValue;
+        var glimmerSystem = entMan.System<GlimmerSystem>();
+        glimmerSystem.SetGlimmerOutput(glimmerValue);
     }
 }
diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
index 85aea76bd65..88849cd3f17 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -23,365 +23,363 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Psionics.Glimmer
+namespace Content.Server.Psionics.Glimmer;
+
+public sealed class GlimmerReactiveSystem : EntitySystem
 {
-    public sealed class GlimmerReactiveSystem : EntitySystem
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
+    [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _sharedAudioSystem = default!;
+    [Dependency] private readonly SharedAmbientSoundSystem _sharedAmbientSoundSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly LightningSystem _lightning = default!;
+    [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
+    [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
+    [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!;
+    [Dependency] private readonly GhostSystem _ghostSystem = default!;
+    [Dependency] private readonly RevenantSystem _revenantSystem = 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;
+    public float BeamCooldown = 3;
+    public GlimmerTier LastGlimmerTier = GlimmerTier.Minimal;
+    public bool GhostsVisible = false;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
+
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, ComponentRemove>(OnComponentRemove);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, GlimmerTierChangedEvent>(OnTierChanged);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, GetVerbsEvent<AlternativeVerb>>(AddShockVerb);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, DamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, DestructionEventArgs>(OnDestroyed);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
+        SubscribeLocalEvent<SharedGlimmerReactiveComponent, AttemptMeleeThrowOnHitEvent>(OnMeleeThrowOnHitAttempt);
+    }
+
+    /// <summary>
+    /// Update relevant state on an Entity.
+    /// </summary>
+    /// <param name="glimmerTierDelta">The number of steps in tier
+    /// difference since last update. This can be zero for the sake of
+    /// toggling the enabled states.</param>
+    private void UpdateEntityState(EntityUid uid, SharedGlimmerReactiveComponent component, GlimmerTier currentGlimmerTier, int glimmerTierDelta)
     {
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-        [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _sharedAudioSystem = default!;
-        [Dependency] private readonly SharedAmbientSoundSystem _sharedAmbientSoundSystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly LightningSystem _lightning = default!;
-        [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
-        [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
-        [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!;
-        [Dependency] private readonly GhostSystem _ghostSystem = default!;
-        [Dependency] private readonly RevenantSystem _revenantSystem = 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;
-        public float BeamCooldown = 3;
-        public GlimmerTier LastGlimmerTier = GlimmerTier.Minimal;
-        public bool GhostsVisible = false;
-        public override void Initialize()
+        var isEnabled = true;
+
+        if (component.RequiresApcPower
+            && TryComp(uid, out ApcPowerReceiverComponent? apcPower))
+            isEnabled = apcPower.Powered;
+
+        _appearanceSystem.SetData(uid, GlimmerReactiveVisuals.GlimmerTier, isEnabled ? currentGlimmerTier : GlimmerTier.Minimal);
+
+        // Update ambient sound
+        if (TryComp(uid, out GlimmerSoundComponent? glimmerSound)
+            && TryComp(uid, out AmbientSoundComponent? ambientSoundComponent)
+            && 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))
         {
-            base.Initialize();
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, ComponentRemove>(OnComponentRemove);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, GlimmerTierChangedEvent>(OnTierChanged);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, GetVerbsEvent<AlternativeVerb>>(AddShockVerb);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, DamageChangedEvent>(OnDamageChanged);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, DestructionEventArgs>(OnDestroyed);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
-            SubscribeLocalEvent<SharedGlimmerReactiveComponent, AttemptMeleeThrowOnHitEvent>(OnMeleeThrowOnHitAttempt);
+            _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);
         }
 
-        /// <summary>
-        /// Update relevant state on an Entity.
-        /// </summary>
-        /// <param name="glimmerTierDelta">The number of steps in tier
-        /// difference since last update. This can be zero for the sake of
-        /// toggling the enabled states.</param>
-        private void UpdateEntityState(EntityUid uid, SharedGlimmerReactiveComponent component, GlimmerTier currentGlimmerTier, int glimmerTierDelta)
-        {
-            var isEnabled = true;
+    }
 
-            if (component.RequiresApcPower
-                && TryComp(uid, out ApcPowerReceiverComponent? apcPower))
-                isEnabled = apcPower.Powered;
+    /// <summary>
+    /// Track when the component comes online so it can be given the
+    /// current status of the glimmer tier, if it wasn't around when an
+    /// update went out.
+    /// </summary>
+    private void OnMapInit(EntityUid uid, SharedGlimmerReactiveComponent component, MapInitEvent args)
+    {
+        if (component.RequiresApcPower && !HasComp<ApcPowerReceiverComponent>(uid))
+            _sawmill.Warning($"{ToPrettyString(uid)} had RequiresApcPower set to true but no ApcPowerReceiverComponent was found on init.");
 
-            _appearanceSystem.SetData(uid, GlimmerReactiveVisuals.GlimmerTier, isEnabled ? currentGlimmerTier : GlimmerTier.Minimal);
+        UpdateEntityState(uid, component, LastGlimmerTier, (int) LastGlimmerTier);
+    }
 
-            // Update ambient sound
-            if (TryComp(uid, out GlimmerSoundComponent? glimmerSound)
-                && TryComp(uid, out AmbientSoundComponent? ambientSoundComponent)
-                && glimmerSound.GetSound(currentGlimmerTier, out SoundSpecifier? spec)
-                && spec != null)
-                _sharedAmbientSoundSystem.SetSound(uid, spec, ambientSoundComponent);
+    /// <summary>
+    /// Reset the glimmer tier appearance data if the component's removed,
+    /// just in case some objects can temporarily become reactive to the
+    /// glimmer.
+    /// </summary>
+    private void OnComponentRemove(EntityUid uid, SharedGlimmerReactiveComponent component, ComponentRemove args)
+    {
+        UpdateEntityState(uid, component, GlimmerTier.Minimal, -1 * (int) LastGlimmerTier);
+    }
 
-            // Update point light
-            if (component.ModulatesPointLight
-                && _pointLightSystem.TryGetLight(uid, out var pointLight))
-            {
-                _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);
-            }
+    /// <summary>
+    /// If the Entity has RequiresApcPower set to true, this will force an
+    /// update to the entity's state.
+    /// </summary>
+    private void OnPowerChanged(EntityUid uid, SharedGlimmerReactiveComponent component, ref PowerChangedEvent args)
+    {
+        if (component.RequiresApcPower)
+            UpdateEntityState(uid, component, LastGlimmerTier, 0);
+    }
 
-        }
+    /// <summary>
+    ///     Enable / disable special effects from higher tiers.
+    /// </summary>
+    private void OnTierChanged(EntityUid uid, SharedGlimmerReactiveComponent component, GlimmerTierChangedEvent args)
+    {
+        if (!TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
+            return;
 
-        /// <summary>
-        /// Track when the component comes online so it can be given the
-        /// current status of the glimmer tier, if it wasn't around when an
-        /// update went out.
-        /// </summary>
-        private void OnMapInit(EntityUid uid, SharedGlimmerReactiveComponent component, MapInitEvent args)
+        if (args.CurrentTier >= GlimmerTier.Dangerous)
         {
-            if (component.RequiresApcPower && !HasComp<ApcPowerReceiverComponent>(uid))
-                _sawmill.Warning($"{ToPrettyString(uid)} had RequiresApcPower set to true but no ApcPowerReceiverComponent was found on init.");
+            if (!Transform(uid).Anchored)
+                AnchorOrExplode(uid);
 
-            UpdateEntityState(uid, component, LastGlimmerTier, (int) LastGlimmerTier);
+            receiver.PowerDisabled = false;
+            receiver.NeedsPower = false;
         }
-
-        /// <summary>
-        /// Reset the glimmer tier appearance data if the component's removed,
-        /// just in case some objects can temporarily become reactive to the
-        /// glimmer.
-        /// </summary>
-        private void OnComponentRemove(EntityUid uid, SharedGlimmerReactiveComponent component, ComponentRemove args)
+        else
         {
-            UpdateEntityState(uid, component, GlimmerTier.Minimal, -1 * (int) LastGlimmerTier);
+            receiver.NeedsPower = true;
         }
+    }
 
-        /// <summary>
-        /// If the Entity has RequiresApcPower set to true, this will force an
-        /// update to the entity's state.
-        /// </summary>
-        private void OnPowerChanged(EntityUid uid, SharedGlimmerReactiveComponent component, ref PowerChangedEvent args)
-        {
-            if (component.RequiresApcPower)
-                UpdateEntityState(uid, component, LastGlimmerTier, 0);
-        }
+    private void AddShockVerb(EntityUid uid, SharedGlimmerReactiveComponent component, GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !TryComp<ApcPowerReceiverComponent>(uid, out var receiver)
+            || receiver.NeedsPower)
+            return;
 
-        /// <summary>
-        ///     Enable / disable special effects from higher tiers.
-        /// </summary>
-        private void OnTierChanged(EntityUid uid, SharedGlimmerReactiveComponent component, GlimmerTierChangedEvent args)
+        AlternativeVerb verb = new()
         {
-            if (!TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
-                return;
-
-            if (args.CurrentTier >= GlimmerTier.Dangerous)
+            Act = () =>
             {
-                if (!Transform(uid).Anchored)
-                    AnchorOrExplode(uid);
+                _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
+                _electrocutionSystem.TryDoElectrocution(args.User, null, (int) _glimmerSystem.GlimmerOutput / 200, TimeSpan.FromSeconds(_glimmerSystem.GlimmerOutput / 100), false);
+            },
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
+            Text = Loc.GetString("power-switch-component-toggle-verb"),
+            Priority = -3
+        };
+        args.Verbs.Add(verb);
+    }
 
-                receiver.PowerDisabled = false;
-                receiver.NeedsPower = false;
-            }
-            else
-            {
-                receiver.NeedsPower = true;
-            }
-        }
+    private void OnDamageChanged(EntityUid uid, SharedGlimmerReactiveComponent component, DamageChangedEvent args)
+    {
+        if (args.Origin == null
+            || !_random.Prob(_glimmerSystem.GetGlimmerEquilibriumRatio() / 10))
+            return;
+
+        var tier = _glimmerSystem.GetGlimmerTier();
+        if (tier < GlimmerTier.High)
+            return;
+        Beam(uid, args.Origin.Value, tier);
+    }
 
-        private void AddShockVerb(EntityUid uid, SharedGlimmerReactiveComponent component, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanAccess
-                || !args.CanInteract
-                || !TryComp<ApcPowerReceiverComponent>(uid, out var receiver)
-                || receiver.NeedsPower)
-                return;
+    private void OnDestroyed(EntityUid uid, SharedGlimmerReactiveComponent component, DestructionEventArgs args)
+    {
+        Spawn("MaterialBluespace1", Transform(uid).Coordinates);
 
-            AlternativeVerb verb = new()
-            {
-                Act = () =>
-                {
-                    _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
-                    _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
-                },
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
-                Text = Loc.GetString("power-switch-component-toggle-verb"),
-                Priority = -3
-            };
-            args.Verbs.Add(verb);
-        }
+        var tier = _glimmerSystem.GetGlimmerTier();
+        if (tier < GlimmerTier.High)
+            return;
 
-        private void OnDamageChanged(EntityUid uid, SharedGlimmerReactiveComponent component, DamageChangedEvent args)
-        {
-            if (args.Origin == null
-                || !_random.Prob((float) _glimmerSystem.Glimmer / 1000))
-                return;
+        var totalIntensity = _glimmerSystem.GlimmerOutput * 2;
+        var slope = 11 - _glimmerSystem.GlimmerOutput / 100;
+        var maxIntensity = 20;
 
-            var tier = _glimmerSystem.GetGlimmerTier();
-            if (tier < GlimmerTier.High)
-                return;
-            Beam(uid, args.Origin.Value, tier);
-        }
+        var removed = _glimmerSystem.GlimmerOutput * _random.NextFloat(0.1f, 0.15f);
+        _glimmerSystem.DeltaGlimmerInput(-removed);
+        BeamRandomNearProber(uid, (int) _glimmerSystem.GlimmerOutput / 350, _glimmerSystem.GlimmerOutput / 50);
+        _explosionSystem.QueueExplosion(uid, "Default", totalIntensity, slope, maxIntensity);
+    }
 
-        private void OnDestroyed(EntityUid uid, SharedGlimmerReactiveComponent component, DestructionEventArgs args)
-        {
-            Spawn("MaterialBluespace1", Transform(uid).Coordinates);
+    private void OnUnanchorAttempt(EntityUid uid, SharedGlimmerReactiveComponent component, UnanchorAttemptEvent args)
+    {
+        if (_glimmerSystem.GetGlimmerTier() < GlimmerTier.Dangerous)
+            return;
 
-            var tier = _glimmerSystem.GetGlimmerTier();
-            if (tier < GlimmerTier.High)
-                return;
+        _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
+        _electrocutionSystem.TryDoElectrocution(args.User, null, (int) _glimmerSystem.GlimmerOutput / 200, TimeSpan.FromSeconds(_glimmerSystem.GlimmerOutput / 100), false);
+        args.Cancel();
+    }
 
-            var totalIntensity = (float) (_glimmerSystem.Glimmer * 2);
-            var slope = (float) (11 - _glimmerSystem.Glimmer / 100);
-            var maxIntensity = 20;
+    public void BeamRandomNearProber(EntityUid prober, int targets, float range = 10f)
+    {
+        List<EntityUid> targetList = new();
+        foreach (var (target, status) in _entityLookupSystem.GetEntitiesInRange<StatusEffectsComponent>(_transformSystem.GetMapCoordinates(prober), range))
+            if (status.AllowedEffects.Contains("Electrocution"))
+                targetList.Add(target);
 
-            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);
-        }
+        foreach (var reactive in _entityLookupSystem.GetEntitiesInRange<SharedGlimmerReactiveComponent>(_transformSystem.GetMapCoordinates(prober), range))
+            targetList.Add(reactive);
 
-        private void OnUnanchorAttempt(EntityUid uid, SharedGlimmerReactiveComponent component, UnanchorAttemptEvent args)
+        _random.Shuffle(targetList);
+        foreach (var target in targetList)
         {
-            if (_glimmerSystem.GetGlimmerTier() < GlimmerTier.Dangerous)
+            if (targets <= 0)
                 return;
 
-            _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
-            _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
-            args.Cancel();
+            Beam(prober, target, _glimmerSystem.GetGlimmerTier(), false);
+            targets--;
         }
+    }
 
-        public void BeamRandomNearProber(EntityUid prober, int targets, float range = 10f)
-        {
-            List<EntityUid> targetList = new();
-            foreach (var (target, status) in _entityLookupSystem.GetEntitiesInRange<StatusEffectsComponent>(_transformSystem.GetMapCoordinates(prober), range))
-                if (status.AllowedEffects.Contains("Electrocution"))
-                    targetList.Add(target);
+    private void Beam(EntityUid prober, EntityUid target, GlimmerTier tier, bool obeyCD = true)
+    {
+        if (obeyCD && BeamCooldown != 0
+            || Deleted(prober)
+            || Deleted(target))
+            return;
 
-            foreach (var reactive in _entityLookupSystem.GetEntitiesInRange<SharedGlimmerReactiveComponent>(_transformSystem.GetMapCoordinates(prober), range))
-                targetList.Add(reactive);
+        var lxform = Transform(prober);
+        var txform = Transform(target);
 
-            _random.Shuffle(targetList);
-            foreach (var target in targetList)
-            {
-                if (targets <= 0)
-                    return;
+        if (!lxform.Coordinates.TryDistance(EntityManager, txform.Coordinates, out var distance))
+            return;
+        if (distance > _glimmerSystem.GlimmerOutput / 100)
+            return;
 
-                Beam(prober, target, _glimmerSystem.GetGlimmerTier(), false);
-                targets--;
-            }
-        }
+        string beamproto;
 
-        private void Beam(EntityUid prober, EntityUid target, GlimmerTier tier, bool obeyCD = true)
+        switch (tier)
         {
-            if (obeyCD && BeamCooldown != 0
-                || Deleted(prober)
-                || Deleted(target))
-                return;
-
-            var lxform = Transform(prober);
-            var txform = Transform(target);
-
-            if (!lxform.Coordinates.TryDistance(EntityManager, txform.Coordinates, out var distance))
-                return;
-            if (distance > (float) (_glimmerSystem.Glimmer / 100))
-                return;
-
-            string beamproto;
-
-            switch (tier)
-            {
-                case GlimmerTier.Dangerous:
-                    beamproto = "SuperchargedLightning";
-                    break;
-                case GlimmerTier.Critical:
-                    beamproto = "HyperchargedLightning";
-                    break;
-                default:
-                    beamproto = "ChargedLightning";
-                    break;
-            }
+            case GlimmerTier.Dangerous:
+                beamproto = "SuperchargedLightning";
+                break;
+            case GlimmerTier.Critical:
+                beamproto = "HyperchargedLightning";
+                break;
+            default:
+                beamproto = "ChargedLightning";
+                break;
+        }
 
 
-            _lightning.ShootLightning(prober, target, beamproto);
-            BeamCooldown += 3f;
-        }
+        _lightning.ShootLightning(prober, target, beamproto);
+        BeamCooldown += 3f;
+    }
 
-        private void AnchorOrExplode(EntityUid uid)
-        {
-            if (Transform(uid).GridUid is null)
-                _destructibleSystem.DestroyEntity(uid);
+    private void AnchorOrExplode(EntityUid uid)
+    {
+        if (Transform(uid).GridUid is null)
+            _destructibleSystem.DestroyEntity(uid);
 
-            if (HasComp<AnchorableComponent>(uid))
-                _transformSystem.AnchorEntity(uid, Transform(uid));
-        }
+        if (HasComp<AnchorableComponent>(uid))
+            _transformSystem.AnchorEntity(uid, Transform(uid));
+    }
 
-        private void OnMeleeThrowOnHitAttempt(Entity<SharedGlimmerReactiveComponent> ent, ref AttemptMeleeThrowOnHitEvent args)
-        {
-            if (_glimmerSystem.GetGlimmerTier() < GlimmerTier.Dangerous)
-                return;
+    private void OnMeleeThrowOnHitAttempt(Entity<SharedGlimmerReactiveComponent> ent, ref AttemptMeleeThrowOnHitEvent args)
+    {
+        if (_glimmerSystem.GetGlimmerTier() < GlimmerTier.Dangerous)
+            return;
 
-            args.Cancelled = true;
-            args.Handled = true;
+        args.Cancelled = true;
+        args.Handled = true;
 
-            _lightning.ShootRandomLightnings(ent, 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, ent, 5, TimeSpan.FromSeconds(3), true,
-                    ignoreInsulation: true);
-        }
+        // 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, ent, 5, TimeSpan.FromSeconds(3), true,
+                ignoreInsulation: true);
+    }
 
-        private void Reset(RoundRestartCleanupEvent args)
-        {
-            Accumulator = 0;
+    private void Reset(RoundRestartCleanupEvent args)
+    {
+        Accumulator = 0;
+
+        // It is necessary that the GlimmerTier is reset to the default
+        // tier on round restart. This system will persist through
+        // restarts, and an undesired event will fire as a result after the
+        // start of the new round, causing modulatable PointLights to have
+        // negative Energy if the tier was higher than Minimal on restart.
+        LastGlimmerTier = GlimmerTier.Minimal;
+    }
 
-            // It is necessary that the GlimmerTier is reset to the default
-            // tier on round restart. This system will persist through
-            // restarts, and an undesired event will fire as a result after the
-            // start of the new round, causing modulatable PointLights to have
-            // negative Energy if the tier was higher than Minimal on restart.
-            LastGlimmerTier = GlimmerTier.Minimal;
-        }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        Accumulator += frameTime;
+        BeamCooldown = Math.Max(0, BeamCooldown - frameTime);
 
-        public override void Update(float frameTime)
+        if (Accumulator > UpdateFrequency)
         {
-            base.Update(frameTime);
-            Accumulator += frameTime;
-            BeamCooldown = Math.Max(0, BeamCooldown - frameTime);
+            var currentGlimmerTier = _glimmerSystem.GetGlimmerTier();
 
-            if (Accumulator > UpdateFrequency)
+            var reactives = EntityQuery<SharedGlimmerReactiveComponent>();
+            if (currentGlimmerTier != LastGlimmerTier)
             {
-                var currentGlimmerTier = _glimmerSystem.GetGlimmerTier();
+                var glimmerTierDelta = (int) currentGlimmerTier - (int) LastGlimmerTier;
+                var ev = new GlimmerTierChangedEvent(LastGlimmerTier, currentGlimmerTier, glimmerTierDelta);
 
-                var reactives = EntityQuery<SharedGlimmerReactiveComponent>();
-                if (currentGlimmerTier != LastGlimmerTier)
+                foreach (var reactive in reactives)
                 {
-                    var glimmerTierDelta = (int) currentGlimmerTier - (int) LastGlimmerTier;
-                    var ev = new GlimmerTierChangedEvent(LastGlimmerTier, currentGlimmerTier, glimmerTierDelta);
-
-                    foreach (var reactive in reactives)
-                    {
-                        UpdateEntityState(reactive.Owner, reactive, currentGlimmerTier, glimmerTierDelta);
-                        RaiseLocalEvent(reactive.Owner, ev);
-                    }
-
-                    LastGlimmerTier = currentGlimmerTier;
+                    UpdateEntityState(reactive.Owner, reactive, currentGlimmerTier, glimmerTierDelta);
+                    RaiseLocalEvent(reactive.Owner, ev);
                 }
-                if (currentGlimmerTier == GlimmerTier.Critical)
-                {
-                    _ghostSystem.MakeVisible(true);
-                    _revenantSystem.MakeVisible(true);
-                    GhostsVisible = true;
-                    foreach (var reactive in reactives)
-                        BeamRandomNearProber(reactive.Owner, 1, 12);
-                }
-                else if (GhostsVisible == true)
-                {
-                    _ghostSystem.MakeVisible(false);
-                    _revenantSystem.MakeVisible(false);
-                    GhostsVisible = false;
-                }
-                Accumulator = 0;
+
+                LastGlimmerTier = currentGlimmerTier;
             }
+            if (currentGlimmerTier == GlimmerTier.Critical)
+            {
+                _ghostSystem.MakeVisible(true);
+                _revenantSystem.MakeVisible(true);
+                GhostsVisible = true;
+                foreach (var reactive in reactives)
+                    BeamRandomNearProber(reactive.Owner, 1, 12);
+            }
+            else if (GhostsVisible == true)
+            {
+                _ghostSystem.MakeVisible(false);
+                _revenantSystem.MakeVisible(false);
+                GhostsVisible = false;
+            }
+            Accumulator = 0;
         }
     }
+}
+
+/// <summary>
+/// This event is fired when the broader glimmer tier has changed,
+/// not on every single adjustment to the glimmer count.
+///
+/// <see cref="GlimmerSystem.GetGlimmerTier"/> has the exact
+/// values corresponding to tiers.
+/// </summary>
+public class GlimmerTierChangedEvent : EntityEventArgs
+{
+    /// <summary>
+    /// What was the last glimmer tier before this event fired?
+    /// </summary>
+    public readonly GlimmerTier LastTier;
 
     /// <summary>
-    /// This event is fired when the broader glimmer tier has changed,
-    /// not on every single adjustment to the glimmer count.
-    ///
-    /// <see cref="GlimmerSystem.GetGlimmerTier"/> has the exact
-    /// values corresponding to tiers.
+    /// What is the current glimmer tier?
     /// </summary>
-    public class GlimmerTierChangedEvent : EntityEventArgs
+    public readonly GlimmerTier CurrentTier;
+
+    /// <summary>
+    /// What is the change in tiers between the last and current tier?
+    /// </summary>
+    public readonly int TierDelta;
+
+    public GlimmerTierChangedEvent(GlimmerTier lastTier, GlimmerTier currentTier, int tierDelta)
     {
-        /// <summary>
-        /// What was the last glimmer tier before this event fired?
-        /// </summary>
-        public readonly GlimmerTier LastTier;
-
-        /// <summary>
-        /// What is the current glimmer tier?
-        /// </summary>
-        public readonly GlimmerTier CurrentTier;
-
-        /// <summary>
-        /// What is the change in tiers between the last and current tier?
-        /// </summary>
-        public readonly int TierDelta;
-
-        public GlimmerTierChangedEvent(GlimmerTier lastTier, GlimmerTier currentTier, int tierDelta)
-        {
-            LastTier = lastTier;
-            CurrentTier = currentTier;
-            TierDelta = tierDelta;
-        }
+        LastTier = lastTier;
+        CurrentTier = currentTier;
+        TierDelta = tierDelta;
     }
 }
-
diff --git a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
index 57c74398b08..eddd70409d6 100644
--- a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -1,78 +1,53 @@
-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
-{
-    /// <summary>
-    /// Handles the passive reduction of glimmer.
-    /// </summary>
-    public sealed class PassiveGlimmerReductionSystem : EntitySystem
-    {
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-
-        /// List of glimmer values spaced by minute.
-        public List<int> GlimmerValues = new();
-
-        public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(6);
-
-        private int _updateIncrementor;
-        public TimeSpan NextUpdateTime = default!;
-        public TimeSpan LastUpdateTime = default!;
-
-        private float _glimmerLostPerSecond;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
-            _cfg.OnValueChanged(CCVars.GlimmerLostPerSecond, UpdatePassiveGlimmer, true);
-        }
-
-        private void OnRoundRestartCleanup(RoundRestartCleanupEvent args)
-        {
-            GlimmerValues.Clear();
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
+namespace Content.Server.Psionics.Glimmer;
 
-            var curTime = _timing.CurTime;
-            if (NextUpdateTime > curTime)
-                return;
-
-
-            var delta = curTime - LastUpdateTime;
-            var maxGlimmerLost = (int) Math.Round(delta.TotalSeconds * _glimmerLostPerSecond);
-
-            // It used to be 75% to lose one glimmer per ten seconds, but now it's 50% per six seconds.
-            // The probability is exactly the same over the same span of time. (0.25 ^ 3 == 0.5 ^ 6)
-            // This math is just easier to do for pausing's sake.
-            var actualGlimmerLost = _random.Next(0, 1 + maxGlimmerLost);
-
-            _glimmerSystem.Glimmer -= actualGlimmerLost;
+/// <summary>
+/// Handles the passive reduction of glimmer.
+/// </summary>
+public sealed class PassiveGlimmerReductionSystem : EntitySystem
+{
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-            _updateIncrementor++;
+    /// List of glimmer values spaced by minute.
+    public List<int> GlimmerValues = new();
 
-            // Since we normally update every 6 seconds, this works out to a minute.
-            if (_updateIncrementor == 10)
-            {
-                GlimmerValues.Add(_glimmerSystem.Glimmer);
+    public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(6);
+    public TimeSpan NextUpdateTime = default!;
+    public TimeSpan LastUpdateTime = default!;
 
-                _updateIncrementor = 0;
-            }
+    private float _glimmerLinearDecay;
+    private bool _enabled;
 
-            NextUpdateTime = curTime + TargetUpdatePeriod;
-            LastUpdateTime = curTime;
-        }
+    public override void Initialize()
+    {
+        base.Initialize();
+        _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
+        _cfg.OnValueChanged(CCVars.GlimmerLinearDecayPerMinute, UpdatePassiveGlimmer, true);
+        _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
+    }
 
-        private void UpdatePassiveGlimmer(float value) => _glimmerLostPerSecond = value;
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        if (!_enabled)
+            return;
+
+        var curTime = _timing.CurTime;
+        if (NextUpdateTime > curTime)
+            return;
+        NextUpdateTime = curTime + TargetUpdatePeriod;
+        LastUpdateTime = curTime;
+
+        var glimmerDecay = _glimmerLinearDecay / (60 / TargetUpdatePeriod.Seconds);
+        _glimmerSystem.DeltaGlimmerOutput(-glimmerDecay);
+        GlimmerValues.Add((int) Math.Round(_glimmerSystem.GlimmerOutput));
     }
+
+    private void UpdatePassiveGlimmer(float value) => _glimmerLinearDecay = value;
 }
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
index c7db2a5229f..ce8e079c0b5 100644
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
@@ -1,27 +1,46 @@
-namespace Content.Server.Psionics.Glimmer
+namespace Content.Server.Psionics.Glimmer;
+
+[RegisterComponent]
+/// <summary>
+/// Adds to glimmer at regular intervals. We'll use it for glimmer drains too when we get there.
+/// </summary>
+public sealed partial class GlimmerSourceComponent : Component
 {
-    [RegisterComponent]
+    [DataField]
+    public float Accumulator = 0f;
+
+    [DataField]
+    public bool Active = true;
+
+    /// <summary>
+    ///     Since glimmer is an int, we'll do it like this.
+    /// </summary>
+    [DataField]
+    public float SecondsPerGlimmer = 10f;
+
     /// <summary>
-    /// Adds to glimmer at regular intervals. We'll use it for glimmer drains too when we get there.
+    ///     True if it produces glimmer, false if it subtracts it.
     /// </summary>
-    public sealed partial class GlimmerSourceComponent : Component
-    {
-        [DataField]
-        public float Accumulator = 0f;
+    [DataField]
+    public bool AddToGlimmer = true;
 
-        [DataField]
-        public bool Active = 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>
-        ///     Since glimmer is an int, we'll do it like this.
-        /// </summary>
-        [DataField]
-        public float SecondsPerGlimmer = 10f;
+    /// <summary>
+    ///     Controls whether this entity requires electrical power to generate research points.
+    /// </summary>
+    [DataField]
+    public bool RequiresPower = true;
 
-        /// <summary>
-        ///     True if it produces glimmer, false if it subtracts it.
-        /// </summary>
-        [DataField]
-        public bool AddToGlimmer = 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 c0c11b083ce..528abbadbd2 100644
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -1,77 +1,133 @@
 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.Power;
+using Content.Shared.Mobs;
 using Content.Shared.Psionics.Glimmer;
+using Content.Shared.Power;
+
+namespace Content.Server.Psionics.Glimmer;
 
-namespace Content.Server.Psionics.Glimmer
+/// <summary>
+/// Handles structures which add/subtract glimmer.
+/// </summary>
+public sealed class GlimmerStructuresSystem : EntitySystem
 {
-    /// <summary>
-    /// Handles structures which add/subtract glimmer.
-    /// </summary>
-    public sealed class GlimmerStructuresSystem : EntitySystem
-    {
-        [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!;
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!;
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
 
-        public override void Initialize()
-        {
-            base.Initialize();
+    public override void Initialize()
+    {
+        base.Initialize();
 
-            SubscribeLocalEvent<AnomalyVesselComponent, PowerChangedEvent>(OnAnomalyVesselPowerChanged);
+        SubscribeLocalEvent<AnomalyVesselComponent, PowerChangedEvent>(OnAnomalyVesselPowerChanged);
 
-            SubscribeLocalEvent<GlimmerSourceComponent, AnomalyPulseEvent>(OnAnomalyPulse);
-            SubscribeLocalEvent<GlimmerSourceComponent, AnomalySupercriticalEvent>(OnAnomalySupercritical);
-        }
+        SubscribeLocalEvent<GlimmerSourceComponent, AnomalyPulseEvent>(OnAnomalyPulse);
+        SubscribeLocalEvent<GlimmerSourceComponent, AnomalySupercriticalEvent>(OnAnomalySupercritical);
+        SubscribeLocalEvent<GlimmerSourceComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<GlimmerSourceComponent, ComponentStartup>(OnInit);
+    }
 
-        private void OnAnomalyVesselPowerChanged(EntityUid uid, AnomalyVesselComponent component, ref PowerChangedEvent args)
+    private void OnInit(EntityUid uid, GlimmerSourceComponent component, ComponentStartup args)
+    {
+        if (component.ResearchPointGeneration != null)
         {
-            if (TryComp<GlimmerSourceComponent>(component.Anomaly, out var glimmerSource))
-                glimmerSource.Active = args.Powered;
+            EnsureComp<ResearchPointSourceComponent>(uid, out var points);
+            points.PointsPerSecond = component.ResearchPointGeneration.Value;
+            points.Active = true;
         }
+    }
 
-        private void OnAnomalyPulse(EntityUid uid, GlimmerSourceComponent component, ref AnomalyPulseEvent args)
-        {
-            // Anomalies are meant to have GlimmerSource on them with the
-            // active flag set to false, as they will be set to actively
-            // generate glimmer when scanned to an anomaly vessel for
-            // harvesting research points.
-            //
-            // It is not a bug that glimmer increases on pulse or
-            // supercritical with an inactive glimmer source.
-            //
-            // However, this will need to be reworked if a distinction
-            // needs to be made in the future. I suggest a GlimmerAnomaly
-            // component.
-
-            if (TryComp<AnomalyComponent>(uid, out var anomaly))
-                _glimmerSystem.Glimmer += (int) (5f * anomaly.Severity);
-        }
+    private void OnAnomalyVesselPowerChanged(EntityUid uid, AnomalyVesselComponent component, ref PowerChangedEvent args)
+    {
+        if (TryComp<GlimmerSourceComponent>(component.Anomaly, out var glimmerSource))
+            glimmerSource.Active = args.Powered;
+    }
 
-        private void OnAnomalySupercritical(EntityUid uid, GlimmerSourceComponent component, ref AnomalySupercriticalEvent args)
-        {
-            _glimmerSystem.Glimmer += 100;
-        }
+    private void OnAnomalyPulse(EntityUid uid, GlimmerSourceComponent component, ref AnomalyPulseEvent args)
+    {
+        // Anomalies are meant to have GlimmerSource on them with the
+        // active flag set to false, as they will be set to actively
+        // generate glimmer when scanned to an anomaly vessel for
+        // harvesting research points.
+        //
+        // It is not a bug that glimmer increases on pulse or
+        // supercritical with an inactive glimmer source.
+        //
+        // However, this will need to be reworked if a distinction
+        // needs to be made in the future. I suggest a GlimmerAnomaly
+        // component.
+
+        if (TryComp<AnomalyComponent>(uid, out var anomaly))
+            _glimmerSystem.DeltaGlimmerOutput(5f * anomaly.Severity);
+    }
 
-        public override void Update(float frameTime)
+    private void OnAnomalySupercritical(EntityUid uid, GlimmerSourceComponent component, ref AnomalySupercriticalEvent args)
+    {
+        _glimmerSystem.DeltaGlimmerOutput(100);
+    }
+
+    private void OnMobStateChanged(EntityUid uid, GlimmerSourceComponent component, ref MobStateChangedEvent args)
+    {
+        if (args.NewMobState != MobState.Alive)
+            component.Active = false;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var glimmerSources = Count<GlimmerSourceComponent>();
+        foreach (var source in EntityQuery<GlimmerSourceComponent>())
         {
-            base.Update(frameTime);
-            foreach (var source in EntityQuery<GlimmerSourceComponent>())
+            if (!_powerReceiverSystem.IsPowered(source.Owner)
+                && source.RequiresPower)
+            {
+                glimmerSources--;
+                continue;
+            }
+
+            if (!source.Active)
+            {
+                glimmerSources--;
+                continue;
+            }
+
+            source.Accumulator += frameTime;
+
+            if (source.Accumulator > source.SecondsPerGlimmer)
             {
-                if (!_powerReceiverSystem.IsPowered(source.Owner)
-                    || !source.Active)
-                    continue;
+                source.Accumulator -= source.SecondsPerGlimmer;
 
-                source.Accumulator += frameTime;
+                // 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());
 
-                if (source.Accumulator > source.SecondsPerGlimmer)
+                // Shorthand explanation:
+                // This makes glimmer far more "Swingy", by making both positive and negative glimmer sources scale quite dramatically with glimmer
+                if (!_glimmerSystem.GetGlimmerEnabled())
+                    return;
+
+                var glimmerEquilibrium = GlimmerSystem.GlimmerEquilibrium;
+
+                if (source.AddToGlimmer)
+                {
+                    _glimmerSystem.DeltaGlimmerInput((_glimmerSystem.GlimmerOutput > glimmerEquilibrium
+                    ? MathF.Pow(_glimmerSystem.GetGlimmerOutputInteger() - source.GlimmerExponentOffset + glimmerSources, 2) : 1f)
+                    * (_glimmerSystem.GlimmerOutput < glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
+                }
+                else
                 {
-                    source.Accumulator -= source.SecondsPerGlimmer;
-                    if (source.AddToGlimmer)
-                        _glimmerSystem.Glimmer++;
-                    else
-                        _glimmerSystem.Glimmer--;
+                    _glimmerSystem.DeltaGlimmerInput(-(_glimmerSystem.GlimmerOutput > glimmerEquilibrium
+                    ? MathF.Pow(_glimmerSystem.GetGlimmerOutputInteger() - source.GlimmerExponentOffset + glimmerSources, 2) : 1f)
+                    * (_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
                 }
             }
         }
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index a775b60bc90..9f30f7f80ad 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -285,9 +285,8 @@ public void RollPsionics(EntityUid uid, PsionicComponent component, bool applyGl
             + _random.NextFloat(0, 100);
 
         // Increase the initial odds based on Glimmer.
-        // TODO: Change this equation when I do my Glimmer Refactor
         baselineChance += applyGlimmer
-            ? (float) _glimmerSystem.Glimmer / 1000 //Convert from Glimmer to %chance
+            ? _glimmerSystem.GetGlimmerEquilibriumRatio() * 25
             : 0;
 
         // Certain sources of power rolls provide their own multiplier.
diff --git a/Content.Server/Research/Oracle/OracleSystem.cs b/Content.Server/Research/Oracle/OracleSystem.cs
index 511a18f3795..301235adf36 100644
--- a/Content.Server/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Research/Oracle/OracleSystem.cs
@@ -178,7 +178,7 @@ private void DispenseLiquidReward(Entity<OracleComponent> oracle)
             return;
 
         // Why is this hardcoded?
-        var amount = MathF.Round(20 + _random.Next(1, 30) + _glimmer.Glimmer / 10f);
+        var amount = MathF.Round(20 + _random.Next(1, 30) + _glimmer.GlimmerOutput / 10f);
         var temporarySol = new Solution();
         var reagent = _protoMan.Index(oracle.Comp.RewardReagents).Pick(_random);
 
diff --git a/Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
index 845cef461c7..2a0198e76ea 100644
--- a/Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
@@ -5,4 +5,9 @@ namespace Content.Server.StationEvents.Components;
 [RegisterComponent, Access(typeof(NoosphericFryRule))]
 public sealed partial class NoosphericFryRuleComponent : Component
 {
+    [DataField]
+    public float FryHeadgearMinorThreshold = 750f;
+
+    [DataField]
+    public float FryHeadgearMajorThreshold = 900f;
 }
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index eec4d792178..753d4ad5f06 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -197,8 +197,8 @@ private bool CanRun(EntityPrototype prototype, StationEventComponent stationEven
         // This could not be cleanly done anywhere else.
         if (_configurationManager.GetCVar(CCVars.GlimmerEnabled) &&
             prototype.TryGetComponent<GlimmerEventComponent>(out var glimmerEvent) &&
-            (_glimmerSystem.Glimmer < glimmerEvent.MinimumGlimmer ||
-            _glimmerSystem.Glimmer > glimmerEvent.MaximumGlimmer))
+            (_glimmerSystem.GlimmerOutput < glimmerEvent.MinimumGlimmer ||
+            _glimmerSystem.GlimmerOutput > glimmerEvent.MaximumGlimmer))
         {
             return false;
         }
diff --git a/Content.Server/StationEvents/Events/FreeProberRule.cs b/Content.Server/StationEvents/Events/FreeProberRule.cs
index 04795bdf4e9..9aeea28c769 100644
--- a/Content.Server/StationEvents/Events/FreeProberRule.cs
+++ b/Content.Server/StationEvents/Events/FreeProberRule.cs
@@ -38,7 +38,7 @@ protected override void Started(EntityUid uid, FreeProberRuleComponent component
             }
         }
 
-        if (PossibleSpawns.Count == 0 || _glimmerSystem.Glimmer >= 500 || _robustRandom.Prob(0.25f))
+        if (PossibleSpawns.Count == 0 || _robustRandom.Prob(0.25f))
         {
             var queryBattery = EntityQueryEnumerator<PowerNetworkBatteryComponent>();
             while (query.MoveNext(out var battery, out var _))
diff --git a/Content.Server/StationEvents/Events/GlimmerEventSystem.cs b/Content.Server/StationEvents/Events/GlimmerEventSystem.cs
index 37eb0410fbd..75efe3390db 100644
--- a/Content.Server/StationEvents/Events/GlimmerEventSystem.cs
+++ b/Content.Server/StationEvents/Events/GlimmerEventSystem.cs
@@ -1,35 +1,33 @@
 using Content.Shared.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Psionics.Glimmer;
 using Content.Shared.Psionics.Glimmer;
 
-namespace Content.Server.StationEvents.Events
+namespace Content.Server.StationEvents.Events;
+
+public sealed class GlimmerEventSystem : StationEventSystem<GlimmerEventComponent>
 {
-    public sealed class GlimmerEventSystem : StationEventSystem<GlimmerEventComponent>
-    {
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
 
-        protected override void Ended(EntityUid uid, GlimmerEventComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
-        {
-            base.Ended(uid, component, gameRule, args);
+    protected override void Ended(EntityUid uid, GlimmerEventComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    {
+        base.Ended(uid, component, gameRule, args);
 
-            var glimmerBurned = RobustRandom.Next(component.GlimmerBurnLower, component.GlimmerBurnUpper);
-            _glimmerSystem.Glimmer -= glimmerBurned;
+        var glimmerBurned = RobustRandom.Next(component.GlimmerBurnLower, component.GlimmerBurnUpper);
+        _glimmerSystem.DeltaGlimmerInput(-glimmerBurned);
 
-            var reportEv = new GlimmerEventEndedEvent(component.SophicReport, glimmerBurned);
-            RaiseLocalEvent(reportEv);
-        }
+        var reportEv = new GlimmerEventEndedEvent(component.SophicReport, glimmerBurned);
+        RaiseLocalEvent(reportEv);
     }
+}
 
-    public sealed class GlimmerEventEndedEvent : EntityEventArgs
-    {
-        public string Message = "";
-        public int GlimmerBurned = 0;
+public sealed class GlimmerEventEndedEvent : EntityEventArgs
+{
+    public string Message = "";
+    public int GlimmerBurned = 0;
 
-        public GlimmerEventEndedEvent(string message, int glimmerBurned)
-        {
-            Message = message;
-            GlimmerBurned = glimmerBurned;
-        }
+    public GlimmerEventEndedEvent(string message, int glimmerBurned)
+    {
+        Message = message;
+        GlimmerBurned = glimmerBurned;
     }
 }
diff --git a/Content.Server/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/StationEvents/Events/NoosphericFryRule.cs
index 7e025f61e17..d73c522663f 100644
--- a/Content.Server/StationEvents/Events/NoosphericFryRule.cs
+++ b/Content.Server/StationEvents/Events/NoosphericFryRule.cs
@@ -79,7 +79,7 @@ protected override void Started(EntityUid uid, NoosphericFryRuleComponent compon
             damage.DamageDict.Add("Heat", 2.5);
             damage.DamageDict.Add("Shock", 2.5);
 
-            if (_glimmerSystem.Glimmer > 500 && _glimmerSystem.Glimmer < 750)
+            if (_glimmerSystem.GlimmerOutput > component.FryHeadgearMinorThreshold && _glimmerSystem.GlimmerOutput < component.FryHeadgearMajorThreshold)
             {
                 damage *= 2;
                 if (TryComp<FlammableComponent>(pair.wearer, out var flammableComponent))
@@ -87,7 +87,7 @@ protected override void Started(EntityUid uid, NoosphericFryRuleComponent compon
                     flammableComponent.FireStacks += 1;
                     _flammableSystem.Ignite(pair.wearer, pair.wearer, flammableComponent);
                 }
-            } else if (_glimmerSystem.Glimmer > 750)
+            } else if (_glimmerSystem.GlimmerOutput > component.FryHeadgearMajorThreshold)
             {
                 damage *= 3;
                 if (TryComp<FlammableComponent>(pair.wearer, out var flammableComponent))
diff --git a/Content.Server/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/StationEvents/Events/NoosphericStormRule.cs
index b2777346ae0..4a520a3a09b 100644
--- a/Content.Server/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/StationEvents/Events/NoosphericStormRule.cs
@@ -49,9 +49,8 @@ protected override void Started(EntityUid uid, NoosphericStormRuleComponent comp
 
         // Increase glimmer.
         var baseGlimmerAdd = _robustRandom.Next(component.BaseGlimmerAddMin, component.BaseGlimmerAddMax);
-        //var glimmerSeverityMod = 1 + (component.GlimmerSeverityCoefficient * (GetSeverityModifier() - 1f));
-        var glimmerAdded = (int) baseGlimmerAdd; // Math.Round(baseGlimmerAdd * glimmerSeverityMod);
+        var glimmerAdded = baseGlimmerAdd;
 
-        _glimmerSystem.Glimmer += glimmerAdded;
+        _glimmerSystem.DeltaGlimmerInput(glimmerAdded);
     }
 }
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index a9f224ad5d9..567a8060c48 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -378,7 +378,7 @@ private void OnExtractButton(EntityUid uid, AnalysisConsoleComponent component,
         if (TryComp<ArtifactAnalyzerComponent>(component.AnalyzerEntity.Value, out var analyzer) &&
             analyzer != null)
         {
-            _glimmerSystem.Glimmer += (int) pointValue / analyzer.ExtractRatio;
+            _glimmerSystem.DeltaGlimmerInput(pointValue / analyzer.ExtractRatio);
         }
         // Nyano - End modified code block.
 
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 32aa91b646b..62b08509558 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2722,11 +2722,11 @@ public static readonly CVarDef<float>
             CVarDef.Create("glimmer.enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        ///     Passive glimmer drain per second.
-        ///     Note that this is randomized and this is an average value.
+        ///     The rate at which glimmer linearly decays. Since glimmer increases (usually) follow a logistic curve, this means glimmer
+        ///     becomes increasingly harder to raise after ~502 points.
         /// </summary>
-        public static readonly CVarDef<float> GlimmerLostPerSecond =
-            CVarDef.Create("glimmer.passive_drain_per_second", 0.1f, CVar.SERVERONLY);
+        public static readonly CVarDef<float> GlimmerLinearDecayPerMinute =
+            CVarDef.Create("glimmer.linear_decay_per_minute", 6f, CVar.SERVERONLY);
 
         /// <summary>
         ///     Whether random rolls for psionics are allowed.
diff --git a/Content.Shared/Chapel/SacrificialAltarComponent.cs b/Content.Shared/Chapel/SacrificialAltarComponent.cs
index c3db338861d..6652d446199 100644
--- a/Content.Shared/Chapel/SacrificialAltarComponent.cs
+++ b/Content.Shared/Chapel/SacrificialAltarComponent.cs
@@ -35,7 +35,7 @@ public sealed partial class SacrificialAltarComponent : Component
     ///     Base amount to reduce glimmer by, multiplied by the victim's Amplification stat.
     /// </summary>
     [DataField]
-    public float GlimmerReduction = 25;
+    public float GlimmerReduction = -25;
 
     [DataField]
     public List<ProtoId<WeightedRandomEntityPrototype>>? RewardPool;
diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
index 31af85bbb51..32d6502707f 100644
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -3,63 +3,180 @@
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 
-namespace Content.Shared.Psionics.Glimmer
+namespace Content.Shared.Psionics.Glimmer;
+
+/// <summary>
+/// This handles setting / reading the value of glimmer.
+/// </summary>
+public sealed class GlimmerSystem : EntitySystem
 {
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private float _glimmerInput = 0;
+    /// <summary>
+    ///     GlimmerInput represents the system-facing value of the station's glimmer, and is given by f(y) for this graph: https://www.desmos.com/calculator/posutiq38e
+    ///     Where x = GlimmerOutput and y = GlimmerInput
+    /// </summary>
+    /// <remarks>
+    ///     This is private set for a good reason, if you're looking to change it, do so via DeltaGlimmerInput or SetGlimmerInput
+    /// </remarks>
+    public float GlimmerInput
+    {
+        get { return _glimmerInput; }
+        private set { _glimmerInput = _enabled ? Math.Max(value, 0) : 0; }
+    }
+    private float _glimmerOutput = 0;
+
+    /// <summary>
+    ///     This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X.
+    /// </summary>
+    public const float GlimmerEquilibrium = 502.941f;
+
+
+    /// <summary>
+    ///     Glimmer Output represents the player-facing value of the station's glimmer, and is given by f(x) for this graph: https://www.desmos.com/calculator/posutiq38e
+    ///     Where x = GlimmerInput and y = GlimmerOutput
+    /// </summary>
+    /// <remarks>
+    ///     This is private set for a good reason, if you're looking to change it, do so via DeltaGlimmerOutput or SetGlimmerOutput
+    /// </remarks>
+    public float GlimmerOutput
+    {
+        get { return _glimmerOutput; }
+        private set { _glimmerOutput = _enabled ? Math.Clamp(value, 0, 999.999f) : 0; }
+    }
+    private bool _enabled;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
+        _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
+        _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
+    }
+
+    private void Reset(RoundRestartCleanupEvent args)
+    {
+        GlimmerInput = 0;
+        GlimmerOutput = 0;
+    }
+
+    /// <summary>
+    ///     Return an abstracted range of a glimmer count. This is a legacy system used to support the Prober,
+    ///     and is the lowest form of abstracted glimmer. It's meant more for sprite states than math.
+    /// </summary>
+    /// <param name="glimmer">What glimmer count to check. Uses the current glimmer by default.</param>
+    public GlimmerTier GetGlimmerTier(float? glimmer = null)
+    {
+        if (glimmer == null)
+            glimmer = GlimmerOutput;
+
+        return glimmer switch
+        {
+            <= 49 => GlimmerTier.Minimal,
+            >= 50 and <= 399 => GlimmerTier.Low,
+            >= 400 and <= 599 => GlimmerTier.Moderate,
+            >= 600 and <= 699 => GlimmerTier.High,
+            >= 700 and <= 899 => GlimmerTier.Dangerous,
+            _ => GlimmerTier.Critical,
+        };
+    }
+
     /// <summary>
-    /// This handles setting / reading the value of glimmer.
+    ///     Returns a 0 through 10 range of glimmer. Do not divide by this for any reason.
     /// </summary>
-    public sealed class GlimmerSystem : EntitySystem
+    /// <returns></returns>
+    public int GetGlimmerOutputInteger()
     {
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        private int _glimmer = 0;
-        public int Glimmer
+        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)
         {
-            get { return _glimmer; }
-            set { _glimmer = _enabled ? Math.Clamp(value, 0, 1000) : 0; }
+            GlimmerInput += delta;
+            GlimmerOutput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerInput)) - 1000;
         }
-        private bool _enabled;
-        public override void Initialize()
+    }
+
+    /// <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)
         {
-            base.Initialize();
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-            _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
-            _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
+            GlimmerOutput += delta;
+            GlimmerInput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
         }
+    }
 
-        private void Reset(RoundRestartCleanupEvent args)
+    /// <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)
         {
-            Glimmer = 0;
+            GlimmerOutput = Math.Clamp(set, 0, 999.999f);
+            GlimmerInput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
         }
+    }
 
-        /// <summary>
-        /// Return an abstracted range of a glimmer count.
-        /// </summary>
-        /// <param name="glimmer">What glimmer count to check. Uses the current glimmer by default.</param>
-        public GlimmerTier GetGlimmerTier(int? glimmer = null)
+    /// <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)
         {
-            if (glimmer == null)
-                glimmer = Glimmer;
-
-            return (glimmer) switch
-            {
-                <= 49 => GlimmerTier.Minimal,
-                >= 50 and <= 99 => GlimmerTier.Low,
-                >= 100 and <= 299 => GlimmerTier.Moderate,
-                >= 300 and <= 499 => GlimmerTier.High,
-                >= 500 and <= 899 => GlimmerTier.Dangerous,
-                _ => GlimmerTier.Critical,
-            };
+            GlimmerInput = set;
+            GlimmerOutput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
         }
     }
 
-    [Serializable, NetSerializable]
-    public enum GlimmerTier : byte
+    /// <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()
     {
-        Minimal,
-        Low,
-        Moderate,
-        High,
-        Dangerous,
-        Critical,
+        return _enabled;
     }
 }
+
+[Serializable, NetSerializable]
+public enum GlimmerTier : byte
+{
+    Minimal,
+    Low,
+    Moderate,
+    High,
+    Dangerous,
+    Critical,
+}
diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
index 33d8807f4b2..0df66164260 100644
--- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -82,13 +82,13 @@ private void OnPowerUsed(EntityUid uid, PsionicComponent component, PsionicPower
             }
         }
 
-        public void LogPowerUsed(EntityUid uid, string power, int minGlimmer = 8, int maxGlimmer = 12)
+        public void LogPowerUsed(EntityUid uid, string power, float minGlimmer = 8, float 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);
 
-            _glimmerSystem.Glimmer += _robustRandom.Next(minGlimmer, maxGlimmer);
+            _glimmerSystem.DeltaGlimmerInput(_robustRandom.NextFloat(minGlimmer, maxGlimmer));
         }
 
         /// <summary>
diff --git a/Resources/Locale/en-US/guidebook/psionics.ftl b/Resources/Locale/en-US/guidebook/psionics.ftl
new file mode 100644
index 00000000000..74ba05aa850
--- /dev/null
+++ b/Resources/Locale/en-US/guidebook/psionics.ftl
@@ -0,0 +1,4 @@
+guide-entry-psionics = Psionics
+guide-entry-glimmer = Glimmer
+guide-entry-psionic-insulation = Psionic Insulation
+guide-entry-mindbreaking = Mindbreaking
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index 42c12b1fd64..dcce764af2f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -92,6 +92,7 @@
     nameSegments: [names_golem]
   - type: Psionic
     removable: false
+    roller: false
     assayFeedback:
       - ifrit-feedback
     psychognomicDescriptors:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index bc5e0239d6a..78fd5aa982f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -306,8 +306,8 @@
   - type: DrainableSolution
     solution: bloodstream
   - type: Psionic
-    removable: false
     roller: false
+    removable: false
     assayFeedback:
       - reagent-slime-feedback
   - type: InnatePsionicPowers
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml
index 5fcada3f7f3..a1c03f02b44 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml
@@ -79,6 +79,7 @@
   # powers
   - type: Psionic
     removable: false
+    roller: false
   - type: InnatePsionicPowers
     powersToAdd:
     - NoosphericZapPower
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 52cc4dc6266..546205c4de4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -98,6 +98,7 @@
     speechVerb: Ghost
   - type: Psionic
     removable: false
+    roller: false
     psychognomicDescriptors:
       - p-descriptor-vampiric
   - type: InnatePsionicPowers
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index db8287e13e2..03e57e2bcc3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -132,6 +132,7 @@
     speechVerb: LargeMob
   - type: Psionic
     removable: false
+    roller: false
   - type: InnatePsionicPowers
     powersToAdd:
       - TelepathyPower
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
index 95c87fcb635..145f2043e76 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -41,6 +41,7 @@
   - type: Familiar
   - type: Psionic
     removable: false
+    roller: false
     psychognomicDescriptors:
       - p-descriptor-bound
       - p-descriptor-cyclic
@@ -192,6 +193,7 @@
   - type: Dispellable
   - type: Psionic
     removable: false
+    roller: false
   - type: InnatePsionicPowers
     powersToAdd:
       - TelepathyPower
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index b3c61bb47fb..2a06306a911 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -168,9 +168,11 @@
           shader: unshaded
     - type: Psionic
       removable: false
+      roller: false
     - type: InnatePsionicPowers
       powersToAdd:
         - TelepathyPower
+    - type: Dispellable
 
 - type: entity
   name: HoloClown
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index a839d287ff8..d9580df7e6d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -536,3 +536,26 @@
       color: gold
   - type: Paper
     content: book-text-atmos-vents
+
+- type: entity
+  id: BookPsionicsGuidebook
+  parent: BaseItem
+  name: psionics guidebook
+  description: A guidebook about Psionics written by Gunther P. Gunderaan.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#542485"
+    - state: decor_wingette_circle
+      color: "#be69f0"
+    - state: icon_dna
+  - type: Tag
+    tags:
+    - Book
+  - type: GuideHelp
+    openOnActivation: true
+    guides:
+    - Psionics
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 6e59fc95ecb..c4bdddad4a2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -609,6 +609,8 @@
         reagents:
         - ReagentId: SpaceDrugs
           Quantity: 15
+  - type: GuideHelp
+    guides: [ Psionics ]
 
 - type: entity
   parent: PillCanister
@@ -621,6 +623,8 @@
     contents:
     - id: PillSpaceDrugs
       amount: 5
+  - type: GuideHelp
+    guides: [ Psionics ]
 
 - type: entity
   suffix: Pax 10u
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
index 79c475900aa..c2d1a7ab421 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
@@ -6,4 +6,6 @@
   components:
   - type: TelepathicRepeater
   - type: Psionic
-  - type: Speech
\ No newline at end of file
+    removable: false
+    roller: false
+  - type: Speech
diff --git a/Resources/Prototypes/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Entities/Structures/Machines/metempsychoticMachine.yml
index 9667ed12d46..ecb454e2e98 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/metempsychoticMachine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -24,3 +24,5 @@
             Gore: { state: cloning_failed }
             Idle: { state: cloning_idle }
     - type: Psionic
+      removable: false
+      roller: false
diff --git a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
index e908ecab66f..cc4417a3970 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
@@ -18,6 +18,7 @@
   - type: Actions
   - type: Psionic
     removable: false
+    roller: false
     assayFeedback:
       - oracle-feedback
     psychognomicDescriptors:
@@ -67,6 +68,8 @@
     - TauCetiBasic
     understands:
     - TauCetiBasic
+  - type: GuideHelp
+    guides: [ Psionics ]
 
 
 - type: weightedRandomEntity
diff --git a/Resources/Prototypes/Guidebook/psionics.yml b/Resources/Prototypes/Guidebook/psionics.yml
new file mode 100644
index 00000000000..7c9c99661a8
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/psionics.yml
@@ -0,0 +1,35 @@
+- type: guideEntry
+  id: Psionics
+  name: guide-entry-psionics
+  text: "/ServerInfo/Guidebook/Psionics/Psionics.xml"
+  children:
+  - Glimmer
+  - PsionicInsulation
+  - Mindbreaking
+  - AltarsGolemancy
+  - GlimmerCreatures
+
+- type: guideEntry
+  id: Glimmer
+  name: guide-entry-glimmer
+  text: "/ServerInfo/Guidebook/Psionics/Glimmer.xml"
+
+- type: guideEntry
+  id: PsionicInsulation
+  name: guide-entry-psionic-insulation
+  text: "/ServerInfo/Guidebook/Psionics/PsionicInsulation.xml"
+
+- type: guideEntry
+  id: Mindbreaking
+  name: guide-entry-mindbreaking
+  text: "/ServerInfo/Guidebook/Psionics/Mindbreaking.xml"
+
+- type: guideEntry
+  id: AltarsGolemancy
+  name: guide-entry-altars-golemancy
+  text: "/ServerInfo/Guidebook/Psionics/Altar.xml"
+
+- type: guideEntry
+  id: GlimmerCreatures
+  name: guide-entry-glimmer-creatures
+  text: "/ServerInfo/Guidebook/Psionics/GlimmerCreatures.xml"
diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml
index 56363a6a92a..f9c678d94ce 100644
--- a/Resources/Prototypes/Guidebook/science.yml
+++ b/Resources/Prototypes/Guidebook/science.yml
@@ -8,9 +8,7 @@
   - Xenoarchaeology
   - Robotics
   - MachineUpgrading
-  - AltarsGolemancy
   - ReverseEngineering
-  - GlimmerCreatures
 
 - type: guideEntry
   id: Technologies
@@ -69,8 +67,3 @@
   id: Cyborgs
   name: guide-entry-cyborgs
   text: "/ServerInfo/Guidebook/Science/Cyborgs.xml"
-
-- type: guideEntry
-  id: GlimmerCreatures
-  name: guide-entry-glimmer-creatures
-  text: /ServerInfo/Guidebook/DeltaV/Epistemics/GlimmerCreatures.xml
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml
index cb55cd9c0f5..1849bca2c2a 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/ss14.yml
@@ -14,6 +14,7 @@
   - Glossary
   - LoadoutInfo
   - SettingLore
+  - Psionics
 
 - type: guideEntry
   id: Writing
diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml
index 1e1f2fb4c8f..a2bfd781bcb 100644
--- a/Resources/Prototypes/Loadouts/Generic/head.yml
+++ b/Resources/Prototypes/Loadouts/Generic/head.yml
@@ -94,6 +94,7 @@
   exclusive: true
   customColorTint: true
   canBeHeirloom: true
+  guideEntry: PsionicInsulation
   items:
     - ClothingHeadTinfoil
   requirements:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml
index 2f14ad3ef28..6f2db06b69f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml
@@ -36,6 +36,7 @@
   id: LoadoutAcolytePillCanisterSpaceDrugs
   category: JobsEpistemicsAcolyte
   cost: 1
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutAcolyteEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml
index a2deba33abc..811ae5e2f0b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml
@@ -49,6 +49,7 @@
   id: LoadoutCatalogerPillCanisterSpaceDrugs
   category: JobsEpistemicsCataloger
   cost: 1
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutCatalogerEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml
index 05e01148b22..970d697014f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml
@@ -64,6 +64,7 @@
   id: LoadoutChaplainPillCanisterSpaceDrugs
   category: JobsEpistemicsChaplain
   cost: 0
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutChaplainEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml
index 4cb0bd989aa..a7442d10426 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml
@@ -78,6 +78,7 @@
   id: LoadoutGolemancerPillCanisterSpaceDrugs
   category: JobsEpistemicsGolemancer
   cost: 1
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutGolemancerEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml
index efa4a861445..f36ca4f6603 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml
@@ -77,6 +77,7 @@
   id: LoadoutMystagoguePillCanisterSpaceDrugs
   category: JobsEpistemicsMystagogue
   cost: 0
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutMystagogueEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml
index cc8422b9289..1e978cbb0d4 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml
@@ -36,6 +36,7 @@
   id: LoadoutMysticPillCanisterSpaceDrugs
   category: JobsEpistemicsMystic
   cost: 0
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutMysticEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml
index f6aa0535d12..46da00cd8b8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml
@@ -36,6 +36,7 @@
   id: LoadoutNoviciatePillCanisterSpaceDrugs
   category: JobsEpistemicsNoviciate
   cost: 2
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutNoviciateEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml
index 68140732f4b..6df1d8ef1ff 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml
@@ -36,6 +36,7 @@
   id: LoadoutPsionicMantisPillCanisterSpaceDrugs
   category: JobsEpistemicsPsionicMantis
   cost: 0
+  guideEntry: Psionics
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutPsionicMantisEquipment
@@ -49,6 +50,7 @@
   id: LoadoutPsionicMantisPillCanisterCryptobiolin
   category: JobsEpistemicsPsionicMantis
   cost: 0
+  guideEntry: PsionicInsulation
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutPsionicMantisEquipment
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml
index e7e7ea19e4c..d96662571e4 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml
@@ -994,6 +994,7 @@
   id: LoadoutSecurityHeadHelmetInsulated
   category: JobsSecurityAUncategorized
   cost: 1
+  guideEntry: PsionicInsulation
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutSecurityHead
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml
index ceb1f1b152d..abb2bd507ef 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml
@@ -11,6 +11,9 @@
       layers:
         - state: boxwide
         - state: shellslug
+    - type: GuideHelp
+      guides: [ Mindbreaking ]
+
 
 - type: entity
   name: box of .45 magnum Universal magazines
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
index 9625ec95d6b..5afc951c368 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -6,6 +6,8 @@
   description: Lightweight hardsuit helmet that has a galaxy-first psionic passthrough system.
   components:
   - type: Psionic
+    removable: false
+    roller: false
   - type: TinfoilHat
     passthrough: true
     destroyOnFry: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
index 2f23944549f..3be093de095 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
@@ -74,6 +74,8 @@
   - type: Construction
     graph: TinfoilHat
     node: tinfoilhat
+  - type: GuideHelp
+    guides: [ PsionicInsulation ]
 
 - type: entity
   parent: ClothingHeadBase
@@ -117,6 +119,9 @@
         Slash: 0.85
         Piercing: 0.95
         Radiation: 0.95
+  - type: GuideHelp
+    guides: [ PsionicInsulation ]
+
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
index 0bc1b60ad35..11e62edcdc2 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
@@ -12,6 +12,8 @@
   - type: ClothingGrantPsionicPower
     power: TelegnosisPower
   - type: Psionic
+    removable: false
+    roller: false
 
 - type: entity
   id: BedsheetInvisibilityCloak
@@ -26,6 +28,8 @@
   - type: ClothingGrantPsionicPower
     power: PsionicInvisibilityPower
   - type: Psionic
+    removable: false
+    roller: false
 
 - type: entity
   parent: ClothingHandsBase
@@ -46,6 +50,8 @@
   - type: ClothingGrantPsionicPower
     power: DispelPower
   - type: Psionic
+    removable: false
+    roller: false
 
 - type: entity
   parent: ClothingHandsBase
@@ -64,3 +70,5 @@
   - type: ClothingGrantPsionicPower
     power: NoosphericZapPower
   - type: Psionic
+    removable: false
+    roller: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml
index d133377e01b..dc3c0b159d5 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml
@@ -15,6 +15,8 @@
       - state: eyeball
         shader: unshaded
   - type: Psionic
+    removable: false
+    roller: false
   - type: MindContainer
   - type: Clickable
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml
index 2c51deb272d..49182d46af9 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml
@@ -11,6 +11,8 @@
         reagents:
         - ReagentId: MindbreakerToxin
           Quantity: 20
+  - type: GuideHelp
+    guides: [ Mindbreaking ]
 
 - type: entity
   name: cryptobiolin
@@ -25,6 +27,8 @@
         reagents:
         - ReagentId: Cryptobiolin
           Quantity: 20
+  - type: GuideHelp
+    guides: [ PsionicInsulation ]
 
 - type: entity
   parent: PillCanister
@@ -37,6 +41,8 @@
     contents:
     - id: PillCryptobiolin
       amount: 5
+  - type: GuideHelp
+    guides: [ PsionicInsulation ]
 
 - type: entity
   name: chloral-hydrate
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index efc0d2c9a1a..b8a6eb1d0d6 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -19,4 +19,6 @@
   - type: SolutionTransfer
     maxTransferAmount: 15
   - type: SpentAmmoVisuals
-    state: "practice"
\ No newline at end of file
+    state: "practice"
+  - type: GuideHelp
+    guides: [ Mindbreaking ]
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
index 1bb752ade46..6cadcba5a46 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
@@ -6,12 +6,14 @@
   components:
   - type: Psionic
     removable: false
+    roller: false
     assayFeedback:
       - prober-feedback
   - type: InnatePsionicPowers
     powersToAdd:
       - TelepathyPower
   - type: GlimmerSource
+    researchPointGeneration: 20
   - type: Construction
     graph: GlimmerDevices
     node: glimmerProber
@@ -86,6 +88,8 @@
         path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
       Critical:
         path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
+  - type: GuideHelp
+    guides: [ Glimmer ]
 
 - type: entity
   parent: BaseMachinePowered
@@ -95,6 +99,7 @@
   components:
   - type: Psionic
     removable: false
+    roller: false
     assayFeedback:
       - drain-feedback
   - type: GlimmerSource
@@ -123,6 +128,8 @@
   - type: NpcFactionMember
     factions:
     - PsionicInterloper # :^)
+  - type: GuideHelp
+    guides: [ Glimmer ]
 
 - type: entity
   id: GlimmerDeviceFrame
@@ -173,3 +180,5 @@
       - state: base
       - state: intermediate
     - type: CargoSellBlacklist
+    - type: GuideHelp
+      guides: [ Glimmer ]
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
index 6f7b02cb6b8..2a4e7da9257 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -25,6 +25,7 @@
   - type: Actions
   - type: Psionic
     removable: false
+    roller: false
     assayFeedback:
       - sophic-grammateus-feedback
     psychognomicDescriptors:
@@ -48,3 +49,5 @@
     - TauCetiBasic
     understands:
     - TauCetiBasic
+  - type: GuideHelp
+    guides: [ Psionics ]
diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
index 8612fb0fec7..934ad8581db 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -61,9 +61,9 @@
     - type: StationEvent
       reoccurrenceDelay: 15
     - type: GlimmerEvent
-      maximumGlimmer: 300
-      glimmerBurnLower: 18
-      glimmerBurnUpper: 40
+      maximumGlimmer: 800
+      glimmerBurnLower: 80
+      glimmerBurnUpper: 120
     - type: MundaneDischargeRule
 
 - type: entity
@@ -84,7 +84,7 @@
   categories: [ HideSpawnMenu ]
   components:
     - type: GlimmerEvent
-      minimumGlimmer: 550
+      minimumGlimmer: 650
       maximumGlimmer: 1000
     - type: NoosphericFryRule
 
@@ -94,10 +94,10 @@
   categories: [ HideSpawnMenu ]
   components:
     - type: GlimmerEvent
-      minimumGlimmer: 400
+      minimumGlimmer: 600
       maximumGlimmer: 1000
-      glimmerBurnLower: 18
-      glimmerBurnUpper: 40
+      glimmerBurnLower: 80
+      glimmerBurnUpper: 120
     - type: PsionicCatGotYourTongueRule
 
 - type: entity
@@ -107,8 +107,8 @@
   components:
     - type: GlimmerEvent
       minimumGlimmer: 900
-      glimmerBurnLower: 350
-      glimmerBurnUpper: 450 # Unless epistemics badly f-d up, this will restore the glimmer balance for a while.
+      glimmerBurnLower: 750
+      glimmerBurnUpper: 950 # Unless epistemics badly f-d up, this will restore the glimmer balance for a while.
     - type: MassMindSwapRule
       isTemporary: true # Permanent mindswap is hell.
 
@@ -137,6 +137,9 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: FreeProberRule
+  - type: GlimmerEvent
+    minimumGlimmer: 700
+    maximumGlimmer: 1000
 
 ## converted upstream events
 - type: entity
@@ -161,10 +164,10 @@
   categories: [ HideSpawnMenu ]
   components:
     - type: GlimmerEvent
-      minimumGlimmer: 450
+      minimumGlimmer: 750
       maximumGlimmer: 900
-      glimmerBurnLower: 50
-      glimmerBurnUpper: 100 # Gives epi a chance to recover
+      glimmerBurnLower: 120
+      glimmerBurnUpper: 200
     - type: GlimmerRevenantRule
 
 - type: entity
@@ -173,8 +176,10 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: GlimmerEvent
-    minimumGlimmer: 250
+    minimumGlimmer: 700
     maximumGlimmer: 900
+    glimmerBurnLower: 50
+    glimmerBurnUpper: 250
   - type: GlimmerMobRule
     mobPrototype: MobGlimmerMite
     glimmerTier: Low # get more mites earlier on
diff --git a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
index 2ae051100bb..1e2ace9a287 100644
--- a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
@@ -1,8 +1,3 @@
-- type: guideEntry
-  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/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 961bbf05fd0..9c07338690c 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -54,7 +54,7 @@
     gloves: ClothingHandsGlovesColorWhite
     outerClothing: ClothingOuterCoatMantis
     belt: ClothingBeltMantis
-    # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective
+    pocket1: BookPsionicsGuidebook
   innerClothingSkirt: ClothingUniformSkirtMantis
   satchel: ClothingBackpackSatchelMantisFilled
   duffelbag: ClothingBackpackDuffelMantisFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index fe7175172d2..b2c88fe212a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -49,6 +49,7 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetScience
+    pocket1: BookPsionicsGuidebook
   innerClothingSkirt: ClothingUniformJumpskirtChaplain
   satchel: ClothingBackpackSatchelChaplainFilled
   duffelbag: ClothingBackpackDuffelChaplainFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
index 3468d10f278..f2928c6b917 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -48,7 +48,7 @@
     outerClothing: ClothingOuterCoatRnd
     id: LibrarianPDA
     ears: ClothingHeadsetScience
-    pocket1: d10Dice
+    pocket1: BookPsionicsGuidebook
     pocket2: HandLabeler
   innerClothingSkirt: ClothingUniformJumpskirtLibrarian
   satchel: ClothingBackpackSatchelLibrarianFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index 4d4038d7c02..5bcc7185465 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -24,6 +24,7 @@
     shoes: ClothingShoesColorWhite
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
+    pocket1: BookPsionicsGuidebook
     pocket2: BookScientistsGuidebook
   innerClothingSkirt: ClothingUniformJumpskirtColorWhite
   satchel: ClothingBackpackSatchelScienceFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 46d91ee00ee..edc92bc8097 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -58,7 +58,8 @@
     shoes: ClothingShoesColorBrown
     id: RnDPDA
     ears: ClothingHeadsetRD
-    belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
+    pocket1: BookPsionicsGuidebook
+    pocket2: BibleMystagogue
   innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml
index 1d2434a4e0c..8b7611e7a4c 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml
@@ -23,6 +23,7 @@
     outerClothing: ClothingOuterCoatRobo
     id: RoboticsPDA
     ears: ClothingHeadsetRobotics
+    pocket1: BookPsionicsGuidebook
   innerClothingSkirt: ClothingUniformJumpskirtRoboticist
   satchel: ClothingBackpackSatchelRoboticsFilled
   duffelbag: ClothingBackpackDuffelRoboticsFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index 2d91e0e6ef9..ea4af6a6fbc 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -23,6 +23,7 @@
     outerClothing: ClothingOuterCoatRnd
     id: SciencePDA
     ears: ClothingHeadsetScience
+    pocket1: BookPsionicsGuidebook
   innerClothingSkirt: ClothingUniformJumpskirtScientist
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
index ecb61b36f4a..8984fe79ff9 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
@@ -24,6 +24,7 @@
     outerClothing: ClothingOuterCoatLabSeniorResearcher
     id: SeniorResearcherPDA
     ears: ClothingHeadsetScience
+    pocket1: BookPsionicsGuidebook
   innerClothingSkirt: ClothingUniformJumpskirtSeniorResearcher
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled
diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml b/Resources/ServerInfo/Guidebook/Psionics/Altar.xml
similarity index 100%
rename from Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml
rename to Resources/ServerInfo/Guidebook/Psionics/Altar.xml
diff --git a/Resources/ServerInfo/Guidebook/Psionics/Glimmer.xml b/Resources/ServerInfo/Guidebook/Psionics/Glimmer.xml
new file mode 100644
index 00000000000..f9b107ea0cf
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Psionics/Glimmer.xml
@@ -0,0 +1,76 @@
+<Document>
+# 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 approximated 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."
+
+## Strossmayer's Constant ƥ (Glimmer Equilibrium)
+Named after Ljiljana Strossmayer, First Mystagogue, Original Founder of the Epistemics Cult. Strossmayer's Constant is approximated as the number 502.941.
+
+Glimmer does not operate on a linear scale, rather it follows a logistic curve between values of 0 and 1000.
+Given sufficient time and minimal input, Glimmer will always attempt to equalize itself at this value. If glimmer is below this number, it will rapidly attempt to increase until it reaches it.
+If glimmer is raised above the constant, it will rapidly attempt to decrease until it reaches it.
+
+[color=#4169e1]As a general rule of thumb, psionic powers are weakened when glimmer is less than 500, and strengthened when glimmer is greater than 500[/color]
+
+## Glimmer Sources
+<Box>
+<GuideEntityEmbed Entity="GlimmerProber"/>
+<GuideEntityEmbed Entity="GlimmerDrain"/>
+<GuideEntityEmbed Entity="AnomalyPyroclastic"/>
+<GuideEntityEmbed Entity="MobGlimmerMite"/>
+</Box>
+
+There exist several entities which can interact with glimmer, usually by causing it to fluctuate above or below the Strossmayer's Constant. These include, but are not limited to:
+- Glimmer Probers and Drainers
+- All Anomalies
+- Glimmer Mites
+
+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.
+Glimmer Probers and Drainers work by agitating the Noösphere, which causes glimmer to fluctuate randomly.
+
+Probers increase the range of random fluctuations, while Drainers decrease the range of fluctations.
+This increase in range follows an exponential scale. The more sources of glimmer there are, the more chaotic glimmer becomes. For example, one Prober will cause glimmer to fluctuate between 502.941 and 550.
+But two probers will cause it to fluctuate between 502.941 and 620. Four sources will make it jump randomly between 502.941 and 750.
+
+Probers in turn generate research based on observing the generated Noöspheric fluctuations. As a baseline, probers generate 20 research points per second. When glimmer is less than 500, they generate less points.
+When glimmer is greater than 500, probers generate more points. Unfortunately, Probers are interfered with by the presence of other glimmer sources. For each additional glimmer source (Prober, Drainer, Anomaly, etc.)
+research output is dramatically decreased. This pattern follows an inverse log base 4 scale. Meaning that, if one prober generates 20 research points, 2 probers will each generate 13.333 points(for a total of 26).
+4 probers are required to generate 40 research points per second. 8 probers will generate 64 research points.
+
+If your probers are not generating any points at all, it is likely that you will need to "prime" the station's local Glimmer. This can be done by using two or three psionic powers in a short span of time.
+
+Prober research output can be visualized by a graph located here: https://www.desmos.com/calculator/q183tseun8
+
+A clever Epistemiologist would at this point realize that they can detect the presence of anomalies or glimmer mites, merely by observing the research point generation of their probers.
+If one prober is generating 13.333 points, there must exist an anomaly somewhere on the station.
+
+## Discharges
+Glimmer will occasionally discharge if it's above 500 mΨ, causing a wide range of effects based on 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.
+
+## Handling Glimmer Emergencies
+<Box>
+<GuideEntityEmbed Entity="GlimmerProber"/>
+<GuideEntityEmbed Entity="GlimmerDrain"/>
+<GuideEntityEmbed Entity="MaterialNormality"/>
+<GuideEntityEmbed Entity="Ectoplasm" />
+</Box>
+Probers should be turned off before glimmer exceeds 750 mΨ.
+
+Glimmer drains are quite effective at draining glimmer, taking it out as fast as a prober can put it in. Glimmer Drains are constructed using Normality Crystals, which can be quite rare.
+Normality Crystals can be manufactured out of Ectoplasm, but they are much more easily obtained from mining during Planetary Expeditions. Therefore one should ask their station's Salvage Specialists
+to bring in any normality they find while mining, and use them to build drains as often as possible.
+
+[color=#a4885c]Ectoplasm[/color] when combined in a beaker with equal parts water, ash, blood, plasma, [color=#fcdf03]and heated to at least 400 celsius[/color] will produce a normality crystal.
+Ectoplasm is a very rare substance that can only be obtained from noöspheric entities.
+
+In a true emergency, Psionic individuals can be sacrificed upon an altar by the station's Chaplain or Mystagogue. Doing so causes glimmer to massively decrease. Be ready to shut off the probers immediately
+once this is done.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Epistemics/GlimmerCreatures.xml b/Resources/ServerInfo/Guidebook/Psionics/GlimmerCreatures.xml
similarity index 100%
rename from Resources/ServerInfo/Guidebook/DeltaV/Epistemics/GlimmerCreatures.xml
rename to Resources/ServerInfo/Guidebook/Psionics/GlimmerCreatures.xml
diff --git a/Resources/ServerInfo/Guidebook/Psionics/Mindbreaking.xml b/Resources/ServerInfo/Guidebook/Psionics/Mindbreaking.xml
new file mode 100644
index 00000000000..86b2e4c16ab
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Psionics/Mindbreaking.xml
@@ -0,0 +1,16 @@
+<Document>
+## Mind Breaking
+<Box>
+<GuideEntityEmbed Entity="PillMindbreakerToxin" />
+<GuideEntityEmbed Entity="ShellSoulbreaker" />
+</Box>
+
+Mind breaking is the act of permanently destroying an individual's link to the noösphere. Such an action is considered to be equivalent to attempted murder in most civilized systems, due to the extremely deleterious effect such trauma can have on the psyche and brain matter of the victim. 
+Incidents of mass mind breaking typically have similar hallmarks to those of serial killings, or mass killings; with the perpetrator usually subscribing to an extreme ideology when interrogated by the authorities.
+  
+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.
+
+[color=#ff0000]((MINDBREAKING IS IRREVERSIBLE, AND CAN RENDER ITS VICTIM A NON-SENTIENT HUSK. DO NOT PERFORM THIS PROCEDURE WITHOUT A GOOD REASON.))[/color]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Psionics/PsionicInsulation.xml b/Resources/ServerInfo/Guidebook/Psionics/PsionicInsulation.xml
new file mode 100644
index 00000000000..f5a2f72ab60
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Psionics/PsionicInsulation.xml
@@ -0,0 +1,12 @@
+<Document>
+## 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.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Psionics/Psionics.xml b/Resources/ServerInfo/Guidebook/Psionics/Psionics.xml
new file mode 100644
index 00000000000..862e652e395
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Psionics/Psionics.xml
@@ -0,0 +1,62 @@
+<Document>
+# Psionics
+[color=#a4885c]Psionics[/color] are mental abilities that interface with the [color=#a4885c]noösphere[/color]. Although human understanding and access to the noösphere is limited, there have been a number of breakthroughs in the potential applications available to individuals.
+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.
+
+## 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 significantly an entity can distort the energy fields of the noösphere to achieve a given effect. A Pyromancer with a higher degree of amplification can concentratye greater energy into a firebolt; but the impact on the noösphere in their proximity will be proportionally great in regards to Glimmer generation. [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.
+
+Finally, [color=#a4885c]Potentia[/color] represents the growth of psionic potential in an individual. Potentia is gained by consuming large quantities of powerful hallucinogenic drugs, and it is spent upon reaching certain thresholds in order to gain new powers.
+Worship of The Oracle is the fastest known method for gaining Potentia.
+
+<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
+Indivividuals who have the potential to become psionic are known as Latents; however, not all individuals show the required sensitivity to psionic phenomena. ((This is determined by the Latent Psionic trait that can be taken at character selection.)) Non-Latent individuals have never shown the ability to manifest psionic abilities.
+
+While most active psions are at least moderately telepathic; it requires dedication and training to be able to truly create a telepathic 'voice' with which to communicate.
+
+## Telepathy
+Rare individuals, known across many different species, are known as Naturals, and innately possess a telepathic 'voice,' allowing them to communicate with others that 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.
+
+## Sophia
+<GuideEntityEmbed Entity="SophicScribe"/>
+[color=#a4885c]Sophia (sometimes known as Sophic Grammateus)[/color] is a semi-divine manifestation of one of the patron deities of Epistemics. In truth, She is not actually a god,
+merely a being that exists in greater than the four dimensions known to mortal Man. She exists to study our Noösphere, as well as offer guidance to those seeking higher power. Sophia will periodically report
+on the current glimmer levels. She may also be asked directly about the current glimmer.
+
+## Oracle
+<GuideEntityEmbed Entity="Oracle" />
+[color=#a4885c]Oracle[/color] is like Sophic Grammateus, a semi-divine manifestation who offers patronage over Epistemics. Oracle cares not about studying Glimmer, rather she wishes to study our
+technology for reasons known only to herself. She will periodically make demands of her cult, which if met, will be exchanged with rewards. The most important of which is the divine hallucinogen known as Lotophagoi Oil.
+Worshippers of Oracle are granted great power in exchange for her service, and much of the modern Epistemiological Cult centers around serving Her for the promise of enlightenment.
+
+## Acquiring Psionics
+
+First, an individual must be a Latent Psychic. Without the Potential for powers, an individual can never in their life obtain psionic abilities. Each individual has an initial "D100 Roll" to generate a random amount of Potentia, which is added to their baseline.
+When the individual's Potentia exceeds a threshold given by Gunderaan's Second Law:
+
+Potentia Threshold Y = 100 * 2^(total powers).
+
+Once this threshold is met by an individual, they will awaken a new psionic power and the Potentia used to generate such power is "spent". Notably, the scale for Potentia thresholds is an exponential one. Your first psionic power costs 100 Potentia. The second will cost 200.
+The third will cost 400, the fourth will cost 800, the fifth will cost 1600. There is no upper limit to how many powers an individual may have, only an exponentially increasing time and drugs requirement.
+
+All Latent Psychics start with a baseline 4 points of Potentia, plus some random amount between 0 and 100. Some particular individuals may have a higher baseline chance. After this initial chance, individuals may increase
+their psionic potential by 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. There is also a small chance that psionic individuals may be given a seizure from noospheric activity, which will unlock a new opportunity to gain Potentia.
+
+The amount of Potentia gained via drug consumption is given by Gunderaan's Third Law:
+
+χ = (4 + 0.001Ψ + random amount between 0 and 100 + φ) * ψ
+
+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.
+</Document>

From b56f1236b7fa146c8de09e1585d5cfdad5c4a2a4 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 02:04:18 +0000
Subject: [PATCH 42/64] Automatic Changelog Update (#1480)

---
 Resources/Changelog/Changelog.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index df4db6da927..408c7396c82 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10068,3 +10068,27 @@ Entries:
   id: 6708
   time: '2025-01-17T01:53:42.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1563
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Glimmer has been substantially reworked. Please read the new Psionics
+        Guidebook for more information. In short: "500 is the new normal
+        glimmer. Stop panicking if Sophia says the glimmer is 500. Call code
+        white if it gets to 750 and stays above that level."
+    - type: Add
+      message: >-
+        The much-requested Psionics Guidebook has returned, now with all new
+        up-to-date information. 
+    - type: Remove
+      message: >-
+        Removed "GLIMMERLOOSE". It's no longer possible for glimmer to start a
+        chain of events that ends the round if epistemics isn't destroyed. You
+        can ALWAYS recover from high glimmer now. 
+    - type: Tweak
+      message: >-
+        All glimmer events have had their thresholds tweaked to reflect the fact
+        that 500 is the new "Normal" amount of glimmer.
+  id: 6709
+  time: '2025-01-17T02:03:49.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1480

From 08154a9f8ffa5e9dcdbc9abc14b94d2ac202248b Mon Sep 17 00:00:00 2001
From: Eris <eris@erisws.com>
Date: Thu, 16 Jan 2025 22:12:40 -0500
Subject: [PATCH 43/64] Modular Computer System (#1556)

# Description

Ports the Modular Computer system from Arcadis. I'll document it more
later, for now just look to the provided .yml for reference.

---

# TODO

- [ ] Disk Burner (for creating program disks)
- [ ] Some way to make a modular computer

---

<details><summary><h1>(Not) Media</h1></summary>
<p>

No.

</p>
</details>

---

# Changelog

:cl: Eris
- add: The Modular Computer system has been ported. Expect cool stuff to
come soon.

---------

Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Signed-off-by: Eris <erisfiregamer1@gmail.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Computer/ComputerDiskComponent.cs         |  23 +++
 .../Computer/ModularComputerComponent.cs      |  20 +++
 .../Computer/ModularComputerSystem.cs         | 131 ++++++++++++++++++
 Resources/Audio/_Arcadis/computer_startup.ogg | Bin 0 -> 6288 bytes
 .../Locale/en-US/_Arcadis/modularComputer.ftl |   5 +
 .../Objects/Computers/baseComputerModular.yml |  19 +++
 .../Computers/computerDiskPrototypes.yml      |  40 ++++++
 .../Objects/Computers/computerDisks.yml       |  40 ++++++
 8 files changed, 278 insertions(+)
 create mode 100644 Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs
 create mode 100644 Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs
 create mode 100644 Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs
 create mode 100644 Resources/Audio/_Arcadis/computer_startup.ogg
 create mode 100644 Resources/Locale/en-US/_Arcadis/modularComputer.ftl
 create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml
 create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDiskPrototypes.yml
 create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml

diff --git a/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs b/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs
new file mode 100644
index 00000000000..5813c0342a8
--- /dev/null
+++ b/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._Arcadis.Computer;
+
+/// <summary>
+/// Main component for the ComputerDisk system
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+//[Access(typeof(ComputerDiskSystem))]
+public sealed partial class ComputerDiskComponent : Component
+{
+    /// <summary>
+    /// The prototype of the computer that will be used
+    /// </summary>
+    [DataField]
+    public EntProtoId ProgramPrototype;
+    public EntityUid? ProgramPrototypeEntity;
+
+    [DataField]
+    public bool PersistState;
+}
diff --git a/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs b/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs
new file mode 100644
index 00000000000..de4fe5f2d24
--- /dev/null
+++ b/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Containers.ItemSlots;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._Arcadis.Computer;
+
+/// <summary>
+/// Main component for the ComputerDisk system
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+//[Access(typeof(ComputerDiskSystem))]
+public sealed partial class ModularComputerComponent : Component
+{
+    [DataField]
+    public string DiskSlot = "modularComputerDiskSlot";
+
+    [DataField]
+    public SoundSpecifier? DiskInsertSound = new SoundPathSpecifier("/Audio/_Arcadis/computer_startup.ogg");
+}
diff --git a/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs b/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs
new file mode 100644
index 00000000000..7a6d7742d11
--- /dev/null
+++ b/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs
@@ -0,0 +1,131 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Coordinates;
+using Robust.Shared.Audio;
+using Content.Shared.Audio;
+using Robust.Shared.Network;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._Arcadis.Computer;
+
+public sealed class ModularComputerSystem : EntitySystem
+{
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
+
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    [Dependency] private readonly INetManager _netMan = default!;
+
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    public string BlankDiskPrototype = "UnburnedDiskPrototype";
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ModularComputerComponent, EntInsertedIntoContainerMessage>(InsertDisk);
+        SubscribeLocalEvent<ModularComputerComponent, ActivateInWorldEvent>(OnActivate);
+        SubscribeLocalEvent<ModularComputerComponent, ExaminedEvent>(OnExamined);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+    }
+
+    private void OnExamined(EntityUid uid, ModularComputerComponent component, ExaminedEvent args)
+    {
+        if (!TryComp(uid, out ItemSlotsComponent? slots)
+            || !_itemSlots.TryGetSlot(uid, component.DiskSlot, out var diskSlot, slots))
+            return;
+
+        if (diskSlot.Item == null || !TryComp(diskSlot.Item, out ComputerDiskComponent? diskComp))
+        {
+            args.PushMarkup(Loc.GetString("modular-computer-examine-no-disk"));
+            return;
+        }
+
+        if (diskComp.ProgramPrototypeEntity == null)
+        {
+            args.PushMarkup(Loc.GetString("modular-computer-examine-disk-error"));
+            return;
+        }
+
+        args.PushMarkup(Loc.GetString("modular-computer-examine-has-program", ("program", EntityManager.GetComponent<MetaDataComponent>(diskComp.ProgramPrototypeEntity.Value).EntityName)));
+    }
+    private void OnActivate(EntityUid uid, ModularComputerComponent component, ActivateInWorldEvent args)
+    {
+        // go figure it out yourself
+        if (!TryComp(uid, out ItemSlotsComponent? slots)
+            || !_itemSlots.TryGetSlot(uid, component.DiskSlot, out var diskSlot, slots))
+            return;
+
+        if (diskSlot.Item == null || !TryComp(diskSlot.Item, out ComputerDiskComponent? diskComp))
+        {
+            _popupSystem.PopupPredicted(Loc.GetString("modular-computer-no-program"), uid, args.User);
+            return;
+        }
+
+        if (diskComp.ProgramPrototypeEntity == null)
+        {
+            _popupSystem.PopupPredicted(Loc.GetString("modular-computer-no-program-on-disk"), uid, args.User);
+            return;
+        }
+
+        if (_gameTiming.IsFirstTimePredicted || _netMan.IsServer) {
+            var activateMsg = new ActivateInWorldEvent(args.User, diskComp.ProgramPrototypeEntity.Value, true);
+            RaiseLocalEvent(diskComp.ProgramPrototypeEntity.Value, activateMsg);
+        }
+    }
+
+    private void InsertDisk(EntityUid uid, ModularComputerComponent component, EntInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != component.DiskSlot
+            || !TryComp(uid, out ItemSlotsComponent? slots)
+            || !_itemSlots.TryGetSlot(uid, component.DiskSlot, out var diskSlot, slots)
+            || diskSlot.Item is null
+            || !TryComp(diskSlot.Item, out ComputerDiskComponent? diskComp))
+            return;
+
+        UpdateComputer((uid, component), diskComp, diskSlot);
+
+        if (diskComp.ProgramPrototypeEntity is null
+            || _netMan.IsClient)
+            return;
+
+        _audioSystem.PlayPvs(component.DiskInsertSound, uid, AudioParams.Default.WithVolume(+4f));
+    }
+
+
+    private void UpdateComputer(Entity<ModularComputerComponent> computer, ComputerDiskComponent diskComp, ItemSlot diskSlot)
+    {
+        if (diskSlot.Item is null
+            || diskComp.ProgramPrototype == BlankDiskPrototype)
+            return;
+
+        EntityUid magicComputerEntity;
+
+        if (diskComp.ProgramPrototypeEntity == null || diskComp.PersistState != true)
+        {
+            if (diskComp.ProgramPrototypeEntity != null)
+                QueueDel(diskComp.ProgramPrototypeEntity.Value);
+
+            magicComputerEntity = Spawn(diskComp.ProgramPrototype, computer.Owner.ToCoordinates());
+            diskComp.ProgramPrototypeEntity = magicComputerEntity;
+        }
+        else
+            magicComputerEntity = diskComp.ProgramPrototypeEntity.Value;
+
+        _transform.SetParent(magicComputerEntity, diskSlot.Item.Value);
+    }
+}
diff --git a/Resources/Audio/_Arcadis/computer_startup.ogg b/Resources/Audio/_Arcadis/computer_startup.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..53cfb4c4e570053de7de882c42974fcfc8c868c0
GIT binary patch
literal 6288
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
AGynhq

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/_Arcadis/modularComputer.ftl b/Resources/Locale/en-US/_Arcadis/modularComputer.ftl
new file mode 100644
index 00000000000..c3c60f3bb84
--- /dev/null
+++ b/Resources/Locale/en-US/_Arcadis/modularComputer.ftl
@@ -0,0 +1,5 @@
+modular-computer-no-program = ERROR: No program loaded!
+modular-computer-no-program-on-disk = ERROR: No program on disk!
+modular-computer-examine-no-disk = This computer doesn't have a program loaded.
+modular-computer-examine-disk-error = This computer doesn't have a program loaded. An error on the display reports that the loaded disk has no program.
+modular-computer-examine-has-program = This computer has the {$program} program loaded.
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml
new file mode 100644
index 00000000000..24c2f57d128
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: BaseComputer
+  id: BaseComputerModular
+  name: modular computer
+  description: Part of a recent initiative to make computers less static. Comes with a disk slot for various "program disks".
+  components:
+    - type: ModularComputer
+    # I plan to make modular itemslots a thing in the future for stuff like the fax machine. Coming Soon:tm:
+    - type: ItemSlots
+      slots:
+        modularComputerDiskSlot:
+          name: Disk
+          insertSound:
+            path: /Audio/Machines/terminal_insert_disc.ogg
+          ejectSound:
+            path: /Audio/Machines/terminal_insert_disc.ogg
+
+
+
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDiskPrototypes.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDiskPrototypes.yml
new file mode 100644
index 00000000000..d6df15c1dc2
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDiskPrototypes.yml
@@ -0,0 +1,40 @@
+- type: entity
+  id: UnburnedDiskPrototype
+  name: unburned disk dummy prototype
+  categories: [HideSpawnMenu]
+
+- type: entity
+  id: CrewMonitorDiskPrototype
+  name: Crew Monitor
+  categories: [HideSpawnMenu]
+  components:
+    - type: ActivatableUI
+      key: enum.CrewMonitoringUIKey.Key
+    - type: UserInterface
+      interfaces:
+        enum.CrewMonitoringUIKey.Key:
+          type: CrewMonitoringBoundUserInterface
+    - type: CrewMonitoringConsole
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+      receiveFrequencyId: CrewMonitor
+    - type: WirelessNetworkConnection
+      range: 1200
+
+- type: entity
+  id: CommunicationsConsoleDiskPrototype
+  name: Communications Console
+  categories: [HideSpawnMenu]
+  components:
+    - type: AccessReader
+      access: [["Command"]]
+    - type: CommunicationsConsole
+      title: comms-console-announcement-title-station
+    - type: DeviceNetwork
+      transmitFrequencyId: ShuttleTimer
+    - type: ActivatableUI
+      key: enum.CommunicationsConsoleUiKey.Key
+    - type: UserInterface
+      interfaces:
+        enum.CommunicationsConsoleUiKey.Key:
+          type: CommunicationsConsoleBoundUserInterface
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml
new file mode 100644
index 00000000000..f742f46dc99
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml
@@ -0,0 +1,40 @@
+- type: entity
+  parent: BaseItem
+  id: BaseProgramDisk
+  abstract: true
+  name: program disk
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/cd.rsi
+      state: icon
+    - type: ComputerDisk
+      saveData: false
+
+- type: entity
+  parent: BaseProgramDisk
+  id: ProgramDiskCrewMonitor
+  name: program disk (crew monitor)
+  description: A diskette for usage in a computer. This one has the "Crew Monitor" program burnt to it.
+  components:
+    - type: ComputerDisk
+      programPrototype: CrewMonitorDiskPrototype
+      persistState: true
+
+- type: entity
+  parent: BaseProgramDisk
+  id: ProgramDiskCommunicationsConsole
+  name: program disk (communications console)
+  description: A diskette for usage in a computer. This one has the "Communications Console" program burnt to it.
+  components:
+    - type: ComputerDisk
+      programPrototype: CommunicationsConsoleDiskPrototype
+      persistState: true
+
+- type: entity
+  parent: BaseProgramDisk
+  id: ProgramDiskUnburnt
+  name: program disk
+  description: A diskette for usage in a computer. This one has no program burnt to it.
+  components:
+    - type: ComputerDisk
+      programPrototype: UnburnedDiskPrototype

From d185170b0cbf0d05e6f2cd369ecbaba45657bee0 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:13:03 +0000
Subject: [PATCH 44/64] Automatic Changelog Update (#1556)

---
 Resources/Changelog/Changelog.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 408c7396c82..0ae01943a4d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10092,3 +10092,12 @@ Entries:
   id: 6709
   time: '2025-01-17T02:03:49.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1480
+- author: Eris
+  changes:
+    - type: Add
+      message: >-
+        The Modular Computer system has been ported. Expect cool stuff to come
+        soon.
+  id: 6710
+  time: '2025-01-17T03:12:40.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1556

From 6c43d005e0804fe29007371a46a56e27bccbd4f8 Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 11:16:13 +0800
Subject: [PATCH 45/64] Martial Artist Rework + Fix MeleeWeapon Wizmerge Bugs
 (#1560)

# Description

Reworks the Martial Artist trait, making it a more impactful and
visually distinct trait.
- Left-clicks are now single-target power attacks, requiring less aim
than before.
- **50%** damage bonus reduced to **20%** damage bonus (same overall DPS
with next change).
- Gain **25%** attack rate bonus.
- The attack rate bonus helps make the trait feel and look distinct from
non-Martial Artist melee attacks.
- **50%** range bonus reduced to **10%** range bonus.
- The damage bonus is now also applied to Asphyxiation and Poison
damage, which Lamia unarmed attacks deal.
- Trait cost increased from **-3** points to **-5** points.
- Striking Calluses (which requires Martial Artist) cost reduced from
**-4** points to **-3** points to prevent the Martial Artist/Striking
Calluses combo from being too expensive. The combo used to cost **-7**
points, now it is **-8** points.

The reworked Martial Artist trait is also given to the Boxers, Martial
Artists and Gladiators.

Also reverted some wizmerge messery that messed up the melee attack rate
**again**, and messed up pistol whipping by making the cooldowns of
gunshots and melee attacks intertwined.

Also while we're at it, Natural Weapons Removal has been disabled for
all species whose damage is pure Blunt, including Diona, Dwarf, Arachne
and IPC. (IPC have 6 blunt so the trait would literally be a 0-point
negative trait for them)

## Technical Details

A new trait function has been added for Martial Artist:
`TraitModifyUnarmed`, which modifies the player entity's
`MeleeWeaponComponent`.

The Claws, Talons, Natural Weapon Removal, and Striking Calluses traits
have also been refactored under the hood to use `TraitModifyUnarmed`,
instead of replacing `MeleeWeaponComponent` which would wipe out all the
changes made by the Martial Artist trait.

## Media

### New Description

![martialartist](https://github.com/user-attachments/assets/de51530f-5f2a-41a8-b686-c12f746b5e4a)

### Martial Artist In Action

https://github.com/user-attachments/assets/7890aac2-2c74-4abd-be9f-b28c2922c865

### Striking Calluses New Description

![strikingcalluses](https://github.com/user-attachments/assets/bc15425e-3460-49f2-88f5-840c686e0053)

### Natural Weapons Removal New Description

![naturalweaponsremoval](https://github.com/user-attachments/assets/583adaa4-48c0-46e3-882b-1bb0f470018c)

# Changelog

:cl: Skubman
- add: Martial Artist Rework: Martial Artist now costs 5 points, but it
turns all unarmed melee attacks into single-target power attacks, with
20% bonus damage, 25% bonus attack rate and 10% bonus attack range.
- tweak: The reworked Martial Artist trait is now given for free to
Boxers, Martial Artists, and Gladiators.
- tweak: Martial Artists (the job) and Gladiators can now select the
Striking Calluses trait.
- tweak: The Martial Artist trait now applies bonus damage to the
Lamiae's unarmed Asphyxiation and Poison damage.
- tweak: The cost of Striking Calluses has been reduced from 4 points to
3 points.
- fix: Fixed a bug where slow weapons were fast and fast weapons were
slow.
- fix: You can pistol whip (right-click melee) immediately after firing
a gun again, and the cooldown on firing the gun after pistol whipping is
always 0.528 seconds again.
- fix: Prevented Dionas, Arachnae and IPCs, who all have pure Blunt
damage from selecting the redundant Natural Weapons Removal trait.
---
 .../Weapons/Melee/MeleeWeaponSystem.cs        |   9 ++
 .../Abilities/Boxer/Boxer/BoxerComponent.cs   |   2 +-
 .../Traits/TraitSystem.Functions.cs           |  90 ++++++++++++++++
 .../Weapons/Melee/MeleeWeaponComponent.cs     |   6 ++
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |  43 +++-----
 Resources/Locale/en-US/traits/traits.ftl      |   8 +-
 .../Entities/Mobs/Player/silicon_base.yml     |   5 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   5 +
 .../Roles/Jobs/Wildcards/gladiator.yml        |  11 +-
 .../Roles/Jobs/Wildcards/martialartist.yml    |  11 +-
 .../Prototypes/Roles/Jobs/Wildcards/boxer.yml |  11 +-
 Resources/Prototypes/Traits/physical.yml      | 100 +++++++++---------
 12 files changed, 199 insertions(+), 102 deletions(-)

diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index d86172de718..6b5ddedd59e 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -151,6 +151,9 @@ public override void Update(float frameTime)
             if (mousePos.MapId != attackerPos.MapId ||
                 (attackerPos.Position - mousePos.Position).Length() > weapon.Range)
             {
+                if (weapon.HeavyOnLightMiss)
+                    ClientHeavyAttack(entity, coordinates, weaponUid, weapon);
+
                 return;
             }
 
@@ -165,6 +168,12 @@ public override void Update(float frameTime)
             if (Interaction.CombatModeCanHandInteract(entity, target))
                 return;
 
+            if (weapon.HeavyOnLightMiss && !CanDoLightAttack(entity, target, weapon, out _))
+            {
+                ClientHeavyAttack(entity, coordinates, weaponUid, weapon);
+                return;
+            }
+
             RaisePredictiveEvent(new LightAttackEvent(GetNetEntity(target), GetNetEntity(weaponUid), GetNetCoordinates(coordinates)));
         }
     }
diff --git a/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs b/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs
index b844e5e8f5a..41adfab116a 100644
--- a/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs
@@ -12,7 +12,7 @@ public sealed partial class BoxerComponent : Component
     public DamageModifierSet UnarmedModifiers = default!;
 
     [DataField("rangeBonus")]
-    public float RangeBonus = 1.5f;
+    public float RangeBonus = 1.0f;
 
     /// <summary>
     /// Damage modifier with boxing glove stam damage.
diff --git a/Content.Server/Traits/TraitSystem.Functions.cs b/Content.Server/Traits/TraitSystem.Functions.cs
index 29ab1512ae6..8306105b936 100644
--- a/Content.Server/Traits/TraitSystem.Functions.cs
+++ b/Content.Server/Traits/TraitSystem.Functions.cs
@@ -20,6 +20,8 @@
 using Content.Shared.Mobs;
 using Content.Shared.Damage.Components;
 using Content.Shared.NPC.Systems;
+using Content.Shared.Weapons.Melee;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Traits;
 
@@ -585,3 +587,91 @@ public override void OnPlayerSpawn(EntityUid uid,
         slowOnDamage.SpeedModifierThresholds = newSpeedModifierThresholds;
     }
 }
+
+/// <summary>
+///     Used for traits that modify unarmed damage on MeleeWeaponComponent.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class TraitModifyUnarmed : TraitFunction
+{
+    // <summary>
+    //     The sound played on hitting targets.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public SoundSpecifier? SoundHit;
+
+    // <summary>
+    //     The animation to play on hit, for both light and power attacks.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public EntProtoId? Animation;
+
+    // <summary>
+    //     Whether to set the power attack animation to be the same as the light attack.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public bool HeavyAnimationFromLight = true;
+
+    // <summary>
+    //     The damage values of unarmed damage.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public DamageSpecifier? Damage;
+
+    // <summary>
+    //     Additional damage added to the existing damage.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public DamageSpecifier? FlatDamageIncrease;
+
+    /// <summary>
+    ///   Turns the left click into a power attack when the light attack misses.
+    /// </summary>
+    [DataField]
+    public bool? HeavyOnLightMiss;
+
+    // <summary>
+    //     What to multiply the melee weapon range by.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public float? RangeModifier;
+
+    // <summary>
+    //     What to multiply the attack rate by.
+    // </summary>
+    [DataField, AlwaysPushInheritance]
+    public float? AttackRateModifier;
+
+    public override void OnPlayerSpawn(EntityUid uid,
+        IComponentFactory factory,
+        IEntityManager entityManager,
+        ISerializationManager serializationManager)
+    {
+        if (!entityManager.TryGetComponent<MeleeWeaponComponent>(uid, out var melee))
+            return;
+
+        if (SoundHit != null)
+            melee.SoundHit = SoundHit;
+
+        if (Animation != null)
+            melee.Animation = Animation.Value;
+
+        if (HeavyAnimationFromLight)
+            melee.WideAnimation = melee.Animation;
+
+        if (Damage != null)
+            melee.Damage = Damage;
+
+        if (FlatDamageIncrease != null)
+            melee.Damage += FlatDamageIncrease;
+
+        if (HeavyOnLightMiss != null)
+            melee.HeavyOnLightMiss = HeavyOnLightMiss.Value;
+
+        if (RangeModifier != null)
+            melee.Range *= RangeModifier.Value;
+
+        if (AttackRateModifier != null)
+            melee.AttackRate *= AttackRateModifier.Value;
+    }
+}
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 851699c9815..e25328ada61 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -61,6 +61,12 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField]
     public bool DisableClick = false;
 
+    /// <summary>
+    ///   If true, when a light attack misses, the weapon will perform a power attack instead.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool HeavyOnLightMiss = false;
+
     /*
      * Melee combat works based around 2 types of attacks:
      * 1. Click attacks with left-click. This attacks whatever is under your mnouse
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index edca18e5f76..201269fcc86 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -68,8 +68,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<MeleeWeaponComponent, HandSelectedEvent>(OnMeleeSelected);
-        SubscribeLocalEvent<MeleeWeaponComponent, ShotAttemptedEvent>(OnMeleeShotAttempted);
-        SubscribeLocalEvent<MeleeWeaponComponent, GunShotEvent>(OnMeleeShot);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetMeleeDamageEvent>(OnGetBonusMeleeDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetHeavyDamageModifierEvent>(OnGetBonusHeavyDamageModifier);
         SubscribeLocalEvent<BonusMeleeAttackRateComponent, GetMeleeAttackRateEvent>(OnGetBonusMeleeAttackRate);
@@ -93,24 +91,6 @@ private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEve
 #endif
     }
 
-    private void OnMeleeShotAttempted(EntityUid uid, MeleeWeaponComponent comp, ref ShotAttemptedEvent args)
-    {
-        if (comp.NextAttack > Timing.CurTime)
-            args.Cancel();
-    }
-
-    private void OnMeleeShot(EntityUid uid, MeleeWeaponComponent component, ref GunShotEvent args)
-    {
-        if (!TryComp<GunComponent>(uid, out var gun))
-            return;
-
-        if (gun.NextFire > component.NextAttack)
-        {
-            component.NextAttack = gun.NextFire;
-            DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
-        }
-    }
-
     private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
     {
         var attackRate = GetAttackRate(uid, args.User, component);
@@ -351,6 +331,8 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         if (!CombatMode.IsInCombatMode(user))
             return false;
 
+        var fireRateSwingModifier = 1f;
+
         EntityUid? target = null;
         switch (attack)
         {
@@ -368,6 +350,9 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
                 if (weaponUid == target)
                     return false;
 
+                break;
+            case HeavyAttackEvent:
+                fireRateSwingModifier = weapon.HeavyRateModifier;
                 break;
             case DisarmAttackEvent disarm:
                 if (disarm.Target != null && !TryGetEntity(disarm.Target, out target))
@@ -386,7 +371,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(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.
@@ -457,6 +442,16 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
 
     protected abstract bool InRange(EntityUid user, EntityUid target, float range, ICommonSession? session);
 
+    protected bool CanDoLightAttack(EntityUid user, [NotNullWhen(true)] EntityUid? target, MeleeWeaponComponent component, [NotNullWhen(true)] out TransformComponent? targetXform, ICommonSession? session = null)
+    {
+        targetXform = null;
+        return !Deleted(target) &&
+            HasComp<DamageableComponent>(target) &&
+            TryComp<TransformComponent>(target, out targetXform) &&
+            // Not in LOS.
+            InRange(user, target.Value, component.Range, session);
+    }
+
     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
@@ -465,11 +460,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
 
         // For consistency with wide attacks stuff needs damageable.
-        if (Deleted(target) ||
-            !HasComp<DamageableComponent>(target) ||
-            !TryComp(target, out TransformComponent? targetXform) ||
-            // Not in LOS.
-            !InRange(user, target.Value, component.Range, session))
+        if (!CanDoLightAttack(user, target, component, out var targetXform, session))
         {
             // Leave IsHit set to true, because the only time it's set to false
             // is when a melee weapon is examined. Misses are inferred from an
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 592e8b32bcf..7dc82335181 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -179,9 +179,11 @@ trait-description-Feeble =
 
 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.
+    You have received formal training in unarmed combat, whether with fists, claws, feet, or teeth.
+    Your unarmed melee attack is now considered a single-target [color=orange]Power Attack[/color], requiring less precision.
+    Additionally, your unarmed melee attacks deal [color=yellow]20%[/color] more damage, attack [color=yellow]25%[/color] faster, and have [color=yellow]10%[/color] increased range.
+    This has no effect on damage dealt with any form of armed melee.
+    The [color=#9FED58]Boxer[/color], [color=#9FED58]Martial Artist[/color], and [color=#9FED58]Gladiator[/color] jobs start with this trait by default.
 
 trait-name-Vigor = Vigor
 trait-description-Vigor =
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
index 532c28b0116..7cdc46f350c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
@@ -256,6 +256,11 @@
       damage:
         types:
           Blunt: 6 # It's tough.
+      heavyRateModifier: 1
+      heavyDamageBaseModifier: 1
+      heavyPartDamageMultiplier: 1
+      heavyStaminaCost: 0
+      maxTargets: 1
     - type: MobPrice
       price: 1500 # Kidnapping a living person and selling them for cred is a good move.
       deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 46224a3cb33..bb27e46ba47 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -179,6 +179,11 @@
     damage:
       types:
         Blunt: 5
+    heavyRateModifier: 1
+    heavyDamageBaseModifier: 1
+    heavyPartDamageMultiplier: 1
+    heavyStaminaCost: 0
+    maxTargets: 1
   - type: SleepEmitSound
   - type: SSDIndicator
   - type: StandingState
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
index 3651d223d77..79ae853f9f1 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
@@ -15,14 +15,9 @@
       department: Security
       min: 21600
   special:
-  - !type:AddComponentSpecial
-    components:
-    - type: Boxer
-      modifiers:
-        coefficients: # These only apply to unarmed
-          Blunt: 1.5
-          Slash: 1.5
-          Piercing: 1.5
+  - !type:AddTraitSpecial
+    traits:
+    - MartialArtist
 
 - type: startingGear
   id: NyanoGladiatorGear
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
index 8c3c80c72fd..de6212dacf9 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
@@ -16,14 +16,9 @@
   - Theatre # DeltaV - Add Theatre access
   - Boxer # DeltaV - Add Boxer access
   special:
-  - !type:AddComponentSpecial
-    components:
-    - type: Boxer
-      modifiers:
-        coefficients: # These only apply to unarmed
-          Blunt: 1.5
-          Slash: 1.5
-          Piercing: 1.5
+  - !type:AddTraitSpecial
+    traits:
+    - MartialArtist
 
 - type: startingGear
   id: MartialArtistGear
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
index 33def38bb08..65739809da0 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
@@ -14,14 +14,9 @@
   - Theatre # DeltaV - Add Theatre access
   - Boxer # DeltaV - Add Boxer access
   special: # Nyanotrasen - BoxerComponent, see Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs
-  - !type:AddComponentSpecial
-    components:
-    - type: Boxer
-      modifiers:
-        coefficients: # These only apply to unarmed
-          Blunt: 1.5
-          Slash: 1.5
-          Piercing: 1.5
+  - !type:AddTraitSpecial
+    traits:
+    - MartialArtist
 
 - type: startingGear
   id: BoxerGear
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index 81ae6715d77..77ea7871f50 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -284,7 +284,7 @@
 - type: trait
   id: MartialArtist
   category: Physical
-  points: -3
+  points: -5
   requirements:
   - !type:CharacterJobRequirement
     inverted: true
@@ -292,15 +292,26 @@
       - Borg
       - MedicalBorg
       - Boxer
+      - MartialArtist
+      - Gladiator
   functions:
+    - !type:TraitModifyUnarmed
+      heavyOnLightMiss: true
+      attackRateModifier: 0.8
+      rangeModifier: 1.1
     - !type:TraitReplaceComponent
-      components:
-        - type: Boxer
+      components:     # Keep BoxerComponent for now until we have After/Before on traits prototypes
+        - type: Boxer # for potential conflicts with other traits that replace unarmed damage
           modifiers:
             coefficients:
-              Blunt: 1.5
-              Slash: 1.5
-              Piercing: 1.5
+              Blunt: 1.2
+              Slash: 1.2
+              Piercing: 1.2
+              Poison: 1.2
+              Asphyxiation: 1.2
+      # An attack rate of 1.25 hits per second (1 / 0.8 = 1.25) multiplied by 20% extra damage
+      # effectively means 50% more overall DPS, same DPS bonus as before (1 * 1.25 * 1.2 = 1.5)
+      # but the extra attack rate makes it visually apparent that it's Martial Artist.
 
 - type: trait
   id: Small
@@ -358,16 +369,14 @@
       traits:
         - Claws
   functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: MeleeWeapon
-          soundHit:
-            collection: AlienClaw
-          animation: WeaponArcClaw
-          damage:
-            types:
-              Piercing: 5 # No, this isn't "OP", this is literally the worst brute damage type in the game.
-                          # Same deal as Slash, except that a majority of all armor provides Piercing resistance.
+    - !type:TraitModifyUnarmed
+      soundHit:
+        collection: AlienClaw
+      animation: WeaponArcClaw
+      damage:
+        types:
+          Piercing: 5 # No, this isn't "OP", this is literally the worst brute damage type in the game.
+                      # Same deal as Slash, except that a majority of all armor provides Piercing resistance.
 
 - type: trait
   id: Claws
@@ -386,17 +395,14 @@
       traits:
         - Talons
   functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: MeleeWeapon
-          soundHit:
-            collection: AlienClaw
-          angle: 30
-          animation: WeaponArcClaw
-          damage:
-            types:
-              Slash: 5 # Trade stamina damage on hit for a very minor amount of extra bleed.
-                      # Blunt also deals bleed damage, so this is more of a sidegrade.
+    - !type:TraitModifyUnarmed
+      soundHit:
+        collection: AlienClaw
+      animation: WeaponArcClaw
+      damage:
+        types:
+          Slash: 5 # Trade stamina damage on hit for a very minor amount of extra bleed.
+                  # Blunt also deals bleed damage, so this is more of a sidegrade.
 
 - type: trait
   id: NaturalWeaponRemoval
@@ -409,27 +415,29 @@
         - Human
         - Oni
         - SlimePerson
+        - Diona
+        - Dwarf
+        - Arachne
+        - IPC # Other species could justify getting this trait for Blunt stamina damage,
+              # but 6 blunt -> 5 blunt is a straight up downgrade.
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
         - Talons
         - Claws
   functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: MeleeWeapon
-          soundHit:
-            collection: Punch
-          angle: 30
-          animation: WeaponArcFist
-          damage:
-            types:
-              Blunt: 5
+    - !type:TraitModifyUnarmed
+      soundHit:
+        collection: Punch
+      animation: WeaponArcFist
+      damage:
+        types:
+          Blunt: 5
 
 - type: trait
   id: StrikingCalluses
   category: Physical
-  points: -4
+  points: -3
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
@@ -452,17 +460,13 @@
         - !type:CharacterJobRequirement
           jobs:
             - Boxer
+            - MartialArtist
+            - Gladiator
   functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: MeleeWeapon
-          soundHit:
-            collection: Punch
-          angle: 30
-          animation: WeaponArcFist
-          damage:
-            types:
-              Blunt: 6
+    - !type:TraitModifyUnarmed
+      flatDamageIncrease:
+        types:
+          Blunt: 1
 
 - type: trait
   id: Spinarette

From b5403ba4bc5c75a135ba8fc543c92b209785cbcd Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:16:37 +0000
Subject: [PATCH 46/64] Automatic Changelog Update (#1560)

---
 Resources/Changelog/Changelog.yml | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0ae01943a4d..04c1f40665f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10101,3 +10101,40 @@ Entries:
   id: 6710
   time: '2025-01-17T03:12:40.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1556
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Martial Artist Rework: Martial Artist now costs 5 points, but it turns
+        all unarmed melee attacks into single-target power attacks, with 20%
+        bonus damage, 25% bonus attack rate and 10% bonus attack range.
+    - type: Tweak
+      message: >-
+        The reworked Martial Artist trait is now given for free to Boxers,
+        Martial Artists, and Gladiators.
+    - type: Tweak
+      message: >-
+        Martial Artists (the job) and Gladiators can now select the Striking
+        Calluses trait.
+    - type: Tweak
+      message: >-
+        The Martial Artist trait now applies bonus damage to the Lamiae's
+        unarmed Asphyxiation and Poison damage.
+    - type: Tweak
+      message: >-
+        The cost of Striking Calluses has been reduced from 4 points to 3
+        points.
+    - type: Fix
+      message: Fixed a bug where slow weapons were fast and fast weapons were slow.
+    - type: Fix
+      message: >-
+        You can pistol whip (right-click melee) immediately after firing a gun
+        again, and the cooldown on firing the gun after pistol whipping is
+        always 0.528 seconds again.
+    - type: Fix
+      message: >-
+        Prevented Dionas, Arachnae and IPCs, who all have pure Blunt damage from
+        selecting the redundant Natural Weapons Removal trait.
+  id: 6711
+  time: '2025-01-17T03:16:13.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1560

From 19a350fc9ae0d958406b3d6018f71ab8af5447c4 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:30:13 -0400
Subject: [PATCH 47/64] Handheld Frequencies (#1574)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Adds frequencies to handheld radios. Ports [this
PR](https://github.com/new-frontiers-14/frontier-station-14/pull/1833)
with changes.


![image](https://github.com/user-attachments/assets/e39d8fce-7fa3-4e0a-918a-506b0446de35)

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added handheld radio frequencies, accessible by pressing your
"Use Item" key while holding one.

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
---
 .../UI/HandheldRadioBoundUserInterface.cs     |  62 +++++++++
 .../_NC/Radio/UI/HandheldRadioMenu.xaml       |  29 ++++
 .../_NC/Radio/UI/HandheldRadioMenu.xaml.cs    |  55 ++++++++
 .../Components/RadioMicrophoneComponent.cs    |   7 +
 .../Radio/EntitySystems/RadioDeviceSystem.cs  | 129 +++++++++++++++---
 .../Radio/EntitySystems/RadioSystem.cs        |  52 ++++++-
 Content.Shared/Radio/RadioChannelPrototype.cs |   8 ++
 .../_NC/Radio/SharedHandheldRadio.cs          |  57 ++++++++
 .../components/handheld-radio-component.ftl   |  12 +-
 .../Entities/Objects/Devices/radio.yml        |   9 ++
 Resources/Prototypes/radio_channels.yml       |   1 +
 11 files changed, 394 insertions(+), 27 deletions(-)
 create mode 100644 Content.Client/_NC/Radio/UI/HandheldRadioBoundUserInterface.cs
 create mode 100644 Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml
 create mode 100644 Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml.cs
 create mode 100644 Content.Shared/_NC/Radio/SharedHandheldRadio.cs

diff --git a/Content.Client/_NC/Radio/UI/HandheldRadioBoundUserInterface.cs b/Content.Client/_NC/Radio/UI/HandheldRadioBoundUserInterface.cs
new file mode 100644
index 00000000000..2b671443af8
--- /dev/null
+++ b/Content.Client/_NC/Radio/UI/HandheldRadioBoundUserInterface.cs
@@ -0,0 +1,62 @@
+using Content.Shared._NC.Radio;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._NC.Radio.UI;
+
+
+[UsedImplicitly]
+public sealed class HandheldRadioBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private HandheldRadioMenu? _menu;
+
+    public HandheldRadioBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new();
+
+        _menu.OnMicPressed += enabled =>
+        {
+            SendMessage(new ToggleHandheldRadioMicMessage(enabled));
+        };
+        _menu.OnSpeakerPressed += enabled =>
+        {
+            SendMessage(new ToggleHandheldRadioSpeakerMessage(enabled));
+        };
+        _menu.OnFrequencyChanged += frequency =>
+        {
+            if (int.TryParse(frequency.Trim(), out var intFreq) && intFreq > 0)
+                SendMessage(new SelectHandheldRadioFrequencyMessage(intFreq));
+            else
+                SendMessage(new SelectHandheldRadioFrequencyMessage(-1)); // Query the current frequency
+        };
+
+        _menu.OnClose += Close;
+        _menu.OpenCentered();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+        _menu?.Close();
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not HandheldRadioBoundUIState msg)
+            return;
+
+        _menu?.Update(msg);
+    }
+}
diff --git a/Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml b/Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml
new file mode 100644
index 00000000000..7c0490ebc64
--- /dev/null
+++ b/Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml
@@ -0,0 +1,29 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      Title="{Loc 'handheld-radio-menu-title'}"
+                      MinSize="200 150"
+                      SetSize="200 150">
+    <BoxContainer Orientation="Vertical"
+                  HorizontalExpand="True"
+                  VerticalExpand="True"
+                  Margin="5 0 5 0">
+        <Control MinHeight="10"/>
+        <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
+            <Label Name="CurrentTextFrequency" Text="{Loc 'handheld-radio-current-text-frequency'}" />
+            <LineEdit Name="FrequencyLineEdit" Text="1330"/>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" HorizontalAlignment="Right" Margin="5 0 5 5">
+            <Button Name="MicButton" ToggleMode="True" Text="{Loc 'handheld-radio-button-text-mic'}" StyleClasses="OpenRight" MinWidth="70"/>
+            <Button Name="SpeakerButton" ToggleMode="True" Text="{Loc 'handheld-radio-button-text-speaker'}" StyleClasses="OpenLeft" MinWidth="70"/>
+        </BoxContainer>
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'handheld-radio-flavor-text-left'}" StyleClasses="WindowFooterText"
+                       HorizontalAlignment="Left" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
+                             VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml.cs b/Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml.cs
new file mode 100644
index 00000000000..0a419629c5f
--- /dev/null
+++ b/Content.Client/_NC/Radio/UI/HandheldRadioMenu.xaml.cs
@@ -0,0 +1,55 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared._NC.Radio;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._NC.Radio.UI;
+// TODO: Fix silly ui update issues
+[GenerateTypedNameReferences]
+public sealed partial class HandheldRadioMenu : FancyWindow
+{
+
+    public event Action<bool>? OnMicPressed;
+    public event Action<bool>? OnSpeakerPressed;
+    public event Action<string>? OnFrequencyChanged;
+
+    private string _lastFrequency = "1330";
+
+    public HandheldRadioMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed);
+        SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed);
+
+        FrequencyLineEdit.OnTextEntered += e => OnFrequencyChanged?.Invoke(e.Text);
+        FrequencyLineEdit.OnTextChanged += ValidateText;
+        FrequencyLineEdit.OnFocusExit += e => OnFrequencyChanged?.Invoke(e.Text);
+    }
+
+    private void ValidateText(LineEdit.LineEditEventArgs args)
+    {
+        if (!int.TryParse(args.Text, out int frequency))
+        {
+            FrequencyLineEdit.SetText(_lastFrequency);
+            return;
+        }
+
+        _lastFrequency = args.Text;
+    }
+
+    public void Update(HandheldRadioBoundUIState state)
+    {
+        if (state.MicEnabled != MicButton.Pressed)
+            MicButton.Pressed = state.MicEnabled;
+
+        if (state.SpeakerEnabled != SpeakerButton.Pressed)
+            SpeakerButton.Pressed = state.SpeakerEnabled;
+
+        if (state.Frequency.ToString() != FrequencyLineEdit.Text)
+            FrequencyLineEdit.Text = state.Frequency.ToString();
+    }
+}
diff --git a/Content.Server/Radio/Components/RadioMicrophoneComponent.cs b/Content.Server/Radio/Components/RadioMicrophoneComponent.cs
index af01f86f23c..b2aa3840b4d 100644
--- a/Content.Server/Radio/Components/RadioMicrophoneComponent.cs
+++ b/Content.Server/Radio/Components/RadioMicrophoneComponent.cs
@@ -40,4 +40,11 @@ public sealed partial class RadioMicrophoneComponent : Component
     /// </summary>
     [DataField("unobstructedRequired")]
     public bool UnobstructedRequired = false;
+
+    // Nuclear-14
+    /// <summary>
+    // The radio frequency on which the message will be transmitted
+    /// </summary>
+    [DataField]
+    public int Frequency = 1459; // Common channel frequency
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 6fd5e46e10a..0260439fbd0 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
+using Content.Server.Language;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -13,6 +14,11 @@
 using Content.Shared.Radio;
 using Content.Shared.Chat;
 using Content.Shared.Radio.Components;
+using Content.Shared.UserInterface; // Nuclear-14
+using Content.Shared._NC.Radio; // Nuclear-14
+using Robust.Server.GameObjects;
+using Robust.Shared.Network;
+using Robust.Shared.Player; // Nuclear-14
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Radio.EntitySystems;
@@ -28,10 +34,17 @@ public sealed class RadioDeviceSystem : EntitySystem
     [Dependency] private readonly RadioSystem _radio = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
 
     // Used to prevent a shitter from using a bunch of radios to spam chat.
     private HashSet<(string, EntityUid)> _recentlySent = new();
 
+    // Frontier: minimum, maximum radio frequencies
+    private const int MinRadioFrequency = 1000;
+    private const int MaxRadioFrequency = 3000;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -50,6 +63,13 @@ public override void Initialize()
         SubscribeLocalEvent<IntercomComponent, ToggleIntercomMicMessage>(OnToggleIntercomMic);
         SubscribeLocalEvent<IntercomComponent, ToggleIntercomSpeakerMessage>(OnToggleIntercomSpeaker);
         SubscribeLocalEvent<IntercomComponent, SelectIntercomChannelMessage>(OnSelectIntercomChannel);
+
+        SubscribeLocalEvent<RadioMicrophoneComponent, BeforeActivatableUIOpenEvent>(OnBeforeHandheldRadioUiOpen);
+        SubscribeLocalEvent<RadioMicrophoneComponent, ToggleHandheldRadioMicMessage>(OnToggleHandheldRadioMic);
+        SubscribeLocalEvent<RadioMicrophoneComponent, ToggleHandheldRadioSpeakerMessage>(OnToggleHandheldRadioSpeaker);
+        SubscribeLocalEvent<RadioMicrophoneComponent, SelectHandheldRadioFrequencyMessage>(OnChangeHandheldRadioFrequency);
+
+        SubscribeLocalEvent<IntercomComponent, MapInitEvent>(OnMapInit); // Frontier
     }
 
     public override void Update(float frameTime)
@@ -180,9 +200,14 @@ private void OnExamine(EntityUid uid, RadioMicrophoneComponent component, Examin
 
         using (args.PushGroup(nameof(RadioMicrophoneComponent)))
         {
-            args.PushMarkup(Loc.GetString("handheld-radio-component-on-examine", ("frequency", proto.Frequency)));
-            args.PushMarkup(Loc.GetString("handheld-radio-component-chennel-examine",
-                ("channel", proto.LocalizedName)));
+            args.PushMarkup(Loc.GetString(
+                "handheld-radio-component-on-examine",
+                ("frequency", component.Frequency),
+                ("color", proto.Color.ToHex())));
+            args.PushMarkup(Loc.GetString(
+                "handheld-radio-component-channel-examine",
+                ("channel", proto.LocalizedName),
+                ("color", proto.Color.ToHex())));
         }
     }
 
@@ -192,32 +217,28 @@ private void OnListen(EntityUid uid, RadioMicrophoneComponent component, ListenE
             return; // no feedback loops please.
 
         if (_recentlySent.Add((args.Message, args.Source)))
-            _radio.SendRadioMessage(args.Source, args.Message, _protoMan.Index<RadioChannelPrototype>(component.BroadcastChannel), uid);
+            _radio.SendRadioMessage(args.Source, args.Message, _protoMan.Index<RadioChannelPrototype>(component.BroadcastChannel), uid, /*Nuclear-14-start*/ frequency: component.Frequency /*Nuclear-14-end*/);
     }
 
     private void OnAttemptListen(EntityUid uid, RadioMicrophoneComponent component, ListenAttemptEvent args)
     {
         if (component.PowerRequired && !this.IsPowered(uid, EntityManager)
             || component.UnobstructedRequired && !_interaction.InRangeUnobstructed(args.Source, uid, 0))
-        {
             args.Cancel();
-        }
     }
 
     private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref RadioReceiveEvent args)
     {
-        if (uid == args.RadioSource)
-            return;
-
-        var nameEv = new TransformSpeakerNameEvent(args.MessageSource, Name(args.MessageSource));
-        RaiseLocalEvent(args.MessageSource, nameEv);
-
-        var name = Loc.GetString("speech-name-relay",
-            ("speaker", Name(uid)),
-            ("originalName", nameEv.VoiceName));
-
-        // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
-        _chat.TrySendInGameICMessage(uid, args.OriginalChatMsg.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
+        var parent = Transform(uid).ParentUid;
+        if (TryComp(parent, out ActorComponent? actor))
+        {
+            var canUnderstand = _language.CanUnderstand(parent, args.Language.ID);
+            var msg = new MsgChatMessage
+            {
+                Message = canUnderstand ? args.OriginalChatMsg : args.LanguageObfuscatedChatMsg
+            };
+            _netMan.ServerSendMessage(msg, actor.PlayerSession.Channel);
+        }
     }
 
     private void OnIntercomEncryptionChannelsChanged(Entity<IntercomComponent> ent, ref EncryptionChannelsChangedEvent args)
@@ -256,7 +277,7 @@ private void OnSelectIntercomChannel(Entity<IntercomComponent> ent, ref SelectIn
         if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        if (!_protoMan.HasIndex<RadioChannelPrototype>(args.Channel) || !ent.Comp.SupportedChannels.Contains(args.Channel))
+        if (!_protoMan.TryIndex<RadioChannelPrototype>(args.Channel, out var channel) || !ent.Comp.SupportedChannels.Contains(args.Channel)) // Nuclear-14: add channel
             return;
 
         SetIntercomChannel(ent, args.Channel);
@@ -277,9 +298,79 @@ private void SetIntercomChannel(Entity<IntercomComponent> ent, ProtoId<RadioChan
         }
 
         if (TryComp<RadioMicrophoneComponent>(ent, out var mic))
+        {
             mic.BroadcastChannel = channel;
+            if(_protoMan.TryIndex<RadioChannelPrototype>(channel, out var channelProto)) // Frontier
+                mic.Frequency = _radio.GetFrequency(ent, channelProto); // Frontier
+        }
         if (TryComp<RadioSpeakerComponent>(ent, out var speaker))
             speaker.Channels = new(){ channel };
         Dirty(ent);
     }
+
+    // Nuclear-14-Start
+    #region Handheld Radio
+
+    private void OnBeforeHandheldRadioUiOpen(Entity<RadioMicrophoneComponent> microphone, ref BeforeActivatableUIOpenEvent args)
+    {
+        UpdateHandheldRadioUi(microphone);
+    }
+
+    private void OnToggleHandheldRadioMic(Entity<RadioMicrophoneComponent> microphone, ref ToggleHandheldRadioMicMessage args)
+    {
+        if (!args.Actor.Valid)
+            return;
+
+        SetMicrophoneEnabled(microphone, args.Actor, args.Enabled, true);
+        UpdateHandheldRadioUi(microphone);
+    }
+
+    private void OnToggleHandheldRadioSpeaker(Entity<RadioMicrophoneComponent> microphone, ref ToggleHandheldRadioSpeakerMessage args)
+    {
+        if (!args.Actor.Valid)
+            return;
+
+        SetSpeakerEnabled(microphone, args.Actor, args.Enabled, true);
+        UpdateHandheldRadioUi(microphone);
+    }
+
+    private void OnChangeHandheldRadioFrequency(Entity<RadioMicrophoneComponent> microphone, ref SelectHandheldRadioFrequencyMessage args)
+    {
+        if (!args.Actor.Valid)
+            return;
+
+        // Update frequency if valid and within range.
+        if (args.Frequency >= MinRadioFrequency && args.Frequency <= MaxRadioFrequency)
+            microphone.Comp.Frequency = args.Frequency;
+        // Update UI with current frequency.
+        UpdateHandheldRadioUi(microphone);
+    }
+
+    private void UpdateHandheldRadioUi(Entity<RadioMicrophoneComponent> radio)
+    {
+        var speakerComp = CompOrNull<RadioSpeakerComponent>(radio);
+        var frequency = radio.Comp.Frequency;
+
+        var micEnabled = radio.Comp.Enabled;
+        var speakerEnabled = speakerComp?.Enabled ?? false;
+        var state = new HandheldRadioBoundUIState(micEnabled, speakerEnabled, frequency);
+        if (TryComp<UserInterfaceComponent>(radio, out var uiComp))
+            _ui.SetUiState((radio.Owner, uiComp), HandheldRadioUiKey.Key, state); // Frontier: TrySetUiState<SetUiState
+    }
+
+    #endregion
+    // Nuclear-14-End
+
+    // Frontier: init intercom with map
+    private void OnMapInit(EntityUid uid, IntercomComponent ent, MapInitEvent args)
+    {
+        // Set initial frequency (must be done regardless of power/enabled)
+        if (ent.CurrentChannel != null &&
+                _protoMan.TryIndex(ent.CurrentChannel, out var channel) &&
+                TryComp(uid, out RadioMicrophoneComponent? mic))
+        {
+            mic.Frequency = channel.Frequency;
+        }
+    }
+    // End Frontier
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 4433ac6d545..045fd6f3ac4 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Radio.Components;
 using Content.Shared.Speech;
 using Microsoft.CodeAnalysis.Host;
+using Content.Shared.Ghost; // Nuclear-14
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -57,6 +58,18 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
         }
     }
 
+    //Nuclear-14
+    /// <summary>
+    /// Gets the message frequency, if there is no such frequency, returns the standard channel frequency.
+    /// </summary>
+    public int GetFrequency(EntityUid source, RadioChannelPrototype channel)
+    {
+        if (TryComp<RadioMicrophoneComponent>(source, out var radioMicrophone))
+            return radioMicrophone.Frequency;
+
+        return channel.Frequency;
+    }
+
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
         if (TryComp(uid, out ActorComponent? actor))
@@ -80,15 +93,23 @@ public void SendRadioMessage(
         string message,
         ProtoId<RadioChannelPrototype> channel,
         EntityUid radioSource,
+        int? frequency = null,
         LanguagePrototype? language = null,
         bool escapeMarkup = true
         ) =>
-        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup, language: language);
+        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup, frequency: frequency, language: language);
 
     /// <summary>
     /// Send radio message to all active radio listeners
     /// </summary>
-    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
+    public void SendRadioMessage(
+        EntityUid messageSource,
+        string message,
+        RadioChannelPrototype channel,
+        EntityUid radioSource,
+        LanguagePrototype? language = null,
+        int? frequency = null,
+        bool escapeMarkup = true)
     {
         if (language == null)
             language = _language.GetLanguage(messageSource);
@@ -111,12 +132,12 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content, language);
+        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content, language, frequency);
         var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
 
         // ... you guess it
         var obfuscated = _language.ObfuscateSpeech(content, language);
-        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated, language);
+        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated, language, frequency);
         var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
 
         var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language, radioSource);
@@ -132,6 +153,10 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
 
         var speakerQuery = GetEntityQuery<RadioSpeakerComponent>();
         var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
+
+        if (frequency == null) // Nuclear-14
+            frequency = GetFrequency(messageSource, channel); // Nuclear-14
+
         while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform))
         {
             if (!radio.ReceiveAllChannels)
@@ -141,6 +166,9 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
                     continue;
             }
 
+            if (!HasComp<GhostComponent>(receiver) && GetFrequency(receiver, channel) != frequency)
+                continue;
+
             if (!channel.LongRange && transform.MapID != sourceMapId && !radio.GlobalReceive)
                 continue;
 
@@ -169,7 +197,13 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         _messages.Remove(message);
     }
 
-    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message, LanguagePrototype language)
+    private string WrapRadioMessage(
+        EntityUid source,
+        RadioChannelPrototype channel,
+        string name,
+        string message,
+        LanguagePrototype language,
+        int? frequency = null)
     {
         // TODO: code duplication with ChatSystem.WrapMessage
         var speech = _chat.GetSpeechVerb(source, message);
@@ -181,6 +215,12 @@ private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel,
             : "";
         var messageColor = language.IsVisibleLanguage ? languageColor : channel.Color;
 
+        string channelText;
+        if (channel.ShowFrequency && frequency.HasValue)
+            channelText = $"\\[{frequency}\\]";
+        else
+            channelText = $"\\[{channel.LocalizedName}\\]";
+
         return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
             ("color", channel.Color),
             ("languageColor", languageColor),
@@ -188,7 +228,7 @@ private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel,
             ("fontType", language.SpeechOverride.FontId ?? speech.FontId),
             ("fontSize", language.SpeechOverride.FontSize ?? speech.FontSize),
             ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
-            ("channel", $"\\[{channel.LocalizedName}\\]"),
+            ("channel", channelText),
             ("name", name),
             ("message", message),
             ("language", languageDisplay));
diff --git a/Content.Shared/Radio/RadioChannelPrototype.cs b/Content.Shared/Radio/RadioChannelPrototype.cs
index cc65f885375..878f41138f9 100644
--- a/Content.Shared/Radio/RadioChannelPrototype.cs
+++ b/Content.Shared/Radio/RadioChannelPrototype.cs
@@ -35,4 +35,12 @@ public sealed partial class RadioChannelPrototype : IPrototype
     /// </summary>
     [DataField("longRange"), ViewVariables]
     public bool LongRange = false;
+
+    // Frontier: radio channel frequencies
+    /// <summary>
+    /// If true, the frequency of the message being sent will be appended to the chat message
+    /// </summary>
+    [DataField, ViewVariables]
+    public bool ShowFrequency = false;
+    // End Frontier
 }
diff --git a/Content.Shared/_NC/Radio/SharedHandheldRadio.cs b/Content.Shared/_NC/Radio/SharedHandheldRadio.cs
new file mode 100644
index 00000000000..43d45da52dc
--- /dev/null
+++ b/Content.Shared/_NC/Radio/SharedHandheldRadio.cs
@@ -0,0 +1,57 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._NC.Radio;
+
+[Serializable, NetSerializable]
+public enum HandheldRadioUiKey : byte
+{
+    Key,
+}
+
+[Serializable, NetSerializable]
+public sealed class HandheldRadioBoundUIState : BoundUserInterfaceState
+{
+    public bool MicEnabled;
+    public bool SpeakerEnabled;
+    public int Frequency;
+
+    public HandheldRadioBoundUIState(bool micEnabled, bool speakerEnabled, int frequency)
+    {
+        MicEnabled = micEnabled;
+        SpeakerEnabled = speakerEnabled;
+        Frequency = frequency;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class ToggleHandheldRadioMicMessage : BoundUserInterfaceMessage
+{
+    public bool Enabled;
+
+    public ToggleHandheldRadioMicMessage(bool enabled)
+    {
+        Enabled = enabled;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class ToggleHandheldRadioSpeakerMessage : BoundUserInterfaceMessage
+{
+    public bool Enabled;
+
+    public ToggleHandheldRadioSpeakerMessage(bool enabled)
+    {
+        Enabled = enabled;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class SelectHandheldRadioFrequencyMessage : BoundUserInterfaceMessage
+{
+    public int Frequency;
+
+    public SelectHandheldRadioFrequencyMessage(int frequency)
+    {
+        Frequency = frequency;
+    }
+}
diff --git a/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl b/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl
index 39bbf8f968c..48fd1c1829b 100644
--- a/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl
+++ b/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl
@@ -1,6 +1,14 @@
 handheld-radio-component-on-use = The radio is now {$radioState}.
-handheld-radio-component-on-examine = It's set to broadcast over the {$frequency} frequency.
+handheld-radio-component-on-examine = Frequency: [color={$color}]{$frequency}[/color]
 handheld-radio-component-on-state = on
 handheld-radio-component-off-state = off
 handheld-radio-component-channel-set = Channel set to {$channel}
-handheld-radio-component-chennel-examine = The current channel is {$channel}.
\ No newline at end of file
+handheld-radio-component-channel-examine = Channel: [color={$color}]{$channel}[/color]
+
+# Nuclear-14-Start
+handheld-radio-menu-title = Handheld radio
+handheld-radio-current-text-frequency = Broadcast frequency
+handheld-radio-button-text-mic = Mic.
+handheld-radio-button-text-speaker = Spkr.
+handheld-radio-flavor-text-left = HandiComms, 1000-3000 kHz
+# Nuclear-14-End
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index 77b6cac2d37..67e4597f0b6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -7,7 +7,10 @@
   - type: TelecomExempt
   - type: RadioMicrophone
     broadcastChannel: Handheld
+    toggleOnInteract: false
+    frequency: 1330
   - type: RadioSpeaker
+    toggleOnInteract: false
     channels:
     - Handheld
   - type: Speech
@@ -24,6 +27,12 @@
   - type: Tag
     tags:
     - Radio
+  - type: ActivatableUI
+    key: enum.HandheldRadioUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.HandheldRadioUiKey.Key:
+        type: HandheldRadioBoundUserInterface
 
 - type: entity
   name: security radio
diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml
index 48cc0872a1a..b6b65045f19 100644
--- a/Resources/Prototypes/radio_channels.yml
+++ b/Resources/Prototypes/radio_channels.yml
@@ -77,6 +77,7 @@
   color: "#d39f01"
   # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
   longRange: true
+  showFrequency: true # Frontier
 
 - type: radioChannel
   id: Binary

From ae63a452b24c16ff4a1c5ba1655a512cec671b07 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:30:39 +0000
Subject: [PATCH 48/64] Automatic Changelog Update (#1574)

---
 Resources/Changelog/Changelog.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 04c1f40665f..861dabd205c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10138,3 +10138,12 @@ Entries:
   id: 6711
   time: '2025-01-17T03:16:13.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1560
+- author: sleepyyapril
+  changes:
+    - type: Add
+      message: >-
+        Added handheld radio frequencies, accessible by pressing your "Use Item"
+        key while holding one.
+  id: 6712
+  time: '2025-01-17T03:30:13.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1574

From 86f9dfd53ea28d382156b2fd2b999f26330d0de4 Mon Sep 17 00:00:00 2001
From: Piras314 <p1r4s@proton.me>
Date: Thu, 16 Jan 2025 22:52:27 -0500
Subject: [PATCH 49/64] Lobby Background Credits (#1558)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This PR adds credits for lobby screens, the same as lobby songs have.
This works by adding `name` and `artist` to the LobbyBackground
prototype and storing the prototype rather than just the path to the
texture.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/6a348060-0ef2-4775-9adb-39a576a1c21e)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added credits for lobby screens.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../GameTicking/Managers/ClientGameTicker.cs  |  3 +-
 Content.Client/Lobby/LobbyState.cs            | 34 +++++++++++++++----
 Content.Client/Lobby/UI/LobbyGui.xaml         |  5 ++-
 Content.Client/Lobby/UI/LobbyGui.xaml.cs      |  1 +
 .../GameTicking/GameTicker.LobbyBackground.cs | 22 +++++++-----
 .../Prototypes/LobbyBackgroundPrototype.cs    | 12 +++++--
 .../GameTicking/SharedGameTicker.cs           |  5 +--
 .../en-US/_Goobstation/lobby/lobby-state.ftl  |  4 +++
 Resources/Prototypes/lobbyscreens.yml         | 24 ++++++++++++-
 .../Textures/LobbyScreens/attributions.yml    |  2 +-
 10 files changed, 90 insertions(+), 22 deletions(-)
 rename {Content.Server => Content.Shared}/GameTicking/Prototypes/LobbyBackgroundPrototype.cs (68%)
 create mode 100644 Resources/Locale/en-US/_Goobstation/lobby/lobby-state.ftl

diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 309db2eb4e6..a9e109df8af 100644
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -3,6 +3,7 @@
 using Content.Client.Lobby;
 using Content.Client.RoundEnd;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
 using Content.Shared.GameWindow;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
@@ -26,7 +27,7 @@ public sealed class ClientGameTicker : SharedGameTicker
         [ViewVariables] public bool AreWeReady { get; private set; }
         [ViewVariables] public bool IsGameStarted { get; private set; }
         [ViewVariables] public string? RestartSound { get; private set; }
-        [ViewVariables] public string? LobbyBackground { get; private set; }
+        [ViewVariables] public LobbyBackgroundPrototype? LobbyBackground { get; private set; }
         [ViewVariables] public bool DisallowedLateJoin { get; private set; }
         [ViewVariables] public string? ServerInfoBlob { get; private set; }
         [ViewVariables] public TimeSpan StartTime { get; private set; }
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 2e728f552a5..f003189007f 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -12,7 +12,6 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
-
 namespace Content.Client.Lobby
 {
     public sealed class LobbyState : Robust.Client.State.State
@@ -25,6 +24,7 @@ public sealed class LobbyState : Robust.Client.State.State
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IVoteManager _voteManager = default!;
 
+        private ISawmill _sawmill = default!;
         private ClientGameTicker _gameTicker = default!;
         private ContentAudioSystem _contentAudioSystem = default!;
 
@@ -42,6 +42,7 @@ protected override void Startup()
             _gameTicker = _entityManager.System<ClientGameTicker>();
             _contentAudioSystem = _entityManager.System<ContentAudioSystem>();
             _contentAudioSystem.LobbySoundtrackChanged += UpdateLobbySoundtrackInfo;
+            _sawmill = Logger.GetSawmill("lobby");
 
             chatController.SetMainChat(true);
 
@@ -113,7 +114,7 @@ public override void FrameUpdate(FrameEventArgs e)
                 return;
             }
 
-            Lobby!.StationTime.Text =  Loc.GetString("lobby-state-player-status-round-not-started");
+            Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-not-started");
             string text;
 
             if (_gameTicker.Paused)
@@ -161,7 +162,7 @@ private void UpdateLobbyUi()
             else
             {
                 Lobby!.StartTime.Text = string.Empty;
-                Lobby!.ReadyButton.Text = Loc.GetString(Lobby!.ReadyButton.Pressed ? "lobby-state-player-status-ready": "lobby-state-player-status-not-ready");
+                Lobby!.ReadyButton.Text = Loc.GetString(Lobby!.ReadyButton.Pressed ? "lobby-state-player-status-ready" : "lobby-state-player-status-not-ready");
                 Lobby!.ReadyButton.ToggleMode = true;
                 Lobby!.ReadyButton.Disabled = false;
                 Lobby!.ReadyButton.Pressed = _gameTicker.AreWeReady;
@@ -200,10 +201,31 @@ private void UpdateLobbySoundtrackInfo(LobbySoundtrackChangedEvent ev)
         private void UpdateLobbyBackground()
         {
             if (_gameTicker.LobbyBackground != null)
-                Lobby!.Background.Texture = _resourceCache.GetResource<TextureResource>(_gameTicker.LobbyBackground);
-            else
-                Lobby!.Background.Texture = null;
+            {
+                Lobby!.Background.Texture = _resourceCache.GetResource<TextureResource>(_gameTicker.LobbyBackground.Background);
+
+                var lobbyBackground = _gameTicker.LobbyBackground;
+
+                var name = string.IsNullOrEmpty(lobbyBackground.Name)
+                    ? Loc.GetString("lobby-state-background-unknown-title")
+                    : lobbyBackground.Name;
+
+                var artist = string.IsNullOrEmpty(lobbyBackground.Artist)
+                    ? Loc.GetString("lobby-state-background-unknown-artist")
+                    : lobbyBackground.Artist;
+
+                var markup = Loc.GetString("lobby-state-background-text",
+                    ("backgroundName", name),
+                    ("backgroundArtist", artist));
+
+                Lobby!.LobbyBackground.SetMarkup(markup);
+
+                return;
+            }
 
+            _sawmill.Warning("_gameTicker.LobbyBackground was null! No lobby background selected.");
+            Lobby!.Background.Texture = null;
+            Lobby!.LobbyBackground.SetMarkup(Loc.GetString("lobby-state-background-no-background-text"));
         }
 
         private void SetReady(bool newReady)
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 4a158fd811f..6f3072a29fe 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -50,11 +50,14 @@
                     <!-- Vertical Padding-->
                     <Control VerticalExpand="True" />
                     <!-- Left Bot Panel -->
-                    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom">
+                    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" SeparationOverride="4">
                         <info:DevInfoBanner Name="DevInfoBanner" VerticalExpand="false" Margin="3 3 3 3" />
                         <PanelContainer StyleClasses="AngleRect">
                             <RichTextLabel Name="LobbySong" Access="Public" HorizontalAlignment="Center" />
                         </PanelContainer>
+                        <PanelContainer StyleClasses="AngleRect">
+                            <RichTextLabel Name="LobbyBackground" Access="Public" HorizontalAlignment="Center" />
+                        </PanelContainer>
                     </BoxContainer>
                 </Control>
                 <!-- Character setup state -->
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index d19643f20a9..8e18db89932 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -22,6 +22,7 @@ public LobbyGui()
             SetAnchorPreset(Background, LayoutPreset.Wide);
 
             LobbySong.SetMarkup(Loc.GetString("lobby-state-song-no-song-text"));
+            LobbyBackground.SetMarkup(Loc.GetString("lobby-state-background-no-background-text"));
 
             LeaveButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
             OptionsButton.OnPressed += _ => UserInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow();
diff --git a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
index 2090e3e31f0..26bd119d44d 100644
--- a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
+++ b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Prototypes;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
@@ -8,24 +8,30 @@ namespace Content.Server.GameTicking;
 public sealed partial class GameTicker
 {
     [ViewVariables]
-    public string? LobbyBackground { get; private set; }
+    public LobbyBackgroundPrototype? LobbyBackground { get; private set; }
 
     [ViewVariables]
-    private List<ResPath>? _lobbyBackgrounds;
+    private List<LobbyBackgroundPrototype> _lobbyBackgrounds = [];
 
     private static readonly string[] WhitelistedBackgroundExtensions = new string[] {"png", "jpg", "jpeg", "webp"};
 
     private void InitializeLobbyBackground()
     {
-        _lobbyBackgrounds = _prototypeManager.EnumeratePrototypes<LobbyBackgroundPrototype>()
-            .Select(x => x.Background)
-            .Where(x => WhitelistedBackgroundExtensions.Contains(x.Extension))
-            .ToList();
+        foreach (var prototype in _prototypeManager.EnumeratePrototypes<LobbyBackgroundPrototype>())
+        {
+            if (!WhitelistedBackgroundExtensions.Contains(prototype.Background.Extension))
+            {
+                _sawmill.Warning($"Lobby background '{prototype.ID}' has an invalid extension '{prototype.Background.Extension}' and will be ignored.");
+                continue;
+            }
+
+            _lobbyBackgrounds.Add(prototype);
+        }
 
         RandomizeLobbyBackground();
     }
 
     private void RandomizeLobbyBackground() {
-        LobbyBackground = _lobbyBackgrounds!.Any() ? _robustRandom.Pick(_lobbyBackgrounds!).ToString() : null;
+        LobbyBackground = _lobbyBackgrounds!.Any() ? _robustRandom.Pick(_lobbyBackgrounds!) : null;
     }
 }
diff --git a/Content.Server/GameTicking/Prototypes/LobbyBackgroundPrototype.cs b/Content.Shared/GameTicking/Prototypes/LobbyBackgroundPrototype.cs
similarity index 68%
rename from Content.Server/GameTicking/Prototypes/LobbyBackgroundPrototype.cs
rename to Content.Shared/GameTicking/Prototypes/LobbyBackgroundPrototype.cs
index 4370c22b7ff..16cb9a4e6a5 100644
--- a/Content.Server/GameTicking/Prototypes/LobbyBackgroundPrototype.cs
+++ b/Content.Shared/GameTicking/Prototypes/LobbyBackgroundPrototype.cs
@@ -1,12 +1,14 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameTicking.Prototypes;
+namespace Content.Shared.GameTicking.Prototypes;
 
 /// <summary>
 /// Prototype for a lobby background the game can choose.
 /// </summary>
 [Prototype("lobbyBackground")]
+[NetSerializable, Serializable]
 public sealed partial class LobbyBackgroundPrototype : IPrototype
 {
     /// <inheritdoc/>
@@ -18,4 +20,10 @@ public sealed partial class LobbyBackgroundPrototype : IPrototype
     /// </summary>
     [DataField("background", required: true)]
     public ResPath Background = default!;
+
+    [DataField]
+    public string? Name;
+
+    [DataField]
+    public string? Artist;
 }
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 95da4f4c38d..3154b038f2e 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Roles;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.Network;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
@@ -78,14 +79,14 @@ public TickerConnectionStatusEvent(TimeSpan roundStartTimeSpan)
     public sealed class TickerLobbyStatusEvent : EntityEventArgs
     {
         public bool IsRoundStarted { get; }
-        public string? LobbyBackground { get; }
+        public LobbyBackgroundPrototype? LobbyBackground { get; }
         public bool YouAreReady { get; }
         // UTC.
         public TimeSpan StartTime { get; }
         public TimeSpan RoundStartTimeSpan { get; }
         public bool Paused { get; }
 
-        public TickerLobbyStatusEvent(bool isRoundStarted, string? lobbyBackground, bool youAreReady, TimeSpan startTime, TimeSpan preloadTime, TimeSpan roundStartTimeSpan, bool paused)
+        public TickerLobbyStatusEvent(bool isRoundStarted, LobbyBackgroundPrototype? lobbyBackground, bool youAreReady, TimeSpan startTime, TimeSpan preloadTime, TimeSpan roundStartTimeSpan, bool paused)
         {
             IsRoundStarted = isRoundStarted;
             LobbyBackground = lobbyBackground;
diff --git a/Resources/Locale/en-US/_Goobstation/lobby/lobby-state.ftl b/Resources/Locale/en-US/_Goobstation/lobby/lobby-state.ftl
new file mode 100644
index 00000000000..c92b3cb6ab5
--- /dev/null
+++ b/Resources/Locale/en-US/_Goobstation/lobby/lobby-state.ftl
@@ -0,0 +1,4 @@
+lobby-state-background-text = Background: [color=white]{$backgroundName}[/color] by [color=white]{$backgroundArtist}[/color]
+lobby-state-background-no-background-text = No background selected.
+lobby-state-background-unknown-title = [color=dimgray]Unknown lobby background[/color]
+lobby-state-background-unknown-artist = [color=dimgray]Unknown artist[/color]
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index d8c5d283794..358a75930df 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -1,43 +1,65 @@
 - type: lobbyBackground
   id: Robotics
   background: /Textures/LobbyScreens/robotics.webp
+  name: Robotics
+  artist: Veritius
 
 - type: lobbyBackground
   id: Supermatter
   background: /Textures/LobbyScreens/supermatter.webp
+  name: Supermatter
+  artist: Vertitius
 
 - type: lobbyBackground
   id: Warden
   background: /Textures/LobbyScreens/warden.webp
+  name: Warden
+  artist: Solbusaur
 
 - type: lobbyBackground
   id: Pharmacy
   background: /Textures/LobbyScreens/pharmacy.webp
+  name: Pharmacy
+  artist: Solbusaur
 
 - type: lobbyBackground
   id: SSXIV
   background: /Textures/LobbyScreens/ssxiv.webp
+  name: SSXIV
+  artist: Abyssal
 
 - type: lobbyBackground
   id: Susstation
   background: /Textures/LobbyScreens/susstation.webp
+  name: Sus Station
+  artist: Alekshhh
 
 - type: lobbyBackground
   id: SkellyVsTheRev
   background: /Textures/LobbyScreens/skellyvstherev.webp
+  name: Skelly Vs The Rev
+  artist: Hannah 'FairlySadPanda' Dawson
 
 - type: lobbyBackground
   id: Doomed
   background: /Textures/LobbyScreens/doomed.webp
+  name: Doomed
+  artist: brainfood1183
 
 - type: lobbyBackground
   id: Blueprint
   background: /Textures/LobbyScreens/blueprint.webp
+  name: Blueprint
+  artist: data_redacted
 
 - type: lobbyBackground
   id: TerminalStation
   background: /Textures/LobbyScreens/terminalstation.webp
+  name: Terminal Station
+  artist: aserovich
 
 - type: lobbyBackground
   id: JustAWeekAway
-  background: /Textures/LobbyScreens/justaweekaway.webp
\ No newline at end of file
+  background: /Textures/LobbyScreens/justaweekaway.webp
+  name: Just A Week Away
+  artist: plantyfern
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index 4dd3dc945bf..0429884ca05 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -41,4 +41,4 @@
 - files: ["justaweekaway.webp"]
   license: "CC-BY-SA-3.0"
   copyright: "plantyfern on discord"
-  source: "https://github.com/space-wizards/space-station-14"
\ No newline at end of file
+  source: "https://github.com/space-wizards/space-station-14"

From b1162a325bb84dda50f63ea70f97cbed398fb497 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:52:51 +0000
Subject: [PATCH 50/64] Automatic Changelog Update (#1558)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 861dabd205c..651ea5d7c85 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10147,3 +10147,10 @@ Entries:
   id: 6712
   time: '2025-01-17T03:30:13.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1574
+- author: Piras314
+  changes:
+    - type: Add
+      message: Added credits for lobby screens.
+  id: 6713
+  time: '2025-01-17T03:52:28.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1558

From a9f7fe8e9a337d13ef34ec643064432d0cec2b60 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:53:49 -0400
Subject: [PATCH 51/64] Downstream Port (#1509)

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: sleepyyapril, Stop-Signs, Memeji
- add: Changed the Warden suit's capabilities. (Original author:
Stop-Signs)
- add: Repeater, Argenti, and 45 magnum rubber box to Bartender's
loadout.
- add: Red cloak to loadout (Port from Floof PR #390)
- add: Witch Robes to loadout (Port from Floof PR #390)
- add: Sawed-off PKA (Port from Floof PR #390)
- add: The ChemMaster now has 20, 75, and 80 unit options available.
- tweak: Made the ChemMaster wider.
- fix: Ported Frontier fix to mag visuals on specific guns.
- fix: Fixed heirlooms flickering negative mood when the moodlet ended.

---------

Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Chemistry/UI/ChemMasterWindow.xaml        |  16 +++----
 .../Chemistry/UI/ChemMasterWindow.xaml.cs     |   5 ++-
 .../EntitySystems/ConditionalSpawnerSystem.cs |  14 +++++-
 .../Traits/Assorted/HeirloomSystem.cs         |  11 +++--
 Content.Shared/Chemistry/SharedChemMaster.cs  |   3 ++
 .../VendingMachines/Inventories/theater.yml   |   3 ++
 .../Jobs/Service/bartender.yml                |   4 ++
 .../Clothing/OuterClothing/hardsuits.yml      |   8 ++--
 .../Entities/Clothing/Head/hoods.yml          |  17 +++++++
 .../Entities/Clothing/Neck/cloaks.yml         |  16 +++++++
 .../Entities/Clothing/OuterClothing/suits.yml |  11 +++++
 .../Objects/Weapons/Guns/Basic/pka.yml        |   7 +++
 .../Loadouts/Jobs/Service/bartender.yml       |  42 ++++++++++++++++++
 .../Mood/genericNegativeEffects.yml           |   5 +++
 .../Mood/genericPositiveEffects.yml           |   2 +-
 .../Entities/Clothing/Belt/belts.yml          |   2 +
 .../Entities/Clothing/Head/hats.yml           |   3 ++
 .../Entities/Objects/Weapons/Melee/knives.yml |   3 ++
 .../_NF/Entities/Clothing/Neck/cloaks.yml     |  10 +++++
 .../Objects/Weapons/Guns/Basic/sawn_pka.yml   |  27 +++++++++++
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |  15 ++++---
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |  31 +++++++++++++
 .../Construction/Graphs/weapons/pkasawn.yml   |  12 +++++
 .../Hoods/redhood.rsi/equipped-HELMET.png     | Bin 0 -> 682 bytes
 .../Clothing/Head/Hoods/redhood.rsi/icon.png  | Bin 0 -> 235 bytes
 .../Clothing/Head/Hoods/redhood.rsi/meta.json |  18 ++++++++
 .../Neck/Cloaks/redhood.rsi/equipped-NECK.png | Bin 0 -> 1077 bytes
 .../Clothing/Neck/Cloaks/redhood.rsi/icon.png | Bin 0 -> 392 bytes
 .../Neck/Cloaks/redhood.rsi/inhand-left.png   | Bin 0 -> 821 bytes
 .../Neck/Cloaks/redhood.rsi/inhand-right.png  | Bin 0 -> 784 bytes
 .../Neck/Cloaks/redhood.rsi/meta.json         |  26 +++++++++++
 .../witchrobe.rsi/equipped-OUTERCLOTHING.png  | Bin 0 -> 612 bytes
 .../Suits/witchrobe.rsi/icon.png              | Bin 0 -> 330 bytes
 .../Suits/witchrobe.rsi/inhand-left.png       | Bin 0 -> 725 bytes
 .../Suits/witchrobe.rsi/inhand-right.png      | Bin 0 -> 730 bytes
 .../Suits/witchrobe.rsi/meta.json             |  26 +++++++++++
 .../Neck/Cloaks/janitor.rsi/equipped-NECK.png | Bin 0 -> 1247 bytes
 .../Clothing/Neck/Cloaks/janitor.rsi/icon.png | Bin 0 -> 515 bytes
 .../Neck/Cloaks/janitor.rsi/inhand-left.png   | Bin 0 -> 755 bytes
 .../Neck/Cloaks/janitor.rsi/inhand-right.png  | Bin 0 -> 799 bytes
 .../Neck/Cloaks/janitor.rsi/meta.json         |  33 ++++++++++++++
 .../janitor.rsi/plunger-equipped-NECK.png     | Bin 0 -> 225 bytes
 .../Neck/Cloaks/janitor.rsi/plunger.png       | Bin 0 -> 193 bytes
 .../equipped-BELT.png                         | Bin 0 -> 8773 bytes
 .../sawn_kinetic_accelerator.rsi/icon.png     | Bin 0 -> 7007 bytes
 .../inhand-left.png                           | Bin 0 -> 9405 bytes
 .../inhand-right.png                          | Bin 0 -> 9434 bytes
 .../sawn_kinetic_accelerator.rsi/meta.json    |  26 +++++++++++
 .../Guns/Snipers/repeater.rsi/base.png        | Bin 0 -> 4994 bytes
 .../Guns/Snipers/repeater.rsi/bolt-open.png   | Bin 0 -> 4766 bytes
 .../repeater.rsi/equipped-BACKPACK.png        | Bin 0 -> 1294 bytes
 .../repeater.rsi/equipped-SUITSTORAGE.png     | Bin 0 -> 1294 bytes
 .../Guns/Snipers/repeater.rsi/inhand-left.png | Bin 0 -> 4826 bytes
 .../Snipers/repeater.rsi/inhand-right.png     | Bin 0 -> 4800 bytes
 .../Guns/Snipers/repeater.rsi/meta.json       |  41 +++++++++++++++++
 .../repeater.rsi/wielded-inhand-left.png      | Bin 0 -> 7348 bytes
 .../repeater.rsi/wielded-inhand-right.png     | Bin 0 -> 7293 bytes
 57 files changed, 410 insertions(+), 27 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml
 create mode 100644 Resources/Textures/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Hoods/redhood.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Hoods/redhood.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png
 create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png

diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index b1f4f5917f4..61bbba3c35f 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -2,7 +2,7 @@
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                 xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                MinSize="620 670"
+                MinSize="620 770"
                 Title="{Loc 'chem-master-bound-user-interface-title'}">
     <TabContainer Name="Tabs" Margin="5 5 7 5">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="5" SeparationOverride="10">
@@ -13,12 +13,12 @@
                 <Button MinSize="80 0" Name="InputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" />
             </BoxContainer>
 
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 300">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 300">
                     <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
                     <BoxContainer Name="InputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
@@ -38,12 +38,12 @@
             </BoxContainer>
 
             <!-- Buffer info -->
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 300">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 300">
                     <!-- Buffer reagent list -->
                     <BoxContainer Name="BufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-buffer-empty-text'}" />
@@ -60,12 +60,12 @@
                 <Button MinSize="80 0" Name="OutputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" />
             </BoxContainer>
 
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 300">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 300">
                     <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
                     <BoxContainer Name="OutputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
@@ -129,4 +129,4 @@
             </PanelContainer>
         </BoxContainer>
     </TabContainer>
-</controls:FancyWindow>
+</controls:FancyWindow>
\ No newline at end of file
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index d312a69e7a6..ec6d41bd32c 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -103,7 +103,7 @@ private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amo
         private List<ReagentButton> CreateReagentTransferButtons(ReagentId reagent, bool isBuffer, bool addReagentButtons)
         {
             if (!addReagentButtons)
-                return new List<ReagentButton>(); // Return an empty list if reagentTransferButton creation is disabled.
+                return new(); // Return an empty list if reagentTransferButton creation is disabled.
 
             var buttons = new List<ReagentButton>();
             var names = Enum.GetNames<ChemMasterReagentAmount>();
@@ -111,7 +111,8 @@ private List<ReagentButton> CreateReagentTransferButtons(ReagentId reagent, bool
 
             for (int i = 0; i < names.Length; i++)
             {
-                var name = names[i];
+                var isNumber = int.TryParse(names[i].Substring(1), out int number);
+                var name = isNumber ? number.ToString() : names[i];
                 var reagentAmount = values[i];
 
                 var reagentTransferButton = MakeReagentButton(
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index f176f1b1358..d96d6ed541d 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -89,8 +89,18 @@ private void Spawn(EntityUid uid, ConditionalSpawnerComponent component)
                 return;
             }
 
-            if (!Deleted(uid))
-                EntityManager.SpawnEntity(_robustRandom.Pick(component.Prototypes), Transform(uid).Coordinates);
+            if (Deleted(uid))
+                return;
+
+            var picked = _robustRandom.Pick(component.Prototypes);
+            try
+            {
+                EntityManager.SpawnEntity(picked, Transform(uid).Coordinates);
+            }
+            catch (EntityCreationException e)
+            {
+                Log.Warning($"Caught an exception while trying to process a conditional spawner {ToPrettyString(uid)} of type {picked}: {e}");
+            }
         }
 
         private void Spawn(EntityUid uid, RandomSpawnerComponent component)
diff --git a/Content.Server/Traits/Assorted/HeirloomSystem.cs b/Content.Server/Traits/Assorted/HeirloomSystem.cs
index fc114b786b4..1453fa6e6b9 100644
--- a/Content.Server/Traits/Assorted/HeirloomSystem.cs
+++ b/Content.Server/Traits/Assorted/HeirloomSystem.cs
@@ -10,6 +10,7 @@ public sealed class HeirloomSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _gameTiming = default!;
 
+    private const long HeirloomRepeatDuration = 60;
     private TimeSpan _nextUpdate;
 
 
@@ -31,15 +32,17 @@ public override void Update(float frameTime)
         while (query.MoveNext(out var uid, out var comp))
         {
             var children = RecursiveGetAllChildren(uid);
-            if (!children.Any(c => c == comp.Heirloom))
+            var moodlet = comp.Moodlet;
+
+            if (children.Any(c => c != comp.Heirloom))
                 continue;
-            var ev = new MoodEffectEvent(comp.Moodlet);
+
+            var ev = new MoodEffectEvent(moodlet);
             RaiseLocalEvent(uid, ev);
         }
 
         query.Dispose();
-
-        _nextUpdate = _gameTiming.CurTime + TimeSpan.FromSeconds(10);
+        _nextUpdate = _gameTiming.CurTime + TimeSpan.FromSeconds(HeirloomRepeatDuration);
     }
 
     private IEnumerable<EntityUid> RecursiveGetAllChildren(EntityUid uid)
diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
index 8fca24fcdb0..3c11a3552d0 100644
--- a/Content.Shared/Chemistry/SharedChemMaster.cs
+++ b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -95,10 +95,13 @@ public enum ChemMasterReagentAmount
         U5 = 5,
         U10 = 10,
         U15 = 15,
+        U20 = 20,
         U25 = 25,
         U30 = 30,
         U45 = 45,
         U50 = 50,
+        U75 = 75,
+        U90 = 90,
         U100 = 100,
         All,
     }
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index ff8b4087abe..92a35ebaf66 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -30,6 +30,9 @@
     ClothingHeadHatPumpkin: 2
     ClothingHeadHatShrineMaidenWig: 2
     ClothingOuterSuitShrineMaiden: 2
+    ClothingHeadHatWitch1: 2
+    ClothingHeadHatWitch: 2
+    ClothingOuterSuitWitchRobes: 2
     Gohei: 2
     ClothingHeadHatRedRacoon: 2
     ClothingOuterRedRacoon: 2
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml
index a6d0e7a21e1..27788fa2a51 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml
@@ -30,6 +30,10 @@
       id: LoadoutServiceBartenderShotgunDoubleBarreledRubber
     - type: loadout
       id: LoadoutServiceBartenderMosinRubber
+    - type: loadout
+      id: LoadoutServiceBartenderArgentiNonlethal
+    - type: loadout
+      id: LoadoutServiceBartenderRepeaterNonlethal
 
 #- type: characterItemGroup
 #  id: LoadoutBartenderEyes
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml
index d3451108774..041a1482b88 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -107,13 +107,13 @@
       coefficients:
         Blunt: 0.50
         Slash: 0.50
-        Piercing: 0.50
+        Piercing: 0.40
         Radiation: 0.70
         Caustic: 0.70
-        Heat: 0.70
+        Heat: 0.40
   - type: ClothingSpeedModifier
-    walkModifier: 0.65
-    sprintModifier: 0.65
+    walkModifier: 0.60
+    sprintModifier: 0.60
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCombatRiot
 
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 3a5056340cc..f16dbd1a730 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -518,3 +518,20 @@
     sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHoodRedHood
+  name: Red Hood
+  description: A hood of a red cloak, made to keep the harsh light out of a traveler's eyes. Sometimes it sparkles in the light of the sun.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/redhood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/redhood.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Hair
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index f31b38c20c7..f02dc068da9 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -272,3 +272,19 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/pan.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakRedHood
+  name: Red Cloak
+  description: A cloak made for travel and comfort. Slightly smells of cherry pie?
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/redhood.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodRedHood
+    requiredSlot:
+    - neck
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 0621e7cd694..96caf947172 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -311,3 +311,14 @@
     coefficient: 0.01
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCarp
+
+- type: entity # From Upstream
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitWitchRobes
+  name: witch robes
+  description: Magic is all about the spell power, ZE!
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
index 6af389fed4c..b7d329d22fc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
@@ -19,3 +19,10 @@
         requireDetailRange: false
   # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi
   # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi
+  - type: StaticPrice
+    price: 270
+  - type: Construction #Frontier
+    graph: PKASawn #Frontier
+    node: start #Frontier
+    deconstructionTarget: null #Frontier
+  - type: Wieldable # Frontier
diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
index ef4614e886b..d5525f333db 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
@@ -62,6 +62,48 @@
   items:
     - WeaponSniperMosinRubber
 
+- type: loadout
+  id: LoadoutServiceBartenderBoxMagnumRubber
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderAmmo
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - MagazineBoxMagnumRubber
+
+- type: loadout
+  id: LoadoutServiceBartenderArgentiNonlethal
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - WeaponRevolverArgentiNonlethal
+
+- type: loadout
+  id: LoadoutServiceBartenderRepeaterNonlethal
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - WeaponSniperRepeaterNonlethal
+
 # Eyes
 
 # Gloves
diff --git a/Resources/Prototypes/Mood/genericNegativeEffects.yml b/Resources/Prototypes/Mood/genericNegativeEffects.yml
index b83a5c2fc22..4c9c5686d38 100644
--- a/Resources/Prototypes/Mood/genericNegativeEffects.yml
+++ b/Resources/Prototypes/Mood/genericNegativeEffects.yml
@@ -54,3 +54,8 @@
   id: HeirloomLost
   moodChange: -15
   category: Heirloom
+
+- type: moodEffect
+  id: HeirloomNeutral
+  moodChange: -5
+  category: Heirloom
diff --git a/Resources/Prototypes/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Mood/genericPositiveEffects.yml
index 3af8ec052a6..c3d3acc8a5d 100644
--- a/Resources/Prototypes/Mood/genericPositiveEffects.yml
+++ b/Resources/Prototypes/Mood/genericPositiveEffects.yml
@@ -51,4 +51,4 @@
   category: Heirloom
   moodChange: 5
   timeout: 60 # A bit of time before they realize it's gone
-  moodletOnEnd: HeirloomLost
+  moodletOnEnd: HeirloomNeutral
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
index 8847f8d03a9..df1e61c23da 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
@@ -15,6 +15,8 @@
         - Flashlight
         - ForensicBeltEquip
         - HandLabeler
+        - Sidearm
+        - Folder
 
 - type: entity
   parent: ClothingBeltBase
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
index 3be093de095..710ce8322dc 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
@@ -101,6 +101,9 @@
     equipDelay: 0.5
     unequipDelay: 6
   - type: HeadCage
+  - type: Tag
+    tags:
+    - ForensicBeltEquip
 
 - type: entity
   parent: ClothingHeadTinfoil
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/knives.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/knives.yml
index b2ee1bcfdce..b5cb96f1617 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/knives.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/knives.yml
@@ -24,6 +24,9 @@
     state: icon
   - type: Item
     sprite: Nyanotrasen/Objects/Weapons/Melee/anti_psychic_knife.rsi
+    storedSprite:
+      state: icon
+      sprite: Nyanotrasen/Objects/Weapons/Melee/anti_psychic_knife.rsi
   - type: Tag
     tags:
     - ForensicBeltEquip
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml
new file mode 100644
index 00000000000..31e20f92c5a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakJanitor
+  name: janitor's cloak
+  description: An exquisite cloak fitting for those who save the station from messes and slips. The unsung heroes who work thanklessly while we make a mess over the bar. Pure angels of patience and an iron will! ...It's also waterproof!
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
new file mode 100644
index 00000000000..4dd2d8fb7b8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
@@ -0,0 +1,27 @@
+- type: entity
+  id: WeaponProtoKineticAcceleratorSawn
+  parent: WeaponProtoKineticAcceleratorBase
+  name: sawn-off proto-kinetic accelerator
+  description: A PKA rifle that has been crudely cut down and rewired. It's all but impossible to aim effectively, but at least it fits inside a jumpsuit pocket now.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
+    state: icon
+  - type: Item
+    sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
+    size: Small
+    shape:
+    - 0,0,1,0
+  - type: Gun
+    fireRate: 8
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    minAngle: 41
+    maxAngle: 55
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
+  - type: Construction
+    graph: PKASawn
+    node: pkasawn
+    deconstructionTarget: null
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index a2d93631db6..bc20482e1bd 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -8,10 +8,10 @@
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi
     layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi
   - type: Gun
@@ -60,6 +60,7 @@
     magState: mag
     steps: 1
     zeroVisible: true
+  - type: Appearance
 
 - type: entity
   parent: WeaponRifleGestio
@@ -124,10 +125,10 @@
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi
     layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi
   - type: Gun
@@ -165,6 +166,7 @@
     magState: mag
     steps: 1
     zeroVisible: true
+  - type: Appearance
 
 - type: entity
   parent: WeaponRifleNovaliteC1
@@ -230,10 +232,10 @@
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
     layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
     quickEquip: false
@@ -276,6 +278,7 @@
     magState: mag
     steps: 1
     zeroVisible: true
+  - type: Appearance
 
 - type: entity
   parent: WeaponRifleSVT
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
new file mode 100644
index 00000000000..e6005fd0cc7
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -0,0 +1,31 @@
+# Frontier
+- type: entity
+  name: N2524 Pattern Repeater
+  parent: BaseWeaponSniper
+  id: WeaponSniperRepeater
+  description: A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi    
+  - type: StaticPrice
+    price: 500
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - CartridgeMagnum
+    capacity: 7
+    proto: CartridgeMagnum
+
+- type: entity
+  parent: WeaponSniperRepeater
+  id: WeaponSniperRepeaterNonlethal
+  suffix: Non-lethal
+  components:
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - CartridgeMagnum
+    capacity: 7
+    proto: CartridgeMagnumRubber
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml
new file mode 100644
index 00000000000..9ed778d7844
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml
@@ -0,0 +1,12 @@
+- type: constructionGraph
+  id: PKASawn
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: pkasawn
+          steps:
+            - tool: Sawing
+              doAfter: 2
+    - node: pkasawn
+      entity: WeaponProtoKineticAcceleratorSawn
diff --git a/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a090ee541c3a9b45c2f3410b2e0b79a84ba15a9
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%WJyFpRCt{2n!j%2Fbu{&9*P28Z}y|yAP)taDah0%9rFNwk~~0Gce=sIbOAC*
zLm#Ar=bH)?C=TEaiBj2h0#mWofBY?Wf>;#4h!kN8_~uaGA3En6pO<;g{=TrbF^(~&
z_XOJG_T`v;iERM*5o`R088c?wFgGTXf+6jT1@OkN06YV@0+Na_w0)5PZQ~CEO(NF*
z5F%Vi9|)bl-{lbgwf{Z^UC#S!3}OLV&NoCz!7=BbBgYd9;GGY%w=sqQB*_6ouYle;
zV43Iq!aE<^TUYE>CZ({JDk5x%8qRNsP!YY^j{DI2fho~JfS&*s&K;gz8N+|~_m@Oi
zGe_4KeHp3_5Qo4mcB-$8;YnHI&wP&1`NCRS3nvjn%)i}5?+_@grOROHP0AAg=5tKS
z61RADeuzn>L{tY9){>7u;5GBc#@|OkTnTy+e&5|;Lxe2L=(9SnD2k#eilQirq9}^;
zEgAjoZEBKqhrbfy*W#Y8Mr5jYgG1Vm65v>ucA4iqwg^MpjyfLzbob`QZjqmAkB4)U
zAQHeQm>F|tgYp3owZ){YnJGMz5ME~-r@KgiDG{G?KI|8c#lpFhB20-yN{B<CB0A~(
znA@cv`<Mt7$@Lev#?WE-z34h1Aq~N(Iw0)NZ;@u{w^=wxTQtuI#30@V{VMPo`MvSZ
z`*}%Q^U;-HVJ-RP|7Z-ajN!VjM^~h-YhD?{kH#Ff<8x|{vr6HL2v0=V0=PbBAR*V-
zh2GQtXv{f8m%>0Z94Y`smW`eZvMi(Jeyh{AyrL+Iq9}@@D2k#eilT`54*`Ty+x^GI
Q)&Kwi07*qoM6N<$f@9J<)Bpeg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ac846225346f99de6b30cb97b36939192ab1391
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWTn`*L
z;4j4JDaD&8#+WL}93>>=&&cS>%NxzWuz-PKIs-!(1A`|6!;&RSuAW;s38;&&B*-tA
z;Xg76_qr_tlnM28aSXBOeS6W6&q0xcIbazZ=bit%_HPOn{+}f)^NWpj^Yqya7i!l8
zBz^aKb8jj`_2L<fK-~EKsj!2bBlme3mP!3<cD~OS>z^UAXwj23{;Ml~PUJt3%Cz54
SMeR1w0tQc4KbLh*2~7Y3g;aU~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/meta.json
new file mode 100644
index 00000000000..bd53e417c59
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/redhood.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdf97f81d12763075467421fa41598ce363ede57
GIT binary patch
literal 1077
zcmV-51j_q~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&?@2^KRCt{2Td{82Fc5uLbg|I<LC_yb26-r8WC=WUs)jBJ&@p4bAY(qD9Xh15
zkxf7X*hBLTS%W}-5WrdjT!;EpnxU*anX=kM4=^N~65rkFkrc@@Fkrxd0RsjMc&(sK
zg^R^v?fb=e%m8pUpFg{=t}IQ{jRyD}?mfHUf3vaFBbYK{!d#KLWfNvh17)!w{2`7_
zWlc~8Kq{RPAt%Cw8Fy*QMN#lwn(~AhIT2<=YuCqu%ReK+lo|JF%HNNU_&!Z}%3PIM
z`PB-Lrw;%*5%w-Gk)NLaIj)FB1zo_cdq#wtBmn^2BuVACYoiv80T6kW07jl6k7c<=
zJOWUzzQ<C5G%vUA2{RtcvigWku8ms$x0;Kj;<aOzVFKVO%Yx-GkvmV=b@G`_K&1vP
zHeP*9#C1fPV@`xCX46Om{O!4Yez&QGxco8=f1?7lQFfn>9Am((PdM@bzc>yfe`5fA
zr>+qmhrgvMe?a_Z;MXVeN8tC+c@r8tLErh4#Ud!Flf{Cr(X9fk=NdEyK;yi?4?+xt
z6i|A<*PUyi?gK37N&#*Ve4e`VCaC)W3%XK(>!8omwhwsq3Q+d}K=aH>%DYrR>^?v}
z3WQJ>kS-Ol(^24TKBpNGMgR^2<;O(N-nS3&!W7^dp@I7v8hT-}qE`j@MraUI{;mQw
z3IOa1XnaEMgyge#{V@^ylZ_t$YbPQa_!A<azUP-R3xDG<c*RUu8KFT;=LOpL0Kl$5
z^@`9Jg<34vS)lC$+Dyb$3nJF18T07_-6}v8fIcBju+@DEm{)85H$>YPc&Qiy(6<47
zV+cUs2K0>~0DT+KH--STx#?m&=C1Mp+F%=d%mEN0%MNUpklkZBx883~k&$GGz0n8<
z%jMcWU5phV4O~Yj%(zXGYMb0&iHiOzEPHd0Wr^D)!Nf^QD2k$UMF@xRy3V&*i8AL1
z$#l~Vf&}6z%Q_80Q55`?WtHQ;^Cj%b8K&v5<mb3S$X8h+(iA>gDr|vjYktM+=L%R8
zB-9F!cI7WpN_vVkgZ=&e&iVnV+vN;7Z|RH73nG${C5FV_4%fh6DtA+8tO_s(K-!s0
zylePQ`m4qkv>FBK<iCqyP&n$EffeQe_*+#mcY(Axo6jjH3ff}DRtng4+wa1btrala
z@zWQCw#|A`K;P(H0exdzHNGeXw1FuAp?23dwzZ|zg2<~?fWVFVyN>=JpuxKcuj1z6
z>l46k9?)%);BvX_<()W75<XZiD_ed6_-XWMD+N3Ny*ZB+_XBp^2T+n!&YyRX3}MAN
vPz8Zjf1|O$<iJ;e-{aqL-i6p^ZIZtM=Kah0{e0N<00000NkvXXu0mjf1V!;#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e1aebb03954dc93f6e2162930694a0af39bf233
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$LP<nHR9J=WmN9O_FbqXMi!2V%JJ~=7Z-I}JljJBywhRUAI|YbFcBp93j4Cm8
zJyisP(3ax=_^E^eYSgIl--B|C^E|JvFI~p~aGs{8&;7L4wrv*R%|j^y12YEZMa;8S
z3YP=+p#y(kejbnbcsu|ABds4LPLv!tcu9L^G*M_I!h6#!5cd!kumIpj*}7IyY{8}L
zSj0mV>6vj4VR`k@{s5qfu-;a<9FU5vh(PIg+lo?Tcb|w>)eA^UJhgTs!j(CzQFK5H
z<$5f_Q2RYm1khCqP#?bq_I@hg44@srFY?U*_K<n1-pv6mpy6`)W&rDe+|zKmd^13G
zpgOR(1KDYKo+cWJlD`8Xk!x}9P%7@S0|^N+;Mso9AOf7@*n0*nlqXyO-ZNmK{tRGG
m2V5uRMD)@>T>!5B1Hcy&i_zBYjf-&r0000<MNUMnLSTaTZ>6>X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4fd8db4bac192587244f792ec2fbeb9e591830b
GIT binary patch
literal 821
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V1@
zPZ!6KiaBp*`RCno5IMHLQ@64)MPyfRKowKeQ?{5!>5|iuRZZ(|e&LHOxu|RIpew#Y
zAdy>R+L|mC{>w)<cV_<h+;(FR!{^BpCfL?}KKtA}`LJ~A+M}k$%DN6x`3+kbGWRfE
zVp{T%&4YWwF=+)Hg0oheD?BlI)!udaOj+`R?Hi<fe=pp`5W#q=aNcAFhAY!`iZ3!S
zNTmGP|8vzThH81n`Y)#&oeIpCeZFIHS7OHN>*{PXOQj^HYw>LOE@*J^%g<{8VhRW2
zXP?TGKC{l^=!5!ytZoJw$I@&c*-X}IH)Z8Byy&ocV!i*#mQJ=j!3Qf7FZ4DfHZ=z)
zu4@cnXW(I&#n!KzT0gr~E!0mnc)?W$yJd`atY2yuHQwZkICNmy!E00QxvgOS6LIlD
zy7sB2=Pi${QYHz9N-Pl5ywKzMMoIM}>)R6vtC+*)1lB!2EmAoDQ_R{b*?>8RIKFEJ
z9MR#~vHPaYxhpA*3EP@}y{{_c5udCT$y`*{SzO7Im;JtKuW<N(r6;@-#1wkX9ikdc
z?lELCUaDZW=(P&GYxE=`{lL;$4@_9~F1AEnYuIfZ6`3`;N>6Q0=b2v>+u7!5HQ!sy
zxcm@uNQbhnTAWwTwa$)t&TFQ*96vTZcE6~w*)R2t`G-{zK`9He|K~6to7FWNC^dDD
zUg=k}qgP)#RsLsS(3&sHeY#;|TP;KBjDrhgXU>fbFn%pm75O8YYdJgbi}q7xN(|Lj
zFLgEk?lXV2^5OKE*+5TkQEoQO+|)d!Y^lw*DcQ1<rZX<((>3vJPW)7~Z~N~{S{v`q
z`1STlbG^d?hFzZ9IWE{KX-Bfv^zpWFmRcOT^^@1j+9GTA|6*Th)uPX*pO$QG*{G4b
z?!h5L2hrWu+pfMp{dP{3UDL~djFUL~takV}?sfG4@*>z<V)vEmuNK^vKa@(=<yXW+
pSi9)WTwO2v4V3Jjz2g1Be*5QpHIH4~?7)1$;OXk;vd$@?2>?`3X#)TN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e1008748c2ed1dc5adbf61e7b60ef8904cf8dfc
GIT binary patch
literal 784
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V0`
zPZ!6KiaBp*Ip*DR5NX@r>Hdl7q{o`o8n%opi<)B=mY-<T-lG1(YPMb#vsi4&Y2G!{
zxI+SGt#x$Vv}&T!Oub`fWjV_yILT>!Udv<l`2XL}#}xhrp0n(mDV)i8iG_IytA{Yp
z1Th6)1Ba*vlY<Pn1ZDOz{(31by!MoH`QHa2fA5qmxs$`%z_g>zV$c4|YEhxP_GR!s
zXzN_+UmnlC<8+E`!byMT^o{oWqi^nBoE>Du>}tDq@?LKR;}3-^Vk{plZ!9ur%j3J#
z(it{&U1Cyf*VEhY>x84c8<M`&M-)^ZanUXp`+dlrx&EN<zWq%9rk+0Hf2We=`)ZC2
z3>m@`MUR(SSt}Ut`=L5*_wmw?&jt6KU3{v;S;aW+`Clz1-7m~FwOcZTx2}8tiXqSU
zNM=r?)c;@a1W!Di*O8bMc|}g6{g^&))zi{VS@XPW*-c8yB^OMK2p74(!{VqF-;Rm~
zS3d4lk3<j5o}6`ed&%kvJhGO!gN0B4rW;*xx2;-t{KZ!9Z*nuHe4pQUYx^mm&tF6T
zeLs_|&HO4xE%nC>O{0qAb-pW({oj}Myk_~v)OWrGk1LF2_01HF&+<?I_*r`f!-3sP
zW`3ErxxUd{&9qEe_O>1KosuV?zpuVC@zLk+?Kg_D7lm=ZYd+6h|NndU^V`)j=HI!#
zY%FC@VYAD4J1s)5L!@H+ao68_)5OnYy?k%6ETjJQv5o#aUf$sUFlFt2*1X>P<_s%D
zqFv9Weyo1SWNLob*g9UH(bW8{>ZRk`*jA*vAB&qb^U}|~i+;W1e{IXKnK${*bQ_l6
zY@x-?k0qPSJZnFP&7bFc?C1J=j@(VX`Z*KeDat+nfc(VnfAgH*dQSo-aRyIUKbLh*
G2~7Yq>sYk_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/meta.json
new file mode 100644
index 00000000000..de450048eb5
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.",
+  "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/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b797c8dce44d41c7f83ad86b3593e43a8f83ec88
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq004jh001Be0{{R3?fifj00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj55>QN3MGg)Q=ib-MxTqKy7#kZK00021PX_D&000Jb
zQchF<|NsC00JFcOzW@LL32;bRa{vGi!vFvd!vV){sAK>D0m(^3K~z{r?N#lPgdhy#
z%lCifOWJ~ht=!Gc+};l}yGltdA%Ldi!*~U}0$u^HfPW<*rA(wq)Q&%nl1s5>fPxfj
zDlWxJN(J?Kvz{3{o(e^yMGi#%Jb^PP<e-m5yb*RhYSmKflLC%kk#tos+L&CbD4uY|
zG_Ci<jt3~OG-OzO1E|I|hy^s_K|rky|4;yC$P%#tR;LXX6TQvVg@wp~LujufD9`fh
zvZvrz0y3THGemn`N8?q1!xJK)w#nfMso?2A0A`2*%mD`0-=X{v;5)#6q{IU7v=p+K
znA)t5oT$JMVDXAXTXqiM<~l$O2P|H(6~N2R0l7=0nA&|0SiEA(^YRS`VgVf%uP`>|
zQJo&e0%#y|0s+__2KSV2`K>@V;RgbE$`ru}@_rz1@eSmd;0rj%_Z8?F$q(C*N3gMs
z#W%1rpTCwrOYsyN+-)QRG8F^@Ql+{F3#2rQT%R9JZV)`oAGXnb1UZ8oAya^-053VS
zAlM^X8!zK3XF)M4@iPmSaKE?Us|vvI-ViW=$CQX1Qj$W?gtG;Cx<#=T)-_?rcb0H1
y@DnDjT%&LWfoEPg{aeohH^DXQFY#dk$MFTU2}JDU2kWf>0000<MNUMnLSTZ*vi!OL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..acdc1b394b240a78f926d3232b887816aeb40a23
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?ST`S|#r-@ATh#|jAv32A9*pzvycwl_eEtt7}V_&*3RY~H_QKTw3T
zz$3Dlfr0NZ2s0kfUy%Y7T<_`P7-Hf7cH(QkqY50&f?xl}|J-teQ_p+aU;DFqN%o9a
zpLPE`a7q2Zn!qw0t;X4wHUCVURUbrfG40#xl*7=y_OMCKM7Pc52?6IBR!5ir@KfmI
z&RBD=TE60@=jEES3=WbK8FtkTW&B;v>I-;4gq%n_--Ahy0yuYEURpFEzTpeMQsa(O
zs`{1RFYIuxs5quk`%ZAZ<+;wXl@m3L^`E*rER~X+w&ELa#U*Zo=ls6{1(t^{e!~rP
OI)kUHpUXO@geCyvk9&~-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a93d4a5af0340300aefd324a724d1df5fbecea1e
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004lX+uL$Nkc;*
zP;zf(X>4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+<IJGrc#m
zu~fFo!pFwf!p54dg{@M`N6F64ir7fc|GrT(sZnm-?yqz2Io*3M1P`*N<yQ58Wfz>-
zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+
z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp<vsaxCF~;r5heOMWm>
z<doty#a4F3{JE!kVf~^#Gp%%)ZHzO)6j3w`R#+xWfo@rCQCwoOAF1GP_5D$C8RA;T
z6vr4jEOg(G`h(xyy6L{&Vp4qss-HaXtpjSd;A_+KJ`X+b>j*-RaABAHxdRw{7k#s&
zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp
zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk
z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002UNkl<ZSV!%a
z-4cW#2uAtQ_kZODmu<9gN8*-qg_NhSoJpZ4DM1O85|ltG!A1Z`cxv|UBT&djgT2z}
zA^|c2p^XJc`NJ15^DK}~<F+U-+*~7p)k;`Eiq&6+!0HvRi$kzHZgi|(@dV6-#Pb#T
zD71;-HD$#>*3CvrllgQmc=A+UoC*F=f)XetD1lOfR|45-ty1Cw{l8DM;sWHB69A_Z
zEVJGuXgPsw{JB>kV##n37U=nDUWRxAIq=P=m$=|YQqcPc_lHfk>b3l(00000NkvXX
Hu0mjfUGYjr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ee8f62362720f49506bdce053ff5ddc7e26e144
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004lX+uL$Nkc;*
zP;zf(X>4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+<IJGrc#m
zu~fFo!pFwf!p54dg{@M`N6F64ir7fc|GrT(sZnm-?yqz2Io*3M1P`*N<yQ58Wfz>-
zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+
z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp<vsaxCF~;r5heOMWm>
z<doty#a4F3{JE!kVf~^#Gp%%)ZHzO)6j3w`R#+xWfo@rCQCwoOAF1GP_5D$C8RA;T
z6vr4jEOg(G`h(xyy6L{&Vp4qss-HaXtpjSd;A_+KJ`X+b>j*-RaABAHxdRw{7k#s&
zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp
zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk
z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002ZNkl<ZSV!%a
z$qvLI2tZl%|9^P^mtZqVp<a0hOB;PqJs|W;N>Bo&1SL>PumymG-&|uAfkGBXaQW<k
z1jq=4_URp;ZwZ(=ERgAq+nl}%(F#WR&OZSuBaC2z8QO>@h;G4=ZwQzPiNpUOJ4UO7
zG0LHU9F4^RnyjZoki_TvB=D4=1WE}?pp@VgWcu^Q38dLUzMw<UINseBX9e-@w($b#
zk#`kH&%3KYI&}URoS;e5z7gml$VF+sg>ehy>Xx{qEYcaDTnc*s0p7?>wmd(FW&i*H
M07*qoM6N<$f-oIP5dZ)H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json
new file mode 100644
index 00000000000..76513321794
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license",
+  "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/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2f820071c8157a84d559dfbf1e6b56fa194493b
GIT binary patch
literal 1247
zcmV<51R(o~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(nMp)JRCt{2n!jt?Xc))8I_{Q$<(6`{+#HNAj&U-0>YzU$K~pFs7Q`XsxGe}u
zvxRIf0g<(##0N^RluV-STo0W*G$Ba|p;^0BWN-prZg_9dJ<97yw%%8^buRaQz}R~A
z=zV^?&-=r#UO=HxC=?3C{}oL}*vMH709v<h<heojMhWSOBaQAKWfX7!<pKcmD>n0P
zoKTsm+idfd6I?7?Y#c!_b(;Zz@hs3&Dc{{YISsz^&jT6Wwj_iENjZ=4%z@XiU~ai+
zJ+~vz$QY4?k+Yb&<>Jg~!uqq`SI%8+V%Dz1YgoeBAS6Vse{u?V4GVeg=ZH*)`7pO!
zRLa24vbX`F`j3t;aemQ;yV?YRo<Q(rrD7FJbA{0bVC_+p@yaOOC=ld0(3_U-Y7+<7
z^`V2nJI~ud*+8w%>y`<^4<bgmtIaUVq{!TIW1Z(^N5%U5<DTnE8JM->osW|r#J~tq
z-{YMF5Ze#$-=pp_Y*#RKn?3qzwx?{6e&YJ?Gof)PaTchQgOobIXorg9T9`MgRICDM
z!%M0>0V8Lz-)ati`8BYEx?i0BS-T$EdvXeV`wDd2<QYkL8l)iXt=RBxqJ8^%C722W
z=SK%Q4{&3Q9nAo~8&t}`iD3OgV*n92AD>p<jic?YM5n`HA;(I^YM23)a`XcPEl&+_
ze_ZH?Z~)flA1C%H@5a$&1|U%=`=~ntcg|8!O2sNFW#IgxEtQ2*88AuIo>Y6j)AC&e
zfYtz%3H@ZK<@?FRkr;q+^lKR?#mDvBzyP#vU9H1>0Kn!eC-y%95C5lVRDtsvR@mS9
zmZjhK%V=Ei8kSJ~!qZ?JMy~%n+hP9Di=fu6tC_mZ&YUKKKY@S5NX3`swGl0Z{%bnS
zhhf)IdlK#cabrTMSjFL+b~YK1C5LaK1KY`|SlJ*F1JJs4wWT?W0R`j*5_)IZ3ZIj*
zWPpA&`tJe_d`_WIC=?2XLZMJ76pGPd>NXp6P$6rKoW+v1>-r(RD{SgE>o6Zj$CrtF
zgjrzfHaj}L3|`cZ+a6Q5nSWJf?_WP)^xM>JmUTu@i}N<TfBhi*EmK$OEwPOk2Uwq9
z!^=+}!?LBh@f?rgq4NU3C4k_K)y9j1)b$A)Yw9+8`ROChKYsxLbh|;I_kUjtWoQe1
zTtT2L<4>rN^HWoS%F@iV&}%$GI0HJ&$I@H@Kmpr_?=Ur`q1$DV=<jYUidLD5r~7Xs
zW#s%$ZQ<V%U${Q0mNIplZMseDS;6b+P516SeYeZ7yRn$bF}bJvZ$qa6^w_g!)uj$-
zNsj@gnd#7RQViUse-`X+EcSE*vZpjNEnQctL68*D07&D)T?&qu?ZbCHb^!8@6VmGd
za`yi9PHiERz4+Fxt5Kl)*&@S8UXN$xJi!NHSiXz%0pnz-0GxmRl6mVBlm%(ho=0VX
zjIej(X#CVSX~?btfE3dptq6m2!UfsKN6t=dAw07zvjR+wsoU&>_mKHl)rr^>Fme|2
zud3{W_b}C-K<Y6-=1BTD3C=HMn2AQtnuwOa&!pO=P$(vwe*k06NebZ%D(L_K002ov
JPDHLkV1hiSXhZ-2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab239662ab5cd506f6bddceaf2284d5d022c0d42
GIT binary patch
literal 515
zcmV+e0{s1nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$y-7qtR9J=WR<TZlP!v5HJ5q-xE`ET)06_;P2mYXw>C%@-;uo;=7wW<<v`M=(
zPW*v0i=-uK`~Vk?Lv?g`4tOb03KukSkdqL~dzX99JNNWGfEF!U{C6DGeZf|Q+&A~|
zF{_>Lh#T1Nx)K2Fkp}=UjqO~xjPJ*Hag6`&v56dVf^0=dd*q?l(P0|d;zY(YfL=$3
zJ@QIb%7d-Ia9|-a9L#Pe001#{lDYJlrdsgF+^h@_*ou(%k57o!K{6IDft5Fbn8t*3
z*U6}&sTQs;&RCvcwcz&hD)Vd_fbJF-FN!ZiCBuH#mA#Ih8B5Dgpf(WRK36O=mU_Te
zgghU5I5~}1O>WN@17byhZQRQ<u$c*2)rLwFQgKQS0C0B|NVmZ>fUqj@H!3|qi8a+q
z6rjId`U2vWYpS(F=tl&oc(e{+8ruR?j7Vv!1=9ecb&$mT8i67V2Uh0Z6f6R?2apo`
zVrb?2Vj2-3iR*&<UL^s4ERuewS4O|{W8@2eELa2@ZA2XW%0>hL8~F;`b>hP)*V`gb
zXsU(zB48`PJ`LxKU1Nny-dGt}9}acScS4h|qZTdx1YeHJsknnsu_*um002ovPDHLk
FV1my*+|U33

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..721476f5923bf6b9095c4e0022d62a06dc7a6e17
GIT binary patch
literal 755
zcmV<P0u23$P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%tw}^dRCt{2nm=#TKp4iKL%`r6uIa$WH{c6&2u$q)*oc9p9^#>u7*KGgsuKfa
zOa_*ANCqP{Y>BEyg#i?U_yQ=53=Aw4kW{Eck@_-}3;Cz`oL+i>-k)SCcc(mg?$N!@
za4*0x48t%C!!QiPFbu;mLlDu_XAn0R(%{_adKMiw7t$*3X7VygYwiKa$IXSbx3fT#
z=B24L(}Ozgc6&@~9syj`5t3(@s2JC9bTmAlBnj5Gs_<+O0HLC@wpG<(NtrVTAU7We
z5dgrluF%ap-$arm`0>T1cW=8&I&Loft@9M0j$gwTO<)%U0Qr1gcy@^zy>e=ZS-GG?
zBn~3@)eu+j7Z3*#T6Kq_+fA~pQ@_Qy1~(U`o=vGEIq7;h>3T?#go<%Zht)B(1mIUg
zyn6Y)|9N{oK#vYk@e2UZUrXcOvqyNmdJ6!CzQ6zChO$Oh&K$tC!^=V%U0!ie@eAnD
zL4SRD#Zl5}9!6q&Js6vp8&}oIN@`81zEwTDL;x^Yr=3m*n@d#!PB%DBO9%lX8q<;E
zQSE66q5i7S7Qo*`mH@Q81O8<=0MiCc!vUB!U>Xj<v;os_0HzI?h66Bdz%(3yX#=L=
z08AS&4F_P_fN3}Y(*{h#0hl&m8V<m;0n=!?9X@Ynxh$EP(R+TCK7m>9^;PxXG#%R8
zS)h#vnD|>+P$~h>E>XDa&J>_d{`4W}yRAwMAWPFitM1J09_^vnz~ZIr{jp^Ue0&}b
zl|!rU(BN1Fr4t~V9I}e*<a6$r{A!3eh+tU)6~BN+uPhq9vheH@wdzj4A3-a!XD6+;
zWn<HM)PAs7o7jsaeP-ET>c7B~_kq}40)@No)Ogd@bs%g1>(38E^GTBQeKvY!Aw)E9
lD`t?V%(M@NVHoCr;TPO8q)j;dI&uI2002ovPDHLkV1h<EQo8^E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cae5a2d0e07843f26f705cb33b5f75ef9da6b348
GIT binary patch
literal 799
zcmV+)1K|9LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%*-1n}RCt{2nm=#TKp4iKL%>jpBvsXRLt>@k8?+HqyAavXp-Vl)1C>IBQfCSq
zLr1$Ay3ipJN+qUBwkif#kgrw004gH`151U73(5czFGFS5NlX)~4HwA!lPuYHr}OhZ
z_iuO)U>JsB7=~dOhG7_nVa5w_Q6&*U2ob&O*$R25j)>Qf8lheQSj9tp%iJLVi0keP
z5kbpXL_~-`zVA~~`6xft66p1-T%^03Ye@#^*$P?v8l;pxb>(IQdbTopL*IwTFY1Hq
z)-o1VOCaC($@l$e^v$UTnNtmV=S`06ObB&VOQ32Aq-89+f6M659gnqV251?J%FPA<
z;8#nBQ}9SiNiQFL#Oz8D%i9}hn$A@W%1|gb8+i6a(Bjf07MCWYa-(h~>P}n&Z{K_c
z0Mv{k0y=?H@L<#}0KnlvD|#PA+HJ!8LJq*WegJsB`T)z@8$In44FJ&LUO*?P8O5lq
zW)yMz^yc8Z>R)7H;!IY%-Mid(*36#MATfw=oopVNVs36ODi1diH?T)CcmN$6U8pmz
zJAO<82?h`mj*pK405dZ)n4X><rd}n)O-MB0e<yChANPQ9felbCKs9WDY5}TY15^u8
z4I7|ZfNIzP)dEz*2B;RG8a6<+0M)Poss*Tq4NxsWHEe)t0je2$1Fm1TgQP^nKTX<f
ztnd5Oor52C=J&Gg;#}DhI6P>j%fSzkyQ|K?I#L;+XDcM7r1-Z}@S<!i08HJuho_>N
zrrT7+|9=sKUgStU1HOOOAf+TdTOl{Fg&WvnXU)X?LJoWDTQKStK4pF=n+0LeN!j5f
zQX6o1(1KI&IyO8vu*Kf`7G_t9X}e2>8`#1rco&YW8`$E*t`()p`;qDta06TDS<vQ@
zDWsIh=krnBm!I!3i}TAB!@}Cv`bK8$Yr-j<>Fn1wRd%>Lx86;7uOQWxv>}rePro=A
dhGCd-;WzyZyv~|JF8%-j002ovPDHLkV1l5oVuSzy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json
new file mode 100644
index 00000000000..5ef8985ec58
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, edited by dvir001 on github",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "plunger"
+    },
+    {
+      "name": "plunger-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..978c7a77800c44f06a1d09dd80e41086bee81923
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_!9ghE&XX
zd)biB(NTcyf#RYo7d>{g39p!Ym{+B0>A9_Q925g5zL@9rsibN7M*kDfYU8)wOfojM
zu4iFjxZtw3UVK85{fp`A%O5}1Tsgh$Z&6)-weGv;7fXcZ=IQ@jtHW+!9Y3$Gy5fdv
ze$h0+h%<|Y8n3FIkIT}WcGa;)>oiAA@V4yF63uSw>RnuRiZKFR1O*TFN-yXV>u<h)
Q>kCN4)78&qol`;+0ILR8Jpcdz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f0183cf19eff87179154a7227b36362b062527
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArY;~
z2@<S}6GVEN0u3%PDqGHy>+1aHE<U;b>nxqkGfrGA`FB3tBKq9frpDIZewpMG<qijS
z=WFbnT30k(=f1JQ1WDGZkvtNC7wmd%Hfu1&XB)^mX(?!Pt>8StXZ9pRV#0&;goK12
j_w9KWLG0jiJJ`U?&?_R=ufmxOavFoDtDnm{r-UW|51Byz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..28077085547e8beadf10913f877dccb4ee550ff5
GIT binary patch
literal 8773
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
P8=$SOr&g$PIq1It+NO38

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..acd074e877c65427d3b8416d8a888156dadf4b3d
GIT binary patch
literal 7007
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
B2VejI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..767ed5b8e494e6e1fe9e5f273312f3d120eb2e70
GIT binary patch
literal 9405
zcmeHNXH=70myUo`rASc(G;~lxLg<m+I|zsr5mF(PBqX5-B1NQ&Q~{+4N)x0AB27W*
z3P@7{=>kd-QIL)k(ChWieDlrRwPya^WTl*Qp8f27p0oFP^PZImGZWpzjK>)P0Kj2=
zJuP#}r`q0&o|f`ni1io+09ZwQEv?DsaBm=ih{s^v&_MDf0vd?+!D0XapP|K68zQgb
z5v}hYk%}4!x|pj2Za7G5=B!%$k%4#{yn}RSd|?|(<R(3fH_NM{@7sR21C}|79wJQ_
z%#A-zobETXpSu0!U5VG|B74`?2IEr6`o;^-uNzFQ!rggKRd240e)kx;!c0&-KGwWM
zdunP&`}=0pX4iNJ3w8C@M5Tbg>R8a+nON_&qu=<lM%<MPZf@^zZPsLdMT$=E%KI`+
z&zA>$C5iY-LvMKFF3q1DP51UbaPj-q<;BZ=E7bC~7dv$yeB43ar+M$>;rqlcX+!FC
z=GdUah41|0DkJluOb%C5Ra66fM_NukcuIYXeR2u&ZHhDle$!X_t#$G8_Lv{n!?l`P
zSAMqM72F*1^z0ejLdd(!)*~e^zqhSz)SW6ps4W4fzjB+-%DPp?RJidhRCMBMyJkzT
z3e#3ynCYvY*siv^>@{%s`>}G4mGWV<!_LaJ?ZdtE)pIIu5Z!gFM)Gd(No;kW4ei6=
z;GW^J<;`g|Kc+7<k1w}GdMXCRqQywQvyw*;YjiP_44+%)Tfx%<35`C_F1&U0+vLmE
z-9i{Dd=c%*;1SHMdhM361PBSQ7K}Qu+NjdL>73wSP8zhGv~Dv+W@Qh3xZBY3LF7KU
zaZ8IB+4oK<VX^v+wm0~>jgY|Rd+CCLCvo=yWkH#|jK^F!&WB6orXV9^AHBEGle(9f
z&{l%Z)QnM_PBVN^&FP>KA)Is}QoOQat}u)jX)OE3+|~WMK98V$2JYP}TknyzS4dOk
zwO&^|^?Ed9Qcv&(LWj@2=A)>RRNu>oFJZ&wOk%~QlLn_t%I92o^4*_4k2$kg_u@gV
zKc@56?bl;<R{~xy=)Qi}o``#yX*1Q6rW#tBosgdvCv{YUySoDr=+!Z3;YQyj=1KYF
zJIBU%KiZ(HqT?9%p%*oe7o9#mL4PtFHKGp?$A1ze=@e|8fjTADIG{dNUE0!ro!gI5
z8cjP?aEP<N)#A##QUlUG{r)R!c^f$_+tRPT_p9BXPN^AFp6%F5soYBIv$pIR{UYzW
z6q~o|cSm`6O*!46FSs}2F)@I)tnaf{LP}+Y*dxxq2Odq%1&X(=_^My0Z%Pc$%xu0(
zt;s!feq6;E<v(zD*sTgyI%{t0-^Ay-oZ}{9oS>2VaQK|&x4tjqMM`5cjM8An;bzvM
zZ|HAHMhGvFy!CF~M5ic4e7~>HBk5|3K8fUSHagvY&FxoMXX@|Rh&|V}T3IM!O4X|v
zWH>jPvsGsIsV}MFlW*~0-fK)$;`U1MP`?!m16|`?aX4Kue8*3d$ME6NP-H~&qd1d%
zr)vPYi4!Eh&gHv`@l{cubF&vc=XLF*1qZA86a0qSXTHv=bXGAvNjl<vk*U_ky5^(@
z=5gMFNu9|}8y?>0+a@SklZB#5sjB67^;wO#A}mCt>v2o1<B~5<bhMRD7;&prSn|8@
zveCQ?E1Bp2B)w$P8^&NJ)c=NEbtNo3h|&2*TB~^Tt!u|Z2U~l$r{UGvEvZ5AM#tva
zv}$`w(g(I;qLeDj!p@laF(wwy!==OvlqX8Wy)pr-^ua{hqXu5G3|_QMaxWFVKw4MA
zDh%g~%WT|Jii(wBA)SRc*<)%m{pGAueepgUWocN}D}xPMg&Y>vFIt+v8r5%6&8hi$
zyX3GFu4|49J=BUgTs$W%7Q)DDJX6S3|Jfg;-FBdJ0<=bR<I!1Oe>NYvJcZ1|Lmczs
z_rriVV7<|(=eH4-u3nu;fcph@4<z+Fk6;IA8JH6r?OV!pFGKixx|3)bB<LfR;qB;G
zmb`S55+GUC^Xi`7<kOR7g)C^c>584>v0Yu&_s2Jh^&zQ7enHyRt#&S{u&c)AAA<#1
z%!@jpg?d&PU#lD3Fo6?ht?dC0gREs6T8J~xx<)H4z^gajL~JyJFKdRnqn-+z(#Ihr
zqclzux>Y=QoD45kr*o=M2^9rI8)-K{oNfziRK7pWs9zf&CCuT8^L<?%VQ9^DlBAdT
zoEdkk-;4Svjankeh4=GhZWGM(J#(pDJKU5>xBDQzXQyGoah6T)^c4X%MJt&T#n};~
zq4W$~9mQL(xulI!PGQt}M#H3ZCBkmZ41H015LW8!dp0iRwAF$YZ%zfrrPyyltEJrL
zQsY->qfhu=JTwa%hoh~<$l5tvTuJ)hpO=1S!MW+o-BTA@$kFOJFBEqSE#8(Qq3zKn
zW|hX{kp(z9Y`NZ9b2}oAv5trIm6huvHrL|Tp=N4bs@@fWDV>M)g1Z6F6gc3|olJYD
z_(KvGt2r$q4}VSEWn|?VPw+-9nOIg;`-LkDi_@T^&eF7_w#l;8o1l@V7&(Jr2$zqS
zxqC+X&4ia)ZBID0haNqm5q(P?X3J9MDS!67LSOL(nZ_$R#1I#e{3P)si_^IhZAR~_
zwB+@B5_}RJ6KwIki7u`xlPR_aW9{!xZpx@$3>2+f@#l;7;|eZD+ieU4gFucKX9rEI
zgQq4eu6pL?(E3~yD|hYQAd-%*$n6FsK`r>2>JEm`Hi|o@%$gnM<j^pRuDQ!M?B0zO
z^T%!Ebg7LLJQOr7d{}$8GyW7(=;QU|qmJ}7g5$mKZ;bQB-3uq56pGt$<H>mbEi34w
zR%`;7Uhr4Pz+_a0uN5in>+-S5RY8{%Q4UibaVzWgjJ=H?q9l>dyPu^F7Mrpe*zyF1
zX0Kik&6j4ag_SGD(A8!XSE<C|me4M8BTQ9V*H5icRiG}YRgI&amExTy7WnRD1%HsQ
zqvt-_5LtsrzNf;$k861Gq@cAeUf<@P*JD&{WsTOO%X~rn3l-PgE9hMAvT1PCId4a5
z7!;;^6qXgxzJM)9=hIhw?o-=3wfNC|mkg2JvhzE$q3inKi>TDXE&z7*-KT0*8IFU3
zRo2zfhdLX051c&s=);%I3EAaJpTixE-AVB+t8FtS$BQzL6$j962Jq2m9<e*m*W1k-
zwc;gRCg9m7nVa3!%5sL~?EqJZYiNrdTg&zBZ=(5DcQhLVsg}^)C1o@g1Jk{U+v~$U
z3nixGjSpoP+dPkd<PgxB_&k#L=tC{ap@@r%H~X5#8Cz99MO2}F1I{uo>^g07^wf$O
zf5x*B+t)!fH&3TavW1ONt=2eF+18q8zWqWlX~8&jS-CoG-rMAD;l$TY@P)ncIAL<#
z{zblv+QTH4kZY{w0qqL}?p;O$HQ>=TWqamBP<_!5xSo36h0tS#QS(rt9@D3qgaP$Z
zJs#!U;&umRow(;pUQIo6MN|Ui(=Ql1Ma_>+3@lrmi#DWt_R&6s)?f$8xxR2E;w}GS
zXf&yK3iY0(Oz#omddN}|MikDxkrTBtj=Ekc22Yuo-?1*2kpE~4)h>PO*iG<p2C8im
zj-OCDsjhjwR=}x$c44jMW9A&wB03Kn&PK}N3Nd-q+fW;tTlUqt%r$D@Mg2q~Os=mB
zPVglk%)4|_^EIYD{=6sJ6Ri}+s$&~V9Ts?)*MR`%zh#EcjvAWd)|EHe&1znksqlZr
ztc>5<t?icna8IM*#0zhFjZUU~`!FXisSFRDXjHNo^PQ!Yq1HQ&!ecl)^KxMyQ)wq9
z*#+UuxwvM-1(D3Fk<D|#h`x^U>*|^rFoaS#bG0Fywte~eI~%vnoBZ*9%yQGtQA6mN
z?62mvMG4nPn*s^UoPpO$P3d?$73&^nd-4`bOu*7bn00B>P`vH^>ePYZIaJbC7I7oI
zww{BYTQux9#JOWI9tG^wr|oe}_vxRPirdN=s=Ng$4BxB?J&EgvvaU=ye#Ytu1vSLK
zvvaUEt1JQDNy{K6bDvbxy(2D8Jdik_2!5uTNc-I9Rz6DLM9xHPQL7IM5~!aeY@YL~
zn~nXHWOs$&@Uxitx^w5=J4<8D`%w|@<r7ctVgdo>)iHc;+>Wt%e#rBFtlV0~{=n@%
zHR*BIkN~7%@|6xxBY4PmB{e56Ec?jR6P~*RXIPwUFTTp)4^N@wNGh{!M_ov5a@^qx
z1SxXHN}SpB+z@OAbmBM%29dXzIrX|g^})^v!|CT4$2$biw=vdCo^0euxI0Wgay90I
zf7X1^@j92CDUQ%u{MVU*I&En$%P}1~s?mBAC6Od2e)Ms#v3z5BE$ds=@1)~3d6H#6
zWKN!doP*Wtb>!Jmsg*(-cy_y*1o@MNo)+k2oi-#iCE9>D9vhNzt6^4+Z8sa2c7>EK
z-iwo-5`7<@VU<sYEnLlJ$jTADStQ}q-1gWjS41M44LhiuU8|4|YZnY-g|4wN1*nyN
z8tipv-%51u;0YG}HrmNkz2iU3GboELl;b#gitW9wtV^a7Bq1qY>Xi0j=r}g?l;t+n
zI(uxgNe}SZYfK8m?N8zok;gf2%^ecFSalXT>ag_cnIU1uJMDwqaS{5+x#PB(7YLW^
zA@pU%=Y%?xWSIB{04l95EE}7CP~eK}jU(lJKxWO1hh_>{i|bipy^DPUHn!oeEp|0@
z+AJZ>Q?Oox)rQP$j;R9?rw%*rDt>UcTIRNN<Zn>OtxM%29NH>>@v2?@CQ!A9uI!Ks
zCS9SRGvG#Af70F5_laFW-HHdfMdo9V<wnqyhr!GbHEfDpG8<eN@M;qt7=GDJiq2o0
z;>c1lrZzF1YR#WZWDpQ>4SBp!cWpC2I_XqnjI)IM!QCfe5_#-7VCqtiz#jOFk}=25
zv4dcXycXqdUouZRhh!aZ^kO6}i&@9@@>gdsm0p5h%VJZ^88Tpp%qzbdg5oYTn>HuB
z0?jRbg+(RLknieQwG#PGPj@cnv%nq8!-Z0nOLKEjJg|Gc6B#FjG4~EN1;yZWE*ofM
z!nthq9gNb{ub+w%nf9N<(_O4q8A*h7YwOy7n3;1A7Uu}p3+V4~mpuhH(1{boeKrsx
z+>yWoyQ$e-*as(~-D++Q*h`&TcakXmP-w=K54We~5)`P9dzd%I;mrq@=QC_iq^Ez(
zZ!Ktl0f`PQV#cKG@=C;`U7I>!<I1zCLu<Fz#!W;zKbBl+ihqfgr=x<-G3tv-B|X-s
z53llZt*1Nd<-hV3eUxt&Kn)~xm-Poo`)SF<9b@GM1)q6vXGJn?PA*`EMX8?u1kn5R
zokGh{S@{aMZ@MVR=Wqlnx1&BkX7T>20h>kcSE^Mr1}?-sl4QdfRD2!$jF5G}m<Q9?
z1!~FF`GVGN7G=iDdS9JbJO~(Dc=cmkoPnER-h4{nXU{-t|5N@745x7yTinw{XyW6d
z0r%SbrMa=;m22Iw{4qs{+Y!~&`<HxA-64Hsp-E&#heh0@5`NU@d)A&^GJiMKwt!vy
zcG=_$)H(9aP`~@o{AC!_sz+Bf=9#^2T#85StKpVPmgiy{^Kre(XS25-p4{Tya5Sd>
zpt#OV&nY`fCeob`nxT#Da0wlm_Ynl#RebGnaQ-Hh?K4MpQM;`fE|YFVQh_vYbRS2+
zJeaeu)?$bL)R_S+T`;TT{k4><pznooXqtu5fCKR3CNx<uQ{(`E1J|&cnr8Z%ntz-a
zP|gX`{Nt4Mo~!XTJ6ITMpJMi6^=LComk5vKxNtX8yVPumu^5(eVe_Ez@pz7-x{a0N
z<E@B+#%7!Ibm!Gsw*ekr1aorSk?+YIwoN{ScQ?G(PIxZ??%1FU2c-|>-$LJI_mE0<
z;JjMG3JC!qQj$^%M5Uu_d}2!c*4KTHPTP#m?(*&!G@=4cg))#ea5g+^x0@|&)_)Rm
z+K_Qsarv?OQK2jEYZkun%*H>b>ORCXxT55dVlClW_O7|eEx)O+iA{Sz%%QEih%h=?
zWHn#pZ@T-;Ox>=XkUm3y#9HHsczEnt-Gk?>!+Q(k5CX<q9xUHWr%dAvMb00L=4HxP
zzxIB;@%y-U6~@D**O;+6s3FQdAeyStK5L+KaS1t$O9$*ajT_9byBY((>HFs7XvYKw
zxsOlQ<h1)WOfy4P?iz-^*Sm5{ql~^Tvqye9sL?J9-?>;^f1{5MXlM@_1JH#vSVxq<
zQ63!`9vOb>G_<n=0JIawM<-XR005RWEaeEt+Smw&#JfwvQFsJe(#M@ZIpP5TlvI5P
zaHK1m3`C%vusCIbrP`+gKrBjG;JmCc#F(IocE;-Y644gECYDHFSEM3JKvjiN$p=Ou
za7UBjKp%HE90}&5EU?cDqkP}%1`7c9A!Ju&0c&G3peCM(2FggvNJ2o`K3FfPfC?i}
ziHO3$%(ZlWQczmT0?uSI0R{$pdwWZIOH1O3PGBiTMMW?K3Wh>K6a<KL2}g$efN&(i
zJ&GS3T4)lIh$WD*cpPw#6OO=pl9dGnDC5AN<djjQwhyKAr-QxrK0S$y0_#&6GL-pH
z0AMHtq5y(GK~P2T@Ai~YW8+`eIMPoQDSCo^-~_OgBn0g4{uc`pS=;MRfB({gWJx(m
z1Dm5scuyh{t?h-zkp+KuN^tWe{qEC~gx>4gkJ}A}0aJq7_x!t!uD-F^FPl9Xov`kN
zeTzNx??@E#7mnabblb<EkYKbM+MN;ziNY-P7d#n@`E!B(GM~MX{}Kqr-7o&Xp#RWo
zKbC!6VOn^k=blr2EoFhdcws0!5{rWEe?`m7!_f*DX%JLi3JsEx#UMZm2q`I$w4#h6
zL>8%_h=N0YqteHb$Z#AIy+=hMm&8(dkZ>plA}@^u$wM(HkPI3D1u4qGr9o0qX&DR}
zDvd%wP`^=_60wv@fV=%3)gBd!LM4lU$}2)3G9W3Gj4Vh-K?Va-fFl$@GSYA)R0fT~
zNXh-6+FJ*hx|zPR095iveEU6SZg4UNPjsi07Z!)Ydz1G4?hjdF-O(0g_?~Q1@(=}i
zIT<-wIRzO71v#ldK~`uYiIV1ftWpq3D0F`Wg@ox)IN_9Z!@9$r&|m`2X@6jEVPKT$
zP^5+LRR@K6zn?N2m?jYoC*z5hc)Xjkz+M2rJ<9!}0xJD17nl(qxo@}+Mx*vB?q|(u
zz@5PRO(pQZ1OFE$3unAH?tjPgC-fJKI+5&+C%T#vO%X0=B>CU-{44M;CUeSeM<Nq1
z>HiOt`cF8e9|@~RvBeWF{pQ~S?eU}aV@q<w?n?y(?r#GyIP!=5B)Av)M}AOr{4s=d
zhU1*jl>PQ+vHj7H{TGQWry!>Y$DkEKvI^3a?1Lj^L6q8%1IfxrBM|Zs87KzxBiDYh
zlkga_H=Kx8ccSC~Wt}O-wZG0lv7h-TzMl}k@ZQeoz2t&GW%f5g8A~ZCm@EV)D<|+{
zwSh|Dy&d+C*(&YrLB__g-}O-1+oNFmdx>b_Ng%jk(Zs*%^he(OH@M&If9B}_Wd1ws
zhqWf2aEVgI&SX<>+`o1IFMvN7jIc;Fj)ebrq5lr~A<J(UB1+6Z`Y0DT%JmZb>w@_+
zODKx}e?ER@-~XozAn+e2e@owg<oZXhzoo$60{@d;|H$>X6!=@<f3oZUOfJShZ@JMp
z%I`jJ$_+K4_e3}4W}FsbsH+9g*n2|i+O;S>3<NzJ5&*!&zV|u+xRrK{(n&|wH`b>6
zKy{2Bs&J$`n;rn58q?QOx1{_VW5`r50nSVJdC9;fIrRjGoCEKZNIPlnffm%IUL%IN
z+_38*-!wD=yyjw)j}+!;Y1R$id6eaPCL}Hx0oLa~BrDf~iAol+Mb*>rMdoSNgG&q^
zy{Rve-Sju{%UrzlXe_fnd5nowgPuR+#~UJ?RyVLx=u6QZr|3nO?~-dDE4!mLZ&X$f
zF1~PoEJI>SJ$t&`L;XBt@Nom}2KTD3Pk!dLt_&Gr{&N_Nykh#Z`^hC|9UeNod9oZK
zQ&h~n3KKn#L@)ZI$$(ZqI3QNM?XAN4L6xU;@=F=uYNm3Jpw1%yz!%u(pUqUM1CuVF
z(8ls{_8jnfz&tiB0LZF($k#6JZx2z4)4@BP0W?fk1kLgmMa&)m#9JQV%PQ`F|4x8v
z<Z`=x>~*G>Lvsz3CiI|<z5GLJ3Csx1NGEUFH`~W)a!p6FH%Fflhsyg@?rj3h#IA(&
zUA+I~%KCchJp?ZJ{ydMuKu@@}M$-hfEC7%>Mh#f-)?cseN_=`ljtxVDx1|#spedF0
zQSy=e^!A|L+V=w2-H$YBXV~6VSh;-mYwtgqQ=C1RB=l3mJvC#W>TpNRr!$@xLLVy}
z7$ByNRI|b-a`<wE_<4?6Yjz)V)qnp&rFLO3EB*fPBe`SC0*dLu-Aj#aAE41j8gi1Q
zaXsh@?zU=E*LUL?5iV4by)ashVd_KVuc4yq45PDaK#JCmO?Kw$UgqE2%;IlKOiH{}
z({t>6)IA50InMlyb9r*No}-I=smE_I;!Y!7&4zm>H$8(<TKXH$2hDAM>N|Jv;h|T3
zHYY*7iVQsj*3{tWjRK|7%OC-8{qXAAa@tjU#gVFlF9zAt2e}oik54Wr31QpI^Z2qB
zY4oWO3~nx-$$g=^XxfrjRw_4HCvY=>?aR#YMT?|Q<A)amiwAly^03trKdnajyHIgV
ozvMlQv&LEx8TdoCZ(IQ!CF&V)ULK63WIsS(+eGVuhGX!50Cu^nr~m)}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e54e8fa2cc8b2349e1fde514b18adc25af9a78aa
GIT binary patch
literal 9434
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%0D#hK=RV+xRaP1On3l{<
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
AEdT%j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json
new file mode 100644
index 00000000000..98181d3ead3
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, and belt equip sprites by RiceMar1244 | edited for sawn-off version by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..421fb6015216f65a98b842889637fc99ea37faed
GIT binary patch
literal 4994
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..5194385cf00737e1fea3338c749cb69005f2470d
GIT binary patch
literal 4766
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff8892bdaf3802aa0f974271368dc6842e0b9b6c
GIT binary patch
literal 1294
zcmV+p1@ZccP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKcqz}3RX~Y$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0B^I(6vH0_6xGzz
ziMWu<uL^-z_%Vb51Ti8qLrZ2Bvv3_>_wexbF3Pjq&;2?2<buHfk3bw_nr;$r5YKL!
z8s~lDFe{5P@j3CNP8TG8<htbW8|RYEUY;4&v*~%_FtJeTVyTN+SyzZ>h$FJ1Qoc9m
zu*`Xjvr?_I_C5IvLj`pu!*!ZtNMH#`q#!^-9TikzB1)@Dih(rk$6frRwm(HKiCh&h
zax9<*1)}W-|AXJ%8pY`;Cn*#MdR{E+V;l(V0<DH+eIHv^>jdyU16OLtUuyz$pQJZB
zTI2}m-v%zOJDRiyT<!qFPnxKUw&bJfEf#_IGy0}HFn9~}t~tH6_i_3FWT~s=8{ps&
zm?%;9y34zR-M#&LrrqBUcFc09Oe+qI00006VoOIv089W(08C=4cPIb=010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=mZrIGZ`qNT%rH~0}Dw+K~#9!?V7(!8(|p7zjrA&
zydgoon>?FqhMOdk4xxyGSS5ofl>QlUXiMqn<mlw$KT_$?P7V%-L4{H}SdbJIDv3%Y
zS3HPs2T7V#ll$R&=cPWMEg{_dKHulZ1-=hJ5ClOG!dP5f<b(8V`LQQV7M-D^N+q<*
z9#tyBt3ap#ySuv>GmOv#7&8o%%jI}hK&hbfSGp8xxn_Rt;q}u*JOxmh0sz?D+?2xZ
z+fqU2u@YcyVVolZR4oOSDNvb$m6<G$g#hbIx%Ndic8){O{`cx{q>~KkBoiXMEGqcb
zt;5iRx0)H$^$BdrSttn^N<!|sL!<(99{l0cHwh6kKR1gn+z`@&a?qZ4n%8ie*Ld^s
zYgh2aVlmWtU|AO4zI!hL=sG*-Oz@q#&V%kMdsAclplXLw5vIm?(bVwypo-2j))vNj
zy<wwfJHF?TuL>v?bY8O^)NH3`&xaL!>)HD!mnfPVOpOU?!9Xn##kB9mcI8|e8Dh7-
zk75YNf+=H|FHdIT^+)KTgm}~f<VRCob08>B1}*T@#ufHYKoA5$5ClOG1VIo{5T@_{
zkawm10I!OM>HCYu&mMs%0m|iasJ_2w{Ol2UZUM(}VjXm;pz|Q^(0?%lR%WtXWeRGx
z<J%(hB*3%^yh!}?l!d5+Ut1XG>Ew-3vaxe4t!^Dk&znCmtqKw#pYvuvi&|Ll!}?N=
zD~X#B?sA5_++FrEQ0n>wtY)Tf7J$ENGErsTX<h@k?G3i}2)qn#+3oc=KQ{}@vRpHt
zPO`}Sxs{nLuQzM}xMk0`MX)T)&&|5N4qYpt<;C|ZK>(;X?8ufRI$O={%zk(GjHxlc
zJelEl*--0CIey<2l`vj+{q7tncu_{AC;`0uuH_=TiQw7-BSQ?^mGjtm?_PHkdhHSX
zOJ8&JplVBJ7dD?VhWX29LxEOM9*QYrn4ewPt{W?|+e6~;XXm~`1gZd2V>~~aYJVQo
z6_osF3a5>$o{L+3TVVg>62OfoKWNY%0YMN1K@e{I0fUf6$Y4cg`Tzg`07*qoM6N<$
Ef_#inZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff8892bdaf3802aa0f974271368dc6842e0b9b6c
GIT binary patch
literal 1294
zcmV+p1@ZccP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKcqz}3RX~Y$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0B^I(6vH0_6xGzz
ziMWu<uL^-z_%Vb51Ti8qLrZ2Bvv3_>_wexbF3Pjq&;2?2<buHfk3bw_nr;$r5YKL!
z8s~lDFe{5P@j3CNP8TG8<htbW8|RYEUY;4&v*~%_FtJeTVyTN+SyzZ>h$FJ1Qoc9m
zu*`Xjvr?_I_C5IvLj`pu!*!ZtNMH#`q#!^-9TikzB1)@Dih(rk$6frRwm(HKiCh&h
zax9<*1)}W-|AXJ%8pY`;Cn*#MdR{E+V;l(V0<DH+eIHv^>jdyU16OLtUuyz$pQJZB
zTI2}m-v%zOJDRiyT<!qFPnxKUw&bJfEf#_IGy0}HFn9~}t~tH6_i_3FWT~s=8{ps&
zm?%;9y34zR-M#&LrrqBUcFc09Oe+qI00006VoOIv089W(08C=4cPIb=010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=mZrIGZ`qNT%rH~0}Dw+K~#9!?V7(!8(|p7zjrA&
zydgoon>?FqhMOdk4xxyGSS5ofl>QlUXiMqn<mlw$KT_$?P7V%-L4{H}SdbJIDv3%Y
zS3HPs2T7V#ll$R&=cPWMEg{_dKHulZ1-=hJ5ClOG!dP5f<b(8V`LQQV7M-D^N+q<*
z9#tyBt3ap#ySuv>GmOv#7&8o%%jI}hK&hbfSGp8xxn_Rt;q}u*JOxmh0sz?D+?2xZ
z+fqU2u@YcyVVolZR4oOSDNvb$m6<G$g#hbIx%Ndic8){O{`cx{q>~KkBoiXMEGqcb
zt;5iRx0)H$^$BdrSttn^N<!|sL!<(99{l0cHwh6kKR1gn+z`@&a?qZ4n%8ie*Ld^s
zYgh2aVlmWtU|AO4zI!hL=sG*-Oz@q#&V%kMdsAclplXLw5vIm?(bVwypo-2j))vNj
zy<wwfJHF?TuL>v?bY8O^)NH3`&xaL!>)HD!mnfPVOpOU?!9Xn##kB9mcI8|e8Dh7-
zk75YNf+=H|FHdIT^+)KTgm}~f<VRCob08>B1}*T@#ufHYKoA5$5ClOG1VIo{5T@_{
zkawm10I!OM>HCYu&mMs%0m|iasJ_2w{Ol2UZUM(}VjXm;pz|Q^(0?%lR%WtXWeRGx
z<J%(hB*3%^yh!}?l!d5+Ut1XG>Ew-3vaxe4t!^Dk&znCmtqKw#pYvuvi&|Ll!}?N=
zD~X#B?sA5_++FrEQ0n>wtY)Tf7J$ENGErsTX<h@k?G3i}2)qn#+3oc=KQ{}@vRpHt
zPO`}Sxs{nLuQzM}xMk0`MX)T)&&|5N4qYpt<;C|ZK>(;X?8ufRI$O={%zk(GjHxlc
zJelEl*--0CIey<2l`vj+{q7tncu_{AC;`0uuH_=TiQw7-BSQ?^mGjtm?_PHkdhHSX
zOJ8&JplVBJ7dD?VhWX29LxEOM9*QYrn4ewPt{W?|+e6~;XXm~`1gZd2V>~~aYJVQo
z6_osF3a5>$o{L+3TVVg>62OfoKWNY%0YMN1K@e{I0fUf6$Y4cg`Tzg`07*qoM6N<$
Ef_#inZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..417daab40097d97eec4904a371721b0827b12fc9
GIT binary patch
literal 4826
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
VP=9B(vl>(=B$dn(ADFf<<3D$K6$AhP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aec54fe893c9aeb89d8019e40e9afb048bdd4c0
GIT binary patch
literal 4800
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
new file mode 100644
index 00000000000..f0146e82a56
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f41af6b0c46e05b246dd67d3ff7de5d00ec9cdec
GIT binary patch
literal 7348
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
aACdB6>nhQUO-sQfg4k_vB9vPB?)evOKa5=f

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcae7fa8f04e142287c516628e671d90aab8f93e
GIT binary patch
literal 7293
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
S=m?lJ5DSy7#`%UWA^!qY4~|R#

literal 0
HcmV?d00001


From 5acb3319e7277a4d212389bc17757c65ecdd74dc Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:56:22 +0000
Subject: [PATCH 52/64] Automatic Changelog Update (#1509)

---
 Resources/Changelog/Changelog.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 651ea5d7c85..06a28cad922 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10154,3 +10154,26 @@ Entries:
   id: 6713
   time: '2025-01-17T03:52:28.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1558
+- author: sleepyyapril
+  changes:
+    - type: Add
+      message: 'Changed the Warden suit''s capabilities. (Original author: Stop-Signs)'
+    - type: Add
+      message: Repeater, Argenti, and 45 magnum rubber box to Bartender's loadout.
+    - type: Add
+      message: 'Red cloak to loadout (Port from Floof PR #390)'
+    - type: Add
+      message: 'Witch Robes to loadout (Port from Floof PR #390)'
+    - type: Add
+      message: 'Sawed-off PKA (Port from Floof PR #390)'
+    - type: Add
+      message: The ChemMaster now has 20, 75, and 80 unit options available.
+    - type: Tweak
+      message: Made the ChemMaster wider.
+    - type: Fix
+      message: Ported Frontier fix to mag visuals on specific guns.
+    - type: Fix
+      message: Fixed heirlooms flickering negative mood when the moodlet ended.
+  id: 6714
+  time: '2025-01-17T03:53:49.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1509

From 00064a68d3f630e573be70ee1d70b3df72c9e86c Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 12:55:26 +0800
Subject: [PATCH 53/64] IPC Facial Hair (#1575)

# Description

Adds Facial Hair to IPCs. They already have hair and human-like heads
like the Zenghu, Ward-Takahashi and Bishop Cybernetics heads, so I think
it makes sense to give them facial hair too.

## Media

![ipcfh2](https://github.com/user-attachments/assets/e2e46150-f7b6-4fe6-ab91-2bf88de81cdd)

![ipcfh1](https://github.com/user-attachments/assets/05c9663f-764e-4bec-af3f-f6fb4292314a)



## Changelog

:cl: Skubman
- add: IPCs can now wear Facial Hair.
---
 Resources/Prototypes/Species/ipc.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml
index c4361d65f36..febabce4aab 100644
--- a/Resources/Prototypes/Species/ipc.yml
+++ b/Resources/Prototypes/Species/ipc.yml
@@ -34,6 +34,7 @@
     HeadSide: MobHumanoidAnyMarking
     Tail: MobHumanoidAnyMarking
     Hair: MobHumanoidMarkingMatchSkin
+    FacialHair: MobHumanoidMarkingMatchSkin
     Chest: MobIPCTorso
     LArm: MobIPCLArm
     RArm: MobIPCRArm

From 58edabd15dec4e226e2640619ecf08d3e65f36ba Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 04:55:52 +0000
Subject: [PATCH 54/64] Automatic Changelog Update (#1575)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 06a28cad922..73b1a700ea0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10177,3 +10177,10 @@ Entries:
   id: 6714
   time: '2025-01-17T03:53:49.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1509
+- author: Skubman
+  changes:
+    - type: Add
+      message: IPCs can now wear Facial Hair.
+  id: 6715
+  time: '2025-01-17T04:55:26.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1575

From e29ee867c7d4e3884944fb32182faa6e0dbaad29 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:54:00 -0400
Subject: [PATCH 55/64] Remove All Usages of DepartmentTimeRequirement (#1576)

title
---
 .../Entities/Markers/Spawners/ghost_roles.yml     | 12 ++++++------
 .../DeltaV/Entities/Mobs/NPCs/familiars.yml       |  4 ++--
 .../Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml |  4 ++--
 .../Jobs/Command/administrative_assistant.yml     | 15 ++++++---------
 .../DeltaV/Roles/Jobs/Medical/medical_borg.yml    |  2 +-
 .../DeltaV/Roles/Jobs/Security/brigmedic.yml      |  4 ++--
 .../Entities/Markers/Spawners/ghost_roles.yml     |  4 ++--
 .../Roles/Jobs/Epistemics/forensicmantis.yml      |  2 +-
 .../Roles/Jobs/Security/prisonguard.yml           |  2 +-
 .../Roles/Jobs/Wildcards/gladiator.yml            |  2 +-
 .../Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml |  2 +-
 .../Roles/Jobs/Command/blueshield_officer.yml     |  6 +++---
 .../Jobs/Command/nanotrasen_representative.yml    |  2 +-
 13 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
index 4bcca6ca675..6e9913aa116 100644
--- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
@@ -30,15 +30,15 @@
     requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this.
     - !type:CharacterOverallTimeRequirement
       min: 259200 # 72 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
-      time: 40000 # 11.1 hours
-    - !type:DepartmentTimeRequirement
+      min: 40000 # 11.1 hours
+    - !type:CharacterDepartmentTimeRequirement
       department: Civilian
-      time: 40000 # 11.1 hours
-    - !type:DepartmentTimeRequirement
+      min: 40000 # 11.1 hours
+    - !type:CharacterDepartmentTimeRequirement
       department: Command
-      time: 40000 # 11.1 hours
+      min: 40000 # 11.1 hours
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateListener
   - type: Sprite
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index dcce764af2f..30b9ef682d8 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -126,9 +126,9 @@
     allowMovement: true
     allowSpeech: true
     requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
-      time: 14400 # 4 hours
+      min: 14400 # 4 hours
 
 - type: entity
   parent: WelderExperimental
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
index 2d1a1d72c48..0e457fd3720 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -32,9 +32,9 @@
     name: "Laika"
     description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders."
     requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
-      time: 14400 # DeltaV - 4 hours
+      min: 14400 # DeltaV - 4 hours
   - type: GhostTakeoverAvailable
   - type: InteractionPopup
     successChance: 1
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
index 1483d646605..d07a1b44979 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
@@ -4,25 +4,22 @@
   description: job-description-admin-assistant
   playTimeTracker: JobAdminAssistant
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 10800 # 3 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Logistics
       min: 10800 # 3 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 10800 # 3 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Civilian
       min: 10800 # 3 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 10800 # 3 hours
-    - !type:DepartmentTimeRequirement
-      department: Justice
-      min: 10800 # 3 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 10800 # 3 hours
   startingGear: AdminAssistantGear
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml
index 18a4bbf3152..4c48ffd3761 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml
@@ -7,7 +7,7 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 216000 #60 hrs
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 21600 #6 hrs
   canBeAntag: false
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
index 44f32ffc8d7..802ef248f2c 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -4,10 +4,10 @@
   description: job-description-brigmedic
   playTimeTracker: JobBrigmedic
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 21600 # 6 hrs
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 18000 # 4 hrs
   startingGear: CorpsmanGear
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 3cc6d1e35e6..62b0e15b2cf 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -104,9 +104,9 @@
     requirements:
     - !type:CharacterOverallTimeRequirement
       min: 172800 # DeltaV - 48 hours
-    - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
+    - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement
       department: Security
-      time: 36000 # DeltaV - 10 hours
+      min: 36000 # DeltaV - 10 hours
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 9c07338690c..6a143a78b11 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 18000
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
       min: 3600
     - !type:CharacterLogicOrRequirement
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
index fec6ac685ed..b82178a936f 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 18000
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 14400
   startingGear: PrisonGuardGear
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
index 79ae853f9f1..b2d54651e47 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
@@ -11,7 +11,7 @@
   setPreference: true
 #  whitelistRequired: true
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 21600
   special:
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index 4f5551a2b3e..e892a480413 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -10,7 +10,7 @@
   icon: "JobIconPrisoner"
   supervisors: job-supervisors-security
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 21600
   special:
diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml
index 84a5907c5bc..19a75105bdf 100644
--- a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml
+++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml
@@ -4,13 +4,13 @@
   description: "Act as a bodyguard and advisor for Command and CentCom VIPs."
   playTimeTracker: JobBlueshieldOfficer
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Command
       min: 54000 # 15 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 54000 # 15 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 54000 # 15 hours
   weight: 20
diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml
index 47e31e43174..290a73e392c 100644
--- a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml
+++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml
@@ -4,7 +4,7 @@
   description: "Represent NT, send reports back to them on the station's situation, inform the heads of anything CentCom orders them to do."
   playTimeTracker: JobNanotrasenRepresentative
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Command
       min: 54000 # 15 hours
   weight: 20

From 5990b03d0169cf92560e25afb8b540ae0b71fe6d Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 17 Jan 2025 01:07:46 -0500
Subject: [PATCH 56/64] Make Loadout Firearms Comply With Space Law (#1522)

# Description

Just because I can. I've added requirements to every firearm available
in Loadouts, and added a minimum character age requirement to them in
order to make them consistent with Space Law(Biesel Republic Law).

# Changelog

:cl:
- add: In order to comply with Biesel Republic laws governing firearm
ownership, all firearms now require that a person be 21 years of age or
older to purchase.
---
 .../Systems/CharacterRequirements.Profile.cs  |  6 +-
 .../Loadouts/Jobs/Command/captain.yml         |  4 +
 .../Loadouts/Jobs/Security/headOfSecurity.yml | 10 +++
 .../Loadouts/Jobs/Security/uncategorized.yml  | 84 +++++++++++++++++++
 .../Loadouts/Jobs/Service/bartender.yml       |  8 ++
 5 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
index d250b46b1a8..2ba8bfb2f92 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
@@ -25,8 +25,8 @@ public sealed partial class CharacterAgeRequirement : CharacterRequirement
     [DataField(required: true)]
     public int Min;
 
-    [DataField(required: true)]
-    public int Max;
+    [DataField]
+    public int Max = 2147483647;
 
     public override bool IsValid(
         JobPrototype job,
@@ -402,4 +402,4 @@ public override bool IsValid(
 
         return count < group.MaxItems;
     }
-}
\ No newline at end of file
+}
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index 02ed0324e3b..6def6a9ed37 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -166,6 +166,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Captain
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponAntiqueLaser
 
@@ -180,6 +182,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Captain
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPulsePistolCaptain
 
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
index e918615e4c8..84e30a33028 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
@@ -20,6 +20,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPulsePistolHoS
 
@@ -34,6 +36,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponSubMachineGunWt550HoS
 
@@ -62,6 +66,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponSubMachineGunC20rHoS
 
@@ -76,6 +82,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponShotgunBulldogHoS
 
@@ -104,6 +112,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponEnergyGunMultiphase
 
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml
index d96662571e4..73bb1b571b6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml
@@ -130,6 +130,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazinePistol
 
@@ -146,6 +148,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazinePistol
 
@@ -159,6 +163,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazinePistolRubber
 
@@ -172,6 +178,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazinePistolRubber
 
@@ -189,6 +197,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderMagnum
 
@@ -206,6 +216,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderMagnum
 
@@ -220,6 +232,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderMagnumRubber
 
@@ -234,6 +248,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderMagnumRubber
 
@@ -251,6 +267,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazineMagnum
 
@@ -268,6 +286,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazineMagnumRubber
 
@@ -285,6 +305,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazineMagnum
 
@@ -302,6 +324,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazineMagnumRubber
 
@@ -319,6 +343,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderRifleHeavy
 
@@ -336,6 +362,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderRifleHeavy
 
@@ -350,6 +378,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderRifleHeavyRubber
 
@@ -364,6 +394,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - SpeedLoaderRifleHeavyRubber
 
@@ -401,6 +433,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolMk58Security
 
@@ -416,6 +450,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolMk58SecurityNonlethal
 
@@ -434,6 +470,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverInspectorSecurity
 
@@ -449,6 +487,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverInspectorNonLethalSecurity
 
@@ -467,6 +507,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverDeckardSecurity
 
@@ -482,6 +524,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverDeckardNonLethalSecurity
 
@@ -500,6 +544,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolN1984Security
 
@@ -515,6 +561,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolN1984SecurityNonLethal
 
@@ -533,6 +581,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolViperSecurity
 
@@ -548,6 +598,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolViperSecurityNonLethal
 
@@ -566,6 +618,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolViperWoodSecurity
 
@@ -605,6 +659,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponLaserSvalinn
 
@@ -623,6 +679,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponEnergyGunMiniSecurity
 
@@ -641,6 +699,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponEnergyGunPistolSecurity
 
@@ -659,6 +719,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolPollockSecurity
 
@@ -674,6 +736,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponPistolPollockNonlethalSecurity
 
@@ -692,6 +756,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverSnubSecurity
 
@@ -707,6 +773,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverSnubNonlethalSecurity
 
@@ -725,6 +793,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverK38MasterSecurity
 
@@ -740,6 +810,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverK38MasterNonlethalSecurity
 
@@ -758,6 +830,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverFitzSecurity
 
@@ -773,6 +847,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverFitzNonlethalSecurity
 
@@ -791,6 +867,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverPythonSecurity
 
@@ -806,6 +884,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverPythonNonlethalSecurity
 
@@ -824,6 +904,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverArgentiSecurity
 
@@ -839,6 +921,8 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverArgentiNonLethalSecurity
 
diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
index d5525f333db..c647b02a3a1 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
@@ -17,6 +17,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - BoxBeanbag
 
@@ -31,6 +33,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazineBoxLightRifleRubber
 
@@ -45,6 +49,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponShotgunDoubleBarreledRubber
 
@@ -59,6 +65,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponSniperMosinRubber
 

From 5d1dbe403658f969f24b91c211d6a2e40fb35a7c Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 14:08:10 +0800
Subject: [PATCH 57/64] Alternative Bunny Ears (#1577)

# Description

Adds an alternative set of Bunny Ears and Bunny Tail markings for humans
as part of the Kemonomimi markings set, which comes from the bunny ears
item.

## Media


![SirinaBunny](https://github.com/user-attachments/assets/2c024ab0-ca8e-46e2-ab13-7bb71042786e)


![BunnyGirlEars](https://github.com/user-attachments/assets/9402700a-a7bd-4874-b505-8ddbdc6f51c9)


![image](https://github.com/user-attachments/assets/d73f0528-c625-4848-b1da-7f7085accd07)


![image](https://github.com/user-attachments/assets/a93f5424-5155-48d7-933c-c13693bcbc5b)


## Changelog

:cl: Skubman
add: Humans have received alternative bunny ears and bunny tail markings
that look the same as the bunny ears from the AutoDrobe, but
color-customizable.
---
 .../en-US/markings/Kemonomimi_tails.ftl       |   3 +++
 .../Locale/en-US/markings/kemonomimi_ears.ftl |   3 +++
 .../Markings/kemonomimi_ears.yml              |  18 +++++++++++++++-
 .../Markings/kemonomimi_tails.yml             |  20 +++++++++++++++++-
 .../kemonomimi-ears.rsi/bunnyearsalt.png      | Bin 0 -> 241 bytes
 .../kemonomimi-ears.rsi/meta.json             |   6 +++++-
 .../kemonomimi-tails.rsi/bunnytailalt.png     | Bin 0 -> 135 bytes
 .../kemonomimi-tails.rsi/meta.json            |   6 +++++-
 8 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/bunnyearsalt.png
 create mode 100644 Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/bunnytailalt.png

diff --git a/Resources/Locale/en-US/markings/Kemonomimi_tails.ftl b/Resources/Locale/en-US/markings/Kemonomimi_tails.ftl
index 039aa699e01..69b5fad58c0 100644
--- a/Resources/Locale/en-US/markings/Kemonomimi_tails.ftl
+++ b/Resources/Locale/en-US/markings/Kemonomimi_tails.ftl
@@ -1,6 +1,9 @@
 marking-BunnyTail = Bunny Tail
 marking-BunnyTail-bunnytail = Tail
 
+marking-BunnyTailAlt = Bunny Tail, Alternative
+marking-BunnyTailAlt-bunnytailalt = Bunny Tail, Alternative
+
 marking-DobleFur = Doble Tail
 marking-DobleFur-doblefurtailtone1 = Outer
 marking-DobleFur-doblefurtailtone2 = Inner
diff --git a/Resources/Locale/en-US/markings/kemonomimi_ears.ftl b/Resources/Locale/en-US/markings/kemonomimi_ears.ftl
index e4b0d631e7e..c3b98dbc066 100644
--- a/Resources/Locale/en-US/markings/kemonomimi_ears.ftl
+++ b/Resources/Locale/en-US/markings/kemonomimi_ears.ftl
@@ -2,6 +2,9 @@ marking-BunnyEars = Bunny Ears
 marking-BunnyEars-bunnyearstone1 = Outer ear
 marking-BunnyEars-bunnyearstone2 = Inner ear
 
+marking-BunnyEarsAlt = Bunny Ears, Alternative
+marking-BunnyEarsAlt-bunnyearsalt = Bunny Ears, Alternative
+
 marking-BullishHorns = Bull Horns
 marking-BullishHorns-bullishhorns = Horns
 
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml
index 66b4b5242c5..eeb52123af9 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml
@@ -37,6 +37,22 @@
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: bunnyearstone2
 
+- type: marking
+  id: BunnyEarsAlt
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SkinColoring
+  sprites:
+  - sprite: Mobs/Customization/kemonomimi-ears.rsi
+    state: bunnyearsalt
+
 - type: marking
   id: FoxEars
   bodyPart: HeadTop
@@ -74,4 +90,4 @@
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: goathornstone1
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
-    state: goathornstone2
\ No newline at end of file
+    state: goathornstone2
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
index d45d366ec04..c045523b41e 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
@@ -16,6 +16,24 @@
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: bunnytail
 
+- type: marking
+  id: BunnyTailAlt
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:CategoryColoring
+          category: FacialHair
+        - !type:SkinColoring
+  sprites:
+  - sprite: Mobs/Customization/kemonomimi-tails.rsi
+    state: bunnytailalt
+
 - type: marking
   id: DobleFur
   bodyPart: Tail
@@ -166,4 +184,4 @@
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: tasseltailtone1
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
-    state: tasseltailtone2
\ No newline at end of file
+    state: tasseltailtone2
diff --git a/Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/bunnyearsalt.png b/Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/bunnyearsalt.png
new file mode 100644
index 0000000000000000000000000000000000000000..44a214aa57e384cb4959916bd90517d57ac24b67
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J3L(+Ln>~)z3Ir+svy$(aP{wr
zVGmcm*E;0uG5bR=)5Hbys)Qf?cjH}BESg>9lD8tuvPjSUoNMUmHCz27pYPr+o~L+X
z-lUF>Ip+=C%r||Te>VF0@8yS&NZg$_DM!(xdROU>6K&y7e&18fx;8t0*8ShQ=l`&;
zIl~UL83OE*R`}RN-<*}|nKkiw8c%Tfr?B>fsn4s~vksqsb?a7WT(x#waj0YTwM+TW
e8DW|je)P$U1zd69Gj*x~iFvyExvX<aXaWG(nqtrZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/meta.json
index fcee2ae217f..3f7deb835ff 100644
--- a/Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/kemonomimi-ears.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Body parts by @Kilath",
+    "copyright": "Body parts by @Kilath | bunnyearsalt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e modified by Skubman",
     "size": {
         "x": 32,
         "y": 32
@@ -19,6 +19,10 @@
             "name": "bunnyearstone2",
             "directions": 4
         },
+        {
+            "name": "bunnyearsalt",
+            "directions": 4
+        },
         {
             "name": "foxears",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/bunnytailalt.png b/Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/bunnytailalt.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad99962d996c11f056c9af64caececf633bf27c0
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=ex5FlAr-gY-f|RVP~c#3_#M7z
zLNaIVO$PZBc}zPR#d{b*I%EYmMw{<{cIU1026iAH1XNa)bos6SYNs5+`QYSZm)D#O
b3=RKfq7<}wL<$@Kf>e0A`njxgN@xNAh({<X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/meta.json
index 29005fb2115..d378db1eaf8 100644
--- a/Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Body parts by @Kilath",
+    "copyright": "Body parts by @Kilath | bunnytailalt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e modified by Skubman",
     "size": {
         "x": 32,
         "y": 32
@@ -11,6 +11,10 @@
             "name": "bunnytail",
             "directions": 4
         },
+        {
+            "name": "bunnytailalt",
+            "directions": 4
+        },
         {
             "name": "doblefurtailtone1",
             "directions": 4

From 7bf36922a149d7072b0061e834644d9f6e3f1fd1 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:09:02 +0000
Subject: [PATCH 58/64] Automatic Changelog Update (#1577)

---
 Resources/Changelog/Changelog.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 73b1a700ea0..528c3c34715 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10184,3 +10184,13 @@ Entries:
   id: 6715
   time: '2025-01-17T04:55:26.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1575
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Humans have received alternative bunny ears and bunny tail markings that
+        look the same as the bunny ears from the AutoDrobe, but
+        color-customizable.
+  id: 6716
+  time: '2025-01-17T06:08:10.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1577

From 64c11963c6db0b6ea7c7bb576903c777d57b4256 Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 18:30:44 +0800
Subject: [PATCH 59/64] Fix Mining Drills & Reduce Stamina Cost (#1579)

# Description

Fixes the attack values of mining weapons which were messed up in the
Wizmerge.

For the pickaxe, I reverted all damage values to be the same as before.
For the mining drill however, I opted to keep the rapid fire rate
because it was an interesting effect and just added the extra range from
pre-wizmerge and the throwing damage back. I also **greatly reduced the
mining drill's stamina cost** because it was a common complaint among
players.

Before the wizmerge, the mining weapons (pickaxe and drill) were in
`Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml` but
they got moved to
`Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml` and
thus the EE-specific changes got wiped.

Also fixes a subtle bug in `SharedMeleeWeaponSystem.OnMeleeSelected`,
responsible for resetting the cooldown of a melee weapon upon selecting
it, that treated attack rate as attacks per second as opposed to seconds
per attack :
```diff
    private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
    {
        ...
-       var minimum = curTime + TimeSpan.FromSeconds(1 / attackRate);
+       var minimum = curTime + TimeSpan.FromSeconds(GetAttackRate(uid, args.User, component));

        if (minimum < component.NextAttack)
            return;
        component.NextAttack = minimum;
        DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
    }
```

Bug above was particularly noticeable for weapons with a very fast
attack rate like the mining drill and north stars, which caused the
`NextAttack` delay on select to be 4 seconds instead of 0.25 seconds.

Another subtle issue, the Goliath's attack rate field was `0.75` but the
field was set from Wizden and means attacks per second, not seconds per
attack so I changed it `1.33`.

## Media

**Pickaxe**
<img width=300px
src="https://github.com/user-attachments/assets/8bf1290e-6506-4ac8-9b8b-2bb23a2013b6">

**Mining Drill**
<img width=300px
src="https://github.com/user-attachments/assets/2f852a29-7b58-4e33-8264-67bab87254fd">

**Diamond Tipped Mining Drill**
<img width=300px
src="https://github.com/user-attachments/assets/750fa019-17dc-4d21-900c-88526c873771">

**Mining with Mining Drill**


https://github.com/user-attachments/assets/a9822ccb-c991-4341-a076-fd89a8689e0c

## Changelog

:cl: Skubman
- fix: The mining drill now has a fast fire rate and extra range again.
- fix: The pickaxe and the mining drill can now be used as throwing
weapons again.
- fix: Fixed a bug where selecting weapons with a fast attack rate took
a few seconds before you could attack with them.
- fix: Fixed the Goliath attacking too fast.
- tweak: The power attack stamina cost of mining drills has been reduced
to 0.7 stamina.
- tweak: Re-adjusted the damage of the pickaxe.
---
 .../Damage/Systems/DamageOtherOnHitSystem.cs  |  2 +-
 .../Weapons/Melee/MeleeWeaponSystem.cs        |  2 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |  2 +-
 .../Entities/Mobs/NPCs/asteroid.yml           |  2 +-
 .../Entities/Objects/Weapons/Melee/mining.yml | 37 ++++++++++++++++---
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index 0dc9808dc1d..0d54ad5843d 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -60,7 +60,7 @@ private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component,
 
             var staminaCostMarkup = FormattedMessage.FromMarkupOrThrow(
                 Loc.GetString("damage-stamina-cost",
-                ("type", Loc.GetString("damage-throw")), ("cost", component.StaminaCost)));
+                ("type", Loc.GetString("damage-throw")), ("cost", Math.Round(component.StaminaCost, 2).ToString("0.##"))));
             args.Message.PushNewline();
             args.Message.AddMessage(staminaCostMarkup);
         }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 3ed47945082..42cc357b8db 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -69,7 +69,7 @@ private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component,
             {
                 var staminaCostMarkup = FormattedMessage.FromMarkupOrThrow(
                     Loc.GetString("damage-stamina-cost",
-                    ("type", Loc.GetString("damage-melee-heavy")), ("cost", component.HeavyStaminaCost)));
+                    ("type", Loc.GetString("damage-melee-heavy")), ("cost", Math.Round(component.HeavyStaminaCost, 2).ToString("0.##"))));
                 args.Message.PushNewline();
                 args.Message.AddMessage(staminaCostMarkup);
             }
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 201269fcc86..99db6a5f70c 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -105,7 +105,7 @@ private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, Hand
 
         // If someone swaps to this weapon then reset its cd.
         var curTime = Timing.CurTime;
-        var minimum = curTime + TimeSpan.FromSeconds(1 / attackRate);
+        var minimum = curTime + TimeSpan.FromSeconds(GetAttackRate(uid, args.User, component));
 
         if (minimum < component.NextAttack)
             return;
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index 8cbd40b5cc7..f901a7ea6e8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -59,7 +59,7 @@
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
     angle: 0
-    attackRate: 0.75
+    attackRate: 1.3333
     animation: WeaponArcPunch
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index b2506325862..94de9b167af 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -11,20 +11,28 @@
     sprite: Objects/Weapons/Melee/pickaxe.rsi
     state: pickaxe
   - type: MeleeWeapon
-    attackRate: 0.7
+    attackRate: 0.85
+    range: 1.5
     wideAnimationRotation: -135
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
       params:
         volume: -3
     damage:
-      groups:
-        Brute: 5
+      types:
+        Blunt: 6
+        Piercing: 3
+    bluntStaminaDamageFactor: 2.0
+    heavyDamageBaseModifier: 1.75
+    maxTargets: 5
+    angle: 80
+  - type: DamageOtherOnHit
+    staminaCost: 5
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       groups:
-        Brute: 10
+        Brute: 5
       types:
         Structural: 30
   - type: Item
@@ -56,12 +64,23 @@
     wideAnimationRotation: -90
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
-    attackRate: 4
+    attackRate: 0.25
+    range: 1.5
+    heavyStaminaCost: 0.7
     damage:
       groups:
         Brute: 3
       types:
         Structural: 15
+  - type: DamageOtherOnHit
+    staminaCost: 9
+    damage:
+      groups:
+        Brute: 9
+      types:
+        Structural: 15
+  - type: ThrowingAngle
+    angle: 270
 
 - type: entity
   name: diamond tipped mining drill
@@ -78,12 +97,18 @@
     wideAnimationRotation: -90
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
-    attackRate: 4
+    heavyStaminaCost: 0.55 # More efficient so less stamina needed to use
     damage:
       groups:
         Brute: 6
       types:
         Structural: 30
+  - type: DamageOtherOnHit
+    damage:
+      groups:
+        Brute: 18
+      types:
+        Structural: 30
 
 - type: entity
   abstract: true

From cc1cf109293cbce57a97021b463d3671684a801d Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 10:31:11 +0000
Subject: [PATCH 60/64] Automatic Changelog Update (#1579)

---
 Resources/Changelog/Changelog.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 528c3c34715..ad1c330b8ea 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10194,3 +10194,26 @@ Entries:
   id: 6716
   time: '2025-01-17T06:08:10.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1577
+- author: Skubman
+  changes:
+    - type: Fix
+      message: The mining drill now has a fast fire rate and extra range again.
+    - type: Fix
+      message: >-
+        The pickaxe and the mining drill can now be used as throwing weapons
+        again.
+    - type: Fix
+      message: >-
+        Fixed a bug where selecting weapons with a fast attack rate took a few
+        seconds before you could attack with them.
+    - type: Fix
+      message: 'Fixed the Goliath attacking too fast. '
+    - type: Tweak
+      message: >-
+        The power attack stamina cost of mining drills has been reduced to 0.7
+        stamina.
+    - type: Tweak
+      message: Re-adjusted the damage of the pickaxe.
+  id: 6717
+  time: '2025-01-17T10:30:44.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1579

From b8a48704c9a03236230cffd4bd931e2729630d2e Mon Sep 17 00:00:00 2001
From: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
Date: Fri, 17 Jan 2025 10:26:49 -0500
Subject: [PATCH 61/64] Add Magistrate, Dignitary Department, and Minor FTL
 Fixes (#1536)

# Description
This adds the Magistrate to the role list of Central Command VIPs. This
also splits up the Central Command VIPs into their own department named
"Dignitary" for the purpose of making it clear that Central Command VIPs
are above Command and should be responding to orders from Central
Command.

---

# TODO
Lots of stuff to do here, mostly just transferring Chief Justice's
loadout to also work for Magistrate (most of it). I'll also list the
basics I've done as well.

### Magistrate-Specific
- [x] Add Magistrate-only Access (for locker).
- [x] Add Magistrate Job, Job Icon, and PlayTimeTracker
- [x] Add Magistrate clothes (ported from PS13)
- [x] Add Magistrate job spawner.
- [x] Add Magistrate Locker Teleporter and Locker.
- [x] Add Magistrate Contents to Locker.
- [x] Add Magistrate loadout (Chief Justice included).
- [x] Add Magistrate stamp and stamped icon.

### Dignitary Department
- [x] Add Dignitary Department.
- [x] Put Magistrate, Blueshield Officer, and Nanotrasen Representative
in Dignitary.
- [x] Add FTL for Dignitary.
- [x] Put Dignitary above Command.

### Map Stuff
- [x] Add Magistrate job spawners to maps.
- [x] Add a Centcom Wintercoat to NTR and Magistrate on the Glacier
map.\

### Extras/Fixes
- [x] Add winter coats for Magistrate and NanoRep on Glacier.
- [x] Fix the category grouping FTL for NTR and BSO.

---
# Media

<details><summary><h3>Lobby/Customization Screenshots</h3></summary>
<p>

Jobs Listing

![image](https://github.com/user-attachments/assets/61ebe868-b411-449c-810d-794536b7c76f)
Category Grouping

![image](https://github.com/user-attachments/assets/98a6707b-9631-4a38-892a-492a8b9461d3)

</p>
</details>
<details><summary><h3>Items/Clothes/Entities</h3></summary>
<p>

Stamps (Stamp shows the same in the spawn menu)

![image](https://github.com/user-attachments/assets/7225ccca-a07e-4ae3-bd1f-c2e806a7b377)
Magistrate Robes

![image](https://github.com/user-attachments/assets/abb39f42-e9bf-4038-94ad-418f0c642ff7)
Spawner & Magistrate Robes

![image](https://github.com/user-attachments/assets/cdd38786-222c-48b8-8aaa-332f65dad265)
Access List

![image](https://github.com/user-attachments/assets/f92cc6b5-3884-4a17-b898-095e7968ce2a)
PDA Crew Manifest

![image](https://github.com/user-attachments/assets/38c5dc83-6fdf-41fe-b304-2f294359a87d)
Lockers with Teleporter

![image](https://github.com/user-attachments/assets/cf1346fc-5b8f-4c52-a7a7-33c0c7bbedb6)
Locker with Contents (from Teleported Locker)

![image](https://github.com/user-attachments/assets/9f18290a-07cc-4e4b-93f2-01276c7611b6)

</p>
</details>
<details><summary><h3>Map Spawners</h3></summary>
<p>

Arena

![image](https://github.com/user-attachments/assets/10ba04c1-9d48-46e7-aa1e-700f22f1d169)
Asterisk

![image](https://github.com/user-attachments/assets/a49434ef-2efe-4ae4-ae1e-c405add68704)
Core

![image](https://github.com/user-attachments/assets/0fe868e4-92a9-4100-803b-66bb130ee68c)
Edge

![image](https://github.com/user-attachments/assets/bbeebbc6-2a82-4707-b874-7ef8216ccb03)
Europa

![image](https://github.com/user-attachments/assets/6be71cca-6599-46bb-8f8c-f67be12fdaf2)
Gaxstation

![image](https://github.com/user-attachments/assets/02dfe9bb-98ff-41d5-bf9d-d87a4a05fe60)
Glacier (Winter Coats for NTR and Magistrate as well.)

![image](https://github.com/user-attachments/assets/1849f239-611d-4370-a58d-2d63b9cba03c)
Hammurabi

![image](https://github.com/user-attachments/assets/f8b544be-b8ab-4dd9-b801-d5482d244bb9)
Hive

![image](https://github.com/user-attachments/assets/09514381-4131-491e-aa56-fff7b27d200a)
Lighthouse

![image](https://github.com/user-attachments/assets/a0ddcddb-9133-40b0-9f77-b6d2a8eb0f21)
Meta

![image](https://github.com/user-attachments/assets/695dec69-24f8-4de0-a237-9d24000d2a35)
Pebble

![image](https://github.com/user-attachments/assets/1f9926c9-f5fc-4a4d-a4a0-1cabb15e5907)
Radstation

![image](https://github.com/user-attachments/assets/b61dda0d-5a4c-4463-bc80-508426039c85)
Saltern

![image](https://github.com/user-attachments/assets/57c3e590-09f4-4862-b1d0-193c1db9488e)
Shoukou

![image](https://github.com/user-attachments/assets/81a9b185-8d7b-4efa-b565-397f44fe5cd8)
Submarine

![image](https://github.com/user-attachments/assets/2e5860c1-8bea-4730-a629-da348056d7c3)
Tortuga

![image](https://github.com/user-attachments/assets/e45b066a-3180-4dce-af27-bc4af8c2bb59)

</p>
</details>
<details><summary><h3>Misc. Minor Fixes</h3></summary>
<p>

Chief Justice Access

![image](https://github.com/user-attachments/assets/10d54485-d0ee-40bb-b048-738e61bf585f)
Category Groupings (BSO AND NTR)

![image](https://github.com/user-attachments/assets/8548dc33-f75f-4051-84b2-e26230f3cc2c)

![image](https://github.com/user-attachments/assets/dd67ad17-0128-4ca6-bf8d-9b4fded117a5)

</p>
</details>

---

# Changelog
:cl:
- add: Added Magistrate role.
- add: Added Dignitary Department.
- add: Added winter coats for NTR and Magistrate on Glacier Spawn.
- tweak: Moved Blueshield Officer and Nanotrasen Representative to
Dignitary Department.
- fix: Fixed the category groups identifier for BSO and NTR in Loadouts.
- fix: Fixed Chief Justice tag in ID Card Computer.

---------

Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
---
 .../prototypes/access/accesses.ftl            |   1 +
 .../deltav/prototypes/access/accesses.ftl     |   2 +-
 .../Locale/en-US/job/department-desc.ftl      |   1 +
 Resources/Locale/en-US/job/department.ftl     |   1 +
 .../Locale/en-US/loadouts/categories.ftl      |   1 +
 .../Locale/en-US/loadouts/itemgroups.ftl      |  15 ++
 .../Locale/en-US/paper/stamp-component.ftl    |   1 +
 Resources/Maps/arena.yml                      |   7 +
 Resources/Maps/asterisk.yml                   |   7 +
 Resources/Maps/core.yml                       |   7 +
 Resources/Maps/edge.yml                       |   7 +
 Resources/Maps/europa.yml                     |   9 +-
 Resources/Maps/gaxstation.yml                 |   9 +-
 Resources/Maps/glacier.yml                    |  19 +++
 Resources/Maps/hammurabi.yml                  |   7 +
 Resources/Maps/hive.yml                       |   7 +
 Resources/Maps/lighthouse.yml                 |   7 +
 Resources/Maps/meta.yml                       |  11 +-
 Resources/Maps/pebble.yml                     |   7 +
 Resources/Maps/radstation.yml                 |  11 +-
 Resources/Maps/saltern.yml                    |   9 +-
 Resources/Maps/shoukou.yml                    |   9 +-
 Resources/Maps/submarine.yml                  |   7 +
 Resources/Maps/tortuga.yml                    |   7 +
 Resources/Prototypes/Access/misc.yml          |   5 +-
 .../Jobs/Command/magistrate.yml               |  35 +++++
 .../Loadouts/Categories/categories.yml        |   4 +
 .../Loadouts/Jobs/Command/magistrate.yml      | 141 ++++++++++++++++++
 Resources/Prototypes/Maps/arena.yml           |   1 +
 Resources/Prototypes/Maps/asterisk.yml        |   1 +
 Resources/Prototypes/Maps/core.yml            |   1 +
 Resources/Prototypes/Maps/edge.yml            |   1 +
 Resources/Prototypes/Maps/europa.yml          |   1 +
 Resources/Prototypes/Maps/gaxstation.yml      |   1 +
 Resources/Prototypes/Maps/glacier.yml         |   1 +
 Resources/Prototypes/Maps/hammurabi.yml       |   1 +
 Resources/Prototypes/Maps/hive.yml            |   1 +
 Resources/Prototypes/Maps/lighthouse.yml      |   1 +
 Resources/Prototypes/Maps/meta.yml            |   1 +
 Resources/Prototypes/Maps/pebble.yml          |   1 +
 Resources/Prototypes/Maps/radstation.yml      |   1 +
 Resources/Prototypes/Maps/saltern.yml         |   1 +
 Resources/Prototypes/Maps/shoukou.yml         |   1 +
 Resources/Prototypes/Maps/submarine.yml       |   1 +
 Resources/Prototypes/Maps/tortuga.yml         |   1 +
 .../Prototypes/Roles/Jobs/departments.yml     |  11 +-
 .../_Goobstation/Access/centcomm.yml          |   4 +
 .../Catalog/Fills/Lockers/heads.yml           |  13 ++
 .../Entities/Clothing/Ears/headsets.yml       |  20 +++
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |  11 ++
 .../_Goobstation/Entities/Marker/unique.yml   |  16 +-
 .../Entities/Markers/Spawners/jobs.yml        |  12 ++
 .../Devices/Electronics/door_access.yml       |   8 +
 .../Objects/Devices/unique_teleporters.yml    |  28 +++-
 .../Entities/Objects/Misc/rubber_stamps.yml   |  15 +-
 .../Structures/Doors/Airlocks/access.yml      |  20 +++
 .../Storage/Closets/Lockers/lockers.yml       |  15 ++
 .../_Goobstation/Entities/Unique/lockers.yml  |  11 +-
 .../Roles/Jobs/Command/magistrate.yml         |  46 ++++++
 .../_Goobstation/Roles/play_time_trackers.yml |   3 +
 .../_Goobstation/StatusEffects/job.yml        |   7 +
 .../Objects/Misc/bureaucracy.rsi/meta.json    |   5 +-
 .../paper_stamp-magistrate.png                | Bin 0 -> 4936 bytes
 .../magistrate.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 5237 bytes
 .../Uniforms/Jumpsuit/magistrate.rsi/icon.png | Bin 0 -> 4569 bytes
 .../Jumpsuit/magistrate.rsi/inhand-left.png   | Bin 0 -> 4424 bytes
 .../Jumpsuit/magistrate.rsi/inhand-right.png  | Bin 0 -> 4430 bytes
 .../Jumpsuit/magistrate.rsi/meta.json         |  26 ++++
 .../Misc/job_icons.rsi/magistrate.png         | Bin 0 -> 185 bytes
 .../Interface/Misc/job_icons.rsi/meta.json    |   3 +
 .../Devices/unique_teleporters.rsi/mag.png    | Bin 0 -> 6494 bytes
 .../Devices/unique_teleporters.rsi/meta.json  |   5 +-
 .../Objects/Misc/stamps.rsi/meta.json         |   5 +-
 .../Misc/stamps.rsi/stamp-magistrate.png      | Bin 0 -> 5299 bytes
 .../Structures/Storage/closet.rsi/mag.png     | Bin 0 -> 6050 bytes
 .../Storage/closet.rsi/mag_door.png           | Bin 0 -> 6130 bytes
 .../Structures/Storage/closet.rsi/meta.json   |   8 +-
 77 files changed, 642 insertions(+), 21 deletions(-)
 create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml
 create mode 100644 Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml
 create mode 100644 Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml
 create mode 100644 Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
 create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-magistrate.png
 create mode 100644 Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png
 create mode 100644 Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json
 create mode 100644 Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png
 create mode 100644 Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/mag.png
 create mode 100644 Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/stamp-magistrate.png
 create mode 100644 Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag.png
 create mode 100644 Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag_door.png

diff --git a/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
index 131d1eef770..e11ee5caeaf 100644
--- a/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
@@ -1,2 +1,3 @@
 id-card-access-level-ntr = Nanotrasen Representative
 id-card-access-level-bso = Blueshield Officer
+id-card-access-level-mag = Magistrate
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
index 3ebfe8bf1b1..1ea79f2c16d 100644
--- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -1,6 +1,6 @@
 id-card-access-level-orders = Orders
 id-card-access-level-mantis = Mantis
-id-card-access-level-chief-justice = Chief Justice
+id-card-access-level-cj = 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/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl
index 0243d61942f..f9670d4b6b3 100644
--- a/Resources/Locale/en-US/job/department-desc.ftl
+++ b/Resources/Locale/en-US/job/department-desc.ftl
@@ -7,3 +7,4 @@ department-Security-description = Keep the peace around the station.
 department-Science-description = Research artifacts and anomalies to invent new equipment for the station
 department-Silicon-description = Obey your laws and serve the crew.
 department-Specific-description = Jobs that not all stations have.
+department-Dignitary-description = Assist Heads of Staff and Captain, follow your directives.
diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl
index 2295a9ba9d3..784e8f8e87b 100644
--- a/Resources/Locale/en-US/job/department.ftl
+++ b/Resources/Locale/en-US/job/department.ftl
@@ -7,3 +7,4 @@ department-Security = Security
 department-Science = Science
 department-Silicon = Silicons
 department-Specific = Station specific
+department-Dignitary = Dignitary
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 0e4cf112521..78caa4aa485 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -20,6 +20,7 @@ loadout-category-JobsCommandHeadOfPersonnel = Head of Personnel
 loadout-category-JobsCommandAdminAssistant = Administrative Assistant
 loadout-category-JobsCommandBlueshieldOfficer = Blueshield Officer
 loadout-category-JobsCommandNanorep = Nanotrasen Representative
+loadout-category-JobsCommandMagistrate = Magistrate
 
 # Engineering
 loadout-category-JobsEngineering = Engineering
diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl
index 4c42edc72c0..c49f2e14042 100644
--- a/Resources/Locale/en-US/loadouts/itemgroups.ftl
+++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl
@@ -82,6 +82,21 @@ character-item-group-LoadoutHeadOfPersonnelOuter = Head of Personnel Outerwear
 character-item-group-LoadoutHeadOfPersonnelShoes = Head of Personnel Shoes
 character-item-group-LoadoutHeadOfPersonnelUniforms = Head of Personnel Uniforms
 
+# Dignitary - BlueshieldOfficer
+character-item-group-LoadoutBlueshieldOfficerBackpacks = Blueshield Officer Backpacks
+character-item-group-LoadoutBlueshieldOfficerVests = Blueshield Officer Vests
+character-item-group-LoadoutBlueshieldOfficerUniforms = Blueshield Officer Uniforms
+
+# Dignitary - Magistrate
+character-item-group-LoadoutMagistrateHead = Magistrate Headgear
+character-item-group-LoadoutMagistrateNeck = Magistrate Neckwear
+character-item-group-LoadoutMagistrateOuter = Magistrate Outerwear
+character-item-group-LoadoutMagistrateUniforms = Magistrate Uniforms
+
+# Dignitary - Nanotrasen Representative
+character-item-group-LoadoutNanorepBackpacks = Nanotrasen Representative Backpacks
+character-tiem-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms
+
 # Engineering
 character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks
 character-item-group-LoadoutEngineeringBelt = Engineering Belt
diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index c3e38245ca8..797a0fff55b 100644
--- a/Resources/Locale/en-US/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/paper/stamp-component.ftl
@@ -17,3 +17,4 @@ stamp-component-stamped-name-trader = Trader
 stamp-component-stamped-name-syndicate = Syndicate
 stamp-component-stamped-name-ce = Chief Engineer
 stamp-component-stamped-name-nanorep = Nanotrasen Representative
+stamp-component-stamped-name-magistrate = Magistrate
diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index d409d1add8a..aa61c9bb3af 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -151146,6 +151146,13 @@ entities:
     - type: Transform
       pos: -31.5,17.5
       parent: 6747
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27823
+    components:
+    - type: Transform
+      pos: -23.5,-51.5
+      parent: 6747
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 27031
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
index 0bd34d57884..41fc0f2e73d 100644
--- a/Resources/Maps/asterisk.yml
+++ b/Resources/Maps/asterisk.yml
@@ -57641,6 +57641,13 @@ entities:
     - type: Transform
       pos: -12.5,14.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 11187
+    components:
+    - type: Transform
+      pos: 46.5,-9.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 9983
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index 40ab7beceed..9685efd2e13 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -121830,6 +121830,13 @@ entities:
     - type: Transform
       pos: -18.5,-9.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 22545
+    components:
+    - type: Transform
+      pos: 45.5,-36.5
+      parent: 2
 - proto: SpawnPointMedicalDoctor
   entities:
   - uid: 6720
diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index b50006a7cb9..f19c2065af2 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -91074,6 +91074,13 @@ entities:
     - type: Transform
       pos: -20.5,20.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 17481
+    components:
+    - type: Transform
+      pos: -8.5,35.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 13998
diff --git a/Resources/Maps/europa.yml b/Resources/Maps/europa.yml
index 165934fe330..0d54891dc6a 100644
--- a/Resources/Maps/europa.yml
+++ b/Resources/Maps/europa.yml
@@ -65764,7 +65764,7 @@ entities:
       pos: -11.5,11.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -26472.29
+      secondsUntilStateChange: -26515.367
       state: Opening
     - type: Occluder
       enabled: True
@@ -78679,6 +78679,13 @@ entities:
     - type: Transform
       pos: -28.5,-0.5
       parent: 1
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 16620
+    components:
+    - type: Transform
+      pos: -8.5,6.5
+      parent: 1
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 1223
diff --git a/Resources/Maps/gaxstation.yml b/Resources/Maps/gaxstation.yml
index aee3e3d9d2d..f502c4b698d 100644
--- a/Resources/Maps/gaxstation.yml
+++ b/Resources/Maps/gaxstation.yml
@@ -113824,6 +113824,13 @@ entities:
     - type: Transform
       pos: 17.5,58.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 20871
+    components:
+    - type: Transform
+      pos: 71.5,26.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 20865
@@ -134443,7 +134450,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -120432.64
+      secondsUntilStateChange: -120542.65
       state: Opening
   - uid: 18112
     components:
diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index d1ed95ead20..c0fcbe15321 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -45936,6 +45936,18 @@ entities:
     - type: Transform
       pos: 36.74322,44.429073
       parent: 2
+- proto: ClothingOuterWinterCentcom
+  entities:
+  - uid: 17499
+    components:
+    - type: Transform
+      pos: 32.888283,41.295105
+      parent: 2
+  - uid: 17500
+    components:
+    - type: Transform
+      pos: 36.825783,45.31073
+      parent: 2
 - proto: ClothingOuterWinterChem
   entities:
   - uid: 6216
@@ -96430,6 +96442,13 @@ entities:
     - type: Transform
       pos: -57.5,2.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 17498
+    components:
+    - type: Transform
+      pos: 32.5,41.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 13932
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
index c5e3cb0e876..09f874f94b9 100644
--- a/Resources/Maps/hammurabi.yml
+++ b/Resources/Maps/hammurabi.yml
@@ -236485,6 +236485,13 @@ entities:
     - type: Transform
       pos: -64.5,3.5
       parent: 1
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 42454
+    components:
+    - type: Transform
+      pos: -97.5,1.5
+      parent: 1
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 17152
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
index 60982472322..ef0019b3454 100644
--- a/Resources/Maps/hive.yml
+++ b/Resources/Maps/hive.yml
@@ -149517,6 +149517,13 @@ entities:
     - type: Transform
       pos: -53.5,-24.5
       parent: 1
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27791
+    components:
+    - type: Transform
+      pos: 105.5,6.5
+      parent: 1
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 7387
diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
index 94c30dfd8ad..9921bbb9f6d 100644
--- a/Resources/Maps/lighthouse.yml
+++ b/Resources/Maps/lighthouse.yml
@@ -110260,6 +110260,13 @@ entities:
     - type: Transform
       pos: 18.5,-9.5
       parent: 100
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 20900
+    components:
+    - type: Transform
+      pos: -8.5,58.5
+      parent: 100
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 16733
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index 445bb4f7dd6..ddbd71d9b11 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -10339,7 +10339,7 @@ entities:
       pos: -53.5,-12.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -12845.943
+      secondsUntilStateChange: -12876.496
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -75704,7 +75704,7 @@ entities:
       pos: -3.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -40871.477
+      secondsUntilStateChange: -40902.03
       state: Closing
   - uid: 11944
     components:
@@ -142409,6 +142409,13 @@ entities:
     - type: Transform
       pos: -25.5,-16.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27707
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 21681
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
index 81b007c7e9b..9b7c428b513 100644
--- a/Resources/Maps/pebble.yml
+++ b/Resources/Maps/pebble.yml
@@ -59195,6 +59195,13 @@ entities:
     - type: Transform
       pos: -29.5,-4.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 10228
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 8928
diff --git a/Resources/Maps/radstation.yml b/Resources/Maps/radstation.yml
index b8eb6b1bcc5..f350c67478e 100644
--- a/Resources/Maps/radstation.yml
+++ b/Resources/Maps/radstation.yml
@@ -15129,7 +15129,7 @@ entities:
       pos: 34.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -55516.35
+      secondsUntilStateChange: -55586.55
       state: Opening
   - uid: 383
     components:
@@ -131127,6 +131127,13 @@ entities:
     - type: Transform
       pos: 43.5,-0.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 22317
+    components:
+    - type: Transform
+      pos: 5.5,53.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 18892
@@ -157775,7 +157782,7 @@ entities:
       links:
       - 19976
     - type: Door
-      secondsUntilStateChange: -191808.66
+      secondsUntilStateChange: -191878.86
       state: Opening
   - uid: 23356
     components:
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index e90783df4fc..e2f8a808534 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -4332,7 +4332,7 @@ entities:
       pos: 3.5,22.5
       parent: 31
     - type: Door
-      secondsUntilStateChange: -32552.574
+      secondsUntilStateChange: -32634.607
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -66886,6 +66886,13 @@ entities:
     - type: Transform
       pos: 12.5,-29.5
       parent: 31
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 11411
+    components:
+    - type: Transform
+      pos: -1.5,23.5
+      parent: 31
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 11397
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index 9988eefc92c..4cbe47174af 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -36708,7 +36708,7 @@ entities:
       pos: -36.5,-22.5
       parent: 34
     - type: Door
-      secondsUntilStateChange: -67318.92
+      secondsUntilStateChange: -67401.266
       state: Closing
   - uid: 1274
     components:
@@ -72765,6 +72765,13 @@ entities:
     - type: Transform
       pos: -7.5,-17.5
       parent: 34
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 13762
+    components:
+    - type: Transform
+      pos: 52.5,-36.5
+      parent: 34
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 857
diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index 3f1bc9eb174..0890fe73aa5 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -209675,6 +209675,13 @@ entities:
     - type: Transform
       pos: 9.5,-27.5
       parent: 2
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 39307
+    components:
+    - type: Transform
+      pos: 14.5,49.5
+      parent: 2
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 983
diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
index 1359965938b..f9f702c820c 100644
--- a/Resources/Maps/tortuga.yml
+++ b/Resources/Maps/tortuga.yml
@@ -167883,6 +167883,13 @@ entities:
     - type: Transform
       pos: 44.5,14.5
       parent: 33
+- proto: SpawnPointMagistrate
+  entities:
+  - uid: 27376
+    components:
+    - type: Transform
+      pos: -68.5,22.5
+      parent: 33
 - proto: SpawnPointMailCarrier
   entities:
   - uid: 3585
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index c2984168f85..a9e3aa0cd8a 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -48,5 +48,6 @@
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
   - Corpsman # DeltaV - Add Corpsman access
-  - BlueshieldOfficer
-  - NanotrasenRepresentative
+  - BlueshieldOfficer # Goobstation - Add BSO Access
+  - NanotrasenRepresentative # Goobstation - Add NTR Access
+  - Magistrate # Goobstation - Add Magistrate Access
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml
new file mode 100644
index 00000000000..918963673f7
--- /dev/null
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/magistrate.yml
@@ -0,0 +1,35 @@
+- type: characterItemGroup
+  id: LoadoutMagistrateHead
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingHeadChiefJustice
+
+- type: characterItemGroup
+  id: LoadoutMagistrateNeck
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingNeckChiefJustice
+
+- type: characterItemGroup
+  id: LoadoutMagistrateOuter
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingOuterChiefJustice
+
+- type: characterItemGroup
+  id: LoadoutMagistrateUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitMagistrate
+    - type: loadout
+      id: LoadoutClothingUniformJumpskirtMagistrate
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitChiefJustice
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitChiefJusticeFormal
+    - type: loadout
+      id: LoadoutClothingUniformJumpsuitChiefJusticeWhite
diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml
index d9a9dc56b57..af4b7ab2117 100644
--- a/Resources/Prototypes/Loadouts/Categories/categories.yml
+++ b/Resources/Prototypes/Loadouts/Categories/categories.yml
@@ -54,6 +54,7 @@
     - JobsCommandAdminAssistant
     - JobsCommandBlueshieldOfficer
     - JobsCommandNanorep
+    - JobsCommandMagistrate
 
 - type: loadoutCategory
   id: JobsCommandAUncategorized
@@ -73,6 +74,9 @@
 - type: loadoutCategory
   id: JobsCommandNanorep
 
+- type: loadoutCategory
+  id: JobsCommandMagistrate
+
 # Engineering
 - type: loadoutCategory
   id: JobsEngineering
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml b/Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml
new file mode 100644
index 00000000000..bd36d9e2167
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/magistrate.yml
@@ -0,0 +1,141 @@
+# Uncategorized
+# Backpacks
+
+# Belt
+
+# Ears
+
+# Equipment
+
+# Eyes
+
+# Gloves
+
+# Head
+- type: loadout
+  id: LoadoutClothingHeadChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingHeadHatCJToque
+
+# Id
+
+# Neck
+- type: loadout
+  id: LoadoutClothingNeckChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateNeck
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingNeckCloakCJ
+
+# Mask
+
+# Outer
+- type: loadout
+  id: LoadoutClothingOuterChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingOuterChiefJustice
+
+# Shoes
+
+# Uniforms
+- type: loadout
+  id: LoadoutClothingUniformJumpskirtMagistrate
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpskirtChiefJustice
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitMagistrate
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitMagistrate
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitChiefJustice
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitChiefJustice
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitChiefJusticeFormal
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitChiefJusticeFormal
+
+- type: loadout
+  id: LoadoutClothingUniformJumpsuitChiefJusticeWhite
+  category: JobsCommandMagistrate
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagistrateUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefJustice
+        - Magistrate
+  items:
+    - ClothingUniformJumpsuitChiefJusticeWhite
diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml
index 0d1ad7edffe..d1e02b8456e 100644
--- a/Resources/Prototypes/Maps/arena.yml
+++ b/Resources/Prototypes/Maps/arena.yml
@@ -26,6 +26,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml
index 294ac7b8064..b43202acf72 100644
--- a/Resources/Prototypes/Maps/asterisk.yml
+++ b/Resources/Prototypes/Maps/asterisk.yml
@@ -26,6 +26,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
index 89d8b097af6..e5b4640911c 100644
--- a/Resources/Prototypes/Maps/core.yml
+++ b/Resources/Prototypes/Maps/core.yml
@@ -27,6 +27,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             ServiceWorker: [ 3, 6 ]
diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml
index 3acfaaefdc9..bb27ee6ebb5 100644
--- a/Resources/Prototypes/Maps/edge.yml
+++ b/Resources/Prototypes/Maps/edge.yml
@@ -23,6 +23,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml
index 18d54babe94..a3397c29c09 100644
--- a/Resources/Prototypes/Maps/europa.yml
+++ b/Resources/Prototypes/Maps/europa.yml
@@ -21,6 +21,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/gaxstation.yml b/Resources/Prototypes/Maps/gaxstation.yml
index ca6088c7d1c..a1901d5fe46 100644
--- a/Resources/Prototypes/Maps/gaxstation.yml
+++ b/Resources/Prototypes/Maps/gaxstation.yml
@@ -22,6 +22,7 @@
             Captain: [ 1, 1 ]
             NanotrasenRepresentative: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml
index 0b146b1ae0f..8eef819c824 100644
--- a/Resources/Prototypes/Maps/glacier.yml
+++ b/Resources/Prototypes/Maps/glacier.yml
@@ -25,6 +25,7 @@
           Captain: [ 1, 1 ]
           BlueshieldOfficer: [ 1, 1]
           NanotrasenRepresentative: [ 1, 1 ]
+          Magistrate: [ 1, 1 ]
           AdministrativeAssistant: [ 1, 1 ]
         #service
           HeadOfPersonnel: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/hammurabi.yml b/Resources/Prototypes/Maps/hammurabi.yml
index e36cca1314e..0d117d37f27 100644
--- a/Resources/Prototypes/Maps/hammurabi.yml
+++ b/Resources/Prototypes/Maps/hammurabi.yml
@@ -25,6 +25,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 2, 3 ]
diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml
index 30dfcd4edbe..52353877a07 100644
--- a/Resources/Prototypes/Maps/hive.yml
+++ b/Resources/Prototypes/Maps/hive.yml
@@ -26,6 +26,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml
index 34fa636e2c4..036d1fa7d77 100644
--- a/Resources/Prototypes/Maps/lighthouse.yml
+++ b/Resources/Prototypes/Maps/lighthouse.yml
@@ -23,6 +23,7 @@
           Captain: [ 1, 1 ]
           BlueshieldOfficer: [ 1, 1]
           NanotrasenRepresentative: [ 1, 1 ]
+          Magistrate: [ 1, 1 ]
           AdministrativeAssistant: [ 1, 1 ]
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 4362375c753..2365ba1fc41 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -21,6 +21,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml
index fdf6a0d3b26..1659dfc7610 100644
--- a/Resources/Prototypes/Maps/pebble.yml
+++ b/Resources/Prototypes/Maps/pebble.yml
@@ -21,6 +21,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/radstation.yml b/Resources/Prototypes/Maps/radstation.yml
index c05f16796b3..5bc4f4709b6 100644
--- a/Resources/Prototypes/Maps/radstation.yml
+++ b/Resources/Prototypes/Maps/radstation.yml
@@ -22,6 +22,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index 4d416df87ba..73072bce836 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -24,6 +24,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml
index 18aae21c379..743234b6533 100644
--- a/Resources/Prototypes/Maps/shoukou.yml
+++ b/Resources/Prototypes/Maps/shoukou.yml
@@ -35,6 +35,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
           #Engineering
diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml
index 5ff22608182..656c7a3e7b7 100644
--- a/Resources/Prototypes/Maps/submarine.yml
+++ b/Resources/Prototypes/Maps/submarine.yml
@@ -25,6 +25,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 2, 4 ]
diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml
index 1108593bb30..933f7747a78 100644
--- a/Resources/Prototypes/Maps/tortuga.yml
+++ b/Resources/Prototypes/Maps/tortuga.yml
@@ -25,6 +25,7 @@
             Captain: [ 1, 1 ]
             BlueshieldOfficer: [ 1, 1]
             NanotrasenRepresentative: [ 1, 1 ]
+            Magistrate: [ 1, 1 ]
             AdministrativeAssistant: [ 1, 1 ]
           #engineering
             AtmosphericTechnician: [ 2, 3 ]
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 06963eb8988..8fc4cfb986b 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -58,10 +58,19 @@
   - ERTEngineer
   - DeathSquad
   - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
+  primary: false
+  weight: 100
+
+- type: department
+  id: Dignitary
+  description: department-Dignitary-description
+  color: "#33FE6D"
+  roles:
   - BlueshieldOfficer # Goobstation
   - NanotrasenRepresentative # Goobstation
+  - Magistrate # Goobstation
   primary: false
-  weight: 100
+  weight: 101
 
 - type: department
   id: Engineering
diff --git a/Resources/Prototypes/_Goobstation/Access/centcomm.yml b/Resources/Prototypes/_Goobstation/Access/centcomm.yml
index bd8ee7102ec..c2f20bceacf 100644
--- a/Resources/Prototypes/_Goobstation/Access/centcomm.yml
+++ b/Resources/Prototypes/_Goobstation/Access/centcomm.yml
@@ -5,3 +5,7 @@
 - type: accessLevel
   id: BlueshieldOfficer
   name: id-card-access-level-bso
+
+- type: accessLevel
+  id: Magistrate
+  name: id-card-access-level-mag
diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml
index 45e4e5262a2..8be2864619f 100644
--- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml
@@ -29,3 +29,16 @@
     - id: WeaponLeverChester
     - id: WeaponEnergyRevolver
     - id: BlueshieldAmmunitionBoxFilled
+
+- type: entity
+  id: LockerMagistrateFilled
+  suffix: Filled
+  parent: LockerMagistrate
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxFolderCentCom
+    - id: WeaponDisabler
+    - id: BriefcaseBrownFilled
+    - id: RubberStampMagistrate
+    - id: ClothingHeadHatPwig
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml
new file mode 100644
index 00000000000..99ba0a12653
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml
@@ -0,0 +1,20 @@
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetMagistrate
+  name: magistrate's headset
+  description: The headset used by the magistrate.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommand
+      - EncryptionKeyCentCom
+      - EncryptionKeyJustice
+      - EncryptionKeyPrison
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon_alt
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
index 13185f9b389..7c8ec011131 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -24,3 +24,14 @@
     sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
   - type: Clothing
     sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitMagistrate
+  name: magistrate robes
+  description: The robes worn by officials.
+  components:
+  - type: Sprite
+    sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi
+  - type: Clothing
+    sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml b/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml
index 4400a7b872a..dc9c6637304 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Marker/unique.yml
@@ -24,4 +24,18 @@
       - sprite: _Goobstation/Structures/Storage/closet.rsi
         state: ntr
   - type: UniqueEntityMarker
-    markerName: NanorepLocker
\ No newline at end of file
+    markerName: NanorepLocker
+
+- type: entity
+  name: magistrate locker unique marker
+  id: UniqueMarkerMagistrateLocker
+  parent: MarkerBase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: _Goobstation/Structures/Storage/closet.rsi
+        state: mag
+  - type: UniqueEntityMarker
+    markerName: MagistrateLocker
diff --git a/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml
index 9bf7854bf7d..afe4800c9f5 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Markers/Spawners/jobs.yml
@@ -23,3 +23,15 @@
     layers:
       - state: green
       - state: centcom
+
+- type: entity
+  id: SpawnPointMagistrate
+  parent: SpawnPointJobBase
+  name: magistrate
+  components:
+  - type: SpawnPoint
+    job_id: Magistrate
+  - type: Sprite
+    layers:
+      - state: green
+      - state: centcom
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml
index c49a3f34bc4..1e9b3f4d4e7 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/Electronics/door_access.yml
@@ -21,3 +21,11 @@
   components:
   - type: AccessReader
     access: [["BlueshieldOfficer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMAG
+  suffix: Magistrate, Locked
+  components:
+  - type: AccessReader
+    access: [["Magistrate"]]
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml
index e4bb5b8d48d..15adb7be458 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Devices/unique_teleporters.yml
@@ -22,7 +22,7 @@
   - type: Sprite
     state: bso
   - type: SpawnItemsOnUse
-    items: 
+    items:
     - id: UniqueLockerBlueshieldOfficerFilled
 
 - type: entity
@@ -46,7 +46,7 @@
   - type: Sprite
     state: ntr
   - type: SpawnItemsOnUse
-    items: 
+    items:
     - id: UniqueLockerNanorepFilled
 
 - type: entity
@@ -60,3 +60,27 @@
   - type: UniqueEntityMarker
     markerName: NanorepLocker
     stationOnly: false
+
+- type: entity
+  parent: BaseLockerTeleporter
+  id: MagistrateLockerTeleporter
+  name: magistrate locker teleporter
+  description: Device that allows you to request delivery of magistrate locker.
+  components:
+  - type: Sprite
+    state: mag
+  - type: SpawnItemsOnUse
+    items:
+    - id: UniqueLockerMagistrateFilled
+
+- type: entity
+  parent: MagistrateLockerTeleporter
+  id: UniqueMagistrateLockerTeleporter
+  suffix: Unique
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: UniqueEntityChecker
+    markerName: MagistrateLocker
+  - type: UniqueEntityMarker
+    markerName: MagistrateLocker
+    stationOnly: false
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml
index fb4d12bb33e..f21d039b394 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/rubber_stamps.yml
@@ -9,4 +9,17 @@
     stampState: "paper_stamp-nanorep"
   - type: Sprite
     sprite: _Goobstation/Objects/Misc/stamps.rsi
-    state: stamp-nanorep
\ No newline at end of file
+    state: stamp-nanorep
+
+- type: entity
+  name: magistrate rubber stamp
+  parent: RubberStampBase
+  id: RubberStampMagistrate
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-magistrate
+    stampedColor: "#76a5b4"
+    stampState: "paper_stamp-magistrate"
+  - type: Sprite
+    sprite: _Goobstation/Objects/Misc/stamps.rsi
+    state: stamp-magistrate
diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml
index 01df42e7f2c..e44c9fb990d 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Doors/Airlocks/access.yml
@@ -77,3 +77,23 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsNTR ]
+
+# MAG locked
+
+- type: entity
+  parent: AirlockCentralCommand
+  id: AirlockMagistrateCommandLocked
+  suffix: Magistrate, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMAG ]
+
+- type: entity
+  parent: AirlockCentralCommandGlass
+  id: AirlockMagistrateCommandGlassLocked
+  suffix: Magistrate, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMAG ]
diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 4cbb6f375c0..b4556c8f347 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -27,3 +27,18 @@
     stateBaseClosed: ntr
     stateDoorOpen: ntr_open
     stateDoorClosed: ntr_door
+
+- type: entity
+  id: LockerMagistrate
+  name: magistrate locker
+  parent: LockerBaseSecure
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: _Goobstation/Structures/Storage/closet.rsi
+  - type: AccessReader
+    access: [["Magistrate"]]
+  - type: EntityStorageVisuals
+    stateBaseClosed: mag
+    stateDoorOpen: bso_open # Sue me
+    stateDoorClosed: mag_door
diff --git a/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml b/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml
index 8a2ab206f30..8b8199f9ec7 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Unique/lockers.yml
@@ -5,7 +5,7 @@
   components:
   - type: ConditionalSpawner
     prototypes:
-    - UniqueMarkerNanorepLocker 
+    - UniqueMarkerNanorepLocker
 
 - type: entity
   id: UniqueLockerBlueshieldOfficerFilled
@@ -15,3 +15,12 @@
   - type: ConditionalSpawner
     prototypes:
     - UniqueMarkerBlueshieldLocker
+
+- type: entity
+  id: UniqueLockerMagistrateFilled
+  suffix: MAP THIS, Unique, Filled
+  parent: LockerMagistrateFilled
+  components:
+  - type: ConditionalSpawner
+    prototypes:
+    - UniqueMarkerMagistrateLocker
diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
new file mode 100644
index 00000000000..1e97aee0d32
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
@@ -0,0 +1,46 @@
+- type: job
+  id: Magistrate
+  name: Magistrate
+  description: "Ensure Space Law is being followed, Uphold Justice and Legality, Hold Hearings and Trials, Follow SOP, Ensure Command is Following Space Law."
+  playTimeTracker: JobMagistrate
+  requirements:
+    - !type:CharacterDepartmentTimeRequirement
+      department: Command
+      min: 54000 # 15 hours
+    - !type:CharacterDepartmentTimeRequirement
+      department: Security
+      min: 54000 # 15 hours
+  weight: 20
+  startingGear: MagistrateGear
+  icon: "JobIconMagistrate"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - External
+  - Cryogenics
+  - Maintenance
+  - Detective
+  - Corpsman
+  - Command
+  - CentralCommand
+  - Magistrate
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
+
+- type: startingGear
+  id: MagistrateGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMagistrate
+    shoes: ClothingShoesLeather
+    gloves: ClothingHandsGlovesColorWhite
+    id: CentcomPDA
+    ears: ClothingHeadsetMagistrate
+    pocket1: UniqueMagistrateLockerTeleporter
diff --git a/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml b/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml
index fbaf30463be..7faee3d9999 100644
--- a/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_Goobstation/Roles/play_time_trackers.yml
@@ -3,3 +3,6 @@
 
 - type: playTimeTracker
   id: JobNanotrasenRepresentative
+
+- type: playTimeTracker
+  id: JobMagistrate
diff --git a/Resources/Prototypes/_Goobstation/StatusEffects/job.yml b/Resources/Prototypes/_Goobstation/StatusEffects/job.yml
index 22ed9aeda4c..fbfadfe32af 100644
--- a/Resources/Prototypes/_Goobstation/StatusEffects/job.yml
+++ b/Resources/Prototypes/_Goobstation/StatusEffects/job.yml
@@ -11,3 +11,10 @@
   icon:
     sprite: /Textures/_Goobstation/Interface/Misc/job_icons.rsi
     state: blueshield
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconMagistrate
+  icon:
+    sprite: /Textures/_Goobstation/Interface/Misc/job_icons.rsi
+    state: magistrate
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 8807254a3d2..7dde264d713 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/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. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician. paper_stamp-magistrate by CerberusWolfie",
   "size": {
     "x": 32,
     "y": 32
@@ -239,6 +239,9 @@
     {
       "name": "paper_stamp-nanorep"
     },
+    {
+      "name": "paper_stamp-magistrate"
+    },
     {
       "name": "paper_stamp-rd"
     },
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-magistrate.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-magistrate.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdaa688372badd40e841be7b7841477bddc45e67
GIT binary patch
literal 4936
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e2b28207b7681212cd60af9abf77f084e05c4c1
GIT binary patch
literal 5237
zcmeHKc~leU79R=}3_^k80%ZwNQG_Iul_Z88lnBufs0yMunVCR@EF=NK=EAB_p)Lhm
z5mAbuR4iJgA_Wz#B5rj@KoP_RpW==_5#A)A;(0yi9nX3F&&iqXF28&4@4MeUnYDs>
zb4+nIH~;`lc>#Vx?CzyKjlaaMyCrcqu-ozE&_!w?l!#X-<zh)JidQEoP&}%Uhyg%z
zT`FidZ3c}8qjK|C>CFQ3FYXk&-FtOB+mF}2KlM(zzJB|g7n$wA1if8(%otNUk?2yV
zVEpqIL-c7Ta_ViMZN5R$nzy}*TJ)_wIme6JxhL83LW<Lsn4|mj?-vP}-4u(1PXZhR
z9d`z7vby(#7`wCewaJ6*h0zg{f7{ttY`iipEH$N|FKu&l&(V9QT`54p;?;+~L8<F}
zJhx_5snAwls^jp>-}F5^;IQ+!J&)!BfL@lw*H^&v^?g?mRz`8!diQ{4fmPQ0i*x;F
znkAUWofI5Dl3uw6-X*ed-E_dG%FK!UHp9u3mz!7C6|Q(3Rnyni{YzCw72bGg)$b<r
za!JDOG~Raq?<U#z_cWxK^>-Q>pP3nQ#%sKQ(HbzlTSRJ_`DNs-3<tgMV4-Md$!S;d
zt+2>}OZ@mry<s=fRxW4~g4SJMuZ4r$T)R!X+xUTZ8|K@JQJ$m6^b+u1`mutDq9rSO
zB9x1|euSoMDVc8ebzV8C@X+QTOn=a1vvyS4^qR1XCY)Vde0llS+WwZv$upx}tgA2D
zcz+QXKrpnR_EnbROoFd7gh4;w=RUgSkTB@1Y`MLA)p}TuQTe^C=PQT7l09L?CCZIH
zaiw>UAMl*Lx{Gvv`L&k=HPX6yz%Wfw9zR&?1P<_$%gX%oSFM(Ib=Q}*q#W)w1E2pK
zn0-57MYvCmal^L1+<I3ZSzIbVvvu(s+lsHe3dOal`nI-Tz|&4G9nd7o2ReoxO3w8g
z?cJ(udRlNY3+ucD3D#kY_(2?4E+s*TT!fM|QU%s}0KoOsC?GfnRpUiyltkuE=s(m%
zz)KK!!a@cg<STs9Xh}e_5)Db77YZlGz-)xz>4D>FI2eEwRYQ1<G*+hKXxs@pTn_fE
z6_W{goryZeov?^6!28OTD4tHDlR%=sMv_1!c;N6{B_ies{br9sU~le(Xti3wA(Imm
z6G@3Ql3W=@rm)#;GDsy;sYJ|zs7jKlAq`Qcnxcgm!SF*>uu`H>OXM=V784T5<JIm2
z0;b2m%TKD{^WVeERHH0le2_Jef=nTSWT})q)<dQCPryJ%6Z%^ZRVcPm$wE{mk5|H|
ze*!8~PZ<k=!0-JP@yb|TIS5QfV^Jw)s=}gDJ_<R9#}~Z!&{7a3kt%dv7}+0LswLtN
zWPOyIR--FtY$BNZd)$w#-_@=&#;o{!j-MQk*QUqwb0=uya}YT!K{&ccnBm4?K}?tk
zQCJ9(&R{T!EEWYJGMNk}lZ`@bF;zSUiYHU4AsLKnp)hcg1jC_;K{|tmphPN2btBR#
z3<eQGQG_U>(Le-6=%|PSje(f2lwe&6#g5HN3x!}%Y&OhfQ&}L9LWk%?IwFRMkeJOR
ziWzK{i0y{JFa_2@AuwmQTq%XH<&;RFD3q*_Md=h;!a3doo;!g`0zXIuv5;DfIbeH0
zB17bfst>AAi4+Y{Ls~v5ZZrnVjm==vDQ+w`koLi70jgACy{JW{fFv4Sr_nA92P+4o
z7SeVq2B4E;)o^^3D5RDvL*?>VcY-!4yw>x*nvZQL1X4qOkQ&86K`Mg-QaB(rluG5$
z85{<i2r@a~7<)M)5hwjGYwh;Ib4M0EK%&CpC+S2ZdnyEt8+jXfjg{y&6CSVI790p3
zDM1A#polI{3~NLMM?<nG6q_HT4f{?m`I}~-(^*UiWip5eiwzR#bP7yl!7P->fG7+$
z#G=7&H1@~nD!Evl2q{tTD2zvpE383vT;XSoE|v4g_KDG`b{#Ovh#-YHN*P8Loj@Kf
zmaLr^@2cgJ|BDZ<&S1=l!Td&K*yzG0A^H6%9OX+pbpF9(bRGV|2pII|AfLqVXSzPq
z^+^nTlJV#6`b^g+G4M&opS$b-Mi=hG#}q2V{sARopGtElo#tYnSzn3*=lB7`+F$7(
z6&o?hI7L913INQGX-~Z$T+F_~ghpx}-{0uIp1uLepv_r-2>=+_^ZdL+HP;`8Q)1e^
ztcL!Tsf-9P`qplDrd2(w<;n$$RZ!_xzlI#y65MNcmRZXcbzk@QEr#2tg@|_S*;C}@
zTUPFEILmT}dA0Asp43|S!7r)}cN+cI6Cb4Xr}W=g^2lx(G<w9j1zQhzCp5GqS2&k6
zumMK{Z}SfQU-e3B8yjz&d1gC(R?OzepL~1UPRwn~PS|3~Y@+AnkQaCFcWw1@o-p9)
z+2qqtKmK;MDt4&v_uGfsjTUt-&oEEtp0hadL=J50W<9!-WaeYMpziv$P7klTwq;Jm
zH#>)1JRA-3dsYc?C*qDpVNO^Gmt&rV!s-W9pEZJ6t<=<qsbAmRd#UhEW9u{9yLa!F
zqepV;3flgxs=)9E{JA_!R{q5zi^v=9CziS#eK2s-rQEob^A+&s&6~#)Cml;0>>1zK
zKVU5^G|qUHW2$F2RFe&qTZI*_Eo#kg{du7^V;rmLv?-8OGTfsH9_pL%!tR7c?iXI>
z25WjIKPlMX7-Md5w9>V;i)9vZ72P;H^3FoLDVc*)LW76aTOV#YSl`&+{ET}nt|Re9
zS|qo58(DwmaAj29({uUB+f#dkyUsrCJ2$0yKXP92SNsa|VesDL0?SfDQ>O6LtI0jt
zCogXs-Z}p6oF|cv3mk{~rmnY6Sh+=T*}7o)^WJXQvhP)4$kL*f2Lk-<Lz6D&205cB
zDgE~IicR^qjSjy8XSnNMGF(gb$gx>?CEUw0Y(iRTS~(7^Ryp|#@~Vqp*5~crZFca{
zKwYEp4Xd2i;;cU>dd;h=s_y%D$EIf;_VG{P*ogv@k|5H}EkEI2r@UT~X=6K-6g<?%
zyR@*(V_p2=Uxz&^YRqbW{c!w#sB{zcYW$B6>RreCUI`>$i*LISNM1BK`>6d~=PkL<
zI>i|^J$&zuK=SF0E(y;sm>fBm?-o|qcHVOP<C3nHvo<foEs`sCT?3>J_KvxPOei`c
z6C59A<sa=}ulMSZ_k~&fnya~reft+^wp5=V`lF+&C?z9u)=j^vh6PpM2I0=%S5F2s
zc_xc?5eHsOk3TytTAsUmUGVF}nGyx*hRbHeVPAN*H`nfu<AxTFA%ERHt2)c0R6Q$m
zZOweTNvJ8wd3kF+i@Xds*f|)KUc9#c&FXOL@28I2Fx5hIGRLX!MSYEpVDD9zzSZL|
zm+Y8<xNZ|&^1$!a=WRIb2Zs`m4I-Ou<I#%i5f%+C56O1zI1@!ulCxD&%+cSr&yGBB
zrV^mhXuzsTU#%E-`Eo)n?<6tqY^(Iv0X}NO4RSDDcamP_d2(XU#jer}<EPLmNq+om
z`BuZ=35mAlxMlSWS$ebBD=h0CC$DR2hyOXFP+(1uvU!2%qIzjBc^~f5Plkv^Xmjp{
i7@T6y;Kbo?hJXiiruiWa^!eEE0C@iM{HlGHrT+&ND)4y#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..327ad37558bdc6fc9b26114943b3fcb68a3bf430
GIT binary patch
literal 4569
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f3da9492f2125a7b6d2c389c3f6a2b96d42a352
GIT binary patch
literal 4424
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..981c5ec9b5f5e03abfe9c9450f8ba2ef6f5bb7c7
GIT binary patch
literal 4430
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json
new file mode 100644
index 00000000000..66fe2f9230f
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from paradise @ https://github.com/ParadiseSS13/Paradise/commit/14a7b74c2aad4002bf575687ed01321c8d66e5ff",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png
new file mode 100644
index 0000000000000000000000000000000000000000..60ff394c1f11d9919553a18d3c055805cb17d189
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9F5M?jcysy3fAP%zum
z#WAE}PI4jx)5QbJ{@-8sF7d&ovP6ev`|nvDIdN!h+V}asJ~J6x93NcW6~#8QC)MCz
zz1V~-i3%fSF281x#wQUDZU;-6Stg2pTyfhtVFp8ROCpnxK$;Lo!;=SU2UsRD-e|f0
f`nANzN?`_DAE$p2migX5YZ*LU{an^LB{Ts5{Cq))

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json
index 1c7da3045b0..6e3863d054a 100644
--- a/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/meta.json
@@ -12,6 +12,9 @@
       },
       {
         "name": "blueshield"
+      },
+      {
+        "name": "magistrate"
       }
   ]
 }
diff --git a/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/mag.png b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36a855df9664b7c41b8d41ddbb45f1ce1614082
GIT binary patch
literal 6494
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json
index 1701d119ac5..6c03554278c 100644
--- a/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Renee - https://discord.com/channels/1202734573247795300/1288192265319223387/1288254493020131368",
+  "copyright": "Made by Renee - https://discord.com/channels/1202734573247795300/1288192265319223387/1288254493020131368. Mag resprite by CerberusWolfie",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,9 @@
     },
     {
       "name": "bso"
+    },
+    {
+      "name": "mag"
     }
   ]
 }
diff --git a/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json
index cf9e466a53d..b2b1dcf57c8 100644
--- a/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Objects/Misc/stamps.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/fb1012102257b7b0a08d861fd2b8ba963c416e93. Resprited centcom sprite by BombasterDS",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. Resprited centcom sprite by BombasterDS (NanoTrasen Rep). Repsprited from NTR by CerberusWolfie (Magistrate)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,9 @@
     "states": [
         {
             "name": "stamp-nanorep"
+        },
+        {
+            "name": "stamp-magistrate"
         }
     ]
 }
diff --git a/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/stamp-magistrate.png b/Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi/stamp-magistrate.png
new file mode 100644
index 0000000000000000000000000000000000000000..501963b0fe024aa722af8a5a8d543ff8581fde92
GIT binary patch
literal 5299
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag.png b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fabadb1c98be09a2b1e447fa98ded0d82e83bf0
GIT binary patch
literal 6050
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
Z3JAoA?aLP$3h)I2!E*I>sdElX`zLX4A&39~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag_door.png b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/mag_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb09ddfde3d4715a51b90f0afe9acf47e881145b
GIT binary patch
literal 6130
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
CxMV2+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json
index 79b82e65e63..a149cb6a917 100644
--- a/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Made by Icepick - https://discord.com/channels/1202734573247795300/1236697829171527841/1282401830181277789",
+  "copyright": "Made by Icepick - https://discord.com/channels/1202734573247795300/1236697829171527841/1282401830181277789. Mag and Mag_Open resprited from BSO by CerberusWolfie",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -15,6 +15,12 @@
     },
     {
       "name": "bso_open"
+    },
+    {
+      "name": "mag"
+    },
+    {
+      "name": "mag_door"
     },
 	{
       "name": "ntr"

From eefa06d12b9c15b27f49f6a39fcc4dadd798a61f Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:27:19 +0000
Subject: [PATCH 62/64] Automatic Changelog Update (#1536)

---
 Resources/Changelog/Changelog.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ad1c330b8ea..7bb905d1de3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10217,3 +10217,22 @@ Entries:
   id: 6717
   time: '2025-01-17T10:30:44.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1579
+- author: CerberusWolfie
+  changes:
+    - type: Add
+      message: Added Magistrate role.
+    - type: Add
+      message: Added Dignitary Department.
+    - type: Add
+      message: Added winter coats for NTR and Magistrate on Glacier Spawn.
+    - type: Tweak
+      message: >-
+        Moved Blueshield Officer and Nanotrasen Representative to Dignitary
+        Department.
+    - type: Fix
+      message: Fixed the category groups identifier for BSO and NTR in Loadouts.
+    - type: Fix
+      message: Fixed Chief Justice tag in ID Card Computer.
+  id: 6718
+  time: '2025-01-17T15:26:50.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1536

From b338f1b778366fe275389f760af85e7e5f34463b Mon Sep 17 00:00:00 2001
From: Skubman <ba.fallaria@gmail.com>
Date: Fri, 17 Jan 2025 23:53:24 +0800
Subject: [PATCH 63/64] Vigor Buff & Lethargy Nerf (#1578)

# Description

Adds new attributes to Vigor and Lethargy to catch up with the recent
traits:

Vigor:
- Still has +10 stamina
- Now increases stamina regen per second from 3 to 3.6
  - Time to regenerate 50 stamina: ~13.8 seconds
- (As a reference, the base time to regenerate 50 stamina with 3 regen
is ~16.6 seconds)
- Now reduces the delay of stamina regen after stamina damage from 3
seconds to 2.25 seconds

Lethargy:
- Still has -15 stamina
- Now decreases stamina regen per second from 3 to 2.4
  - Time to regenerate 50 stamina: ~20.8 seconds
- Now increases the delay of stamina regen after stamina damage from 3
seconds to 3.75 seconds

As a bonus change to be consistent with the traits, Onis and Felinids
now have their stamina regen scaled precisely with their non-standard
stamina points, such that the time where they regenerate all their
stamina is the exact same. Onis have (3 * 1.15) 3.45 stamina regen, and
Felinids have (3 * 0.85) 2.55 stamina regen.

## Why / Balance

Vigor/Lethargy was one of the traits designed early in Einstein Engines'
lifetime. For better or for worse, Vigor has been powercreeped by
several traits in the same cost bracket:


![image](https://github.com/user-attachments/assets/7df6a18d-dc6d-499f-8c7d-1a7ef51c10ee)

Why get a +10 stamina stat increase when for the same points you can
either have a constant source of power attacks (Martial Artist),
traverse difficult terrain faster (Parkour Training), or have a constant
10% armor (Dermal Armor)?

Adding faster stamina regen could mean more stamina for Power Attacks in
prolonged fights, and being able to recover from stamina slowdowns
faster, escaping bad situations more efficiently. This makes Vigor more
or less up to par with the new traits.

## Media
**New Vigor Description**

![newvigor](https://github.com/user-attachments/assets/4735e7e2-70d7-4afe-84d7-ad120d839dd4)

**New Lethargy Description**

![newlethargy](https://github.com/user-attachments/assets/089573b8-05e3-40e2-bcce-f5c6b63eabec)

## Changelog

:cl: Skubman
- add: The Vigor trait now has additional effects! Aside from increasing
stamina, Vigor now increases stamina regen per second, and reduces the
delay of stamina regen after taking stamina damage. The opposite effects
have been added to the Lethargy trait.
- tweak: The Oni species now has slightly increased stamina regen, and
Felinids decreased stamina regen.
---
 Resources/Locale/en-US/traits/traits.ftl         | 12 ++++++++++--
 .../Prototypes/Entities/Mobs/Species/dwarf.yml   |  1 +
 .../Nyanotrasen/Entities/Mobs/Species/Oni.yml    |  1 +
 .../Entities/Mobs/Species/felinid.yml            |  1 +
 Resources/Prototypes/Traits/physical.yml         | 16 ++++++++--------
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 7dc82335181..43dd9f66a93 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -185,15 +185,23 @@ trait-description-MartialArtist =
     This has no effect on damage dealt with any form of armed melee.
     The [color=#9FED58]Boxer[/color], [color=#9FED58]Martial Artist[/color], and [color=#9FED58]Gladiator[/color] jobs start with this trait by default.
 
+-stamina-info = [color=gray]Most species start with [color=#919039]100 points[/color] of stamina and [color=#919039]3 points[/color] of stamina regen per second.[/color]
+
 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.
+    Your stamina is increased by [color=yellow]10 points[/color].
+    Your stamina regen per second is increased by [color=yellow]0.6 points[/color].
+    Stamina regen now starts [color=lightblue]2.25 seconds[/color] after taking stamina damage, instead of [color=lightblue]3 seconds[/color].
+    { -stamina-info }
 
 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.
+    Your stamina is decreased by [color=yellow]15 points[/color].
+    Your stamina regen per second is decreased by [color=yellow]0.6 points[/color].
+    Stamina regen now starts [color=lightblue]3.75 seconds[/color] after taking stamina damage, instead of [color=lightblue]3 seconds[/color].
+    { -stamina-info }
 
 trait-name-SignLanguage = Sign Language
 trait-description-SignLanguage =
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 72c1e782507..81dfc194a25 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -67,6 +67,7 @@
     boozeStrengthMultiplier: 0.5
   - type: Stamina
     critThreshold: 115
+    decay: 3.3 # 3 base decay multiplied by 1.15 = 3.3
   - type: FootPrints
     leftBarePrint: "footprint-left-bare-dwarf"
     rightBarePrint: "footprint-right-bare-dwarf"
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index 8ac15fd865c..c56c0b81aa8 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -36,6 +36,7 @@
         - MobLayer
   - type: Stamina
     critThreshold: 115
+    decay: 3.45 # 3 base decay multiplied by 1.15 = 3.45
   - type: TypingIndicator
     proto: oni
   - type: LanguageKnowledge
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 5247ed351b6..36ffbb0d577 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -48,6 +48,7 @@
         Blunt: 1
   - type: Stamina
     critThreshold: 85
+    decay: 2.55 # 3 base decay multiplied by 0.85 = 2.55
   - type: TypingIndicator
     proto: felinid
   - type: PseudoItem
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index 77ea7871f50..812765702e1 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -116,10 +116,10 @@
         - Oni
         - IPC
   functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: StaminaCritModifier
-          critThresholdModifier: 10
+    - !type:TraitModifyStamina
+      staminaModifier: 10
+      decayModifier: 0.6
+      cooldownModifier: -0.75
 
 - type: trait
   id: Lethargy
@@ -140,10 +140,10 @@
       species:
         - Felinid
   functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: StaminaCritModifier
-          critThresholdModifier: -15
+    - !type:TraitModifyStamina
+      staminaModifier: -15
+      decayModifier: -0.6
+      cooldownModifier: 0.75
 
 - type: trait
   id: HighAdrenaline

From 0ba87723c3e5e83df3797a9958d2694c7e280967 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:53:52 +0000
Subject: [PATCH 64/64] Automatic Changelog Update (#1578)

---
 Resources/Changelog/Changelog.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7bb905d1de3..3631d7e8cfb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10236,3 +10236,18 @@ Entries:
   id: 6718
   time: '2025-01-17T15:26:50.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1536
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        The Vigor trait now has additional effects! Aside from increasing
+        stamina, Vigor now increases stamina regen per second, and reduces the
+        delay of stamina regen after taking stamina damage. The opposite effects
+        have been added to the Lethargy trait.
+    - type: Tweak
+      message: >-
+        The Oni species now has slightly increased stamina regen, and Felinids
+        decreased stamina regen.
+  id: 6719
+  time: '2025-01-17T15:53:24.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1578