From 24993c3ffef9aaa48174a4ab3b59f02ed2d3cb3a Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:28:33 -0300
Subject: [PATCH 001/360] Fix xenoborg evac calling announcment (#41437)

* no longer calls evac if evac is called or if the round is over

* can't recall shuttle

* some commentary

* can recall next round

* cancel evac recalling

* add this back

* only call once

* admins can recall anyway now

* 1 bool is better than 2 i guess

* some cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Commands/ShuttleCommands.cs               |  2 +-
 .../Components/XenoborgsRuleComponent.cs      |  7 +++
 .../GameTicking/Rules/XenoborgsRuleSystem.cs  | 15 +++---
 Content.Server/RoundEnd/RoundEndSystem.cs     | 46 +++++++++++++++----
 4 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/Content.Server/Administration/Commands/ShuttleCommands.cs b/Content.Server/Administration/Commands/ShuttleCommands.cs
index 677c38ac4e..6dffe1f52c 100644
--- a/Content.Server/Administration/Commands/ShuttleCommands.cs
+++ b/Content.Server/Administration/Commands/ShuttleCommands.cs
@@ -35,7 +35,7 @@ namespace Content.Server.Administration.Commands
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _roundEndSystem.CancelRoundEndCountdown(shell.Player?.AttachedEntity, false);
+            _roundEndSystem.CancelRoundEndCountdown(shell.Player?.AttachedEntity, forceRecall: true);
         }
     }
 }
diff --git a/Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
index c7496bb0fb..4a018d7e6c 100644
--- a/Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
@@ -36,4 +36,11 @@ public sealed partial class XenoborgsRuleComponent : Component
     /// </summary>
     [DataField]
     public bool MothershipCoreDeathAnnouncmentSent = false;
+
+    /// <summary>
+    /// If the emergency shuttle trigged by <see cref="XenoborgShuttleCallPercentage"> was already called.
+    /// Will only call once. if a admin recalls it. it won't call again unless this is set to false by a admin
+    /// </summary>
+    [DataField]
+    public bool XenoborgShuttleCalled = false;
 }
diff --git a/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs b/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs
index 97a6efb471..cda1bce258 100644
--- a/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs
@@ -100,14 +100,17 @@ public sealed class XenoborgsRuleSystem : GameRuleSystem<XenoborgsRuleComponent>
 
         xenoborgsRuleComponent.MaxNumberXenoborgs = Math.Max(xenoborgsRuleComponent.MaxNumberXenoborgs, numXenoborgs);
 
-        if ((float)numXenoborgs / (numHumans + numXenoborgs) > xenoborgsRuleComponent.XenoborgShuttleCallPercentage)
+        if (xenoborgsRuleComponent.XenoborgShuttleCalled
+            || (float)numXenoborgs / (numHumans + numXenoborgs) <= xenoborgsRuleComponent.XenoborgShuttleCallPercentage
+            || _roundEnd.IsRoundEndRequested())
+            return;
+
+        foreach (var station in _station.GetStations())
         {
-            foreach (var station in _station.GetStations())
-            {
-                _chatSystem.DispatchStationAnnouncement(station, Loc.GetString("xenoborg-shuttle-call"), colorOverride: Color.BlueViolet);
-            }
-            _roundEnd.RequestRoundEnd(null, false);
+            _chatSystem.DispatchStationAnnouncement(station, Loc.GetString("xenoborg-shuttle-call"), colorOverride: Color.BlueViolet);
         }
+        _roundEnd.RequestRoundEnd(null, false, cantRecall: true);
+        xenoborgsRuleComponent.XenoborgShuttleCalled = true;
     }
 
     protected override void Started(EntityUid uid, XenoborgsRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index f59203c50c..8e728a962f 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -56,6 +56,11 @@ namespace Content.Server.RoundEnd
         public TimeSpan? ExpectedShuttleLength => ExpectedCountdownEnd - LastCountdownStart;
         public TimeSpan? ShuttleTimeLeft => ExpectedCountdownEnd - _gameTiming.CurTime;
 
+        /// <summary>
+        /// If the shuttle can't be recalled. if set to true, the station wont be able to recall
+        /// </summary>
+        public bool CantRecall = false;
+
         public TimeSpan AutoCallStartTime;
         private bool _autoCalledBefore = false;
 
@@ -85,6 +90,8 @@ namespace Content.Server.RoundEnd
                 _cooldownTokenSource = null;
             }
 
+            CantRecall = false;
+
             LastCountdownStart = null;
             ExpectedCountdownEnd = null;
             SetAutoCallTime();
@@ -116,7 +123,7 @@ namespace Content.Server.RoundEnd
 
         public bool CanCallOrRecall()
         {
-            return _cooldownTokenSource == null;
+            return _cooldownTokenSource == null && !CantRecall;
         }
 
         public bool IsRoundEndRequested()
@@ -124,7 +131,15 @@ namespace Content.Server.RoundEnd
             return _countdownTokenSource != null;
         }
 
-        public void RequestRoundEnd(EntityUid? requester = null, bool checkCooldown = true, string text = "round-end-system-shuttle-called-announcement", string name = "round-end-system-shuttle-sender-announcement")
+        /// <summary>
+        /// Starts the process of ending the round by calling evac
+        /// </summary>
+        /// <param name="requester"></param>
+        /// <param name="checkCooldown"></param>
+        /// <param name="text">text in the announcement of shuttle calling</param>
+        /// <param name="name">name in the announcement of shuttle calling</param>
+        /// <param name="cantRecall">if the station shouldn't be able to recall the shuttle</param>
+        public void RequestRoundEnd(EntityUid? requester = null, bool checkCooldown = true, string text = "round-end-system-shuttle-called-announcement", string name = "round-end-system-shuttle-sender-announcement", bool cantRecall = false)
         {
             var duration = DefaultCountdownDuration;
 
@@ -139,10 +154,19 @@ namespace Content.Server.RoundEnd
                 }
             }
 
-            RequestRoundEnd(duration, requester, checkCooldown, text, name);
+            RequestRoundEnd(duration, requester, checkCooldown, text, name, cantRecall);
         }
 
-        public void RequestRoundEnd(TimeSpan countdownTime, EntityUid? requester = null, bool checkCooldown = true, string text = "round-end-system-shuttle-called-announcement", string name = "round-end-system-shuttle-sender-announcement")
+        /// <summary>
+        /// Starts the process of ending the round by calling evac
+        /// </summary>
+        /// <param name="countdownTime">time for evac to arrive</param>
+        /// <param name="requester"></param>
+        /// <param name="checkCooldown"></param>
+        /// <param name="text">text in the announcement of shuttle calling</param>
+        /// <param name="name">name in the announcement of shuttle calling</param>
+        /// <param name="cantRecall">if the station shouldn't be able to recall the shuttle</param>
+        public void RequestRoundEnd(TimeSpan countdownTime, EntityUid? requester = null, bool checkCooldown = true, string text = "round-end-system-shuttle-called-announcement", string name = "round-end-system-shuttle-sender-announcement", bool cantRecall = false)
         {
             if (_gameTicker.RunLevel != GameRunLevel.InRound)
                 return;
@@ -154,6 +178,7 @@ namespace Content.Server.RoundEnd
                 return;
 
             _countdownTokenSource = new();
+            CantRecall = cantRecall;
 
             if (requester != null)
             {
@@ -214,12 +239,17 @@ namespace Content.Server.RoundEnd
             }
         }
 
-        public void CancelRoundEndCountdown(EntityUid? requester = null, bool checkCooldown = true)
+        public void CancelRoundEndCountdown(EntityUid? requester = null, bool forceRecall = false)
         {
-            if (_gameTicker.RunLevel != GameRunLevel.InRound) return;
-            if (checkCooldown && _cooldownTokenSource != null) return;
+            if (_gameTicker.RunLevel != GameRunLevel.InRound)
+                return;
+
+            if (!forceRecall && (CantRecall || _cooldownTokenSource != null))
+                return;
+
+            if (_countdownTokenSource == null)
+                return;
 
-            if (_countdownTokenSource == null) return;
             _countdownTokenSource.Cancel();
             _countdownTokenSource = null;
 

From 6486b81397fded692195f407ddbc64170bbd34a5 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Thu, 22 Jan 2026 19:54:42 +0100
Subject: [PATCH 002/360] Downstream fix for xenoborg evac calls

---
 Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs b/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs
index bb6ae0ad07..c0968ead8a 100644
--- a/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs
+++ b/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs
@@ -104,7 +104,7 @@ public sealed partial class CosmicCultSystem : SharedCosmicCultSystem
         Dirty(uid, monument);
         _ui.SetUiState(uid.Owner, MonumentKey.Key, new MonumentBuiState(monument));
 
-        if (!_evac.EmergencyShuttleArrived && _roundEnd.IsRoundEndRequested()) _roundEnd.CancelRoundEndCountdown(checkCooldown: false);
+        if (!_evac.EmergencyShuttleArrived && _roundEnd.IsRoundEndRequested()) _roundEnd.CancelRoundEndCountdown();
         var query = EntityQueryEnumerator<CosmicCultComponent>();
         while (query.MoveNext(out var cultist, out var cultComp))
         {

From d531f34b9c41cacd3b1847ba63e655d4d4ed1d82 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 2 Dec 2025 06:51:59 -0800
Subject: [PATCH 003/360] Fix Mothership cannot use their tools and BorgSystem
 cleanup. (#41673)

Fixe

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Silicons/Borgs/SharedBorgSystem.API.cs      | 13 ++++++-------
 .../Silicons/Borgs/SharedBorgSystem.cs          | 17 +++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs
index 821ef35d8d..3f86abb568 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs
@@ -24,7 +24,7 @@ public abstract partial class SharedBorgSystem
         if (!_mind.TryGetMind(chassis.Owner, out _, out _))
             return false;
 
-        if (!_mobState.IsAlive(chassis.Owner))
+        if (_mobState.IsIncapacitated(chassis.Owner))
             return false;
 
         return true;
@@ -39,13 +39,12 @@ public abstract partial class SharedBorgSystem
         if (chassis.Comp.Active)
             return false; // Already active.
 
-        if (CanActivate(chassis))
-        {
-            SetActive(chassis, true, user);
-            return true;
-        }
+        if (!CanActivate(chassis))
+            return false;
+
+        SetActive(chassis, true, user);
+        return true;
 
-        return false;
     }
 
     /// <summary>
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index d965a362ff..71818ca211 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -197,8 +197,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
         // Unpredicted because the event is raised on the server.
         _popup.PopupEntity(Loc.GetString("borg-mind-added", ("name", Identity.Name(chassis.Owner, EntityManager))), chassis.Owner);
 
-        if (CanActivate(chassis))
-            SetActive(chassis, true);
+        TryActivate(chassis);
+
         _appearance.SetData(chassis.Owner, BorgVisuals.HasPlayer, true);
     }
 
@@ -285,14 +285,9 @@ public abstract partial class SharedBorgSystem : EntitySystem
     private void OnMobStateChanged(Entity<BorgChassisComponent> chassis, ref MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Alive)
-        {
-            if (CanActivate(chassis))
-                SetActive(chassis, true, user: args.Origin);
-        }
+            TryActivate(chassis, args.Origin);
         else
-        {
             SetActive(chassis, false, user: args.Origin);
-        }
     }
 
     private void OnBeingGibbed(Entity<BorgChassisComponent> chassis, ref BeingGibbedEvent args)
@@ -357,8 +352,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
     // Raised when a power cell is inserted.
     private void OnPowerCellChanged(Entity<BorgChassisComponent> chassis, ref PowerCellChangedEvent args)
     {
-        if (CanActivate(chassis))
-            SetActive(chassis, true);
+        TryActivate(chassis);
     }
 
     public override void Update(float frameTime)
@@ -374,8 +368,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
             Dirty(uid, borgChassis);
 
             // If we aren't drawing and suddenly get enough power to draw again, reenable.
-            if (CanActivate((uid, borgChassis)))
-                SetActive((uid, borgChassis), true);
+            TryActivate((uid, borgChassis));
         }
     }
 }

From 6e7df0e06b2fcc384049fd2784a6b9277953865d Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:43:43 -0500
Subject: [PATCH 004/360] Minor cleanup of crowbars.yml (#41672)

* Minor cleanup of crowbars.yml

* Or, not and

* I think the CrowbarRed tag actually is used for belt sprite stuff? Removing a code comment calling it a legacy tag.
---
 .../Prototypes/Entities/Objects/Tools/crowbars.yml    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
index 31a6b8ef06..50ba2b9f7f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
@@ -1,8 +1,9 @@
 - type: entity
-  name: crowbar
+  abstract: true
   parent: BaseItem
   id: BaseCrowbar
-  abstract: true
+  name: crowbar
+  description: A multipurpose tool used for many tasks, such as prying doors or bludgeoning interdimensional invaders.
   components:
   - type: EmitSoundOnLand
     sound:
@@ -50,7 +51,6 @@
 - type: entity
   parent: BaseCrowbar
   id: Crowbar
-  description: A multipurpose tool to pry open doors and fight interdimensional invaders.
   components:
   - type: Sprite
     state: icon
@@ -61,10 +61,8 @@
 
 # Emergency (red) Crowbar
 - type: entity
-  name: emergency crowbar
   parent: BaseCrowbar
   id: CrowbarRed
-  description: An emergency crowbar designed to pry open doors and firelocks during power outages.
   components:
   - type: Tag
     tags:
@@ -99,7 +97,6 @@
 - type: entity
   parent: BaseCrowbar
   id: CrowbarGreen
-  description: A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe.
   components:
   - type: Sprite
     layers:
@@ -130,7 +127,6 @@
 - type: entity
   parent: BaseCrowbar
   id: CrowbarOrange
-  description: A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes.
   components:
   - type: Sprite
     layers:
@@ -161,7 +157,6 @@
 - type: entity
   parent: BaseCrowbar
   id: CrowbarYellow
-  description: A multipurpose tool to pry open doors and fight interdimensional invaders, dispensed from Engineering.
   components:
   - type: Sprite
     layers:

From 22c086c901847b417b76c7544fd8bcae7e73f627 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Tue, 2 Dec 2025 19:33:40 +0100
Subject: [PATCH 005/360] cleanup EntityStorageSystem (#40163)

---
 .../Storage/Systems/EntityStorageSystem.cs    |  42 +-----
 .../EntitySystems/EntityStorageSystem.cs      |  88 ++----------
 .../Components/EntityStorageComponent.cs      |  93 ++++++-------
 .../InsideEntityStorageComponent.cs           |  12 +-
 .../SharedEntityStorageSystem.cs              | 125 ++++++++++--------
 5 files changed, 133 insertions(+), 227 deletions(-)

diff --git a/Content.Client/Storage/Systems/EntityStorageSystem.cs b/Content.Client/Storage/Systems/EntityStorageSystem.cs
index ca2b986667..96dc353c48 100644
--- a/Content.Client/Storage/Systems/EntityStorageSystem.cs
+++ b/Content.Client/Storage/Systems/EntityStorageSystem.cs
@@ -1,43 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Client.Storage.Components;
-using Content.Shared.Destructible;
-using Content.Shared.Foldable;
-using Content.Shared.Interaction;
-using Content.Shared.Lock;
-using Content.Shared.Movement.Events;
-using Content.Shared.Storage.Components;
-using Content.Shared.Storage.EntitySystems;
-using Content.Shared.Verbs;
-using Robust.Shared.GameStates;
+using Content.Shared.Storage.EntitySystems;
 
 namespace Content.Client.Storage.Systems;
 
-public sealed class EntityStorageSystem : SharedEntityStorageSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<EntityStorageComponent, EntityUnpausedEvent>(OnEntityUnpausedEvent);
-        SubscribeLocalEvent<EntityStorageComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<EntityStorageComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<EntityStorageComponent, ActivateInWorldEvent>(OnInteract, after: new[] { typeof(LockSystem) });
-        SubscribeLocalEvent<EntityStorageComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
-        SubscribeLocalEvent<EntityStorageComponent, DestructionEventArgs>(OnDestruction);
-        SubscribeLocalEvent<EntityStorageComponent, GetVerbsEvent<InteractionVerb>>(AddToggleOpenVerb);
-        SubscribeLocalEvent<EntityStorageComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
-        SubscribeLocalEvent<EntityStorageComponent, FoldAttemptEvent>(OnFoldAttempt);
-
-        SubscribeLocalEvent<EntityStorageComponent, ComponentGetState>(OnGetState);
-        SubscribeLocalEvent<EntityStorageComponent, ComponentHandleState>(OnHandleState);
-    }
-
-    public override bool ResolveStorage(EntityUid uid, [NotNullWhen(true)] ref EntityStorageComponent? component)
-    {
-        if (component != null)
-            return true;
-
-        TryComp<EntityStorageComponent>(uid, out var storage);
-        component = storage;
-        return component != null;
-    }
-}
+public sealed class EntityStorageSystem : SharedEntityStorageSystem;
diff --git a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
index c38a3e9b17..e22a4f5d7e 100644
--- a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
@@ -1,22 +1,10 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
-using Content.Server.Storage.Components;
-using Content.Shared.Destructible;
-using Content.Shared.Explosion;
-using Content.Shared.Foldable;
-using Content.Shared.Interaction;
-using Content.Shared.Lock;
-using Content.Shared.Movement.Events;
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
-using Content.Shared.Tools.Systems;
-using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
-using Robust.Shared.Containers;
-using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 
 namespace Content.Server.Storage.EntitySystems;
@@ -32,30 +20,11 @@ public sealed class EntityStorageSystem : SharedEntityStorageSystem
     {
         base.Initialize();
 
-        /* CompRef things */
-        SubscribeLocalEvent<EntityStorageComponent, EntityUnpausedEvent>(OnEntityUnpausedEvent);
-        SubscribeLocalEvent<EntityStorageComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<EntityStorageComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<EntityStorageComponent, ActivateInWorldEvent>(OnInteract, after: new[] { typeof(LockSystem) });
-        SubscribeLocalEvent<EntityStorageComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
-        SubscribeLocalEvent<EntityStorageComponent, DestructionEventArgs>(OnDestruction);
-        SubscribeLocalEvent<EntityStorageComponent, GetVerbsEvent<InteractionVerb>>(AddToggleOpenVerb);
-        SubscribeLocalEvent<EntityStorageComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
-        SubscribeLocalEvent<EntityStorageComponent, FoldAttemptEvent>(OnFoldAttempt);
-
-        SubscribeLocalEvent<EntityStorageComponent, ComponentGetState>(OnGetState);
-        SubscribeLocalEvent<EntityStorageComponent, ComponentHandleState>(OnHandleState);
-        /* CompRef things */
-
         SubscribeLocalEvent<EntityStorageComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<EntityStorageComponent, WeldableAttemptEvent>(OnWeldableAttempt);
-        SubscribeLocalEvent<EntityStorageComponent, BeforeExplodeEvent>(OnExploded);
 
         SubscribeLocalEvent<InsideEntityStorageComponent, InhaleLocationEvent>(OnInsideInhale);
         SubscribeLocalEvent<InsideEntityStorageComponent, ExhaleLocationEvent>(OnInsideExhale);
         SubscribeLocalEvent<InsideEntityStorageComponent, AtmosExposedGetAirEvent>(OnInsideExposed);
-
-        SubscribeLocalEvent<InsideEntityStorageComponent, EntGotRemovedFromContainerMessage>(OnRemoved);
     }
 
     private void OnMapInit(EntityUid uid, EntityStorageComponent component, MapInitEvent args)
@@ -76,64 +45,30 @@ public sealed class EntityStorageSystem : SharedEntityStorageSystem
             _construction.AddContainer(uid, ContainerName, construction);
     }
 
-    public override bool ResolveStorage(EntityUid uid, [NotNullWhen(true)] ref EntityStorageComponent? component)
-    {
-        if (component != null)
-            return true;
-
-        TryComp<EntityStorageComponent>(uid, out var storage);
-        component = storage;
-        return component != null;
-    }
-
-    private void OnWeldableAttempt(EntityUid uid, EntityStorageComponent component, WeldableAttemptEvent args)
-    {
-        if (component.Open)
-        {
-            args.Cancel();
-            return;
-        }
-
-        if (component.Contents.Contains(args.User))
-        {
-            var msg = Loc.GetString("entity-storage-component-already-contains-user-message");
-            Popup.PopupEntity(msg, args.User, args.User);
-            args.Cancel();
-        }
-    }
-
-    private void OnExploded(Entity<EntityStorageComponent> ent, ref BeforeExplodeEvent args)
-    {
-        args.Contents.AddRange(ent.Comp.Contents.ContainedEntities);
-    }
-
     protected override void TakeGas(EntityUid uid, EntityStorageComponent component)
     {
         if (!component.Airtight)
             return;
 
-        var serverComp = (EntityStorageComponent) component;
-        var tile = GetOffsetTileRef(uid, serverComp);
+        var tile = GetOffsetTileRef(uid, component);
 
-        if (tile != null && _atmos.GetTileMixture(tile.Value.GridUid, null, tile.Value.GridIndices, true) is {} environment)
+        if (tile != null && _atmos.GetTileMixture(tile.Value.GridUid, null, tile.Value.GridIndices, true) is { } environment)
         {
-            _atmos.Merge(serverComp.Air, environment.RemoveVolume(serverComp.Air.Volume));
+            _atmos.Merge(component.Air, environment.RemoveVolume(component.Air.Volume));
         }
     }
 
     public override void ReleaseGas(EntityUid uid, EntityStorageComponent component)
     {
-        var serverComp = (EntityStorageComponent) component;
-
-        if (!serverComp.Airtight)
+        if (!component.Airtight)
             return;
 
-        var tile = GetOffsetTileRef(uid, serverComp);
+        var tile = GetOffsetTileRef(uid, component);
 
-        if (tile != null && _atmos.GetTileMixture(tile.Value.GridUid, null, tile.Value.GridIndices, true) is {} environment)
+        if (tile != null && _atmos.GetTileMixture(tile.Value.GridUid, null, tile.Value.GridIndices, true) is { } environment)
         {
-            _atmos.Merge(environment, serverComp.Air);
-            serverComp.Air.Clear();
+            _atmos.Merge(environment, component.Air);
+            component.Air.Clear();
         }
     }
 
@@ -149,13 +84,6 @@ public sealed class EntityStorageSystem : SharedEntityStorageSystem
         return null;
     }
 
-    private void OnRemoved(EntityUid uid, InsideEntityStorageComponent component, EntGotRemovedFromContainerMessage args)
-    {
-        if (args.Container.Owner != component.Storage)
-            return;
-        RemComp(uid, component);
-    }
-
     #region Gas mix event handlers
 
     private void OnInsideInhale(EntityUid uid, InsideEntityStorageComponent component, InhaleLocationEvent args)
diff --git a/Content.Shared/Storage/Components/EntityStorageComponent.cs b/Content.Shared/Storage/Components/EntityStorageComponent.cs
index 009083b2d8..ecfcccc45b 100644
--- a/Content.Shared/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Shared/Storage/Components/EntityStorageComponent.cs
@@ -5,42 +5,61 @@ using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.Storage.Components;
 
+/// <summary>
+/// A storage component that stores nearby entities in a container when this object is opened or closed.
+/// This does not have an UI like grid storage, but just makes them disappear inside.
+/// Used for lockers, crates etc.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause] // TODO: Field deltas
 public sealed partial class EntityStorageComponent : Component, IGasMixtureHolder
 {
-    public readonly float MaxSize = 1.0f; // maximum width or height of an entity allowed inside the storage.
+    /// <summary>
+    /// Maximum width or height of an entity allowed inside the storage.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float MaxSize = 1.0f;
 
-    public static readonly TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5);
+    /// <summary>
+    /// The delay between opening attempts when stuck inside an entity storage.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5);
+
+    /// <summary>
+    /// The next time a player stuck inside the entity storage can attempt to open it from inside.
+    /// </summary>
+    [DataField, AutoNetworkedField, AutoPausedField]
     public TimeSpan NextInternalOpenAttempt;
 
     /// <summary>
-    ///     Collision masks that get removed when the storage gets opened.
+    /// Collision masks that get removed when the storage gets opened.
     /// </summary>
-    public readonly int MasksToRemove = (int)(
+    [DataField]
+    public int MasksToRemove = (int)(
         CollisionGroup.MidImpassable |
         CollisionGroup.HighImpassable |
         CollisionGroup.LowImpassable);
 
     /// <summary>
-    ///     Collision masks that were removed from ANY layer when the storage was opened;
+    /// Collision masks that were removed from ANY layer when the storage was opened;
     /// </summary>
     [DataField]
     public int RemovedMasks;
 
     /// <summary>
-    /// The total amount of items that can fit in one entitystorage
+    /// The total amount of items that can fit in one entitystorage.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public int Capacity = 30;
 
     /// <summary>
-    /// Whether or not the entity still has collision when open
+    /// Whether or not the entity still has collision when open.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool IsCollidableWhenOpen;
 
     /// <summary>
@@ -48,7 +67,7 @@ public sealed partial class EntityStorageComponent : Component, IGasMixtureHolde
     /// If false, it prevents the storage from opening when the entity inside of it moves.
     /// This is for objects that you want the player to move while inside, like large cardboard boxes, without opening the storage.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool OpenOnMove = true;
 
     //The offset for where items are emptied/vacuumed for the EntityStorage.
@@ -60,62 +79,62 @@ public sealed partial class EntityStorageComponent : Component, IGasMixtureHolde
     public CollisionGroup EnteringOffsetCollisionFlags = CollisionGroup.Impassable | CollisionGroup.MidImpassable;
 
     /// <summary>
-    /// How close you have to be to the "entering" spot to be able to enter
+    /// How close you have to be to the "entering" spot to be able to enter.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float EnteringRange = 0.18f;
 
     /// <summary>
-    /// Whether or not to show the contents when the storage is closed
+    /// Whether or not to show the contents when the storage is closed.
     /// </summary>
     [DataField]
     public bool ShowContents;
 
     /// <summary>
-    /// Whether or not light is occluded by the storage
+    /// Whether or not light is occluded by the storage.
     /// </summary>
     [DataField]
     public bool OccludesLight = true;
 
     /// <summary>
-    /// Whether or not all the contents stored should be deleted with the entitystorage
+    /// Whether or not all the contents stored should be deleted with the entitystorage.
     /// </summary>
     [DataField]
     public bool DeleteContentsOnDestruction;
 
     /// <summary>
-    /// Whether or not the container is sealed and traps air inside of it
+    /// Whether or not the container is sealed and traps air inside of it.
     /// </summary>
     [DataField]
     public bool Airtight = true;
 
     /// <summary>
-    /// Whether or not the entitystorage is open or closed
+    /// Whether or not the entitystorage is open or closed.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool Open;
 
     /// <summary>
-    /// The sound made when closed
+    /// The sound made when closed.
     /// </summary>
     [DataField]
     public SoundSpecifier CloseSound = new SoundPathSpecifier("/Audio/Effects/closetclose.ogg");
 
     /// <summary>
-    /// The sound made when open
+    /// The sound made when opened.
     /// </summary>
     [DataField]
     public SoundSpecifier OpenSound = new SoundPathSpecifier("/Audio/Effects/closetopen.ogg");
 
     /// <summary>
-    ///     Whitelist for what entities are allowed to be inserted into this container. If this is not null, the
-    ///     standard requirement that the entity must be an item or mob is waived.
+    /// Whitelist for what entities are allowed to be inserted into this container. If this is not null, the
+    /// standard requirement that the entity must be an item or mob is waived.
     /// </summary>
     [DataField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
-    /// The contents of the storage
+    /// The contents of the storage.
     /// </summary>
     [ViewVariables]
     public Container Contents = default!;
@@ -128,32 +147,6 @@ public sealed partial class EntityStorageComponent : Component, IGasMixtureHolde
     public GasMixture Air { get; set; } = new(200);
 }
 
-[Serializable, NetSerializable]
-public sealed class EntityStorageComponentState : ComponentState
-{
-    public bool Open;
-
-    public int Capacity;
-
-    public bool IsCollidableWhenOpen;
-
-    public bool OpenOnMove;
-
-    public float EnteringRange;
-
-    public TimeSpan NextInternalOpenAttempt;
-
-    public EntityStorageComponentState(bool open, int capacity, bool isCollidableWhenOpen, bool openOnMove, float enteringRange, TimeSpan nextInternalOpenAttempt)
-    {
-        Open = open;
-        Capacity = capacity;
-        IsCollidableWhenOpen = isCollidableWhenOpen;
-        OpenOnMove = openOnMove;
-        EnteringRange = enteringRange;
-        NextInternalOpenAttempt = nextInternalOpenAttempt;
-    }
-}
-
 /// <summary>
 /// Raised on the entity being inserted whenever checking if an entity can be inserted into an entity storage.
 /// </summary>
diff --git a/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs b/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs
index 258ea07ec6..8d0b45a4a2 100644
--- a/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs
+++ b/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs
@@ -1,10 +1,16 @@
-namespace Content.Shared.Storage.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Storage.Components;
 
 /// <summary>
-///     Added to entities contained within entity storage, for directed event purposes.
+/// Added to entities contained within entity storage, for directed event purposes.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class InsideEntityStorageComponent : Component
 {
+    /// <summary>
+    /// The entity storage this entity is inside.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityUid Storage;
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index dd6f1a223e..93a534843a 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -1,10 +1,9 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Shared.Body.Components;
 using Content.Shared.Destructible;
 using Content.Shared.Foldable;
 using Content.Shared.Hands.Components;
+using Content.Shared.Explosion;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Lock;
@@ -19,7 +18,6 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
@@ -48,31 +46,23 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public const string ContainerName = "entity_storage";
 
-    protected void OnEntityUnpausedEvent(EntityUid uid, EntityStorageComponent component, EntityUnpausedEvent args)
+    public override void Initialize()
     {
-        component.NextInternalOpenAttempt += args.PausedTime;
-    }
+        base.Initialize();
 
-    protected void OnGetState(EntityUid uid, EntityStorageComponent component, ref ComponentGetState args)
-    {
-        args.State = new EntityStorageComponentState(component.Open,
-            component.Capacity,
-            component.IsCollidableWhenOpen,
-            component.OpenOnMove,
-            component.EnteringRange,
-            component.NextInternalOpenAttempt);
-    }
+        SubscribeLocalEvent<EntityStorageComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<EntityStorageComponent, ComponentStartup>(OnComponentStartup);
+        SubscribeLocalEvent<EntityStorageComponent, ActivateInWorldEvent>(OnInteract, after: new[] { typeof(LockSystem) });
+        SubscribeLocalEvent<EntityStorageComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
+        SubscribeLocalEvent<EntityStorageComponent, DestructionEventArgs>(OnDestruction);
+        SubscribeLocalEvent<EntityStorageComponent, GetVerbsEvent<InteractionVerb>>(AddToggleOpenVerb);
+        SubscribeLocalEvent<EntityStorageComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
+        SubscribeLocalEvent<EntityStorageComponent, FoldAttemptEvent>(OnFoldAttempt);
 
-    protected void OnHandleState(EntityUid uid, EntityStorageComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not EntityStorageComponentState state)
-            return;
-        component.Open = state.Open;
-        component.Capacity = state.Capacity;
-        component.IsCollidableWhenOpen = state.IsCollidableWhenOpen;
-        component.OpenOnMove = state.OpenOnMove;
-        component.EnteringRange = state.EnteringRange;
-        component.NextInternalOpenAttempt = state.NextInternalOpenAttempt;
+        SubscribeLocalEvent<EntityStorageComponent, WeldableAttemptEvent>(OnWeldableAttempt);
+        SubscribeLocalEvent<EntityStorageComponent, BeforeExplodeEvent>(OnExploded);
+
+        SubscribeLocalEvent<InsideEntityStorageComponent, EntGotRemovedFromContainerMessage>(OnRemoved);
     }
 
     protected virtual void OnComponentInit(EntityUid uid, EntityStorageComponent component, ComponentInit args)
@@ -82,12 +72,12 @@ public abstract class SharedEntityStorageSystem : EntitySystem
         component.Contents.OccludesLight = component.OccludesLight;
     }
 
-    protected virtual void OnComponentStartup(EntityUid uid, EntityStorageComponent component, ComponentStartup args)
+    private void OnComponentStartup(EntityUid uid, EntityStorageComponent component, ComponentStartup args)
     {
         _appearance.SetData(uid, StorageVisuals.Open, component.Open);
     }
 
-    protected void OnInteract(EntityUid uid, EntityStorageComponent component, ActivateInWorldEvent args)
+    private void OnInteract(EntityUid uid, EntityStorageComponent component, ActivateInWorldEvent args)
     {
         if (args.Handled || !args.Complex)
             return;
@@ -96,9 +86,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
         ToggleOpen(args.User, uid, component);
     }
 
-    public abstract bool ResolveStorage(EntityUid uid, [NotNullWhen(true)] ref EntityStorageComponent? component);
-
-    protected void OnLockToggleAttempt(EntityUid uid, EntityStorageComponent target, ref LockToggleAttemptEvent args)
+    private void OnLockToggleAttempt(EntityUid uid, EntityStorageComponent target, ref LockToggleAttemptEvent args)
     {
         // Cannot (un)lock open lockers.
         if (target.Open)
@@ -109,7 +97,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
             args.Cancelled = true;
     }
 
-    protected void OnDestruction(EntityUid uid, EntityStorageComponent component, DestructionEventArgs args)
+    private void OnDestruction(EntityUid uid, EntityStorageComponent component, DestructionEventArgs args)
     {
         component.Open = true;
         Dirty(uid, component);
@@ -125,7 +113,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
         }
     }
 
-    protected void OnRelayMovement(EntityUid uid, EntityStorageComponent component, ref ContainerRelayMovementEntityEvent args)
+    private void OnRelayMovement(EntityUid uid, EntityStorageComponent component, ref ContainerRelayMovementEntityEvent args)
     {
         if (!HasComp<HandsComponent>(args.Entity))
             return;
@@ -136,21 +124,54 @@ public abstract class SharedEntityStorageSystem : EntitySystem
         if (_timing.CurTime < component.NextInternalOpenAttempt)
             return;
 
-        component.NextInternalOpenAttempt = _timing.CurTime + EntityStorageComponent.InternalOpenAttemptDelay;
+        component.NextInternalOpenAttempt = _timing.CurTime + component.InternalOpenAttemptDelay;
         Dirty(uid, component);
 
         if (component.OpenOnMove)
             TryOpenStorage(args.Entity, uid);
     }
 
-    protected void OnFoldAttempt(EntityUid uid, EntityStorageComponent component, ref FoldAttemptEvent args)
+    private void OnFoldAttempt(EntityUid uid, EntityStorageComponent component, ref FoldAttemptEvent args)
     {
         if (args.Cancelled)
             return;
+
         args.Cancelled = component.Open || component.Contents.ContainedEntities.Count != 0;
     }
 
-    protected void AddToggleOpenVerb(EntityUid uid, EntityStorageComponent component, GetVerbsEvent<InteractionVerb> args)
+    private void OnWeldableAttempt(EntityUid uid, EntityStorageComponent component, WeldableAttemptEvent args)
+    {
+        if (component.Open)
+        {
+            args.Cancel();
+            return;
+        }
+
+        if (component.Contents.Contains(args.User))
+        {
+            var msg = Loc.GetString("entity-storage-component-already-contains-user-message");
+            Popup.PopupEntity(msg, args.User, args.User);
+            args.Cancel();
+        }
+    }
+
+    private void OnExploded(Entity<EntityStorageComponent> ent, ref BeforeExplodeEvent args)
+    {
+        args.Contents.AddRange(ent.Comp.Contents.ContainedEntities);
+    }
+
+    private void OnRemoved(EntityUid uid, InsideEntityStorageComponent component, EntGotRemovedFromContainerMessage args)
+    {
+        if (_timing.ApplyingState)
+            return; // the component removal is already networked on its own
+
+        if (args.Container.Owner != component.Storage)
+            return;
+
+        RemComp(uid, component);
+    }
+
+    private void AddToggleOpenVerb(EntityUid uid, EntityStorageComponent component, GetVerbsEvent<InteractionVerb> args)
     {
         if (!args.CanAccess || !args.CanInteract)
             return;
@@ -177,7 +198,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public void ToggleOpen(EntityUid user, EntityUid target, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(target, ref component))
+        if (!Resolve(target, ref component))
             return;
 
         if (component.Open)
@@ -192,7 +213,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public void EmptyContents(EntityUid uid, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(uid, ref component))
+        if (!Resolve(uid, ref component))
             return;
 
         var uidXform = Transform(uid);
@@ -205,7 +226,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public void OpenStorage(EntityUid uid, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(uid, ref component))
+        if (!Resolve(uid, ref component))
             return;
 
         if (component.Open)
@@ -226,7 +247,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public void CloseStorage(EntityUid uid, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(uid, ref component))
+        if (!Resolve(uid, ref component))
             return;
 
         if (!component.Open)
@@ -277,7 +298,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public bool Insert(EntityUid toInsert, EntityUid container, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(container, ref component))
+        if (!Resolve(container, ref component))
             return false;
 
         if (component.Open)
@@ -286,12 +307,14 @@ public abstract class SharedEntityStorageSystem : EntitySystem
             return true;
         }
 
+        // TODO: This should be done automatically for all containers
         _joints.RecursiveClearJoints(toInsert);
         if (!_container.Insert(toInsert, component.Contents))
             return false;
 
         var inside = EnsureComp<InsideEntityStorageComponent>(toInsert);
         inside.Storage = container;
+        Dirty(toInsert, inside);
         return true;
     }
 
@@ -300,7 +323,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
         if (!Resolve(container, ref xform, false))
             return false;
 
-        if (!ResolveStorage(container, ref component))
+        if (!Resolve(container, ref component))
             return false;
 
         _container.Remove(toRemove, component.Contents);
@@ -327,7 +350,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public bool CanInsert(EntityUid toInsert, EntityUid container, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(container, ref component))
+        if (!Resolve(container, ref component))
             return false;
 
         if (component.Open)
@@ -384,7 +407,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public bool IsOpen(EntityUid target, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(target, ref component))
+        if (!Resolve(target, ref component))
             return false;
 
         return component.Open;
@@ -392,7 +415,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public bool CanOpen(EntityUid user, EntityUid target, bool silent = false, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(target, ref component))
+        if (!Resolve(target, ref component))
             return false;
 
         if (!HasComp<HandsComponent>(user))
@@ -434,7 +457,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public bool AddToContents(EntityUid toAdd, EntityUid container, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(container, ref component))
+        if (!Resolve(container, ref component))
             return false;
 
         if (toAdd == container)
@@ -445,7 +468,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     private void ModifyComponents(EntityUid uid, EntityStorageComponent? component = null)
     {
-        if (!ResolveStorage(uid, ref component))
+        if (!Resolve(uid, ref component))
             return;
 
         if (!component.IsCollidableWhenOpen && TryComp<FixturesComponent>(uid, out var fixtures) &&
@@ -475,13 +498,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
         _appearance.SetData(uid, StorageVisuals.HasContents, component.Contents.ContainedEntities.Count > 0);
     }
 
-    protected virtual void TakeGas(EntityUid uid, EntityStorageComponent component)
-    {
+    protected virtual void TakeGas(EntityUid uid, EntityStorageComponent component) { }
 
-    }
-
-    public virtual void ReleaseGas(EntityUid uid, EntityStorageComponent component)
-    {
-
-    }
+    public virtual void ReleaseGas(EntityUid uid, EntityStorageComponent component) { }
 }

From 4b3e6e73a7980a3d1630ae320600f78e5b498484 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Thu, 22 Jan 2026 19:50:34 +0100
Subject: [PATCH 006/360] Downstream fix for EntityStorageSystem changes

---
 Content.Server/_DV/Autoclave/AutoclaveSystem.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Content.Server/_DV/Autoclave/AutoclaveSystem.cs b/Content.Server/_DV/Autoclave/AutoclaveSystem.cs
index b594990b7e..8468ed7827 100644
--- a/Content.Server/_DV/Autoclave/AutoclaveSystem.cs
+++ b/Content.Server/_DV/Autoclave/AutoclaveSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Power.EntitySystems;
 using Content.Shared._DV.Autoclave;
 using Content.Shared._DV.Surgery;
 using Content.Shared.Power;
+using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.GameObjects;
@@ -46,8 +47,7 @@ public sealed class AutoclaveSystem : EntitySystem
             if (!(isPowered && isClosed))
                 continue;
 
-            EntityStorageComponent? storageComponent = null;
-            if (!_entityStorage.ResolveStorage(uid, ref storageComponent))
+            if (!TryComp<EntityStorageComponent>(uid, out var storageComponent))
                 continue;
 
             foreach (var containedEntity in storageComponent.Contents.ContainedEntities)
@@ -61,9 +61,8 @@ public sealed class AutoclaveSystem : EntitySystem
 
     private void UpdateVisuals(EntityUid ent, bool isPowered, bool isClosed)
     {
-        EntityStorageComponent? storageComponent = null;
-        bool hasDirtyContents =
-            _entityStorage.ResolveStorage(ent, ref storageComponent)
+        var hasDirtyContents =
+                TryComp<EntityStorageComponent>(ent, out var storageComponent)
                 && storageComponent.Contents.ContainedEntities.Any(contained => _surgeryClean.RequiresCleaning(contained));
 
         var (greenLight, redLight) = (isPowered, isClosed, hasDirtyContents) switch

From cfb0ac862df3cf0b0ff298b723d910d217f88fe1 Mon Sep 17 00:00:00 2001
From: Pok <113675512+Pok27@users.noreply.github.com>
Date: Tue, 2 Dec 2025 21:39:21 +0200
Subject: [PATCH 007/360] Move some admin components to shared (#41677)

* AdminSystem-move-to-shared

* review
---
 .../Components/KillSignComponent.cs           |  7 -------
 .../Administration/Systems/BufferingSystem.cs |  7 +++++++
 .../Administration/Systems/KillSignSystem.cs  |  2 +-
 .../Tests/PostMapInitTest.cs                  | 15 +++++++--------
 .../Components/AdminMinigunComponent.cs       |  7 -------
 .../Components/KillSignComponent.cs           |  7 -------
 .../Components/SuperBonkComponent.cs          |  3 ++-
 .../Systems/AdminVerbSystem.Smites.cs         |  8 ++++----
 .../Systems/AdminVerbSystem.Tools.cs          |  5 ++---
 .../Administration/Systems/BufferingSystem.cs |  5 +++--
 .../Components/AdminMinigunComponent.cs       |  6 ++++++
 .../Components/BufferingComponent.cs          | 19 +++++++++++++------
 .../Components/DisarmProneComponent.cs        |  5 +----
 ...tandComponent.cs => HeadstandComponent.cs} |  0
 .../Components/KillSignComponent.cs           |  6 ++++++
 .../Components/SharedKillSignComponent.cs     |  9 ---------
 .../StationInfiniteBatteryTargetComponent.cs  | 11 +++++------
 .../Administration/Systems/AdminGunSystem.cs  |  4 ++--
 .../Systems/SharedBufferingSystem.cs          |  5 +++++
 19 files changed, 64 insertions(+), 67 deletions(-)
 delete mode 100644 Content.Client/Administration/Components/KillSignComponent.cs
 create mode 100644 Content.Client/Administration/Systems/BufferingSystem.cs
 delete mode 100644 Content.Server/Administration/Components/AdminMinigunComponent.cs
 delete mode 100644 Content.Server/Administration/Components/KillSignComponent.cs
 create mode 100644 Content.Shared/Administration/Components/AdminMinigunComponent.cs
 rename {Content.Server => Content.Shared}/Administration/Components/BufferingComponent.cs (67%)
 rename Content.Shared/Administration/Components/{SharedHeadstandComponent.cs => HeadstandComponent.cs} (100%)
 create mode 100644 Content.Shared/Administration/Components/KillSignComponent.cs
 delete mode 100644 Content.Shared/Administration/Components/SharedKillSignComponent.cs
 rename {Content.Server => Content.Shared}/Administration/Components/StationInfiniteBatteryTargetComponent.cs (55%)
 rename {Content.Server => Content.Shared}/Administration/Systems/AdminGunSystem.cs (80%)
 create mode 100644 Content.Shared/Administration/Systems/SharedBufferingSystem.cs

diff --git a/Content.Client/Administration/Components/KillSignComponent.cs b/Content.Client/Administration/Components/KillSignComponent.cs
deleted file mode 100644
index 91c44ef3f2..0000000000
--- a/Content.Client/Administration/Components/KillSignComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class KillSignComponent : SharedKillSignComponent;
diff --git a/Content.Client/Administration/Systems/BufferingSystem.cs b/Content.Client/Administration/Systems/BufferingSystem.cs
new file mode 100644
index 0000000000..e511bbff36
--- /dev/null
+++ b/Content.Client/Administration/Systems/BufferingSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Administration.Systems;
+
+namespace Content.Client.Administration.Systems;
+
+public sealed class BufferingSystem : SharedBufferingSystem
+{
+}
diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs
index c12f65f1f0..f15cfe6442 100644
--- a/Content.Client/Administration/Systems/KillSignSystem.cs
+++ b/Content.Client/Administration/Systems/KillSignSystem.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Utility;
 
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 95860b1720..1459214bba 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using YamlDotNet.RepresentationModel;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
 using Content.Server.Maps;
@@ -11,20 +12,18 @@ using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Roles;
+using Content.Shared.Station.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Prototypes;
-using Content.Shared.Station.Components;
 using Robust.Shared.EntitySerialization;
 using Robust.Shared.EntitySerialization.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Map.Events;
-
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 namespace Content.IntegrationTests.Tests
 {
     [TestFixture]
diff --git a/Content.Server/Administration/Components/AdminMinigunComponent.cs b/Content.Server/Administration/Components/AdminMinigunComponent.cs
deleted file mode 100644
index 368d3d3ba7..0000000000
--- a/Content.Server/Administration/Components/AdminMinigunComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class AdminMinigunComponent : Component
-{
-
-}
diff --git a/Content.Server/Administration/Components/KillSignComponent.cs b/Content.Server/Administration/Components/KillSignComponent.cs
deleted file mode 100644
index 11479c32fc..0000000000
--- a/Content.Server/Administration/Components/KillSignComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class KillSignComponent : SharedKillSignComponent;
diff --git a/Content.Server/Administration/Components/SuperBonkComponent.cs b/Content.Server/Administration/Components/SuperBonkComponent.cs
index 0ceeccd136..9c20c4d88a 100644
--- a/Content.Server/Administration/Components/SuperBonkComponent.cs
+++ b/Content.Server/Administration/Components/SuperBonkComponent.cs
@@ -6,7 +6,8 @@ namespace Content.Server.Administration.Components;
 /// <summary>
 /// Component to track the timer for the SuperBonk smite.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause, Access(typeof(SuperBonkSystem))]
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(SuperBonkSystem))]
 public sealed partial class SuperBonkComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 36f7399d87..2ad927aac9 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -1,4 +1,5 @@
-using Content.Server.Administration.Components;
+using System.Numerics;
+using System.Threading;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
 using Content.Server.Electrocution;
@@ -17,12 +18,14 @@ using Content.Server.Tabletop.Components;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clumsy;
 using Content.Shared.Cluwne;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Electrocution;
@@ -54,9 +57,6 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Spawners;
 using Robust.Shared.Utility;
-using System.Numerics;
-using System.Threading;
-using Content.Shared.Damage.Components;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Administration.Systems;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 8c7d3f33d1..f510ed52e9 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -1,11 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Administration.Components;
 using Content.Server.Cargo.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Hands.Systems;
-using Content.Server.Power.Components;
 using Content.Server.Revenant.Components; // Imp
 using Content.Server.Revenant.EntitySystems; // Imp
 using Content.Server.Stack;
@@ -15,10 +13,11 @@ using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Construction.Components;
-using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Database;
 using Content.Shared.Doors.Components;
diff --git a/Content.Server/Administration/Systems/BufferingSystem.cs b/Content.Server/Administration/Systems/BufferingSystem.cs
index f3df34e7d2..71e5c4d5c6 100644
--- a/Content.Server/Administration/Systems/BufferingSystem.cs
+++ b/Content.Server/Administration/Systems/BufferingSystem.cs
@@ -1,12 +1,13 @@
 using System.Numerics;
-using Content.Server.Administration.Components;
 using Content.Shared.Administration;
+using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.Administration.Systems;
 
-public sealed class BufferingSystem : EntitySystem
+public sealed class BufferingSystem : SharedBufferingSystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 
diff --git a/Content.Shared/Administration/Components/AdminMinigunComponent.cs b/Content.Shared/Administration/Components/AdminMinigunComponent.cs
new file mode 100644
index 0000000000..04a7aacd69
--- /dev/null
+++ b/Content.Shared/Administration/Components/AdminMinigunComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Administration.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class AdminMinigunComponent : Component;
diff --git a/Content.Server/Administration/Components/BufferingComponent.cs b/Content.Shared/Administration/Components/BufferingComponent.cs
similarity index 67%
rename from Content.Server/Administration/Components/BufferingComponent.cs
rename to Content.Shared/Administration/Components/BufferingComponent.cs
index 1f80376596..3d365d00aa 100644
--- a/Content.Server/Administration/Components/BufferingComponent.cs
+++ b/Content.Shared/Administration/Components/BufferingComponent.cs
@@ -1,22 +1,29 @@
-using Content.Server.Administration.Systems;
+using Content.Shared.Administration.Systems;
 
-namespace Content.Server.Administration.Components;
+namespace Content.Shared.Administration.Components;
 
-[RegisterComponent, Access(typeof(BufferingSystem))]
+[RegisterComponent]
+[Access(typeof(SharedBufferingSystem))]
 public sealed partial class BufferingComponent : Component
 {
     [DataField("minBufferTime")]
     public float MinimumBufferTime = 0.5f;
+
     [DataField("maxBufferTime")]
     public float MaximumBufferTime = 1.5f;
+
     [DataField("minTimeTilNextBuffer")]
     public float MinimumTimeTilNextBuffer = 10.0f;
+
     [DataField("maxTimeTilNextBuffer")]
     public float MaximumTimeTilNextBuffer = 120.0f;
-    [DataField("timeTilNextBuffer")]
+
+    [DataField]
     public float TimeTilNextBuffer = 15.0f;
-    [DataField("bufferingIcon")]
+
+    [DataField]
     public EntityUid? BufferingIcon = null;
-    [DataField("bufferingTimer")]
+
+    [DataField]
     public float BufferingTimer = 0.0f;
 }
diff --git a/Content.Shared/Administration/Components/DisarmProneComponent.cs b/Content.Shared/Administration/Components/DisarmProneComponent.cs
index 4ba11df8e2..86addab4f6 100644
--- a/Content.Shared/Administration/Components/DisarmProneComponent.cs
+++ b/Content.Shared/Administration/Components/DisarmProneComponent.cs
@@ -8,7 +8,4 @@ namespace Content.Shared.Administration.Components;
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedMeleeWeaponSystem))]
-public sealed partial class DisarmProneComponent : Component
-{
-
-}
+public sealed partial class DisarmProneComponent : Component;
diff --git a/Content.Shared/Administration/Components/SharedHeadstandComponent.cs b/Content.Shared/Administration/Components/HeadstandComponent.cs
similarity index 100%
rename from Content.Shared/Administration/Components/SharedHeadstandComponent.cs
rename to Content.Shared/Administration/Components/HeadstandComponent.cs
diff --git a/Content.Shared/Administration/Components/KillSignComponent.cs b/Content.Shared/Administration/Components/KillSignComponent.cs
new file mode 100644
index 0000000000..34c36759cc
--- /dev/null
+++ b/Content.Shared/Administration/Components/KillSignComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Administration.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class KillSignComponent : Component;
diff --git a/Content.Shared/Administration/Components/SharedKillSignComponent.cs b/Content.Shared/Administration/Components/SharedKillSignComponent.cs
deleted file mode 100644
index 9a95454f72..0000000000
--- a/Content.Shared/Administration/Components/SharedKillSignComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Administration.Components;
-
-[NetworkedComponent]
-public abstract partial class SharedKillSignComponent : Component
-{
-
-}
diff --git a/Content.Server/Administration/Components/StationInfiniteBatteryTargetComponent.cs b/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
similarity index 55%
rename from Content.Server/Administration/Components/StationInfiniteBatteryTargetComponent.cs
rename to Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
index 5543d5ed8c..d26527a472 100644
--- a/Content.Server/Administration/Components/StationInfiniteBatteryTargetComponent.cs
+++ b/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
@@ -1,10 +1,9 @@
-namespace Content.Server.Administration.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Administration.Components;
 
 /// <summary>
 /// This is used for the admin map-wide/station-wide/grid-wide infinite power trick.
 /// </summary>
-[RegisterComponent]
-public sealed partial class StationInfiniteBatteryTargetComponent : Component
-{
-
-}
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StationInfiniteBatteryTargetComponent : Component;
diff --git a/Content.Server/Administration/Systems/AdminGunSystem.cs b/Content.Shared/Administration/Systems/AdminGunSystem.cs
similarity index 80%
rename from Content.Server/Administration/Systems/AdminGunSystem.cs
rename to Content.Shared/Administration/Systems/AdminGunSystem.cs
index 6270481a3c..28ff142709 100644
--- a/Content.Server/Administration/Systems/AdminGunSystem.cs
+++ b/Content.Shared/Administration/Systems/AdminGunSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.Administration.Components;
+using Content.Shared.Administration.Components;
 using Content.Shared.Weapons.Ranged.Events;
 
-namespace Content.Server.Administration.Systems;
+namespace Content.Shared.Administration.Systems;
 
 public sealed class AdminGunSystem : EntitySystem
 {
diff --git a/Content.Shared/Administration/Systems/SharedBufferingSystem.cs b/Content.Shared/Administration/Systems/SharedBufferingSystem.cs
new file mode 100644
index 0000000000..a1f375ebfd
--- /dev/null
+++ b/Content.Shared/Administration/Systems/SharedBufferingSystem.cs
@@ -0,0 +1,5 @@
+namespace Content.Shared.Administration.Systems;
+
+public abstract class SharedBufferingSystem : EntitySystem
+{
+}

From bede43b560670b7184b34d5d54cf0704021b9747 Mon Sep 17 00:00:00 2001
From: imatsoup <93290208+imatsoup@users.noreply.github.com>
Date: Wed, 3 Dec 2025 03:25:03 +0000
Subject: [PATCH 008/360] Change default Rat King order from 'Loose' to
 'Follow' (#41680)

Update RatKingComponent.cs
---
 Content.Shared/RatKing/RatKingComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/RatKing/RatKingComponent.cs b/Content.Shared/RatKing/RatKingComponent.cs
index 712d4ae3a1..f3830cf4f7 100644
--- a/Content.Shared/RatKing/RatKingComponent.cs
+++ b/Content.Shared/RatKing/RatKingComponent.cs
@@ -56,7 +56,7 @@ public sealed partial class RatKingComponent : Component
     /// </summary>
     [DataField("currentOrders"), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
-    public RatKingOrderType CurrentOrder = RatKingOrderType.Loose;
+    public RatKingOrderType CurrentOrder = RatKingOrderType.Follow;
 
     /// <summary>
     /// The servants that the rat king is currently controlling

From 42e7e8fe88339bd684636e71c7d4f2381d814c72 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:55:29 +0100
Subject: [PATCH 009/360] Add status effect support to Traits, change
 PainNumbness to be a status effect (#41646)

* Initial commit

* Review comments

* Jobify

* Prototype(effect)
---
 .../DamageOverlayUiController.cs              |  4 ++-
 Content.Server/Cloning/CloningSystem.cs       | 35 +++++++++++++++++++
 .../Jobs/ApplyStatusEffectSpecial.cs          | 27 ++++++++++++++
 Content.Server/Traits/TraitSystem.cs          | 11 +++++-
 .../Cloning/CloningSettingsPrototype.cs       |  6 ++++
 Content.Shared/Roles/JobSpecial.cs            |  4 ++-
 .../StatusEffectNew/StatusEffectSystem.API.cs |  1 +
 .../StatusEffectSystem.Relay.cs               |  5 +++
 .../Traits/Assorted/PainNumbnessComponent.cs  | 16 ---------
 .../PainNumbnessStatusEffectComponent.cs      | 20 +++++++++++
 .../Traits/Assorted/PainNumbnessSystem.cs     | 32 +++++++++--------
 Content.Shared/Traits/TraitPrototype.cs       |  9 +++++
 .../Prototypes/Entities/Mobs/Player/clone.yml |  1 -
 .../Entities/StatusEffects/body.yml           | 25 +++++++++----
 Resources/Prototypes/Traits/disabilities.yml  |  6 ++--
 15 files changed, 158 insertions(+), 44 deletions(-)
 create mode 100644 Content.Server/Jobs/ApplyStatusEffectSpecial.cs
 delete mode 100644 Content.Shared/Traits/Assorted/PainNumbnessComponent.cs
 create mode 100644 Content.Shared/Traits/Assorted/PainNumbnessStatusEffectComponent.cs

diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
index 20db76554d..f709df4b77 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
@@ -3,6 +3,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.StatusEffectNew;
 using Content.Shared.Traits.Assorted;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
@@ -20,6 +21,7 @@ public sealed class DamageOverlayUiController : UIController
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     [UISystemDependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
+    [UISystemDependency] private readonly StatusEffectsSystem _statusEffects = default!;
     private Overlays.DamageOverlay _overlay = default!;
 
     public override void Initialize()
@@ -98,7 +100,7 @@ public sealed class DamageOverlayUiController : UIController
                 FixedPoint2 painLevel = 0;
                 _overlay.PainLevel = 0;
 
-                if (!EntityManager.HasComponent<PainNumbnessComponent>(entity))
+                if (!_statusEffects.TryEffectsWithComp<PainNumbnessStatusEffectComponent>(entity, out _))
                 {
                     foreach (var painDamageType in damageable.PainDamageGroups)
                     {
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 654a2de07e..bd53e32567 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
 using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew.Components;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
@@ -37,6 +38,7 @@ public sealed partial class CloningSystem : SharedCloningSystem
     [Dependency] private readonly SharedStorageSystem _storage = default!;
     [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!;
     [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly Shared.StatusEffectNew.StatusEffectsSystem _statusEffects = default!; //TODO: This system has to support both the old and new status effect systems, until the old is able to be fully removed.
 
     /// <summary>
     ///     Spawns a clone of the given humanoid mob at the specified location or in nullspace.
@@ -76,6 +78,10 @@ public sealed partial class CloningSystem : SharedCloningSystem
         if (settings.CopyImplants)
             CopyImplants(original, clone.Value, settings.CopyInternalStorage, settings.Whitelist, settings.Blacklist);
 
+        // Copy permanent status effects
+        if (settings.CopyStatusEffects)
+            CopyStatusEffects(original, clone.Value);
+
         var originalName = _nameMod.GetBaseName(original);
 
         // Set the clone's name. The raised events will also adjust their PDA and ID card names.
@@ -268,4 +274,33 @@ public sealed partial class CloningSystem : SharedCloningSystem
         }
 
     }
+
+    /// <summary>
+    ///    Scans all permanent status effects applied to the original entity and transfers them to the clone.
+    /// </summary>
+    public void CopyStatusEffects(Entity<StatusEffectContainerComponent?> original, Entity<StatusEffectContainerComponent?> target)
+    {
+        if (!Resolve(original, ref original.Comp, false))
+            return;
+
+        if (original.Comp.ActiveStatusEffects is null)
+            return;
+
+        foreach (var effect in original.Comp.ActiveStatusEffects.ContainedEntities)
+        {
+            if (!TryComp<StatusEffectComponent>(effect, out var effectComp))
+                continue;
+
+            //We are not interested in temporary effects, only permanent ones.
+            if (effectComp.EndEffectTime is not null)
+                continue;
+
+            var effectProto = Prototype(effect);
+
+            if (effectProto is null)
+                continue;
+
+            _statusEffects.TrySetStatusEffectDuration(target, effectProto);
+        }
+    }
 }
diff --git a/Content.Server/Jobs/ApplyStatusEffectSpecial.cs b/Content.Server/Jobs/ApplyStatusEffectSpecial.cs
new file mode 100644
index 0000000000..b06ce114ba
--- /dev/null
+++ b/Content.Server/Jobs/ApplyStatusEffectSpecial.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Roles;
+using Content.Shared.StatusEffectNew;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Jobs;
+
+/// <summary>
+/// Adds permanent status effects to the entity.
+/// TODO: Move this, and other JobSpecials, from Server to Shared.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ApplyStatusEffectSpecial : JobSpecial
+{
+    [DataField(required: true)]
+    public HashSet<EntProtoId> StatusEffects { get; private set; } = new();
+
+    public override void AfterEquip(EntityUid mob)
+    {
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        var statusSystem = entMan.System<StatusEffectsSystem>();
+        foreach (var effect in StatusEffects)
+        {
+            statusSystem.TrySetStatusEffectDuration(mob, effect);
+        }
+    }
+}
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 5e7675b76b..8e062785e2 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -2,6 +2,7 @@
 // using Content.Shared.Hands.Components;
 // using Content.Shared.Hands.EntitySystems;
 // using Content.Shared.Roles;
+// using Content.Shared.StatusEffectNew;
 // using Content.Shared.Traits;
 // using Content.Shared.Whitelist;
 // using Robust.Shared.Prototypes;
@@ -13,6 +14,7 @@
 //     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 //     [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
 //     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+//     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 //
 //     public override void Initialize()
 //     {
@@ -45,7 +47,14 @@
 //                 continue;
 //
 //             // Add all components required by the prototype
-//             EntityManager.AddComponents(args.Mob, traitPrototype.Components, false);
+//             if (traitPrototype.Components.Count > 0)
+//                 EntityManager.AddComponents(args.Mob, traitPrototype.Components, false);
+//
+//             // Add all JobSpecials required by the prototype
+//             foreach (var special in traitPrototype.Specials)
+//             {
+//                 special.AfterEquip(args.Mob);
+//             }
 //
 //             // Begin DeltaV - Add overridden components
 //             if(traitPrototype.OverriddenComponents != null)
diff --git a/Content.Shared/Cloning/CloningSettingsPrototype.cs b/Content.Shared/Cloning/CloningSettingsPrototype.cs
index b422f7188b..0b531561ca 100644
--- a/Content.Shared/Cloning/CloningSettingsPrototype.cs
+++ b/Content.Shared/Cloning/CloningSettingsPrototype.cs
@@ -50,6 +50,12 @@ public sealed partial class CloningSettingsPrototype : IPrototype, IInheritingPr
     [DataField]
     public bool CopyImplants = true;
 
+    /// <summary>
+    ///     Should infinite status effects applied to an entity be copied or not?
+    /// </summary>
+    [DataField]
+    public bool CopyStatusEffects = true;
+
     /// <summary>
     ///     Whitelist for the equipment allowed to be copied.
     /// </summary>
diff --git a/Content.Shared/Roles/JobSpecial.cs b/Content.Shared/Roles/JobSpecial.cs
index 468e939836..8ebeb69a6d 100644
--- a/Content.Shared/Roles/JobSpecial.cs
+++ b/Content.Shared/Roles/JobSpecial.cs
@@ -1,7 +1,9 @@
 namespace Content.Shared.Roles
 {
     /// <summary>
-    ///     Provides special hooks for when jobs get spawned in/equipped.
+    /// Provides special hooks for when jobs get spawned in/equipped.
+    /// TODO: This is being/should be utilized by more than jobs, and is really just a way to assign components/implants/status effects upon spawning. Rename this class and its derivatives in the future!
+    /// TODO: Move derivatives from Server to Shared, probably.
     /// </summary>
     [ImplicitDataDefinitionForInheritors]
     public abstract partial class JobSpecial
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index ab6362746c..a65d4fe063 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -353,6 +353,7 @@ public sealed partial class StatusEffectsSystem
     /// <summary>
     /// Returns all status effects that have the specified component.
     /// </summary>
+    /// <returns>Returns true if any entity with the specified component is found.</returns>
     public bool TryEffectsWithComp<T>(EntityUid? target, [NotNullWhen(true)] out HashSet<Entity<T, StatusEffectComponent>>? effects) where T : IComponent
     {
         effects = null;
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
index 3644bed45e..9b16aadff0 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Damage.Events;
+using Content.Shared.Mobs.Events;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Rejuvenate;
@@ -25,6 +27,9 @@ public sealed partial class StatusEffectsSystem
         SubscribeLocalEvent<StatusEffectContainerComponent, StandUpAttemptEvent>(RefRelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, StunEndAttemptEvent>(RefRelayStatusEffectEvent);
 
+        SubscribeLocalEvent<StatusEffectContainerComponent, BeforeForceSayEvent>(RelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, BeforeAlertSeverityCheckEvent>(RelayStatusEffectEvent);
+
         SubscribeLocalEvent<StatusEffectContainerComponent, AccentGetEvent>(RelayStatusEffectEvent);
     }
 
diff --git a/Content.Shared/Traits/Assorted/PainNumbnessComponent.cs b/Content.Shared/Traits/Assorted/PainNumbnessComponent.cs
deleted file mode 100644
index 9ae72c6286..0000000000
--- a/Content.Shared/Traits/Assorted/PainNumbnessComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Dataset;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Traits.Assorted;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class PainNumbnessComponent : Component
-{
-    /// <summary>
-    ///     The fluent string prefix to use when picking a random suffix
-    ///     This is only active for those who have the pain numbness component
-    /// </summary>
-    [DataField]
-    public ProtoId<LocalizedDatasetPrototype> ForceSayNumbDataset = "ForceSayNumbDataset";
-}
diff --git a/Content.Shared/Traits/Assorted/PainNumbnessStatusEffectComponent.cs b/Content.Shared/Traits/Assorted/PainNumbnessStatusEffectComponent.cs
new file mode 100644
index 0000000000..c5c340fd10
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/PainNumbnessStatusEffectComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Dataset;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits.Assorted;
+
+/// <summary>
+/// Hides the damage overlay and displays the health alert for the client controlling the entity as full.
+/// Has to be applied as a status effect.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PainNumbnessStatusEffectComponent : Component
+{
+    /// <summary>
+    /// The fluent string prefix to use when picking a random suffix upon taking damage.
+    /// This is only active for those who have the pain numbness status effect. Set to null to prevent changing.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? ForceSayNumbDataset = "ForceSayNumbDataset";
+}
diff --git a/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs b/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs
index 3ded13300d..688354c161 100644
--- a/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Damage.Events;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Events;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared.Traits.Assorted;
 
@@ -11,36 +12,37 @@ public sealed class PainNumbnessSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<PainNumbnessComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<PainNumbnessComponent, ComponentRemove>(OnComponentRemove);
-        SubscribeLocalEvent<PainNumbnessComponent, BeforeForceSayEvent>(OnChangeForceSay);
-        SubscribeLocalEvent<PainNumbnessComponent, BeforeAlertSeverityCheckEvent>(OnAlertSeverityCheck);
+        SubscribeLocalEvent<PainNumbnessStatusEffectComponent, StatusEffectAppliedEvent>(OnEffectApplied);
+        SubscribeLocalEvent<PainNumbnessStatusEffectComponent, StatusEffectRemovedEvent>(OnEffectRemoved);
+        SubscribeLocalEvent<PainNumbnessStatusEffectComponent, StatusEffectRelayedEvent<BeforeForceSayEvent>>(OnChangeForceSay);
+        SubscribeLocalEvent<PainNumbnessStatusEffectComponent, StatusEffectRelayedEvent<BeforeAlertSeverityCheckEvent>>(OnAlertSeverityCheck);
     }
 
-    private void OnComponentRemove(EntityUid uid, PainNumbnessComponent component, ComponentRemove args)
+    private void OnEffectApplied(Entity<PainNumbnessStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        if (!HasComp<MobThresholdsComponent>(uid))
+        if (!HasComp<MobThresholdsComponent>(args.Target))
             return;
 
-        _mobThresholdSystem.VerifyThresholds(uid);
+        _mobThresholdSystem.VerifyThresholds(args.Target);
     }
 
-    private void OnComponentInit(EntityUid uid, PainNumbnessComponent component, ComponentInit args)
+    private void OnEffectRemoved(Entity<PainNumbnessStatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
     {
-        if (!HasComp<MobThresholdsComponent>(uid))
+        if (!HasComp<MobThresholdsComponent>(args.Target))
             return;
 
-        _mobThresholdSystem.VerifyThresholds(uid);
+        _mobThresholdSystem.VerifyThresholds(args.Target);
     }
 
-    private void OnChangeForceSay(Entity<PainNumbnessComponent> ent, ref BeforeForceSayEvent args)
+    private void OnChangeForceSay(Entity<PainNumbnessStatusEffectComponent> ent, ref StatusEffectRelayedEvent<BeforeForceSayEvent> args)
     {
-        args.Prefix = ent.Comp.ForceSayNumbDataset;
+        if (ent.Comp.ForceSayNumbDataset != null)
+            args.Args.Prefix = ent.Comp.ForceSayNumbDataset.Value;
     }
 
-    private void OnAlertSeverityCheck(Entity<PainNumbnessComponent> ent, ref BeforeAlertSeverityCheckEvent args)
+    private void OnAlertSeverityCheck(Entity<PainNumbnessStatusEffectComponent> ent, ref StatusEffectRelayedEvent<BeforeAlertSeverityCheckEvent> args)
     {
-        if (args.CurrentAlert == "HumanHealth")
-            args.CancelUpdate = true;
+        if (args.Args.CurrentAlert == "HumanHealth")
+            args.Args.CancelUpdate = true;
     }
 }
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
index caacaaff4a..91fcfccc8a 100644
--- a/Content.Shared/Traits/TraitPrototype.cs
+++ b/Content.Shared/Traits/TraitPrototype.cs
@@ -1,3 +1,4 @@
+// using Content.Shared.Roles;
 // using Content.Shared.Whitelist; // DeltaV - Traits rework
 // using Robust.Shared.Prototypes;
 // using Content.Shared.Humanoid.Prototypes; // DeltaV - Trait species hiding
@@ -40,11 +41,19 @@
 //
 //     /// <summary>
 //     /// The components that get added to the player, when they pick this trait.
+//     /// NOTE: When implementing a new trait, it's preferable to add it as a status effect instead if possible.
 //     /// </summary>
 //     [DataField]
+//     [Obsolete("Use JobSpecial instead.")]
 //     public ComponentRegistry Components { get; private set; } = default!;
 //
 //     /// <summary>
+//     /// Special effects applied to the player who takes this Trait.
+//     /// </summary>
+//     [DataField(serverOnly: true)]
+//     public List<JobSpecial> Specials { get; private set; } = new();
+//
+//     /// <summary>
 //     /// DeltaV - Components that get added to the player, overriding any existing instances of the component if they exist.
 //     /// </summary>
 //     [DataField]
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index 7a3f9d99cf..6b0af7e86b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -23,7 +23,6 @@
   - Muted
   - Narcolepsy
   - Pacified
-  - PainNumbness
   - Paracusia
   - PermanentBlindness
   - Snoring
diff --git a/Resources/Prototypes/Entities/StatusEffects/body.yml b/Resources/Prototypes/Entities/StatusEffects/body.yml
index 3765ebefd4..4c94804884 100644
--- a/Resources/Prototypes/Entities/StatusEffects/body.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/body.yml
@@ -3,16 +3,27 @@
   id: BloodstreamStatusEffectBase
   abstract: true
   components:
-    - type: StatusEffect
-      whitelist:
-        components:
-          - Bloodstream
+  - type: StatusEffect
+    whitelist:
+      components:
+      - Bloodstream
 
 - type: entity
   parent: [ BloodstreamStatusEffectBase ]
   id: StatusEffectBloodloss
   name: bloodloss
   components:
-    - type: StutteringAccent
-    - type: DrunkStatusEffect
-    - type: RejuvenateRemovedStatusEffect
+  - type: StutteringAccent
+  - type: DrunkStatusEffect
+  - type: RejuvenateRemovedStatusEffect
+
+- type: entity
+  parent: MobStatusEffectBase
+  id: PainNumbnessTraitStatusEffect
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+      - MobThresholds
+  - type: PainNumbnessStatusEffect
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 488fdd7d8c..b9a8e1fd54 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -87,8 +87,10 @@
 #  name: trait-painnumbness-name
 #  description: trait-painnumbness-desc
 #  category: Disabilities
-#  components:
-#  - type: PainNumbness
+#  specials:
+#  - !type:ApplyStatusEffectSpecial
+#    statusEffects:
+#    - PainNumbnessTraitStatusEffect
 #
 #- type: trait
 #  id: ImpairedMobility

From 7f2b7500d2234e04904f22a47aaf120217c006c9 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Thu, 22 Jan 2026 19:57:30 +0100
Subject: [PATCH 010/360] Downstream fix for painnumbness status effect

---
 Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
index e44aedb99c..2bce1959c4 100644
--- a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
+++ b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
@@ -21,6 +21,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Content.Shared.Verbs;
 using Content.Shared._Goobstation.CCVar;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Server._Shitmed.Medical.Surgery;
 
@@ -35,6 +36,7 @@ public sealed class SurgerySystem : SharedSurgerySystem
     [Dependency] private readonly SurgeryCleanSystem _clean = default!; // DeltaV
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly InventorySystem _inventory = default!; // DeltaV - surgery cross contamination
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     private readonly HashSet<string> _dirtyDnas = new(); // DeltaV
 
@@ -251,7 +253,7 @@ public sealed class SurgerySystem : SharedSurgerySystem
     {
         if (HasComp<AnesthesiaComponent>(args.Body)) // DeltaV
             return;
-        if (HasComp<PainNumbnessComponent>(args.Body)) // DeltaV
+        if (_statusEffects.HasEffectComp<PainNumbnessStatusEffectComponent>(ent))
             return;
 
         _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);

From b24ec257b7e551027bc49a7df8bbe56a703557f0 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Fri, 23 Jan 2026 08:38:17 +0100
Subject: [PATCH 011/360] Extend DV trait system to handle status effects

---
 .../Tests/_DV/TraitSystemTest.cs              |  3 +++
 Content.Server/_DV/Traits/TraitSystem.cs      |  4 ++++
 .../Traits/Conditions/BaseTraitCondition.cs   |  2 ++
 .../_DV/Traits/Effects/ApplyStatusEffect.cs   | 23 +++++++++++++++++++
 .../_DV/Traits/Effects/BaseTraitEffect.cs     |  2 ++
 .../Prototypes/_DV/Traits/disabilities.yml    |  6 ++---
 6 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 Content.Shared/_DV/Traits/Effects/ApplyStatusEffect.cs

diff --git a/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs b/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
index 5daf838b25..670b443de2 100644
--- a/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
+++ b/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
@@ -7,6 +7,7 @@ using Content.Shared._DV.Traits.Effects;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -773,6 +774,7 @@ public sealed partial class TraitSystemTest
             LogMan = IoCManager.Resolve<ILogManager>(),
             JobId = jobId,
             SpeciesId = speciesId,
+            StatusEffects = IoCManager.Resolve<StatusEffectsSystem>(),
         };
     }
 
@@ -790,6 +792,7 @@ public sealed partial class TraitSystemTest
             CompFactory = factory,
             LogMan = IoCManager.Resolve<ILogManager>(),
             Transform = entMan.GetComponent<TransformComponent>(player),
+            StatusEffects = IoCManager.Resolve<StatusEffectsSystem>(),
         };
     }
 
diff --git a/Content.Server/_DV/Traits/TraitSystem.cs b/Content.Server/_DV/Traits/TraitSystem.cs
index f3d67e2571..d43cfe1f2e 100644
--- a/Content.Server/_DV/Traits/TraitSystem.cs
+++ b/Content.Server/_DV/Traits/TraitSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -25,6 +26,7 @@ public sealed class TraitSystem : EntitySystem
     [Dependency] private readonly ILogManager _log = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     private int _maxTraitCount;
     private int _maxTraitPoints;
@@ -104,6 +106,7 @@ public sealed class TraitSystem : EntitySystem
             JobId = jobId,
             SpeciesId = speciesId,
             Profile = profile,
+            StatusEffects = _statusEffects
         };
 
         foreach (var traitId in selectedTraits)
@@ -272,6 +275,7 @@ public sealed class TraitSystem : EntitySystem
             CompFactory = _factory,
             LogMan = _log,
             Transform = transform,
+            StatusEffects = _statusEffects,
         };
 
         foreach (var effect in trait.Effects)
diff --git a/Content.Shared/_DV/Traits/Conditions/BaseTraitCondition.cs b/Content.Shared/_DV/Traits/Conditions/BaseTraitCondition.cs
index 293dceeb7e..68781af5d2 100644
--- a/Content.Shared/_DV/Traits/Conditions/BaseTraitCondition.cs
+++ b/Content.Shared/_DV/Traits/Conditions/BaseTraitCondition.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Preferences;
+using Content.Shared.StatusEffectNew;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -48,6 +49,7 @@ public sealed class TraitConditionContext
     public required IPrototypeManager Proto { get; init; }
     public required IComponentFactory CompFactory { get; init; }
     public required ILogManager LogMan { get; init; }
+    public required StatusEffectsSystem StatusEffects { get; init; }
 
     /// <summary>
     /// The job ID of the player, if available.
diff --git a/Content.Shared/_DV/Traits/Effects/ApplyStatusEffect.cs b/Content.Shared/_DV/Traits/Effects/ApplyStatusEffect.cs
new file mode 100644
index 0000000000..712d628825
--- /dev/null
+++ b/Content.Shared/_DV/Traits/Effects/ApplyStatusEffect.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._DV.Traits.Effects;
+
+/// <summary>
+/// Effect that adds status effects to the player entity.
+/// </summary>
+public sealed partial class ApplyStatusEffect : BaseTraitEffect
+{
+    /// <summary>
+    /// The status effects to add to the entity.
+    /// </summary>
+    [DataField(required: true)]
+    public HashSet<EntProtoId> StatusEffects = new();
+
+    public override void Apply(TraitEffectContext ctx)
+    {
+        foreach (var effect in StatusEffects)
+        {
+            ctx.StatusEffects.TrySetStatusEffectDuration(ctx.Player, effect);
+        }
+    }
+}
diff --git a/Content.Shared/_DV/Traits/Effects/BaseTraitEffect.cs b/Content.Shared/_DV/Traits/Effects/BaseTraitEffect.cs
index a901e626d1..8e3118258e 100644
--- a/Content.Shared/_DV/Traits/Effects/BaseTraitEffect.cs
+++ b/Content.Shared/_DV/Traits/Effects/BaseTraitEffect.cs
@@ -1,3 +1,4 @@
+using Content.Shared.StatusEffectNew;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
@@ -28,4 +29,5 @@ public sealed class TraitEffectContext
     public required IComponentFactory CompFactory { get; init; }
     public required ILogManager LogMan { get; init; }
     public required TransformComponent Transform { get; init; }
+    public required StatusEffectsSystem StatusEffects { get; init; }
 }
diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml
index a8f6635fc1..b021d5c9ca 100644
--- a/Resources/Prototypes/_DV/Traits/disabilities.yml
+++ b/Resources/Prototypes/_DV/Traits/disabilities.yml
@@ -117,9 +117,9 @@
   description: trait-painnumbness-desc
   category: Disabilities
   effects:
-  - !type:AddCompsEffect
-    components:
-    - type: PainNumbness
+  - !type:ApplyStatusEffect
+    statusEffects:
+    - PainNumbnessTraitStatusEffect
 
 - type: trait
   id: Hemophilia

From 538a1b18394c49bfbe0d652c4ddce40a5f1d46b3 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Fri, 23 Jan 2026 09:14:02 +0100
Subject: [PATCH 012/360] Downstream devil fix to Painnumbness status effect

---
 .../Devil/Contract/DevilContractSystem.cs          | 14 ++++++++++++++
 .../Devil/Contract/DevilClausePrototype.cs         |  3 +++
 .../Prototypes/_Goobstation/Devil/clauses.yml      |  5 ++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
index 702a93205a..305d5ff864 100644
--- a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
+++ b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
@@ -35,6 +35,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using Content.Shared._EE.Silicon.Components;
+using Content.Shared.StatusEffectNew; // DeltaV - Clause status effects
 
 namespace Content.Server._Goobstation.Devil.Contract;
 
@@ -51,6 +52,7 @@ public sealed partial class DevilContractSystem : EntitySystem
     [Dependency] private readonly PolymorphSystem _polymorph = null!;
     [Dependency] private readonly ExplosionSystem _explosion = null!;
     [Dependency] private readonly MindSystem _mind = null!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = null!; // DeltaV - Clause status effects
 
     public override void Initialize()
     {
@@ -363,6 +365,8 @@ public sealed partial class DevilContractSystem : EntitySystem
 
         OverrideComponents(target, clause); // DeltaV - Fix component modifications
 
+        ApplyStatusEffect(target, clause); // DeltaV - Clause status effects
+
         ChangeDamageModifier(target, clause);
 
         AddImplants(target, clause);
@@ -414,6 +418,16 @@ public sealed partial class DevilContractSystem : EntitySystem
     }
     // End DeltaV Addition
 
+    // Begin DeltaV Addition - Devil clause status effects
+    private void ApplyStatusEffect(EntityUid target, DevilClausePrototype clause)
+    {
+        foreach (var effect in clause.StatusEffects)
+        {
+            _statusEffects.TrySetStatusEffectDuration(target, effect);
+        }
+    }
+    // End DeltaV Addition - Devil clause status effects
+
     private void SpawnItems(EntityUid target, DevilClausePrototype clause)
     {
         if (clause.SpawnedItems == null)
diff --git a/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs b/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs
index 6f72df57f0..5b0d28cc15 100644
--- a/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs
+++ b/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs
@@ -27,6 +27,9 @@ public sealed class DevilClausePrototype : IPrototype
     [DataField]
     public ComponentRegistry? OverriddenComponents; // DeltaV - Added overridden components
 
+    [DataField]
+    public HashSet<EntProtoId> StatusEffects = new(); // DeltaV - Add status effects to clauses
+
     [DataField]
     public string? DamageModifierSet;
 
diff --git a/Resources/Prototypes/_Goobstation/Devil/clauses.yml b/Resources/Prototypes/_Goobstation/Devil/clauses.yml
index f03a562f04..fe9db9627c 100644
--- a/Resources/Prototypes/_Goobstation/Devil/clauses.yml
+++ b/Resources/Prototypes/_Goobstation/Devil/clauses.yml
@@ -117,11 +117,14 @@
   id: pain
   clauseWeight: -5
   addedComponents:
-  - type: PainNumbness
   - type: SlowOnDamage
     speedModifierThresholds:
       60: 1
       80: 1
+  # Begin DeltaV Additions - Clause status effects
+  statusEffects:
+    - PainNumbnessTraitStatusEffect
+  # End DeltaV Additions - Clause status effects
 
 - type: clause
   id: chance

From 9dd9f5cd921cc233b7c0c27ea4b40d93ecf69fe5 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 3 Dec 2025 16:52:25 +0100
Subject: [PATCH 013/360] Reduce explosion airtight cache memory usage (#40912)

* Reduce explosion airtight cache memory usage

This means you can happily add explosion prototypes again

New approach has the tolerance value data in a shared storage with reference counting.

* Oops fix index removal

* Remove debug code and fix merge conflicts

* Also address my other review

* Oh it's in two places lmao

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../ExplosionAirtightGridComponent.cs         | 100 +++++++++
 .../EntitySystems/ExplosionGridTileFlood.cs   |  19 +-
 .../EntitySystems/ExplosionSystem.Airtight.cs | 209 +++++++++++++-----
 .../EntitySystems/ExplosionSystem.GridMap.cs  |   2 +-
 .../EntitySystems/ExplosionSystem.TileFill.cs |  19 +-
 .../EntitySystems/ExplosionSystem.cs          |   3 +
 Resources/Prototypes/explosion.yml            |  12 -
 7 files changed, 282 insertions(+), 82 deletions(-)
 create mode 100644 Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs

diff --git a/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs b/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs
new file mode 100644
index 0000000000..68f576dcb9
--- /dev/null
+++ b/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs
@@ -0,0 +1,100 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Explosion.Components;
+
+/// <summary>
+/// Stores data for airtight explosion traversal on a <see cref="MapGridComponent"/> entity.
+/// </summary>
+/// <seealso cref="ExplosionSystem"/>
+[RegisterComponent]
+[Access(typeof(ExplosionSystem), Other = AccessPermissions.None)]
+public sealed partial class ExplosionAirtightGridComponent : Component
+{
+    /// <summary>
+    /// Data for every tile on the current grid.
+    /// </summary>
+    /// <remarks>
+    /// Intentionally not saved.
+    /// </remarks>
+    [ViewVariables]
+    public readonly Dictionary<Vector2i, TileData> Tiles = new();
+
+    /// <summary>
+    ///     Data struct that describes the explosion-blocking airtight entities on a tile.
+    /// </summary>
+    public struct TileData
+    {
+        /// <summary>
+        /// Which index into the tolerance cache of <see cref="ExplosionSystem"/> this tile is using.
+        /// </summary>
+        public required int ToleranceCacheIndex;
+
+        /// <summary>
+        /// Which directions this tile is blocking explosions in. Bitflag field.
+        /// </summary>
+        public required AtmosDirection BlockedDirections;
+    }
+
+    /// <summary>
+    /// A set of tolerance values
+    /// </summary>
+    public struct ToleranceValues : IEquatable<ToleranceValues>
+    {
+        /// <summary>
+        /// Special value that indicates the entity is "invulnerable" against a specific explosion type.
+        /// </summary>
+        /// <remarks>
+        /// Here to deal with the limited range of <see cref="FixedPoint2"/> over typical floats.
+        /// </remarks>
+        public static readonly FixedPoint2 Invulnerable = FixedPoint2.MaxValue;
+
+        /// <summary>
+        /// The intensities at which explosions of each type can instantly break through an entity.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This is an array, with the index of each value corresponding to the "explosion type ID" cached by
+        /// <see cref="ExplosionSystem"/>.
+        /// </para>
+        /// <para>
+        /// Values are stored as <see cref="FixedPoint2"/> to avoid possible precision issues resulting in
+        /// different-but-almost-identical tolerance values wasting memory.
+        /// </para>
+        /// <para>
+        /// If a value is <see cref="Invulnerable"/>, that indicates the tile is invulnerable.
+        /// </para>
+        /// </remarks>
+        public required FixedPoint2[] Values;
+
+        public bool Equals(ToleranceValues other)
+        {
+            return Values.AsSpan().SequenceEqual(other.Values);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ToleranceValues other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            var hc = new HashCode();
+            hc.AddArray(Values);
+            return hc.ToHashCode();
+        }
+
+        public static bool operator ==(ToleranceValues left, ToleranceValues right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ToleranceValues left, ToleranceValues right)
+        {
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
index da3ce635af..0274979c55 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
@@ -1,7 +1,8 @@
 using System.Numerics;
 using Content.Shared.Atmos;
-using Robust.Shared.Map;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Map.Components;
+using static Content.Server.Explosion.Components.ExplosionAirtightGridComponent;
 using static Content.Server.Explosion.EntitySystems.ExplosionSystem;
 
 namespace Content.Server.Explosion.EntitySystems;
@@ -11,6 +12,8 @@ namespace Content.Server.Explosion.EntitySystems;
 /// </summary>
 public sealed class ExplosionGridTileFlood : ExplosionTileFlood
 {
+    private readonly ExplosionSystem _explosionSystem;
+
     public Entity<MapGridComponent> Grid;
     private bool _needToTransform = false;
 
@@ -45,7 +48,8 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
         Dictionary<Vector2i, NeighborFlag> edgeTiles,
         EntityUid? referenceGrid,
         Matrix3x2 spaceMatrix,
-        Angle spaceAngle)
+        Angle spaceAngle,
+        ExplosionSystem explosionSystem)
     {
         Grid = grid;
         _airtightMap = airtightMap;
@@ -53,6 +57,7 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
         _intensityStepSize = intensityStepSize;
         _typeIndex = typeIndex;
         _edgeTiles = edgeTiles;
+        _explosionSystem = explosionSystem;
 
         // initialise SpaceTiles
         foreach (var (tile, spaceNeighbors) in _edgeTiles)
@@ -193,11 +198,11 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
             NewBlockedTiles.Add(tile);
 
             // At what explosion iteration would this blocker be destroyed?
-            var required = tileData.ExplosionTolerance[_typeIndex];
+            var required = _explosionSystem.GetToleranceValues(tileData.ToleranceCacheIndex).Values[_typeIndex];
             if (required > _maxIntensity)
                 return; // blocker is never destroyed.
 
-            var clearIteration = iteration + (int) MathF.Ceiling(required / _intensityStepSize);
+            var clearIteration = iteration + (int) MathF.Ceiling((float)required / _intensityStepSize);
             if (FreedTileLists.TryGetValue(clearIteration, out var list))
                 list.Add(tile);
             else
@@ -261,13 +266,13 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
         foreach (var tile in tiles)
         {
             var blockedDirections = AtmosDirection.Invalid;
-            float sealIntegrity = 0;
+            FixedPoint2 sealIntegrity = 0;
 
             // Note that if (grid, tile) is not a valid key, then airtight.BlockedDirections will default to 0 (no blocked directions)
             if (_airtightMap.TryGetValue(tile, out var tileData))
             {
                 blockedDirections = tileData.BlockedDirections;
-                sealIntegrity = tileData.ExplosionTolerance[_typeIndex];
+                sealIntegrity = _explosionSystem.GetToleranceValues(tileData.ToleranceCacheIndex).Values[_typeIndex];
             }
 
             // First, yield any neighboring tiles that are not blocked by airtight entities on this tile
@@ -290,7 +295,7 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
                 continue;
 
             // At what explosion iteration would this blocker be destroyed?
-            var clearIteration = iteration + (int) MathF.Ceiling(sealIntegrity / _intensityStepSize);
+            var clearIteration = iteration + (int) MathF.Ceiling((float) sealIntegrity / _intensityStepSize);
 
             // Get the delayed neighbours list
             if (!_delayedNeighbors.TryGetValue(clearIteration, out var list))
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
index 303c4e8cab..da2a571900 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
@@ -1,44 +1,59 @@
+using System.Linq;
+using System.Runtime.InteropServices;
 using Content.Server.Atmos.Components;
+using Content.Server.Explosion.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Explosion;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Collections;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using static Content.Server.Explosion.Components.ExplosionAirtightGridComponent;
 
 namespace Content.Server.Explosion.EntitySystems;
 
 public sealed partial class ExplosionSystem
 {
-    private readonly Dictionary<string, int> _explosionTypes = new();
+    // We keep track of which tiles are airtight, and how much damage from explosions those airtight blockers can take.
+    // This is quite complicated, as the data effectively needs to be tracked *per tile*, *per explosion type*.
+    // To avoid wasting significant memory, we calculate the values and share the actual backing storage of it.
+    // Stored values are reference counted so they can be evicted when no longer needed.
+    // At the time of writing, this compacts the storage for Box Station from ~5500 tolerance value sets to 13,
+    // at round start.
+
+    // Use integers instead of prototype IDs for storage of explosion data.
+    // This allows us to replace a Dictionary<string, FixedPoint2> with just a FixedPoint2[].
+    private readonly Dictionary<ProtoId<ExplosionPrototype>, int> _explosionTypes = new();
+    // Index to look up if we already have an existing set of tolerance values stored, so the data can be shared.
+    private readonly Dictionary<ToleranceValues, int> _toleranceIndex = new();
+    // Storage for tolerance values. Entries form a free linked list when not occupied by a set of real values.
+    private ValueList<CacheEntry> _toleranceData;
+    // First free position in _toleranceData.
+    // -1 indicates there are no free slots left and the storage must be expanded.
+    private int _freeListHead = -1;
 
     private void InitAirtightMap()
     {
-        // Currently explosion prototype hot-reload isn't supported, as it would involve completely re-computing the
-        // airtight map. Could be done, just not yet implemented.
+        _explosionTypes.Clear();
 
-        // for storing airtight entity damage thresholds for all anchored airtight entities, we will use integers in
-        // place of id-strings. This initializes the string <--> id association.
-        // This allows us to replace a Dictionary<string, float> with just a float[].
         int index = 0;
         foreach (var prototype in _prototypeManager.EnumeratePrototypes<ExplosionPrototype>())
         {
-            // TODO EXPLOSION
-            // just make this a field on the prototype
             _explosionTypes.Add(prototype.ID, index);
             index++;
         }
     }
 
-    // The explosion intensity required to break an entity depends on the explosion type. So it is stored in a
-    // Dictionary<string, float>
-    //
-    // Hence, each tile has a tuple (Dictionary<string, float>, AtmosDirection). This specifies what directions are
-    // blocked, and how intense a given explosion type needs to be in order to destroy ALL airtight entities on that
-    // tile. This is the TileData struct.
-    //
-    // We then need this data for every tile on a grid. So this mess of a variable maps the Grid ID and Vector2i grid
-    // indices to this tile-data struct.
-    private Dictionary<EntityUid, Dictionary<Vector2i, TileData>> _airtightMap = new();
+    private void ReloadExplosionPrototypes(PrototypesReloadedEventArgs prototypesReloadedEventArgs)
+    {
+        if (!prototypesReloadedEventArgs.Modified.Contains(typeof(ExplosionPrototype)))
+            return;
+
+        InitAirtightMap();
+        ReloadMap();
+    }
 
     public void UpdateAirtightMap(EntityUid gridId, Vector2i tile, MapGridComponent? grid = null)
     {
@@ -46,6 +61,12 @@ public sealed partial class ExplosionSystem
             UpdateAirtightMap(gridId, grid, tile);
     }
 
+    [Access(typeof(ExplosionGridTileFlood))]
+    public ToleranceValues GetToleranceValues(int idx)
+    {
+        return _toleranceData[idx].Values;
+    }
+
     /// <summary>
     ///     Update the map of explosion blockers.
     /// </summary>
@@ -58,11 +79,12 @@ public sealed partial class ExplosionSystem
     /// </remarks>
     public void UpdateAirtightMap(EntityUid gridId, MapGridComponent grid, Vector2i tile)
     {
-        var tolerance = new float[_explosionTypes.Count];
-        var blockedDirections = AtmosDirection.Invalid;
+        var airtightGrid = EnsureComp<ExplosionAirtightGridComponent>(gridId);
 
-        if (!_airtightMap.ContainsKey(gridId))
-            _airtightMap[gridId] = new();
+        // Calculate tile new airtight state.
+
+        var tolerance = new FixedPoint2[_explosionTypes.Count];
+        var blockedDirections = AtmosDirection.Invalid;
 
         var anchoredEnumerator = _map.GetAnchoredEntitiesEnumerator(gridId, grid, tile);
 
@@ -72,17 +94,97 @@ public sealed partial class ExplosionSystem
                 continue;
 
             blockedDirections |= airtight.AirBlockedDirection;
-            var entityTolerances = GetExplosionTolerance(uid.Value);
-            for (var i = 0; i < tolerance.Length; i++)
-            {
-                tolerance[i] = Math.Max(tolerance[i], entityTolerances[i]);
-            }
+            GetExplosionTolerance(uid.Value, tolerance);
         }
 
-        if (blockedDirections != AtmosDirection.Invalid)
-            _airtightMap[gridId][tile] = new(tolerance, blockedDirections);
+        // Log.Info($"UPDATE {gridId}/{tile}: {blockedDirections}");
+
+        if (blockedDirections == AtmosDirection.Invalid)
+        {
+            // No longer airtight
+
+            if (!airtightGrid.Tiles.Remove(tile, out var tileData))
+            {
+                // Did not have this tile before and after, nothing to do.
+                return;
+            }
+
+            // Removing tile data.
+            DecrementRefCount(tileData.ToleranceCacheIndex);
+            return;
+        }
+
+        ref var tileEntry = ref CollectionsMarshal.GetValueRefOrAddDefault(airtightGrid.Tiles, tile, out var existed);
+        var cacheKey = new ToleranceValues { Values = tolerance };
+
+        // Remove previous tolerance reference if necessary.
+        if (existed)
+        {
+            ref var prevEntry = ref _toleranceData[tileEntry.ToleranceCacheIndex];
+            if (prevEntry.Values == cacheKey)
+            {
+                // No change.
+                return;
+            }
+
+            DecrementRefCount(tileEntry.ToleranceCacheIndex);
+        }
+
+        ref var newCacheIndex = ref CollectionsMarshal.GetValueRefOrAddDefault(_toleranceIndex, cacheKey, out existed);
+        if (existed)
+        {
+            _toleranceData[newCacheIndex].RefCount += 1;
+        }
         else
-            _airtightMap[gridId].Remove(tile);
+        {
+            if (_freeListHead < 0)
+                ExpandCache();
+
+            newCacheIndex = _freeListHead;
+            ref var newCacheEntry = ref _toleranceData[newCacheIndex];
+            _freeListHead = newCacheEntry.RefCount;
+
+            newCacheEntry.Values = cacheKey;
+            newCacheEntry.RefCount = 1;
+        }
+
+        tileEntry = new TileData
+        {
+            BlockedDirections = blockedDirections,
+            ToleranceCacheIndex = newCacheIndex,
+        };
+    }
+
+    private void ExpandCache()
+    {
+        var newCacheSize = Math.Max(8, _toleranceData.Count * 2);
+        var curSize = _toleranceData.Count;
+
+        _toleranceData.EnsureLength(newCacheSize);
+        for (var i = curSize; i < newCacheSize; i++)
+        {
+            _toleranceData[i].RefCount = _freeListHead;
+            _freeListHead = i;
+        }
+    }
+
+    private void DecrementRefCount(int index)
+    {
+        ref var cacheEntry = ref _toleranceData[index];
+
+        DebugTools.Assert(cacheEntry.RefCount > 0);
+        cacheEntry.RefCount -= 1;
+
+        if (cacheEntry.RefCount == 0)
+        {
+            var prevValue = cacheEntry.Values;
+            cacheEntry.Values = default;
+            cacheEntry.RefCount = _freeListHead;
+            _freeListHead = index;
+
+            var result = _toleranceIndex.Remove(prevValue);
+            DebugTools.Assert(result, "Failed to removed 0 refcounted index!");
+        }
     }
 
     /// <summary>
@@ -106,7 +208,7 @@ public sealed partial class ExplosionSystem
     /// <summary>
     ///     Return a dictionary that specifies how intense a given explosion type needs to be in order to destroy an entity.
     /// </summary>
-    public float[] GetExplosionTolerance(EntityUid uid)
+    private void GetExplosionTolerance(EntityUid uid, Span<FixedPoint2> explosionTolerance)
     {
         // How much total damage is needed to destroy this entity? This also includes "break" behaviors. This ASSUMES
         // that this will result in a non-airtight entity.Entities that ONLY break via construction graph node changes
@@ -117,14 +219,14 @@ public sealed partial class ExplosionSystem
             totalDamageTarget = _destructibleSystem.DestroyedAt(uid, destructible);
         }
 
-        var explosionTolerance = new float[_explosionTypes.Count];
         if (totalDamageTarget == FixedPoint2.MaxValue || !_damageableQuery.TryGetComponent(uid, out var damageable))
         {
             for (var i = 0; i < explosionTolerance.Length; i++)
             {
-                explosionTolerance[i] = float.MaxValue;
+                explosionTolerance[i] = ToleranceValues.Invulnerable;
             }
-            return explosionTolerance;
+
+            return;
         }
 
         // What multiple of each explosion type damage set will result in the damage exceeding the required amount? This
@@ -157,38 +259,43 @@ public sealed partial class ExplosionSystem
                 damagePerIntensity += value * mod * Math.Max(0, ev.DamageCoefficient);
             }
 
-            explosionTolerance[index] = damagePerIntensity > 0
+            var toleranceValue = damagePerIntensity > 0
                 ? (float) ((totalDamageTarget - damageable.TotalDamage) / damagePerIntensity)
-                : float.MaxValue;
-        }
+                : ToleranceValues.Invulnerable;
 
-        return explosionTolerance;
+            explosionTolerance[index] = toleranceValue;
+        }
     }
 
-    /// <summary>
-    ///     Data struct that describes the explosion-blocking airtight entities on a tile.
-    /// </summary>
-    public struct TileData
+    private void OnAirtightGridRemoved(EntityUid entity)
     {
-        public TileData(float[] explosionTolerance, AtmosDirection blockedDirections)
+        if (!TryComp(entity, out ExplosionAirtightGridComponent? airtightGrid))
+            return;
+
+        foreach (var tile in airtightGrid.Tiles.Values)
         {
-            ExplosionTolerance = explosionTolerance;
-            BlockedDirections = blockedDirections;
+            DecrementRefCount(tile.ToleranceCacheIndex);
         }
 
-        public float[] ExplosionTolerance;
-        public AtmosDirection BlockedDirections = AtmosDirection.Invalid;
+        RemComp<ExplosionAirtightGridComponent>(entity);
     }
 
     public override void ReloadMap()
     {
-        foreach (var(grid, dict) in _airtightMap)
+        var enumerator = EntityQueryEnumerator<ExplosionAirtightGridComponent, MapGridComponent>();
+        while (enumerator.MoveNext(out var uid, out var airtightComp, out var mapGrid))
         {
-            var comp = Comp<MapGridComponent>(grid);
-            foreach (var index in dict.Keys)
+            foreach (var pos in airtightComp.Tiles.Keys)
             {
-                UpdateAirtightMap(grid, comp, index);
+                UpdateAirtightMap(uid, pos, mapGrid);
             }
         }
     }
+
+    private struct CacheEntry
+    {
+        public ToleranceValues Values;
+        public int RefCount; // Doubles as freelist chain
+    }
+
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index 5c032d5c82..3767d0c238 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -38,7 +38,7 @@ public sealed partial class ExplosionSystem
 
     private void OnGridRemoved(GridRemovalEvent ev)
     {
-        _airtightMap.Remove(ev.EntityUid);
+        OnAirtightGridRemoved(ev.EntityUid);
         _gridEdges.Remove(ev.EntityUid);
 
         // this should be a small enough set that iterating all of them is fine
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index ac539da213..a274fa8660 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Server.Explosion.Components;
 using Content.Shared.Administration;
 using Content.Shared.Explosion.Components;
 using Robust.Shared.Map;
@@ -40,11 +41,7 @@ public sealed partial class ExplosionSystem
         if (totalIntensity <= 0 || slope <= 0)
             return null;
 
-        if (!_explosionTypes.TryGetValue(typeID, out var typeIndex))
-        {
-            Log.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported.");
-            return null;
-        }
+        var typeIndex = _explosionTypes[typeID];
 
         Vector2i initialTile;
         EntityUid? epicentreGrid = null;
@@ -103,8 +100,7 @@ public sealed partial class ExplosionSystem
             // set up the initial `gridData` instance
             encounteredGrids.Add(epicentreGrid.Value);
 
-            if (!_airtightMap.TryGetValue(epicentreGrid.Value, out var airtightMap))
-                airtightMap = new();
+            var airtightMap = CompOrNull<ExplosionAirtightGridComponent>(epicentreGrid)?.Tiles ?? new();
 
             var initialGridData = new ExplosionGridTileFlood(
                 (epicentreGrid.Value, Comp<MapGridComponent>(epicentreGrid.Value)),
@@ -115,7 +111,8 @@ public sealed partial class ExplosionSystem
                 _gridEdges[epicentreGrid.Value],
                 referenceGrid,
                 spaceMatrix,
-                spaceAngle);
+                spaceAngle,
+                this);
 
             gridData[epicentreGrid.Value] = initialGridData;
 
@@ -192,8 +189,7 @@ public sealed partial class ExplosionSystem
                 // is this a new grid, for which we must create a new explosion data set
                 if (!gridData.TryGetValue(grid, out var data))
                 {
-                    if (!_airtightMap.TryGetValue(grid, out var airtightMap))
-                        airtightMap = new();
+                    var airtightMap = CompOrNull<ExplosionAirtightGridComponent>(grid)?.Tiles ?? new();
 
                     data = new ExplosionGridTileFlood(
                         (grid, Comp<MapGridComponent>(grid)),
@@ -204,7 +200,8 @@ public sealed partial class ExplosionSystem
                         _gridEdges[grid],
                         referenceGrid,
                         spaceMatrix,
-                        spaceAngle);
+                        spaceAngle,
+                        this);
 
                     gridData[grid] = data;
                 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 934e4b40c6..223d1dbd01 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -106,6 +106,8 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
         _destructibleQuery = GetEntityQuery<DestructibleComponent>();
         _damageableQuery = GetEntityQuery<DamageableComponent>();
         _airtightQuery = GetEntityQuery<AirtightComponent>();
+
+        _prototypeManager.PrototypesReloaded += ReloadExplosionPrototypes;
     }
 
     private void OnReset(RoundRestartCleanupEvent ev)
@@ -124,6 +126,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
         base.Shutdown();
         _nodeGroupSystem.PauseUpdating = false;
         _pathfindingSystem.PauseUpdating = false;
+        _prototypeManager.PrototypesReloaded -= ReloadExplosionPrototypes;
     }
 
     private void RelayedResistance(EntityUid uid, ExplosionResistanceComponent component,
diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index ad00333892..4d3febeda7 100644
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -1,11 +1,3 @@
-#  Does not currently support prototype hot-reloading. See comments in c# file.
-
-# Note that for every explosion type you define, explosions & nukes will start performing worse
-# You should only define a new explopsion type if you really need to
-#
-# If you just want to modify properties other than `damagePerIntensity`, it'd be better to
-# split off explosion damage & explosion visuals/effects into their own separate prototypes.
-
 - type: explosion
   id: Default
   damagePerIntensity:
@@ -135,7 +127,3 @@
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
   fireStacks: 2
-
-# STOP
-# BEFORE YOU ADD MORE EXPLOSION TYPES CONSIDER IF AN EXISTING ONE IS SUITABLE
-# ADDING NEW ONES IS PROHIBITIVELY EXPENSIVE

From 2ac36dcbffd7b0ffd04719f7989b590edcb6319d Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:39:18 -0500
Subject: [PATCH 014/360] Minor cleanup of hypospray.yml + clearer medipen
 descriptions (#41682)

* Minor cleanup of hypospray.yml

* SyndiHypo is only used by corpsmen (it's not in the uplink) so the description should reflect that

* Small and large shots
---
 .../Objects/Specific/Medical/hypospray.yml    | 61 +++++++++----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 1cdcee68b3..fc6f4dc8e3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -60,7 +60,7 @@
   parent: [BaseHypospray, BaseSyndicateContraband]
   id: SyndiHypo
   name: gorlex hypospray
-  description: Using reverse engineered designs from NT, Cybersun produced these in limited quantities for Gorlex Marauder operatives.
+  description: A sterile injector for rapid administration of drugs. Reverse-engineered from Nanotrasen designs, Cybersun produces these in limited quantities for Gorlex Marauders' corpsmen.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/syndihypo.rsi
@@ -85,7 +85,7 @@
   parent: BaseHypospray
   id: BorgHypo
   name: borghypo
-  description: A sterile injector for rapid administration of drugs to patients. A cheaper and more specialised version for medical borgs.
+  description: A sterile injector for rapid administration of drugs to patients. This integrated model is specialized for use by medical borgs.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
@@ -137,7 +137,7 @@
     - JetInjectorDynamicMode
     - JetInjectorInjectMode
   - type: Tag
-    tags: 
+    tags:
     - JetInjector
 
 - type: entity
@@ -186,7 +186,7 @@
   parent: BaseHypospray
   id: ChemicalMedipen
   name: chemical medipen
-  description: A sterile injector for rapid administration of drugs to patients. This one can't be refilled.
+  description: A single-dose, non-refillable medipen.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -241,10 +241,10 @@
     - ChemicalMedipen
 
 - type: entity
-  name: emergency medipen
   parent: ChemicalMedipen
   id: EmergencyMedipen
-  description: A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine and tranexamic acid.
+  name: emergency medipen
+  description: A single-dose, non-refillable medipen containing epinephrine and tranexamic acid, used to temporarily stabilize patients in critical condition and buy time for them to recieve proper medical treatment. Beware of overdose.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -266,10 +266,10 @@
           Quantity: 3
 
 - type: entity
-  name: poison auto-injector
   parent: ChemicalMedipen
   id: AntiPoisonMedipen
-  description: A rapid dose of anti-poison. Contains ultravasculine and epinephrine.
+  name: poison auto-injector
+  description: A single-dose, non-refillable medipen containing ultravasculine and epinephrine, used to quickly and easily treat toxin poisoning.
   components:
   - type: Item
     inhandVisuals:
@@ -303,10 +303,10 @@
           Quantity: 5
 
 - type: entity
-  name: brute auto-injector
   parent: ChemicalMedipen
   id: BruteAutoInjector
-  description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications.
+  name: brute auto-injector
+  description: A single-dose, non-refillable medipen containing bicaridine and tranexamic acid, used to quickly and easily treat simple physical injuries. Commonly used as a combat medicine.
   components:
   - type: Item
     inhandVisuals:
@@ -340,10 +340,10 @@
           Quantity: 5
 
 - type: entity
-  name: burn auto-injector
   parent: ChemicalMedipen
   id: BurnAutoInjector
-  description: A rapid dose of dermaline and leporazine, intended for combat applications.
+  name: burn auto-injector
+  description: A single-dose, non-refillable medipen containing dermaline and leporazine, used to quickly and easily treat non-chemical burns. Commonly used as a combat medicine.
   components:
   - type: Item
     inhandVisuals:
@@ -377,10 +377,10 @@
           Quantity: 10
 
 - type: entity
-  name: rad auto-injector
   parent: ChemicalMedipen
   id: RadAutoInjector
-  description: A rapid dose of anti-radiation. Contains arithrazine and bicaridine.
+  name: rad auto-injector
+  description: A single-dose, non-refillable medipen containing arithrazine and bicaridine, used to quickly and easily treat radiation poisoning.
   components:
   - type: Item
     inhandVisuals:
@@ -414,10 +414,10 @@
           Quantity: 5
 
 - type: entity
-  name: puncturase auto-injector
   parent: ChemicalMedipen
   id: PunctAutoInjector
-  description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
+  name: puncturase auto-injector
+  description: A single-dose, non-refillable medipen containing puncturase and tranexamic acid, used to quickly and easily treat puncture wounds. Commonly used as a combat medicine.
   components:
   - type: Item
     inhandVisuals:
@@ -451,10 +451,10 @@
           Quantity: 5
 
 - type: entity
-  name: pyrazine auto-injector
   parent: ChemicalMedipen
   id: PyraAutoInjector
-  description: A rapid dose of pyrazine and dermaline, intended for combat applications.
+  name: pyrazine auto-injector
+  description: A single-dose, non-refillable medipen containing pyrazine and dermaline, used to quickly and easily treat thermal burns. Commonly used as a combat medicine.
   components:
   - type: Item
     inhandVisuals:
@@ -488,10 +488,9 @@
           Quantity: 10
 
 - type: entity
-  name: airloss auto-injector
   parent: ChemicalMedipen
   id: AirlossAutoInjector
-  description: A rapid dose of saline and salbutamol, intended to get someone up quickly. # Funkychem - dex+ -> salbutamol
+  description: A single-dose, non-refillable medipen containing saline and dexalin plus, used to quickly and easily treat blood loss and asphyxiation.
   components:
   - type: Item
     inhandVisuals:
@@ -527,10 +526,10 @@
     tags: []
 
 - type: entity
-  name: space medipen
   parent: ChemicalMedipen
   id: SpaceMedipen
-  description: Contains a mix of chemicals that protect you from the deadly effects of space.
+  name: space medipen
+  description: A single-dose, non-refillable medipen containing barozine and leporazine, used to protect exposed flesh from the deadly effects of space.
   components:
   - type: Item
     inhandVisuals:
@@ -565,10 +564,10 @@
             Quantity: 20
 
 - type: entity
-  name: hyperzine injector
   parent: [ChemicalMedipen, BaseSyndicateContraband]
   id: Stimpack
-  description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
+  name: hyperzine injector
+  description: A chemical injector containing a large shot of pure hyperzine. For when it's time to throw down. Effects last for about 30 seconds.
   components:
   - type: Item
     inhandVisuals:
@@ -604,10 +603,10 @@
     price: 1500
 
 - type: entity
-  name: hyperzine microinjector
   parent: [ChemicalMedipen, BaseSyndicateContraband]
   id: StimpackMini
-  description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects.
+  name: hyperzine microinjector
+  description: A chemical microinjector containing a small shot of pure hyperzine. Effects last for about 15 seconds.
   components:
   - type: Item
     inhandVisuals:
@@ -643,10 +642,10 @@
     price: 583 # 3500 for 6 as a freaky fraction
 
 - type: entity
-  name: combat medipen
   parent: [ChemicalMedipen, BaseSyndicateContraband]
   id: CombatMedipen
-  description: A single-use medipen containing chemicals that regenerate most types of damage.
+  name: combat medipen
+  description: A single-dose, non-refillable medipen containing a chemical cocktail that treats most forms of damage.
   components:
   - type: Item
     inhandVisuals:
@@ -682,9 +681,9 @@
     price: 1500
 
 - type: entity
-  suffix: Hypopen
   parent: Pen # It is just like normal pen, isn't it?
   id: Hypopen
+  suffix: Hypopen
   components:
   - type: SolutionContainerManager
     solutions:
@@ -729,10 +728,10 @@
       path: /Audio/Effects/unwrap.ogg
 
 - type: entity
-  name: weh auto-injector
   parent: ChemicalMedipen
   id: WehMedipen
-  description: A rapid dose of Weh. Contains juice that makes you Weh.
+  name: weh auto-injector
+  description: A non-refillable medipen containing multiple doses of weh.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi

From 1052426b3ec1a0de34837b0945d25d6cdd3e67de Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Fri, 23 Jan 2026 08:27:45 +0100
Subject: [PATCH 015/360] Downstream fix for hypospray description updates

---
 .../prototypes/entities/objects/specific/medical/hypospray.ftl | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Resources/Locale/en-US/_DV/prototypes/entities/objects/specific/medical/hypospray.ftl

diff --git a/Resources/Locale/en-US/_DV/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/en-US/_DV/prototypes/entities/objects/specific/medical/hypospray.ftl
new file mode 100644
index 0000000000..d8ddcf0d04
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/prototypes/entities/objects/specific/medical/hypospray.ftl
@@ -0,0 +1,3 @@
+# Funkychem - dex+ -> salbutamol
+ent-AirlossAutoInjector = airloss auto injector
+    .desc = A single-dose, non-refillable medipen containing saline and salbutamol, used to quickly and easily treat blood loss and asphyxiation.

From e21a29ddf822c715f34a51b1ba801614fbd4dbab Mon Sep 17 00:00:00 2001
From: Pok <113675512+Pok27@users.noreply.github.com>
Date: Wed, 3 Dec 2025 21:44:17 +0200
Subject: [PATCH 016/360] Predict BedSystem (#41686)

* BedSystem-move-to-shared

* dependency

* dirty!!!
---
 Content.Client/Bed/BedSystem.cs               |  8 ---
 Content.Server/Bed/BedSystem.cs               | 57 -------------------
 .../Bed/{SharedBedSystem.cs => BedSystem.cs}  | 54 ++++++++++++++++--
 .../Components/StasisBedBuckledComponent.cs   |  2 +-
 .../Bed/Components/StasisBedComponent.cs      |  2 +-
 5 files changed, 50 insertions(+), 73 deletions(-)
 delete mode 100644 Content.Client/Bed/BedSystem.cs
 delete mode 100644 Content.Server/Bed/BedSystem.cs
 rename Content.Shared/Bed/{SharedBedSystem.cs => BedSystem.cs} (70%)

diff --git a/Content.Client/Bed/BedSystem.cs b/Content.Client/Bed/BedSystem.cs
deleted file mode 100644
index 9c6f28290f..0000000000
--- a/Content.Client/Bed/BedSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Bed;
-
-namespace Content.Client.Bed;
-
-public sealed class BedSystem : SharedBedSystem
-{
-
-}
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
deleted file mode 100644
index c56838c032..0000000000
--- a/Content.Server/Bed/BedSystem.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Content.Shared.Bed;
-using Content.Shared.Bed.Components;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Power;
-using Content.Shared._EE.Silicon.Components; // Goobstation
-
-namespace Content.Server.Bed
-{
-    public sealed class BedSystem : SharedBedSystem
-    {
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-
-        private EntityQuery<SleepingComponent> _sleepingQuery;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            _sleepingQuery = GetEntityQuery<SleepingComponent>();
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var query = EntityQueryEnumerator<HealOnBuckleHealingComponent, HealOnBuckleComponent, StrapComponent>();
-            while (query.MoveNext(out var uid, out _, out var bedComponent, out var strapComponent))
-            {
-                if (Timing.CurTime < bedComponent.NextHealTime)
-                    continue;
-
-                bedComponent.NextHealTime += TimeSpan.FromSeconds(bedComponent.HealTime);
-
-                if (strapComponent.BuckledEntities.Count == 0)
-                    continue;
-
-                foreach (var healedEntity in strapComponent.BuckledEntities)
-                {
-                    if (_mobStateSystem.IsDead(healedEntity)
-                        || HasComp<SiliconComponent>(healedEntity)) // Goobstation
-                        continue;
-
-                    var damage = bedComponent.Damage;
-
-                    if (_sleepingQuery.HasComp(healedEntity))
-                        damage *= bedComponent.SleepMultiplier;
-
-                    _damageableSystem.TryChangeDamage(healedEntity, damage, true, origin: uid);
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Shared/Bed/SharedBedSystem.cs b/Content.Shared/Bed/BedSystem.cs
similarity index 70%
rename from Content.Shared/Bed/SharedBedSystem.cs
rename to Content.Shared/Bed/BedSystem.cs
index 0518f05fdf..c1b149c218 100644
--- a/Content.Shared/Bed/SharedBedSystem.cs
+++ b/Content.Shared/Bed/BedSystem.cs
@@ -1,10 +1,13 @@
+using Content.Shared._EE.Silicon.Components; // Goobstation
 using Content.Shared.Actions;
 using Content.Shared.Bed.Components;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Systems;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Power;
 using Content.Shared.Power.EntitySystems;
 using Robust.Shared.Timing;
@@ -12,16 +15,20 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.Bed;
 
-public abstract class SharedBedSystem : EntitySystem
+public sealed class BedSystem : EntitySystem
 {
-    [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly ActionContainerSystem _actConts = default!;
-    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private readonly SharedMetabolizerSystem _metabolizer = default!;
     [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
     [Dependency] private readonly SleepingSystem _sleepingSystem = default!;
 
+    private EntityQuery<SleepingComponent> _sleepingQuery;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -35,6 +42,8 @@ public abstract class SharedBedSystem : EntitySystem
         SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnStasisEmagged);
         SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<StasisBedBuckledComponent, GetMetabolicMultiplierEvent>(OnStasisGetMetabolicMultiplier);
+
+        _sleepingQuery = GetEntityQuery<SleepingComponent>();
     }
 
     private void OnHealMapInit(Entity<HealOnBuckleComponent> ent, ref MapInitEvent args)
@@ -46,7 +55,7 @@ public abstract class SharedBedSystem : EntitySystem
     private void OnStrapped(Entity<HealOnBuckleComponent> bed, ref StrappedEvent args)
     {
         EnsureComp<HealOnBuckleHealingComponent>(bed);
-        bed.Comp.NextHealTime = Timing.CurTime + TimeSpan.FromSeconds(bed.Comp.HealTime);
+        bed.Comp.NextHealTime = _timing.CurTime + TimeSpan.FromSeconds(bed.Comp.HealTime);
         _actionsSystem.AddAction(args.Buckle, ref bed.Comp.SleepAction, SleepingSystem.SleepActionId, bed);
         Dirty(bed);
 
@@ -62,7 +71,7 @@ public abstract class SharedBedSystem : EntitySystem
             _actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction);
             _sleepingSystem.TryWaking(args.Buckle.Owner);
         }
-        
+
         RemComp<HealOnBuckleHealingComponent>(bed);
     }
 
@@ -112,7 +121,7 @@ public abstract class SharedBedSystem : EntitySystem
         args.Multiplier *= stasis.Multiplier;
     }
 
-    protected void UpdateMetabolisms(Entity<StrapComponent?> ent)
+    private void UpdateMetabolisms(Entity<StrapComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return;
@@ -122,4 +131,37 @@ public abstract class SharedBedSystem : EntitySystem
             _metabolizer.UpdateMetabolicMultiplier(buckledEntity);
         }
     }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<HealOnBuckleHealingComponent, HealOnBuckleComponent, StrapComponent>();
+        while (query.MoveNext(out var uid, out _, out var bedComponent, out var strapComponent))
+        {
+            if (_timing.CurTime < bedComponent.NextHealTime)
+                continue;
+
+            bedComponent.NextHealTime += TimeSpan.FromSeconds(bedComponent.HealTime);
+
+            Dirty(uid, bedComponent);
+
+            if (strapComponent.BuckledEntities.Count == 0)
+                continue;
+
+            foreach (var healedEntity in strapComponent.BuckledEntities)
+            {
+                if (_mobStateSystem.IsDead(healedEntity)
+                    || HasComp<SiliconComponent>(healedEntity)) // Goobstation)
+                    continue;
+
+                var damage = bedComponent.Damage;
+
+                if (_sleepingQuery.HasComp(healedEntity))
+                    damage *= bedComponent.SleepMultiplier;
+
+                _damageableSystem.TryChangeDamage(healedEntity, damage, true, origin: uid);
+            }
+        }
+    }
 }
diff --git a/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs b/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
index 3a1c991b1e..09759f71ef 100644
--- a/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
+++ b/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
@@ -6,5 +6,5 @@ namespace Content.Shared.Bed.Components;
 /// Tracking component added to entities buckled to stasis beds.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedBedSystem))]
+[Access(typeof(BedSystem))]
 public sealed partial class StasisBedBuckledComponent : Component;
diff --git a/Content.Shared/Bed/Components/StasisBedComponent.cs b/Content.Shared/Bed/Components/StasisBedComponent.cs
index 97936261d6..fdc720c34f 100644
--- a/Content.Shared/Bed/Components/StasisBedComponent.cs
+++ b/Content.Shared/Bed/Components/StasisBedComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Bed.Components;
 /// A <see cref="StrapComponent"/> that modifies a strapped entity's metabolic rate by the given multiplier
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedBedSystem))]
+[Access(typeof(BedSystem))]
 public sealed partial class StasisBedComponent : Component
 {
     /// <summary>

From 1104f5d06610028d3bfe4a513d69917ebc9ee51d Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 3 Dec 2025 22:55:04 +0100
Subject: [PATCH 017/360] Change stamina slowdown to use a percentage-based
 threshold (#41691)

Change stamina to use a percentage based slowdown
---
 Content.Shared/Damage/Components/StaminaComponent.cs | 4 ++--
 Content.Shared/Damage/Systems/SharedStaminaSystem.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index b343b24403..9875d31349 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -85,10 +85,10 @@ public sealed partial class StaminaComponent : Component
     public SoundSpecifier ForceStandSuccessSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg");
 
     /// <summary>
-    /// Thresholds that determine an entity's slowdown as a function of stamina damage.
+    /// Thresholds that determine an entity's slowdown as a function of stamina damage, in percentages.
     /// </summary>
     [DataField]
-    public Dictionary<FixedPoint2, float> StunModifierThresholds = new() { {0, 1f }, { 60, 0.7f }, { 80, 0.5f } };
+    public Dictionary<FixedPoint2, float> StunModifierThresholds = new() { {0, 1f }, { 0.6, 0.7f }, { 0.8, 0.5f } };
 
     #region Animation Data
 
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index be89c12470..79028962ed 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -465,7 +465,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         {
             var key = thres.Key.Float();
 
-            if (ent.Comp.StaminaDamage >= key && key > closest && closest < ent.Comp.CritThreshold)
+            if ((ent.Comp.StaminaDamage / ent.Comp.CritThreshold) >= key && key > closest && closest < 1f)
                 closest = thres.Key;
         }
 

From 0150cb5ed1faf8574fb4a24793377ff7e06a9f2c Mon Sep 17 00:00:00 2001
From: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Date: Wed, 3 Dec 2025 20:06:54 -0500
Subject: [PATCH 018/360] Change to fix wording of Pun Pun's jacket (#41695)

Slightly fixes wording on Pun Pun's jacket
---
 Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 2cab388fc5..4cef2dbec5 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -34,7 +34,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitJacketMonkey
-  name: bartender's jacket monkey
+  name: bartender's monkey jacket
   description: A decent jacket, for a decent monkey.
   components:
   - type: Sprite

From a4c5cff209652790fb7d54101db2ad4a32946494 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Tue, 3 Jun 2025 12:01:07 -0400
Subject: [PATCH 019/360] Cargo food crate adjustments (#38006)

* Adjusted cargo food prices; removed large pizza/softdrinks crates

* Adjusted salvage_rewards.yml and cargo_gifts.yml around the removal of large pizza/soda crates
---
 Resources/Migrations/migration.yml            |  8 ++--
 .../Prototypes/Catalog/Cargo/cargo_food.yml   | 32 +++------------
 .../Prototypes/Catalog/Fills/Crates/food.yml  | 39 -------------------
 .../Prototypes/GameRules/cargo_gifts.yml      |  4 +-
 .../Prototypes/Procedural/salvage_rewards.yml |  2 +-
 5 files changed, 13 insertions(+), 72 deletions(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 9cdbac19ca..a7804f0be7 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -618,9 +618,9 @@ WeaponEnergyTurretStationMachineCircuitboard: WeaponEnergyTurretSecurityMachineC
 # 2025-05-30
 SpawnHonkBot: SpawnMobHonkBot
 
-# 2025-06-01 - DeltaV: https://github.com/space-wizards/space-station-14/pull/38006 was never merged
-#CrateFoodPizzaLarge: CrateFoodPizza
-#CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks
+# 2025-06-01
+CrateFoodPizzaLarge: CrateFoodPizza
+CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks
 
 # 2025-06-03
 FloorTileItemGCircuit4: FloorTileItemGCircuit
@@ -691,4 +691,4 @@ ToyOwlman: ToyFigurineOwlman
 ToySkeleton: ToyFigurineSkeleton
 
 # 2025-10-28
-DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
\ No newline at end of file
+DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index e5847179c9..eec2516a8e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -4,27 +4,17 @@
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
     state: margherita-slice
   product: CrateFoodPizza
-  cost: 1000 # DeltaV - raised from 450
+  cost: 1000 # DeltaV - Lowered from 1600
   category: cargoproduct-category-name-food
   group: market
 
-#- type: cargoProduct # DeltaV - Removed to not invalidate chef
-#  id: FoodPizzaLarge
-#  icon:
-#    sprite: Objects/Consumable/Food/Baked/pizza.rsi
-#    state: margherita
-#  product: CrateFoodPizzaLarge
-#  cost: 1800
-#  category: cargoproduct-category-name-food
-#  group: market
-
 - type: cargoProduct
   id: FoodMRE
   icon:
     sprite: Objects/Consumable/Food/snacks.rsi
     state: nutribrick
   product: CrateFoodMRE
-  cost: 1000
+  cost: 1400
   category: cargoproduct-category-name-food
   group: market
 
@@ -64,17 +54,7 @@
     sprite: Objects/Consumable/Drinks/cola.rsi
     state: icon
   product: CrateFoodSoftdrinks
-  cost: 1200
-  category: cargoproduct-category-name-food
-  group: market
-
-- type: cargoProduct
-  id: FoodSoftdrinksLarge
-  icon:
-    sprite: Objects/Consumable/Drinks/colabottle.rsi
-    state: icon
-  product: CrateFoodSoftdrinksLarge
-  cost: 2400
+  cost: 1500
   category: cargoproduct-category-name-food
   group: market
 
@@ -94,7 +74,7 @@
     sprite: Objects/Consumable/Food/burger.rsi
     state: bigbite
   product: CrateFoodHappyHonkBigBite
-  cost: 1500
+  cost: 2800
   category: cargoproduct-category-name-food
   group: market
 
@@ -104,7 +84,7 @@
     sprite: Objects/Consumable/Food/frozen.rsi
     state: sandwich
   product: CrateFoodIceCream
-  cost: 1200
+  cost: 2000
   category: cargoproduct-category-name-food
   group: market
 
@@ -114,6 +94,6 @@
     sprite: Objects/Consumable/Food/frozen.rsi
     state: cone
   product: CrateFoodSnowcone
-  cost: 1100
+  cost: 2000
   category: cargoproduct-category-name-food
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 150d70e508..cb263ee735 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -14,20 +14,6 @@
         - id: LidSalami
           prob: 0.01
 
-- type: entity
-  id: CrateFoodPizzaLarge
-  parent: CratePlastic
-  name: disaster pizza delivery
-  description: In the ultimate event that all else has failed, Find comfort in that more pizza solves everything. Includes 16 pizzas.
-  components:
-  - type: StorageFill
-    contents:
-    - id: FoodBoxPizzaFilled
-      amount: 15
-    - id: FoodBoxPizzaCotton
-    - id: LidSalami
-      prob: 0.04
-
 - type: entity
   id: CrateFoodMRE
   parent: CratePlastic
@@ -155,31 +141,6 @@
         - id: DrinkFourteenLokoCan
           amount: 2
 
-- type: entity
-  id: CrateFoodSoftdrinksLarge
-  parent: CrateFreezer
-  name: softdrinks bulk crate
-  description: Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas.
-  components:
-  - type: EntityStorage
-    capacity: 32 # Slightly over-sized CrateFreezer to accomodate over 30 drink cans at once.
-  - type: StorageFill
-    contents:
-      - id: DrinkColaCan
-        amount: 8
-      - id: DrinkGrapeCan
-        amount: 4
-      - id: DrinkRootBeerCan
-        amount: 4
-      - id: DrinkIcedTeaCan
-        amount: 4
-      - id: DrinkLemonLimeCan
-        amount: 4
-      - id: DrinkLemonLimeCranberryCan
-        amount: 4
-      - id: DrinkFourteenLokoCan
-        amount: 4
-
 - type: entity
   id: CrateFoodGetMore
   parent: CrateFreezer
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 486280a1af..a881bc29b6 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -65,9 +65,9 @@
     description: cargo-gift-pizza-large
     dest: cargo-gift-dest-bar
     gifts:
-      FoodPizza: 2 # DeltaV - Changed to 2 small pizza crates, 8 pizzas total
+      FoodPizza: 2 # DeltaV - Changed to 2 small pizza crates, 8 pizzas total (Was 16)
       FoodBarSupply: 1
-      FoodSoftdrinksLarge: 1
+      FoodSoftdrinks: 2         # 32 sodas
 
 - type: entity
   id: GiftsEngineering
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index 2f24a32d1d..a54ac8fbb0 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -8,7 +8,7 @@
     CrateMaterialSteel: 1.0
     # things the station might want
     CrateEngineeringAMEJar: 0.25
-    CrateFoodPizzaLarge: 0.25
+    CrateFoodPizza: 0.25
     CrateFoodSoftdrinks: 0.25
     CrateFunInstrumentsVariety: 0.25
     CrateSalvageEquipment: 0.25

From 514d6b5b395087eff9b3bd1da408ddc1e656f394 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Thu, 4 Dec 2025 02:55:35 -0500
Subject: [PATCH 020/360] Cleanup of prototypes in
 Resources/Prototypes/Catalog/Fills/Crates/ + fixed light crate descriptions
 (#41697)

* Fix prototype string order

* Fix replacement lights crate description

* Clearer light descriptions in general

* Suffix fix

* Updated internals crate descriptions
---
 .../Prototypes/Catalog/Fills/Crates/antag.yml |  4 +-
 .../Catalog/Fills/Crates/armory.yml           | 14 ++--
 .../Catalog/Fills/Crates/botany.yml           | 10 +--
 .../Prototypes/Catalog/Fills/Crates/cargo.yml |  6 +-
 .../Catalog/Fills/Crates/chemistry.yml        |  8 +--
 .../Catalog/Fills/Crates/emergency.yml        | 22 +++---
 .../Catalog/Fills/Crates/engineering.yml      | 40 +++++------
 .../Catalog/Fills/Crates/engines.yml          | 30 ++++----
 .../Prototypes/Catalog/Fills/Crates/food.yml  | 20 +++---
 .../Prototypes/Catalog/Fills/Crates/fun.yml   | 55 ++++++++-------
 .../Catalog/Fills/Crates/materials.yml        | 34 +++++-----
 .../Catalog/Fills/Crates/medical.yml          | 28 ++++----
 .../Prototypes/Catalog/Fills/Crates/npc.yml   | 48 ++++++-------
 .../Catalog/Fills/Crates/permaescape.yml      | 56 +++++++--------
 .../Catalog/Fills/Crates/salvage.yml          | 10 +--
 .../Catalog/Fills/Crates/science.yml          |  6 +-
 .../Catalog/Fills/Crates/security.yml         | 14 ++--
 .../Catalog/Fills/Crates/service.yml          | 68 +++++++++----------
 .../Catalog/Fills/Crates/syndicate.yml        |  8 +--
 .../Catalog/Fills/Crates/vending.yml          | 53 +++++++--------
 20 files changed, 266 insertions(+), 268 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
index 352b33a3d0..8b397bd31c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
@@ -1,8 +1,8 @@
 - type: entity
+  parent: CratePirate
   id: CratePirateChestCaptain
   name: captains pirate chest
   suffix: Filled
-  parent: CratePirate
   components:
   - type: EntityTableContainerFill
     containers:
@@ -13,10 +13,10 @@
         - id: MicroBombImplanter
 
 - type: entity
+  parent: CratePirate
   id: CratePirateChest
   name: crews pirate chest
   suffix: Filled
-  parent: CratePirate
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index 6a172a8a6f..9e01feb50e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateArmorySMG
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateArmorySMG
   name: SMG crate
   description: Contains two SMGs with four mags. Requires Armory access to open.
   components:
@@ -14,8 +14,8 @@
           amount: 4
 
 - type: entity
-  id: CrateArmoryShotgun
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateArmoryShotgun
   name: shotgun crate
   description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open.
   components:
@@ -29,8 +29,8 @@
           amount: 4
 
 - type: entity
-  id: CrateTrackingImplants
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateTrackingImplants
   name: tracking implants
   description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of.
   components:
@@ -53,8 +53,8 @@
         amount: 3
 
 - type: entity
-  id: CrateArmoryLaser
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateArmoryLaser
   name: lasers crate
   description: Contains three standard-issue laser rifles. Requires Armory access to open.
   components:
@@ -65,8 +65,8 @@
         amount: 3
 
 - type: entity
-  id: CrateArmoryPistols
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateArmoryPistols
   name: pistols crate
   description: Contains two standard NT pistols with four mags. Requires Armory access to open.
   components:
@@ -80,8 +80,8 @@
           amount: 4
 
 - type: entity
-  id: CrateSecurityRiot
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateSecurityRiot
   name: swat crate
   description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
   components:
@@ -101,8 +101,8 @@
           amount: 2
 
 - type: entity
-  id: CrateArmoryRifle
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateArmoryRifle
   name: rifle crate
   description: Contains two high-powered assault rifles with four mags. Requires Armory access to open.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 7f95f57d73..99702bc018 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateHydroponicsSeedsExotic
   parent: CrateHydroSecure
+  id: CrateHydroponicsSeedsExotic
   name: exotic seeds crate
   description: Any entrepreneuring botanist's dream. Contains many different exotic seeds. Requires Hydroponics access to open.
   components:
@@ -24,8 +24,8 @@
           amount: 2
 
 - type: entity
-  id: CrateHydroponicsSeedsMedicinal
   parent: CrateHydroSecure
+  id: CrateHydroponicsSeedsMedicinal
   name: medicinal seeds crate
   description: The wannabe chemist's dream. The power of medicine is at your fingertips! Requires Hydroponics access to open.
   components:
@@ -45,8 +45,8 @@
           amount: 3
 
 - type: entity
-  id: CrateHydroponicsTools
   parent: CrateHydroponics
+  id: CrateHydroponicsTools
   name: hydroponics equipment crate
   description: Supplies for growing a great garden! Contains some spray bottles of plant chemicals, a hatchet, a mini-hoe, scythe, as well as a pair of leather gloves and a botanist's apron.
   components:
@@ -68,8 +68,8 @@
           amount: 2
 
 - type: entity
-  id: CrateHydroponicsSeeds
   parent: CrateHydroponics
+  id: CrateHydroponicsSeeds
   name: seeds crate
   description: Big things have small beginnings. Contains twenty-four different seeds.
   components:
@@ -103,8 +103,8 @@
         - id: CottonSeeds
 
 - type: entity
-  id: CrateHydroponicsTray
   parent: CrateHydroponics
+  id: CrateHydroponicsTray
   name: hydroponics tray crate
   description: Contains a hydroponics tray flatpack.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 6cc4b70b7a..35e1c426c8 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateCargoLuxuryHardsuit
   parent: CratePirate
+  id: CrateCargoLuxuryHardsuit
   name: luxury mining hardsuit crate
   # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
   description: Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking.
@@ -12,8 +12,8 @@
         id: ClothingOuterHardsuitLuxury
 
 - type: entity
-  id: CrateCargoParcelWrap
   parent: CrateGenericSteel
+  id: CrateCargoParcelWrap
   name: parcel wrap crate
   description: All your parcel wrapping needs in one crate, containing three rolls of parcel wrap.
   components:
@@ -24,10 +24,10 @@
         amount: 3
 
 - type: entity
+  parent: CratePrivateSecure
   id: CrateCargoGambling
   name: the grand lottery $$$
   description: A box containing treasure beyond your greatest imaginations!
-  parent: CratePrivateSecure
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml
index 45fb81f1b5..01d05cd359 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateChemistryP
   parent: CrateChemistrySecure
+  id: CrateChemistryP
   name: chemicals crate (P)
   description: Contains chemicals from the P-Block of elements. Requires Chemistry access to open.
   components:
@@ -20,8 +20,8 @@
         - id: JugNitrogen
 
 - type: entity
-  id: CrateChemistryS
   parent: CrateChemistrySecure
+  id: CrateChemistryS
   name: chemicals crate (S)
   description: Contains chemicals from the S-Block of elements. Requires Chemistry access to open.
   components:
@@ -36,8 +36,8 @@
         - id: JugRadium
 
 - type: entity
-  id: CrateChemistryD
   parent: CrateChemistrySecure
+  id: CrateChemistryD
   name: chemicals crate (D)
   description: Contains chemicals from the D-Block of elements. Requires Chemistry access to open.
   components:
@@ -52,8 +52,8 @@
         - id: JugSilver
 
 - type: entity
-  id: CratePlantBGone
   parent: CrateGenericSteel
+  id: CratePlantBGone
   name: bulk Plant-B-Gone crate
   description: From Monstano. "Unwanted Weeds, Meet Your Celestial Roundup!"
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
index bf47d3f271..dd82c2208f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateEmergencyExplosive
   parent: CrateSecgear
+  id: CrateEmergencyExplosive
   name: bomb suit crate
   description: Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)
   components:
@@ -16,8 +16,8 @@
         - id: ClothingOuterSuitBomb
 
 - type: entity
-  id: CrateEmergencyFire
   parent: CrateGenericSteel
+  id: CrateEmergencyFire
   name: firefighting crate
   description: Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!
   components:
@@ -39,10 +39,10 @@
           amount: 2
 
 - type: entity
+  parent: CrateInternals
   id: CrateEmergencyInternals
-  parent: CrateInternals
   name: internals crate
-  description: Master your life energy and control your breathing with 3 breath masks, emergency suits and large air tanks.
+  description: Master your life energy and control your breathing with three breath masks, three gas masks, three emergency EVA suits, three oxygen tanks, and three nitrogen tanks.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -60,10 +60,10 @@
           amount: 3
 
 - type: entity
+  parent: CrateInternals
   id: CrateEmergencyInternalsLarge
-  parent: CrateInternals
   name: internals crate (large)
-  description: Master your life energy and control your breathing with 6 breath masks, emergency suits and large air tanks.
+  description: Master your life energy and control your breathing with six breath masks, six gas masks, six emergency EVA suits, six oxygen tanks, and six nitrogen tanks.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -81,10 +81,10 @@
           amount: 6
 
 - type: entity
-  id: CrateNitrogenInternals
   parent: CrateInternals
+  id: CrateNitrogenInternals
   name: internals crate (nitrogen)
-  description: Contains four breath masks and four large nitrogen tanks. Intended for Slimepeople and Vox.
+  description: Contains two breath masks, two gas masks, and four nitrogen tanks. Intended for nitrogen-breathing species.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -98,8 +98,8 @@
           amount: 4
 
 - type: entity
-  id: CrateEmergencyRadiation
   parent: CrateRadiation
+  id: CrateEmergencyRadiation
   name: radiation protection crate
   description: Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this.
   components:
@@ -116,8 +116,8 @@
           amount: 2
 
 - type: entity
-  id: CrateEmergencyInflatablewall
   parent: CratePlastic
+  id: CrateEmergencyInflatablewall
   name: inflatable wall crate
   description: Three stacks of inflatable walls for when the stations metal walls don't want to hold atmosphere anymore.
   components:
@@ -127,8 +127,8 @@
         id: BoxInflatable
 
 - type: entity
-  id: CrateGenericBiosuit
   parent: CratePlastic
+  id: CrateGenericBiosuit
   name: emergency bio suit crate
   description: Contains 2 biohazard suits to ensure that no disease will distract you from what you're doing there.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index bcf73a2c4d..27ade67868 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateEngineeringGear
   parent: CrateEngineering
+  id: CrateEngineeringGear
   name: engineering gear crate
   description: Various engineering gear parts.
   components:
@@ -22,8 +22,8 @@
           amount: 2
 
 - type: entity
-  id: CrateEngineeringToolbox
   parent: CrateEngineering
+  id: CrateEngineeringToolbox
   name: toolbox crate
   description: Two mechanical and two electrical toolboxes.
   components:
@@ -37,8 +37,8 @@
           amount: 2
 
 #- type: entity
-#  id: CrateEngineeringPowercell
 #  parent: CrateElectrical
+#  id: CrateEngineeringPowercell
 #  name: AME crate
 #  description: Three microcreactor powercells.
 #  components:
@@ -49,8 +49,8 @@
 #       amount: 3
 
 - type: entity
-  id: CrateEngineeringCableLV
   parent: CrateElectrical
+  id: CrateEngineeringCableLV
   name: LV cable crate
   description: 3 coils of LV cables.
   components:
@@ -61,8 +61,8 @@
         amount: 3
 
 - type: entity
-  id: CrateEngineeringCableMV
   parent: CrateElectrical
+  id: CrateEngineeringCableMV
   name: MV cable crate
   description: 3 coils of MV cables.
   components:
@@ -73,8 +73,8 @@
         amount: 3
 
 - type: entity
-  id: CrateEngineeringCableHV
   parent: CrateElectrical
+  id: CrateEngineeringCableHV
   name: HV cable crate
   description: 3 coils of HV cables.
   components:
@@ -85,8 +85,8 @@
         amount: 3
 
 - type: entity
-  id: CrateEngineeringFoamGrenade
   parent: CrateEngineeringSecure
+  id: CrateEngineeringFoamGrenade
   name: sealant grenade crate
   description: 5 metal foam sealant grenades.
   components:
@@ -97,8 +97,8 @@
         amount: 5
 
 - type: entity
-  id: CrateEngineeringCableBulk
   parent: CrateElectrical
+  id: CrateEngineeringCableBulk
   name: bulk cable crate
   description: 2 coils each for every cable type.
   components:
@@ -114,8 +114,8 @@
           amount: 2
 
 - type: entity
-  id: CrateEngineeringElectricalSupplies
   parent: CrateElectrical
+  id: CrateEngineeringElectricalSupplies
   name: electrical supplies crate
   description: NT is not responsible for any workplace infighting relating to the insulated gloves included within these crates.
   components:
@@ -129,8 +129,8 @@
           amount: 2
 
 - type: entity
-  id: CrateEngineeringStationBeaconBundle
   parent: CratePlastic
+  id: CrateEngineeringStationBeaconBundle
   name: station beacon bundle
   description: A crate containing 5 station beacon assemblies for modifying the station map.
   components:
@@ -141,8 +141,8 @@
         amount: 5
 
 - type: entity
-  id: CrateEngineeringJetpack
   parent: CrateGenericSteel
+  id: CrateEngineeringJetpack
   name: jetpack crate
   description: Two jetpacks for those who don't know how to use fire extinguishers.
   components:
@@ -153,8 +153,8 @@
         amount: 2
 
 - type: entity
-  id: CrateEngineeringMiniJetpack
   parent: CrateGenericSteel
+  id: CrateEngineeringMiniJetpack
   name: mini jetpack crate
   description: Two mini jetpacks for those who want an extra challenge.
   components:
@@ -165,8 +165,8 @@
         amount: 2
 
 - type: entity
-  id: CrateAirlockKit
   parent: CrateEngineering
+  id: CrateAirlockKit
   name: airlock kit
   description: A kit for building 6 airlocks, doesn't include tools.
   components:
@@ -180,8 +180,8 @@
           amount: 6
 
 - type: entity
-  id: CrateEvaKit
   parent: CrateCommandSecure
+  id: CrateEvaKit
   name: EVA kit
   description: A set consisting of two prestigious EVA suits and helmets.
   components:
@@ -195,8 +195,8 @@
           amount: 2
 
 - type: entity
-  id: CrateRCDAmmo
   parent: CrateEngineering
+  id: CrateRCDAmmo
   name: compressed matter crate
   description: Contains three compressed matter cartridges.
   components:
@@ -207,8 +207,8 @@
         amount: 3
 
 - type: entity
-  id: CrateRCD
   parent: CrateEngineeringSecure
+  id: CrateRCD
   name: RCD crate
   description: A crate containing a single rapid construction device.
   components:
@@ -218,8 +218,8 @@
         id: RCD
 
 - type: entity
-  id: CrateParticleDecelerators
   parent: CrateEngineeringSecure
+  id: CrateParticleDecelerators
   name: particle decelerators crate
   description: A crate containing 3 Particle Decelerators.
   components:
@@ -230,8 +230,8 @@
         amount: 3
 
 - type: entity
-  id: CrateEngineeringSpaceHeater
   parent: CrateEngineering
+  id: CrateEngineeringSpaceHeater
   name: space heater crate
   description: Contains a space heater for climate control.
   components:
@@ -258,8 +258,8 @@
     - id: BlockGameArcadeComputerCircuitboard
 
 - type: entity
-  id: CrateTechBoardRandom
   parent: ToteBase
+  id: CrateTechBoardRandom
   name: surplus boards
   description: Surplus boards from somewhere.
   components:
@@ -271,8 +271,8 @@
           range: 6, 8
 
 - type: entity
-  id: CrateAirGrenade
   parent: CrateEngineering
+  id: CrateAirGrenade
   name: air grenade crate
   description: A crate containing 3 air grenades.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index e81b6135ec..92a3eabe08 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -1,8 +1,8 @@
 # AME
 
 - type: entity
-  id: CrateEngineeringAMEShielding
   parent: CrateEngineeringSecure
+  id: CrateEngineeringAMEShielding
   name: packaged antimatter reactor crate
   description: 9 parts for the main body of an antimatter reactor, or for expanding an existing one.
   components:
@@ -13,8 +13,8 @@
         amount: 9
 
 - type: entity
-  id: CrateEngineeringAMEJar
   parent: CrateEngineeringSecure
+  id: CrateEngineeringAMEJar
   name: antimatter containment jar crate
   description: 3 antimatter jars, for fuelling an antimatter reactor.
   components:
@@ -25,8 +25,8 @@
         amount: 3
 
 - type: entity
-  id: CrateEngineeringAMEControl
   parent: CrateEngineeringSecure
+  id: CrateEngineeringAMEControl
   name: antimatter control unit crate
   description: The control unit of an antimatter reactor.
   components:
@@ -38,8 +38,8 @@
 # Singularity
 
 - type: entity
-  id: CrateEngineeringSingularityEmitter
   parent: CrateEngineeringSecure
+  id: CrateEngineeringSingularityEmitter
   name: emitter crate
   description: An emitter, best used for singularity engines.
   components:
@@ -49,8 +49,8 @@
         id: EmitterFlatpack
 
 - type: entity
-  id: CrateEngineeringSingularityCollector
   parent: CrateEngineeringSecure
+  id: CrateEngineeringSingularityCollector
   name: radiation collector crate
   description: A radiation collector, best used for singularity engines. Plasma is included.
   components:
@@ -62,8 +62,8 @@
         - id: PlasmaTankFilled
 
 - type: entity
-  id: CrateEngineeringSingularityContainment
   parent: CrateEngineeringSecure
+  id: CrateEngineeringSingularityContainment
   name: containment field generator crate
   description: A containment field generator, keeps the singulo in submission.
   components:
@@ -73,8 +73,8 @@
         id: ContainmentFieldGeneratorFlatpack
 
 - type: entity
-  id: CrateEngineeringSingularityGenerator
   parent: CrateEngineeringSecure
+  id: CrateEngineeringSingularityGenerator
   name: singularity generator crate
   description: A singularity generator, the mother of the beast.
   components:
@@ -86,8 +86,8 @@
 # Particle Accelerator
 
 - type: entity
-  id: CrateEngineeringParticleAccelerator
   parent: CrateEngineeringSecure
+  id: CrateEngineeringParticleAccelerator
   name: PA board crate
   description: Complex to setup, but rewarding as fuck. Contains boards for all particle accelerator components.
   components:
@@ -106,10 +106,10 @@
 # Non-functional for some reason
 
 #- type: entity
+#  parent: CrateEngineeringSecure
 #  id: CrateEngineeringSingularity
 #  name:  singularity crate
 #  description:  "Prank the station!"
-#  parent: CrateEngineeringSecure
 #  components:
 #  - type: EntityTableContainerFill
 #    containers:
@@ -117,8 +117,8 @@
 #        id: Singularity
 
 - type: entity
-  id: CrateEngineeringGenerator
   parent: CrateEngineering
+  id: CrateEngineeringGenerator
   name:  generator crate
   suffix: DEBUG
   components:
@@ -128,8 +128,8 @@
         id: DebugGenerator # TODO change to flatpack
 
 - type: entity
-  id: CrateEngineeringSolar
   parent: CrateEngineering
+  id: CrateEngineeringSolar
   name: solar assembly crate
   description: A kit with solar flatpacks and glass to construct ten solar panels.
   components:
@@ -143,8 +143,8 @@
           amount: 2
 
 - type: entity
-  id: CrateEngineeringShuttle
   parent: CrateEngineeringSecure
+  id: CrateEngineeringShuttle
   name: shuttle powering crate
   description: A crate containing all needs for shuttle powering.
   components:
@@ -158,8 +158,8 @@
         - id: InflatableDoorStack1
 
 - type: entity
-  id: CrateEngineeringTeslaGenerator
   parent: CrateEngineeringSecure
+  id: CrateEngineeringTeslaGenerator
   name: tesla generator crate
   description: A tesla generator. God save you.
   components:
@@ -169,8 +169,8 @@
         id: TeslaGeneratorFlatpack
 
 - type: entity
-  id: CrateEngineeringTeslaCoil
   parent: CrateEngineeringSecure
+  id: CrateEngineeringTeslaCoil
   name: tesla coil crate
   description: Tesla coil. Attracts lightning and generates energy from it.
   components:
@@ -180,8 +180,8 @@
         id: TeslaCoilFlatpack
 
 - type: entity
-  id: CrateEngineeringTeslaGroundingRod
   parent: CrateEngineeringSecure
+  id: CrateEngineeringTeslaGroundingRod
   name: tesla grounding rod crate
   description: Grounding rod, best for lightning protection.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index cb263ee735..29203f32d0 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateFoodPizza
   parent: CratePlastic
+  id: CrateFoodPizza
   name: emergency pizza delivery
   description: Help do your part to end station hunger by distributing pizza to underfunded departments! Includes 4 pizzas.
   components:
@@ -15,8 +15,8 @@
           prob: 0.01
 
 - type: entity
-  id: CrateFoodMRE
   parent: CratePlastic
+  id: CrateFoodMRE
   name: MRE crate
   description: A military style meal fit to feed a whole department.
   components:
@@ -27,8 +27,8 @@
         amount: 6
 
 - type: entity
-  id: CrateFoodCooking
   parent: CrateFreezer
+  id: CrateFoodCooking
   name: kitchen supplies crate
   description: Extra kitchen supplies, in case the botanists are absent.
   components:
@@ -61,8 +61,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFoodDinnerware
   parent: CratePlastic
+  id: CrateFoodDinnerware
   name: kitchen dinnerware crate
   description: Extra kitchen supplies, in case the clown was allowed in the cafeteria unsupervised.
   components:
@@ -88,8 +88,8 @@
         - id: BoxUtensil
 
 - type: entity
-  id: CrateFoodBarSupply
   parent: CrateFreezer
+  id: CrateFoodBarSupply
   name: bartending supplies crate
   description: Extra Bar supplies, in case the clown was allowed in the bar unsupervised.
   components:
@@ -117,8 +117,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFoodSoftdrinks
   parent: CrateFreezer
+  id: CrateFoodSoftdrinks
   name: softdrinks crate
   description: A variety of sodas to complement a small party, without having to empty the soda machines. Includes 14 sodas.
   components:
@@ -142,8 +142,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFoodGetMore
   parent: CrateFreezer
+  id: CrateFoodGetMore
   name: Getmore Bakemore crate
   description: Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines!
   components:
@@ -170,8 +170,8 @@
         - id: FoodBoxCloth
 
 - type: entity
-  id: CrateFoodIceCream
   parent: CrateFreezer
+  id: CrateFoodIceCream
   name: ice cream delivery
   description: An assortment of ice cream delights for any occasion! Includes 16 frozen treats.
   components:
@@ -195,8 +195,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFoodSnowcone
   parent: CrateFreezer
+  id: CrateFoodSnowcone
   name: snowcone delivery
   description: A freezer packed with refreshing snowcones for a hard working crew, or even a lazy one! Includes 16 snowcones.
   components:
@@ -218,8 +218,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFoodHappyHonkBigBite
   parent: CratePlastic
+  id: CrateFoodHappyHonkBigBite
   name: Happy Honk meal delivery
   description: Two fully loaded Happy Honk Big Bite burger meals, complete with cheesy fries, a bottle of Space Cola, a slice of apple pie and a toy!
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index a32fae9fef..cb40b508f7 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -156,8 +156,8 @@
     - id: PottedPlant26
 
 - type: entity
-  id: CratePlants
   parent: CrateGenericSteel
+  id: CratePlants
   name: plant crate
   description: A variety pack of potted plants to spruce up your station!
   components:
@@ -169,8 +169,8 @@
           value: 5
 
 - type: entity
-  id: CrateFunPlushie
   parent: CrateGenericSteel
+  id: CrateFunPlushie
   name: plushie crate
   description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
   components:
@@ -182,8 +182,8 @@
           value: 10
 
 - type: entity
-  id: CrateFunLizardPlushieBulk
   parent: CrateGenericSteel
+  id: CrateFunLizardPlushieBulk
   name: bulk lizard plushie crate
   description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
   components:
@@ -195,8 +195,8 @@
           value: 6
 
 - type: entity
-  id: CrateFunSharkPlushieBulk
   parent: CrateGenericSteel
+  id: CrateFunSharkPlushieBulk
   name: bulk soft toy shark crate
   description: A crate filled with a variety of everyone's favorite finned friend. Rawr!
   components:
@@ -215,8 +215,8 @@
             value: 2
 
 - type: entity
-  id: CrateFunInstrumentsVariety
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsVariety
   name: variety instrument collection
   description: Get your sad station movin' and groovin' with this catch-all variety pack! Contains seven different instruments.
   components:
@@ -233,8 +233,8 @@
         - id: GlockenspielInstrument
 
 - type: entity
-  id: CrateFunInstrumentsBrass
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsBrass
   name: brass instrument ensemble crate
   description: Bring some jazz to the station with the brass ensemble. Contains a variety of brass instruments for the whole station to play.
   components:
@@ -252,8 +252,8 @@
         - id: TubaInstrument
 
 - type: entity
-  id: CrateFunInstrumentsString
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsString
   name: string instrument ensemble crate
   description: Pluck or pick, slap or shred! Play a smooth melody or melt peoples' faces with this package of stringed instruments.
   components:
@@ -272,8 +272,8 @@
         - id: HarpInstrument
 
 - type: entity
-  id: CrateFunInstrumentsWoodwind
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsWoodwind
   name: woodwind instrument ensemble crate
   description: If atmos is good at their job, use air to play music with these woodwind instruments! Real wood not guaranteed with every item.
   components:
@@ -294,8 +294,8 @@
         - id: PanFluteInstrument
 
 - type: entity
-  id: CrateFunInstrumentsKeyedPercussion
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsKeyedPercussion
   name: keyed/percussion instrument ensemble crate
   description: Hit some keys with some sticks or your hands, with this Keyed and Percussion instrument ensemble crate.
   components:
@@ -315,8 +315,8 @@
         - id: VibraphoneInstrument
 
 - type: entity
-  id: CrateFunInstrumentsSpecial
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsSpecial
   name: special instrument collector's crate
   description: Create some noise with this special collection of arguably-instruments! Centcomm is not responsible for any trauma caused by the contents.
   components:
@@ -336,8 +336,8 @@
         - id: ReverseCymbalsInstrument
 
 - type: entity
-  id: CrateFunInstrumentsRandom
   parent: CrateGenericSteel
+  id: CrateFunInstrumentsRandom
   name: random instrument collection
   description: A box containing several randomly curated instruments, hand picked by Centcomm's top musicians!
   components:
@@ -360,8 +360,8 @@
           rolls: 2
 
 - type: entity
-  id: CrateFunArtSupplies
   parent: CrateGenericSteel
+  id: CrateFunArtSupplies
   name: art supplies
   description: Make some happy little accidents with lots of crayons!
   components:
@@ -371,8 +371,8 @@
         id: CrayonBox
 
 - type: entity
-  id: CrateFunBoardGames
   parent: CrateGenericSteel
+  id: CrateFunBoardGames
   name: board game crate
   description: Game nights have been proven to either decrease boredom or increase murderous rage depending on the game.
   components:
@@ -395,8 +395,8 @@
           amount: 6
 
 - type: entity
-  id: CrateFunSadTromboneImplants
   parent: CrateGenericSteel
+  id: CrateFunSadTromboneImplants
   name: sad trombone implants
   description: Death's never been so fun before! Implant these to make dying a bit more happy.
   components:
@@ -407,8 +407,8 @@
         amount: 3
 
 - type: entity
-  id: CrateFunLightImplants
   parent: CrateGenericSteel
+  id: CrateFunLightImplants
   name: light implants
   description: Light up your skin with these implants!
   components:
@@ -419,8 +419,8 @@
         amount: 3
 
 - type: entity
-  id: CrateFunParty
   parent: CrateGenericSteel
+  id: CrateFunParty
   name: party crate
   description: An entire party just waiting for you to open it. Includes party favors, party beverages, and even a cake.
   components:
@@ -452,8 +452,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFunWaterGuns
   parent: CratePlastic
+  id: CrateFunWaterGuns
   name: water gun crate
   description: A summer special with a variety of brightly colored water guns. Water not included.
   components:
@@ -467,8 +467,8 @@
           amount: 4
 
 - type: entity
-  id: CrateFunFoamGuns
   parent: CratePlastic
+  id: CrateFunFoamGuns
   name: Foam Force crate
   description: Contains four Foam Force rifles, some grenades, and extra ammo. It's [REDACTED] or nothing!
   components:
@@ -484,8 +484,8 @@
           amount: 4
 
 - type: entity
-  id: CrateFunBoxing
   parent: CrateGenericSteel
+  id: CrateFunBoxing
   name: boxing crate
   description: Want to set up an underground fight club or host a tournament amongst station crew? This crate is for you!
   components:
@@ -503,8 +503,8 @@
           amount: 3
 
 - type: entity
-  id: CrateFunPirate
   parent: CratePirate
+  id: CrateFunPirate
   suffix: Filled
   components:
   - type: EntityTableContainerFill
@@ -522,8 +522,8 @@
           amount: 2
 
 - type: entity
-  id: CrateFunToyBox
   parent: CrateToyBox
+  id: CrateFunToyBox
   suffix: Filled
   components:
   - type: EntityTableContainerFill
@@ -551,8 +551,8 @@
         - id: RubberChicken
 
 - type: entity
-  id: CrateFunBikeHornImplants
   parent: CrateGenericSteel
+  id: CrateFunBikeHornImplants
   name: bike horn implants
   description: A thousand honks a day keeps security officers away!
   components:
@@ -563,8 +563,8 @@
         amount: 3
 
 - type: entity
-  id: CrateFunMysteryFigurines
   parent: CratePlastic
+  id: CrateFunMysteryFigurines
   name: mystery figure crate
   description: A collection of 10 Mystery Figurine boxes. Duplicates non refundable.
   components:
@@ -579,10 +579,10 @@
           prob: 0.05
 
 - type: entity
+  parent: CratePlastic
+  id: CrateFunDartsSet
   name: dartboard box set
   description: A box with everything you need for a fun game of darts.
-  id: CrateFunDartsSet
-  parent: CratePlastic
   components:
   - type: EntityTableContainerFill
     containers:
@@ -595,10 +595,10 @@
           prob: 0.05
 
 - type: entity
+  parent: CrateLivestock
+  id: CrateFunScurret
   name: hydrated scurret
   description: Wait, what?
-  id: CrateFunScurret
-  parent: CrateLivestock
   components:
   - type: EntityTableContainerFill
     containers:
@@ -614,4 +614,3 @@
         - id: ClothingHeadHatHardhatYellow
         - id: ClothingNeckMantleQM
         - id: ClothingHeadsetCargo
-
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index cb8a690f2b..ebf1a4a584 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateMaterialGlass
   parent: CrateGenericSteel
+  id: CrateMaterialGlass
   name: glass sheet crate
   description: 90 sheets of glass, packed with care.
   components:
@@ -11,8 +11,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMaterialSteel
   parent: CrateGenericSteel
+  id: CrateMaterialSteel
   name: steel sheet crate
   description: 90 sheets of steel.
   components:
@@ -23,8 +23,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMaterialTextiles
   parent: CrateGenericSteel
+  id: CrateMaterialTextiles
   name: textiles crate
   description: 60 pieces of cloth and 30 pieces of durathread.
   components:
@@ -37,8 +37,8 @@
         - id: MaterialDurathread
 
 - type: entity
-  id: CrateMaterialPlastic
   parent: CrateGenericSteel
+  id: CrateMaterialPlastic
   name: plastic sheet crate
   description: 90 sheets of plastic.
   components:
@@ -49,8 +49,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMaterialWood
   parent: CrateGenericSteel
+  id: CrateMaterialWood
   name: wood crate
   description: Bunch of wood planks.
   components:
@@ -60,8 +60,8 @@
         id: MaterialWoodPlank
 
 - type: entity
-  id: CrateMaterialBrass
   parent: CrateGenericSteel
+  id: CrateMaterialBrass
   name: brass crate
   description: 90 sheets of brass.
   components:
@@ -72,8 +72,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMaterialPlasteel
   parent: CrateGenericSteel
+  id: CrateMaterialPlasteel
   name: plasteel crate
   description: 30 sheets of plasteel.
   components:
@@ -83,8 +83,8 @@
         id: SheetPlasteel
 
 - type: entity
-  id: CrateMaterialPlasma
   parent: CratePlasma
+  id: CrateMaterialPlasma
   name: solid plasma crate
   description: 30 sheets of plasma.
   components:
@@ -94,8 +94,8 @@
         id: SheetPlasma
 
 - type: entity
-  id: CrateMaterialGold
   parent: CrateGenericSteel
+  id: CrateMaterialGold
   name: gold crate
   description: 30 bars of gold.
   components:
@@ -105,8 +105,8 @@
         id: IngotGold
 
 - type: entity
-  id: CrateMaterialSilver
   parent: CrateGenericSteel
+  id: CrateMaterialSilver
   name: silver crate
   description: 30 bars of silver.
   components:
@@ -116,8 +116,8 @@
         id: IngotSilver
 
 - type: entity
-  id: CrateMaterialCardboard
   parent: CrateGenericSteel
+  id: CrateMaterialCardboard
   name: cardboard crate
   description: 90 pieces of cardboard.
   components:
@@ -128,8 +128,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMaterialPaper
   parent: CrateGenericSteel
+  id: CrateMaterialPaper
   name: paper crate
   description: 90 sheets of paper.
   components:
@@ -171,8 +171,8 @@
       - id: IngotSilver1
 
 - type: entity
-  id: CrateMaterialRandom
   parent: CrateGenericSteel
+  id: CrateMaterialRandom
   name: surplus materials
   description: Surplus materials from somewhere.
   components:
@@ -184,8 +184,8 @@
           range: 2, 4
 
 - type: entity
-  id: CrateMaterialSilo
   parent: CrateGenericSteel
+  id: CrateMaterialSilo
   name: material silo crate
   description: A package including all the materials to create a material silo.
   components:
@@ -202,8 +202,8 @@
           amount: 2
 
 - type: entity
-  id: CrateMaterialBasicResource
   parent: CrateGenericSteel
+  id: CrateMaterialBasicResource
   name: basic sheet crate
   description: 30 sheets of steel, glass, and plastic.
   components:
@@ -216,9 +216,9 @@
         - id: SheetPlastic
 
 #- type: entity
+#  parent: CrateGenericSteel
 #  id: CrateMaterialHFuelTank
 #  name: fueltank crate
-#  parent: CrateGenericSteel
 #  components:
 #  - type: EntityTableContainerFill
 #    containers:
@@ -226,9 +226,9 @@
 #        id: WeldingFuelTank
 
 #- type: entity
+#  parent: CrateGenericSteel
 #  id: CrateMaterialHWaterTank
 #  name: watertank crate
-#  parent: CrateGenericSteel
 #  components:
 #  - type: EntityTableContainerFill
 #    containers:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index f14dffc6c5..7c904ff325 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateMedicalSupplies
   parent: CrateMedical
+  id: CrateMedicalSupplies
   name: medical supplies crate
   description: Basic medical supplies.
   components:
@@ -19,8 +19,8 @@
         - id: BoxMouthSwab
 
 - type: entity
-  id: CrateChemistrySupplies
   parent: CrateMedical
+  id: CrateChemistrySupplies
   name: chemistry supplies crate
   description: Basic chemistry supplies.
   components:
@@ -39,8 +39,8 @@
           amount: 2
 
 - type: entity
-  id: CrateChemistryVials
   parent: CrateMedical
+  id: CrateChemistryVials
   name: vial supply crate
   description: Crate filled with a box of vials.
   components:
@@ -50,8 +50,8 @@
         id: BoxVial
 
 - type: entity
-  id: CrateMindShieldImplants
   parent: CrateMedical
+  id: CrateMindShieldImplants
   name: MindShield implant crate
   description: Crate filled with 3 MindShield implants.
   components:
@@ -62,8 +62,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMedicalSurgery
   parent: CrateSurgery
+  id: CrateMedicalSurgery
   name: surgical supplies crate
   description: Surgical instruments.
   components:
@@ -84,8 +84,8 @@
         - id: BoxSterileMask
 
 - type: entity
-  id: CrateMedicalScrubs
   parent: CrateMedical
+  id: CrateMedicalScrubs
   name: medical scrubs crate
   description: Medical clothings.
   components:
@@ -116,8 +116,8 @@
           amount: 1
 
 - type: entity
-  id: CrateEmergencyBurnKit
   parent: CrateMedical
+  id: CrateEmergencyBurnKit
   name: emergency burn kit
   description: Crate filled with a burn treatment kit.
   components:
@@ -127,8 +127,8 @@
         id: MedkitBurnFilled
 
 - type: entity
-  id: CrateEmergencyToxinKit
   parent: CrateMedical
+  id: CrateEmergencyToxinKit
   name: emergency toxin kit
   description: Crate filled with a toxin treatment kit.
   components:
@@ -138,8 +138,8 @@
         id: MedkitToxinFilled
 
 - type: entity
-  id: CrateEmergencyO2Kit
   parent: CrateMedical
+  id: CrateEmergencyO2Kit
   name: emergency O2 kit
   description: Crate filled with an O2 treatment kit.
   components:
@@ -149,8 +149,8 @@
         id: MedkitOxygenFilled
 
 - type: entity
-  id: CrateEmergencyBruteKit
   parent: CrateMedical
+  id: CrateEmergencyBruteKit
   name: emergency brute kit
   description: Crate filled with a brute treatment kit.
   components:
@@ -160,8 +160,8 @@
         id: MedkitBruteFilled
 
 - type: entity
-  id: CrateEmergencyAdvancedKit
   parent: CrateMedical
+  id: CrateEmergencyAdvancedKit
   name: emergency advanced kit
   description: Crate filled with an advanced treatment kit.
   components:
@@ -171,8 +171,8 @@
         id: MedkitAdvancedFilled
 
 - type: entity
-  id: CrateEmergencyRadiationKit
   parent: CrateMedical
+  id: CrateEmergencyRadiationKit
   name: emergency radiation kit
   description: Crate filled with a radiation treatment kit.
   components:
@@ -182,8 +182,8 @@
         id: MedkitRadiationFilled
 
 - type: entity
-  id: CrateBodyBags
   parent: CrateMedical
+  id: CrateBodyBags
   name: body bags crate
   description: Contains ten body bags.
   components:
@@ -194,8 +194,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVirologyBiosuit
   parent: CrateMedicalSecure
+  id: CrateVirologyBiosuit
   name: virology bio suit crate
   description: Contains 2 biohazard suits to ensure that no disease will distract you from treating the crew. Requires Medical access to open.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 625a890d8b..84a58e67ce 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateNPCBee
   parent: CrateLivestock
+  id: CrateNPCBee
   name: crate of bees
   description: A crate containing a swarm of eight bees.
   components:
@@ -11,8 +11,8 @@
         amount: 8
 
 - type: entity
-  id: CrateNPCButterflies
   parent: CrateLivestock
+  id: CrateNPCButterflies
   name: crate of butterflies
   description: A crate containing five butterflies.
   components:
@@ -23,8 +23,8 @@
         amount: 5
 
 - type: entity
-  id: CrateNPCCat
   parent: CrateLivestock
+  id: CrateNPCCat
   name: cat crate
   description: A crate containing a single cat.
   components:
@@ -42,8 +42,8 @@
           weight: 0.005
 
 - type: entity
-  id: CrateNPCChicken
   parent: CrateLivestock
+  id: CrateNPCChicken
   name: chicken crate
   description: A crate containing four fully grown chickens.
   components:
@@ -54,8 +54,8 @@
         amount: 4
 
 - type: entity
-  id: CrateNPCCrab
   parent: CrateLivestock
+  id: CrateNPCCrab
   name: crab crate
   description: A crate containing three huge crabs.
   components:
@@ -66,8 +66,8 @@
         amount: 3
 
 - type: entity
-  id: CrateNPCDuck
   parent: CrateLivestock
+  id: CrateNPCDuck
   name: duck crate
   description: A crate containing six fully grown ducks.
   components:
@@ -81,8 +81,8 @@
           amount: 2
 
 - type: entity
-  id: CrateNPCCorgi
   parent: CrateLivestock
+  id: CrateNPCCorgi
   name: corgi crate
   description: A crate containing a single corgi.
   components:
@@ -92,8 +92,8 @@
         id: MobCorgi
 
 - type: entity
-  id: CrateNPCPuppyCorgi
   parent: CrateLivestock
+  id: CrateNPCPuppyCorgi
   name: puppy corgi crate
   description: A crate containing a single puppy corgi. Awww.
   components:
@@ -103,8 +103,8 @@
         id: MobCorgiPuppy
 
 - type: entity
-  id: CrateNPCCow
   parent: CrateLivestock
+  id: CrateNPCCow
   name: cow crate
   description: A crate containing a single cow.
   components:
@@ -114,8 +114,8 @@
         id: MobCow
 
 - type: entity
-  id: CrateNPCGoat
   parent: CrateLivestock
+  id: CrateNPCGoat
   name: goat crate
   description: A crate containing a single goat.
   components:
@@ -125,8 +125,8 @@
         id: MobGoat
 
 - type: entity
-  id: CrateNPCGoose
   parent: CrateLivestock
+  id: CrateNPCGoose
   name: goose crate
   description: A crate containing two geese.
   components:
@@ -137,8 +137,8 @@
         amount: 2
 
 - type: entity
-  id: CrateNPCGorilla
   parent: CrateLivestock
+  id: CrateNPCGorilla
   name: gorilla crate
   description: A crate containing a single gorilla.
   components:
@@ -148,8 +148,8 @@
         id: MobGorilla
 
 - type: entity
-  id: CrateNPCMonkeyCube
   parent: CrateGenericSteel
+  id: CrateNPCMonkeyCube
   name: monkey cube crate
   description: A crate containing single box of monkey cubes.
   components:
@@ -159,8 +159,8 @@
         id: MonkeyCubeBox
 
 - type: entity
-  id: CrateNPCKoboldCube
   parent: CrateGenericSteel
+  id: CrateNPCKoboldCube
   name: kobold cube crate
   description: A crate containing single box of kobold cubes.
   components:
@@ -170,8 +170,8 @@
         id: KoboldCubeBox
 
 - type: entity
-  id: CrateNPCMouse
   parent: CrateLivestock
+  id: CrateNPCMouse
   name: mice crate
   description: A crate containing five mice.
   components:
@@ -182,8 +182,8 @@
         amount: 5
 
 - type: entity
-  id: CrateNPCParrot
   parent: CrateLivestock
+  id: CrateNPCParrot
   name: parrot crate
   description: A crate containing three parrots.
   components:
@@ -194,8 +194,8 @@
         amount: 3
 
 - type: entity
-  id: CrateNPCPenguin
   parent: CrateLivestock
+  id: CrateNPCPenguin
   name: penguin crate
   description: A crate containing two penguins.
   components:
@@ -206,8 +206,8 @@
         amount: 2
 
 - type: entity
-  id: CrateNPCPig
   parent: CrateLivestock
+  id: CrateNPCPig
   name: pig crate
   description: A crate containing a single pig.
   components:
@@ -217,8 +217,8 @@
         id: MobPig
 
 - type: entity
-  id: CrateNPCSnake
   parent: CrateLivestock
+  id: CrateNPCSnake
   name: snake crate
   description: A crate containing three snakes.
   components:
@@ -229,8 +229,8 @@
         amount: 3
 
 - type: entity
-  id: CrateNPCHamster
   parent: CrateRodentCage
+  id: CrateNPCHamster
   suffix: Filled
   components:
   - type: EntityTableContainerFill
@@ -239,8 +239,8 @@
         id: MobHamster
 
 - type: entity
-  id: CrateNPCHamlet
   parent: CrateRodentCage
+  id: CrateNPCHamlet
   suffix: Hamlet
   components:
   - type: EntityTableContainerFill
@@ -252,8 +252,8 @@
             weight: 0.001
 
 - type: entity
-  id: CrateNPCLizard
   parent: CrateLivestock
+  id: CrateNPCLizard
   name: lizard crate
   description: A crate containing a lizard.
   components:
@@ -263,8 +263,8 @@
         id: MobLizard
 
 - type: entity
-  id: CrateNPCKangaroo
   parent: CrateLivestock
+  id: CrateNPCKangaroo
   name: kangaroo crate
   description: A crate containing a kangaroo.
   components:
@@ -274,8 +274,8 @@
         id: MobKangaroo
 
 - type: entity
-  id: CrateNPCMothroach
   parent: CrateLivestock
+  id: CrateNPCMothroach
   name: crate of mothroaches
   description: A crate containing four mothroaches.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
index e81d340bb0..3cf7e72eb0 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -1,31 +1,31 @@
 - type: entity
-  name: Perma Escape Crate Spawner
-  id: CratePermaEscapeSpawner
   parent: CrateEmptySpawner
+  id: CratePermaEscapeSpawner
+  name: Perma Escape Crate Spawner
   components:
   - type: RandomSpawner
     prototypes:
     # Please note any duplicates & alphabetize <3
+      - ClosetMaintenanceFilledRandom # x3
+      - ClosetMaintenanceFilledRandom
+      - ClosetMaintenanceFilledRandom
       - CrateEngineeringMiniJetpack
       - CratePermaEscapeBureaucracy
-      - CratePermaEscapeEVA
-      - CratePermaEscapeGiftsFromSyndicate
-      - CratePermaEscapeGun
-      - CratePermaEscapeLights
-      - CratePermaEscapeMerc
-      - CrateServiceCustomSmokable
-      - CrateTrashCartFilled
       - CratePermaEscapeComs # x2
       - CratePermaEscapeComs
       - CratePermaEscapeDigging # x2
       - CratePermaEscapeDigging
+      - CratePermaEscapeEVA
+      - CratePermaEscapeGiftsFromSyndicate
+      - CratePermaEscapeGun
+      - CratePermaEscapeLights
       - CratePermaEscapeMats #x2
       - CratePermaEscapeMats
+      - CratePermaEscapeMerc
       - CratePermaEscapeTowercap # x2
       - CratePermaEscapeTowercap
-      - ClosetMaintenanceFilledRandom # x3
-      - ClosetMaintenanceFilledRandom
-      - ClosetMaintenanceFilledRandom
+      - CrateTrashCartFilled
+      - CrateServiceCustomSmokable
     rarePrototypes:
       - MobTick # These need to be killable by one dude with a shovel.
     rareChance: .30
@@ -33,8 +33,8 @@
     offset: 0.0
 
 - type: entity
-  id: CratePermaEscapeDigging
   parent: CrateGenericSteel
+  id: CratePermaEscapeDigging
   suffix: Digging
   components:
   - type: EntityTableContainerFill
@@ -58,9 +58,9 @@
           prob: 0.05
 
 - type: entity
-  id: CratePermaEscapeEVA
   parent: CrateGenericSteel
-  suffix: EVAs
+  id: CratePermaEscapeEVA
+  suffix: EVA
   components:
   - type: EntityTableContainerFill
     containers:
@@ -88,8 +88,8 @@
           prob: 0.05
 
 - type: entity
-  id: CratePermaEscapeGun
   parent: CrateGenericSteel
+  id: CratePermaEscapeGun
   suffix: Gun
   components:
   - type: EntityTableContainerFill
@@ -112,9 +112,9 @@
           weight: 2
 
 - type: entity
-  id: CratePermaEscapeBureaucracy
   parent: CrateGenericSteel
-  suffix: Writing
+  id: CratePermaEscapeBureaucracy
+  suffix: Bureaucracy
   components:
   - type: EntityTableContainerFill
     containers:
@@ -145,8 +145,8 @@
         - id: PersonalAI
 
 - type: entity
-  id: CratePermaEscapeLights
   parent: CrateGenericSteel
+  id: CratePermaEscapeLights
   suffix: Glowsticks
   components:
   - type: EntityTableContainerFill
@@ -185,9 +185,9 @@
           prob: 0.05
 
 - type: entity
-  id: CratePermaEscapeMats
   parent: CrateGenericSteel
-  suffix: Mats
+  id: CratePermaEscapeMats
+  suffix: Materials
   components:
   - type: EntityTableContainerFill
     containers:
@@ -198,9 +198,9 @@
          - id: PartRodMetal
 
 - type: entity
-  id: CratePermaEscapeGiftsFromSyndicate
   parent: CrateGenericSteel
-  suffix: Syndi Gifts
+  id: CratePermaEscapeGiftsFromSyndicate
+  suffix: Syndicate gifts
   components:
   - type: EntityTableContainerFill
     containers:
@@ -240,9 +240,9 @@
           prob: 0.005
 
 - type: entity
-  id: CratePermaEscapeMerc
   parent: CrateGenericSteel
-  suffix: Merc
+  id: CratePermaEscapeMerc
+  suffix: Mercenary
   components:
   - type: EntityTableContainerFill
     containers:
@@ -273,9 +273,9 @@
           prob: 0.05
 
 - type: entity
-  id: CratePermaEscapeComs
   parent: CrateGenericSteel
-  suffix: Coms
+  id: CratePermaEscapeComs
+  suffix: Comms
   components:
   - type: EntityTableContainerFill
     containers:
@@ -305,8 +305,8 @@
           prob: 0.01
 
 - type: entity
-  id: CratePermaEscapeTowercap
   parent: CrateGenericSteel
+  id: CratePermaEscapeTowercap
   suffix: Towercap
   components:
   - type: EntityTableContainerFill
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 8c8e0e02cb..0580d1f46f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -1,9 +1,9 @@
 - type: entity
+  parent: CrateGenericSteel
   id: CrateSalvageEquipment
   name: "salvage equipment crate"
-  description: For the daring.
   suffix: Filled
-  parent: CrateGenericSteel
+  description: For the daring.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -28,10 +28,10 @@
           prob: 0.8
 
 - type: entity
-  id: CrateSalvageAssortedGoodies
-  suffix: Filled, Salvage Random
-  categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead
   parent: CrateGenericSteel
+  id: CrateSalvageAssortedGoodies
+  categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead
+  suffix: Filled, Salvage Random
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
index 1a5bd028ad..ab8cdc90e8 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateScienceBiosuit
   parent: CrateScienceSecure
+  id: CrateScienceBiosuit
   name: scientist bio suit crate
   description: Contains 2 biohazard suits to ensure that no disease will distract you from doing science. Requires Science access to open.
   components:
@@ -15,8 +15,8 @@
           amount: 2
 
 - type: entity
-  id: CrateCrewMonitoring
   parent: CrateScienceSecure
+  id: CrateCrewMonitoring
   name: crew monitoring crate
   description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open.
   components:
@@ -29,8 +29,8 @@
           amount: 3
 
 - type: entity
-  id: CrateStationAiCore
   parent: CrateScienceSecure
+  id: CrateStationAiCore
   name: station AI core crate
   description: Contains the components for constructing a station AI core. Positronic brain not included. Requires Science access to open.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index 2727cd8799..9c3b695a5d 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateSecurityArmor
   parent: CrateSecgear
+  id: CrateSecurityArmor
   name: armor crate
   description: Contains three bulletproof vests. Requires Security access to open.
   components:
@@ -11,8 +11,8 @@
         amount: 3
 
 - type: entity
-  id: CrateSecurityHelmet
   parent: CrateSecgear
+  id: CrateSecurityHelmet
   name: helmet crate
   description: Contains three standard-issue brain buckets. Requires Security access to open.
   components:
@@ -23,8 +23,8 @@
         amount: 3
 
 - type: entity
-  id: CrateSecurityNonlethal
   parent: CrateSecgear
+  id: CrateSecurityNonlethal
   name: nonlethals crate
   description: Contains a mix of disablers, stun batons, and flashes. Requires Security access to open.
   components:
@@ -43,8 +43,8 @@
 #        - GrenadeTeargas
 
 - type: entity
-  id: CrateSecuritySupplies
   parent: CrateSecgear
+  id: CrateSecuritySupplies
   name: security supplies crate
   description: Contains various supplies for the station's Security team. Requires Security access to open.
   components:
@@ -59,8 +59,8 @@
 #        - SpacelawBook
 
 - type: entity
-  id: CrateRestraints
   parent: CrateSecgear
+  id: CrateRestraints
   name: restraints crate
   description: Contains two boxes each of handcuffs and zipties. Requires Security access to open.
   components:
@@ -74,8 +74,8 @@
           amount: 2
 
 - type: entity
-  id: CrateSecurityBiosuit
   parent: CrateSecgear
+  id: CrateSecurityBiosuit
   name: security bio suit crate
   description: Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open.
   components:
@@ -90,10 +90,10 @@
           amount: 2
 
 - type: entity
+  parent: CrateSecgear
   id: CrateSecurityTrackingMindshieldImplants
   name: implanter crate
   description: Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open.
-  parent: CrateSecgear
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 8a4f04894b..528db232e9 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateServiceJanitorialSupplies
   parent: CratePlastic
+  id: CrateServiceJanitorialSupplies
   name: janitorial supplies crate
   description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, wire brush, rag, and trash bag.
   components:
@@ -26,8 +26,8 @@
           amount: 2
 
 - type: entity
-  id: CrateServiceCleanerGrenades
   parent: CratePlastic
+  id: CrateServiceCleanerGrenades
   name: bulk cleanades crate
   description: Contains two boxes of cleaner grenades, for those deeply-entrenched stains.
   components:
@@ -38,10 +38,10 @@
         amount: 2
 
 - type: entity
-  id: CrateServiceReplacementLights
   parent: CrateGenericSteel
+  id: CrateServiceReplacementLights
   name: replacement lights crate
-  description: May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs.
+  description: May the light of Aether shine upon this station! Or at least, the light of twelve fluorescent light tubes and twelve incandescent light bulbs.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -51,10 +51,23 @@
         - id: BoxLightbulb
 
 - type: entity
-  id: CrateServiceHolidayLights
   parent: CrateGenericSteel
+  id: CrateServiceColorfulLights
+  name: colorful lights crate
+  description: It's not a party until it's hard to see, a little disorienting, and your ears hurt. Contains twelve light tubes and twelve light bulbs in a variety of colors.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: BoxLightbulbColorfulMixed
+        - id: BoxLighttubeColorfulMixed
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateServiceHolidayLights
   name: holiday lights crate
-  description: Deck the halls with these festive holiday lights!
+  description: Deck the halls with these festive holiday lights! Contains twelve red light tubes and twelve green light tubes.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -63,8 +76,8 @@
         amount: 2
 
 - type: entity
-  id: CrateMousetrapBoxes
   parent: CrateGenericSteel
+  id: CrateMousetrapBoxes
   name: mousetraps crate
   description: Mousetraps, for when all of service is being haunted by an entire horde of rats. Use sparingly... or not.
   components:
@@ -74,8 +87,8 @@
         id: BoxMousetrap
 
 - type: entity
-  id: CrateServiceSmokeables
   parent: CrateGenericSteel
+  id: CrateServiceSmokeables
   name: smokeables crate
   description: Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise!
   components:
@@ -109,8 +122,8 @@
           amount: 2
 
 - type: entity
-  id: CrateServiceTheatre
   parent: CrateGenericSteel
+  id: CrateServiceTheatre
   name: theatrical performances crate
   description: Contains a moth cloak, barber scissors, maid uniform, clown and mime attributes, and other performance charms.
   components:
@@ -138,8 +151,8 @@
         - id: ClothingBeltSuspendersBlack
 
 - type: entity
-  id: CrateServiceCustomSmokable
   parent: CrateGenericSteel
+  id: CrateServiceCustomSmokable
   name: DIY smokeables crate
   description: Want to get a little creative with what you use to destroy your lungs? Then this crate is for you! Has everything you need to roll your own cigarettes.
   components:
@@ -156,8 +169,8 @@
         - id: Matchbox
 
 - type: entity
-  id: CrateServiceBureaucracy
   parent: CrateGenericSteel
+  id: CrateServiceBureaucracy
   name: bureaucracy crate
   description: Several stacks of paper, a few pens and an office toy. What more could you ask for?
   components:
@@ -207,8 +220,8 @@
         # End DeltaV - More folders & colored paper reams in the bureaucracy crate + denied/approved stamp, low chance of paperwork hater stamp
 
 - type: entity
-  id: CrateServiceFaxMachine
   parent: CrateGenericSteel
+  id: CrateServiceFaxMachine
   name: fax machine crate
   description: A fax machine and a screwdriver to set the name with.
   components:
@@ -220,8 +233,8 @@
         - id: FaxMachineFlatpack
 
 - type: entity
-  id: CrateServicePersonnel
   parent: CrateCommandSecure
+  id: CrateServicePersonnel
   name: personnel crate
   description: Contains a box of blank ID cards and PDAs.
   components:
@@ -233,8 +246,8 @@
         - id: BoxID
 
 - type: entity
-  id: CrateServiceBooks
   parent: CrateGenericSteel
+  id: CrateServiceBooks
   name: books crate
   description: Contains 10 empty books of random appearance.
   components:
@@ -245,8 +258,8 @@
         amount: 10
 
 - type: entity
-  id: CrateServiceGuidebooks
   parent: CrateGenericSteel
+  id: CrateServiceGuidebooks
   name: guidebooks crate
   description: Contains guidebooks.
   components:
@@ -270,8 +283,8 @@
         - id: BookSpaceLaw
 
 - type: entity
-  id: CrateServiceSodaDispenser
   parent: CrateFreezer
+  id: CrateServiceSodaDispenser
   name: soda dispenser refill crate
   description: Contains refills for soda dispensers.
   components:
@@ -299,8 +312,8 @@
         - id: DrinkWaterMelonJuiceJug
 
 - type: entity
-  id: CrateServiceBoozeDispenser
   parent: CrateFreezer
+  id: CrateServiceBoozeDispenser
   name: booze dispenser refill crate
   description: Contains refills for booze dispensers.
   components:
@@ -323,8 +336,8 @@
         - id: DrinkJaegermisterBottleFull # Den - Jaegerminster
 
 - type: entity
-  id: CrateServiceBox
   parent: CratePlastic
+  id: CrateServiceBox
   name: boxes crate
   description: Contains 6 empty multipurpose boxes.
   components:
@@ -335,8 +348,8 @@
         amount: 6
 
 - type: entity
-  id: CrateJanitorBiosuit
   parent: CratePlastic
+  id: CrateJanitorBiosuit
   name: janitor bio suit crate
   description: Contains 2 biohazard suits to ensure that no disease will distract you from cleaning.
   components:
@@ -351,9 +364,9 @@
           amount: 2
 
 - type: entity
+  parent: CrateTrashCart
   id: CrateTrashCartFilled
   suffix: Filled
-  parent: CrateTrashCart
   components:
   - type: EntityTableContainerFill
     containers:
@@ -428,8 +441,8 @@
           prob: 0.1
 
 - type: entity
-  id: CrateCandles
   parent: CrateGenericSteel
+  id: CrateCandles
   name: candles crate
   description: Contains 4 boxes of candles, 2 large and 2 small. For atmosphere or something.
   components:
@@ -441,16 +454,3 @@
           amount: 2
         - id: BoxCandleSmall
           amount: 2
-
-- type: entity
-  parent: CrateGenericSteel
-  id: CrateServiceColorfulLights
-  name: colorful lights crate
-  description: It's not a party until it's hard to see, a little disorienting, and your ears hurt.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: BoxLightbulbColorfulMixed
-        - id: BoxLighttubeColorfulMixed
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
index b51db18fc4..6e4418778a 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateSyndicateSurplusBundle
   parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
+  id: CrateSyndicateSurplusBundle
   name: Syndicate surplus crate
   description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
   components:
@@ -11,10 +11,10 @@
       - Syndicate
 
 - type: entity
-  id: CrateCybersunJuggernautBundle
-  suffix: Filled
   parent: CrateSyndicate
+  id: CrateCybersunJuggernautBundle
   name: Cybersun juggernaut bundle
+  suffix: Filled
   description: Contains everything except a big gun to go postal.
   components:
   - type: EntityTableContainerFill
@@ -29,8 +29,8 @@
     - Syndicate
 
 - type: entity
-  id: CrateSyndicateSuperSurplusBundle
   parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
+  id: CrateSyndicateSuperSurplusBundle
   name: Syndicate super surplus crate
   description: Contains 125 telecrystals worth of completely random Syndicate items.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index 0a68481bbd..047ae5c36f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateVendingMachineRestockBoozeFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockBoozeFilled
   name: Booze-O-Mat restock crate
   description: Contains a restock box for the Booze-O-Mat.
   components:
@@ -10,8 +10,8 @@
         id: VendingMachineRestockBooze
 
 - type: entity
-  id: CrateVendingMachineRestockChefvendFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockChefvendFilled
   name: ChefVend restock crate
   description: Contains a restock box for the ChefVend.
   components:
@@ -21,8 +21,8 @@
         id: VendingMachineRestockChefvend
 
 - type: entity
-  id: CrateVendingMachineRestockClothesFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockClothesFilled
   name: clothing restock crate
   description: Contains a restock box for the clothes vending machines.
   components:
@@ -32,8 +32,8 @@
         id: VendingMachineRestockClothes
 
 - type: entity
-  id: CrateVendingMachineRestockAutoDrobeFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockAutoDrobeFilled
   name: AutoDrobe restock crate
   description: Contains a restock box for the AutoDrobe.
   components:
@@ -43,8 +43,8 @@
         id: VendingMachineRestockCostumes
 
 - type: entity
-  id: CrateVendingMachineRestockCondimentStationFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockCondimentStationFilled
   name: condiment station restock crate
   description: Contains a restock box for the condiment station.
   components:
@@ -54,8 +54,8 @@
         id: VendingMachineRestockCondimentStation
 
 - type: entity
-  id: CrateVendingMachineRestockDinnerwareFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockDinnerwareFilled
   name: Plasteel Chef restock crate
   description: Contains a restock box for the Plasteel Chef vending machine.
   components:
@@ -65,8 +65,8 @@
         id: VendingMachineRestockDinnerware
 
 - type: entity
-  id: CrateVendingMachineRestockEngineeringFilled
   parent: CrateEngineeringSecure
+  id: CrateVendingMachineRestockEngineeringFilled
   name: EngiVend restock crate
   description: Contains a restock box for the EngiVend. Also supports the YouTool.
   components:
@@ -76,8 +76,8 @@
         id: VendingMachineRestockEngineering
 
 - type: entity
-  id: CrateVendingMachineRestockGamesFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockGamesFilled
   name: Good Clean Fun restock crate
   description: Contains a restock box for the Good Clean Fun vending machine.
   components:
@@ -87,8 +87,8 @@
         id: VendingMachineRestockGames
 
 - type: entity
-  id: CrateVendingMachineRestockHotDrinksFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockHotDrinksFilled
   name: Solar's Best restock crate
   description: Contains two restock boxes for Solar's Best Hot Drinks vending machine.
   components:
@@ -99,8 +99,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockMedicalFilled
   parent: CrateMedicalSecure
+  id: CrateVendingMachineRestockMedicalFilled
   name: NanoMed restock crate
   description: Contains a restock box, compatible with the NanoMed and NanoMedPlus.
   components:
@@ -110,8 +110,8 @@
         id: VendingMachineRestockMedical
 
 - type: entity
-  id: CrateVendingMachineRestockChemVendFilled
   parent: CrateMedicalSecure
+  id: CrateVendingMachineRestockChemVendFilled
   name: ChemVend restock crate
   description: Contains a restock box for the ChemVend.
   components:
@@ -121,8 +121,8 @@
         id: VendingMachineRestockChemVend
 
 - type: entity
-  id: CrateVendingMachineRestockNutriMaxFilled
   parent: CrateHydroSecure
+  id: CrateVendingMachineRestockNutriMaxFilled
   name: NutriMax restock crate
   description: Contains a restock box for the NutriMax vending machine.
   components:
@@ -132,8 +132,8 @@
         id: VendingMachineRestockNutriMax
 
 - type: entity
-  id: CrateVendingMachineRestockPTechFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockPTechFilled
   name: PTech restock crate
   description: Contains a restock box for the PTech bureaucracy dispenser.
   components:
@@ -143,8 +143,8 @@
         id: VendingMachineRestockPTech
 
 - type: entity
-  id: CrateVendingMachineRestockRobustSoftdrinksFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockRobustSoftdrinksFilled
   name: beverage vendor restock crate
   description: Contains restock boxes for beverage vending machines.
   components:
@@ -154,11 +154,10 @@
         id: VendingMachineRestockRobustSoftdrinks
         amount: 2
 
-
 #- type: entity # DeltaV: Salvage vendor doesn't have stock anymore
 #- type: entity
-#  id: CrateVendingMachineRestockSalvageEquipmentFilled
 #  parent: CrateGenericSteel
+#  id: CrateVendingMachineRestockSalvageEquipmentFilled
 #  name: Salvage restock crate
 #  description: Contains a restock box for the salvage vendor.
 #  components:
@@ -168,8 +167,8 @@
 #        id: VendingMachineRestockSalvageEquipment
 
 - type: entity
-  id: CrateVendingMachineRestockSecTechFilled
   parent: CrateSecgear
+  id: CrateVendingMachineRestockSecTechFilled
   name: SecTech restock crate
   description: Contains a restock box for the SecTech vending machine.
   components:
@@ -179,8 +178,8 @@
         id: VendingMachineRestockSecTech
 
 - type: entity
-  id: CrateVendingMachineRestockSeedsFilled
   parent: CrateHydroSecure
+  id: CrateVendingMachineRestockSeedsFilled
   name: MegaSeed restock crate
   description: Contains a restock box for the MegaSeed vending machine.
   components:
@@ -190,8 +189,8 @@
         id: VendingMachineRestockSeeds
 
 - type: entity
-  id: CrateVendingMachineRestockSmokesFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockSmokesFilled
   name: ShadyCigs restock crate
   description: Contains two restock boxes for the ShadyCigs vending machine.
   components:
@@ -202,8 +201,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockVendomatFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockVendomatFilled
   name: Vendomat restock crate
   description: Contains a restock box for a Vendomat vending machine.
   components:
@@ -213,8 +212,8 @@
         id: VendingMachineRestockVendomat
 
 - type: entity
-  id: CrateVendingMachineRestockRoboticsFilled
   parent: CrateScienceSecure
+  id: CrateVendingMachineRestockRoboticsFilled
   name: Robotech Deluxe restock crate
   description: Contains a restock box for a Robotech Deluxe vending machine.
   components:
@@ -224,8 +223,8 @@
         id: VendingMachineRestockRobotics
 
 - type: entity
-  id: CrateVendingMachineRestockTankDispenserFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockTankDispenserFilled
   name: tank dispenser restock crate
   description: Contains a restock box for an Engineering or Atmospherics tank dispenser.
   components:
@@ -235,8 +234,8 @@
         id: VendingMachineRestockTankDispenser
 
 - type: entity
-  id: CrateVendingMachineRestockHappyHonkFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockHappyHonkFilled
   name: Happy Honk restock crate
   description: Contains a restock box for a happy honk dispenser.
   components:
@@ -247,8 +246,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockGetmoreChocolateCorpFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockGetmoreChocolateCorpFilled
   name: Getmore Chocolate Corp restock crate
   description: Contains a restock box for a Getmore Chocolate Corp dispenser.
   components:
@@ -259,8 +258,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockChangFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockChangFilled
   name: Chang restock crate
   description: Contains a restock box for a Mr. Chang dispenser.
   components:
@@ -271,8 +270,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockDiscountDansFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockDiscountDansFilled
   name: Discount Dans restock crate
   description: Contains a restock box for a Discount Dan's dispenser.
   components:
@@ -283,8 +282,8 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockDonutFilled
   parent: CratePlastic
+  id: CrateVendingMachineRestockDonutFilled
   name: Donut restock crate
   description: Contains a restock box for a Monkin' Donuts dispenser.
   components:

From 5bbfd796fd3f4401dc37e89ea118a493ab3aebd0 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Thu, 4 Dec 2025 03:06:27 -0500
Subject: [PATCH 021/360] figurines.ftl is now sorted by department (#41701)

* figurines.ftl is now sorted by department

* Nukie order fix

* Greytider order fix

* Tweaks to existing lines

* still tweaking
---
 Resources/Locale/en-US/datasets/figurines.ftl | 494 +++++++++---------
 1 file changed, 259 insertions(+), 235 deletions(-)

diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index 2c5d073864..b6428c0560 100644
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -1,59 +1,4 @@
-figurines-hop-1 = Papers, please.
-figurines-hop-2 = You are fired.
-figurines-hop-3 = BRB.
-figurines-hop-4 = You can get AA if you fill out the form.
-figurines-hop-5 = I was gone for two seconds...
-
-figurines-passenger-1 = Insuls please.
-figurines-passenger-2 = Call evac.
-figurines-passenger-3 = HELP MAINTS!!
-figurines-passenger-4 = I'm no tider.
-figurines-passenger-5 = How much for a toolbelt?
-
-figurines-greytider-1 = Man, this party stinks. I fucking hate these people.
-figurines-greytider-2 = Uh-oh, who's lost their stunbaton?
-figurines-greytider-3 = Robust.
-figurines-greytider-4 = I'm not me without a toolbox.
-figurines-greytider-5 = Grey tide station wide!
-figurines-greytider-6 = Viva la revolution.
-
-figurines-clown-1 = Honk!
-figurines-clown-2 = Banana!
-figurines-clown-3 = Soap!
-figurines-clown-4 = HoP has one clown, HoS has the whole department.
-figurines-clown-5 = Do I annoy you?
-figurines-clown-6 = Can I have AA? Please?
-figurines-clown-7 = I'm a clown, but you're the whole circus!
-
-figurines-holoclown-1 = I'm helping my older brother.
-figurines-holoclown-2 = Hello, officer!
-figurines-holoclown-3 = Who are you calling blue?
-figurines-holoclown-4 = Bleeding on the ground is a good look for you.
-figurines-holoclown-5 = Pathetic.
-figurines-holoclown-6 = It's not them you need to worry about; it's me.
-figurines-holoclown-7 = What's so funny?
-
-figurines-mime-1 = ...
-figurines-mime-2 = ...
-figurines-mime-3 = ....
-figurines-mime-4 = .......
-figurines-mime-5 = ................
-figurines-mime-6 = ...........?
-figurines-mime-7 = !!!
-figurines-mime-8 = ....!
-figurines-mime-9 = ???
-
-figurines-musician-1 = Never gonna give you up!
-figurines-musician-2 = Never gonna let you down!
-figurines-musician-3 = Music is an art.
-figurines-musician-4 = Thank you, I'll be here all night.
-figurines-musician-5 = I'm a one man band.
-
-figurines-boxer-1 = The first rule of Fight Club is...
-figurines-boxer-2 = We settle this in the ring, alright?
-figurines-boxer-3 = I. AM. THE. CHAMPION!!
-figurines-boxer-4 = Don't look at me; he was shot, not punched.
-figurines-boxer-5 = 1v1 me, captain.
+# Command
 
 figurines-captain-1 = Glory to NT!
 figurines-captain-2 = How did I get hired? Yes.
@@ -64,19 +9,108 @@ figurines-captain-6 = The disk was in my bag last I checked.
 figurines-captain-7 = The chain of command starts and ends with me.
 figurines-captain-8 = It's hard being at the top.
 
+# Cargo
+
+figurines-qm-1 = Who stole the shuttle?
+figurines-qm-2 = Wait, where did my digi-board go?
+figurines-qm-3 = I didn't approve that shipment of guns!
+figurines-qm-4 = One toy box for my fellow clown!
+figurines-qm-5 = Time to gamble!
+figurines-qm-6 = Viva la Cargonia!
+figurines-qm-7 = Fill out the form.
+figurines-qm-8 = Where'd all our money go?
+figurines-qm-9 = 99% of gamblers quit right before they hit it big!
+
+figurines-cargotech-1 = DRAGON ON ATS!
+figurines-cargotech-2 = I sold the station!
+figurines-cargotech-3 = Brain bounty? I don't have a brain.
+figurines-cargotech-4 = You're worth 3000 spesos. Congrats.
+figurines-cargotech-5 = Vegetable bounty? Nobody eats those anyways.
+figurines-cargotech-6 = WE ARE SECEDING!! ALL HAIL CARGONIA!!
+
+figurines-salvage-1 = Megafauna? It was mega easy.
+figurines-salvage-2 = We're lost. Anyone bring a GPS?
+figurines-salvage-3 = Anyone have oxygen?
+figurines-salvage-4 = I found a blood-red and e-sword!
+figurines-salvage-5 = There's bears in space?
+figurines-salvage-6 = Crusher? I barely know her!
+
+# Engineering
+
+figurines-ce-1 = Everyone to the briefing!
+figurines-ce-2 = Wire the solars!
+figurines-ce-3 = How to setup the TEG?
+figurines-ce-4 = SINGULOOSE!
+figurines-ce-5 = TESLOOSE!
+figurines-ce-6 = Power's out again.
+
+figurines-atmostech-1 = I put plasma in distro.
+figurines-atmostech-2 = I will burn you in a burn chamber.
+figurines-atmostech-3 = Frezon...
+figurines-atmostech-4 = Tritium...
+figurines-atmostech-5 = Glory to Atmosia!
+figurines-atmostech-6 = Distro? That's short for disposal.
+figurines-atmostech-7 = TEG: Thermal Energy? Gone!
+
+figurines-engineer-1 = SINGULOOSE!
+figurines-engineer-2 = TESLOOSE!
+figurines-engineer-3 = Did anyone remember to turn the AME on?
+figurines-engineer-4 = Free insuls at Engineering!
+figurines-engineer-5 = Where'd the power go?
+figurines-engineer-6 = Someone bombed the medbay... again...
+figurines-engineer-7 = Well, why don't you come and fix it?
+
+# Medical
+
+figurines-cmo-1 = Suit sensors!
+figurines-cmo-2 = Why do we have meth?
+figurines-cmo-3 = Who drank all the chems?
+figurines-cmo-4 = Desoxyephedrine? Sounds healthy.
+figurines-cmo-5 = No, you're not getting my hypospray.
+
+figurines-chemist-1 = Get your pills!
+figurines-chemist-2 = We need to cook.
+figurines-chemist-3 = I am the one who knocks!
+figurines-chemist-4 = Say my name.
+figurines-chemist-5 = 99.8% purity.
+figurines-chemist-6 = Epinephrine? Didn't you say methamphetamine?
+
+figurines-doctor-1 = The patient is already dead!
+figurines-doctor-2 = CLEAR!
+figurines-doctor-3 = Saw makes BRRR.
+figurines-doctor-4 = Just a week away...
+figurines-doctor-5 = I knew it...
+
+figurines-paramedic-1 = Insuls and tools!
+figurines-paramedic-2 = I need AA for saving people!
+figurines-paramedic-3 = SUIT SENSORS!!
+figurines-paramedic-4 = I need the hypospray for saving people!
+figurines-paramedic-5 = 14 dead in the clown's room.
+
+# Science
+
+figurines-rd-1 = Blowing up all of the borgs!
+figurines-rd-2 = Tier 3 Arsenal? No way.
+figurines-rd-3 = Now where did I leave my hardsuit...?
+figurines-rd-4 = Now you're thinking with portals!
+figurines-rd-5 = The cake is a lie!
+figurines-rd-6 = The trait I look for in a scientist is expendability.
+
+figurines-scientist-1 = Someone else must have made those bombs!
+figurines-scientist-2 = He asked to be borged!
+figurines-scientist-3 = Carp at sci!
+figurines-scientist-4 = Explosion at sci!
+figurines-scientist-5 = Anyone seen an anomaly?
+figurines-scientist-6 = The anomaly exploded!
+
+# Security
+
 figurines-hos-1 = Space law? What?
 figurines-hos-2 = Shoot the clown.
 figurines-hos-3 = Yes, I shot the clown. No, I don't regret it.
 figurines-hos-4 = Clown is now KOS.
 figurines-hos-5 = Armory is now open to the public!
 
-figurines-warden-1 = Execute him for breaking in!
-figurines-warden-2 = Perma the fucker for insulting me!
-figurines-warden-3 = We totally treat everyone fairly and do NOT mistreat our prisoners.
-figurines-warden-4 = Brig is my home. My home is brig. My brig is home. Stop, what?
-figurines-warden-5 = Soap is now contraband.
-figurines-warden-6 = You're going away for a long time, buddy.
-
 figurines-detective-1 = The butler did it.
 figurines-detective-2 = I need some whiskey after this.
 figurines-detective-3 = Chameleon fibers? How did a chameleon get in here?
@@ -94,98 +128,86 @@ figurines-security-8 = I love donuts.
 figurines-security-9 = Greytide this, motherfucker.
 figurines-security-10 = Do not resist.
 
+figurines-warden-1 = Execute him for breaking in!
+figurines-warden-2 = Perma the fucker for insulting me!
+figurines-warden-3 = We totally treat everyone fairly and do NOT mistreat our prisoners.
+figurines-warden-4 = Brig is my home. My home is brig. My brig is home. Stop, what?
+figurines-warden-5 = Soap is now contraband.
+figurines-warden-6 = You're going away for a long time, buddy.
+
+# Service
+
+figurines-hop-1 = Papers, please.
+figurines-hop-2 = You are fired.
+figurines-hop-3 = BRB.
+figurines-hop-4 = You can get AA if you fill out the form.
+figurines-hop-5 = I was gone for two seconds...
+
+figurines-bartender-1 = Where's my monkey?
+figurines-bartender-2 = Sec won't drink.
+figurines-bartender-3 = I mixed a little something in there...
+figurines-bartender-4 = The recipe? Plasma and vomit. Why?
+figurines-bartender-5 = I need those toxins for my drinks, officer!
+figurines-bartender-6 = Read the room.
+figurines-bartender-7 = I've got a shotgun.
+
+figurines-botanist-1 = I don't have any weed, officer!
+figurines-botanist-2 = Dude, I see colors...
+figurines-botanist-3 = Is it just me, or is that weed glowing?
+figurines-botanist-4 = 50 more units of mutagen. That should be enough.
+figurines-botanist-5 = More bananas for my favorite clown!
+
+figurines-boxer-1 = The first rule of Fight Club is...
+figurines-boxer-2 = We settle this in the ring, alright?
+figurines-boxer-3 = I. AM. THE. CHAMPION!!
+figurines-boxer-4 = Don't look at me; he was shot, not punched.
+figurines-boxer-5 = 1v1 me, captain.
+
+figurines-chaplain-1 = Would you like to join my cul- I mean religion.
+figurines-chaplain-2 = Gods, please make me a killing machine!
+figurines-chaplain-3 = God exists!
+figurines-chaplain-4 = Those aren't blood runes, I drew them in crayon.
+figurines-chaplain-5 = Anyone want to be sacrificed?
+figurines-chaplain-6 = Vampires aren't real.
+
+figurines-chef-1 = I swear it's not human meat.
+figurines-chef-2 = More banana cream pies?
+figurines-chef-3 = How does rotary sushi sound?
+figurines-chef-4 = That'll be 1,000 spesos.
+figurines-chef-5 = For here or to go?
+figurines-chef-6 = Where'd Pun Pun go? No idea...
+
+figurines-clown-1 = Honk!
+figurines-clown-2 = Banana!
+figurines-clown-3 = Soap!
+figurines-clown-4 = HoP has one clown, HoS has the whole department.
+figurines-clown-5 = Do I annoy you?
+figurines-clown-6 = Can I have AA? Please?
+figurines-clown-7 = I'm a clown, but you're the whole circus!
+
+figurines-greytider-1 = Man, this party stinks. I fucking hate these people.
+figurines-greytider-2 = Uh-oh, who's lost their stunbaton?
+figurines-greytider-3 = Robust.
+figurines-greytider-4 = I'm not me without a toolbox.
+figurines-greytider-5 = Grey tide station wide!
+figurines-greytider-6 = Viva la revolution.
+
+figurines-janitor-1 = Clown stole my soap. Again.
+figurines-janitor-2 = Look at the signs, you idiot.
+figurines-janitor-3 = I've never seen this much lube in my life.
+figurines-janitor-4 = Another day, another spill.
+figurines-janitor-5 = I'm not even paid for this.
+figurines-janitor-6 = This blood wasn't evidence, right?
+figurines-janitor-7 = My only friend is my mop.
+figurines-janitor-8 = That better not be what I think it is...
+figurines-janitor-9 = Another day, another body.
+
 figurines-lawyer-1 = Better Call Saul!
 figurines-lawyer-2 = Objection!
 figurines-lawyer-3 = Did you know that you have rights?
 figurines-lawyer-4 = Space law says!
 figurines-lawyer-5 = Sign the contract first.
 
-figurines-cargotech-1 = DRAGON ON ATS!
-figurines-cargotech-2 = I sold the station!
-figurines-cargotech-3 = Brain bounty? I don't have a brain.
-figurines-cargotech-4 = You're worth 3000 spesos. Congrats.
-figurines-cargotech-5 = Vegetable bounty? Nobody eats those anyways.
-figurines-cargotech-6 = WE ARE SECEDING!! ALL HAIL CARGONIA!!
-
-figurines-salvage-1 = Megafauna? It was mega easy.
-figurines-salvage-2 = We're lost. Anyone bring a GPS?
-figurines-salvage-3 = Anyone have oxygen?
-figurines-salvage-4 = I found a blood-red and e-sword!
-figurines-salvage-5 = There's bears in space?
-figurines-salvage-6 = Crusher? I barely know her!
-
-figurines-qm-1 = Who stole the shuttle?
-figurines-qm-2 = I won't approve the guns.
-figurines-qm-3 = I didn't buy those guns!
-figurines-qm-4 = One toys crate for ma fellow clown!
-figurines-qm-5 = Time to spent all money on gambling.
-figurines-qm-6 = Viva La Cargonia!
-figurines-qm-7 = Fill the form.
-figurines-qm-8 = Where'd all our money go?
-figurines-qm-9 = 99% of gamblers quit right before they hit it big!
-
-figurines-ce-1 = Everyone to the briefing!
-figurines-ce-2 = Wire the solars!
-figurines-ce-3 = How to setup the TEG?
-figurines-ce-4 = SINGULOOSE!
-figurines-ce-5 = TESLOOSE!
-figurines-ce-6 = Power's out again.
-
-figurines-engineer-1 = SINGULOOSE!
-figurines-engineer-2 = TESLOOSE!
-figurines-engineer-3 = What is AME?
-figurines-engineer-4 = Free insuls at Engineering!
-figurines-engineer-5 = Where'd the power go?
-figurines-engineer-6 = Someone bombed the medbay... again...
-figurines-engineer-7 = Well, why don't you come and fix it?
-
-figurines-atmostech-1 = I put plasma in distro.
-figurines-atmostech-2 = I will burn you in a burn chamber.
-figurines-atmostech-3 = Frezon...
-figurines-atmostech-4 = Tritium...
-figurines-atmostech-5 = Glory to Atmosia!
-figurines-atmostech-6 = Distro? That's short for disposal.
-figurines-atmostech-7 = TEG: Thermal Energy? Gone!
-
-figurines-rd-1 = Blowing up all of the borgs!
-figurines-rd-2 = Tier 3 Arsenal? No way.
-figurines-rd-3 = Now where did I leave my hardsuit...?
-figurines-rd-4 = Now you're thinking with portals!
-figurines-rd-5 = The cake is a lie!
-figurines-rd-6 = The trait I look for in a scientist is expendability.
-
-figurines-scientist-1 = Someone else must have made those bombs!
-figurines-scientist-2 = He asked to be borged!
-figurines-scientist-3 = Carp at sci!
-figurines-scientist-4 = Explosion at sci!
-figurines-scientist-5 = Anyone seen an anomaly?
-figurines-scientist-6 = The anomaly exploded!
-
-figurines-cmo-1 = Suit sensors!
-figurines-cmo-2 = Why do we have meth?
-figurines-cmo-3 = Who drank all the chems?
-figurines-cmo-4 = Desoxyephedrine? Sounds healthy.
-figurines-cmo-5 = No, you're not getting my hypospray.
-
-figurines-chemist-1 = Get your pills!
-figurines-chemist-2 = We need to cook.
-figurines-chemist-3 = I am the one who knocks!
-figurines-chemist-4 = Say my name.
-figurines-chemist-5 = 99.8% purity.
-figurines-chemist-6 = Epinephrine? Didn't you say methamphetamine?
-
-figurines-paramedic-1 = Insuls and tools!
-figurines-paramedic-2 = I need AA for saving people!
-figurines-paramedic-3 = SUIT SENSORS!!
-figurines-paramedic-4 = I need the hypospray for saving people!
-figurines-paramedic-5 = 14 dead in the clown's room.
-
-figurines-doctor-1 = The patient is already dead!
-figurines-doctor-2 = CLEAR!
-figurines-doctor-3 = Saw makes BRRR.
-figurines-doctor-4 = Just a week away...
-figurines-doctor-5 = I knew it...
-
 figurines-librarian-1 = Silence!
 figurines-librarian-2 = One day while...
 figurines-librarian-3 = Once upon a time...
@@ -201,62 +223,33 @@ figurines-librarian-12 = Gather round...
 figurines-librarian-13 = ...It's a tale as old as time...
 figurines-librarian-14 = ...That's all she wrote.
 
-figurines-chaplain-1 = Would you like to join my cul- I mean religion.
-figurines-chaplain-2 = Gods make me a killing machine please!
-figurines-chaplain-3 = God exists!
-figurines-chaplain-4 = Those aren't blood runes, I drew them in crayon.
-figurines-chaplain-5 = Anyone want to be sacrificed?
-figurines-chaplain-6 = Vampires aren't real.
+figurines-mime-1 = ...
+figurines-mime-2 = ...
+figurines-mime-3 = ....
+figurines-mime-4 = .......
+figurines-mime-5 = ................
+figurines-mime-6 = ...........?
+figurines-mime-7 = !!!
+figurines-mime-8 = ....!
+figurines-mime-9 = ???
 
-figurines-chef-1 = I swear it's not human meat.
-figurines-chef-2 = More banana cream pies?
-figurines-chef-3 = How does rotary sushi sound?
-figurines-chef-4 = That'll be 1000 spesos
-figurines-chef-5 = For here or to go?
-figurines-chef-6 = Where'd Pun Pun go? No idea...
+figurines-musician-1 = Never gonna give you up!
+figurines-musician-2 = Never gonna let you down!
+figurines-musician-3 = Music is an art.
+figurines-musician-4 = Thank you, I'll be here all night.
+figurines-musician-5 = I'm a one man band.
 
-figurines-bartender-1 = Where's my monkey?
-figurines-bartender-2 = Sec won't drink.
-figurines-bartender-3 = I mixed a little something in there...
-figurines-bartender-4 = The recipe? Plasma and vomit. Why?
-figurines-bartender-5 = I need those toxins for my drinks, officer!
-figurines-bartender-6 = Read the room.
-figurines-bartender-7 = I've got a shotgun.
+figurines-passenger-1 = Insuls please.
+figurines-passenger-2 = Call evac.
+figurines-passenger-3 = HELP MAINTS!!
+figurines-passenger-4 = I'm no tider.
+figurines-passenger-5 = How much for a toolbelt?
 
-figurines-botanist-1 = I don't have any weed, officer!
-figurines-botanist-2 = Dude, I see colors...
-figurines-botanist-3 = Is it just me, or is that weed glowing?
-figurines-botanist-4 = 50 more units of mutagen. That should be enough.
-figurines-botanist-5 = More bananas for my favorite clown!
+# Silicon
 
-figurines-janitor-1 = Clown stole my soap. Again.
-figurines-janitor-2 = Look at the signs, you idiot.
-figurines-janitor-3 = I've never seen this much lube in my life.
-figurines-janitor-4 = Another day, another spill.
-figurines-janitor-5 = I'm not even paid for this.
-figurines-janitor-6 = This blood wasn't evidence, right?
-figurines-janitor-7 = My only friend is my mop.
-figurines-janitor-8 = That better not be what I think it is...
-figurines-janitor-9 = Another day, another body.
+# ...no voiced silicon figures at the moment.
 
-figurines-nukie-1 = I got the disk!
-figurines-nukie-2 = Whiskey, Echo, Whiskey.
-figurines-nukie-3 = The nuke makes boom.
-figurines-nukie-4 = What's the code?
-figurines-nukie-5 = Commander...? ...That's a balloon...
-
-figurines-nukie-elite-1 = Not a word in Nanotrasen.
-figurines-nukie-elite-2 = THAT'S A KEG!
-figurines-nukie-elite-3 = Guys, are you alive?
-figurines-nukie-elite-4 = Breach and clear!
-figurines-nukie-elite-5 = Leave no survivors.
-figurines-nukie-elite-6 = Good work, team.
-
-figurines-nukie-commander-1 = GET DAT FUKKEN DISK!
-figurines-nukie-commander-2 = Fuckin' flukies.
-figurines-nukie-commander-3 = The Syndicate sends its regards.
-figurines-nukie-commander-4 = Failure is not an option.
-figurines-nukie-commander-5 = Whoops.
+# Antagonists
 
 figurines-footsoldier-1 = I'm an evil boy. Less boy every day, more evil every day.
 figurines-footsoldier-2 = Who will you choose? Them or us? Us or them?
@@ -264,16 +257,32 @@ figurines-footsoldier-3 = Glory to the Syndicate!
 figurines-footsoldier-4 = Down with Nanotrasen!
 figurines-footsoldier-5 = I'd rather die than join Nanotrasen.
 
-figurines-wizard-1 = Ei Nath!!
-figurines-wizard-2 = Real wizards support trans rights.
-figurines-wizard-3 = Skidaddle skadoodle!
-figurines-wizard-4 = FIREBALL!
+figurines-holoclown-1 = I'm helping my older brother.
+figurines-holoclown-2 = Hello, officer!
+figurines-holoclown-3 = Who are you calling blue?
+figurines-holoclown-4 = Bleeding on the ground is a good look for you.
+figurines-holoclown-5 = Pathetic.
+figurines-holoclown-6 = It's not them you need to worry about; it's me.
+figurines-holoclown-7 = What's so funny?
 
-figurines-space-dragon-1 = Fish will consume the station.
-figurines-space-dragon-2 = Dragon de- Actually, nevermind.
-figurines-space-dragon-3 = Crew is delicious.
-figurines-space-dragon-4 = Don't you dare make sushi.
-figurines-space-dragon-5 = This station ain't big enough for the two of us.
+figurines-nukie-1 = I got the disk!
+figurines-nukie-2 = Whiskey, Echo, Whiskey.
+figurines-nukie-3 = The nuke makes boom.
+figurines-nukie-4 = What's the code?
+figurines-nukie-5 = Commander...? ...That's a balloon...
+
+figurines-nukie-commander-1 = GET DAT FUKKEN DISK!
+figurines-nukie-commander-2 = Fuckin' flukies.
+figurines-nukie-commander-3 = The Syndicate sends its regards.
+figurines-nukie-commander-4 = Failure is not an option.
+figurines-nukie-commander-5 = Whoops.
+
+figurines-nukie-elite-1 = Not a word in Nanotrasen.
+figurines-nukie-elite-2 = THAT'S A KEG!
+figurines-nukie-elite-3 = Guys, are you alive?
+figurines-nukie-elite-4 = Breach and clear!
+figurines-nukie-elite-5 = Leave no survivors.
+figurines-nukie-elite-6 = Good work, team.
 
 figurines-queen-1 = Our domain must grow.
 figurines-queen-2 = The hive hungers.
@@ -295,6 +304,40 @@ figurines-rat-servant-3 = The boss wants a word with youse.
 figurines-rat-servant-4 = Ay, I'm walkin' here!
 figurines-rat-servant-5 = You get the chedda', then we talk.
 
+figurines-space-dragon-1 = Fish will consume the station.
+figurines-space-dragon-2 = Dragon de- Actually, nevermind.
+figurines-space-dragon-3 = Crew is delicious.
+figurines-space-dragon-4 = Don't you dare make sushi.
+figurines-space-dragon-5 = This station ain't big enough for the two of us.
+
+figurines-skeleton-1 = ACK ACK!
+figurines-skeleton-2 = Ugh, that locker was cramped!
+figurines-skeleton-3 = You're going to have a bad time.
+figurines-skeleton-4 = Got any milk?
+figurines-skeleton-5 = I have a bone to pick with you!
+
+figurines-thief-1 = You don't have a warrant!
+figurines-thief-2 = This is just a normal beacon!
+figurines-thief-3 = Theres nothing suspicious about this satchel at all, officer.
+figurines-thief-4 = I have NO idea where your pet is...
+figurines-thief-5 = Huh, I didn't know that wall could open up...
+
+figurines-wizard-1 = Ei Nath!!
+figurines-wizard-2 = Real wizards support trans rights.
+figurines-wizard-3 = Skidaddle skadoodle!
+figurines-wizard-4 = FIREBALL!
+
+# Animals
+
+figurines-hamlet-1 = Piep!
+figurines-hamlet-2 = Squeak!
+figurines-hamlet-3 = Chuu!
+figurines-hamlet-4 = Eeee!
+figurines-hamlet-5 = Pip!
+figurines-hamlet-6 = Fwiep!
+figurines-hamlet-7 = Heep!
+figurines-hamlet-8 = NOT THE MICROWAVE!
+
 figurines-mouse-1 = Piep!
 figurines-mouse-2 = Squeak!
 figurines-mouse-3 = Chuu!
@@ -308,35 +351,16 @@ figurines-slime-2 = Blimpuf?
 figurines-slime-3 = Blump!
 figurines-slime-4 = Squish!
 
-figurines-hamlet-1 = Piep!
-figurines-hamlet-2 = Squeak!
-figurines-hamlet-3 = Chuu!
-figurines-hamlet-4 = Eeee!
-figurines-hamlet-5 = Pip!
-figurines-hamlet-6 = Fwiep!
-figurines-hamlet-7 = Heep!
-figurines-hamlet-8 = NOT THE MICROWAVE!
-
-figurines-thief-1 = You don't have a warrant!
-figurines-thief-2 = This is just a normal beacon!
-figurines-thief-3 = Theres nothing suspicious about this satchel at all, officer.
-figurines-thief-4 = I have NO idea where your pet is...
-figurines-thief-5 = Huh, I didn't know that wall could open up...
-
-figurines-skeleton-1 = ACK ACK!
-figurines-skeleton-2 = Ugh, that locker was cramped!
-figurines-skeleton-3 = You're going to have a bad time.
-figurines-skeleton-4 = Got any milk?
-figurines-skeleton-5 = I have a bone to pick with you!
-
-figurines-owlman-1 = No need to fear, Owlman is here!
-figurines-owlman-2 = Owl be seeing you later!
-figurines-owlman-3 = HOOT!!
-figurines-owlman-4 = What do you call an owl magician, HOO-DINI!
-figurines-owlman-5 = Don't worry citizen, I'll save the day!
+# Other
 
 figurines-griffin-1 = MUHAHAHAHA, I am so evil!!
 figurines-griffin-2 = The second I see Owlman, they are so dead!!
 figurines-griffin-3 = How do us Griffins deal with stress? We wing it!
 figurines-griffin-4 = My name isn't Gilda!!
 figurines-griffin-5 = Being a criminal mastermind, isn't easy.
+
+figurines-owlman-1 = No need to fear, Owlman is here!
+figurines-owlman-2 = Owl be seeing you later!
+figurines-owlman-3 = HOOT!!
+figurines-owlman-4 = What do you call an owl magician, HOO-DINI!
+figurines-owlman-5 = Don't worry citizen, I'll save the day!

From 0c4c101cb512ff59138ac2063265feac2f6f75a2 Mon Sep 17 00:00:00 2001
From: Minerva <218184747+mnva0@users.noreply.github.com>
Date: Thu, 4 Dec 2025 11:55:03 -0500
Subject: [PATCH 022/360] Allows spesos to fit in envelopes (#41700)

Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 89deedf812..890642ad0d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -421,6 +421,8 @@
         insertSound: /Audio/Effects/packetrip.ogg
         ejectSound: /Audio/Effects/packetrip.ogg
         whitelist:
+          components:
+            - Cash
           tags:
             - Paper
   - type: ActivatableUI

From 5d496b92d92d86b0e29c988025244de10ef0a123 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:52:56 +0100
Subject: [PATCH 023/360] Change Ephedrine, Desoxyephedrine and Hyperzine
 properties (#41693)

* merff (no numbness)

* I can't feel a thing

* Update self-damage and OD values

* Missed a 5
---
 .../Locale/en-US/store/uplink-catalog.ftl     |   4 +-
 .../Entities/StatusEffects/body.yml           |   4 +
 Resources/Prototypes/Reagents/narcotics.yml   | 172 ++++++++++--------
 3 files changed, 106 insertions(+), 74 deletions(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index a3a68132f2..736e1e21f3 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -405,10 +405,10 @@ uplink-nocturine-chemistry-bottle-name = Nocturine Bottle
 uplink-nocturine-chemistry-bottle-desc = A chemical that puts your target straight to sleep.
 
 uplink-stimpack-name = Hyperzine Injector
-uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 30 seconds.
+uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 60 seconds.
 
 uplink-stimkit-name = Hyperzine Injector Kit
-uplink-stimkit-desc = A medkit containing 6 hyperzine microinjectors, which each inject you with enough hyperzine to last for 15 seconds.
+uplink-stimkit-desc = A medkit containing 6 hyperzine microinjectors, which each inject you with enough hyperzine to last for 30 seconds.
 
 uplink-syndicate-segway-crate-name = Syndicate Segway
 uplink-syndicate-segway-crate-desc = Be an enemy of the corporation, in style!
diff --git a/Resources/Prototypes/Entities/StatusEffects/body.yml b/Resources/Prototypes/Entities/StatusEffects/body.yml
index 4c94804884..6b6f704a2c 100644
--- a/Resources/Prototypes/Entities/StatusEffects/body.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/body.yml
@@ -27,3 +27,7 @@
       - MobState
       - MobThresholds
   - type: PainNumbnessStatusEffect
+
+- type: entity
+  parent: PainNumbnessTraitStatusEffect
+  id: StatusEffectPainNumbness
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index c290ac0a24..bb025f4c24 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -4,44 +4,54 @@
   group: Narcotics
   desc: reagent-desc-desoxyephedrine
   physicalDesc: reagent-physical-desc-translucent
-  contrabandSeverity: Major
+  contrabandSeverity: Minor
   flavor: bitter
   color: "#FAFAFA"
   boilingPoint: 212.0  # Dexosyephedrine vape when?
   meltingPoint: 170.0
   metabolisms:
     Poison:
+      # Main effects
       effects:
       - !type:HealthChange
         damage:
           types:
-            Poison: 0.75
+            Poison: 0.55
+            Blunt: 0.5
             Cellular: 1 # DeltaV - meth rots you just like in real life :D
+      # OD
       - !type:HealthChange
         conditions:
         - !type:ReagentCondition
           reagent: Desoxyephedrine
-          min: 30
+          min: 16
         damage:
           types:
-            Poison: 2 # this is added to the base damage of the meth.
+            Poison: 3 # this is added to the base damage of the meth.
             Asphyxiation: 2
     Narcotic:
       effects:
+      # Main effects
       - !type:MovementSpeedModifier
-        walkSpeedModifier: 1.35
-        sprintSpeedModifier: 1.35
+        walkSpeedModifier: 1.20
+        sprintSpeedModifier: 1.20
+      - !type:GenericStatusEffect
+        key: StaminaModifier # You are on meth. You keep going.
+        component: StaminaModifier
+        time: 3
+      - !type:GenericStatusEffect
+        key: Adrenaline
+        component: IgnoreSlowOnDamage
+        time: 3
+      # Side effects
+      - !type:Jitter
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
-      - !type:Jitter
       - !type:ModifyStatusEffect
-        effectProto: StatusEffectStunned
-        time: 3
-        type: Remove
-      - !type:ModifyKnockdown
-        time: 3
-        type: Remove
+        effectProto: StatusEffectPainNumbness
+        time: 2
+      # Interactions
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentCondition
@@ -59,11 +69,12 @@
       - !type:SuppressAddiction
     Medicine:
       effects:
+      # Side effects
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentCondition
           reagent: Desoxyephedrine
-          min: 20
+          min: 5
 
 - type: reagent
   id: Ephedrine
@@ -71,7 +82,6 @@
   group: Narcotics
   desc: reagent-desc-ephedrine
   physicalDesc: reagent-physical-desc-powdery
-  contrabandSeverity: Minor
   flavor: bitter
   color: "#D2FFFA"
   boilingPoint: 255.0
@@ -79,19 +89,10 @@
   metabolisms:
     Narcotic:
       effects:
+      # Main effects
       - !type:MovementSpeedModifier
-        walkSpeedModifier: 1.25
-        sprintSpeedModifier: 1.25
-      - !type:HealthChange
-        conditions:
-        - !type:ReagentCondition
-          reagent: Ephedrine
-          min: 20
-        damage:
-          types:
-            Poison: 2 # this is added to the base damage of the meth.
-            Asphyxiation: 2
-      - !type:Jitter
+        walkSpeedModifier: 1.15
+        sprintSpeedModifier: 1.15
       - !type:ModifyStatusEffect
         effectProto: StatusEffectStunned
         time: 1
@@ -99,6 +100,24 @@
       - !type:ModifyKnockdown
         time: 1
         type: Remove
+      # Side effects
+      - !type:Jitter
+      - !type:PopupMessage
+        visualType: Medium
+        messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]
+        type: Local
+        probability: 0.05
+      # OD
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentCondition
+          reagent: Ephedrine
+          min: 20
+        damage:
+          types:
+            Poison: 2
+            Asphyxiation: 2
+      # Interactions
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentCondition
@@ -107,18 +126,14 @@
         effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
-      - !type:PopupMessage
-        visualType: Medium
-        messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]
-        type: Local
-        probability: 0.05
     Medicine:
       effects:
+      # Side effects
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentCondition
           reagent: Ephedrine
-          min: 30
+          min: 15
 
 - type: reagent
   id: Stimulants
@@ -133,41 +148,38 @@
   meltingPoint: 170.0
   metabolisms:
     Narcotic:
-      metabolismRate: 1.0
       effects:
+      # Main effects
       - !type:MovementSpeedModifier
-        walkSpeedModifier: 1.3
-        sprintSpeedModifier: 1.3
-      - !type:HealthChange
-        conditions:
-          - !type:ReagentCondition
-            reagent: Stimulants
-            min: 80 #please wait 3 minutes before using another stimpack
-        damage:
-          types:
-            Poison: 1
-      - !type:AdjustReagent
-        conditions:
-        - !type:ReagentCondition
-          reagent: ChloralHydrate
-          min: 1
-        reagent: ChloralHydrate
-        amount: -10
+        walkSpeedModifier: 1.25
+        sprintSpeedModifier: 1.25
       - !type:ModifyStatusEffect
         effectProto: StatusEffectStunned
-        time: 3
+        time: 3.5
         type: Remove
       - !type:ModifyKnockdown
-        time: 3
+        time: 3.5
         type: Remove
-      - !type:GenericStatusEffect
-        key: StaminaModifier
-        component: StaminaModifier
-        time: 3
       - !type:ModifyStatusEffect
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        key: Adrenaline
+        component: IgnoreSlowOnDamage
+        time: 3
+      # Side effects
+      - !type:Jitter
+      # OD
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentCondition
+          reagent: Stimulants
+          min: 50
+        damage:
+          types:
+            Poison: 1
+      # Interactions
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentCondition
@@ -176,22 +188,38 @@
         effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
+      - !type:AdjustReagent
+        conditions:
+        - !type:ReagentCondition
+          reagent: ChloralHydrate
+          min: 1
+        reagent: ChloralHydrate
+        amount: -10
     Medicine:
-      metabolismRate: 1.0
       effects:
-        - !type:ResetNarcolepsy
-        - !type:SatiateHunger
-          factor: 1
-        - !type:SatiateThirst
-          factor: 1
-        - !type:HealthChange
-          conditions:
-          - !type:TotalDamageCondition
-            min: 70 # only heals when you're more dead than alive
-          damage: # heals at the same rate as tricordrazine, doesn't heal poison because if you OD'd I'm not giving you a safety net
-            groups:
-              Burn: -1
-              Brute: -1
+      # Main effects
+      - !type:ModifyBleed
+        amount: -1.5
+      - !type:EvenHealthChange
+        conditions:
+        - !type:TotalDamageCondition
+          min: 70 # only heals when you're more dead than alive
+        damage: # Doesn't heal poison because if you OD'd I'm not giving you a safety net
+          Burn: -0.5
+          Brute: -0.5
+      - !type:HealthChange
+        conditions:
+        - !type:TotalDamageCondition
+          min: 95 # Just to bring you back from the brink of death
+        damage:
+          types:
+            Asphyxiation: -2
+      # Side effects
+      - !type:ResetNarcolepsy
+      - !type:SatiateHunger
+        factor: 1
+      - !type:SatiateThirst
+        factor: 1
 
 - type: reagent
   id: THC
@@ -215,7 +243,7 @@
         time: 16
         type: Add
       # Delta-V - Addictive
-      - !type:Addicting 
+      - !type:Addicting
         probability: 0.4 # Chance of Addiction rising per tick
         conditions:
         - !type:ReagentCondition

From 376d1cdafc7cb30a67886668fb20acf793f7d625 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:42:03 +0100
Subject: [PATCH 024/360] Warfarin and Hemorrhinol, Hemophilia turned into a
 StatusEffect (#41685)

* init

* yeah

* move folders

* comments

* i hate cloning sometimes

* review

* review squred

* fix stuff
---
 .../StatusEffectSystem.Relay.cs               |  3 ++
 .../Traits/Assorted/HemophiliaComponent.cs    | 16 --------
 .../HemophiliaStatusEffectComponent.cs        | 22 +++++++++++
 .../Traits/Assorted/HemophiliaSystem.cs       | 10 +++--
 .../Locale/en-US/reagents/meta/medicine.ftl   |  3 ++
 .../Locale/en-US/reagents/meta/toxins.ftl     |  3 ++
 .../Prototypes/Entities/Mobs/Player/clone.yml |  1 -
 .../Entities/StatusEffects/body.yml           | 37 +++++++++++++++++--
 Resources/Prototypes/Reagents/medicine.yml    | 24 ++++++++++++
 Resources/Prototypes/Reagents/toxins.yml      | 19 ++++++++++
 .../Prototypes/Recipes/Reactions/medicine.yml | 26 ++++++++++++-
 Resources/Prototypes/Traits/disabilities.yml  | 19 ++++++----
 12 files changed, 151 insertions(+), 32 deletions(-)
 delete mode 100644 Content.Shared/Traits/Assorted/HemophiliaComponent.cs
 create mode 100644 Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs

diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
index 9b16aadff0..30c5d9f67e 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Body.Events;
 using Content.Shared.Damage.Events;
 using Content.Shared.Mobs.Events;
 using Content.Shared.Movement.Events;
@@ -31,6 +32,8 @@ public sealed partial class StatusEffectsSystem
         SubscribeLocalEvent<StatusEffectContainerComponent, BeforeAlertSeverityCheckEvent>(RelayStatusEffectEvent);
 
         SubscribeLocalEvent<StatusEffectContainerComponent, AccentGetEvent>(RelayStatusEffectEvent);
+
+        SubscribeLocalEvent<StatusEffectContainerComponent, BleedModifierEvent>(RefRelayStatusEffectEvent);
     }
 
     private void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct
diff --git a/Content.Shared/Traits/Assorted/HemophiliaComponent.cs b/Content.Shared/Traits/Assorted/HemophiliaComponent.cs
deleted file mode 100644
index 208883f11c..0000000000
--- a/Content.Shared/Traits/Assorted/HemophiliaComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Traits.Assorted;
-
-/// <summary>
-/// This component is used for the Hemophilia Trait, it reduces the passive bleed stack reduction amount so entities with it bleed for longer.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class HemophiliaComponent : Component
-{
-    /// <summary>
-    /// What multiplier should be applied to the BleedReduction when an entity bleeds?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HemophiliaBleedReductionMultiplier = 0.33f;
-}
diff --git a/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs b/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs
new file mode 100644
index 0000000000..3216052257
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted;
+
+/// <summary>
+/// This component is used for the Hemophilia Trait, it reduces the passive bleed stack reduction amount so entities with it bleed for longer.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class HemophiliaStatusEffectComponent : Component
+{
+    /// <summary>
+    /// Multiplier to use for the amount of bloodloss reduction during a bleed tick.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BleedReductionMultiplier = 0.33f;
+
+    /// <summary>
+    /// Multiplier to use for the amount of blood lost during a bleed tick.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BleedAmountMultiplier = 1f;
+}
diff --git a/Content.Shared/Traits/Assorted/HemophiliaSystem.cs b/Content.Shared/Traits/Assorted/HemophiliaSystem.cs
index 53f6609575..4544007ac7 100644
--- a/Content.Shared/Traits/Assorted/HemophiliaSystem.cs
+++ b/Content.Shared/Traits/Assorted/HemophiliaSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Body.Events;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared.Traits.Assorted;
 
@@ -6,11 +7,14 @@ public sealed class HemophiliaSystem : EntitySystem
 {
     public override void Initialize()
     {
-        SubscribeLocalEvent<HemophiliaComponent, BleedModifierEvent>(OnBleedModifier);
+        SubscribeLocalEvent<HemophiliaStatusEffectComponent, StatusEffectRelayedEvent<BleedModifierEvent>>(OnBleedModifier);
     }
 
-    private void OnBleedModifier(Entity<HemophiliaComponent> ent, ref BleedModifierEvent args)
+    private void OnBleedModifier(Entity<HemophiliaStatusEffectComponent> ent, ref StatusEffectRelayedEvent<BleedModifierEvent> args)
     {
-        args.BleedReductionAmount *= ent.Comp.HemophiliaBleedReductionMultiplier;
+        var ev = args.Args;
+        ev.BleedReductionAmount *= ent.Comp.BleedReductionMultiplier;
+        ev.BleedAmount *= ent.Comp.BleedAmountMultiplier;
+        args.Args = ev;
     }
 }
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index 7d71b43c1d..3a675dc3f4 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -156,3 +156,6 @@ reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Re
 
 reagent-name-stelloxadone = stelloxadone
 reagent-desc-stelloxadone = A cryogenics chemical. Used to aggressively dissolve toxins from the body. Works regardless of the patient being alive or dead.
+
+reagent-name-warfarin = warfarin
+reagent-desc-warfarin = Commonly used as an anticoagulant medication. Causes blood to have difficulty forming clots. Can cause internal bleeding when overdosed.
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index c0cf06fe26..5c4657d34b 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -84,3 +84,6 @@ reagent-desc-mechanotoxin = A neurotoxin used as venom by some species of spider
 
 reagent-name-toxintrash = reprocessed material
 reagent-desc-toxintrash = An awful-smelling slurry efficiently refined from discarded matter. It represents a perfect, zero-waste conversion of salvage into Vox sustenance, though it is a violent poison to others.
+
+reagent-name-hemorrhinol = hemorrhinol
+reagent-desc-hemorrhinol = A toxin that causes severe damage to blood vessels, causing rapid bleeding.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index 6b0af7e86b..b5572e53d7 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -16,7 +16,6 @@
   # traits
   - BlackAndWhiteOverlay
   - Clumsy
-  - Hemophilia
   - ImpairedMobility
   # - LegsParalyzed (you get healed)
   - LightweightDrunk
diff --git a/Resources/Prototypes/Entities/StatusEffects/body.yml b/Resources/Prototypes/Entities/StatusEffects/body.yml
index 6b6f704a2c..739c9c3b22 100644
--- a/Resources/Prototypes/Entities/StatusEffects/body.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/body.yml
@@ -9,13 +9,19 @@
       - Bloodstream
 
 - type: entity
-  parent: [ BloodstreamStatusEffectBase ]
+  parent: BloodstreamStatusEffectBase
+  id: BloodstreamStatusEffectDebuff
+  abstract: true
+  components:
+  - type: RejuvenateRemovedStatusEffect
+
+- type: entity
+  parent: BloodstreamStatusEffectDebuff
   id: StatusEffectBloodloss
   name: bloodloss
   components:
   - type: StutteringAccent
   - type: DrunkStatusEffect
-  - type: RejuvenateRemovedStatusEffect
 
 - type: entity
   parent: MobStatusEffectBase
@@ -29,5 +35,30 @@
   - type: PainNumbnessStatusEffect
 
 - type: entity
-  parent: PainNumbnessTraitStatusEffect
+  parent: BloodstreamStatusEffectBase
+  id: StatusEffectHemophiliaTrait
+  components:
+  - type: HemophiliaStatusEffect
+
+- type: entity
+  parent: BloodstreamStatusEffectDebuff
+  id: StatusEffectAnticoagulant # Decreases the amount of blood coagulation when bleeding.
+  name: thin blood
+  components:
+  - type: HemophiliaStatusEffect
+    bleedReductionMultiplier: 0.33
+    bleedAmountMultiplier: 1
+
+- type: entity
+  parent: BloodstreamStatusEffectDebuff
+  id: StatusEffectHemorrhage # Increases the amount of blood lost when bleeding.
+  name: hemorrhage
+  components:
+  - type: HemophiliaStatusEffect
+    bleedReductionMultiplier: 1 # We don't want it to also reduce coagulation, it would stack with Anticoagulant.
+    bleedAmountMultiplier: 1.33
+
+- type: entity
+  parent: [ PainNumbnessTraitStatusEffect, MobStatusEffectDebuff ]
   id: StatusEffectPainNumbness
+  name: pain numbness
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 4a51ebd26e..bda7d27e07 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1558,3 +1558,27 @@
       - !type:AdjustReagent
         reagent: MindbreakerToxin
         amount: -3.0
+
+- type: reagent
+  id: Warfarin
+  name: reagent-name-warfarin
+  group: Medicine
+  desc: reagent-desc-warfarin
+  physicalDesc: reagent-physical-desc-thin
+  allowedDepartments:
+  - Medical
+  flavor: medicine
+  color: "#d0e21b"
+  metabolisms:
+    Medicine:
+      effects: # One day this could be useful for treating blood clots, if we get those
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectAnticoagulant
+        time: 30 # 10 bleed ticks, you bleed every 3 seconds by default.
+        type: Update
+      - !type:ModifyBleed
+        conditions:
+        - !type:ReagentCondition
+          reagent: Warfarin
+          min: 15
+        amount: 0.25
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index a582b28561..daf0d9554f 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -776,3 +776,22 @@
         conditions:
         - !type:MetabolizerTypeCondition
           type: [Vox]
+
+- type: reagent
+  id: Hemorrhinol
+  name: reagent-name-hemorrhinol
+  group: Toxins
+  desc: reagent-desc-hemorrhinol
+  physicalDesc: reagent-physical-desc-thin
+  contrabandSeverity: Major
+  flavor: sharp
+  color: "#96424f"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectHemorrhage
+        time: 21 # 7 bleed ticks, you bleed every 3 seconds by default.
+        type: Update
+      - !type:ModifyBleed
+        amount: 0.5
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 5b8af49e20..46289b6b4c 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -691,7 +691,7 @@
       amount: 1
   products:
     Traumoxadone: 3
-  
+
 - type: reaction
   id: Stelloxadone
   impact: Medium
@@ -706,3 +706,27 @@
     Stelloxadone: 5
     Water: 3
     Fiber: 2
+
+- type: reaction
+  id: Warfarin
+  reactants:
+    SulfuricAcid:
+      amount: 1
+    Nitrogen:
+      amount: 1
+    Sodium:
+      amount: 1
+  products:
+    Warfarin: 2
+
+- type: reaction
+  id: Hemorrhinol
+  reactants:
+    Warfarin:
+      amount: 2
+    Razorium:
+      amount: 2
+    Plasma:
+      amount: 1
+  products:
+    Hemorrhinol: 2
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index b9a8e1fd54..3ff8529607 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -93,18 +93,21 @@
 #    - PainNumbnessTraitStatusEffect
 #
 #- type: trait
+#  id: Hemophilia
+#  name: trait-hemophilia-name
+#  description: trait-hemophilia-desc
+#  category: Disabilities
+#  specials:
+#  - !type:ApplyStatusEffectSpecial
+#    statusEffects:
+#    - StatusEffectHemophiliaTrait
+#
+#- type: trait
 #  id: ImpairedMobility
 #  name: trait-impaired-mobility-name
 #  description: trait-impaired-mobility-desc
 #  traitGear: OffsetCane
 #  category: Disabilities
 #  components:
-#  - type: ImpairedMobility
+#    - type: ImpairedMobility
 #
-#- type: trait
-#  id: Hemophilia
-#  name: trait-hemophilia-name
-#  description: trait-hemophilia-desc
-#  category: Disabilities
-#  components:
-#  - type: Hemophilia

From b671ea6b1005bfd5b5664643c203bb367215d6f3 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 24 Jan 2026 16:35:56 +0100
Subject: [PATCH 025/360] Downstream fix for Hemophilia status effect change

---
 Resources/Prototypes/_DV/Traits/disabilities.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml
index b021d5c9ca..1c2762b152 100644
--- a/Resources/Prototypes/_DV/Traits/disabilities.yml
+++ b/Resources/Prototypes/_DV/Traits/disabilities.yml
@@ -127,6 +127,6 @@
   description: trait-hemophilia-desc
   category: Disabilities
   effects:
-  - !type:AddCompsEffect
-    components:
-    - type: Hemophilia
+  - !type:ApplyStatusEffect
+    statusEffects:
+    - StatusEffectHemophiliaTrait

From 37b0a845f30f53391f452dd3c12e86dc26cbc903 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 24 Jan 2026 11:21:57 +0100
Subject: [PATCH 026/360] Move Stelloxadone ftl and reaction to _Floof
 namespace

---
 .../en-US/_Floof/reagents/meta/medicine.ftl       |  2 ++
 Resources/Locale/en-US/reagents/meta/medicine.ftl |  3 ---
 .../Prototypes/Recipes/Reactions/medicine.yml     | 15 ---------------
 .../_Floof/Recipes/Reactions/medicine.yml         | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl
 create mode 100644 Resources/Prototypes/_Floof/Recipes/Reactions/medicine.yml

diff --git a/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl
new file mode 100644
index 0000000000..90d167b28e
--- /dev/null
+++ b/Resources/Locale/en-US/_Floof/reagents/meta/medicine.ftl
@@ -0,0 +1,2 @@
+reagent-name-stelloxadone = stelloxadone
+reagent-desc-stelloxadone = A cryogenics chemical. Used to aggressively dissolve toxins from the body. Works regardless of the patient being alive or dead.
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index 3a675dc3f4..b6240170da 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -154,8 +154,5 @@ reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by
 reagent-name-haloperidol = haloperidol
 reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
 
-reagent-name-stelloxadone = stelloxadone
-reagent-desc-stelloxadone = A cryogenics chemical. Used to aggressively dissolve toxins from the body. Works regardless of the patient being alive or dead.
-
 reagent-name-warfarin = warfarin
 reagent-desc-warfarin = Commonly used as an anticoagulant medication. Causes blood to have difficulty forming clots. Can cause internal bleeding when overdosed.
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 46289b6b4c..b98accf093 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -692,21 +692,6 @@
   products:
     Traumoxadone: 3
 
-- type: reaction
-  id: Stelloxadone
-  impact: Medium
-  reactants:
-    Stellibinin:
-      amount: 5
-    Cryoxadone:
-      amount: 3
-    Arithrazine:
-      amount: 2
-  products:
-    Stelloxadone: 5
-    Water: 3
-    Fiber: 2
-
 - type: reaction
   id: Warfarin
   reactants:
diff --git a/Resources/Prototypes/_Floof/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Floof/Recipes/Reactions/medicine.yml
new file mode 100644
index 0000000000..0b067204a5
--- /dev/null
+++ b/Resources/Prototypes/_Floof/Recipes/Reactions/medicine.yml
@@ -0,0 +1,14 @@
+- type: reaction
+  id: Stelloxadone
+  impact: Medium
+  reactants:
+    Stellibinin:
+      amount: 5
+    Cryoxadone:
+      amount: 3
+    Arithrazine:
+      amount: 2
+  products:
+    Stelloxadone: 5
+    Water: 3
+    Fiber: 2

From c9627733c13a1aabfc6504cb0bab9a5a555753f8 Mon Sep 17 00:00:00 2001
From: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Date: Fri, 5 Dec 2025 05:34:00 -0500
Subject: [PATCH 027/360] Add missing vox unequipped sprite for explorer mask
 (#41405)

Mask on face
---
 .../Clothing/Mask/gasexplorer.rsi/meta.json       |   6 +++++-
 .../Mask/gasexplorer.rsi/up-equipped-MASK-vox.png | Bin 0 -> 947 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK-vox.png

diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
index baaca1f25f..976c85ed20 100644
--- a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox state by Flareguy for SS14 | vulpkanin version edited by Floofers. Feroxi sprites made by @Stxcking",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox state by Flareguy for SS14 | vulpkanin version edited by Floofers. Feroxi sprites made by @Stxcking | Vox unequipped by MissKay1994(Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -39,6 +39,10 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbf58361038b1c6c2398bb4e63f744a08ebbdd33
GIT binary patch
literal 947
zcmV;k15EshP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&ZAnByRCt{2nomd+Q5?s=BZ3GrJ0e1kJGt&2TrngpG^xW9brMPh2~95^VqtGf
z2tjy=z>9bjqJt+<#LE(R2nsx8h|!)JcRMK7$|x++>|7)eejVg3JKLf=f81C3KBqVT
ze((4D&ilPL%=-ZX!KFs3_Qs8k4cl=t5hvE3UwBou9lw~G7%%p}xU^jCKNgEQvQy`#
z^JF4Uirj=~BnU-rvWZbklz{BnhGPMei8xtZEoh$}OC9A+v`>$vtge=ti?Fz~ESUw%
z_V(T2NB|c6;N(b3*E2AOuBUW8gTcv>nut(3>;d4>(Css?S3|uUM|3@N+F1E8jIleZ
z;_(He1Z2FPe@Ot)(bfzAc)PMd-wuBkuj9aQWYduVX2HU(lOVR!nPK_s52W?1)VBh%
zx?0eG(ul2s<*0L~m<0>j-GhpgZZZ)k(?$PPr@++2I4J=cTj?G2pEM$^XC(kg>shJ)
zq!C-`9fUO1)i87d>$lQ*H<M!36Ug1co3x)Zpaf)?1q*uzM)BEjP^FNjVn1gfq^X#h
zovZn>$hfd&aAtN+3TY}T&Af|C%hKNvyc-<N0cQp0bvfdNt5pCMz6}3WTzv`tPY3~c
zJHQ(u0B;9)BLv{>0B?i<ydB_;5P-J>yb%KMc7QiR0NxJpMhL*$0p47C0bKtQ^9!ec
zasB4fj{qTnR|CmJoY<ylY1?mz2z@<K>g$P8Y1^w^*98*gBolFpMuGr<qr8bLtqPtb
zpPy_0yg7h~@c7|<Vm1LFyL*7oUosK^NRqeh2wzfw1>e!ujP3g4V(oy}eL^BaL~AEj
zhp=6LjE=TuL?c1mxYkWxgNI)!z=B`P8@AekkfwTeFr=xrI)t^nQ53<C6mY!^vVHn;
zSgnAS&J3G515*>@<YwE9y?p?vOE(P5eccu75XK+eBLG-_^Ul?9@H_{^Vljk+DzR#f
zwY-6=hrh6&Gi*D^XFXpI5!rH^?LL2RYrtsh>8M&=-?Z6xi{}&w2USu6GFI0&0RW?|
zDh7Hx|G3ZV2hTunr!9CTAR`=9`K17Z)diG_0Kk{GQ)+8<eX|%Wt5FDPD)t<f#FXP%
zfSK7j>BY0BR6gYWgosd@t`V)BLYj*AA3sTctONpqKp+qZ1OkCTAP@)y0)gQ2@Egq|
VXtvYfgDn66002ovPDHLkV1iEyuo?gW

literal 0
HcmV?d00001


From 371968842922dd39d9692be0a88a9927579c1864 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Fri, 5 Dec 2025 02:42:23 -0800
Subject: [PATCH 028/360] Fix recharging spray painters (#41725)

change one line
---
 Content.Shared/SprayPainter/SharedSprayPainterSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index a1316e3565..d1f19d0c25 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -188,7 +188,7 @@ public abstract class SharedSprayPainterSystem : EntitySystem
         args.Handled = true;
 
         if (TryComp<LimitedChargesComponent>(args.Used, out var charges)
-            && charges.LastCharges < targetGroup.Cost)
+            && Charges.GetCurrentCharges((args.Used, charges)) < targetGroup.Cost)
         {
             var msg = Loc.GetString("spray-painter-interact-no-charges");
             _popup.PopupClient(msg, args.User, args.User);

From 8cfc9e71842f4ae7eea15d6ff9959501f6f9a38c Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Fri, 5 Dec 2025 07:24:22 -0500
Subject: [PATCH 029/360] New figurine voicelines (#41723)

---
 Resources/Locale/en-US/datasets/figurines.ftl | 50 ++++++++++++++-----
 Resources/Prototypes/Datasets/figurines.yml   | 20 ++++----
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index b6428c0560..9a27dbc584 100644
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -17,9 +17,8 @@ figurines-qm-3 = I didn't approve that shipment of guns!
 figurines-qm-4 = One toy box for my fellow clown!
 figurines-qm-5 = Time to gamble!
 figurines-qm-6 = Viva la Cargonia!
-figurines-qm-7 = Fill out the form.
-figurines-qm-8 = Where'd all our money go?
-figurines-qm-9 = 99% of gamblers quit right before they hit it big!
+figurines-qm-7 = Where'd all our money go?
+figurines-qm-8 = 99% of gamblers quit right before they hit it big!
 
 figurines-cargotech-1 = DRAGON ON ATS!
 figurines-cargotech-2 = I sold the station!
@@ -27,6 +26,11 @@ figurines-cargotech-3 = Brain bounty? I don't have a brain.
 figurines-cargotech-4 = You're worth 3000 spesos. Congrats.
 figurines-cargotech-5 = Vegetable bounty? Nobody eats those anyways.
 figurines-cargotech-6 = WE ARE SECEDING!! ALL HAIL CARGONIA!!
+figurines-cargotech-7 = Pizza party at cargo!
+figurines-cargotech-8 = The mail never stops...
+figurines-cargotech-9 = Nothing stops the mail!
+figurines-cargotech-10 = Clown mask bounty? Alright, let me just find a weapon...
+figurines-cargotech-11 = Laser bounty? Nobody will notice if we ship practice lasers instead, right?
 
 figurines-salvage-1 = Megafauna? It was mega easy.
 figurines-salvage-2 = We're lost. Anyone bring a GPS?
@@ -34,6 +38,9 @@ figurines-salvage-3 = Anyone have oxygen?
 figurines-salvage-4 = I found a blood-red and e-sword!
 figurines-salvage-5 = There's bears in space?
 figurines-salvage-6 = Crusher? I barely know her!
+figurines-salvage-7 = Can someone come pick me up?
+figurines-salvage-8 = I found that contraband on a wreck! It's not mine!
+figurines-salvage-9 = Can we borrow the cargo shuttle? Please?
 
 # Engineering
 
@@ -51,6 +58,8 @@ figurines-atmostech-4 = Tritium...
 figurines-atmostech-5 = Glory to Atmosia!
 figurines-atmostech-6 = Distro? That's short for disposal.
 figurines-atmostech-7 = TEG: Thermal Energy? Gone!
+figurines-atmostech-8 = Does anyone else hear glass cracking?
+figurines-atmostech-9 = I promise this burn chamber is totally safe and will NOT explode.
 
 figurines-engineer-1 = SINGULOOSE!
 figurines-engineer-2 = TESLOOSE!
@@ -74,12 +83,15 @@ figurines-chemist-3 = I am the one who knocks!
 figurines-chemist-4 = Say my name.
 figurines-chemist-5 = 99.8% purity.
 figurines-chemist-6 = Epinephrine? Didn't you say methamphetamine?
+figurines-chemist-7 = Pills here!
+figurines-chemist-8 = Legally speaking, it's not actually a bomb until you mix both beakers together.
 
 figurines-doctor-1 = The patient is already dead!
 figurines-doctor-2 = CLEAR!
 figurines-doctor-3 = Saw makes BRRR.
 figurines-doctor-4 = Just a week away...
 figurines-doctor-5 = I knew it...
+figurines-doctor-6 = Well, at least we have body bags.
 
 figurines-paramedic-1 = Insuls and tools!
 figurines-paramedic-2 = I need AA for saving people!
@@ -140,8 +152,10 @@ figurines-warden-6 = You're going away for a long time, buddy.
 figurines-hop-1 = Papers, please.
 figurines-hop-2 = You are fired.
 figurines-hop-3 = BRB.
-figurines-hop-4 = You can get AA if you fill out the form.
+figurines-hop-4 = Fill out the form.
 figurines-hop-5 = I was gone for two seconds...
+figurines-hop-6 = Go get this form stamped.
+figurines-hop-7 = Has anyone seen Ian?
 
 figurines-bartender-1 = Where's my monkey?
 figurines-bartender-2 = Sec won't drink.
@@ -179,11 +193,12 @@ figurines-chef-6 = Where'd Pun Pun go? No idea...
 
 figurines-clown-1 = Honk!
 figurines-clown-2 = Banana!
-figurines-clown-3 = Soap!
-figurines-clown-4 = HoP has one clown, HoS has the whole department.
-figurines-clown-5 = Do I annoy you?
-figurines-clown-6 = Can I have AA? Please?
-figurines-clown-7 = I'm a clown, but you're the whole circus!
+figurines-clown-3 = Pie!
+figurines-clown-4 = Soap!
+figurines-clown-5 = Service has one clown, but Security has a whole department of them.
+figurines-clown-6 = Do I annoy you?
+figurines-clown-7 = Can I have AA? Please?
+figurines-clown-8 = I'm a clown, but you're the whole circus!
 
 figurines-greytider-1 = Man, this party stinks. I fucking hate these people.
 figurines-greytider-2 = Uh-oh, who's lost their stunbaton?
@@ -207,6 +222,13 @@ figurines-lawyer-2 = Objection!
 figurines-lawyer-3 = Did you know that you have rights?
 figurines-lawyer-4 = Space law says!
 figurines-lawyer-5 = Sign the contract first.
+figurines-lawyer-6 = My client is innocent!
+figurines-lawyer-7 = I'm suing.
+figurines-lawyer-8 = You may be entitled to financial compensation!
+figurines-lawyer-9 = Come back with a warrant!
+figurines-lawyer-10 = See you in court!
+figurines-lawyer-11 = Guilty!
+figurines-lawyer-12 = Not guilty!
 
 figurines-librarian-1 = Silence!
 figurines-librarian-2 = One day while...
@@ -322,10 +344,14 @@ figurines-thief-3 = Theres nothing suspicious about this satchel at all, officer
 figurines-thief-4 = I have NO idea where your pet is...
 figurines-thief-5 = Huh, I didn't know that wall could open up...
 
-figurines-wizard-1 = Ei Nath!!
-figurines-wizard-2 = Real wizards support trans rights.
+figurines-wizard-1 = EI NATH!!
+figurines-wizard-2 = ONI'SOMA!!
 figurines-wizard-3 = Skidaddle skadoodle!
-figurines-wizard-4 = FIREBALL!
+figurines-wizard-4 = Real wizards support trans rights.
+figurines-wizard-5 = Which one of you NERDS is ready to be shoved in a locker?
+figurines-wizard-6 = I'm not the wizard! I'm the captain! I got mind-swapped!
+figurines-wizard-7 = Now you see me, now you don't!
+figurines-wizard-8 = Guns are for losers who can't explode people with their mind.
 
 # Animals
 
diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
index 53ba40da64..8d1a256b53 100644
--- a/Resources/Prototypes/Datasets/figurines.yml
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -2,7 +2,7 @@
   id: FigurinesHoP
   values:
     prefix: figurines-hop-
-    count: 5
+    count: 7
 
 - type: localizedDataset
   id: FigurinesPassenger
@@ -20,7 +20,7 @@
   id: FigurinesClown
   values:
     prefix: figurines-clown-
-    count: 7
+    count: 8
 
 - type: localizedDataset
   id: FigurinesHoloClown
@@ -80,25 +80,25 @@
   id: FigurinesLawyer
   values:
     prefix: figurines-lawyer-
-    count: 5
+    count: 12
 
 - type: localizedDataset
   id: FigurinesCargoTech
   values:
     prefix: figurines-cargotech-
-    count: 6
+    count: 11
 
 - type: localizedDataset
   id: FigurinesSalvage
   values:
     prefix: figurines-salvage-
-    count: 6
+    count: 9
 
 - type: localizedDataset
   id: FigurinesQM
   values:
     prefix: figurines-qm-
-    count: 9
+    count: 8
 
 - type: localizedDataset
   id: FigurinesCE
@@ -116,7 +116,7 @@
   id: FigurinesAtmosTech
   values:
     prefix: figurines-atmostech-
-    count: 7
+    count: 9
 
 - type: localizedDataset
   id: FigurinesRD
@@ -140,7 +140,7 @@
   id: FigurinesChemist
   values:
     prefix: figurines-chemist-
-    count: 6
+    count: 8
 
 - type: localizedDataset
   id: FigurinesParamedic
@@ -152,7 +152,7 @@
   id: FigurinesDoctor
   values:
     prefix: figurines-doctor-
-    count: 5
+    count: 6
 
 - type: localizedDataset
   id: FigurinesLibrarian
@@ -218,7 +218,7 @@
   id: FigurinesWizard
   values:
     prefix: figurines-wizard-
-    count: 4
+    count: 8
 
 - type: localizedDataset
   id: FigurinesSpaceDragon

From 4dc0ff5c6a59b12525ff75373ef687fb5bba263b Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 5 Dec 2025 13:37:02 +0100
Subject: [PATCH 030/360] C# 14 fixes (#41708)

Necessary for the move to .NET 10 & C# 14. Actual PR to change SS14 to C# 14 will be separate.
---
 Content.Client/Parallax/Managers/ParallaxManager.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Parallax/Managers/ParallaxManager.cs b/Content.Client/Parallax/Managers/ParallaxManager.cs
index bc7d7d60d6..bd46288ebf 100644
--- a/Content.Client/Parallax/Managers/ParallaxManager.cs
+++ b/Content.Client/Parallax/Managers/ParallaxManager.cs
@@ -98,10 +98,13 @@ public sealed class ParallaxManager : IParallaxManager
             }
             else
             {
-                layers = await Task.WhenAll(
+                // Explicitly allocate params array to avoid sandbox violation since C# 14.
+                var tasks = new[]
+                {
                     LoadParallaxLayers(parallaxPrototype.Layers, loadedLayers, cancel),
-                    LoadParallaxLayers(parallaxPrototype.LayersLQ, loadedLayers, cancel)
-                );
+                    LoadParallaxLayers(parallaxPrototype.LayersLQ, loadedLayers, cancel),
+                };
+                layers = await Task.WhenAll(tasks);
             }
 
             cancel.ThrowIfCancellationRequested();

From dc3eeb917cba3452545111fb9927be885cef1b3e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 5 Dec 2025 15:53:35 +0100
Subject: [PATCH 031/360] Fix shuttle FTL with UI scale (#40933)

Fixed click inputs being broken

Fixed rendering of background parallax.
---
 Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
index 70ac02bda9..daf2622d81 100644
--- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -124,7 +124,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
                 else
                 {
                     // We'll send the "adjusted" position and server will adjust it back when relevant.
-                    var mapCoords = new MapCoordinates(InverseMapPosition(args.RelativePosition), ViewingMap);
+                    var mapCoords = new MapCoordinates(InverseMapPosition(args.RelativePixelPosition), ViewingMap);
                     RequestFTL?.Invoke(mapCoords, _ftlAngle);
                 }
             }
@@ -180,7 +180,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
 
         // Remove offset so we can floor.
         var botLeft = new Vector2(0f, 0f);
-        var topRight = botLeft + Size;
+        var topRight = botLeft + PixelSize;
 
         var flooredBL = botLeft - originBL;
 

From 6a2537f5117c24b44a08b7a753c13084e617007e Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sat, 6 Dec 2025 01:51:48 +1000
Subject: [PATCH 032/360] Remove static IoC from Replay and Shared EntryPoint
 (#41707)

---
 Content.Replay/EntryPoint.cs       |  4 ++--
 Content.Shared/Entry/EntryPoint.cs | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Content.Replay/EntryPoint.cs b/Content.Replay/EntryPoint.cs
index ed6460a7e7..6a6658f5ef 100644
--- a/Content.Replay/EntryPoint.cs
+++ b/Content.Replay/EntryPoint.cs
@@ -19,8 +19,8 @@ public sealed class EntryPoint : GameClient
     public override void Init()
     {
         base.Init();
-        IoCManager.BuildGraph();
-        IoCManager.InjectDependencies(this);
+        Dependencies.BuildGraph();
+        Dependencies.InjectDependencies(this);
     }
 
     public override void PostInit()
diff --git a/Content.Shared/Entry/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs
index db8d6a6abd..1b5755dd66 100644
--- a/Content.Shared/Entry/EntryPoint.cs
+++ b/Content.Shared/Entry/EntryPoint.cs
@@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Content.Shared.Humanoid.Markings;
-using Content.Shared.IoC;
 using Content.Shared.Maps;
 using Robust.Shared;
 using Robust.Shared.Configuration;
@@ -21,12 +20,15 @@ namespace Content.Shared.Entry
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
         [Dependency] private readonly IResourceManager _resMan = default!;
+#if DEBUG
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+#endif
 
         private readonly ResPath _ignoreFileDirectory = new("/IgnoredPrototypes/");
 
         public override void PreInit()
         {
-            IoCManager.InjectDependencies(this);
+            Dependencies.InjectDependencies(this);
         }
 
         public override void Shutdown()
@@ -44,13 +46,12 @@ namespace Content.Shared.Entry
             base.PostInit();
 
             InitTileDefinitions();
-            IoCManager.Resolve<MarkingManager>().Initialize();
+            Dependencies.Resolve<MarkingManager>().Initialize();
 
 #if DEBUG
-            var configMan = IoCManager.Resolve<IConfigurationManager>();
-            configMan.OverrideDefault(CVars.NetFakeLagMin, 0.075f);
-            configMan.OverrideDefault(CVars.NetFakeLoss, 0.005f);
-            configMan.OverrideDefault(CVars.NetFakeDuplicates, 0.005f);
+            _configurationManager.OverrideDefault(CVars.NetFakeLagMin, 0.075f);
+            _configurationManager.OverrideDefault(CVars.NetFakeLoss, 0.005f);
+            _configurationManager.OverrideDefault(CVars.NetFakeDuplicates, 0.005f);
 #endif
         }
 

From 29ca8f78ffeab21b19e8677fff59f4808cf85df0 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Sun, 22 Jun 2025 12:28:21 -0700
Subject: [PATCH 033/360] Allow admins to export round logs to CSV files
 (#38206)

---
 .../UI/Logs/AdminLogsControl.xaml             |  1 +
 .../Administration/UI/Logs/AdminLogsEui.cs    | 69 +++++++++++++++++++
 .../en-US/administration/ui/admin-logs.ftl    |  1 +
 3 files changed, 71 insertions(+)

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
index 9b5da77801..86b72d9392 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
@@ -55,6 +55,7 @@
                     <Control HorizontalExpand="True"/>
                     <Label Name="Count" Access="Public"/>
                     <Control HorizontalExpand="True"/>
+                    <Button Name="ExportLogs" Access="Public" Text="{Loc admin-logs-export}"/>
                     <Button Name="PopOutButton" Access="Public" Text="{Loc admin-logs-pop-out}"/>
                 </BoxContainer>
                 <BoxContainer HorizontalExpand="True">
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 6ad7de347d..496078a8b8 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -17,6 +17,12 @@ public sealed class AdminLogsEui : BaseEui
 {
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    [Dependency] private readonly IFileDialogManager _dialogManager = default!;
+    [Dependency] private readonly ILogManager _log = default!;
+
+    private ISawmill _sawmill;
+
+    private bool _currentlyExportingLogs = false;
 
     public AdminLogsEui()
     {
@@ -28,6 +34,9 @@ public sealed class AdminLogsEui : BaseEui
         LogsControl.RefreshButton.OnPressed += _ => RequestLogs();
         LogsControl.NextButton.OnPressed += _ => NextLogs();
         LogsControl.PopOutButton.OnPressed += _ => PopOut();
+        LogsControl.ExportLogs.OnPressed += _ => ExportLogs();
+
+        _sawmill = _log.GetSawmill("admin.logs.ui");
     }
 
     private WindowRoot? Root { get; set; }
@@ -76,6 +85,66 @@ public sealed class AdminLogsEui : BaseEui
         SendMessage(request);
     }
 
+    private async void ExportLogs()
+    {
+        if (_currentlyExportingLogs)
+            return;
+
+        _currentlyExportingLogs = true;
+        LogsControl.ExportLogs.Disabled = true;
+
+        var file = await _dialogManager.SaveFile(new FileDialogFilters(new FileDialogFilters.Group("csv")));
+
+        if (file == null)
+            return;
+
+        try
+        {
+            await using var writer = new StreamWriter(file.Value.fileStream);
+            foreach (var child in LogsControl.LogsContainer.Children)
+            {
+                if (child is not AdminLogLabel logLabel || !child.Visible)
+                    continue;
+
+                var log = logLabel.Log;
+
+                // I swear to god if someone adds ,s or "s to the other fields...
+                await writer.WriteAsync(log.Date.ToString("s", System.Globalization.CultureInfo.InvariantCulture));
+                await writer.WriteAsync(',');
+                await writer.WriteAsync(log.Id.ToString());
+                await writer.WriteAsync(',');
+                await writer.WriteAsync(log.Impact.ToString());
+                await writer.WriteAsync(',');
+                // Message
+                await writer.WriteAsync('"');
+                await writer.WriteAsync(log.Message.Replace("\"", "\"\""));
+                await writer.WriteAsync('"');
+                // End of message
+                await writer.WriteAsync(',');
+
+                var players = log.Players;
+                for (var i = 0; i < players.Length; i++)
+                {
+                    await writer.WriteAsync(players[i] + (i == players.Length - 1 ? "" : " "));
+                }
+
+                await writer.WriteAsync(',');
+                await writer.WriteAsync(log.Type.ToString());
+                await writer.WriteLineAsync();
+            }
+        }
+        catch (Exception exc)
+        {
+            _sawmill.Error($"Error when exporting admin log:\n{exc.StackTrace}");
+        }
+        finally
+        {
+            await file.Value.fileStream.DisposeAsync();
+            _currentlyExportingLogs = false;
+            LogsControl.ExportLogs.Disabled = false;
+        }
+    }
+
     private void PopOut()
     {
         if (LogsWindow == null)
diff --git a/Resources/Locale/en-US/administration/ui/admin-logs.ftl b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
index 8c30863a55..0d9894d5ee 100644
--- a/Resources/Locale/en-US/administration/ui/admin-logs.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
@@ -1,5 +1,6 @@
 admin-logs-title = Admin Logs Panel
 admin-logs-count = Showing {$showing}/{$total} of {$round}
+admin-logs-export = Export
 admin-logs-pop-out = Pop Out
 
 # Round

From 0bfa6e8d147add0235338d6016f784da12afbe48 Mon Sep 17 00:00:00 2001
From: Kowlin <10947836+Kowlin@users.noreply.github.com>
Date: Mon, 30 Jun 2025 23:09:16 +0200
Subject: [PATCH 034/360] Tweaks to admin CSV exporting (#38531)

---
 .../Administration/UI/Logs/AdminLogsEui.cs    | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 496078a8b8..52364111c0 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -20,6 +20,10 @@ public sealed class AdminLogsEui : BaseEui
     [Dependency] private readonly IFileDialogManager _dialogManager = default!;
     [Dependency] private readonly ILogManager _log = default!;
 
+    private const char CsvSeparator = ',';
+    private const string CsvQuote = "\"";
+    private const string CsvHeader = "Date,ID,PlayerID,Severity,Type,Message";
+
     private ISawmill _sawmill;
 
     private bool _currentlyExportingLogs = false;
@@ -100,7 +104,9 @@ public sealed class AdminLogsEui : BaseEui
 
         try
         {
-            await using var writer = new StreamWriter(file.Value.fileStream);
+            // Buffer is set to 4KB for performance reasons. As the average export of 1000 logs is ~200KB
+            await using var writer = new StreamWriter(file.Value.fileStream, bufferSize: 4096);
+            await writer.WriteLineAsync(CsvHeader);
             foreach (var child in LogsControl.LogsContainer.Children)
             {
                 if (child is not AdminLogLabel logLabel || !child.Visible)
@@ -108,28 +114,31 @@ public sealed class AdminLogsEui : BaseEui
 
                 var log = logLabel.Log;
 
+                // Date
                 // I swear to god if someone adds ,s or "s to the other fields...
                 await writer.WriteAsync(log.Date.ToString("s", System.Globalization.CultureInfo.InvariantCulture));
-                await writer.WriteAsync(',');
+                await writer.WriteAsync(CsvSeparator);
+                // ID
                 await writer.WriteAsync(log.Id.ToString());
-                await writer.WriteAsync(',');
-                await writer.WriteAsync(log.Impact.ToString());
-                await writer.WriteAsync(',');
-                // Message
-                await writer.WriteAsync('"');
-                await writer.WriteAsync(log.Message.Replace("\"", "\"\""));
-                await writer.WriteAsync('"');
-                // End of message
-                await writer.WriteAsync(',');
-
+                await writer.WriteAsync(CsvSeparator);
+                // PlayerID
                 var players = log.Players;
                 for (var i = 0; i < players.Length; i++)
                 {
                     await writer.WriteAsync(players[i] + (i == players.Length - 1 ? "" : " "));
                 }
-
-                await writer.WriteAsync(',');
+                await writer.WriteAsync(CsvSeparator);
+                // Severity
+                await writer.WriteAsync(log.Impact.ToString());
+                await writer.WriteAsync(CsvSeparator);
+                // Type
                 await writer.WriteAsync(log.Type.ToString());
+                await writer.WriteAsync(CsvSeparator);
+                // Message
+                await writer.WriteAsync(CsvQuote);
+                await writer.WriteAsync(log.Message.Replace(CsvQuote, CsvQuote + CsvQuote));
+                await writer.WriteAsync(CsvQuote);
+
                 await writer.WriteLineAsync();
             }
         }

From 95f9d4805104c0f23dd0aba9a614cff9fec77a84 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 31 Aug 2025 17:50:37 +0200
Subject: [PATCH 035/360] Revert "Admin Log Browser Improvements (#39130)"

This reverts commit f67cebf7a4ed451f1911aa5c8bf6f04c198b917f.

Per request of @Kowlin and @southbridge-fur

Check out https://github.com/space-wizards/space-station-14/issues/39960 for further information
---
 .../UI/CustomControls/AdminLogLabel.cs        |   33 +
 .../CustomControls/PlayerListControl.xaml.cs  |   18 +-
 .../UI/CustomControls/PlayerListEntry.xaml.cs |    1 +
 .../UI/Logs/AdminLogsControl.xaml             |   10 +-
 .../UI/Logs/AdminLogsControl.xaml.cs          |   85 +-
 .../Administration/UI/Logs/AdminLogsEui.cs    |    2 +-
 .../UI/Logs/Entries/AdminLogEntry.xaml        |   14 -
 .../UI/Logs/Entries/AdminLogEntry.xaml.cs     |   79 -
 .../UI/Logs/Entries/AdminLogEntryDetails.xaml |   44 -
 .../Logs/Entries/AdminLogEntryDetails.xaml.cs |   98 -
 .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs       |    2 +
 .../Options/UI/Tabs/AdminOptionsTab.xaml      |    3 -
 .../Options/UI/Tabs/AdminOptionsTab.xaml.cs   |    2 -
 ...0250723055137_AdminLogsCurtime.Designer.cs | 2125 -----------------
 .../20250723055137_AdminLogsCurtime.cs        |   29 -
 .../PostgresServerDbContextModelSnapshot.cs   |    7 +-
 ...0250723055127_AdminLogsCurtime.Designer.cs | 2048 ----------------
 .../Sqlite/20250723055127_AdminLogsCurtime.cs |   29 -
 .../SqliteServerDbContextModelSnapshot.cs     |    4 -
 Content.Server.Database/Model.cs              |    5 -
 .../Logs/AdminLogManager.Cache.cs             |    2 +-
 .../Administration/Logs/AdminLogManager.cs    |    3 -
 Content.Server/Database/ServerDbBase.cs       |    2 +-
 .../Administration/Logs/SharedAdminLog.cs     |    1 -
 Content.Shared/CCVar/CCVars.Interface.cs      |    6 -
 .../en-US/administration/ui/admin-logs.ftl    |   15 -
 .../en-US/escape-menu/ui/options-menu.ftl     |    4 -
 27 files changed, 65 insertions(+), 4606 deletions(-)
 create mode 100644 Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
 delete mode 100644 Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml
 delete mode 100644 Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml.cs
 delete mode 100644 Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml
 delete mode 100644 Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml.cs
 delete mode 100644 Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.Designer.cs
 delete mode 100644 Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.cs
 delete mode 100644 Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.Designer.cs
 delete mode 100644 Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.cs

diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs b/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
new file mode 100644
index 0000000000..0de38ce234
--- /dev/null
+++ b/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Administration.Logs;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Administration.UI.CustomControls;
+
+public sealed class AdminLogLabel : RichTextLabel
+{
+    public AdminLogLabel(ref SharedAdminLog log, HSeparator separator)
+    {
+        Log = log;
+        Separator = separator;
+
+        SetMessage($"{log.Date:HH:mm:ss}: {log.Message}");
+        OnVisibilityChanged += VisibilityChanged;
+    }
+
+    public SharedAdminLog Log { get; }
+
+    public HSeparator Separator { get; }
+
+    private void VisibilityChanged(Control control)
+    {
+        Separator.Visible = Visible;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        OnVisibilityChanged -= VisibilityChanged;
+    }
+}
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index 8027a00c54..c7fbf6c2dc 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -1,15 +1,16 @@
 using System.Linq;
-using System.Text.RegularExpressions;
 using Content.Client.Administration.Systems;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Verbs.UI;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Input;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.CustomControls;
 
@@ -95,26 +96,13 @@ public sealed partial class PlayerListControl : BoxContainer
     private void FilterList()
     {
         _sortedPlayerList.Clear();
-
-        Regex filterRegex;
-        // There is no neat way to handle invalid regex being submitted other than
-        // catching and ignoring the exception which gets thrown when it's invalid.
-        try
-        {
-            filterRegex = new Regex(FilterLineEdit.Text, RegexOptions.IgnoreCase);
-        }
-        catch (ArgumentException)
-        {
-            return;
-        }
-
         foreach (var info in _playerList)
         {
             var displayName = $"{info.CharacterName} ({info.Username})";
             if (info.IdentityName != info.CharacterName)
                 displayName += $" [{info.IdentityName}]";
             if (!string.IsNullOrEmpty(FilterLineEdit.Text)
-                && !filterRegex.IsMatch(displayName))
+                && !displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant()))
                 continue;
             _sortedPlayerList.Add(info);
         }
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs
index 00e4d06044..cf2e776ea8 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs
@@ -1,6 +1,7 @@
 using Content.Client.Stylesheets;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
index 86b72d9392..f92a307de3 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
@@ -1,6 +1,5 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls"
-         xmlns:ui="clr-namespace:Content.Client.Options.UI">
+         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Horizontal">
             <BoxContainer Orientation="Vertical">
@@ -58,13 +57,6 @@
                     <Button Name="ExportLogs" Access="Public" Text="{Loc admin-logs-export}"/>
                     <Button Name="PopOutButton" Access="Public" Text="{Loc admin-logs-pop-out}"/>
                 </BoxContainer>
-                <BoxContainer HorizontalExpand="True">
-                    <Button Name="RenderRichTextButton" Access="Public" Text="{Loc admin-logs-render-rich-text}"
-                            StyleClasses="OpenRight" ToggleMode="True"/>
-                    <Button Name="RemoveMarkupButton" Access="Public" Text="{Loc admin-logs-remove-markup}"
-                            StyleClasses="OpenLeft" ToggleMode="True"/>
-                    <Control HorizontalExpand="True"/>
-                </BoxContainer>
                 <BoxContainer Orientation="Horizontal">
                     <LineEdit Name="LogSearch" Access="Public" StyleClasses="actionSearchBox"
                               HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-logs-placeholder}"/>
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
index 00b5e40e9a..e12d598733 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
@@ -1,8 +1,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
 using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Administration.UI.Logs.Entries;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Robust.Client.AutoGenerated;
@@ -40,9 +38,6 @@ public sealed partial class AdminLogsControl : Control
         SelectAllPlayersButton.OnPressed += SelectAllPlayers;
         SelectNoPlayersButton.OnPressed += SelectNoPlayers;
 
-        RenderRichTextButton.OnPressed += RenderRichTextChanged;
-        RemoveMarkupButton.OnPressed += RemoveMarkupChanged;
-
         RoundSpinBox.IsValid = i => i > 0 && i <= CurrentRound;
         RoundSpinBox.ValueChanged += RoundSpinBoxChanged;
         RoundSpinBox.InitDefaultButtons();
@@ -63,8 +58,6 @@ public sealed partial class AdminLogsControl : Control
 
     private int CurrentRound { get; set; }
 
-    private Regex LogSearchRegex { get; set; } = new("");
-
     public int SelectedRoundId => RoundSpinBox.Value;
     public string Search => LogSearch.Text;
     private int ShownLogs { get; set; }
@@ -84,8 +77,6 @@ public sealed partial class AdminLogsControl : Control
     /// </summary>
     private List<SharedAdminLog> RawAdminLogs { get; set; } = new();
 
-    private bool RenderRichText { get; set; }
-    private bool RemoveMarkup { get; set; }
     public HashSet<LogType> SelectedTypes { get; } = new();
 
     public HashSet<Guid> SelectedPlayers { get; } = new();
@@ -132,19 +123,6 @@ public sealed partial class AdminLogsControl : Control
 
     private void LogSearchChanged(LineEditEventArgs args)
     {
-        // This exception is thrown if the regex is invalid, which happens often, so we ignore it.
-        try
-        {
-            LogSearchRegex = new Regex(
-                "(" + LogSearch.Text + ")",
-                RegexOptions.IgnoreCase,
-                TimeSpan.FromSeconds(1));
-        }
-        catch (ArgumentException)
-        {
-            return;
-        }
-
         UpdateLogs();
     }
 
@@ -226,26 +204,6 @@ public sealed partial class AdminLogsControl : Control
         UpdateLogs();
     }
 
-    private void RenderRichTextChanged(ButtonEventArgs args)
-    {
-        RenderRichText = args.Button.Pressed;
-
-        RemoveMarkup = RemoveMarkup && !RenderRichText;
-        RemoveMarkupButton.Pressed = RemoveMarkup;
-
-        UpdateLogs();
-    }
-
-    private void RemoveMarkupChanged(ButtonEventArgs args)
-    {
-        RemoveMarkup = args.Button.Pressed;
-
-        RenderRichText = !RemoveMarkup && RenderRichText;
-        RenderRichTextButton.Pressed = RenderRichText;
-
-        UpdateLogs();
-    }
-
     public void SetTypesSelection(HashSet<LogType> selectedTypes, bool invert = false)
     {
         SelectedTypes.Clear();
@@ -304,15 +262,16 @@ public sealed partial class AdminLogsControl : Control
 
         foreach (var child in LogsContainer.Children)
         {
-            if (child is not AdminLogEntry log)
+            if (child is not AdminLogLabel log)
+            {
                 continue;
+            }
 
             child.Visible = ShouldShowLog(log);
-            if (!child.Visible)
-                continue;
-
-            log.RenderResults(LogSearchRegex, RenderRichText, RemoveMarkup);
-            ShownLogs++;
+            if (child.Visible)
+            {
+                ShownLogs++;
+            }
         }
 
         UpdateCount();
@@ -330,30 +289,30 @@ public sealed partial class AdminLogsControl : Control
                button.Text.Contains(PlayerSearch.Text, StringComparison.OrdinalIgnoreCase);
     }
 
-    private bool LogMatchesPlayerFilter(AdminLogEntry entry)
+    private bool LogMatchesPlayerFilter(AdminLogLabel label)
     {
-        if (entry.Log.Players.Length == 0)
+        if (label.Log.Players.Length == 0)
             return SelectedPlayers.Count == 0 || IncludeNonPlayerLogs;
 
-        return SelectedPlayers.Overlaps(entry.Log.Players);
+        return SelectedPlayers.Overlaps(label.Log.Players);
     }
 
-    private bool ShouldShowLog(AdminLogEntry entry)
+    private bool ShouldShowLog(AdminLogLabel label)
     {
         // Check log type
-        if (!SelectedTypes.Contains(entry.Log.Type))
+        if (!SelectedTypes.Contains(label.Log.Type))
             return false;
 
         // Check players
-        if (!LogMatchesPlayerFilter(entry))
+        if (!LogMatchesPlayerFilter(label))
             return false;
 
         // Check impact
-        if (!SelectedImpacts.Contains(entry.Log.Impact))
+        if (!SelectedImpacts.Contains(label.Log.Impact))
             return false;
 
         // Check search
-        if (!LogSearchRegex.IsMatch(entry.Log.Message))
+        if (!label.Log.Message.Contains(LogSearch.Text, StringComparison.OrdinalIgnoreCase))
             return false;
 
         return true;
@@ -427,16 +386,15 @@ public sealed partial class AdminLogsControl : Control
         {
             var log = tempLogs[i];
             ref var logRef = ref log; // It didn't like me doing this as one line lmao
-            var entry = new AdminLogEntry(ref log);
 
-            //var label = new AdminLogLabel(ref logRef, separator);
-            //label.Visible = ShouldShowLog(label);
+            var separator = new HSeparator();
+            var label = new AdminLogLabel(ref logRef, separator);
+            label.Visible = ShouldShowLog(label);
 
-            TotalLogs++;
-            //if (label.Visible) ShownLogs++;
+            if (label.Visible) ShownLogs++;
 
-            //LogsContainer.AddChild(label);
-            LogsContainer.AddChild(entry);
+            LogsContainer.AddChild(label);
+            LogsContainer.AddChild(separator);
         }
         UpdateLogs();
     }
@@ -636,7 +594,6 @@ public sealed partial class AdminLogsControl : Control
         SelectAllTypesButton.OnPressed -= SelectAllTypes;
         SelectNoTypesButton.OnPressed -= SelectNoTypes;
 
-        IncludeNonPlayersButton.OnPressed -= IncludeNonPlayers;
         IncludeNonPlayersButton.OnPressed -= IncludeNonPlayers;
         SelectAllPlayersButton.OnPressed -= SelectAllPlayers;
         SelectNoPlayersButton.OnPressed -= SelectNoPlayers;
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 52364111c0..28aca23f75 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using System.Linq;
-using Content.Client.Administration.UI.Logs.Entries;
+using Content.Client.Administration.UI.CustomControls;
 using Content.Client.Eui;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Eui;
diff --git a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml b/Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml
deleted file mode 100644
index 7733c2b1cb..0000000000
--- a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-         Orientation="Vertical">
-    <BoxContainer Margin="2">
-        <Collapsible>
-            <CollapsibleHeading  Name="DetailsHeading" Access="Public">
-                <RichTextLabel Margin="20 0 0 0" Name="Message" MinSize="50 10" VerticalExpand="True" Access="Public" />
-            </CollapsibleHeading>
-            <CollapsibleBody Name="DetailsBody" Access="Public" />
-        </Collapsible>
-    </BoxContainer>
-    <cc:HSeparator/>
-</BoxContainer>
diff --git a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml.cs b/Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml.cs
deleted file mode 100644
index fc9f960b66..0000000000
--- a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntry.xaml.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Text.RegularExpressions;
-using Content.Client.Message;
-using Content.Shared.Administration.Logs;
-using Content.Shared.CCVar;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Administration.UI.Logs.Entries;
-
-[GenerateTypedNameReferences]
-public sealed partial class AdminLogEntry : BoxContainer
-{
-    private readonly IConfigurationManager _cfgManager;
-
-    public SharedAdminLog Log { get; }
-
-    private readonly string _rawMessage;
-
-    public AdminLogEntry(ref SharedAdminLog log)
-    {
-        _cfgManager = IoCManager.Resolve<IConfigurationManager>();
-
-        RobustXamlLoader.Load(this);
-
-        Log = log;
-
-        _rawMessage = $"{log.Date:HH:mm:ss}: {log.Message}";
-        Message.SetMessage(_rawMessage);
-
-        DetailsHeading.OnToggled += DetailsToggled;
-    }
-
-    /// <summary>
-    /// Sets text to be highlighted from a search result, and renders rich text, or removes all rich text markup.
-    /// </summary>
-    public void RenderResults(Regex highlightRegex, bool renderRichText, bool removeMarkup)
-    {
-        var color = _cfgManager.GetCVar(CCVars.AdminLogsHighlightColor);
-        var formattedMessage = renderRichText
-            ? _rawMessage
-            : removeMarkup
-                ? FormattedMessage.RemoveMarkupPermissive(_rawMessage)
-                : FormattedMessage.EscapeText(_rawMessage);
-
-        // Want to avoid highlighting smaller strings
-        if (highlightRegex.ToString().Length > 4)
-        {
-            try
-            {
-                formattedMessage = highlightRegex.Replace(formattedMessage, $"[color={color}]$1[/color]", 3);
-            }
-            catch (RegexMatchTimeoutException)
-            {
-                // if we time out then don't bother highlighting results
-            }
-        }
-
-        if (!FormattedMessage.TryFromMarkup(formattedMessage, out var outputMessage))
-            return;
-
-        Message.SetMessage(outputMessage);
-    }
-
-    /// <summary>
-    /// We perform some extra calculations in the dropdown, so we want to render that only when
-    /// the dropdown is actually opened.
-    /// This also removes itself from the event listener so it doesn't trigger again.
-    /// </summary>
-    private void DetailsToggled(BaseButton.ButtonToggledEventArgs args)
-    {
-        if (!args.Pressed || DetailsBody.ChildCount > 0)
-            return;
-        DetailsBody.AddChild(new AdminLogEntryDetails(Log));
-        DetailsHeading.OnToggled -= DetailsToggled;
-    }
-}
diff --git a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml b/Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml
deleted file mode 100644
index 23391046b9..0000000000
--- a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml
+++ /dev/null
@@ -1,44 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-          StyleClasses="BackgroundDark">
-     <BoxContainer Orientation="Vertical" Margin="4">
-        <BoxContainer Orientation="Vertical">
-            <Label Text="{Loc admin-logs-field-type}" Margin="0 0 4 0"/>
-            <Label Name="Type" Text="None" StyleClasses="LabelSecondaryColor" Access="Public"/>
-        </BoxContainer>
-        <cc:HSeparator/>
-        <BoxContainer Orientation="Vertical">
-            <Label Text="{Loc admin-logs-field-impact}" Margin="0 0 4 0"/>
-            <Label Name="Impact" Text="None" StyleClasses="LabelSecondaryColor" Access="Public"/>
-        </BoxContainer>
-    </BoxContainer>
-    <cc:VSeparator/>
-    <BoxContainer Orientation="Vertical" Margin="4">
-        <Label Text="{Loc admin-logs-field-time-header}"/>
-        <cc:HSeparator/>
-        <BoxContainer>
-            <Label Text="{Loc admin-logs-field-time-local}" Margin="0 0 4 0" HorizontalExpand="True"/>
-            <Label Name="LocalTime" Text="None" StyleClasses="LabelSecondaryColor" Access="Public" HorizontalExpand="True"/>
-        </BoxContainer>
-        <cc:HSeparator/>
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc admin-logs-field-time-utc}" Margin="0 0 4 0" HorizontalExpand="True"/>
-            <Label Name="UTCTime" Text="None" StyleClasses="LabelSecondaryColor" Access="Public" HorizontalExpand="True"/>
-        </BoxContainer>
-        <cc:HSeparator/>
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc admin-logs-field-time-round}" Margin="0 0 4 0" HorizontalExpand="True"/>
-            <Label Name="CurTime" Text="None" StyleClasses="LabelSecondaryColor" Access="Public" HorizontalExpand="True"/>
-        </BoxContainer>
-    </BoxContainer>
-    <cc:VSeparator/>
-    <BoxContainer Orientation="Vertical" Margin="4" HorizontalExpand="True">
-        <Label Text="{Loc admin-logs-field-players-header}"/>
-        <cc:HSeparator/>
-        <BoxContainer Orientation="Horizontal" Margin="4" VerticalExpand="True">
-            <controls:ListContainer Name="PlayerListContainer" Access="Public" HorizontalExpand="True"/>
-        </BoxContainer>
-    </BoxContainer>
-</BoxContainer>
diff --git a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml.cs b/Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml.cs
deleted file mode 100644
index 611626e544..0000000000
--- a/Content.Client/Administration/UI/Logs/Entries/AdminLogEntryDetails.xaml.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System.Linq;
-using Content.Client.Administration.Systems;
-using Content.Client.Administration.UI.CustomControls;
-using Content.Client.UserInterface.Controls;
-using Content.Client.Verbs.UI;
-using Content.Shared.Administration.Logs;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Input;
-using Robust.Shared.Network;
-
-namespace Content.Client.Administration.UI.Logs.Entries;
-
-[GenerateTypedNameReferences]
-public sealed partial class AdminLogEntryDetails : BoxContainer
-{
-    private readonly AdminSystem _adminSystem;
-    private readonly IUserInterfaceManager _uiManager;
-    private readonly IEntityManager _entManager;
-
-    public AdminLogEntryDetails(SharedAdminLog log)
-    {
-        RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _uiManager = IoCManager.Resolve<IUserInterfaceManager>();
-        _adminSystem = _entManager.System<AdminSystem>();
-
-        Type.Text = log.Type.ToString();
-        Impact.Text = log.Impact.ToString();
-
-        LocalTime.Text = $"{log.Date.ToLocalTime():HH:mm:ss}";
-        UTCTime.Text = $"{log.Date:HH:mm:ss}";
-        // TimeSpan and DateTime use different formatting string conventions for some completely logical reason
-        // that mere mortals such as myself will never be able to understand.
-        CurTime.Text = new TimeSpan(log.CurTime).ToString(@"hh\:mm\:ss");
-
-        PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown;
-        PlayerListContainer.GenerateItem += GenerateButton;
-        PopulateList(log.Players);
-    }
-
-    private void PopulateList(Guid[] players)
-    {
-        if (players.Length == 0)
-            return;
-
-        if (_adminSystem.PlayerList is not { } allPlayers || allPlayers.Count == 0)
-            return;
-
-        var listData = new List<PlayerListData>();
-        foreach (var playerGuid in players)
-        {
-            var netUserId = new NetUserId(playerGuid);
-
-            // Linq here is fine since this runs in response to admin input in the UI and
-            // this loop only tends to go through 1-4 iterations.
-            if (allPlayers.FirstOrDefault(player => player.SessionId == netUserId) is not { } playerInfo)
-                continue;
-
-            listData.Add(new PlayerListData(playerInfo));
-        }
-
-        if (listData.Count == 0)
-            return;
-
-        PlayerListContainer.PopulateList(listData);
-    }
-
-    private void PlayerListItemKeyBindDown(GUIBoundKeyEventArgs? args, ListData? data)
-    {
-        if (args == null || data is not PlayerListData { Info: var selectedPlayer })
-            return;
-
-        if (!(args.Function == EngineKeyFunctions.UIRightClick
-            || args.Function == EngineKeyFunctions.UIClick)
-            || selectedPlayer.NetEntity == null)
-            return;
-
-        _uiManager.GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.NetEntity.Value, true);
-        args.Handle();
-    }
-
-    private void GenerateButton(ListData data, ListContainerButton button)
-    {
-        if (data is not PlayerListData { Info: var info })
-            return;
-
-        var entryLabel = new Label();
-        entryLabel.Text = $"{info.CharacterName} ({info.Username})";
-        var entry = new BoxContainer();
-        entry.AddChild(entryLabel);
-
-        button.AddChild(entry);
-        button.AddStyleClass(ListContainer.StyleClassListContainerButton);
-    }
-}
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 371b9952e4..d999df6d98 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -56,6 +56,7 @@ public sealed partial class PlayerTab : Control
         _config.OnValueChanged(CCVars.AdminPlayerTabMarkGhosted, MarkGhostedChanged, true); // DeltaV
         _config.OnValueChanged(CCVars.AdminPlayerTabMarkWatchlisted, MarkWatchlistedChanged, true); // DeltaV
 
+
         OverlayButton.OnPressed += OverlayButtonPressed;
         ShowDisconnectedButton.OnPressed += ShowDisconnectedPressed;
 
@@ -68,6 +69,7 @@ public sealed partial class PlayerTab : Control
         SearchList.ItemKeyBindDown += (args, data) => OnEntryKeyBindDown?.Invoke(args, data);
 
         RefreshPlayerList(_adminSystem.PlayerList);
+
     }
 
     // DeltaV - mark ghosted, watchlisted START
diff --git a/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml b/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml
index 53e6e29cee..dfa9a89b77 100644
--- a/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml
@@ -11,9 +11,6 @@
                 <ui:OptionDropDown Name="DropDownPlayerTabColorSetting" Title="{Loc 'ui-options-admin-player-tab-color-setting'}" />
                 <CheckBox Name="EnablePlayerTabMarkGhosted" Text="{Loc 'ui-options-admin-player-tab-mark-ghosted'}" ToolTip="{Loc 'ui-options-admin-player-tab-mark-ghosted-tooltip'}" /> <!-- DeltaV - Add MarkGhosted -->
                 <CheckBox Name="EnablePlayerTabMarkWatchlisted" Text="{Loc 'ui-options-admin-player-tab-mark-watchlisted'}" ToolTip="{Loc 'ui-options-admin-player-tab-mark-watchlisted-tooltip'}" /> <!-- DeltaV - Add MarkWatchlisted -->
-                <Label Text="{Loc 'ui-options-admin-logs-title'}"
-                       StyleClasses="LabelKeyText"/>
-                <ui:OptionColorSlider Name="ColorSliderLogsHighlight" Title="{Loc 'ui-options-admin-logs-highlight-color'}" />
                 <Label Text="{Loc 'ui-options-admin-overlay-title'}"
                        StyleClasses="LabelKeyText"/>
                 <ui:OptionDropDown Name="DropDownOverlayAntagFormat" Title="{Loc 'ui-options-admin-overlay-antag-format'}" />
diff --git a/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml.cs b/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml.cs
index 1b6ef25f87..f6e55c4ddf 100644
--- a/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml.cs
@@ -51,8 +51,6 @@ public sealed partial class AdminOptionsTab : Control
             playerTabSymbolSettings.Add(new OptionDropDownCVar<string>.ValueOption(setting.ToString()!, Loc.GetString($"ui-options-admin-player-tab-symbol-setting-{setting.ToString()!.ToLower()}")));
         }
 
-        Control.AddOptionColorSlider(CCVars.AdminLogsHighlightColor, ColorSliderLogsHighlight);
-
         Control.AddOptionDropDown(CCVars.AdminPlayerTabSymbolSetting, DropDownPlayerTabSymbolSetting, playerTabSymbolSettings);
         Control.AddOptionDropDown(CCVars.AdminPlayerTabRoleSetting, DropDownPlayerTabRoleSetting, playerTabRoleSettings);
         Control.AddOptionDropDown(CCVars.AdminPlayerTabColorSetting, DropDownPlayerTabColorSetting, playerTabColorSettings);
diff --git a/Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.Designer.cs b/Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.Designer.cs
deleted file mode 100644
index ea06967c89..0000000000
--- a/Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.Designer.cs
+++ /dev/null
@@ -1,2125 +0,0 @@
-// <auto-generated />
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text.Json;
-using Content.Server.Database;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using NpgsqlTypes;
-
-#nullable disable
-
-namespace Content.Server.Database.Migrations.Postgres
-{
-    [DbContext(typeof(PostgresServerDbContext))]
-    [Migration("20250723055137_AdminLogsCurtime")]
-    partial class AdminLogsCurtime
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.1")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Content.Server.Database.Admin", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.Property<int?>("AdminRankId")
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_rank_id");
-
-                    b.Property<bool>("Deadminned")
-                        .HasColumnType("boolean")
-                        .HasColumnName("deadminned");
-
-                    b.Property<bool>("Suspended")
-                        .HasColumnType("boolean")
-                        .HasColumnName("suspended");
-
-                    b.Property<string>("Title")
-                        .HasColumnType("text")
-                        .HasColumnName("title");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_admin");
-
-                    b.HasIndex("AdminRankId")
-                        .HasDatabaseName("IX_admin_admin_rank_id");
-
-                    b.ToTable("admin", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_flag_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<Guid>("AdminId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("admin_id");
-
-                    b.Property<string>("Flag")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("flag");
-
-                    b.Property<bool>("Negative")
-                        .HasColumnType("boolean")
-                        .HasColumnName("negative");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_flag");
-
-                    b.HasIndex("AdminId")
-                        .HasDatabaseName("IX_admin_flag_admin_id");
-
-                    b.HasIndex("Flag", "AdminId")
-                        .IsUnique();
-
-                    b.ToTable("admin_flag", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
-                {
-                    b.Property<int>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("Id")
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_log_id");
-
-                    b.Property<long>("CurTime")
-                        .HasColumnType("bigint")
-                        .HasColumnName("cur_time");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date");
-
-                    b.Property<short>("Impact")
-                        .HasColumnType("smallint")
-                        .HasColumnName("impact");
-
-                    b.Property<JsonDocument>("Json")
-                        .IsRequired()
-                        .HasColumnType("jsonb")
-                        .HasColumnName("json");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("message");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("integer")
-                        .HasColumnName("type");
-
-                    b.HasKey("RoundId", "Id")
-                        .HasName("PK_admin_log");
-
-                    b.HasIndex("Date");
-
-                    b.HasIndex("Message")
-                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
-
-                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
-
-                    b.HasIndex("Type")
-                        .HasDatabaseName("IX_admin_log_type");
-
-                    b.ToTable("admin_log", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
-                {
-                    b.Property<int>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("LogId")
-                        .HasColumnType("integer")
-                        .HasColumnName("log_id");
-
-                    b.Property<Guid>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.HasKey("RoundId", "LogId", "PlayerUserId")
-                        .HasName("PK_admin_log_player");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_log_player_player_user_id");
-
-                    b.ToTable("admin_log_player", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_messages_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("created_at");
-
-                    b.Property<Guid?>("CreatedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("created_by_id");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("boolean")
-                        .HasColumnName("deleted");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("deleted_at");
-
-                    b.Property<Guid?>("DeletedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("deleted_by_id");
-
-                    b.Property<bool>("Dismissed")
-                        .HasColumnType("boolean")
-                        .HasColumnName("dismissed");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<DateTime?>("LastEditedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("message");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("interval")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.Property<bool>("Seen")
-                        .HasColumnType("boolean")
-                        .HasColumnName("seen");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_messages");
-
-                    b.HasIndex("CreatedById");
-
-                    b.HasIndex("DeletedById");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_messages_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_admin_messages_round_id");
-
-                    b.ToTable("admin_messages", null, t =>
-                        {
-                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_notes_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("created_at");
-
-                    b.Property<Guid?>("CreatedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("created_by_id");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("boolean")
-                        .HasColumnName("deleted");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("deleted_at");
-
-                    b.Property<Guid?>("DeletedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("deleted_by_id");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<DateTime>("LastEditedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("message");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("interval")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.Property<bool>("Secret")
-                        .HasColumnType("boolean")
-                        .HasColumnName("secret");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("integer")
-                        .HasColumnName("severity");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_notes");
-
-                    b.HasIndex("CreatedById");
-
-                    b.HasIndex("DeletedById");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_notes_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_admin_notes_round_id");
-
-                    b.ToTable("admin_notes", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_rank_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_rank");
-
-                    b.ToTable("admin_rank", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_rank_flag_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("AdminRankId")
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_rank_id");
-
-                    b.Property<string>("Flag")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("flag");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_rank_flag");
-
-                    b.HasIndex("AdminRankId");
-
-                    b.HasIndex("Flag", "AdminRankId")
-                        .IsUnique();
-
-                    b.ToTable("admin_rank_flag", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("admin_watchlists_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("created_at");
-
-                    b.Property<Guid?>("CreatedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("created_by_id");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("boolean")
-                        .HasColumnName("deleted");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("deleted_at");
-
-                    b.Property<Guid?>("DeletedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("deleted_by_id");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<DateTime>("LastEditedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("character varying(4096)")
-                        .HasColumnName("message");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("interval")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_watchlists");
-
-                    b.HasIndex("CreatedById");
-
-                    b.HasIndex("DeletedById");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_admin_watchlists_round_id");
-
-                    b.ToTable("admin_watchlists", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Antag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("antag_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("AntagName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("antag_name");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_antag");
-
-                    b.HasIndex("ProfileId", "AntagName")
-                        .IsUnique();
-
-                    b.ToTable("antag", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("assigned_user_id_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("user_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_assigned_user_id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.HasIndex("UserName")
-                        .IsUnique();
-
-                    b.ToTable("assigned_user_id", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("ban_template_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("AutoDelete")
-                        .HasColumnType("boolean")
-                        .HasColumnName("auto_delete");
-
-                    b.Property<int>("ExemptFlags")
-                        .HasColumnType("integer")
-                        .HasColumnName("exempt_flags");
-
-                    b.Property<bool>("Hidden")
-                        .HasColumnType("boolean")
-                        .HasColumnName("hidden");
-
-                    b.Property<TimeSpan>("Length")
-                        .HasColumnType("interval")
-                        .HasColumnName("length");
-
-                    b.Property<string>("Reason")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("reason");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("integer")
-                        .HasColumnName("severity");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("title");
-
-                    b.HasKey("Id")
-                        .HasName("PK_ban_template");
-
-                    b.ToTable("ban_template", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_blacklist");
-
-                    b.ToTable("blacklist", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("connection_log_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<IPAddress>("Address")
-                        .IsRequired()
-                        .HasColumnType("inet")
-                        .HasColumnName("address");
-
-                    b.Property<byte?>("Denied")
-                        .HasColumnType("smallint")
-                        .HasColumnName("denied");
-
-                    b.Property<int>("ServerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasDefaultValue(0)
-                        .HasColumnName("server_id");
-
-                    b.Property<DateTime>("Time")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("time");
-
-                    b.Property<float>("Trust")
-                        .HasColumnType("real")
-                        .HasColumnName("trust");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("user_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_connection_log");
-
-                    b.HasIndex("ServerId")
-                        .HasDatabaseName("IX_connection_log_server_id");
-
-                    b.HasIndex("Time");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("connection_log", null, t =>
-                        {
-                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.IPIntelCache", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("ipintel_cache_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<IPAddress>("Address")
-                        .IsRequired()
-                        .HasColumnType("inet")
-                        .HasColumnName("address");
-
-                    b.Property<float>("Score")
-                        .HasColumnType("real")
-                        .HasColumnName("score");
-
-                    b.Property<DateTime>("Time")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("time");
-
-                    b.HasKey("Id")
-                        .HasName("PK_ipintel_cache");
-
-                    b.ToTable("ipintel_cache", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Job", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("job_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("JobName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("job_name");
-
-                    b.Property<int>("Priority")
-                        .HasColumnType("integer")
-                        .HasColumnName("priority");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_job");
-
-                    b.HasIndex("ProfileId");
-
-                    b.HasIndex("ProfileId", "JobName")
-                        .IsUnique();
-
-                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
-                        .IsUnique()
-                        .HasFilter("priority = 3");
-
-                    b.ToTable("job", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("play_time_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<Guid>("PlayerId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_id");
-
-                    b.Property<TimeSpan>("TimeSpent")
-                        .HasColumnType("interval")
-                        .HasColumnName("time_spent");
-
-                    b.Property<string>("Tracker")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("tracker");
-
-                    b.HasKey("Id")
-                        .HasName("PK_play_time");
-
-                    b.HasIndex("PlayerId", "Tracker")
-                        .IsUnique();
-
-                    b.ToTable("play_time", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Player", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("player_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime>("FirstSeenTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("first_seen_time");
-
-                    b.Property<DateTime?>("LastReadRules")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_read_rules");
-
-                    b.Property<IPAddress>("LastSeenAddress")
-                        .IsRequired()
-                        .HasColumnType("inet")
-                        .HasColumnName("last_seen_address");
-
-                    b.Property<DateTime>("LastSeenTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_seen_time");
-
-                    b.Property<string>("LastSeenUserName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("last_seen_user_name");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_player");
-
-                    b.HasAlternateKey("UserId")
-                        .HasName("ak_player_user_id");
-
-                    b.HasIndex("LastSeenUserName");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("player", null, t =>
-                        {
-                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Preference", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("preference_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("AdminOOCColor")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("admin_ooc_color");
-
-                    b.PrimitiveCollection<List<string>>("ConstructionFavorites")
-                        .IsRequired()
-                        .HasColumnType("text[]")
-                        .HasColumnName("construction_favorites");
-
-                    b.Property<int>("SelectedCharacterSlot")
-                        .HasColumnType("integer")
-                        .HasColumnName("selected_character_slot");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_preference");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("preference", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Age")
-                        .HasColumnType("integer")
-                        .HasColumnName("age");
-
-                    b.Property<string>("CharacterName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("char_name");
-
-                    b.Property<string>("EyeColor")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("eye_color");
-
-                    b.Property<string>("FacialHairColor")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("facial_hair_color");
-
-                    b.Property<string>("FacialHairName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("facial_hair_name");
-
-                    b.Property<string>("FlavorText")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("flavor_text");
-
-                    b.Property<string>("Gender")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("gender");
-
-                    b.Property<string>("HairColor")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("hair_color");
-
-                    b.Property<string>("HairName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("hair_name");
-
-                    b.Property<JsonDocument>("Markings")
-                        .HasColumnType("jsonb")
-                        .HasColumnName("markings");
-
-                    b.Property<int>("PreferenceId")
-                        .HasColumnType("integer")
-                        .HasColumnName("preference_id");
-
-                    b.Property<int>("PreferenceUnavailable")
-                        .HasColumnType("integer")
-                        .HasColumnName("pref_unavailable");
-
-                    b.Property<string>("Sex")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("sex");
-
-                    b.Property<string>("SkinColor")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("skin_color");
-
-                    b.Property<int>("Slot")
-                        .HasColumnType("integer")
-                        .HasColumnName("slot");
-
-                    b.Property<int>("SpawnPriority")
-                        .HasColumnType("integer")
-                        .HasColumnName("spawn_priority");
-
-                    b.Property<string>("Species")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("species");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile");
-
-                    b.HasIndex("PreferenceId")
-                        .HasDatabaseName("IX_profile_preference_id");
-
-                    b.HasIndex("Slot", "PreferenceId")
-                        .IsUnique();
-
-                    b.ToTable("profile", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_loadout_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("LoadoutName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("loadout_name");
-
-                    b.Property<int>("ProfileLoadoutGroupId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_loadout_group_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile_loadout");
-
-                    b.HasIndex("ProfileLoadoutGroupId");
-
-                    b.ToTable("profile_loadout", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_loadout_group_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("GroupName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("group_name");
-
-                    b.Property<int>("ProfileRoleLoadoutId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_role_loadout_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile_loadout_group");
-
-                    b.HasIndex("ProfileRoleLoadoutId");
-
-                    b.ToTable("profile_loadout_group", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_role_loadout_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("EntityName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasColumnName("entity_name");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_id");
-
-                    b.Property<string>("RoleName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("role_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile_role_loadout");
-
-                    b.HasIndex("ProfileId");
-
-                    b.ToTable("profile_role_loadout", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
-                {
-                    b.Property<Guid>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("text")
-                        .HasColumnName("role_id");
-
-                    b.HasKey("PlayerUserId", "RoleId")
-                        .HasName("PK_role_whitelists");
-
-                    b.ToTable("role_whitelists", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Round", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ServerId")
-                        .HasColumnType("integer")
-                        .HasColumnName("server_id");
-
-                    b.Property<DateTime?>("StartDate")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("start_date");
-
-                    b.HasKey("Id")
-                        .HasName("PK_round");
-
-                    b.HasIndex("ServerId")
-                        .HasDatabaseName("IX_round_server_id");
-
-                    b.HasIndex("StartDate");
-
-                    b.ToTable("round", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Server", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("server_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server");
-
-                    b.ToTable("server", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("server_ban_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<NpgsqlInet?>("Address")
-                        .HasColumnType("inet")
-                        .HasColumnName("address");
-
-                    b.Property<bool>("AutoDelete")
-                        .HasColumnType("boolean")
-                        .HasColumnName("auto_delete");
-
-                    b.Property<DateTime>("BanTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("ban_time");
-
-                    b.Property<Guid?>("BanningAdmin")
-                        .HasColumnType("uuid")
-                        .HasColumnName("banning_admin");
-
-                    b.Property<int>("ExemptFlags")
-                        .HasColumnType("integer")
-                        .HasColumnName("exempt_flags");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<bool>("Hidden")
-                        .HasColumnType("boolean")
-                        .HasColumnName("hidden");
-
-                    b.Property<DateTime?>("LastEditedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("interval")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<string>("Reason")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("reason");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("integer")
-                        .HasColumnName("severity");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_ban");
-
-                    b.HasIndex("Address");
-
-                    b.HasIndex("BanningAdmin");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_server_ban_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_server_ban_round_id");
-
-                    b.ToTable("server_ban", null, t =>
-                        {
-                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
-
-                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.Property<int>("Flags")
-                        .HasColumnType("integer")
-                        .HasColumnName("flags");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_server_ban_exemption");
-
-                    b.ToTable("server_ban_exemption", null, t =>
-                        {
-                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("server_ban_hit_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("BanId")
-                        .HasColumnType("integer")
-                        .HasColumnName("ban_id");
-
-                    b.Property<int>("ConnectionId")
-                        .HasColumnType("integer")
-                        .HasColumnName("connection_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_ban_hit");
-
-                    b.HasIndex("BanId")
-                        .HasDatabaseName("IX_server_ban_hit_ban_id");
-
-                    b.HasIndex("ConnectionId")
-                        .HasDatabaseName("IX_server_ban_hit_connection_id");
-
-                    b.ToTable("server_ban_hit", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("server_role_ban_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<NpgsqlInet?>("Address")
-                        .HasColumnType("inet")
-                        .HasColumnName("address");
-
-                    b.Property<DateTime>("BanTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("ban_time");
-
-                    b.Property<Guid?>("BanningAdmin")
-                        .HasColumnType("uuid")
-                        .HasColumnName("banning_admin");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<bool>("Hidden")
-                        .HasColumnType("boolean")
-                        .HasColumnName("hidden");
-
-                    b.Property<DateTime?>("LastEditedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("interval")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<string>("Reason")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("reason");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("role_id");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("integer")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("integer")
-                        .HasColumnName("severity");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_role_ban");
-
-                    b.HasIndex("Address");
-
-                    b.HasIndex("BanningAdmin");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_server_role_ban_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_server_role_ban_round_id");
-
-                    b.ToTable("server_role_ban", null, t =>
-                        {
-                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
-
-                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("role_unban_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("BanId")
-                        .HasColumnType("integer")
-                        .HasColumnName("ban_id");
-
-                    b.Property<DateTime>("UnbanTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("unban_time");
-
-                    b.Property<Guid?>("UnbanningAdmin")
-                        .HasColumnType("uuid")
-                        .HasColumnName("unbanning_admin");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_role_unban");
-
-                    b.HasIndex("BanId")
-                        .IsUnique();
-
-                    b.ToTable("server_role_unban", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("unban_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("BanId")
-                        .HasColumnType("integer")
-                        .HasColumnName("ban_id");
-
-                    b.Property<DateTime>("UnbanTime")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("unban_time");
-
-                    b.Property<Guid?>("UnbanningAdmin")
-                        .HasColumnType("uuid")
-                        .HasColumnName("unbanning_admin");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_unban");
-
-                    b.HasIndex("BanId")
-                        .IsUnique();
-
-                    b.ToTable("server_unban", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Trait", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("trait_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_id");
-
-                    b.Property<string>("TraitName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("trait_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_trait");
-
-                    b.HasIndex("ProfileId", "TraitName")
-                        .IsUnique();
-
-                    b.ToTable("trait", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("uploaded_resource_log_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<byte[]>("Data")
-                        .IsRequired()
-                        .HasColumnType("bytea")
-                        .HasColumnName("data");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("path");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_uploaded_resource_log");
-
-                    b.ToTable("uploaded_resource_log", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_whitelist");
-
-                    b.ToTable("whitelist", (string)null);
-                });
-
-            modelBuilder.Entity("PlayerRound", b =>
-                {
-                    b.Property<int>("PlayersId")
-                        .HasColumnType("integer")
-                        .HasColumnName("players_id");
-
-                    b.Property<int>("RoundsId")
-                        .HasColumnType("integer")
-                        .HasColumnName("rounds_id");
-
-                    b.HasKey("PlayersId", "RoundsId")
-                        .HasName("PK_player_round");
-
-                    b.HasIndex("RoundsId")
-                        .HasDatabaseName("IX_player_round_rounds_id");
-
-                    b.ToTable("player_round", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Admin", b =>
-                {
-                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
-                        .WithMany("Admins")
-                        .HasForeignKey("AdminRankId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
-
-                    b.Navigation("AdminRank");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
-                {
-                    b.HasOne("Content.Server.Database.Admin", "Admin")
-                        .WithMany("Flags")
-                        .HasForeignKey("AdminId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_flag_admin_admin_id");
-
-                    b.Navigation("Admin");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
-                {
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany("AdminLogs")
-                        .HasForeignKey("RoundId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_log_round_round_id");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminLogs")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.AdminLog", "Log")
-                        .WithMany("Players")
-                        .HasForeignKey("RoundId", "LogId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
-
-                    b.Navigation("Log");
-
-                    b.Navigation("Player");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminMessagesCreated")
-                        .HasForeignKey("CreatedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_messages_player_created_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
-                        .WithMany("AdminMessagesDeleted")
-                        .HasForeignKey("DeletedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminMessagesLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminMessagesReceived")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("FK_admin_messages_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_admin_messages_round_round_id");
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("DeletedBy");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Player");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminNotesCreated")
-                        .HasForeignKey("CreatedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_notes_player_created_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
-                        .WithMany("AdminNotesDeleted")
-                        .HasForeignKey("DeletedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminNotesLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminNotesReceived")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("FK_admin_notes_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_admin_notes_round_round_id");
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("DeletedBy");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Player");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
-                {
-                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
-                        .WithMany("Flags")
-                        .HasForeignKey("AdminRankId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
-
-                    b.Navigation("Rank");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminWatchlistsCreated")
-                        .HasForeignKey("CreatedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
-                        .WithMany("AdminWatchlistsDeleted")
-                        .HasForeignKey("DeletedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminWatchlistsLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminWatchlistsReceived")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_admin_watchlists_round_round_id");
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("DeletedBy");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Player");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Antag", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Antags")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_antag_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
-                {
-                    b.HasOne("Content.Server.Database.Server", "Server")
-                        .WithMany("ConnectionLogs")
-                        .HasForeignKey("ServerId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .IsRequired()
-                        .HasConstraintName("FK_connection_log_server_server_id");
-
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
-                        {
-                            b1.Property<int>("ConnectionLogId")
-                                .HasColumnType("integer")
-                                .HasColumnName("connection_log_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("bytea")
-                                .HasColumnName("hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("integer")
-                                .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
-
-                            b1.HasKey("ConnectionLogId");
-
-                            b1.ToTable("connection_log");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ConnectionLogId")
-                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
-                        });
-
-                    b.Navigation("HWId");
-
-                    b.Navigation("Server");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Job", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Jobs")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_job_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Player", b =>
-                {
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
-                        {
-                            b1.Property<int>("PlayerId")
-                                .HasColumnType("integer")
-                                .HasColumnName("player_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("bytea")
-                                .HasColumnName("last_seen_hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("integer")
-                                .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid_type");
-
-                            b1.HasKey("PlayerId");
-
-                            b1.ToTable("player");
-
-                            b1.WithOwner()
-                                .HasForeignKey("PlayerId")
-                                .HasConstraintName("FK_player_player_player_id");
-                        });
-
-                    b.Navigation("LastSeenHWId");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.HasOne("Content.Server.Database.Preference", "Preference")
-                        .WithMany("Profiles")
-                        .HasForeignKey("PreferenceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_preference_preference_id");
-
-                    b.Navigation("Preference");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
-                {
-                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
-                        .WithMany("Loadouts")
-                        .HasForeignKey("ProfileLoadoutGroupId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
-
-                    b.Navigation("ProfileLoadoutGroup");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
-                {
-                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
-                        .WithMany("Groups")
-                        .HasForeignKey("ProfileRoleLoadoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
-
-                    b.Navigation("ProfileRoleLoadout");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Loadouts")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("JobWhitelists")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
-
-                    b.Navigation("Player");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Round", b =>
-                {
-                    b.HasOne("Content.Server.Database.Server", "Server")
-                        .WithMany("Rounds")
-                        .HasForeignKey("ServerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_round_server_server_id");
-
-                    b.Navigation("Server");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminServerBansCreated")
-                        .HasForeignKey("BanningAdmin")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_ban_player_banning_admin");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminServerBansLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_server_ban_round_round_id");
-
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
-                        {
-                            b1.Property<int>("ServerBanId")
-                                .HasColumnType("integer")
-                                .HasColumnName("server_ban_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("bytea")
-                                .HasColumnName("hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("integer")
-                                .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
-
-                            b1.HasKey("ServerBanId");
-
-                            b1.ToTable("server_ban");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ServerBanId")
-                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
-                        });
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("HWId");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
-                {
-                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
-                        .WithMany("BanHits")
-                        .HasForeignKey("BanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
-
-                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
-                        .WithMany("BanHits")
-                        .HasForeignKey("ConnectionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
-
-                    b.Navigation("Ban");
-
-                    b.Navigation("Connection");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminServerRoleBansCreated")
-                        .HasForeignKey("BanningAdmin")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminServerRoleBansLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_server_role_ban_round_round_id");
-
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
-                        {
-                            b1.Property<int>("ServerRoleBanId")
-                                .HasColumnType("integer")
-                                .HasColumnName("server_role_ban_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("bytea")
-                                .HasColumnName("hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("integer")
-                                .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
-
-                            b1.HasKey("ServerRoleBanId");
-
-                            b1.ToTable("server_role_ban");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ServerRoleBanId")
-                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
-                        });
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("HWId");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
-                {
-                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
-                        .WithOne("Unban")
-                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
-
-                    b.Navigation("Ban");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
-                {
-                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
-                        .WithOne("Unban")
-                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
-
-                    b.Navigation("Ban");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Trait", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Traits")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_trait_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("PlayerRound", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", null)
-                        .WithMany()
-                        .HasForeignKey("PlayersId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_player_round_player_players_id");
-
-                    b.HasOne("Content.Server.Database.Round", null)
-                        .WithMany()
-                        .HasForeignKey("RoundsId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_player_round_round_rounds_id");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Admin", b =>
-                {
-                    b.Navigation("Flags");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
-                {
-                    b.Navigation("Players");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
-                {
-                    b.Navigation("Admins");
-
-                    b.Navigation("Flags");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
-                {
-                    b.Navigation("BanHits");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Player", b =>
-                {
-                    b.Navigation("AdminLogs");
-
-                    b.Navigation("AdminMessagesCreated");
-
-                    b.Navigation("AdminMessagesDeleted");
-
-                    b.Navigation("AdminMessagesLastEdited");
-
-                    b.Navigation("AdminMessagesReceived");
-
-                    b.Navigation("AdminNotesCreated");
-
-                    b.Navigation("AdminNotesDeleted");
-
-                    b.Navigation("AdminNotesLastEdited");
-
-                    b.Navigation("AdminNotesReceived");
-
-                    b.Navigation("AdminServerBansCreated");
-
-                    b.Navigation("AdminServerBansLastEdited");
-
-                    b.Navigation("AdminServerRoleBansCreated");
-
-                    b.Navigation("AdminServerRoleBansLastEdited");
-
-                    b.Navigation("AdminWatchlistsCreated");
-
-                    b.Navigation("AdminWatchlistsDeleted");
-
-                    b.Navigation("AdminWatchlistsLastEdited");
-
-                    b.Navigation("AdminWatchlistsReceived");
-
-                    b.Navigation("JobWhitelists");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Preference", b =>
-                {
-                    b.Navigation("Profiles");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.Navigation("Antags");
-
-                    b.Navigation("Jobs");
-
-                    b.Navigation("Loadouts");
-
-                    b.Navigation("Traits");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
-                {
-                    b.Navigation("Loadouts");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
-                {
-                    b.Navigation("Groups");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Round", b =>
-                {
-                    b.Navigation("AdminLogs");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Server", b =>
-                {
-                    b.Navigation("ConnectionLogs");
-
-                    b.Navigation("Rounds");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
-                {
-                    b.Navigation("BanHits");
-
-                    b.Navigation("Unban");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
-                {
-                    b.Navigation("Unban");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.cs b/Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.cs
deleted file mode 100644
index e87e219ec7..0000000000
--- a/Content.Server.Database/Migrations/Postgres/20250723055137_AdminLogsCurtime.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Content.Server.Database.Migrations.Postgres
-{
-    /// <inheritdoc />
-    public partial class AdminLogsCurtime : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<long>(
-                name: "cur_time",
-                table: "admin_log",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "cur_time",
-                table: "admin_log");
-        }
-    }
-}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 0ae27dda7d..780eb4787c 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -1,6 +1,5 @@
 // <auto-generated />
 using System;
-using System.Collections.Generic;
 using System.Net;
 using System.Text.Json;
 using Content.Server.Database;
@@ -102,10 +101,6 @@ namespace Content.Server.Database.Migrations.Postgres
                         .HasColumnType("integer")
                         .HasColumnName("admin_log_id");
 
-                    b.Property<long>("CurTime")
-                        .HasColumnType("bigint")
-                        .HasColumnName("cur_time");
-
                     b.Property<DateTime>("Date")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date");
@@ -906,7 +901,7 @@ namespace Content.Server.Database.Migrations.Postgres
                         .HasColumnType("text")
                         .HasColumnName("admin_ooc_color");
 
-                    b.PrimitiveCollection<List<string>>("ConstructionFavorites")
+                    b.PrimitiveCollection<string[]>("ConstructionFavorites")
                         .IsRequired()
                         .HasColumnType("text[]")
                         .HasColumnName("construction_favorites");
diff --git a/Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.Designer.cs
deleted file mode 100644
index 8973f40808..0000000000
--- a/Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.Designer.cs
+++ /dev/null
@@ -1,2048 +0,0 @@
-// <auto-generated />
-using System;
-using Content.Server.Database;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Content.Server.Database.Migrations.Sqlite
-{
-    [DbContext(typeof(SqliteServerDbContext))]
-    [Migration("20250723055127_AdminLogsCurtime")]
-    partial class AdminLogsCurtime
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.1");
-
-            modelBuilder.Entity("Content.Server.Database.Admin", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.Property<int?>("AdminRankId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_rank_id");
-
-                    b.Property<bool>("Deadminned")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("deadminned");
-
-                    b.Property<bool>("Suspended")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("suspended");
-
-                    b.Property<string>("Title")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("title");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_admin");
-
-                    b.HasIndex("AdminRankId")
-                        .HasDatabaseName("IX_admin_admin_rank_id");
-
-                    b.ToTable("admin", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_flag_id");
-
-                    b.Property<Guid>("AdminId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("admin_id");
-
-                    b.Property<string>("Flag")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("flag");
-
-                    b.Property<bool>("Negative")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("negative");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_flag");
-
-                    b.HasIndex("AdminId")
-                        .HasDatabaseName("IX_admin_flag_admin_id");
-
-                    b.HasIndex("Flag", "AdminId")
-                        .IsUnique();
-
-                    b.ToTable("admin_flag", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
-                {
-                    b.Property<int>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("Id")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_log_id");
-
-                    b.Property<long>("CurTime")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("cur_time");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("date");
-
-                    b.Property<sbyte>("Impact")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("impact");
-
-                    b.Property<string>("Json")
-                        .IsRequired()
-                        .HasColumnType("jsonb")
-                        .HasColumnName("json");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("message");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("type");
-
-                    b.HasKey("RoundId", "Id")
-                        .HasName("PK_admin_log");
-
-                    b.HasIndex("Date");
-
-                    b.HasIndex("Type")
-                        .HasDatabaseName("IX_admin_log_type");
-
-                    b.ToTable("admin_log", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
-                {
-                    b.Property<int>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("LogId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("log_id");
-
-                    b.Property<Guid>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.HasKey("RoundId", "LogId", "PlayerUserId")
-                        .HasName("PK_admin_log_player");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_log_player_player_user_id");
-
-                    b.ToTable("admin_log_player", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_messages_id");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("created_at");
-
-                    b.Property<Guid?>("CreatedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("created_by_id");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("deleted");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("deleted_at");
-
-                    b.Property<Guid?>("DeletedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("deleted_by_id");
-
-                    b.Property<bool>("Dismissed")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("dismissed");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<DateTime?>("LastEditedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("TEXT")
-                        .HasColumnName("message");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<bool>("Seen")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("seen");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_messages");
-
-                    b.HasIndex("CreatedById");
-
-                    b.HasIndex("DeletedById");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_messages_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_admin_messages_round_id");
-
-                    b.ToTable("admin_messages", null, t =>
-                        {
-                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_notes_id");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("created_at");
-
-                    b.Property<Guid?>("CreatedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("created_by_id");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("deleted");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("deleted_at");
-
-                    b.Property<Guid?>("DeletedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("deleted_by_id");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<DateTime>("LastEditedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("TEXT")
-                        .HasColumnName("message");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<bool>("Secret")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("secret");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("severity");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_notes");
-
-                    b.HasIndex("CreatedById");
-
-                    b.HasIndex("DeletedById");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_notes_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_admin_notes_round_id");
-
-                    b.ToTable("admin_notes", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_rank_id");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_rank");
-
-                    b.ToTable("admin_rank", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_rank_flag_id");
-
-                    b.Property<int>("AdminRankId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_rank_id");
-
-                    b.Property<string>("Flag")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("flag");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_rank_flag");
-
-                    b.HasIndex("AdminRankId");
-
-                    b.HasIndex("Flag", "AdminRankId")
-                        .IsUnique();
-
-                    b.ToTable("admin_rank_flag", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("admin_watchlists_id");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("created_at");
-
-                    b.Property<Guid?>("CreatedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("created_by_id");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("deleted");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("deleted_at");
-
-                    b.Property<Guid?>("DeletedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("deleted_by_id");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<DateTime>("LastEditedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<string>("Message")
-                        .IsRequired()
-                        .HasMaxLength(4096)
-                        .HasColumnType("TEXT")
-                        .HasColumnName("message");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_admin_watchlists");
-
-                    b.HasIndex("CreatedById");
-
-                    b.HasIndex("DeletedById");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_admin_watchlists_round_id");
-
-                    b.ToTable("admin_watchlists", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Antag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("antag_id");
-
-                    b.Property<string>("AntagName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("antag_name");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_antag");
-
-                    b.HasIndex("ProfileId", "AntagName")
-                        .IsUnique();
-
-                    b.ToTable("antag", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("assigned_user_id_id");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_assigned_user_id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.HasIndex("UserName")
-                        .IsUnique();
-
-                    b.ToTable("assigned_user_id", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("ban_template_id");
-
-                    b.Property<bool>("AutoDelete")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("auto_delete");
-
-                    b.Property<int>("ExemptFlags")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("exempt_flags");
-
-                    b.Property<bool>("Hidden")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("hidden");
-
-                    b.Property<TimeSpan>("Length")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("length");
-
-                    b.Property<string>("Reason")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("reason");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("severity");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("title");
-
-                    b.HasKey("Id")
-                        .HasName("PK_ban_template");
-
-                    b.ToTable("ban_template", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_blacklist");
-
-                    b.ToTable("blacklist", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("connection_log_id");
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("address");
-
-                    b.Property<byte?>("Denied")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("denied");
-
-                    b.Property<int>("ServerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasDefaultValue(0)
-                        .HasColumnName("server_id");
-
-                    b.Property<DateTime>("Time")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("time");
-
-                    b.Property<float>("Trust")
-                        .HasColumnType("REAL")
-                        .HasColumnName("trust");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_connection_log");
-
-                    b.HasIndex("ServerId")
-                        .HasDatabaseName("IX_connection_log_server_id");
-
-                    b.HasIndex("Time");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("connection_log", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.IPIntelCache", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("ipintel_cache_id");
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("address");
-
-                    b.Property<float>("Score")
-                        .HasColumnType("REAL")
-                        .HasColumnName("score");
-
-                    b.Property<DateTime>("Time")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("time");
-
-                    b.HasKey("Id")
-                        .HasName("PK_ipintel_cache");
-
-                    b.HasIndex("Address")
-                        .IsUnique();
-
-                    b.ToTable("ipintel_cache", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Job", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("job_id");
-
-                    b.Property<string>("JobName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("job_name");
-
-                    b.Property<int>("Priority")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("priority");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_job");
-
-                    b.HasIndex("ProfileId");
-
-                    b.HasIndex("ProfileId", "JobName")
-                        .IsUnique();
-
-                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
-                        .IsUnique()
-                        .HasFilter("priority = 3");
-
-                    b.ToTable("job", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("play_time_id");
-
-                    b.Property<Guid>("PlayerId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_id");
-
-                    b.Property<TimeSpan>("TimeSpent")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("time_spent");
-
-                    b.Property<string>("Tracker")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("tracker");
-
-                    b.HasKey("Id")
-                        .HasName("PK_play_time");
-
-                    b.HasIndex("PlayerId", "Tracker")
-                        .IsUnique();
-
-                    b.ToTable("play_time", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Player", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("player_id");
-
-                    b.Property<DateTime>("FirstSeenTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("first_seen_time");
-
-                    b.Property<DateTime?>("LastReadRules")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_read_rules");
-
-                    b.Property<string>("LastSeenAddress")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_seen_address");
-
-                    b.Property<DateTime>("LastSeenTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_seen_time");
-
-                    b.Property<string>("LastSeenUserName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_seen_user_name");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_player");
-
-                    b.HasAlternateKey("UserId")
-                        .HasName("ak_player_user_id");
-
-                    b.HasIndex("LastSeenUserName");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("player", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Preference", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("preference_id");
-
-                    b.Property<string>("AdminOOCColor")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("admin_ooc_color");
-
-                    b.PrimitiveCollection<string>("ConstructionFavorites")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("construction_favorites");
-
-                    b.Property<int>("SelectedCharacterSlot")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("selected_character_slot");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_preference");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("preference", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_id");
-
-                    b.Property<int>("Age")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("age");
-
-                    b.Property<string>("CharacterName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("char_name");
-
-                    b.Property<string>("EyeColor")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("eye_color");
-
-                    b.Property<string>("FacialHairColor")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("facial_hair_color");
-
-                    b.Property<string>("FacialHairName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("facial_hair_name");
-
-                    b.Property<string>("FlavorText")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("flavor_text");
-
-                    b.Property<string>("Gender")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("gender");
-
-                    b.Property<string>("HairColor")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("hair_color");
-
-                    b.Property<string>("HairName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("hair_name");
-
-                    b.Property<byte[]>("Markings")
-                        .HasColumnType("jsonb")
-                        .HasColumnName("markings");
-
-                    b.Property<int>("PreferenceId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("preference_id");
-
-                    b.Property<int>("PreferenceUnavailable")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("pref_unavailable");
-
-                    b.Property<string>("Sex")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("sex");
-
-                    b.Property<string>("SkinColor")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("skin_color");
-
-                    b.Property<int>("Slot")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("slot");
-
-                    b.Property<int>("SpawnPriority")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("spawn_priority");
-
-                    b.Property<string>("Species")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("species");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile");
-
-                    b.HasIndex("PreferenceId")
-                        .HasDatabaseName("IX_profile_preference_id");
-
-                    b.HasIndex("Slot", "PreferenceId")
-                        .IsUnique();
-
-                    b.ToTable("profile", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_loadout_id");
-
-                    b.Property<string>("LoadoutName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("loadout_name");
-
-                    b.Property<int>("ProfileLoadoutGroupId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_loadout_group_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile_loadout");
-
-                    b.HasIndex("ProfileLoadoutGroupId");
-
-                    b.ToTable("profile_loadout", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_loadout_group_id");
-
-                    b.Property<string>("GroupName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("group_name");
-
-                    b.Property<int>("ProfileRoleLoadoutId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_role_loadout_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile_loadout_group");
-
-                    b.HasIndex("ProfileRoleLoadoutId");
-
-                    b.ToTable("profile_loadout_group", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_role_loadout_id");
-
-                    b.Property<string>("EntityName")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT")
-                        .HasColumnName("entity_name");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_id");
-
-                    b.Property<string>("RoleName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("role_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_profile_role_loadout");
-
-                    b.HasIndex("ProfileId");
-
-                    b.ToTable("profile_role_loadout", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
-                {
-                    b.Property<Guid>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("role_id");
-
-                    b.HasKey("PlayerUserId", "RoleId")
-                        .HasName("PK_role_whitelists");
-
-                    b.ToTable("role_whitelists", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Round", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("ServerId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("server_id");
-
-                    b.Property<DateTime?>("StartDate")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("start_date");
-
-                    b.HasKey("Id")
-                        .HasName("PK_round");
-
-                    b.HasIndex("ServerId")
-                        .HasDatabaseName("IX_round_server_id");
-
-                    b.HasIndex("StartDate");
-
-                    b.ToTable("round", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Server", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("server_id");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server");
-
-                    b.ToTable("server", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("server_ban_id");
-
-                    b.Property<string>("Address")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("address");
-
-                    b.Property<bool>("AutoDelete")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("auto_delete");
-
-                    b.Property<DateTime>("BanTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("ban_time");
-
-                    b.Property<Guid?>("BanningAdmin")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("banning_admin");
-
-                    b.Property<int>("ExemptFlags")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("exempt_flags");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<bool>("Hidden")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("hidden");
-
-                    b.Property<DateTime?>("LastEditedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<string>("Reason")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("reason");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("severity");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_ban");
-
-                    b.HasIndex("Address");
-
-                    b.HasIndex("BanningAdmin");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_server_ban_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_server_ban_round_id");
-
-                    b.ToTable("server_ban", null, t =>
-                        {
-                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.Property<int>("Flags")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("flags");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_server_ban_exemption");
-
-                    b.ToTable("server_ban_exemption", null, t =>
-                        {
-                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("server_ban_hit_id");
-
-                    b.Property<int>("BanId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("ban_id");
-
-                    b.Property<int>("ConnectionId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("connection_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_ban_hit");
-
-                    b.HasIndex("BanId")
-                        .HasDatabaseName("IX_server_ban_hit_ban_id");
-
-                    b.HasIndex("ConnectionId")
-                        .HasDatabaseName("IX_server_ban_hit_connection_id");
-
-                    b.ToTable("server_ban_hit", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("server_role_ban_id");
-
-                    b.Property<string>("Address")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("address");
-
-                    b.Property<DateTime>("BanTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("ban_time");
-
-                    b.Property<Guid?>("BanningAdmin")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("banning_admin");
-
-                    b.Property<DateTime?>("ExpirationTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("expiration_time");
-
-                    b.Property<bool>("Hidden")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("hidden");
-
-                    b.Property<DateTime?>("LastEditedAt")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_at");
-
-                    b.Property<Guid?>("LastEditedById")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("last_edited_by_id");
-
-                    b.Property<Guid?>("PlayerUserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("player_user_id");
-
-                    b.Property<TimeSpan>("PlaytimeAtNote")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("playtime_at_note");
-
-                    b.Property<string>("Reason")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("reason");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("role_id");
-
-                    b.Property<int?>("RoundId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("round_id");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("severity");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_role_ban");
-
-                    b.HasIndex("Address");
-
-                    b.HasIndex("BanningAdmin");
-
-                    b.HasIndex("LastEditedById");
-
-                    b.HasIndex("PlayerUserId")
-                        .HasDatabaseName("IX_server_role_ban_player_user_id");
-
-                    b.HasIndex("RoundId")
-                        .HasDatabaseName("IX_server_role_ban_round_id");
-
-                    b.ToTable("server_role_ban", null, t =>
-                        {
-                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("role_unban_id");
-
-                    b.Property<int>("BanId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("ban_id");
-
-                    b.Property<DateTime>("UnbanTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("unban_time");
-
-                    b.Property<Guid?>("UnbanningAdmin")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("unbanning_admin");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_role_unban");
-
-                    b.HasIndex("BanId")
-                        .IsUnique();
-
-                    b.ToTable("server_role_unban", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("unban_id");
-
-                    b.Property<int>("BanId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("ban_id");
-
-                    b.Property<DateTime>("UnbanTime")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("unban_time");
-
-                    b.Property<Guid?>("UnbanningAdmin")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("unbanning_admin");
-
-                    b.HasKey("Id")
-                        .HasName("PK_server_unban");
-
-                    b.HasIndex("BanId")
-                        .IsUnique();
-
-                    b.ToTable("server_unban", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Trait", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("trait_id");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_id");
-
-                    b.Property<string>("TraitName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("trait_name");
-
-                    b.HasKey("Id")
-                        .HasName("PK_trait");
-
-                    b.HasIndex("ProfileId", "TraitName")
-                        .IsUnique();
-
-                    b.ToTable("trait", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("uploaded_resource_log_id");
-
-                    b.Property<byte[]>("Data")
-                        .IsRequired()
-                        .HasColumnType("BLOB")
-                        .HasColumnName("data");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("date");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("path");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_uploaded_resource_log");
-
-                    b.ToTable("uploaded_resource_log", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_whitelist");
-
-                    b.ToTable("whitelist", (string)null);
-                });
-
-            modelBuilder.Entity("PlayerRound", b =>
-                {
-                    b.Property<int>("PlayersId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("players_id");
-
-                    b.Property<int>("RoundsId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("rounds_id");
-
-                    b.HasKey("PlayersId", "RoundsId")
-                        .HasName("PK_player_round");
-
-                    b.HasIndex("RoundsId")
-                        .HasDatabaseName("IX_player_round_rounds_id");
-
-                    b.ToTable("player_round", (string)null);
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Admin", b =>
-                {
-                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
-                        .WithMany("Admins")
-                        .HasForeignKey("AdminRankId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
-
-                    b.Navigation("AdminRank");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
-                {
-                    b.HasOne("Content.Server.Database.Admin", "Admin")
-                        .WithMany("Flags")
-                        .HasForeignKey("AdminId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_flag_admin_admin_id");
-
-                    b.Navigation("Admin");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
-                {
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany("AdminLogs")
-                        .HasForeignKey("RoundId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_log_round_round_id");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminLogs")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.AdminLog", "Log")
-                        .WithMany("Players")
-                        .HasForeignKey("RoundId", "LogId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
-
-                    b.Navigation("Log");
-
-                    b.Navigation("Player");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminMessagesCreated")
-                        .HasForeignKey("CreatedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_messages_player_created_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
-                        .WithMany("AdminMessagesDeleted")
-                        .HasForeignKey("DeletedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminMessagesLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminMessagesReceived")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("FK_admin_messages_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_admin_messages_round_round_id");
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("DeletedBy");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Player");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminNotesCreated")
-                        .HasForeignKey("CreatedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_notes_player_created_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
-                        .WithMany("AdminNotesDeleted")
-                        .HasForeignKey("DeletedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminNotesLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminNotesReceived")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("FK_admin_notes_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_admin_notes_round_round_id");
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("DeletedBy");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Player");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
-                {
-                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
-                        .WithMany("Flags")
-                        .HasForeignKey("AdminRankId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
-
-                    b.Navigation("Rank");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminWatchlistsCreated")
-                        .HasForeignKey("CreatedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
-                        .WithMany("AdminWatchlistsDeleted")
-                        .HasForeignKey("DeletedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminWatchlistsLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("AdminWatchlistsReceived")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_admin_watchlists_round_round_id");
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("DeletedBy");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Player");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Antag", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Antags")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_antag_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
-                {
-                    b.HasOne("Content.Server.Database.Server", "Server")
-                        .WithMany("ConnectionLogs")
-                        .HasForeignKey("ServerId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .IsRequired()
-                        .HasConstraintName("FK_connection_log_server_server_id");
-
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
-                        {
-                            b1.Property<int>("ConnectionLogId")
-                                .HasColumnType("INTEGER")
-                                .HasColumnName("connection_log_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("BLOB")
-                                .HasColumnName("hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("INTEGER")
-                                .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
-
-                            b1.HasKey("ConnectionLogId");
-
-                            b1.ToTable("connection_log");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ConnectionLogId")
-                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
-                        });
-
-                    b.Navigation("HWId");
-
-                    b.Navigation("Server");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Job", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Jobs")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_job_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Player", b =>
-                {
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
-                        {
-                            b1.Property<int>("PlayerId")
-                                .HasColumnType("INTEGER")
-                                .HasColumnName("player_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("BLOB")
-                                .HasColumnName("last_seen_hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("INTEGER")
-                                .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid_type");
-
-                            b1.HasKey("PlayerId");
-
-                            b1.ToTable("player");
-
-                            b1.WithOwner()
-                                .HasForeignKey("PlayerId")
-                                .HasConstraintName("FK_player_player_player_id");
-                        });
-
-                    b.Navigation("LastSeenHWId");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.HasOne("Content.Server.Database.Preference", "Preference")
-                        .WithMany("Profiles")
-                        .HasForeignKey("PreferenceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_preference_preference_id");
-
-                    b.Navigation("Preference");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
-                {
-                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
-                        .WithMany("Loadouts")
-                        .HasForeignKey("ProfileLoadoutGroupId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
-
-                    b.Navigation("ProfileLoadoutGroup");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
-                {
-                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
-                        .WithMany("Groups")
-                        .HasForeignKey("ProfileRoleLoadoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
-
-                    b.Navigation("ProfileRoleLoadout");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Loadouts")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "Player")
-                        .WithMany("JobWhitelists")
-                        .HasForeignKey("PlayerUserId")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
-
-                    b.Navigation("Player");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Round", b =>
-                {
-                    b.HasOne("Content.Server.Database.Server", "Server")
-                        .WithMany("Rounds")
-                        .HasForeignKey("ServerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_round_server_server_id");
-
-                    b.Navigation("Server");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminServerBansCreated")
-                        .HasForeignKey("BanningAdmin")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_ban_player_banning_admin");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminServerBansLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_server_ban_round_round_id");
-
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
-                        {
-                            b1.Property<int>("ServerBanId")
-                                .HasColumnType("INTEGER")
-                                .HasColumnName("server_ban_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("BLOB")
-                                .HasColumnName("hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("INTEGER")
-                                .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
-
-                            b1.HasKey("ServerBanId");
-
-                            b1.ToTable("server_ban");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ServerBanId")
-                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
-                        });
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("HWId");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
-                {
-                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
-                        .WithMany("BanHits")
-                        .HasForeignKey("BanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
-
-                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
-                        .WithMany("BanHits")
-                        .HasForeignKey("ConnectionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
-
-                    b.Navigation("Ban");
-
-                    b.Navigation("Connection");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
-                        .WithMany("AdminServerRoleBansCreated")
-                        .HasForeignKey("BanningAdmin")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
-
-                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
-                        .WithMany("AdminServerRoleBansLastEdited")
-                        .HasForeignKey("LastEditedById")
-                        .HasPrincipalKey("UserId")
-                        .OnDelete(DeleteBehavior.SetNull)
-                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
-
-                    b.HasOne("Content.Server.Database.Round", "Round")
-                        .WithMany()
-                        .HasForeignKey("RoundId")
-                        .HasConstraintName("FK_server_role_ban_round_round_id");
-
-                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
-                        {
-                            b1.Property<int>("ServerRoleBanId")
-                                .HasColumnType("INTEGER")
-                                .HasColumnName("server_role_ban_id");
-
-                            b1.Property<byte[]>("Hwid")
-                                .IsRequired()
-                                .HasColumnType("BLOB")
-                                .HasColumnName("hwid");
-
-                            b1.Property<int>("Type")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("INTEGER")
-                                .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
-
-                            b1.HasKey("ServerRoleBanId");
-
-                            b1.ToTable("server_role_ban");
-
-                            b1.WithOwner()
-                                .HasForeignKey("ServerRoleBanId")
-                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
-                        });
-
-                    b.Navigation("CreatedBy");
-
-                    b.Navigation("HWId");
-
-                    b.Navigation("LastEditedBy");
-
-                    b.Navigation("Round");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
-                {
-                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
-                        .WithOne("Unban")
-                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
-
-                    b.Navigation("Ban");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
-                {
-                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
-                        .WithOne("Unban")
-                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
-
-                    b.Navigation("Ban");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Trait", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Traits")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_trait_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("PlayerRound", b =>
-                {
-                    b.HasOne("Content.Server.Database.Player", null)
-                        .WithMany()
-                        .HasForeignKey("PlayersId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_player_round_player_players_id");
-
-                    b.HasOne("Content.Server.Database.Round", null)
-                        .WithMany()
-                        .HasForeignKey("RoundsId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_player_round_round_rounds_id");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Admin", b =>
-                {
-                    b.Navigation("Flags");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
-                {
-                    b.Navigation("Players");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
-                {
-                    b.Navigation("Admins");
-
-                    b.Navigation("Flags");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
-                {
-                    b.Navigation("BanHits");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Player", b =>
-                {
-                    b.Navigation("AdminLogs");
-
-                    b.Navigation("AdminMessagesCreated");
-
-                    b.Navigation("AdminMessagesDeleted");
-
-                    b.Navigation("AdminMessagesLastEdited");
-
-                    b.Navigation("AdminMessagesReceived");
-
-                    b.Navigation("AdminNotesCreated");
-
-                    b.Navigation("AdminNotesDeleted");
-
-                    b.Navigation("AdminNotesLastEdited");
-
-                    b.Navigation("AdminNotesReceived");
-
-                    b.Navigation("AdminServerBansCreated");
-
-                    b.Navigation("AdminServerBansLastEdited");
-
-                    b.Navigation("AdminServerRoleBansCreated");
-
-                    b.Navigation("AdminServerRoleBansLastEdited");
-
-                    b.Navigation("AdminWatchlistsCreated");
-
-                    b.Navigation("AdminWatchlistsDeleted");
-
-                    b.Navigation("AdminWatchlistsLastEdited");
-
-                    b.Navigation("AdminWatchlistsReceived");
-
-                    b.Navigation("JobWhitelists");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Preference", b =>
-                {
-                    b.Navigation("Profiles");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.Navigation("Antags");
-
-                    b.Navigation("Jobs");
-
-                    b.Navigation("Loadouts");
-
-                    b.Navigation("Traits");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
-                {
-                    b.Navigation("Loadouts");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
-                {
-                    b.Navigation("Groups");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Round", b =>
-                {
-                    b.Navigation("AdminLogs");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Server", b =>
-                {
-                    b.Navigation("ConnectionLogs");
-
-                    b.Navigation("Rounds");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
-                {
-                    b.Navigation("BanHits");
-
-                    b.Navigation("Unban");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
-                {
-                    b.Navigation("Unban");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.cs b/Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.cs
deleted file mode 100644
index fa7d37aa15..0000000000
--- a/Content.Server.Database/Migrations/Sqlite/20250723055127_AdminLogsCurtime.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Content.Server.Database.Migrations.Sqlite
-{
-    /// <inheritdoc />
-    public partial class AdminLogsCurtime : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<long>(
-                name: "cur_time",
-                table: "admin_log",
-                type: "INTEGER",
-                nullable: false,
-                defaultValue: 0L);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "cur_time",
-                table: "admin_log");
-        }
-    }
-}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 7738047960..a442b7029b 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -91,10 +91,6 @@ namespace Content.Server.Database.Migrations.Sqlite
                         .HasColumnType("INTEGER")
                         .HasColumnName("admin_log_id");
 
-                    b.Property<long>("CurTime")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("cur_time");
-
                     b.Property<DateTime>("Date")
                         .HasColumnType("TEXT")
                         .HasColumnName("date");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 94c1da12b3..f373f69cdb 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -731,11 +731,6 @@ namespace Content.Server.Database
 
         [Required] public DateTime Date { get; set; }
 
-        /// <summary>
-        /// The current time in the round in ticks since the start of the round.
-        /// </summary>
-        public long CurTime { get; set; }
-
         [Required] public string Message { get; set; } = default!;
 
         [Required, Column(TypeName = "jsonb")] public JsonDocument Json { get; set; } = default!;
diff --git a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
index ebc71236d6..250d0f7aa3 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
@@ -51,7 +51,7 @@ public sealed partial class AdminLogManager
     private void CacheLog(AdminLog log)
     {
         var players = log.Players.Select(player => player.PlayerUserId).ToArray();
-        var record = new SharedAdminLog(log.Id, log.Type, log.Impact, log.Date, log.CurTime, log.Message, players);
+        var record = new SharedAdminLog(log.Id, log.Type, log.Impact, log.Date, log.Message, players);
 
         CacheLog(record);
     }
diff --git a/Content.Server/Administration/Logs/AdminLogManager.cs b/Content.Server/Administration/Logs/AdminLogManager.cs
index 05550d1e47..2fe523789d 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.cs
@@ -88,7 +88,6 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
     // Per round
     private int _currentRoundId;
     private int _currentLogId;
-    private TimeSpan _currentRoundStartTime;
     private int NextLogId => Interlocked.Increment(ref _currentLogId);
     private GameRunLevel _runLevel = GameRunLevel.PreRoundLobby;
 
@@ -268,7 +267,6 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
 
     public void RoundStarting(int id)
     {
-        _currentRoundStartTime = _timing.CurTime;
         _currentRoundId = id;
         CacheNewRound();
     }
@@ -338,7 +336,6 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
             Type = type,
             Impact = impact,
             Date = DateTime.UtcNow,
-            CurTime = (_timing.CurTime - _currentRoundStartTime).Ticks,
             Message = message,
             Json = json,
             Players = players,
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 0100b50b9b..f5e0259915 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1104,7 +1104,7 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
                     players[i] = log.Players[i].PlayerUserId;
                 }
 
-                yield return new SharedAdminLog(log.Id, log.Type, log.Impact, log.Date, log.CurTime, log.Message, players);
+                yield return new SharedAdminLog(log.Id, log.Type, log.Impact, log.Date, log.Message, players);
             }
         }
 
diff --git a/Content.Shared/Administration/Logs/SharedAdminLog.cs b/Content.Shared/Administration/Logs/SharedAdminLog.cs
index 0353100191..de4d1c8e2d 100644
--- a/Content.Shared/Administration/Logs/SharedAdminLog.cs
+++ b/Content.Shared/Administration/Logs/SharedAdminLog.cs
@@ -9,6 +9,5 @@ public readonly record struct SharedAdminLog(
     LogType Type,
     LogImpact Impact,
     DateTime Date,
-    long CurTime,
     string Message,
     Guid[] Players);
diff --git a/Content.Shared/CCVar/CCVars.Interface.cs b/Content.Shared/CCVar/CCVars.Interface.cs
index 58046cbf9e..fb65157015 100644
--- a/Content.Shared/CCVar/CCVars.Interface.cs
+++ b/Content.Shared/CCVar/CCVars.Interface.cs
@@ -37,12 +37,6 @@ public sealed partial class CCVars
     public static readonly CVarDef<bool> OutlineEnabled =
         CVarDef.Create("outline.enabled", true, CVar.CLIENTONLY);
 
-    /// <summary>
-    /// Determines the color to use when highlighting search results in the admin log browser.
-    /// </summary>
-    public static readonly CVarDef<string> AdminLogsHighlightColor =
-        CVarDef.Create("ui.admin_logs_highlight_color", Color.Red.ToHex(), CVar.CLIENTONLY | CVar.ARCHIVE);
-
     /// <summary>
     /// Determines how antagonist status/roletype is displayed. Based on AdminOverlayAntagFormats enum
     /// Binary: Roletypes of interest get an "ANTAG" label
diff --git a/Resources/Locale/en-US/administration/ui/admin-logs.ftl b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
index 0d9894d5ee..25e0943310 100644
--- a/Resources/Locale/en-US/administration/ui/admin-logs.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
@@ -21,18 +21,3 @@ admin-logs-include-non-player = Include Non-players
 admin-logs-search-logs-placeholder = Search Logs
 admin-logs-refresh = Refresh
 admin-logs-next = Next
-admin-logs-render-rich-text = Render Rich Text
-admin-logs-remove-markup = Remove Markup
-
-# Log Data Fields
-admin-logs-field-type = Type
-admin-logs-field-impact = Impact
-admin-logs-field-time-header = Time
-admin-logs-field-time-local = Local
-admin-logs-field-time-utc = UTC
-admin-logs-field-time-round = Round
-admin-logs-field-players-header = Players
-
-# Log Player Fields
-admin-logs-player-field-no-players = No Players
-admin-logs-player-field-not-in-round = Not in round.
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 3aa9904157..a263e52229 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -393,9 +393,6 @@ ui-options-admin-player-tab-color-setting-character = Colorize antag character n
 ui-options-admin-player-tab-color-setting-roletype = Colorize all role types
 ui-options-admin-player-tab-color-setting-both = Colorize both
 
-ui-options-admin-logs-title = Admin Logs
-ui-options-admin-logs-highlight-color = Highlight Color
-
 ui-options-admin-overlay-title = Admin Overlay
 
 ui-options-admin-overlay-antag-format = Antag label style
@@ -413,4 +410,3 @@ ui-options-admin-enable-overlay-starting-job = Show starting job
 ui-options-admin-overlay-merge-distance = Stack merge distance
 ui-options-admin-overlay-ghost-fade-distance = Ghost overlay fade range from mouse
 ui-options-admin-overlay-ghost-hide-distance = Ghost overlay hide range from mouse
-

From 55bfb0fb872f34399dce14818476b30a4958ac1d Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sat, 6 Dec 2025 01:53:07 +1000
Subject: [PATCH 036/360] Cleanup warnings: CS0114, CS0414, CS0618 (#41578)

* Cleanup

* Revert
---
 .../Administration/UI/CustomControls/AdminLogLabel.cs           | 2 +-
 Content.Client/UserInterface/RichText/MonoTag.cs                | 2 +-
 Content.Client/UserInterface/RichText/ScrambleTag.cs            | 2 +-
 Content.Shared/Throwing/ThrowingSystem.cs                       | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs b/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
index 0de38ce234..eb2281cf7b 100644
--- a/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
+++ b/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
@@ -15,7 +15,7 @@ public sealed class AdminLogLabel : RichTextLabel
         OnVisibilityChanged += VisibilityChanged;
     }
 
-    public SharedAdminLog Log { get; }
+    public new SharedAdminLog Log { get; }
 
     public HSeparator Separator { get; }
 
diff --git a/Content.Client/UserInterface/RichText/MonoTag.cs b/Content.Client/UserInterface/RichText/MonoTag.cs
index d97997dc83..5f66217a36 100644
--- a/Content.Client/UserInterface/RichText/MonoTag.cs
+++ b/Content.Client/UserInterface/RichText/MonoTag.cs
@@ -10,7 +10,7 @@ namespace Content.Client.UserInterface.RichText;
 /// <summary>
 /// Sets the font to a monospaced variant
 /// </summary>
-public sealed class MonoTag : IMarkupTag
+public sealed class MonoTag : IMarkupTagHandler
 {
     public static readonly ProtoId<FontPrototype> MonoFont = "Monospace";
 
diff --git a/Content.Client/UserInterface/RichText/ScrambleTag.cs b/Content.Client/UserInterface/RichText/ScrambleTag.cs
index a93af993ca..353a9c9533 100644
--- a/Content.Client/UserInterface/RichText/ScrambleTag.cs
+++ b/Content.Client/UserInterface/RichText/ScrambleTag.cs
@@ -10,7 +10,7 @@ namespace Content.Client.UserInterface.RichText;
 /// Adds a specified length of random characters that scramble at a set rate.
 /// </summary>
 [UsedImplicitly]
-public sealed class ScrambleTag : IMarkupTag
+public sealed class ScrambleTag : IMarkupTagHandler
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 61ea2de26c..c3ea10822e 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -37,7 +37,6 @@ public sealed class ThrowingSystem : EntitySystem
     [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IConfigurationManager _configManager = default!;
-    [Dependency] private readonly AnchorableSystem _anchorable = default!;
 
     private EntityQuery<AnchorableComponent> _anchorableQuery;
 

From f0c592403ad144419d1dbc01cf7a64f6062e20c8 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Fri, 5 Dec 2025 18:01:20 +0100
Subject: [PATCH 037/360] Replace Vestine-derivatives in plant mutations,
 change uplink prices & hypopen to reflect changes (#41716)

* Initial commit

* It's a toxin!

* Review changes

* Review changes
---
 .../Prototypes/Catalog/Fills/Boxes/syndicate.yml |  2 +-
 Resources/Prototypes/Catalog/uplink_catalog.yml  |  8 ++++----
 .../Objects/Specific/Medical/hypospray.yml       |  2 +-
 .../Prototypes/Hydroponics/randomChemicals.yml   | 16 ++++++++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 7d1414c0a4..c2578294de 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -30,10 +30,10 @@
         - id: Dropper
         # It would be cool to have special "syndicate" chemical analysis goggles
         - id: ClothingEyesGlassesChemical
+        - id: SyringeStimulants
         - id: VestineChemistryVial
           amount: 2
         - id: BaseChemistryEmptyVial
-        - id: SyringeStimulants
 
 - type: entity # DeltaV - upstream removed this i think?
   id: Observationskit
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index e437918ad5..9a1f8cc62a 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -666,9 +666,9 @@
   productEntity: ChemicalSynthesisKit
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 2
   cost:
-    Telecrystal: 4
+    Telecrystal: 3
   categories:
   - UplinkChemicals
 
@@ -699,9 +699,9 @@
   productEntity: ChemistryBottleNocturine
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 2
   cost:
-    Telecrystal: 6
+    Telecrystal: 4
   categories:
   - UplinkChemicals
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index fc6f4dc8e3..1a6301d034 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -691,7 +691,7 @@
         maxVol: 10
   - type: RefillableSolution
     solution: hypospray
-    refillTime: 1.25
+    refillTime: 0.75
     maxRefill: 5
   - type: ExaminableSolution
     solution: hypospray
diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index 60675b7dc5..178d145b4e 100644
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -5,11 +5,11 @@
     weight: 0.5
     reagents:
     - Omnizine
-    - Nocturine
-    - Lexorin
+    - Impedrezene
+    - Fresium
+    - HeartbreakerToxin
     - Honk
     #- BuzzochloricBees # DeltaV - Removed from pool.
-    - Stimulants
     - ExoticReagent # Funkychem
   - quantity: 5
     weight: 1
@@ -34,6 +34,9 @@
     - JuiceThatMakesYouWeh
     - Convermol # Funkychem - decent medicine
     - Pestiline # Funkychem - decent toxin
+    - TearGas
+    - Lipolicide
+    - Benzene
   - quantity: 5
     weight: 2
     reagents:
@@ -60,6 +63,8 @@
     - Cola
     - Diphenhydramine
     - Iron
+    - Bleach
+    - Mannitol
   - quantity: 10
     weight: 3
     reagents:
@@ -82,7 +87,7 @@
     - Ash
     - SodiumCarbonate
     - SpaceDrugs
-    - MuteToxin
+    - SpaceGlue
     - JuiceBerryPoison
     - Pilk
     - Posca
@@ -95,6 +100,9 @@
     - Potassium
     - Fluorine
     - Aluminium
+    - Wine
+    - Coffee
+    - Beer
   - quantity: 10
     weight: 3.5
     reagents:

From 2692b911894a3a1f158e2b860083db50771a8457 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:21:47 -0800
Subject: [PATCH 038/360] Vestine now Mutates Plants to Produce Vestine
 (#41731)

* ready freddy!

* remove that shit

* fsasfaf

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Server/Botany/SeedPrototype.cs        | 11 +++-----
 .../Botany/Systems/BotanySystem.Produce.cs    |  6 ++---
 .../PlantMutateChemicalsEntityEffectSystem.cs | 11 ++++----
 .../PlantMutateChemicalsEntityEffect.cs       | 26 +++++++++++++++++++
 .../guidebook/entity-effects/effects.ftl      |  6 +++++
 .../Hydroponics/randomChemicals.yml           | 20 ++++++++++++++
 Resources/Prototypes/Reagents/toxins.yml      |  3 +++
 7 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index 253eea2df9..a01d96a878 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,9 +1,6 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Server.EntityEffects.Effects.Botany;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
 using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -61,18 +58,18 @@ public partial struct SeedChemQuantity
     /// <summary>
     /// Minimum amount of chemical that is added to produce, regardless of the potency
     /// </summary>
-    [DataField("Min")] public int Min;
+    [DataField("Min")] public FixedPoint2 Min = FixedPoint2.Epsilon;
 
     /// <summary>
     /// Maximum amount of chemical that can be produced after taking plant potency into account.
     /// </summary>
-    [DataField("Max")] public int Max;
+    [DataField("Max")] public FixedPoint2 Max;
 
     /// <summary>
     /// When chemicals are added to produce, the potency of the seed is divided with this value. Final chemical amount is the result plus the `Min` value.
     /// Example: PotencyDivisor of 20 with seed potency of 55 results in 2.75, 55/20 = 2.75. If minimum is 1 then final result will be 3.75 of that chemical, 55/20+1 = 3.75.
     /// </summary>
-    [DataField("PotencyDivisor")] public int PotencyDivisor;
+    [DataField("PotencyDivisor")] public float PotencyDivisor;
 
     /// <summary>
     /// Inherent chemical is one that is NOT result of mutation or crossbreeding. These chemicals are removed if species mutation is executed.
diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
index 7d8f8652c7..bba3c48b86 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
@@ -29,10 +29,10 @@ public sealed partial class BotanySystem
         solutionContainer.RemoveAllSolution();
         foreach (var (chem, quantity) in seed.Chemicals)
         {
-            var amount = FixedPoint2.New(quantity.Min);
+            var amount = quantity.Min;
             if (quantity.PotencyDivisor > 0 && seed.Potency > 0)
-                amount += FixedPoint2.New(seed.Potency / quantity.PotencyDivisor);
-            amount = FixedPoint2.New(MathHelper.Clamp(amount.Float(), quantity.Min, quantity.Max));
+                amount += seed.Potency / quantity.PotencyDivisor;
+            amount = FixedPoint2.Clamp(amount, quantity.Min, quantity.Max);
             solutionContainer.MaxVolume += amount;
             solutionContainer.AddReagent(chem, amount);
         }
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
index 120ae6e881..d5589966b1 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Botany;
 using Content.Server.Botany.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Botany;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -23,7 +24,7 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
         // Add a random amount of a random chemical to this set of chemicals
         var pick = _random.Pick(randomChems);
         var chemicalId = _random.Pick(pick.Reagents);
-        var amount = _random.Next(1, (int)pick.Quantity);
+        var amount = _random.NextFloat(0.1f, (float)pick.Quantity);
         var seedChemQuantity = new SeedChemQuantity();
         if (chemicals.ContainsKey(chemicalId))
         {
@@ -32,12 +33,12 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
         }
         else
         {
-            seedChemQuantity.Min = 1;
-            seedChemQuantity.Max = 1 + amount;
+            seedChemQuantity.Min = FixedPoint2.Epsilon;
+            seedChemQuantity.Max = FixedPoint2.Zero + amount;
             seedChemQuantity.Inherent = false;
         }
-        var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
-        seedChemQuantity.PotencyDivisor = potencyDivisor;
+        var potencyDivisor = 100f / seedChemQuantity.Max;
+        seedChemQuantity.PotencyDivisor = (float) potencyDivisor;
         chemicals[chemicalId] = seedChemQuantity;
     }
 }
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
index 6a3d13e0c6..df119c6e40 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Localizations;
 using Content.Shared.Random;
 using Robust.Shared.Prototypes;
 
@@ -13,4 +14,29 @@ public sealed partial class PlantMutateChemicals : EntityEffectBase<PlantMutateC
     /// </summary>
     [DataField]
     public ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+
+    /// <inheritdoc/>
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var list = new List<string>();
+
+        // If your table doesn't exist, no guidebook for you!
+        if (!prototype.Resolve(RandomPickBotanyReagent, out var table))
+            return string.Empty;
+
+        foreach (var fill in table.Fills)
+        {
+            foreach (var reagent in fill.Reagents)
+            {
+                if (!prototype.Resolve(reagent, out var proto))
+                    continue;
+
+                list.Add(proto.LocalizedName);
+            }
+        }
+
+        var names = ContentLocalizationManager.FormatListToOr(list);
+
+        return Loc.GetString("entity-effect-guidebook-plant-mutate-chemicals", ("chance", Probability), ("name", names));
+    }
 }
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
index bbfaca7ee9..fccc6291a8 100644
--- a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
@@ -512,3 +512,9 @@ entity-effect-guidebook-plant-seeds-remove =
         [1] Removes the
         *[other] remove the
     } seeds of the plant
+
+entity-effect-guidebook-plant-mutate-chemicals =
+    { $chance ->
+        [1] Mutates
+        *[other] mutate
+    } a plant to produce {$name}
diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index 178d145b4e..c21e56d13b 100644
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -125,3 +125,23 @@
     - TableSalt
     - Chlorine
     - Mercury
+
+- type: weightedRandomFillSolution
+  id: EvilRandomFillSolution
+  fills:
+  - quantity: 0.1 # Common but low quantity
+    weight: 20
+    reagents:
+    - Vestine
+  - quantity: 0.5 # High quantity but uncommon
+    weight: 10
+    reagents:
+    - Stimulants
+    - MuteToxin
+  - quantity: 0.5 # High quantity but very rare
+    weight: 1
+    reagents:
+    - Tazinide
+    - Lead
+    - Nocturine
+    - Lexorin
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index daf0d9554f..cff77b3b03 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -664,6 +664,9 @@
   contrabandSeverity: Syndicate
   flavor: medicine
   color: "#435166"
+  plantMetabolism:
+  - !type:PlantMutateChemicals
+    randomPickBotanyReagent: EvilRandomFillSolution
   metabolisms:
     Poison:
       effects:

From 4f4945d8c65c6bd9c0348eca18b945f15b930961 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:46:38 +0100
Subject: [PATCH 039/360] Predict ReactionMixerSystem (#41218)

* predict

* documentation

* review
---
 .../EntitySystems/ReactionMixerSystem.cs      |  81 -------------
 .../Reaction/ReactionMixerComponent.cs        |  31 +++--
 .../Chemistry/Reaction/ReactionMixerSystem.cs | 109 ++++++++++++++++++
 3 files changed, 122 insertions(+), 99 deletions(-)
 delete mode 100644 Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
 create mode 100644 Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs

diff --git a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
deleted file mode 100644
index ee99418970..0000000000
--- a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.DoAfter;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Server.Popups;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed partial class ReactionMixerSystem : EntitySystem
-{
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(IngestionSystem)]);
-        SubscribeLocalEvent<ReactionMixerComponent, ShakeEvent>(OnShake);
-        SubscribeLocalEvent<ReactionMixerComponent, ReactionMixDoAfterEvent>(OnDoAfter);
-    }
-
-    private void OnAfterInteract(Entity<ReactionMixerComponent> entity, ref AfterInteractEvent args)
-    {
-        if (!args.Target.HasValue || !args.CanReach || !entity.Comp.MixOnInteract)
-            return;
-
-        if (!MixAttempt(entity, args.Target.Value, out _))
-            return;
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.TimeToMix, new ReactionMixDoAfterEvent(), entity, args.Target.Value, entity);
-
-        _doAfterSystem.TryStartDoAfter(doAfterArgs);
-        args.Handled = true;
-    }
-
-    private void OnDoAfter(Entity<ReactionMixerComponent> entity, ref ReactionMixDoAfterEvent args)
-    {
-        //Do again to get the solution again
-        if (!MixAttempt(entity, args.Target!.Value, out var solution))
-            return;
-
-        _popup.PopupEntity(Loc.GetString(entity.Comp.MixMessage, ("mixed", Identity.Entity(args.Target!.Value, EntityManager)), ("mixer", Identity.Entity(entity.Owner, EntityManager))), args.User, args.User);
-
-        _solutionContainers.UpdateChemicals(solution!.Value, true, entity.Comp);
-
-        var afterMixingEvent = new AfterMixingEvent(entity, args.Target!.Value);
-        RaiseLocalEvent(entity, afterMixingEvent);
-    }
-
-    private void OnShake(Entity<ReactionMixerComponent> entity, ref ShakeEvent args)
-    {
-        if (!MixAttempt(entity, entity, out var solution))
-            return;
-
-        _solutionContainers.UpdateChemicals(solution!.Value, true, entity.Comp);
-
-        var afterMixingEvent = new AfterMixingEvent(entity, entity);
-        RaiseLocalEvent(entity, afterMixingEvent);
-    }
-
-    private bool MixAttempt(EntityUid ent, EntityUid target, out Entity<SolutionComponent>? solution)
-    {
-        solution = null;
-        var mixAttemptEvent = new MixingAttemptEvent(ent);
-        RaiseLocalEvent(ent, ref mixAttemptEvent);
-        if (mixAttemptEvent.Cancelled)
-        {
-            return false;
-        }
-
-        if (!_solutionContainers.TryGetMixableSolution(target, out solution, out _))
-            return false;
-
-        return true;
-    }
-}
diff --git a/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs b/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
index 8edfa44ce8..25fda25607 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
@@ -1,48 +1,43 @@
-using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Reaction;
 
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ReactionMixerComponent : Component
 {
     /// <summary>
-    ///     A list of IDs for categories of reactions that can be mixed (i.e. HOLY for a bible, DRINK for a spoon)
+    /// A list of IDs for categories of reactions that can be mixed (i.e. HOLY for a bible, DRINK for a spoon).
     /// </summary>
-    [ViewVariables]
-    [DataField]
-    public List<ProtoId<MixingCategoryPrototype>> ReactionTypes = default!;
+    [DataField, AutoNetworkedField]
+    public List<ProtoId<MixingCategoryPrototype>> ReactionTypes = new();
 
     /// <summary>
-    ///     A string which identifies the string to be sent when successfully mixing a solution
+    /// The popup message when successfully mixing a solution.
     /// </summary>
-    [ViewVariables]
-    [DataField]
+    [DataField, AutoNetworkedField]
     public LocId MixMessage = "default-mixing-success";
 
     /// <summary>
-    ///     Defines if interacting is enough to mix with this component
+    /// Defines if interacting is enough to mix with this component.
     /// </summary>
-    [ViewVariables]
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool MixOnInteract = true;
 
     /// <summary>
-    ///     How long it takes to mix with this
+    /// How long it takes to mix with this.
     /// </summary>
-    [ViewVariables]
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan TimeToMix = TimeSpan.Zero;
 }
 
 [ByRefEvent]
 public record struct MixingAttemptEvent(EntityUid Mixed, bool Cancelled = false);
 
+[ByRefEvent]
 public readonly record struct AfterMixingEvent(EntityUid Mixed, EntityUid Mixer);
 
 [Serializable, NetSerializable]
-public sealed partial class ReactionMixDoAfterEvent : SimpleDoAfterEvent
-{
-}
+public sealed partial class ReactionMixDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs b/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs
new file mode 100644
index 0000000000..4bc878a42f
--- /dev/null
+++ b/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Popups;
+
+namespace Content.Shared.Chemistry.Reaction;
+
+public sealed partial class ReactionMixerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(IngestionSystem)]);
+        SubscribeLocalEvent<ReactionMixerComponent, ShakeEvent>(OnShake);
+        SubscribeLocalEvent<ReactionMixerComponent, ReactionMixDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnAfterInteract(Entity<ReactionMixerComponent> ent, ref AfterInteractEvent args)
+    {
+        if (!args.Target.HasValue || !args.CanReach || !ent.Comp.MixOnInteract)
+            return;
+
+        if (!CanMix(ent.AsNullable(), args.Target.Value))
+            return;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.TimeToMix, new ReactionMixDoAfterEvent(), ent, args.Target.Value, ent);
+
+        _doAfter.TryStartDoAfter(doAfterArgs);
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(Entity<ReactionMixerComponent> ent, ref ReactionMixDoAfterEvent args)
+    {
+        if (args.Target == null)
+            return;
+
+        if (!TryMix(ent.AsNullable(), args.Target.Value))
+            return;
+
+        _popup.PopupClient(
+            Loc.GetString(
+                ent.Comp.MixMessage,
+                ("mixed", Identity.Entity(args.Target.Value, EntityManager)),
+                ("mixer", Identity.Entity(ent.Owner, EntityManager))),
+            args.User,
+            args.User);
+    }
+
+    private void OnShake(Entity<ReactionMixerComponent> ent, ref ShakeEvent args)
+    {
+        TryMix(ent.AsNullable(), ent);
+    }
+
+    /// <summary>
+    /// Returns true if given reaction mixer is able to mix the solution inside the target entity, false otherwise.
+    /// </summary>
+    /// <param name="ent">The reaction mixer used to cause the reaction.</param>
+    /// <param name="target">The target solution container with a <see cref="MixableSolutionComponent"/>.</param>
+    public bool CanMix(Entity<ReactionMixerComponent?> ent, EntityUid target)
+    {
+        if (!Resolve(ent, ref ent.Comp, false)) // The used entity needs the component to be able to mix a solution
+            return false;
+
+        var mixAttemptEvent = new MixingAttemptEvent(ent);
+        RaiseLocalEvent(ent, ref mixAttemptEvent);
+        if (mixAttemptEvent.Cancelled)
+            return false;
+
+        if (!_solutionContainer.TryGetMixableSolution(target, out _, out _))
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to mix the solution inside the target entity using the given reaction mixer.
+    /// </summary>
+    /// <param name="ent">The reaction mixer used to cause the reaction.</param>
+    /// <param name="target">The target solution container with a <see cref="MixableSolutionComponent"/>.</param>
+    /// <returns>If the reaction mixer was able to mix the solution. This does not necessarily mean a reaction took place.</returns>
+    public bool TryMix(Entity<ReactionMixerComponent?> ent, EntityUid target)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        var mixAttemptEvent = new MixingAttemptEvent(ent);
+        RaiseLocalEvent(ent, ref mixAttemptEvent);
+        if (mixAttemptEvent.Cancelled)
+            return false;
+
+        if (!_solutionContainer.TryGetMixableSolution(target, out var solutionEnt, out _))
+            return false;
+
+        _solutionContainer.UpdateChemicals(solutionEnt.Value, true, ent.Comp);
+
+        var afterMixingEvent = new AfterMixingEvent(ent, target);
+        RaiseLocalEvent(ent, ref afterMixingEvent);
+
+        return true;
+    }
+}

From 36cbc7491f51d73298d24a2489177f4215665648 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sat, 6 Dec 2025 16:45:50 +0100
Subject: [PATCH 040/360] move GameMapPrototype and GameMapCondition to shared
 (#41742)

* move GameMapPrototype and GameMapCondition to shared

* fix
---
 Content.Benchmarks/MapLoadBenchmark.cs                         | 2 +-
 Content.IntegrationTests/Tests/PostMapInitTest.cs              | 2 +-
 Content.IntegrationTests/Tests/Power/StationPowerTests.cs      | 2 +-
 Content.IntegrationTests/Tests/Station/StationJobsTest.cs      | 2 +-
 Content.MapRenderer/Program.cs                                 | 2 +-
 Content.MapRenderer/RenderMap.cs                               | 2 +-
 Content.Server/Administration/Commands/LoadGameMapCommand.cs   | 2 +-
 Content.Server/GameTicking/Commands/ForceMapCommand.cs         | 1 +
 Content.Server/GameTicking/GameTicker.GamePreset.cs            | 1 +
 Content.Server/GameTicking/GameTicker.RoundFlow.cs             | 1 +
 .../GameTicking/Rules/Components/LoadMapRuleComponent.cs       | 3 +--
 Content.Server/Maps/Conditions/HolidayMapCondition.cs          | 1 +
 Content.Server/Maps/GameMapManager.cs                          | 1 +
 Content.Server/Maps/GameMapPoolPrototype.cs                    | 1 +
 Content.Server/Maps/IGameMapManager.cs                         | 2 ++
 Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs     | 2 +-
 {Content.Server => Content.Shared}/Maps/GameMapCondition.cs    | 2 +-
 .../Maps/GameMapPrototype.MapSelection.cs                      | 2 +-
 {Content.Server => Content.Shared}/Maps/GameMapPrototype.cs    | 2 +-
 19 files changed, 20 insertions(+), 13 deletions(-)
 rename {Content.Server => Content.Shared}/Maps/GameMapCondition.cs (87%)
 rename {Content.Server => Content.Shared}/Maps/GameMapPrototype.MapSelection.cs (96%)
 rename {Content.Server => Content.Shared}/Maps/GameMapPrototype.cs (98%)

diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs
index 126ac99774..d43b7d7d19 100644
--- a/Content.Benchmarks/MapLoadBenchmark.cs
+++ b/Content.Benchmarks/MapLoadBenchmark.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.EntitySerialization.Systems;
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 1459214bba..6729f23160 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -5,12 +5,12 @@ using System.Text.RegularExpressions;
 using YamlDotNet.RepresentationModel;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
-using Content.Server.Maps;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using Content.Shared.Roles;
 using Content.Shared.Station.Components;
 using Robust.Shared.Configuration;
diff --git a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
index e9692c2e79..2700d9b0bb 100644
--- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
+++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameTicking;
-using Content.Server.Maps;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
+using Content.Shared.Maps;
 using Content.Shared.Power.Components;
 using Content.Shared.NodeContainer;
 using Robust.Server.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index 3fee4a146c..4abd32bda0 100644
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Maps;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Maps;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
diff --git a/Content.MapRenderer/Program.cs b/Content.MapRenderer/Program.cs
index 534b12565c..90f97a5786 100644
--- a/Content.MapRenderer/Program.cs
+++ b/Content.MapRenderer/Program.cs
@@ -7,7 +7,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Content.IntegrationTests;
 using Content.MapRenderer.Painters;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 using Robust.UnitTesting.Pool;
 using SixLabors.ImageSharp;
diff --git a/Content.MapRenderer/RenderMap.cs b/Content.MapRenderer/RenderMap.cs
index 4ebf4ee5d4..8d6087ec7a 100644
--- a/Content.MapRenderer/RenderMap.cs
+++ b/Content.MapRenderer/RenderMap.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
diff --git a/Content.Server/Administration/Commands/LoadGameMapCommand.cs b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
index dfe18ea5bc..dc82fccd1e 100644
--- a/Content.Server/Administration/Commands/LoadGameMapCommand.cs
+++ b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 using Content.Server.GameTicking;
-using Content.Server.Maps;
 using Content.Shared.Administration;
+using Content.Shared.Maps;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
index 577464acad..f8553a9244 100644
--- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
@@ -3,6 +3,7 @@ using Content.Server.Administration;
 using Content.Server.Maps;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index 1973daa5a1..4634b7820b 100644
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Content.Server.GameTicking.Presets;
 using Content.Server.Maps;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 1dadca4c03..6d2f3fac52 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -8,6 +8,7 @@ using Content.Server.Roles;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
+using Content.Shared.Maps;
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Content.Shared.Preferences;
diff --git a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
index f1bd1e5eef..f85a5b8e85 100644
--- a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
@@ -1,6 +1,5 @@
-using Content.Server.GameTicking.Rules;
-using Content.Server.Maps;
 using Content.Shared.GridPreloader.Prototypes;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
diff --git a/Content.Server/Maps/Conditions/HolidayMapCondition.cs b/Content.Server/Maps/Conditions/HolidayMapCondition.cs
index da971c78f3..b7edc3f6c2 100644
--- a/Content.Server/Maps/Conditions/HolidayMapCondition.cs
+++ b/Content.Server/Maps/Conditions/HolidayMapCondition.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Holiday;
+using Content.Shared.Maps;
 
 namespace Content.Server.Maps.Conditions;
 
diff --git a/Content.Server/Maps/GameMapManager.cs b/Content.Server/Maps/GameMapManager.cs
index 9638dffaa7..9914b7bde2 100644
--- a/Content.Server/Maps/GameMapManager.cs
+++ b/Content.Server/Maps/GameMapManager.cs
@@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.GameTicking;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
diff --git a/Content.Server/Maps/GameMapPoolPrototype.cs b/Content.Server/Maps/GameMapPoolPrototype.cs
index b2ba64a50c..831dea556d 100644
--- a/Content.Server/Maps/GameMapPoolPrototype.cs
+++ b/Content.Server/Maps/GameMapPoolPrototype.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
diff --git a/Content.Server/Maps/IGameMapManager.cs b/Content.Server/Maps/IGameMapManager.cs
index 02433c7b79..d05c42a78c 100644
--- a/Content.Server/Maps/IGameMapManager.cs
+++ b/Content.Server/Maps/IGameMapManager.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Maps;
+
 namespace Content.Server.Maps;
 
 /// <summary>
diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
index 0dd1540933..614a54e0f6 100644
--- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -6,12 +6,12 @@ using Content.Server.Administration.Managers;
 using Content.Server.Discord.WebhookMessages;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Presets;
-using Content.Server.Maps;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Maps;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Voting;
diff --git a/Content.Server/Maps/GameMapCondition.cs b/Content.Shared/Maps/GameMapCondition.cs
similarity index 87%
rename from Content.Server/Maps/GameMapCondition.cs
rename to Content.Shared/Maps/GameMapCondition.cs
index 78c5323777..b5d625ffca 100644
--- a/Content.Server/Maps/GameMapCondition.cs
+++ b/Content.Shared/Maps/GameMapCondition.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 [ImplicitDataDefinitionForInheritors]
 public abstract partial class GameMapCondition
diff --git a/Content.Server/Maps/GameMapPrototype.MapSelection.cs b/Content.Shared/Maps/GameMapPrototype.MapSelection.cs
similarity index 96%
rename from Content.Server/Maps/GameMapPrototype.MapSelection.cs
rename to Content.Shared/Maps/GameMapPrototype.MapSelection.cs
index ff8fd35717..c79d8be5b1 100644
--- a/Content.Server/Maps/GameMapPrototype.MapSelection.cs
+++ b/Content.Shared/Maps/GameMapPrototype.MapSelection.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 public sealed partial class GameMapPrototype
 {
diff --git a/Content.Server/Maps/GameMapPrototype.cs b/Content.Shared/Maps/GameMapPrototype.cs
similarity index 98%
rename from Content.Server/Maps/GameMapPrototype.cs
rename to Content.Shared/Maps/GameMapPrototype.cs
index df9046652b..fc97376412 100644
--- a/Content.Server/Maps/GameMapPrototype.cs
+++ b/Content.Shared/Maps/GameMapPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Utility;
 using System.Diagnostics;
 using Content.Shared.Station;
 
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 /// <summary>
 /// Prototype data for a game map.

From 65eab93a7a57010e791ad4db50c0d346839cf058 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Sat, 6 Dec 2025 15:13:40 -0300
Subject: [PATCH 041/360] Remove explosive component from mothership cpre
 (#41743)

remove explosive comp
---
 .../Entities/Mobs/Player/mothershipcore.yml           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
index c66caff638..b66ffb7753 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -85,11 +85,12 @@
     doAfterDelay: 30 # you can heal the mothership core, but it takes a while
   - type: DamagedSiliconAccent
     enableChargeCorruption: false
-  - type: Explosive
-    explosionType: Default
-    maxIntensity: 100
-    intensitySlope: 2
-    totalIntensity: 200
+  # TODO: make it explosive again once until issue https://github.com/space-wizards/space-station-14/issues/40606 is fixed
+  # - type: Explosive
+  #   explosionType: Default
+  #   maxIntensity: 100
+  #   intensitySlope: 2
+  #   totalIntensity: 200
   - type: SurveillanceCameraSpeaker
   - type: SurveillanceCameraMonitor
   - type: RoboticsConsole

From 7c7ab40ae366fd502194f0f4b4f2724945b774e8 Mon Sep 17 00:00:00 2001
From: August Sun <45527070+august-sun@users.noreply.github.com>
Date: Sat, 6 Dec 2025 13:40:37 -0700
Subject: [PATCH 042/360] Adds the sticky grappling hand (#37551)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adds sprites, entity and sounds for sticky grappling hand

* Switched audio to mono

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

Co-authored-by: āda <ss.adasts@gmail.com>

* Added empty sound, changed yaml to suit conventions, added description

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Resources/Audio/Misc/attributions.yml         |  15 ++++++++++
 Resources/Audio/Misc/boing.ogg                | Bin 0 -> 17115 bytes
 Resources/Audio/Misc/stickystretch.ogg        | Bin 0 -> 42452 bytes
 Resources/Audio/Misc/woosh.ogg                | Bin 0 -> 9410 bytes
 .../Weapons/Guns/Launchers/launchers.yml      |  27 +++++++++++++++++
 .../Weapons/Guns/Projectiles/projectiles.yml  |  11 +++++++
 .../Guns/Launchers/sticky_hand.rsi/base.png   | Bin 0 -> 407 bytes
 .../Guns/Launchers/sticky_hand.rsi/hook.png   | Bin 0 -> 343 bytes
 .../Launchers/sticky_hand.rsi/inhand-left.png | Bin 0 -> 354 bytes
 .../sticky_hand.rsi/inhand-right.png          | Bin 0 -> 351 bytes
 .../Guns/Launchers/sticky_hand.rsi/meta.json  |  28 ++++++++++++++++++
 .../Guns/Launchers/sticky_hand.rsi/rope.png   | Bin 0 -> 130 bytes
 12 files changed, 81 insertions(+)
 create mode 100644 Resources/Audio/Misc/boing.ogg
 create mode 100644 Resources/Audio/Misc/stickystretch.ogg
 create mode 100644 Resources/Audio/Misc/woosh.ogg
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png

diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml
index 67daaff404..25856d8c93 100644
--- a/Resources/Audio/Misc/attributions.yml
+++ b/Resources/Audio/Misc/attributions.yml
@@ -57,3 +57,18 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from Citadel Station 13"
   source: "https://github.com/Skyrat-SS13/Skyrat13/commit/2d4f2d1b489590b559e4073f41b126cef56f4c50"
+
+- files: ["woosh.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from SciFiSounds via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
+  source: "https://freesound.org/people/SciFiSounds/sounds/529925/"
+
+- files: ["stickystretch.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from sdroliasnick via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
+  source: "https://freesound.org/people/sdroliasnick/sounds/731262/"
+
+- files: ["boing.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from stevielematt via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
+  source: "https://freesound.org/people/stevielematt/sounds/538066/"
diff --git a/Resources/Audio/Misc/boing.ogg b/Resources/Audio/Misc/boing.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..1a957104aaf613cafda7f775341f41180e7807ca
GIT binary patch
literal 17115
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

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Misc/stickystretch.ogg b/Resources/Audio/Misc/stickystretch.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..05b0b5935c803ec2b1ee9161aebbbe988fb0856d
GIT binary patch
literal 42452
zcmb@tcUTi$_b57uN)Z7C5tU{Iq=|xbLXi%F^p1dl^xjKQKvWP^5Ri^EktWh>M4Hlj
zkrI&-siB1sLXxw=_x;XyfA>D;{B!3ShP`L)w))y@b~Nqmbf9C<Ki7}*e+v{tk@aM3
zWInDQR`#BUugLBd{e|2rAU`V9kZB(F{LgjRlMK`-pFs6zN=X0DYlQsoNJ5~2p}pH<
zeoYTM4kvpn{iE?YR5)(mx_#@G$SolbE^V7f-q!Xmb{q;WKK352F3vVCUfhRMa)Cd2
zO$`l&`?@+(_gsBloLns***xN~^>B6O(6MxObF#5@wf6Spw{~^D_D|dYTf4KMovxvw
zp_IC%kFD@sexY0Zg0}?8PW)XhkDR<d8AJ)%2&!|mh4#PJgCKecdU%bSHqKUsJ2yUy
z%Rebz`LNV>>qS!hi#BHKXu<Y>9~?rD&Oy*|D3psTCVNrEp;yd~nKQ;CQ_TLpXg&wU
z%Ll*2sJ>xtSi9s^<T<+Za$l!BZFB+xypU189Koo4_^^6@`57~KM6!5%znq`yL4EUM
z=2Pn1-#Nn6Z!hJ<-4|c_m>na&%vI4ZcZ#oKP*q)UMBlok@uXRhXRjD4^`8gT5gr_1
zEpjI>JffGQJRJTxcV3bQ80s%t98f4g6H<D^s8Yt*RmRdYa7}ZI_W^_Oz#Ro0T@5{O
zd7Byd*o^sjkNE@}B}JIj1RK>vn2bl5VIwS=pZ#<11tYPC_YvwGWKiZ+v4lD94_7XJ
z_$~H<Jp5VFG3e1DNjRw9Ug3V5t&(T!P-34_^|-Lgx$6sW*B6?jCP0pkAFc+<v`^0a
zf8Dl52{!-tTjufin~)5kWrsUUhx;`J?Q0z#yc9<i{tko`lF{aE^AJ+<6zcGl1h<mc
zy&v)FJv-`j|1#l_?GPj*$kOJ{@&iyqn{UWN*uYb2%u{0wkm8Uc|L5z;k-PvzE~nWh
zID}H(d2M+_mQXM(a~7pM&EJ_ogXdZE9LfF3+dX2m$qShUj44CSFLYBlYYUQ6jyUMl
zdtnanlDqSLTju-zWY1m|n&jNSCI7Q26vYLD;N1mODsB4(OVG}KFqxuY!VvT|>Q7$$
zSjz}XFXB@;D{FQCj`xpP6qu*>HjB-I9xr~TIMz~`ffDXf>Us~=;k*ASJ~DuBmgCIr
zX-_$VV@_HzUe3E5$L1AF8<#2gojZr^Rg9u)L70~I1<qWrr$?A`Ku|dSkre;?I1=T*
zQk?Vl<;_m6^6uMRyoZmXmR|9d&n@)wG=e~id4+)#zp7kJ_bd@pcFe6DHRj2U*H-1u
z{i{)csT_}9%bvV&q$JOhJUY4afmZxC<2J7KonamLue)!P<-ytO;2yZmr*lV2Pgl>t
z$Jr>+d$KyhY}^|;7K|KwWpV!5{}inMXbuFFCj3Yz<E^3vJ5s~$%TfJh@V}bl&e-vW
z<;R<AYG1Bt4D$AD32AN%4KOG?5Yo^&XEt!odx*(K=dRh1u+5O3&4`c9M3s$6b+A#@
zKMM0#ZIEN$|D`#HDsn|EW={F-@&BzknOrfyMPsh2yuD`h_J)6g-HYUc_vuRoAE^I_
z<~)9xpY$^S`AgLE7_Juy_Ain@)qZg5ELo}hzuy1R93_uy;0Btb;BoE0H0P@zi#*V#
zFT5Jte{qx=00i|?IRD=afS|9hY1EGF$OCP@5pCfSZ9Y9+ssFRa0O*L2#*h#o>^lg$
z06~A+0M+T=W+xcaHyLz_aS3D11#KByX99DRWMe!w-dm}PaaHE`3g$k4V`{?l=1Qw2
zt+?KO?vJvlQ58x)3Sjn*Ll1zu$vqcrWwwfz{myYOT9EQW_;bONm&5vHDX&Mw-=@6$
z?zMI+GpPRH2#=Rjxe)(aTR9hkLLmz9cPgv@^*J(`R0w+d+Vi;}<vDA5amoTOdhJil
zVXwtFuY1y}a$V1*S5*ao+o)@gdR3^d=P;_O6okFj=E}|0Qgz_YW!6#U^P$(K&IJH_
z?n*`zRlfF@f|Tz)wQr+x!nKV7AVG{X7xbXWihrx^n42>S0ABqnOC0gq+V%zU!^T|K
zD*@p8yHR6D!Msr`nxmnLbB3)PxT{8ui;gDGIh_0upu*>QUzOtWyIxst&;zW+ruT5D
zL0PWcoIzui+)6D~wd=W~a@@t0qgLt#l^0c2z);321(n0b#l@A(5|rE#hpVbcFn%eR
z%Vf=!do+12n7p#;aPkUWZTrI>4#n+Y@&bUMqhQsj!z;md7V93dTt;gL?)G8hXuc{I
z>mp&_Bg~n=swx41uN{!&XjOcmhk9|_Mb)FBz~rOGuZk-#>Zk$)9n=eeEA6hVWcCC-
z4(F(3219i)JMsbd`;`ph_!@p&>+yG0h=Uq9=aZM)Q}0l6w=svebL29I(Q~&YdD36W
zW%i_%YX>FOABQDw*6_23e4$t6<_2zA>lg6l55w|We?t+^ijG5a#~|kLc&lzP6bIlz
z_-pNGF%(O<w)RVU?U#b6)G#eo)py$Jf{Tam9165m1>29_71%@{zM}^tR|40c8b&Y2
z&0RSP`g(!ca&yPUL0>Q>ptms?546k89kp6HYIi+%*f{EPxVEaw_1pxjC_zvH?c$B2
z1QT?%RSQ77sIqo#Rbcl<!MpZkFfU+ObXmKxj_M(~z&m3{5OPt_g2+p;Uq$hq!uaEF
z5fqt6BFhLUMPo%H_$<|v{x;<sPZ~Lj%N{@wavo{R*<a38S5>~A!z2deO#3!>R<4%z
zjq5qO#@rCJ3dp<qRgO#O(RJuG1@K-uj3B6a77xhK&LXc0sB9e#WE#9f#cKnUlRUwL
z1^5dP_W<g#Sa$<*dBy-*fOj2-092~=UvEMMK{wri^Zoqbk>}GlnLs^{K?T4|2&x{@
z^<o4wXib?bq%61y7Oh(Fw;Hegx5|C}5PBJK=MX9f)b6kfh^Cr$Sj~!$m!kx30#Ggj
z5Ii?t*Z5{GXbecD|Cg=~#SpY{oC3-`c1d4Jl>6c--Xk2zpszreWlvtVK8%dQ!2_(5
z`EZ@LvS=7DemM&%gQ$!K;7<Xx>qxd#Rk#nO;!si!MeUIJ|5P2pS`Mqs5=T%+!DoM~
z)-;C;cN82oK7u-SSN>CVR0SI6SS*Z+2dX`4?Adz);t&#rLRrT@i+@uYFnpMGnTIS?
z5`vVuj{-}eU57+J<i@{oreNNGO8@)aQEBlXK=&bYqQw?j4*RBh-Us6UgdCCyeRU;;
zA^P~aLmVjqtD`NC#Q(KwcKi{6-|1h>O$|GHDAB+`UC#xQ&sWtg#?Ac>pu*>K7F2<d
z7L@_Z<ycV3Wc`X2ShJUW?H4`Q0BHa|Kt6#H90yHCljXS&n*c;jK{o*CsYD$T1eA(v
z^AATEHT6VG9gb4Dm>LMkkR&Mz$y^^7ZBZRGntkkcM29H|Qsf30(Eh`zcYoFNFXL_k
zjXx5J!|J0${q_0_ko*2$fbjl9#XbUP$#Lg`9u!ARzZ|Zm`Y+(DDpzj&zeD97>g7L8
z&K?Suw)kH$`5Tk`9qLHpv{kA8wmS+|;?Eu~@^23yfQRj}{sOdBkL31nsKfDq@Lv8G
z046$`{0N{eM|u4}fLt&DSk+$unCRcq;V2N)f5gu-@0hIeFBq^rxk`QE#$WxK1@7<P
zwhq_+?SB>6nSVz5cNPEtSN}h!fIfE7P<;JEb;-_9MVyD_H2;wfG69WiNwSWS<pgSM
z?3naaOYToj&Y-GOnXsztA+fZ9nvCB5^D+Lds%mi?lXdj_Fm3Idz=8sMI7%z0%2&x`
z5>>Wn>`0N711#vFfR!|cy;gNBUSPKVEQb0i%f($eZWS#&W*kUcPyq(0+%<LV5ql0S
zyx{0X&mLjylo}X0*|9{JBEyqDFL&JGl`twbkY0Rm*!WfLBAZvgEQ-xbwHSE8UMY&p
zK^wJ|hK@bLsF^T2aZ02^ArNdwv=lZy%ta7La)0w-6WJPO$38JEOE|6g9vcnx{goRe
zV|wfDYw@nngU>H%ex-i`><cyY95}RSV1UB^^2F-pUseAvWd@ss8=@cpH*7BH9{lv`
zci#Q24|K;e`p=}ixtypi7{?$RJFFG;?qQ_9TiE%~BZmfdIrPr~MLc8Z<43L5YIRk`
z9LiAfm!GCqq^kX(k-cy1$oJ?w7pGtq<Lz+9il4?yz?@qZmU%@BsuZ*(sG>mp4n2h+
z@-w#?C>dp*JfVR^Wt3kZgQ!o@u(l}3$namz{+j8gF3Op97lLG;chkRk-o_!Ab&>04
z9(icniDyC3_x^F^`kGLFa?}1cGYUCMIr^uDEHY$NqN20UIA=D(FQsPc=q?}5bGWbm
z1*k9qUHS0-{oJ38J&5Yeh0EN6VzMd^fH?*i2eb!_pnmA{$F_^2;*!!ba`zOKRn_ln
zY3u$cdl4EMdel}1JVQhO$xpByy@C$&6Ne3>a|;v%Z;;|hbt)=4s%pwAs>-U$YDy}K
zD#|LLbod7RQ&G`WQBhY06R6(@Po?njyyasXQ7waRF)6KNkPKYDw*S8UrheRd@BZEu
z=7FBoUL(!p0XlJ0T$cwpd@Ojp<-`zv#FRqmU03NBT^^{dZB(5ZVFX>U(Pj|THtY5#
zd16gxd3vEIk^TNy6vkTTQz>pUtsq3ZDOlgG)V>w7KY^bwzb!MA>gkI<NI|QAZD{hr
z-h^-WQp-5^@;^TnG8dJ0uJ=<`NM3{)6Q+#wxLZR|knhQd=@$C&=Hw3>YGJ2>k#vUM
zO~K~WZ$XqGL%Jd==|xNm!+FW3Vp0!A_5s_#HSo>Gs}OOa)&BIKd@~)b<qni=SK;*8
z;Yo27pA>cpQ>z}^+8y+C@TWiLdNLORboI`ZDZOyn>mKQ5{fU=V=zmT5u~&v-DS^m>
zRu#Yg?HGrRMO&o1els>O=@@<ADd?`>z!bgds>*TNlt84PFh6c4zh%NDzoF#{ewkTL
zlUg~iN7Z=Q<?1OdK`APnK$5QWGxZJ4oM(Mh!Dq!hb*j+fAtYt<bL+YRA>}ez2Ohll
zgtI%a-Yq|sgkVf*yvXX*RN+6a=c629ySLdR=&6n~j$GdPIWG`pd59g8?%Zm?*{jcq
z-x4d<#}3>+cCFzu%0)y-Q<@}(j`9^$)}!?GsnUpT=G`5kvG?v0O&KVqA;+n};EJ)S
zcdyd@lGwyEx^X%oh>Du-ZOOjv+%ZC~q4acb2gb_Be>;r5Z~HelddeeMs_$WXX`%sX
zttU)#3lW74hEMj?GVP8^6!UhI_;)Z-91q>Bu@V$aOB4k!eun4S?{<zQ!teVBV_%tM
zpY`&k$XX|8?iF#e?9KDSRpzGC?q}aHnVg<xrLL2wsSA_oJ)pymOqHGQ&c&pByOBR)
zXR|Gd6f^-S$|R)t2rqpuG&MbeKmPT`dvqPcC_H4K<|*?5UZX`IXtX<MP?MQ0`p5Q6
zMEQ3QFWeqU*h!z~YVJ(2+wE&}VJog#l|Pv-WJyspMa~|_u6$DDIaoW;i^f-fPVLpm
ztkfGCnEB}YE3T4XR6s)H?5p3JC*2i&zZhk;H<HHAbtDh}ifv1v8I1p<MV40ms`4)U
zT*n@KYvSbHDrte=PMxZjc1cE!+RIKt58G|i1d-v*P7$-46_?v9jQdA<zUy_W%qCh(
z>Io+pEYzpmRHYTGYZSW*L0%)DZ4}IN*hLW`!~?HO?w@TY6L;%Y>ybDw%)X>%;KDQ>
zX%Vu0h5l<Lw}n3bRZzfNExC%-!EW2Z3m)HY3rwVE*=CrBaY6HBZOa$@McCC(BzBZy
zNj-%wh`n*|hTy<De92hX(DG0K@ey|^?7*=D7}>(7XE#ZFMcaRfw|=bGrPT8HUh)$y
z>l@f*e@d1^_2$=$%17j}#;-FR9)=cl^#x~GZX;prT|Mqg`AC0Bf<I*_^sS6?=(H*C
zX`O8)vHVK;5ku90rCppP8xK)$Tceufw2^^sny}HXo?P>(CmY^8=w!e-x!iXyK@f1H
zkgd9q?b)-{jH+hEk{cpDd=xJC8}<9}=zY(I(-1^#m-&=DWARd4q))v&m(UmcL!2~8
zt=p2HbL!+U*}%h&z%SLhd^I6LsieRcL!W)A69w(EDiC}7Ip!AnEpv8vUdlkOJt9jf
z3q3YEXz8Vak{dUOCJWDcctU1r-C_>trEbm7x|}~w{5Yamv@6?u0kch2xMRGzftgLE
z4X%U}h?u~rZ>B%@_uCg7nl|lEfqdbsQ2xbtX11)6_upx~;+wobp)6eLMTd)g`xWXY
z7?x*92Z){%G9V`(?%TSkiTNzxza&31DL)q$4g<a2GTyT;5)rc}V(PQZL?<I3xi>&Y
z7T*P8-9&R*_DPpCJy;q#<|q#c;g51G))Je34XGd_(dH8QZxRz{(tX%w0uBW17fhxD
z_J|{do)$V_<vN_B(>|0r*8A}=Xnq$6`qt!dWBmF!BdLk6F!~JCfa#xaPEGn6_H<DN
z2Ggs(6oK1CJ2%WFw6KTN@-O0JX^qi?2X??sxDO70x?j`ao8SJ2aQ8RCg}B#_HkGzX
zJokCTJc5ko*wQ2Gl7qaf{+7W-dnWoUxAi5HE!OGG8(D&uR)Ut<TzbzV2|Ii%AXTMj
zGAhu4u)b$Wh`+t#r9mKud~f=UyxOxM&*0w-h?G<*A8o`X>T<D%tdq0~YqlEcrJmMa
zA^KPl5o&lI5)xpwqkp@q@<!TJVbpVmJU<Vs2m7Y$y{xj>V4AR2?J5O^JgTV^jX%;G
zQY>V-{Dezw4qgTKCg!8h8+1e}%r3e5g=CrG%&Oi6I0o)0{m2LYG#S(U!;RBU(|MY3
za!gCQ@{I5{!iuIp!BmNkya5yL(8p4%^*W;}qc^r_g^vl1NJsDdSYH%Cl_rbM+&<q~
zk241e9t}qW<H^i#m61t9@9x~)65Ouw?0N8UYS|#a`3wzND=ujI&i-3E#+<lk`0bGG
zX0MCyt8yYE^Y>cTF-u;U#|uj`MKlm3T0hF3$jH06F!Qyx@OuCHoFg4By+_yZ{l$3l
zGPDmlv`Tn*_ji4RAk+K}0ulE#4V7hHN0cgVAY6(F^p`09<BP`jrN4ooq--K2!u~_q
zPWOat1yl4xof12dB*S&Tf><I01hwKCelTDh;53X4lKa7a%?s04hx8CmzNFc$(QN!)
zv$)ID`7wBt-dkW$1D5gc8xkKT)38<eS(qB`om+MiiRVLqH?yOsfQA>i=ANYEj{W#i
zVL>|R_3f=j(@nXQ3}UCNVTAe>AN*p5h%3`%tcDoaZKj0YvlF<2Zt7slUWphi;C8xp
zcLC46Go%3lyHxq-$6`4tg5d=VlDKs(Hh^twPP<{Qcx`z|UK%OYD3~sRkA>%Pu7I6c
zQG={-9(-T&{P$PVC0E!Lcsxzd8|^G?bmSk0rf`|mUzgdrDDy*_mZq%>VRswNEszaO
z#OC^jQKTc%7{6THxZ|;%R_Y2qcMNyWa#c-P&BPGGzA}CnSljgx@zkBRNcsv5;~JXV
z4|ot_%J-F8Rwl~Qb{8MkB~1T}JcW!?CD`PkU05>i)2*;Tkoh@dl`PB85%0?B1H5(r
zbSu$iV+21Fy6FnU<Sa+YAe!}>cMnC_flzN@Tz67-cU{<P1T5gAPq>6^LR`^=V7t{S
z%#*E27{Dym>uGn)b-lXziePKj)##M|ep3bN+EQn3<VlF}<Qu1shOMi2sLe&1@cF(C
z-q!o;#fA8tn9ai90q$KXTL<eZbTbL1v7{^z%!FbJIri^F7zsC*#<aB5_`ex*slJ<h
zO&&`RG45*>4$u)&4hnwdZf;J%n}WA{CS8%M1r)SXGd!dxd8FMHI(>5s5(k0^43idG
z2Af;9Ua2-Ipt(-R+#;v1LfRxR^u8=e39aHpvAT=bL)>pFcf^titMa>u;*ac!_((LN
z(at3BU@CS|uy`%FVCG8)$W0xjV?<1o{oNGdtRc0*GHvgaqH@l|?*?Cl4lo}bID9t4
z3V!|B+y6{jWDrMT;f<z9g5malFS~g`8)40R_IJI6IHBJX7^H}H9#jEAak&t6{i0%;
zK~kjmL)jwR&FkW1$4?sF)gGHAKM|#gL?qH)HDfWFLF}xW1%Fva&CMF%8elyld0~yf
zjI^8<Ar?%&3>ELkePK2};m8`+>8<&mah<SQ1yUpPxId4SiVnD2&+(>8v$Gl$34GjM
zYrw0JaCig}<5L|Hg7<EKJsd%F1IukeiN4mYtQr;%*QU!((pb;UCYEJZ6gMTq9#fFd
zZ~l4IipGdka+HK*yfc#)WA`cO_T|r$--Ua-Es$BnZttkM|9lBSpZ(2x>S;+@6V#13
zQ<H_;lYC2e!><>pUFT`&d@KabZ+?6jTeBVIDQk>{leVkh)gke_KJ`1!P5Aje*QKVQ
zoW_oXCXy_w47hFq#Ifp8DcVOD)GV0MH=8w{zcq=Cy|7ry%|`=OkhL*?+%iF=QkUGv
zh-g~BJaJXtcg)0fX()^iugALWxAG$~XAYO22=<|wy9p~(C4?U#?=O<eS2w=En_l$_
zFL+dnLw@Fkh6xQSYPe7E7n;e+_dkh!t=;RdZ3^VYXW%;C;?`BZq~Ou(7C@>$F6*Y0
zj0K8Ny;}GxcXQboul4~&!`89Ga=g<+aH|eEhe6U}muR~&e;#UP97H^g(jmAZ%>-8$
zuKO;rwh_`z0>^iWHpWwE+L9@s$@DvXAeq-0DCO$@qm@u`I#39QAEpuE(V-$;oh^|s
zr-fK{WpqB)lfLnZirR?HEV$0R3!YB@+~TE#M$M)@FztgS#&%6v;9dhIp{G;CDU@U8
zYC;4WBqcX`B70!hgJUlJQGHfPLk{hb$qp`ycT~SPvHAF6sHLcF-%Emg4?+s%4EG;n
zc^d#EahE%9`gEVY#%jhNg);fyyVIWx+muniG;EU~8uPZY=RK~sE~PR>m6IJ{!fmgW
z5L2=_Qm5kB+p*51HD_)(R;`TGvXskLb#8m#AGe-6%&-qOcVVW<`}-N9`#;u<FQu+T
zAm04(N_H?H2xNxQLk&xzm6uC@i!ibzhU^gx-2<h^dqe{EHG_Wt?y%4|;$^Gru_E3%
zRNI9t*)N{&KaJE*_GV0LrK20-hwz2oJbyk-Fj|rUjSF{rO|U1%|5olbKwNdDj>NF$
zFAaDW$l=4c@nsIPg9n%r6^a=au)jk*F+<nyjuC#(zKr|ET|7ZgDH)s*IrH%c!6))0
z)Ig@Pktr}I&;MAJoP1})ywLho8&cXlm~|~%kkyH;4j@z|G;gZOPO=G$9ZMFeve}xl
z!wBp@Ym;=aza=_DvFJriSy<Z=mrRFO5Dq372)x8A?l=A1ckG5@Q4v{g9b}q*<=Dj*
z6WBO{--5+;CZk@UF#))yG5uf-IRAI7wm0SZ>NUfHKWEa>^*lKEAgOg57}K>s5AV^D
zs3c>aW@n4Z^bx8zw?<#uy8GE%C!1=+{ey`v5C<f)_{W$|?ciZcQPK3W$LMK%*B66|
zN8}IP{g)1EKE@y`*VgBd>$jleyRRLTBo|<!=Ngh@;pT*dEf;&9uKF&RRL3M19%n{9
zU5cOB8cGiVc1}hj)mG<Qn<;NAldxV!L3Eq{+1tYPVsf`XL(mjKT}T)CM?g+#Etz~3
zOL7m4fln3hZT*nkpZMKS+RHC&52A@Nm5<q)rx)-VE3Ud0lG^#QlJ74GQToJoAI#mk
zbk{aT_3AvPB1<cF@Ax8@VGzcwNV3UGT%#Uyb8T>!&<BqjdAr`V))jAoxd|-Y@x8OA
zn-gIPAvCT=#`}8L`@ZsU@=2N$->GzmIe--{xLFkxhA5w~iw+^0n02QN;j%G&BK1Rj
z2GcGR*G6rABQ0oHA!s}oe<w13V_<~bQ6L<<l)0gD-wemQZNF@Gv${*<-vba5hZ{}k
zD8X=eP9er^`Hr}%lCq+*qN<9TikzC7qM{0@s;DZcC@CtdDJy}xn!JXxlAOAdrm}*P
zq7r~B9RgKBMuUd<y5vFMfim+6cFq09?*jS$;u-5$gx5=fj0U0%wh{r8Hu72?oAd`X
zt6gF0Ws7mdakBg0dhOTgRp2b-u)m$nzlEqIKMSPP5)%&3m)J<7Hg~mv={_hz@v?aM
zXRPbP=rmEKE+Mw}inB+lTn~W3;+UM8WSY_6ET743eMP<C%qo(}xUyQJg}DL^Z+eZi
z8@0LK{=uMxZ1Y8Zb2AY&q=U_GZEe<<ZWj)``qnA8W^`Q><Z#lyd_U#5+0QOP?mji7
zbtljT706IMvbg!vf`$5I>x5xNSk_@!iJW}<ZT9`Qo?UTOjq3#a5bFA%bOE1TvqF#s
z3PrrT@x=(2o;}1QUem;;J;R_x>e6}RMY~qbu@@`?9Y3}-(JmRqe*Z*iA#g4hGbj^3
zNj~<F>Oh_G>_u$RO4m$UB*V2y9zY(k@;r@zkooAr@|$V}mFjJ2YO?A=3E!?(g#r;E
zb1%m>{Xtw5?`^`Oq7qy%&8B{9LG0JjM3=-Wl>hKKL6@Bu6X3*0=!;=C=RW&aH5DrM
z?+v_e2ygW6g(j^o(p&=yx7je_xy)u^ukAJ!zp!b7X0u4wmy{O$7&&X_oBeyV-_tUd
z1p`0Kv;?McO*_3h`E65T@#@GAbCS5X`8hqdrp6fklT*?l!kcJ)&&zP28ht`zXjs#i
zC~;nWd$wm^?fqPWg)`||U1IIbb9=GaKw#w(pS%C8zKrz0U741|np~69{w1Q-+ey0W
z0>WmQ97;VACDNB90UP}MOXm{v!`9h_S!Z_vH3R?ZHJrne(u_nESd8@j+Dp?F#xJ!<
z8-}IEFKV|>nQQSQ6;H}I=nT;Ow%NWIlHNsPsyJap-TS+{^s7=zxo~RwO*3YfQzq<^
zUd2J<Ym2jKgz@CYI+8gC>?gjWBNwuis!4Zx90$KjW7pNK$_VxS?5fCDpRDUoL#Y@^
z&&;vhy@$LtC3TL7nw-z__wx|%)md@x*2O;5%Wrr5q2Rp%!iqM<(kbP{<Egkx+f7tL
zacmJ*)jVtW-5F?gI_J)6_Xhz+8p&6sq!BdC&vV+-A|#M7K4Tr*mWWCj8`G|znVhVr
zgN{Kvf7Wi5yW~BHD9pbf@H*CQs#oJ}_7B7BOF5UnT0&D)!IR`ahg_{-lft)T(mOpp
z8i$Zu(^lQvE~G4764;Xbk+$l`wbHqpX*_bzD*VG)fn{i_D~;&R)r*iRXxb;NF6^$`
zja7-0t)9>m$@C@I)%bXZ=CTK5tfLKv*6GouoPC1+4KQ4#0-(&wt9Sm6lPjmbDBzlM
zeYvgbliLzbrhY7Wm9hQh!l;6v=%XTBc-yvE;+F5rO9M8(RnqL!+mh$(7JRz!f*m0n
z-pk8f3AU}{`6JFi7H`xjFqgkI?EPd@6!3Z}+Vwz3e4_ReoBBQIIPvwwV?q~PUUsHQ
zz^^g0q_3BDwYVuD&K&-^8rjrfE`T%*$2V$E0t6pENAm=m?k>Kub~G#RCWgt5(7v`6
zcYIh!(!B{CKl^6lDn>X&z!Z**m1bAZ>vDB!BXrP()RC}K);rlSv&Nl_UEm{=QZu~8
z#CLXroM_pKLu&%W0%Tqo5Gs>?*1P5&2Xa`zc#pTw;+V*Kh-YZQL0Y27Sd>U$kUM-K
zwLEScJwmt$@QD&~FGPedm`F;MSo^`Ta)#A`ndFZ#Gta-<fwWKL^cGpg!t3=jlKz)Y
z)P7MXc{0O(dlP=r<_qR)v=EmC1=oHSbcMgeH|mf<p$V%G<+Qr};wVO_PMLXR2$sAl
zY?^N=8(X)t2DXq;Xxn>JTI=;FR$6TJW!I#uMJfAA1M!z_9l<v-0~R#BUToo-*N6v;
z;?1w2mHc3Z5jNT4%B#(5jky@M@X(L_^~E#v&^)W9+QTg!5=}R5|Kjce8|rGH=dH%Y
z@3+jP`2wVaCC$vtCQRWLlO87_XnkQ{{LPKI?a`Q|@ZQpc_}1;sqP$BSb*1!zRVSh0
zGkR*z{g*5<o4wJ$x;*KCW0jnS)dWhf7q1Q2X!0%YZ26A>Ulw%UmbgH*TjP~@^$(|F
z|42?y%@$YJskYp`2o@-w>`i*8;{k){<7B5`TG;3H$uLVaJLcB!-OI2&FJWKy^%c{U
zw%`=N^U3cfilvPLXe4<mUjOkK2Zpq|@Cc!p+CJ&J7=>fQR8l7NxbN&--}8O(xL$wR
zDIZrXvLcqR(P-1h8eR5fPJQoZ9NGvhsMJ~2!)>x+sB7Q8hx>E&QXuYZ>Fi^2I!DwG
zvZ4zZN3G$&hPGYHu@vAnhEXV7{`5ipYSubVvg2iu{q_V(WB`QO99iA2X*f8c+-ufb
zJZxLk3#Heq|68@RF5x;0^oZ(IUwC(U1Nm&rC`)FDh=8;g5&wly+(SKag>{mafO-VD
zRIQU_5Xenm-?ou8C^vH}1NBVObyn*gdUjT*aDO(?&+IOpDXuk%3&)0->z{Y-Axoaw
z<&Q)(reJaPM4zI1AE)^tv;a2*y&mew`m;-FB|YXJnitL~dVzYjb@p4~@mO#1aoK4?
zaa#2Vku07{E%EDk-?nRHc`@>LBReN;ANBUy(jvjLU^2y}tj0{b8gbt+*fJT!LjB&9
zdcWf=>Qfw87IP(qqO0!5ayd{)L~Yb@Ku#CDh0DsM+XQOhJ!GSe!d*k_CNLA&&JW+o
zYODtJQ#uXsHIJh%c3ed~c7)E9mifHALm;B3Vivl)VueGd)g>}XMjDgfJ8{b4!<u<F
zjH2QXIxRRjHb6S?V!c2HYsX|%Psd6|@5ik~PFMx_a2@K$rG?Lbu`$i_TDcRq`!(P!
z&$U<blH%L=v(P<E1K;LtPTx`L<otb>ChXbtwF%59+)VOjUv(4D{N^a;_xtK?VSrMc
zZFc(vfBf`bs_^-{+ZLG9y%ApcgP{;%DNQK)v>H<%8|I^(qU?|^EX{(beZe=C6~=<z
z&s9yp{=g90Qmk;vN_<8wV4L<U(yg$#^z-Dkfv0JKsGY>b8as*bi<TE{^iM)g=L+ck
z(wh$YQful@p48g8@gZu`m7To|HZo6_^Eu@TI1%(b-6AiI34tq+FA!&AaVXF*eyKsX
z@-x#{w7c_lMpI;$-7SlEg;*w`%}&<#4spM6>WfQ#*a*bEOH96k{0{~nZ4M27ck|7+
zW)JF}d;t(k(AkGo1(X)+aODwH5Sh8vj^r0-QmcmNpo6JSgT9PjVJ3N5m%*=4N~xzl
zs}<eEG$uuNDy64(?FAJ?2HjkasAxAf6bn~Kzww;vVdF17*qv2H3M%Om#H`+k%lh;H
zEfX#4jblMnT|K*fy$|5B&9_j<H5Z&gL{P!lARdV>!RjYe%_KO$(?%1${*;<o0+!VX
z2Qo-Z+o!>HOxd`lqb6L2p9bAl9{x!SJvu>%njSKm*9_H{<fw0QV}O6Fh*<SEtHkdY
zCkXVR&WZGvm&I(c1IBY1rnpqOwGF(?iqUdwK9&78A^WWFecD#%QZmSN;-#&P1vW&7
zdT@20BJp+;Y|87-Bh5&HMU~gmqI-pokNJvu3JEAXv)_s8kq0^N<LIR-1fr)E>iBDf
z+GdYIk`t<&a~m3INqpZmFp=5P%S*ULck_kHev6yyrV})2AY0{>F<H$B+_6{P-hq49
zA}Xcg^Tfe*4W3fh?AF5D;TJQI`B$gVAtL1W2qk8x`(}&~SsWt7m^s8|hLQmq8IPPc
zb>Gl_i!R1WRUNDzU&A~30N*9k@mq?j#%KGZ201U?``+U4VqXLA{SPoPh<C!LXt3OM
z`SgjXMVq~Sq;He=x<ERKYi(fEe`mH{sh-$e__n~MM=gs^1|$S6Ov*3@QR&7s1-6&@
zvJfwxlNO~*dnG=9>3IrA5?mmm>5_@~&89K-{im<iwl@@}+>;A4#-)R;LgqS9U4iW;
z&JxZm543<x+x6~YReRUJbcVbQKIvL$8Pd{DAf=D!DUYKUFM?%tCfjb;(lV;MT#O|J
zk41=(;!0+CNn8DE+<`xa=G}|yoR>ach(@8o7s}A<*(oy;Js~ndi<}E5M$2FIy?lyz
zEdf1RD`8vRSYPRS@H!)?4b>HN&{ZE5S<3zr{g{nUI)i^Vogc}99U%5dp|ht!fLC!c
z*faC%snc(rG;Fn8m$Vjtd-f@~LqZci(-S^)iWQmuTPA^|Yq@n9gq^Quv&&-0&Y0=d
zi)q`IY}Z^y5#aC;hi1Fm)!2Y9?{5$(dJaf0+Na7J$ga}%f-^gk3nj4rl6qph{>G~v
zG3^kYSe8_u?Xg8`EY2Y|AZCcEvA3l%9t*Y=5S`f&y^oI)Y>^`}cOs-rLYyDoxb^n5
zmJW?Dv@`CbH^%|P$TZLArLz;S2H=@&kW*9Z(oU`}M!mrwO%T!ov`Cdd!7#8dkm-#%
zWoo<B5n=QJ6PKIZ$WYHK)*^EUy2-L+Ua!&;*h)dol(sCeOO%Z@otY*OmWnU=#+Hux
zr@HK5w<Ggcs=a}w|B7~qKY!Y0K=u2i#H*h->0B1<znhda_;orNiyhLYn~SIi64u#>
zA=4097N)JQ!MNY}-&XKKC1(Mt0)KBuM~o{tJLY%C&YH8~t~m1t$2^hgfGXHK<<*zv
zF!uBeFOdAin3KY1efLhE0O`T+eyb`1h{hE@OsppICtG?FTr=d0J!xbnayU)ETpxtI
zzsgy@Uy+FO3#PTh$Gsu3@&rE%AXbTzNly4!Fe7N6%X^Rw5x;WAO1=Mvc6IsD3A;<-
zg7$V;+g&d-;5jLu-vBZ)zQMh6cNotvnCR)M%eSd<N|znna?-eZ3F2Ka_l&IF<*HNN
zVj0@A^n#&&FOA{D=$w5?uh+DHW=Naui+gPOkRFNv+N|3=oBl-I*nHZndcz*Wwyem2
zYT&hTG0}B`pnDTOy<Txx^M(^0nnUnbi<uBq4+`^SGS((AR%%w}ZVSPMEnk=&hPMDa
zV0x*j53LU`S_`S#wRfP;o|A{^HRsoz8)JZYH_fY2-4<;3n_+pIV{Z}SL4^L5y&b;T
zrXs%;2Lq8_qG;*up1w#I@Vf#T%*NQROd&_Uyy*wn;Nz{-Co!Zb_{xh6NOIPP{mT#b
z#y4dgB_zc{WMas#{AufII(3u-G6?QDCL$1}_H!BU+&;PT>NEu15*AKOaA>*n7-gDV
zqt?6uxBO(Nqs}8g^AM6;D?y}n@GmO0pK~hN|6)1+ZC2>Z&`d9CwGvY_?PO54(~w%S
z;0eN&(8MnuV`4LDzEfg`gWh|a2l(z{wE+X2^2=0|$EQnF=80)I1+C_1I)sHjSN@L{
zed4t5)}*R@g9|ItB&=-~im8NlY!bm98RC~pS?j9}DeM;)s#3(lvftOHjG<`HFN8qX
zHqGI2YyLCr4JV>vko&VRuRV!&3709q<n?qf5+Uo(?1&o)(MznbTbYg_BmtIPW^bkO
zoG@t+sp1|RveVaF@lDjDbvz0EbMnCuOb4#RlMld3K{wRZlEpzr0vvEqQUZAgaL7Sf
zK~X_j>7I(RhCE10+*4FnQBYDkOhhOtD=R9gfSiPiiXvzSs`8T4KD?^WW9ep|_GuD+
zq>|8lQqmnyCVRH&P(7TQ<JLnVzOGWqj!`3F>_8@eUEIpN`y#R6_H?hyeXoe38<)nb
zlbQus<`1`L(#Y>VCBd)#WrrTqx_Q3~CIsz%sW8LNCAm0Z_H$ElcL3XT1vM;xl6#D>
zl-F%-F|)7i-H5fax(l6r9~|kj8;B@h@e4dn#=B&W_?lX}#}}(&9<tR!-1CfYAcTpy
zBBuE?(LsT}fz|m3{x0oPLG`=Jz@}*t?(irYeJ*ZP3Eb1F{LsULbUVJFvodD`v0%(S
z-!27?!jz_@U6F}n*m}2X{0*P;s)DVEU*a8ICr@J*N8Gjwg?-wASu+&pzwR!qXSkJp
zK`ebr>BG%r6N6ZP*AwTUYqKS=++mA-M-J=ey9djz#LY|IgLEVgDa#620OrB+<Z|M+
zOmt9vqX_sG^Jn_gU3jm)iSB6irizb3!1>bK@h<c?3ZFnHA(n{}WDx<~K)k2A=2zdO
zEz%NkHQ3S?#+c?SM2D<(6;pJso0g{qd%}++bJCv5Pqm+vh*#H-vDPCjb&N2*T(qNS
zQ|?7VLJQ`N-1gJk=PjBgwnP?Seq)&FSPbGE-nDLJYymck{W5r6II*|^xcb7I)fcNW
zJA(7}hHo(WU9`^Zb+NpRe{!Xok`khsEkTyod+yLRJ?+8GATYQV*9QJIm=gg_%Z|t4
zHS6s!MOD0d`v9naMfU-ZhBu#X=#RY0z@=UX8NDBj^6|XYDC09AYA6wVPH5=6V%?lM
z)I@{NC18Fx9r%@tg^UM!THF;Nc)13nW8+1Xs<uh1#z5_gB+tD+UjNPYvhPii32Jf9
zPpby;vsaG;>zIyxQ+|?qD~|Z*mIt4y^oR(*X7$3ZTM8SkeZBLr2*b1G6c8<hn>cjH
z|9FQrQf+VLkSgTWs`@_PLErYd)#T!_dut`IANl@GY{aL{nuLJ1NyMmsc@W+(H325(
z(^dV&{3j7JGcdKXw=f9=I$HG^%<%17_<QmlN_V>kvSegBq?Bsoe8?%WrR^1SI!31^
zq8J>$GBBrUiWr&bV<URx<*PJW_l%_fgayiT#_;vp0pa;|Pl+KUJG|fv?Kvx^to@b#
zg<`|?3%3qMhkte3zgP2&(dR$&k%R?odf$F>VsJT(br0+Fb8R`nWzxcBSubDD5q1fv
zb7x)Dtis9I%8ZckcT8`#cx>ozM+BZgmqN!Ue7v>O1E-izF^PbLYahJTv&r|PQY!;>
zTJPxUdNs&4ajg|hsuKlpJp;8JwbfP6rAcdqX5E;a?O&H~Oond-;!7zK-Co|qltio2
zXRMr0cq*#|Ti$nT%=XPe28RTR@8Ih4&rgoWOy_t;mcrfxYfZ4s@Xiun?!JGoWy()#
zUH`0`)Ts;;Q>^C3S%`6|^VMxF^tCG|dWQB~18_SU_Ast0Qia6bMjvanjavMdZ?fg-
zYo#GQz)b1B(&L_ok4AL^i+gPIn^$*j{=WCVEOc+Sv$(Uowp7B9H)-+Ub9EwYta^QA
z-F~MbJCL~5fxapp@Kb+#L>Xu~7gymi24c_2lH<+sY#f29q6RkKeW>hdYhFX@6E7E!
zl_t_NrV5TEYFxFuDt|sIw-YgS4$;uKDZI{Jb(gOm#R`&#GF#}cj#YXeCoMDQmQeHx
zAUD~UY!NpT81(zN5TT@T5>}jV#8sn%X$f*$b?RFr$0OjTkMJV9n`&O=krg6?u06i`
zVAuVVL&R4<<~vAw+QAhTho?FshWw)7FnRvFCm{9Bphn{$wlZ0#6B=>&)x85cvypU*
z(V^eduEg(mtLxztrF}!qS6b+pfvu-xA7Ssh%wnJMEa*Z=CCeUM(b<-`@#&@##5i5z
zA}ka9{>jt!oO&I}{VUbjBEi`o4XD~EA;)Ovl^bmjEu(!qYJoZk4UUvc^!~=SrZ4Wl
z?>WENgB5!*W>TmKc}*Ogn&?$?qB#+EDcH;#?uJZ1#}q5jD5cp!ULRN!ur{v*4_8F)
zYXHGx_9)!n9L%~)YppC*-5|33qU9#it$rHj@Nw4`3MY#iyZA7Dj=`4a@i_M5ii8eo
z!FL+<Z7%UrJ?j@C@is0t5eaziBS$b$hu!XLapjJ8dKO$TT8U9VF8qlx`h<xazK>bR
zSk|ah2<3I7u1}+)Pl%<E&qub-Ez}dRfdP#cSRbhY%*4Q$FK`nNlL8-2Kg+6-^WH{#
zxAyM1iXqqyoVGGJaF$%i{B?A@r2Y^+uwG8-?SYG@w5UDiR#rd5O)fZKjc%HMD7o6z
z;$H7^jdvxbDpwN@Ht(TxZQh!<B(0Q^8L&@o^o1}uO?<AOx&fj?YNk0Iwv*J!gNc&E
z7C-M)kHr?Rd%S4;4y#`y`48t(pm_5QUL2ld+_i{2-+24n?xo#sgHu0ld5)-8^&5?j
zxHH^>bWe1prK9n+#AgXh7(vO4sOKsB4+H%RH<lPI%&XQLMiwW<au4I?IM-inoUBTe
zOSSJV8>+eGw+X(BZsAia?qt162B~AH7c<QWNft|#td$ru58_@Vf48fd;$}_fke=_z
zgm<<sPZnVdD*))j;gGe?r&$!#uddOsrr|9Z&BiHu+D>=>8tN<fEWYH!mwuWsMM@1X
z4ECML2!Zm(D=~{xlAA?u3e8;UnC`Ci%+$*jqkvu-?!;ek(e&UUO{F)^$|wlrhfExd
zTslwYG)sNH-lsG;>*01bf~hYi8h2}qf>zS!>jBC<(7~>>d~CS9usH(Yq%Z!{l+btQ
zbh)7k{8Wqdr|3!)nSWN1$5pgGBuV9~-mHm<Lm&4{eVVr;v4uBKA6oh_J>6575Azxi
z%2*HZNsLDtrZ<R}gUp)DV)JS2CyT0Sol&h6@>@Ap7c~izt_*yOIlgp|DQ@TLAHi50
zPjo$!<rijYaBF>^KZQUZo8Iv<z-2*Q)%7qfQYV;Vp0~%$<-+%;Ib8ez$03xo$zjNv
z-r>#=g{omcsB1niIjd?%SHJ81nUS|7nQVNr&S~<_`p@bMuvIf>J7>7~g{CGefLEFc
z^$FXF4!X@Q?7>VmRRUB+44zqn->se?i1yyencgXU6Yz??rksQugLnCp!W%VrN2}Ra
zR)a@5Cwb7TtV&WF`qfg?g&>da)??h+^eiM{v!#X&BalILTwniN7Ve~WC=^Z=?6~1J
zdO)`)L=bBH^<_)wi`rVVGn_O=XC%U|hAEjeYiJVl2Ri<%{Y=RX1c_a&__#&>(p<tP
zy?l1fF72j-=^NySqGQ+RYxe-rFSNQpKzORQyx$}pBEo0k()7MCkoc>V-9}VAc0nW&
za2zkKzhsp&LUfX5;wy-wA{12CEpCsBpHqK8MFWK|v@SjvHA-cs?qxo`@&Lgun6|i-
z9Ne+4w7Rt2rGK+Hu6jji0*o>hkulx+DOJQ^ufXvt?z)pszFU!X$W9-AXqbiZxamT}
z#83;iN$Yb>0nw)kIlUdEk2FtYcby4BZ6&WY(c?Z>gy$9l|4UujG4?!Zt$#|Tx@S8s
z-}h9C^X6?czMnb?w2;?{sKiWf)=h>9X*<AjLv|!Q9w9kB@@n<<_dKE}XDt$(C=6W+
zbe7OiY?w#gub$Q%Q_I~{+fHj<PlD>Y3!B6ng=t-o{CcLCAd{!F#v2hOq+l2+!#};e
zZX1<5eqhY$jKkLx#+m9QO4dVEfdJh%m$al1W}U|Q6^dWjQ(1Y0sU1!T48+(Km7F^U
z5^Ii6%kDRkZwkLcj(PsDIW2L{JaB8yqz5lgyk)mwU)$?_?}r{h>#4k%g_DtuK*iuN
z8k^Z5uI!`ni{@MLlb+#60_0HiCUvjOk`kfoxASJH?{2RVYjt%!K34>{)?u|o(H7!9
zP(11LbGPw1a1g;w==R*olr+*=>q6z#`51O)YpXM1BL2Y`GKht$i?!BxUyX=!8*6O(
zBg)zG{eot)@0SD1=?8ycO`@^8tIn=G13;J!+1FjK@DyCGhPzZZAn{mU1zYvsTx6Qu
zPZ`L<30_KW%Z`Ni?%4eXf=v)>WZPuv7?y%b#22<PXxp`2H{l;5213Bm@9v&u9_Y01
zlPce0a#v<Q+E>5W)pvT9%6!*>5|YFP@txl_>qbQPH;=Jo&gbSJeCPUl*I;nN80I$d
zDr-O%e27Z7bd$&3{#7T1)_2tknkR)dZhp^sy&Lv{9bRuh825_Yrwzg!6x#Vrt8hJ5
z4>%vqpB7o(Sj&oR>NBq|bT5~7{FbMdGT94kI^@{tPFE#<C&nN~kU*=r&fPPbQ4670
zpHWJIc!SK_(`tctQRSTR4g4Y`j7fHx^0r<nXO|j$?#ovyeGRA-4MF&{6lH?OqZvP^
zWs~UR7Dc-eZHtjDXp4NDzrWwJp`X&_XW|JJ!cX2ilBlw64nq16W)Agk^{i2WB4}z6
z$I=p{8r*ewaphBBJ)loRq2`0O6ef?mA`zE{o#NzZM*}AnwWBSN$B#q21W8Y;Vl?5B
z=-xpxxhdS2c_59A4e2z{SbryW0;Vbibc(X=>aa7XZJ^VD{tNhy3Z7rc_Ns6pWqI`k
z3v5hp${98Z$C8_38q}^VKOi0Bb4ei&nn;hjo=a=Gmhh%>YioOd!qu4{AoexH_)EwE
zO^yi;ncZo6AbfRf(zWzMw5&dBUCW9DY9!Sc>3&Qd*Pq^XC4IBHMM;=<y)*&cbKi`&
zPx@nEM_rR9yHfCh$FMQ5$s3D`_xyduhmBUoD1Ex8U$iKiIp8^T6rT%Ty0I5VRzX(T
z7+lXp<bfLJ_N4?Gb}S?13KAnPHRdgRF=+};3rKz(_Y~Wk!wanYdhI3sf^QN(Hs=Qd
z{T)iGk5vx$+`fZ`j1|bCM`TN4o4S1j1BW^B9y0S-a7c7A8|AD+*cC!VZB&Xxp>2TI
z+YgyH{-PLmx54#yoO8bu*N_uhlbg1=D5^{%S}E|gBVz9y@6yYd)&<jTrHev-CKhR=
zb&b@#-?Nk341EM7+{p4l{&veC;Vt3ZjbcEjtiC!=v4yYg_*YVh&v{O4T%tWY%8|Z&
z4EiEul1mkf_8;;4FWf4HDgG?^5B_N&`bk>6FInOJJ>#DNRwK`+@)8}pOy_SiAVd6O
zb<4&qO)Pz^B@;1LkGGv*=MS<)jnRb@4&v;b*$7d^V-wgo_>PxbUAh@NT-+7Kqq-0T
zt0ZBkTSnbUzl-6DKm?NB>JC*ev;TIsE}EtjG?N=5nH4t`$>5Gbrew06*UQF`{R57)
zw-ChsLHG5Es)k03TDLVXXQ#$^z^YZOHXm`M`?PV?%hS)Qickea+lgPsSEra#)+;a3
z-t}Bc@s&7sZMxH$YF=zPas1b6-2;3}qOEmF*`4N2<<24M8<G+}H$GFj(yrP8;uJnF
z75md*7P;%!`Ouia=9%ET(pix2%J@$nBGenGAh-_m5WsLkVrxUn5+J1@ud1vp3sMYn
zO81oIRFoAJL0Uoq<Qfze6_r4O0^}wXmF~&iQ;@p{QWbJa;2edVk~&CFI8D5MSiZ%8
z&HClGkJ|_+uuoUo-HJ`yRV&{Q6rPZ0c#v|jN9`B~6pA{}6f_-yc#BW^Fjn@n$1_GY
z-JonlKP8tcB$3e#aVm#UF#!^u?pCVJ?+4M%)mN3O+-AMJ5%7_ncytJ9`L%Y%3xh&Z
z8TftW=NV2a2i^O4*Lhc(`5S8-%8PLsEHm1~i6<AJdxX~HJuQo%q01Hi^&vqAvo`ZF
zXicWHMa$~K`nm_A<MYnTJ2hKlA^`cFR}Qd&ll2JfpLU)gk7M)XMX<E5&G#;*Nn9eM
zS)$H6o}IqHNo(dhMw970z1#D1Xa5Dm#YECvkhxe9-!bUxvb#3fIqq8{b0-g$`i8ys
zdCrR7iVGQ^G!VS{y>=#6ccLL~dhZpi;l!(*b-!5&jJI^*L=Wc4?b0TKxD*^_C-`=9
zMG86&jdQAwE<TvEcY=q_dbl)8_T!IL*T_W(S{vhKDP+nokOiF}c=n5y5)*Z!nMi?i
zt}(v9zD*VuPDbX;S+e`Mt@lX@VoFQaKVPE+8Mbx!`z-dXO!n7)P21vjcSKUJs)prV
z8YDVULqa&M#EsgF?Na&@gxJ?7U4GwVc@$krHc9QCOtsFdzkiH31Ch9rfAd1J^{rVm
zm+<Q0(zZ3+(5x*@NZC-qOOgfgU>Cbgdwlw3ex`F%_mij32&3m`)W*ET&)0V)O1@gd
zJoI=M^WK#=42T!Re_FdwDh_)N9uX7l_hKuL<R5l3=JM|hIw)v@dUt+3`{2p^F-?r!
zd3B3NW0;<{9+9!JHG=riWYo1!kq#qWV1JYOCHWc>H&&mgy_(<2sZIXev~MNid~)bX
z#&^&?vMyT9zR}wIG}q4i?bx~8G-Ju@D($_5m%?XA5eMPoHr3m<F;!xKC|}+t8+RiH
zW6s~DyBCn%$9oWDpGJ50NlzEd#P=@9JXRF!K4`*ovSqC9Oa0#IpctBo(L|pg8fvTF
z5m<TC9z0Y;=LKBF!xy=zPl=?S?AuwLsQdjImy5Q%mE!VQwHcMjD4~OKA2y#!@trVF
zyD?VtNVN_pPEP&hrVhKAm)<{a1i8>+R4iA{`v80Kd@7E5%aRk`WA`(6J}2@1w%7ep
ziC<@+M-vCrO>N~f<J2A)%oEO_5^@1oM6hRBkbn8IhaHAOq+a+A%1)qnRS-~j&*zre
zcne?p{Xn(LQ#mt*tudD8t!lE%E(0BSX(F`&#}l4D9Y(H6*N?@)u<Q$cA|?AXH%%C#
zB}yh^BnRYueZfj*1?%#fsZcG<=L0kbOh3Q;=@m_5Uff3pK9mHFY#3@1o?WPSK(a>%
zMYGW6^QQ#255C+I&=hGxTtB6w(;o}YA2*Ps{Z81xC-BPrKjFekB>{2H-QtL+Tl;ER
z*TE+1_(W%^@YhOF#D*EE$wWNpUB{$PQ-b)^xr^AlwIL191oPIWMNHOag@IuYRUr91
zj!^zO&EnKZ+?#mb_R&<2g+g+Ix^9iT7b7Dp4gWS0doYW(I6vkpz_#mxz?Tv8cDH(0
zD$*^e5!-uj!RLS)D!%yJ8oZ?WgEJ)@UY-(<cNN3n3JMvEv(UXYpS4(2Lx-j;7jr7%
zMC9DGD>J{OC>&ezmVAxfCpO^H`;UE-E@~iZZ*_c<hP?Sc;N~;WYeg?L<y+4^s6Td=
zwX3l59?MCViB8&Gd%k5l^ghX;Cz6x57#w{GU-j6gXj|v3H<Nhake-q(RALW!#6d?+
z`ob58@onFaK5I0E?j@EE<&><^RSQ5g6D6keD8vd*uDm+9lGH~hLTVIj^iE}CLmL&)
zVDifz;dXpF_1NK4XCNs4M~jBj3;7a;IN?VJ{H^y#iQE5+rLPWa@_paN4<$-ibcqNk
z(%lFsA*G~rH={ch6jUUnJ0wOUHDZKx=jbuI2OG7)fU$RefA4b~aPZf-@AJ9tE6(e@
z?tS*=R(Ob~Q2gW|C$L@qY#Q9v!G!<$qLG;_uUv=$u8jo+_AmEb#X?(yYdW0pq2WQf
zztJmfZnbnXHZB>hmEx2oF867jjb3yRukOb8qR1yYy|J;u?H$AI5Fc-h2tYim409;a
z<c}+*!Ij4~T4XQsNaIrrsL(V=kQUYKhDrUb%L>yE;yYeB&PSDTw2b(|yjqS|+#K6K
z<B9IX%azBQ!jJ81V_28H^20;heb&%t#V|Stsq-X!c@=VtQx|Fv=~JZpP2JN~oJd!=
zk5g&ng5mHXaiO|0KG^KceR>LQ(RqD%Gv$8J0zS8}$fZI+)0*tz=mHmIKKTUv$(GTd
z=PWln;Mj{~jSFeM*lTN^`1683_lFb#o(c^81-kym-Y0i>UAIB}wO#h`^u`a9g*e(z
z11B~$opm_vqR#m6PG+E>$v-&g^w68w?xZ)iH`t<Ln#D%WBsZ6|=r_fG_?{tbzaG9V
ze_A!ve!I8deLwmvkXwGi&;M;+`%PPI7@c5hxaj)nt{VQM=HA5i1&1K^v*e_hMkbTq
zBI6kW-LG0c0&XdZo-CRNs)8@1sN57*;%9NK0oP<X;xJc?((cjt=a1nMt8!pR6DfE9
z3-i1hJV2IXp4-=RKZB4<{B;n3*`dtq6$^E0c7o*vzno!R+&R@Umi6jNMFs=Of?K!)
zf!eDMXFn_s8j>yMotPj24ER8)?UT}3=NVf3?8?zkmvMdKTU8<N%|XYjKWYEqX$L4D
zozbqCJ6u=EhHa|2A>}$kEo(1AYtNi7!ky<PtRX1y+kbrv%Yk^&vSd+dTUAHy<f$t}
zt|o7%o?tjL8{SR4<KG45qG)~2QFf>tU{+a&!0f)2p>tb1_IwWQg@!F30QvDFANhq1
zjL}C^pEj>{zQup3eCPkg^Jl$OXwhcX!E3zrRf8Slk;~x_IamIcDQJ>R=LpDJ5-N+1
zMDgxpBROJPXL1tfrSL8ShveKgLJnNQuGP#w8t!!Ws4MJq(OT3sJL0R`h2b&LFL3s-
z$1aFyp5YrGT*4+YXH##f>txQ#Wpy_mEofCQw_NNt!G~wquS~vbdw*A6Tfajr-cY~t
zyC?thwaawxF&-Je)${={oYvi8;dTodeyoNgW!+JkfFqIoV`H$qRp;gK#_;)$mt6Qy
zNmh&zc!*jk`?W>q_U!#bBPPbHMPL8vPI7|hi}(0%7Q?qq{$kN~6Hyyq{l~A+sIja8
zA@DU+cBM0TRSOD9bF07o*I&D_e!0x`zA%*jDRp_uqb2$s3!$Etn^WIfaYb@iwRG&n
z3fy;-hKH~78asbGU46TQc0qgi9>cMadGU!f;n*VGY&<$^l0kyx$NDWv!XGmD7(TD9
zMciqTU&Htp(=pt|gFMV^cZ?iyzX}FBbgqO323@vVfDlM+yO5>TT8lmtPq|Laa#%n9
zeNPsCDL3~PsxpxJc50u+U!f(W-nN1KAdJ_xFAlF#Oibv8tRb*f;|^{-X%?(|`?T*g
z^CW@tVIj+{E$^^?Tkc%=zHG>5-t0RU)aCO8P}JC7?VXHe$1!u)ZN^<Pyw^%FWjTk*
zYsA!J1yT(<&Z6H*xvz94Ux}1lz))f=RX{;8HFG0M6Fk5Y?)xImx;s$`%x<&HHpRbH
z#z|X=iQ?Z85<JHfW}?3@jO5erd0~RK-ET8aH)h$ew*#BAUBE>HX#m8$$o2NNXJi0>
znDRHjS(AtlA7_nt2l#)d7fy5u6Z&(M;X;X*mfTY*K5jaQ)J7wjPIm`-vV&SOf?~|K
zYt0XC=L*k`H*Y=aSn<(6U>o}69_&L%T=<#$Gv|)os7S}d%FgAy(+Bug$}nGmR5b1n
z@0B?7N?_V-p@sC%dhx8nJU;J*Y_RmSUv_vKmG+W2enZ9@q6aQ3gJx;V{c|i)cKZdd
zR=FSGJ!c5*K4y{r()IeY#dT2o2H2svUG4<&*S87w@w_*Co4q6?yMYRS0-T$tGCC2S
zV%P4k@-Mg1q`BYDaXImog>(dZsA2iVT%4a=x*YV1C8J`c7KrITv6+~6Z7Qw*kh-yf
zU>cJS#`n4;`f7|IEaLtwPyp>=FiTv@)qG)}_H@vji2v}NkC67IzF?31{6%+hmfKh^
zzRobt3IAewp*q!#0bH;t%P=Ruw&@4FSCE$vKg>8g3=&{EW#cIS3Sg+DkMUyp7fX1y
z{BlpeMr;B|CN=y74?B(o6i_y0^8kaA=p1bbzUT2R-CS|}#<zLl+pk-~9)S@{R|1h5
zzfu0cPI}#zFc{bK#UGsDlk8n8v-!o_xV&3*^mZ;4Dc@=;6bkR2UGafq!<;kc2{8-!
z0_y#Wl<o6KuA;5;r%t!yu9%Q(tce;>5QW7P#hBrpAj)}JoJ~Pm&BWRLaQZ0BY4Iky
z_xvWWxUO>|K5Zh_ZFV`F9<MK-#9SZ|A`ec7#tQ$lr`0C)>{s|Lc4^>QD@}v%-S623
zBOGvV9J3Cy2u=CyQn_2laizHTxh2U!^-y8Fbr5s(%_&ETD6u((w`AoVN%B5oYaPKb
zQ$#xXh55Gb+qKDRZwvj0Plw{1{~)lIt9wT{m$O18=H*6*-dM5Ly#CWCWn8&E%F~|H
zcnN>Aun!r{O5C5*QK>>P?L=C{H@*QARq|(d36dAry5+uOL-M<@tl{qu=G~BH?Sa=`
zp=VcPj_87$OT@U8a$D$8z=a<^8?x557uyyC2)D%>eSa8<tQ8Ds(Tr!u@{T>Q#r{CM
zPc%%(vk&-Y68hXa9&`<`uA)6Q*_NW`uX}oKE}TL5YEp~as=TIq$?vOZ8En7}CintJ
zS7{)va5fo}Lq!F5@a{yexIf?S&E0!xvB@P`IAr1d=_P-BH@Dr~5jAWZtODo^a}DpK
zdHN}C|8AgNh0lNuWA5!QI>3eW!MKX9R5au|T(Sn;1G&ydPTN=i$F%;#a028m7_L+U
z?TBvb<U^kZTzPFCIE4=EdQbP!ws^Zlk9E$2e53Ia(=%i2W%WJAywHmD6~D8)mXG=;
zpoNiB`uH?DL|nTk#H$C08-a#<H;V6y&*M4FRhM5nk6BHZRN-&0j_n3C@%a3Wd8l(1
z`yTRiK~VTvguT0STL3+>(}=(pbK^3JXhnCvK3fROlxshnq%~iVL&}a-cfgVRGe0Z3
zQ=w$BxX&-~t~*35rVJEvnGw*D%<)CnKu?&wA!kd1D(-0n0ndI&{jLr6I6k@8v^a~9
zXNN1f3dYLQiS=0KYaBx?*}wYlztS3LhQr2rEY{iPYob^%uD){rL*E!*smiA|(fUBA
z>O9FhdbxYx|CsiDbS?9cCk{*qkmO&n_KHdnDI|o}&8O}#=EQCFA{FnqbNJN!P0}fN
z^bM@ozFHaI^YnhRHpC{Q2+pPQgM|ML>vZ3J1G{G!?<0>QH5sv;KMvw<kw+P!d@5FF
z+%C{wX8dZjva%Pe9C$awoTwW6^~esB+IFF7bhN%k<KUdw-<wdxEUu?RMj(TF?fPbI
z_bO?n&?yK%EE^uYZxO3fjGm0&u^fZzG@%HY@m5@V0igZy=a#G+bh?pOydC*?erx*a
zow}y%o~wW>8I~$ZDysieN4(C(uO9#WV<qq>nn0Ds56FS19Ms;t!Am2Q-@H*#R>F^J
zym_mN%f?yYY;le_2b?|56z8b7FO!yUrHSpvqCBNfbrxrXb8-dDnve*Y?e@BbYk_SW
z82-MVPYN|BeKe)_cxfWe3t_M;`PEr*79ypoh6%?}J|et^>Pu?=zTxdx=!UrkD7-^M
zOP0wC!7Kxrj?P}G4a+sfrH!qPu7}>oyKj-R=?=_dWDD{`yJu5h!$gJlmBc`r338c0
zV_inwBjftU!SM{{9;#5hDF#1P56i=@?L@cYLI!FqH0Mp7kkOp@IK8Z%RudK(DBbjz
ztIAMPp6rgZzCua`|Gc6A!PeoAG}C%aMklLW=MDiDxZ4wg^J#a(9flwAb6vMY;Fn9V
zwk~+se_!(ma1-tUhFlNzqbMW2sSQ0wmnOE`>CZNjahEUx+wGfrAb=UeHJe;rj|82s
zAbXclZ5eAuBDo7YEg(Wzr%!F&R#q|se-7@>1(U2ZSMy2EOSy#>>%05x9sMqiqbCsA
zzX$q@XuT3w+`NQ!EjIBV_1gwdHKrt3PZ%tU1H%tZDIBn8Xgnu#*fo3qS_PZemc1I_
zSs&0X>3#{QCa?hD`P%j2xV0*aP5wKM#}IPM<D#+Ct)rrvq{l2cGO->24uq=3lb^4*
z)`^^&c_y3_03}iK3@+Jg1{OAfxwM^L9s;|&OgCHiQi-4~bMjn@h!WO%+?jg@Eln0R
z_INMsSCTVszVlY&BP%9{kRNYAYcH8Pm9XD$K5BDcJTE`D=vTWPUJ*4$3_T<WIr0IX
z`W#_cCx6c(F~8)guF-AbP1cAIaCj>=QE;9rc&slct^{!J!D}LlPC!;@(B$eN?Juy4
z{IeHi?QgTjm&K4ZX_3TlPF@3Ezn{NNdzuZDeC<;_e>5ftov4&wh#JGHoEiYX<9+Ar
z!59JB&;Cz>Fs|kd@HqM5n+}iWqpXp?=#lO1t3-q#5jpH#++PIK8P`uvT<ZaRcjQUX
z<M_iBM|BD9Qxz|r0GFFEhZZyxBZ=qWfpd%zp;PQvtCun5qw)82-shE#d+^BLIbV?B
zy>!aK?oMu4SYV8?@!zuAq|K$^thuNB^EzW3tPlC|W7`Cd!4G(^3W;_fNf&>eXt|=6
znALbE&HMaQbx{xrfymL12_k6IUifDkd0Z=Yl`HsZN~dse_~!cl^=>?B9uPe?wHH(9
z8AyjO{~lD{&iAoKW2URj2gz()(sZ`pNHASuqlpQajwWZC?_OEoQjW~S2eifc0q#32
zWrus{0Z`lItemV?nshjGdoBKW$EIm}2-VV$m>f>r&lYv@XZ4x=swX(N?O-BFu(jZa
zi1gd7ZhGxR*9l&jFQgn3wTNBiLm&1oYdf~vjulcDsx6#-#eYnC=M$Fjk)yeHGkN8u
zOPzE7`8TN-r;Xq<?*vmSJtWHTE;UG=iN2#II&vS45YY8+I^A7<NB1)w98dGgUGDiw
zH~uVz2{zrnWZ@KRKd+fKKlhMRbnEP?GT8O?7b4Kx522l4h41lqbD4ze2Iy@w^~74N
z7+)+0gq!Xb6sdX2Q<1_UX85<0e(AjN90d%?RWmMsi~Ezp8K1zF+H9JhB9ul+z_VVu
z^7^v!O7lKz4gXKpumlzo+2Qv#^BHq5O@hE9g*mH1d2OTk{VcmSXKjoRoMsFk<PF{C
zb#FgDI+8flwQ2F&RmS5o3{aT3f`ki*w7~gCFOa4%=zc}(g}~B{P}A1o%5|#eMG6X^
zmVLr8mUp&q*0Djys0K+t1PHh`%a>4}S9Va~v-gJCTPGNbkQM6S8Qu<KbKABw#WnBi
z=XK->+yXB+d?)I+@!Pp9?J;7O`jIb()T(9-?3D3_nTu|o0)>zv_-asZyRCj;Q>rGM
zvR>@xKJWykUK8z7fIa69#vL0tP@$a6B>UR1t8X&!enkQd`=RhL)Wt<_DUW*A-z#H1
z54DvaSvy0RcSlNZWD<7gSgso=9B-_KtT;ZdUYU}qSsBNj16rkT8|3rkBsJMdNlirM
zDdl4E)ww95KXjd29t5sv_2CgsE011Jf=M^=Z(2F$?Sl<qb;s9NuHn8Pjd=13S6hnE
zi8M~AtC=fU-Hh<p+gp3SqVbhBQQgNF7=7^WX>1)-Y-}D-tD8rwI~;Z+;i~9zZg937
zLVc7QD7{Z224~ZzqC1DaWZ|Mxg3WEsVSU=g+vgs^4bGnXxtm2TTZ7Ds>69UwnKKhK
z{yAF=F}La$T6p9L7W8AV<r>b=r>_R756s#p)GgAo+ZNH-z_j{44(CVL5dw12$ppi=
z35gmhkD!<*@8m;A$oHvg>a-^^E8nD;Po1<fH3npM$h%bp)vbz#@oE(~5fkHNN>7MM
zt19>Vxq1G;k@vXwr+eM|giZJ62M2r}>}ZZ7Sw?D|oj>?Ib{5eKwb0&u*tgxDdFp-Q
z%N?%G4=-5TYVJvvd!J`>G%6VuT+?3cPoeqcZI$n{0piA?ZwhAY|A9%ZBY(em{Se<k
zASPJRt6!gcblK8NHTFUCOL)l+-4j(iSD^in{jPOgUzm)hJkVP;eENR9wrrve640b&
zB<+43b8AyIYuL3rbgiP<U<?$NJ*WOXpFJP;IC0CT&UEiCtINyk`4msXcf2LL?>>rn
z)(XZ)5H{G_%Ze{`r_Xx})qkHNB0S<9W6FMNw*EG6GF?naOf_;UYpm}N*>p^o%=^`B
z?X2`_SJ2m?(2J}p&mTgJksxu%(2SC`fadhW<`63z6?}Zg2b>m-Z(6!@(dxyWb?Z9K
zrW|gKorCp3k0-R+qDRVRz@RTXS!{KDyf3MBx-yOXe$w$C>CPT-hM6VT^Y6>tlJj|`
z4CEQCbR|4$_i_$0FYCHDYjdSk=tZ(?XP-0g!+OlQs)J&grJi$XxYH$R6LUw2#_sWb
z|BHxUp5Xgw0ytY4%M&B>Ss)ypj(c$p(p)NjOcnoOn(?PN#hp(CukXm|jX(`w9b+F!
z4e0VBe68tC`mau(p*$jOkCv%IV{;b$&w!%w!n3aJ-`dAqnT$&2B*L<jfr0Iqw-d*7
z40~(8GG(HMR0~5{0qY_SFtLm`&PTPDlqDP;ax}%$!l4*=w6H}RJ56_c^{)L?ZckRF
zLaQLf(|ZsZF1MWbb^c9>bO%4O>DU!ilAV@)W_n4S@@pO=s)hF>&mE$o&$iD8`(<ii
zk#5k7nXPyPk+;auHMt;PNZ_-7;1Xz<T(Eg#ghwL3Jji8OsxSI3J_0*SD`-9RZ3+yn
z#1_|0ZhA|b1Fc7A@y&tM#zdNvUuyK57+(x4DB|VFns;%ppLso^YdN!>a!9Z_&!Gdn
z<rMIOl|=F+O-iA*NtqmBY?t&*&Oo*+pG<o|KU*xsuTcc8r5vq|xVg-+HyUbw8OFdE
zgyswb{i;&FWv?tNUu%01Z<==(ORu+M{5gP_^A16-o^EB&Js<h}M)828#`yc)Wm&~P
zLV-qSjv9mp*Qti{AKgE4Z2$TaCUt*5@X(`*&!@_R$whPc$c?My%M2)wFIMV6rGb;Y
zm^6k{5Xb=B>H0JAos60(XHaz}!Doy*oqdx;J!Usn&WFUlB6;#@zg|7K(NBuWnC-6E
z)Nq^ZDh23c6Sr^^NEyVC^7p*m?<Shq-{B>IJV;osiLRlMhc%4@hMd-iekM872{^wr
z?0GI*e||H*cD#-cNq8SVYhtvteAdWJzNX*m)W~i$WjDSY1aT{OtLKKQRkrN?3_J#O
z_~85}Z*SCxeH+?3ldq?y;BIOQ<e!2Mjma*T?n%m=69;Eb?Mk6KOkLN!WxFJ$st2H6
zKw|QU3LIfMg!UZ;H4@5D&i7bD)41fl1?XC@^Uu2M;Nj|WB9`kaWHT<=KCNyIqAi8x
zZl8}BZZO{LY0i_PEF@xiVh&??5KwxbKu!;z7XEiGvo_kqi~#<5yme2Mb(BHfc=p)y
zt?o^tJgdzsZV_b<hK$@Y-82=H_1wB&+H3E;_^Z+et9B}qs-1G_iSOGTL6=1~xnG<F
zXo#$uWyD6d-%mHD`$YEbm>ym5E5YDn;CZhEH~Lh2Sw-vBhD?&xpI4spDtS-C-gG8h
z5|1)cJ`WP0;AS?Vb=mOD_-rS;;t!ve@j8=m{+XuU9xq4%DNNf!v}s>kJ^u&o9hR(f
z+8**6-cLt^!_=xGCEz;A>XmEC_!i3Y>53rErJV`3J2K2Vgtw7^hzTynhU2;>Q#w^2
z2~d^z-%QXqT<FY*2t#ypuzD8U<UR1Gm`FpL=&R&mTkqvf;Pq9jz(z=GPjTX0owyJX
zY4}+1uuN30yx1?;<vY|>RBOyKG}P`GT+q2+Vn5XPZJ7Voe&oYWhv?t86k4+%F&DO2
zliwe2s#ukuzF8oq$!KE6n}eL5?oiB~R&CQbpip&%Y^45Yq8yv@UZJ>^nM!dBnTaf9
zeU)BnjY+>t5*qa$M5K|_rVP}oH8>U&^>XvoVCbKSu`imfj1IgofG~!#CLLRXck)BR
zF;7;hvAU}cR~T~FzPk>q8tqqB!jc<5n~Q41r=Z8ngD1aqtDHpbhM0diiQun-rs{Em
zFoD)R#=!AcJ1+#y4-X+sgVxPLK`T=;Zc_B>BhC&YEkHo7yQw_BIZ8k<+P=IKgb81s
zwO10+{ck@(IVn3!IIek69QI{}s<QmjNkm|^=c~eb?09`u!L+{l3np0_I+eFP#|GBS
z_w|kooupbzbG6_nJ=B{VYQWY1SW5pqbr&8zC@Q#HdoMgI<zm=`HBO&qR%6!BW${6q
zfu@Kg?CAW6#~u(Dg*yNnpk(tti<{rR+P2uSd!y1kG+LN_5y1aP)y9o|ep+#%N3b(_
zjqOX$gy^L(ezjqGo6V4WhdCwV9`DbqHvv2S+5XmboR$#S+xPFS-F-CQP0Jt1&x&$l
zZ7qcb{+w?oby$~=Xx*RK@htISVjcMQ_Z1(sniK6b?bIzgJ;&O=<d+D4v+p<qK)q8I
z!Bj4NNvi?6J>t8drb06g4xNO}KJ|FS4f|o>9N0HK*JKQ&!t{QL>Z!KrOKmA+iRMiz
z-!?<XutkS0#!3x^#)`ziGcEVI^jZD<GC=Hr&8!n~wX5G$ydk!uH2<vnsm+jhCL>jA
zu$Iu>Vq>g^hFxq?X#{!&p<=fTCkgcxn@&cj_u5gcPS(u`N~5@>`^Q!3LP3It<;@(|
z7N7UpKP>AI%c+MVo`uV;on+Zq$yA%vbOukz%b$m3FcG`N)cz(ix=@2@(rEJL{$-5a
z|D#iAx0;t~>>MY=InC{i$=_+(^ZFcTxZOxG_Np_b;X~dNiJ$+`xqX=a2W=&UK=SeE
ziSj~DrOR(_Ni`nAk*H&CdnaYLw@rcrSBsCp`ALj!<YNVZ*eu$zCDsc!7w3V%(w*j6
zg7%x=v}Gn6q5|IcX6Wh=X_Cx-%E_w-s7K_=Jk|Tw36cAkF`fg^tJKSCE6DlKJrlKA
zmvGgid1F_Sef0KZMysX-iO?84Y3g~1$XuL=PEvs{J^3?ixf_#c!@zd${@0UMS0%BM
z`Ej_p7_hIv1%D-5*!=at+|K{J1%ZZ@lBWUnj?LQ2vjCbT!Czq?J82n$Rv$`X3g`I+
zSseSj<rk(lSDk8Qr<(_Q-r79#%BKKFE2XP&Z3@UDcUvbdz-@K+yJ}Xs&I<2jeJ)~A
z3m45Y$K01F8tJ&yY|$9I2-8sdb1yn$Nf47hQS*uwt|oT=iN}=W{f~L|7Qkqpj{bei
zx^gfN1_h&oE9V!uJ?$1GBcyY$6K!oIi!UnD`@9=T_K!39|4hpGKXdp$Cgq=Y)lZCn
zjt=LJbHZ8T2@@xr9nKp61Hk{~f^!bj(@l=KgVyjE*6cnEt&@r`HPSbn69G+e&z~f|
zi}B}Sn6PQDSlYKdpJvo-UZMo6%*IE|Up?~&fB{jzCSCVK8vvpA>vU#2!j@N=b15rk
zT{FidoV+&HH!A*;&*}1W)?`VmH0rPkqmn<2FkJ3V7&z&&B^ps-x}7P$_DD@2v$5-X
zg>XBHo{H2cc-YeLEQ80Yh&@G|<Y~6KxKA-ph|gtw&&dv?-z(YiCnArWicu3G=8P^i
z!BYnR2HIkmi#q&u+Hhwj7xdAkkG&!)xd^+&Dt^mX<xh`n*7$@kExiTV=ab~b@_7}f
z)piv2F~`1V)EAHs+*W8y&I4q@42+fkNOc%Qn}Pf<V{p|y2xDN}Kzq(43D(!RH#6y7
z9Ne%pwO*Lb7%A&8KO!9~GrxI*XdQ2UtcLxNWol=qSg`-(R#6^U>kS;eP^*2p_`_d+
zhJHD0fXP*&G_8xEfLMSc+boC$e^Zy9?okZKns^sl@1bAlFgtMkWq(HzKTj5R2JL)X
z24J6VbqfQ9B*v0wT={5RXd9W$z-t3Neuha?))TdoZIZ@hbsjv~T8QX>(8@ZEodz7v
z9524+jnSnn*d581uEsp2#W?_uiHez}_1kxqwP*t=Pv;(J*wEP*HHvD-om_uCi|@CO
z8@M@lS=9Rd7MN9~Os)*y^6DFBfw$7<hUG5Qsb#vGYFBRYLl8XA|K-x}w@5=X?GquE
z@(UQseTR(cEgHd#PDHF%>`{Z{b?w6X+0*ZN2SG)wwJuH#p@)nMJAoE=NMhM*E((rR
zlD4O{!(K$zxbGkVEbriECY*?X%~<o~&>7j2&-%1ClQow?q|Ub%;TbdHpoSB2BWB-y
z0@i97Uo91m6%~`@-!=Wd8905><q#UA3P8J})NIv#gyd>dPo}a>v@Wyo($2o#j%aoO
z^y2S>Zeq!XBQ`pLe^w!<pLF0xT&L~PCQE$LDz+~4WD?ZiCB@I%D3vK9q?x%{fz(7S
zg9Bm<c}Kkm500_azJ~JjA+^oUSWd4<u}k$i5hzD#u9bH~rwnnCbZwTzM%TB8DK;_V
z?gQM^F$OC<(QSq_W<xo_Cud?8?UFt;1;T6+3_R5@k<IPZtx=yD1~c+`O)f^3-W+{Q
z_LqiveN79g);!&;w$BN}Ygz~hoQV+AjdG%+W?2oPSw>NOvTgS|y{ep$M8i`nA5y=W
z4?Y75F^$k7=Gkqef<s9H6b5{VpN`bq=(w?-PzTSf23qta%(xjX@cxQls@TR>Wi5X`
z<Vrt#Mm0NW?P1!MoxCaCjyX<sWwBPfWa;>Ru<-fmoeH!BZx78y5ba|6s($^@z9t*C
za@a=oEJg{pbWHS1?fz1Z@a=isz6$0XG#TuXR7b}5=W8G?xt2%+vZYG*R27^xF8FWp
zEc%gaBKb(Nj-!C?Pt`8n)e=lCEQO7ro-zn%=v&A0?<bABQp#4$fRUFKn(hyw?66V0
zgFziZW24OeLJz_PX|0ZiSyJCO2?Eo4t{}f$Se})yvAawgQ=L{$U`1x1t>Oz0-8q&W
z8*k6h8Yo1YdOvqTM7<)jSgPU5#V6#0sg{dYvfD$53DNg`i3|_=FDCWu3Kc7E#lV5-
z`*IXMWveF$Gk@MD{d!TMRzvQKdcZ-Di=>*r+;Ir-`u+bZM306Kgq=MD3eradiMH`}
zn&O<Go#1aiWa?)}fCS+yq1$9I<%&$8_I#peM<@4R{H7IN+h~3yYAmL+bjeON+Di*u
zV34d@!n!*9y1)3_{c$#|X~j_YlB7%NBrh+%*Oz`Gy3&BIBl{5*ufh7>`NFe+Na%}+
zc<%#;aqhexfAXi{s~QXdO>)q%1plSE)L*pHoM+WYme%@brl5zR3-)*LzT#UI#Wx4%
zfHbZj)isrrwS6->FIA?Vj~=x3JHTJTP5eeWKGsS4YRi?D@g>7^lny$OiHzQgSAlLf
zQwa~@Ouq^mn^;Mq?%bg^H4Vin3N8>jUbwZQQNbvq%0!O3OSfvHR(xwct0;D(yT>F_
zCPbvNsJJ?w&U<e!78yVL8&t;<DT(NP{F17FY1&g*qc$Tela#A0>D5bP=0dW~iQcVE
zx<=?0UPgz%Whrd46|iQIxU&@W0F<_#5B21^91!k!!}K3cBCUMov%YX?cp1%J6vNIU
z(6a1%JmcZC&9A2fYt$>|ETOp<pW2~L$@ip+I}%phCl?cJ917Q0@wMI7!B&k$UzF=i
zpb*M*HD0`_hmzN;7WW&M$h|+{+jh7SW;+ZiM?T0Y8vQ|Q2Swa})yay?%gGs>3<?%Z
zswDX{OF0!?aTPiiFQ0Q#fU$2Rde>lp(k#o32$XuNh1VqD9~Qm(OMC>>)I_5700bAh
zpr{YD>_t-Z>Sj6{p<@8bli=20t6AV80Xz0y)$%50&KY47{yh90xA0g}V7@eEcQ@3O
zK984l2ozgN4^=j1o<5w|9kP{L5`pSw)YK30u@fd8P|ew^4_H@F?x)nd0N2HT0Y)@6
zn(S@hbzl9de4_0$8q^CD%LxfZmjyZuYqFop#7V9{ATmY$^f~dBar6E&IA<L%x$c*s
zg`ke@hZO%?wknceZ?|c=y=SkFjybHhVs{97B`+};;yE6<&gm82%qH7Z^2m>x=~G^~
zoOpN$l~{Xo_qYJFkd??AiArr<uK+K`%j*aHPeJ7k;5QZ>ucU8c-ZrC-+i>T5&<JSC
zDYT&TAkc@sJ&rJVb-UvLM%hr!aZhq`IFt$Hy-!*tm~K+@{kis0?Yfk|t?eBu_fXAu
zUGYQG_1F>@Y^F>7)sO<=YqCFg+YRpHd0Kq_Hv_qMo@@D2ytz8~YrE5!0R_M7u2`aI
z(;-uR{mRmf?zOtCNkNt05{DH{t>p>d>C$F3X6&XAamp;X$RtCjes?4xW)eK28*D%F
zO9Wo^MHwPjBW~lhJiV9B=R7sjeQu^{7P4b0Xl<0dI4q~#ux+kbU)wHBm|#vG!o^iV
zB4RRUET@uc2YHvD+g(VK<k@DxZ*t`LKy`F{<6HWl^vJSk>sB?S_$xHfJv6`*NP2|t
zb>8K|n2mHe=%hvQ{=@u}+0a4hMYjc@Fyt4nf3fUV>SQxx)l=A|;+km6<hXXDLyd7$
zB&$O4Rg%&RtS{hpd?&2Sa4(snN9v(e$#RYCj><}So^$dsNmB3(@U>qSATBfueh~jA
z!n-K$O54a{x@*Ig#{JHCMU%aPgs0FQpiwZH>)>h5E<j28$m_P}qXF<Ip^E)&+<{0%
z-Bv_r`7s#Wm-O&|1!83tacOYGJ}KM$?CrSK+$O?_*=_X0q2XSslppE?IiQksAL`J<
zTYsK3wUEs%0skS9)e-n*9-OO8{*9r~_8n_$0eRfCUxZUt!R}$0`qzj=M~x^Np+z2B
zdo2kfF$3R>M+~7g6aXdal|5dmTtwq!J3FKoOQy0zCT7rmlG~az1=7)kcn=@2eRXqp
zjV-F)l<mKu0EKIWjp|-6TloJ&FyDEq=`r&RCfanFpSApLXtBvcyUs>ROE>Ssio}Ai
zFnaK^&retbHr!wsu&W5m%eh8pq!O}V-4sEYV->oTDzC5`lG?#q&u&H28y1)o2TUsB
z^wAIOjhnfh+POftFnvV}D&B#K$7VNfb*6o-`WfZEy7FAPNu7kRY31p^tVYRU19uM!
z22(6z$A-O_*vW3W(^<El5{?4c?}azGOoRw!GKC?P?GVe@Z8HJ07@ODO8{|y?<~#o}
zN`n>Dz4E`7JBGWfwSj6cV-<^nE}!_)q~-)|fKLXV?Egeni{;4uFd-kA{7Ew8y9W{<
zC{fvD>jU(B*)56N{f}GCc~tpsXbzg%1lCTkB|;hbv{9M&$=vWRE2Z~>qINXDd)li_
zcT;29EITsylwZd$1)|3E?Dc5J!#Dnn>iBAEkEUcYR!Q|^95Zw4?Wg3Bn#@hm7EVAg
zHlAZUq2>9#r}%{?cgCf9rry>c$lgfo#<tggT&B$WV{;tv0R3ZHa8lE?(oX=ZZ#eAu
zb?x{$>*G;_dfi)3wL~|o_-M70YB`+r<m+d)AsnM)zrF_mRj#)$yyBsk3hI+zvvHWS
z2;?<u?N~}oJTz~`HQpUDq4Xs^Tr;lWT5801(T#m=;R9#L32J44jmH56UOYI~?ql(Z
zV=QDbD<^)?xzvc+9k}ujOW}}ZQgCd@x{dkz)mK4cySJq5#8?FW`Y*f-J0|iEYZm>-
zdm>L)h@sHj-|)qpKl_Lktv$q*R-R><8B6XFJPLTljhSaCF`Gw$!he!pG%!9d7v-9(
zrUTpm;3*E!L>Z7inuv9J;z~t%x1q}Al(QjNMz%fB%aC_s+)sOzr=nJv$w`z#uMj)5
zmMv+vs9>^@x*@a}>c91ksLBvLW#!OXx0{06e0byeN5&0e%FAaMcH@agh53-EH%n$4
z+Zl?2sn)-*xA5RhuQz6uKo}7r|2Q=%^HXnyw9VT@k{9?*{N;`QJ9pkBkqOOH9y$jf
ztR0SNd+0Qvb3Tr6Wm&{;1dY6!-Jqr7#|*GB8PYwY^!)u2>Nwr9iVagboErKy$PGk8
z^@ty9z^>*n>J+)T>=;O?;j82rACuq1L47bRE%P+m|Hh}1c{px@Eb}}Q&S-dGB*Xji
zF6ylBc`?ihl%t1s6>uTil$F~%2lWn@3kVU;0**5EV&CW_M{~kaH+Y+7pQ$4L6YLzc
zdV&%qUu!K%mdH3`JN|NOg;{U$IVf_kt_Ou3)&S<p0`nX}hTX4?WU5IE!9&l}`pwHx
zP!Gc9thy<F(GV6_g<7G3X4&ioCX>VQt}bhq^W20^L7F5t{a!jJbyt?hqex@{cIDaL
zG>VCckgA4!2R!3$5!wVBNci#}v%%76CPO_nINayZX)FRdZTvk=jGe123!CK!b8Yu=
z>weqHj`bUWZ_!%FHhBN9E*~GLg!isi48PFQHrGhAfJ{@Ms)(BW`CTss2Uyzb`^|&z
zA&lilg`0l0wor$U-}ymFKu*xeBOa0T#Hzwa_CoJ;A#v_9-Tur*QpJC4lM!;SLeI0^
z+jkL@-C->K-+<8p2TNwt>}2qTO<Tz8kD5js3UgbrU4v7JDQ>^}RmS!#1Dz|sOvkxS
z&DL8{d4yyHXK^Gs9li)p5Z#ijt7z!*iB;WOel#i5!}HIg<@7f36dt-V3bLZwT8%bk
z61^2{kaJlOxel%1=BTe$H?R+9#p#{CDSHuj`Y`bcn~&~??~3glJI!OUoc3+=GobSi
zDQm@Z(*+b{S)Q26FF`x!)$ivN;6+Zpnnd(wJ1zPqkOTAJox{M2M^~xU(%-41UOuPu
z6&0Z2`fNAd<5mU=70F0bLmIHQ#KYYvn{>~yPRFX&qM<B4L?$LR7yO*S&n(K7(&D6k
z`j7G{hq!#R#<lTEF@jHuW^PJpL-!<HN$ibD!}nP^4!3*#`E)%sTMVZ4s`&d6cl6&a
zq(xlc9&^IelTxOO)CfLlbhC?mOCeQK{x50sci=0jy#upoFP;}GGn22qqQy!Q1Tr)C
zJ}+fTmpF4(tm}A&LSr?Jm!UEtu6b4a{@_ek?dz|Mf=^(s*3m`|f_|<UWOF$HY0(Ay
z!?3r$S{-41w|D8x=d^?n^7r?pA0*`edX#+EEx7+5CGh`AklTNt{~rm0*9a3lNglMK
z!;>CXc-4p<UOVE1r$Q`nW;jngDPqf_xA_h7sUz)Xa>;~v9@r+PXaId!s9(;K0(IwX
zc?E9nWk}CDUJkRhOnZ}u7P5Bc0UPAbiGF45`C@i>&q4dBGSxD)tRn7>OP%MRK{Xd^
z8<H3W7pwHF1`t;q7~E0sA>H-cBWKr!Y(inR1R&&$XaJ&PJhdl$>6})qGv5!aFD>z=
za`m9zWrfvQ6Zh2eD(}>bC6PT6_dal(OdLB0<`f8=UOOE)p6O_MYjn_`b#LPP@B{?%
zu~1H(w>Ry-1uPs$9fF7I&dXev6bkC8i7i;7ZecACuU8i~!=tTb1k|Q?qHY|FFf~qG
zCV3bRfE#4{+aUd_hQu+ctbYDaBSjec53=vSxsCk>kbIR9Sd{mwYz(tdc=P_zHV^af
zo{Bk(qyV1X{@vAUI#{~Fg52sMawsS^y4tk}R=;<?eMa1vi8Ww)ybU8MxT#Rfpm!)V
zOF+_*XxU4ZCEQg|XX`Ui#LMdcrQ5odF@(MKmcfy5-MA^rDWBe%L0+a>@!UOl^SfQm
z5G5n~!co`QS0+P3zqC&0ZVH#+ul7f$%(7<k%LVymcYV99s^(GHBv^m`qH|R)WVUhX
z_&2I0B~wN~p9Hv1qMB_{7D5XyiyfgkaUn4=$8-d8Is|QE_%F)s$RlnApYJ4JK3IJR
z>t1fIhS0;^YP96{J2OA1|9I+K_-}!)F}Tqtkbjh~rIozVw`qbLO;BRNWvYlo!bGo6
zJn0W<#Hlcwo0PebdZ(VnbCarZWu}WK*(qEn8rAV32QwX4hyrf3afOk^&5z@cf9R)l
zCjA~v1hYC~!Zv)?2d?dKO`Y-4Tp>19p4l->pHQOieK*Ra>SCf;N7Gk*CzC(@ZO5z6
z9i$hqgQhf!CbX4ZMMtZCA|$JS4ZB=#DmX^^72-m7-x3U{fch0|`zshr)0?RC`yVjp
zY5p&A;{D8Q#T^VE-OAmTYIILj{G?=mjLLL}X+dG*Ed0c5sS+afEbH7=&+#3{=w{qN
zV~k`CRzgLgO9>)#s!Y-|*s-;g=?pFZZ2|m{-ZZsJ9<3k0Eb)=1K&@U5XLp#fdLh!w
zOY!k);a(<hNa&uXKng)(Pc9|>fXckS;?zgg{KCkU$r2=Grtp0yP1^a>kN<H^DVox;
z85^VwIjCnnJ#vEWC#~pS<+O<<H^96eHkn_!GrY&+{>ioyp!1Ho>$@$_+gYU~aJfRe
zEoOR10bRoO&d3cACbLNw*J#}%23vvF^ahIwzPYUzQ~2^pg*udeb6dOqYLs{Y{&J}f
zGTP%3^jM>?PSkS+eoLt(wuNHcC{|*wU~)G|QD_EK)k>}Aka8QJVQcP6;_!q}%1b*w
zy4)Bqj=ZHvNXx;0xoE~c3tkK%bw%aGZ4ivhVyhEy{wOq$?L?i4m_9QCFKYXr6<@|s
z9Q$`2zg<AR1o!XFy+j!lTQfTq7rLK#V_%M)SYmmUMk131@9#70_{kQQwf9$>!=+q;
zopl%%Ydr4CpeAgO--JAHYa6Gt3hg$p3u*WQj{K|AsvY}>hcY|d&`;ku2r$D>nkM6p
zVq2GRf%*zY=ERCiQHNw2WZ}ILc1qH1zMeVkKqrH1fQQt^C(#~zwl`>3cq8F<Bv8tl
zUZU#EZdes6Blsx4{2#o3f9#Qd>zciE7-dPO+xnRt*)o(yYyCR-ejl;B1r;g5JupMq
z<2U`1yatxoMg?fnUtCPchAH{eTeL&k^KruVc7^JkDjHBvSnP6o$`A|S5|l?9#{b1$
zEmvwk-4f-syJKojb(Wlh3POO^SJy;gKjjbHyvq%t=n~bZsI%!)6AWFLOR~0{#>y8G
zzgpG>>ifH~%rzs(+Ixk+5x9@dFaDD)xDq2_Q&Cj-2Qfj1-s5E};#&U8vvUo*`J@Ih
zrWtGV2HEfAKVgv_i9RZiM5cDW{&MR`PI7B^44>>zAW~3@L>Gpgw**S7P9S@MF^mT7
z3grh#CqJ07K5M|&frgaQT#o`^n%u#($$_a{1twHb_Tn=&VU97xl1Y2}X6#rAnWh}G
z*=jw(7gJ#I-PcD9yJzi%bu@5RnZKEPJ1L@Mw(tX1KL8Koq%&z-EP)@k#O=1#)2U&-
zf6N7xl@R~qmOkC4`xm!xyPGvNy&^Ahk?ZoFkXv5y?P%7>swJ*}g_!ZG7u0!A|2O0$
zdbCC&=}qo1P%)sed!m{)?0#V6QeWY~64fq~_vhW`!S3>|EzL##(a7*Tq&TnO^*j=e
zBx&^XAe#>W2j9Kf-`rGf8#s4ELRFG|^ek5APgqS8oYJ1u*=e2E$nKjsZM+0dzHFI~
zAUxfLq3B-4h%1hwx|~;>pA$E)n0_W?`?uU%J;Gktf0vN8#f}JS_EQGqL;1x{nH*;r
z6ZA1?@VSeF)ld1>G@qSaJ-H~_RQ3=Z&iQ!X4>^#EjwR}k$lEshq0ZQ4eQP3r-JjPF
zsYP_FdYzvCReR|}=_xeWW54jO)F&a#&QV?&;%uzf4?e44-_)c8aV7q#1dyc=+O4@R
z`HynmeY;8o5e{sCJ}YdeOZ~N-KIUg}ph`Dx6`|0)+F7h(^2lhb*2pBQ_e=jm&?y`T
zJ;+18-Q~m_nw(e(72t1@!aofLpumm~3?u$i3Sj=#Fko$=4tB!#AiTrtfur$C^<&_J
zylCN-Ho`}<4rat57XN*R`{p`xlPlc>fD<~k4jreQ!BJpU7P(~?cUqvuAFp)kqyMfm
z{l$)#Xr=c$zL@njGmT3pZ<b%@d_{}jExABCZRiTPpu@P_pI@#?AZcy1;@vzk*u3Mz
z(1|N%hY{qbgM~tzD^q^N9i><JZs@-xBZlLTKQ$H9<n1ELsGMFjkMZHU@$85c^??1$
zaD*5}3jWI%Bq>z*P(XtPM3Gsm_<hx;?(Tqp*+_SOps3&#|Jf(GhdEJkaZ1-C;(4SF
zlt>;bz)|{Sk;J;1KP0+5sPglt-QIejeBxZI-Q?x61vejsw8HyH&`2*wh}5E#uk}Z6
zi~F2ZWMhh{6>JRHQjg=OZOsw7G#L<;&n1Psp<MGy_{n+={1<MCq7Y~l@a65h)0hgq
z!lRscKfFF3FCvV{<T`J~rQB$#x*lCWTy3&T1+dEesx9n<)1O3`8Cuv~QwI>vj`}`0
z+n-!+FI?!Qp_4@8L`7o}1LR+zL!njKqch{$<4?{|seAE%DHf|98qP_4S~n7c%2Ykl
zrIpd#4s?2DS0%)1o;@w`$H)28?{9X**IEviUgJw-sjLBzsOxIWlc^H+queskf)$Xk
z=i=uoUHZyP?D9K90)iD?e3nhU)&7yfeYROnok2gV<ek`3(1$rMTh4fAd7NWTCL!GQ
zY^~i*2p%n_`((@4uSPVH@yLe_0Lg&yI?oS*IFim!Ek|f-7bFj3m%&?tmJEnSkiK#~
zjhx(B>}c*t-2+^YBk*KRHPZau^_#WQn$!$S7M`B3AIR7~M&4SPGqPmS<+oF7epC0i
z{V@gPllqXm{0caJmEMT|1{#7-v;}keX83<_D`UVkR@1@oej~ZOB=0?WiLlh^>otIw
z9{XnCXGbH%O6K{=1J~IN%K=kou3TD5iWG^)8r~<1Ip$r4iY;VeMirhldMuj1|MT(+
zM&5%9M_dMiC}+a=)|}qj`(po^NFw7}7&>9|t8r@6VE-XsI;Eof3YCb%s#)O@<iP}$
z;G%9^h1)t@5SbGt1(K3FPhN|Y(FoBljE$PgG)O|lWE#lFex-^Py!)13JJLH{Nbt@-
z6K<{|9t`d}CYeW74J*HZK5#QYe&s7~tjtqf2}zSfWx{^R7d?#Bi*+@2fqJkt9Sq|K
zQ!-=S-PlW}9KY`_{P2~`kxP%%|L8Sg0Qb&*VFXRl#Tm-+E?rICXw#%+`Xf(UyoLmI
zjeXJHq&2L@FOjn&(q3iHO4rx(r}A^@HzM}~-QBX~$WXMn98)c(x?||S>9onBSCaT!
zuCz*}6$;wMvMNVHwkw8HpFJ3)D=?*2FbhDnwb)(iF3)-f-4nC#D1Bsb)Z$9c^bk{>
zwb?+gb|L$tS0+s_v|cA`RegupJ^cLMErhqzMR4fD8PVg99mQ@uZiu6zocB>L!d-Sn
z{;U2bByGqeb{wKiw|HlfZ?>wM%7Qg*Glb)6r|SBvrAt?!hJMlQ4I4bf?t!T%pjP#w
zy0y9y_WEVVDawWtS$%9!-y%;9@uyC<M9;4UO8qaRz~^n4tUI@SnZj<3-H67dMOoVf
zsom?G0{V%`__*a~?+!Y9M*_4a43IJd?_+dgmsqRZLdym`k<~3lm~USZ3-?Dc2_8;J
zkJbbk4%aABuE?Q%IOaJQ3ys2y1qhe%5ziI6xY9&FIFynY&U1zens(xw5lOZ25N$0j
zadIv){;T>xEbfud*6~)rAj5Ow$il#8)t``-RIsyoWqRYEW>G5!bbT8gdOhhewZ#vp
z`kZjRuq#@a3jU&5P7|AazH=9~Kku$6@vqu?Kfr7Gu8`b7X(ipoZY6+xv*Bf6-BBtU
zU}54I^qf##<A>Sf@~Y%-Z(%iWI}sVZ8WLTZJtIJM0=^d=$5PrR7rU=ov(Iv&aNkcG
zn6}{IiN13KseuU$e`{Ff%wK{|hSU9}_M7g`)1|8yHu~uX7p`RVH^3`f_PB}&KpV2p
zD#Je+HT7L8P0x@jp^7Auq%?GO4VVwD46gfaYyJ>F7m25&3HPjtQ9S7#Yd4iymRZps
zGDZA+Kc?;jw=Zd2e$9F84F^mb{oy#=k3HIZv6q6Dl~%E7<q*x0IML;2pQVg;{3_gk
z7qXrk<@ROQiFvQFHvMx;bLs3m`X%a2z@vPsEDgTjDdHk>u9u8AGAj2S+z1<&3{izG
z=4Y~93f^t2<6I0M=dK-rM=kvS{TedEs{Z}c8kUoc1rUOBQUUMrbJYZE3QYw96ROQd
zO)lbTR}it}QfGAM&L{28l?}1)r{_;^bgf9+5#F723VhwM-|i*}PGx7K*OO!1=^gW*
zZcF!(#xq{$1{h0)nK+(H*BYFWYV3bYa5rR(I74KJ>iMaR7lh*`eHZC@AU9iRURE4N
zKpOt5der8IuXQY%Z?Vp{$QN^@yV7nE7hg?oe`RZ(_%>7Gc)1)V6z*GW!B=G(lkGhZ
zENQsC^x0-s@#0*0>d?d+_3u_qJh2qH=6vVI#iQ+)hZ#VbHiknJp;X8f9rZo3Jjpn|
zZLjEwG`!I9nk|IKPE2m^Z#ll)Fuz`D3N9N25a}Lg@94!GFWSWwhDqsNoW$18Ogmqx
z0Aw11G!YM}B0fD;>@*Vu7%j~<Xx!(cestF8B!-~`OP`lgxKe2HRR?Y7lj(=qQc63g
z2+HRUT`hsdg;;+tED0}yt-!Gj2!8idhO{6H4giVDfD30U+15Yaz-PT8JhXvt40H>&
z{&06HOv6sJ8#+Si=m0lmek<%V1Ag{f&|Oxsv=ex<sWkeL=UMb~%gT7F`{dsDEsMCB
zH>@^?XXKWxKgst7Fmw#BN?c<pO(BP2deLq*K}UMGz18XF2cL>n&JGLYD??ORZL;Mq
zTRs==^Xj;9;>K+JH{ZbRn%|_JJ-=Z#h)W8xj>W-bStVzdmWGjKwF8|ub;7~ELj2#H
zUDkZy8F6>;3B~^>I{po^;-7zWGx#A#f~uLZZ8|)`@lWYtk0(1^@xML)r}wbMnc<Co
zc$NUmAQLM1>C9O&Gd<L$nedvUnLdvFH)ZVch11BmD+M%!p2sN8ht1oybz}mCAIfD9
z4-!x}90_%JsC4;ytx;3l=9(@D!i=zQh)}wVd$xXh*g?e{5e<jLENhRK<!;$%E}hvX
z1}}Xx;)`D{C!krc;+cJ~r)5B;Dmu;EF!d{G$-hyx%g3C7g#s*^9+X+Bm;|Kd6?3t9
z=<Kg<?70wHdau}5MD*S7GVfs>O*M;R)z)QWZ`lX0P4QcOpQ7}rPr|G8kM=@@MW3zK
zk@n}osqgh>Oi%l7&s7+`ieDldh0|(r6{nj0E2R}CYhhX;+x0m0kHx$=Gw#@N8aqRm
zyuyo67s?J7tI=?zK()zp*JI=RLT=YrWs2Hn({OX<QF#n`u)`nPm&fVxW~)zjEe021
zs(IxZ_c?(T<`qOmW8n0lViE`IYccTNvG=WuF1EBUe)vlc|5??KfA2s}Pw5zM{D2<k
zlBT-fXOQ_nZ-v!o_w*}t5C@H4BNsvEea5NUJFdcwsdfzYvES4TR;Pb9DaXoPq+4r|
z`O_DE86~5pOM)a#Dm@s?3yMf8e)H2oQv!A=(y&0FVBW2q<p08Z0s>hTA0fI>c{Rue
z^Qc>c<>yr!njlJ|Y&ukI6Xc9oh^&PZXR2)G7@VsYPvS;RkL-;@TWj*-oGPu#-`=V+
z@YHC2M9VoHgaSBZ?n5Oce&B6ti)MxLu2Ymv(0Nt6SD5gytFAw5e$rj))2g@bpca!c
z2_E!stwwvh>E?`XN2VMS3aHbcq*6(J-pGD==TjUP(_nL<>EDOs0ny+3ic?wyxxlX?
z=MN6bMXGHLp2=pld{oPXCZGql2+w~+8Ro<tF1lKZHfndwuvEQH23Ma?i0f>E>4onf
zihC`1$19!%U4Hxi>T6XIkK#U^O<87zidpthSdISpUp&aSy6k`ZNVisesK9MX<tf>Q
z;pAQ$bM*8q)~nptqr+zL<yTTPMyWLeLK!kpjVfoAQ11qo#3kJ(x!}@z-swAv_Qi^M
zR}18Z($2q$6dE<u8)khRM`Wtn+9$&{es0}*ji;$3Ntb;L&Jtj|s_KL3wtzF<E^)>_
zt%-FtV`^mPAkqvXx-LGy*uO<X#sGQ#W4}KAdd(fX5Cvh9b@g1OD!HRESD^+FBO`>;
zx^v*$Gz>1Sb5ON-`Tk>3Xw4I%CwOsI^Q#`0`B3RMCO?);UX$L3y}akt&{xFI5G4(b
zdTEG02uYf_`m4l*$njg(tYaPdo~81-Xg^=@j#00^0pcM}JgJs~T*c<5&4sdW=isK!
zO}^i>N<88J74?--QE1=W779qHNT<>a-9xHeKw9Yr8G0BHhR!P>C|y!RNDY!h!!R(U
zbV%nA(nCr!F!192{nvW;r}OdId+l}hKKne+Ig!g`0fCEWR__#if*SiVmz!98<*COW
zSVH)n@OGV}oa};@gH-c1-&jC7+2S>?Q?c;lg|yMuoRRwXxa?<kX~G9QI&kJ-vcI`}
z2d%S$gi(%9Eg3CvNg+ZKiv%^u>}F(5!j+Mgzn*qoCD!{JPx&=hFlqO@-_J`3k9@yY
z_2-9Ncb30Qwui#qf7j%%aw9|1qv@)5SwIfQoB1C6)=xEQ9^ZdW+tyBF&09S&ARMdb
zqHe+5GHlY$U~Eh`6~kF&{f{ikTzB$7P5xdb>8UqlgD2xsNf{^gVrPm8&1I&4Iug=Y
z-;@59BFNBBV&0@?@GZC3o?zqIRX~Gbqnhi^2-|-|Ao9Ya;m)aL<O+51`jl*1CDC3Q
zFzuPhrYwY#_B;USGHzc9ZXyqVDqp|{FEsRP9eDNBG_6b;i`Pi<>Vq1Kr2{nu$N_J8
zOTVNX6>`qf6}O>MlIdjCf{TVN`_*_VPzFwK-m9VFg?|SR>nxK;kj5&QpC$!=a#PiK
zSXdQSUs9lXuj0oJ84?@EVInAxHBsag;?jLGz*yOzojQ5mPMAr5tDO7q+%k@OJgxIq
z)34;MBqCt$RSJ0sOOu?dYT`gXD{uq<XR$J|3S?*zz7J)0ewx2gF{_VqavA!g0e$3H
zsWa!rliLPV@=J*xF*h4~xEIZ~Iu|UmfsQRx&Kp_owQ~O@B$#Gu7_{m=Z7fW29|V)|
zPz*L^$W)@IcJp-^$SE0`Zc`8@B4KM1OgBDT!d%-fW@dD@Mb&fAd+iH2ABU82WC~^!
zGV*<ss{}^z8#_hM;c~%tueffx$**P)u$cvzb@58Y<fl7`(sq@dbMYB{ql#ZaxkgxC
z=jH-b#QxapA%2-ul8$@E<Ybdwc@f2*7v}7j9a3}!(9vt}TH_Pj&zo;}K%&DOZq{pG
zQZzJvD#^Zeh0snt-Qz~{1O_A;4Ai~yJK3^t44O>AYD64@@==G56G9`9?I$Oz8s|Cz
z^Oe{Y8;a~IHv4jDski(YFsr~`bM{8+$QL|NmV2vzyS3XbBMEkY+JG?3?xSM+g+3_a
zz5V#wQ(;>f0k0#GmPLR03%Q#QrPS9EAwCQpUAH1_`({lc4GdD+ISM_wH?T_@N<g-r
zfyTB2-u|=VwgM=5V{18l5L(K*6<A_I$}U6uNUD579lq8ls*uRX>Vmc33_N}loFS#U
z{Z7u_ahuDd@6=&ZLrz>vJV7$UhDYf)OB1cW74q^2pZWOIu&aIRE56#DEc4LmF+40&
z62j<Gz5PI|S=}u3Lnm3ZiqF@-PUMu-jSH<!a?C+&Z)@*OPegvAjnPlDB!bI<aT^aY
z$FRxsMY?I~;Tp7xz@)rC(U(sz+m^d=g#BK0Z_ZzV%CPcFmvYD~FM&Erc09)e|6X)p
z=MOPcT606)mg~<WT_mo)^Pbe<^o2s^8(e(!fqX3~{S3<b^75b-qGsgQteSx`-Yd4y
zb8!l_)nq#XmJmI2zaX*%4yhLj`Q|CX_y2;tErB3=Fv0cn=`7D@cbm#dF#^4H1p||i
z*HZprN}PPW>1RbW@m6xS?esnsX5KE1diUe|hio!;E9U3drE$I1HXt4-&(#RB7i^%D
z7xR>kl>;Jln!_QR8sKBXkx072@gBM-w==H!CGYYVgUOKgW*{~?XD7urJ?mDu8$S4f
zo`@7LxRa=*Zb(A0S8blwkq-Sx^r{|S(gl+-GgV{ew;mCi7I#@#-RtA1QE>#G4Y8=e
zU$he4ekOmX(Y;oN`_ygsEMHGCZ7=~tCG8tJ!_aGVI;n5D!5yu=U7X_lF@qs>KShSL
zZyO^amNHk(OIG!P&_yZ9e(?Uk8Ov;H-NDU8u|d}@lhCgw^OQQ)nlc%+)Bq`ZvwEHv
zLCARW^A$|4wF6`?_7Wx8q*2vYDh4ij-rGqiofQ8h8^zCYQBEeRqy_LSF7Z=`)(WxT
zi{KmL+ZodMGroJ}L1Y1=CcO=EmM%r-An`}eoX53ug`%tJPKVBd!nTttr<J~hGcixC
zAbwRdu8m{RAC!HNEmziR_v1tps>Sj%`$Lib>+PHAwTC~>)*u0cVj+rmn8Mip2spt+
zqPTPSGAvU&h=VIb+nNSm)JS@>YYD4OLEYMj)m$4}EZ9QB3SUb>5c&-HWtEEJzj2k$
zWsG9H<^YJwp#JSrVslciTWO+p5H6qboq#p5HkB+^DW*1{^N`I+BX*h)pMY$3zwmLm
zDQGqw_*-FE{6FYWzB@Ns%!3RN(B}@;@nv5*;2;~m9~uo_?3Sxg+yEgh?kmvVS$Xgq
zdV1DO#@RpjaEGAno#nf|(h5rQKgf~zo6Dcu(P>j+r@-P!{>wC;;`HgkvPAt^{o)9|
zVVqC>kF=`{a=!*MJ^uA9MN@zAWb&=KEsyB;^E#|~dFHY6U(g9AbK10LRQK>QIQ;Su
zt1yA>6yGCz$D3ov8^XArzd3zd3Rznx7(2}jujsW3yYCDEd`IY+bvD?d6irM0^0kc<
z(S<6m)P)jq>oc~NCbpK2x#A;xmdF-B*mRNEVInj{sTh?Y6rl1FvOuCY*5$x5Hi3O|
zyui$lqO7Aj6jYZeYZGOg><h8Yhs<L@KE~a4&tPWe5LTj)3v@8elO&-T!1Xbke>)Z^
zU+||vkXjfhkc+JT9O?eWiMAm80hO!wN7jW!#t}>5b*>f9Xd~s2A_nKO9;@gYrb9)p
zzlw}I(@>45QC0)yjkycgKQ%@K7^(MK?fx5<6`tNo7K_J@SN_x&%q10BXY?wJI}u-q
zGX|`3DsUB8GDFOS5u@AEJIW7k)aX}+-UWLjHdNuiW1Jgw>3xHBN#$#0ah3XbSUo@Z
z-NDTD^p+L+)1oV8-M)_iv~$&D>jjwgDm_G1nw_s3&Pr`yAL^}`23>sr)V(OPU&ST8
zuqKpz`>gig7<U}36Ip3BrWCFm-~M}ZvBDx&8}49nBsgtw$aR*{D0YV4TSK_cOA6b;
zS{t9#mc7Wdvr4J$kHzS7oPbC&A6otsvpFR>9eDa3*l7f=NCW_#My!El-cF#^x{oCe
zYJ{#VnFpOan!}m+ci-S1ZV!Fa$l9eHTt@FldK4^XGINq5%ymo}V9TV3Y$LW=G(GWk
z=_sFrxRbgw6flQ{TOv7BhgRLzfmHb_2eg$Loe9~kSrHp4{fzJZ_-3XF1CMC5zjfsM
zdSUVYcHDl%<yu&zRLi)RF!yG6T5D;Re;|fXM#mZRQ<^}$&vx4`lm~SGL2(zt_oU2J
zZ}CKSs6;t!<umxouuG2p6e1^unw`6T_$<!>7rAd%ECMz*YZh-c5mlK$%{}zM(3e-Y
zXlAg_X$)H>*5g($R{!L1t$#T}T~`3*&@@mUuO*k006hXsdp#4r3HQ9TJ2Q3T55n(n
zq;KiyI;_1g=^lwTch==5H$&mMa`@Il3SHzJfU&=>%^a_T=%Lz(n}ztjB^?l6?_{Yh
zWm8AsG>-;b$)-?=IA*eFpx_-tai<nl8bd&<F%_#ZUm4j9MhcSd7&UfMW%kz4=5)Hb
zwVLge&&BfMkR-NP0V*FHuB(GFjqkya7NqsVI8GcL<R?-m=hYwDCWgQMbtP^sic9fw
zObvHsBK*b<>+;3LaiJ8H7h{0i(iF_Q>v>1c;<xjge_OY1#@#={`tjrk<RKFoaWEeZ
zjU%$t;&SjAGvo29%jE&D1#s)jC92HOr@0_%6>b_-XX<D4C`f>2h12&$`DD~WKzmZ4
zq$5}Y&z(3y?9WxYKi<A<z`$zo5mcyURt`}8X0y^cbK@_c4zOuO_cQjgIa<hiZ)$7k
zkzMwjta`YP20n#1P<e{`m^$|@8uxW1n_tG%Wi27Mnf%@T=cI0Xqrd5Ve|3=bJkxSm
zIyLkNl>b`jCl|Y@$22tlR-@vz#$QG*RkQGTy*(ADlso9lHU1f(SUq_{#1HC!M#xZH
zn!VdFL-WZ^SAkmNVCawfPT7%eQ(E6zlVI>>j)MpZ20S39zkgVjS1+cl#P<llBsgl4
zZ(TIu_tgeuqnQ;wSQMlaVS0+317JdH*~K*6d(qAcfP{r#?aJUS7Q-}zDI9)k>x@%$
zbcgkteZ~IxPf4^hz^r7f9WW|Qb;gN>U)hXBUte9)eMu$Me7Er|XOZf0@{}O1>*qPS
zR_&>ru--euFY)x>kjPhxWPgU6y6zWcYz^yvo1~mve>f(&S?fhV*XBii6UF#up~Ij>
zmx-a?03Wq*1n=siAo%kz@3X&rkMx%2^yM0+$TfPm;0y4BH`VrASC6j-Z(cKwzeh0J
z@_HSZ5i%K}0v^$d6^w5<T7pAwDUbg*0D17Q$NwLI{GFsy>r+WF+%h{p{KxaKxE+C*
z-x%J=-6&!2{?C|nRwhu7&$BHhxg-%48O}`IF2Ui=_xxKp9#5d9r;H}LT$>4pRUa!v
z559y4T*Z(1j?KS6{Z(cmx;2(fS7Fmy`uZp~`V0TcTv@BZj<NboR#uKsnjz^&X0I5+
zd(cLU-v=MGRhzNG0qyUd^k|Jgv!u!z^2$tLOaiR*V4ksRevb0{(3-c*aT|vfprRCZ
ztzpi8)HWDb&bi8V<W+AnwV0aNw=XqUtcyZr9e!KJQD|}OvYMwm+&X8umvMAh)$Qvg
z+vk2JobXm}C;y^ZRP1o(kh$t)d`{Za#JrMJwYw(+-{s0WzWin~Xu^uVE~W(ay<w{L
z(d26pzfImINzZ_wkuVaw98O@Z2IXWXT8XiK%Bg2zZX~<5vY>dV?rlbcdA>br_>4Sz
zXBu3)<xNYXdj+4PvH=%s%7_uvH4n+9mXv&O&RQ+Ri!3kK?b`%2Qxg5{NYFYIofC}b
z^h*wYZ`v-Nq!3~3sxqSYJWEU(v98y-n!7tCP;?4Z=zJu$G+K-<pDa<CYQ`z7)}<h2
zl0@t<ujlmMGt%?CJR=!(7EfeA_`pb}n9w*Mt$-Lkl0m^ku$|LL>TDa*C!{^`<)!X%
zkzQlnsL)#jz?bcg%E$96ivhJKi!p&tWADorat90oYNI>HP&|;Hc_BJ=3hJB+WU5QH
zOsB_4Q>r*Rjt$dN>`M3#tNAT%Kj8z_kuK;4KcINe>2-M@A_|v3Uj50#yWVz}ixN}Z
zsMQRN=@Q74sh%1sIOS9`%(%)F57YZ}Bh`Y0K%Vu<9csAI36@WKaMuJWMkOwmBdda-
z9^XcD<C%}gmnQLNWtzHk^VJ)B$<pzSdRF!jv8v-#=7rT2gnm$K=Ge?sHa5{(>&1B&
zRm#ntTnxD0Cb+J5p9`s6q;1|(oD-iwDS3<X?>UiTb&$;aQE`h<0L*veTZgT|k*Edx
z&@SsTYD=zHyC?HcEYRj~!v1Iew_ocO&cU%$HKt%~(6|9yi<s=+;K|sQI&7!jJrj*`
zMTF0DR<D^1agNEQ{IcRzma&3RVu(>V<aMhh$P=+S3w57M4TDFUtF!YFIg0u)%pwaK
zRG$!Ab1tZhkLDQh)6f;V!ZwulI%2XNEX8v^(*cJn{oHmzzb%<ERh1c$;)hFU$)=d(
z=-SSne{Zq>>&wTwVcVQ?u+0gZHx#(|`fk{ZBjegc+*7|^EiSNcM4cYYGc@>T*WX3y
zYU<6wxfD&&hN#Gvxl7O$ofD-2&tkRRWCB>dG1@_@{VY{SjRbTvu5~0q<?pQ6<a}4I
zEQtnc0l#o|U4YbfGpo4IQSVidww&0(gBai9_Rj%WhbkQRae0fwikO9)+4QQ&sjh+3
z9jy)1nziC@8$*TsZQTFYfl%P~m^-%{u0C%)CRw@?>`^Vy)>9{bd6J;qy*?&c?IG37
zM6aB4k_^kAbR7GxWPefVeo4OGj@uWNxTD5eXZ1PszK``LKGABStdN%9(RbII8wNW;
z9IYnkf=CfRY?`x6EShFpN_4h&pO!F`G8M;fHPswBN$0tlO9w&?GR}s-(Ij_;&+<%7
zlj{_2B|9*AA-0M7@)zTXAE^mP(1PpYuiNoGAGMhI(mzNIX%G`d9lB5dJ>v#5e_;FF
zT4#M&mJ!8}G}Iux>gbk3buyY}I~d38ZLw&y4<B-{SKgUd{j;Y}_Z9wr^GQte109m)
zt(J?J-`4gE3D5Tin{fWJYF+C*C7I%;XF4w5Km)~N!MP19?rC7ghb<d1&{7>=|KSr)
z%Jjy9+wZmYFoVD)8+F87q4DrCxr(!k<{qMFPx7Q^nDT0d&yJ0IBcG<Oc^kLF`>XEK
zmIa*rzx_H;Cvk^Am?dVU44rfSAak3zG<L`jY@sg^R<fQC5{AjdPI-T+UPjyYfBy`5
zC38$<<-k69a=nl};aM~0i1|*Wl%o>yrAXV#yQGUf%jp>q12qOgS=A|`vz#8@&s0>I
zbzBlOQs#U?9_<=Qk?kn}*MI9Ji*Au_IMV^inhm~*3OR2}>W~@5JF>CNR2!@o56p&w
zwT+3kgc00P$Yv4OVRQn8Y<d064}L39j)lm(KIpXCEp`_Fg_FhN=IznB2{UEE1aNwB
zh05x}CGUBON|$xm&Mr{C!|!-W3wY-zUBr4!9D#Vklb`>R^FgkzD5+{SXE8D>DvO^?
z{Rnom?9Fsh#jzV<;K#_$b-rgE9%Fp3$c6#%*o0RX63v(9c-jfDu0(;i!71NfwCqHu
zY_Nm$i5WgV<k(sS0t*dz3c$&{aofQx14_n@W45Z649wUW|7-K_1nN*6a|gG|E7&>O
z4*{N-1M3Rq2SPp#NN^iYt8kw=uWbQ`e)UWOo6Bv;O4=3ZXUSGBMl7@0NK>x*n&hAL
z<W_3O;oxOmi1F`qVMo>_PU&GM^mdIrLY#x-bbY%4hRgwO2aT+BuEx(rk1Qd*$D$KE
z<l1EmJQUnvz_1Zf=w#|>WkJ+kV4JCMdo{3okR?Z2f(I&(6-olgmNCfjk~;z}5hng?
zX^`#Qebh`dnB5^`n`I^J?p98Hn61QZF5k(zxd)ry#(>cF1i!;Tdg%{f*@;qzWrO}V
zNT1@q+E2sZJVins9VE;k>D&{vWy)@Qr$M-ODW4Qm#3Fq9)G1i-i~a*AKd;>4l@L$A
z`(zV1U<3ocduB$HFnL1U&d|_NJu!hj1(ekb7}D{8G`-I`*L=75)%PSmG6L^L6jVE}
zl{EiMFt<L66FoS!SHEAbVMC5pv<O&u#IWn4bc--hXY62^d>UeDzjXC|2BBvBIo(=p
zE7ghkI;tFG9IFHP8R89iJZaki%$yZXDmEw=bBJ31sEcVV{Wt*M?J*zw&B6IP_boV{
z!rj$(p-yABo336X7~U(Fi7NIG=cg>D(aA)*$W15@d_tmX$=Bt(*4&`u;O<iLsO&Y-
zf(~2f&bSA%qwCy*@lT;J^?iWlDE6^LVtd8|TjyYfU%G!UI`1%n4NP^jW%t)F62LEj
zmDIt+tfn7|l%za&3;JVmZYScXND~TY!C+*+f6bPQBi+J5U#t4YN<B8bp=~<2Ii~;m
zxE&u8Mt}_;jY&x#|0x$l?1vBtsQX?I?D*q!8OP`L?d5t)nRFrFqf2-TdOQ%WzxG=x
z3S85lFem96h--J=8r=7D)sva@BO!13>Rq=nU)_oWGu3|AJnF58Oy*7G=e?`A+Skp?
zaJ@Kp#ysfe{+D)q+e<_qas=b(Xy_!F?*#b~HTwqB8t^a-3$>@TVS&BAosAxuGt*4t
z8c7H5?JLe04lA9Hw&d0-XJVXdBoxXcRZ3#!y~uulS73eodsd`Pn?dNby~(LI_@n2p
z#jp>i>f^<-vwI4}3b>%OsDB(#n~77!IRXWZGyN5~t}{6d8wk33iFismUgVF+Xl#Gm
ze-W2zFZw5v<@uAN=kj6u%zrViTRbSQJc17h`@J9hl!J9tMrC<y5?V;0Rb|_pBPKM-
z_I|@Z=`T+)zI40X3HBZpadVU@CJ}9tDxXPAFv$_GcYdz(ApX_PVw)pD5RF>-pZXr<
zBj|zokCjh|{my{-sErJp?~L|<<|TL6x+krYFmvui6Ia~@4eK$FM#@k6gbQ<SV!R-}
ze}FLMplTr(_>V&l<)LTPO==2`l4-V8LNVKu;v3dSR;EMSRqTHe-{$PL+u3kG7sKGg
zjr;E)D+iKt#;~dZ6fChybT~~SfCeEMa2~CvUO)6gGF_5!+-R%3dgcHT@-pLyw1{+&
zOB2!;k11i0N&5aG-3*v`vJ@Tp;d>(T49)0lBNJdC)IUoP(v;OoG!_9ZG7G-B<UaOQ
zue+t@++o=fl=O1;#p9RBbW?<p9~1o6dNAaEw8QV%Di3JBAvlj_j&!nUH2vSnagn}$
z*x0=U*l@0P=?b~>!xWMQbWhh_hF{Lod4U%P5&6lkCfEo5*a74^#BnZTV%NgU*kzef
zbMEzx+3~se<rVBQ2v7$+%v+5gazMhiKCBO!g!W>mMbC)k?SU!-O&;ui*WSDEhszF{
zA|b2&dl`NclgNeS5NG4Np)7Y@T2K$iBfZf5hx?cCvdXB%6yaz8*BhYDjoRg(ziag&
zXyWgZSH(DTkj-fZ>*vp^*5XHr?4a($hApGbYCvM&dN>re`is%T6IRw5l>ry0|4bZ5
z*L5&b@TueIt@QdYA3XtvjT3*HHd8nfg*32h`B|g59$iObcu{ZqwO}Xk_VKLS>&~$r
z#ViqC#P=j)yYyq)va^MgmIp*qDo8YkZIv@c#*)A`Km4G`n2A|o(%%rL+lGYmzBYbf
z9^)Z%O7Sz6cw*T)bH_99r>ax9VW24Yg2fO#iEWC<jj&2Y#7Va$v=+NKU~aPSmR%^@
zAnMS|hykr70cvYs%(uF@Ry<+3LR?XD)@rgz0eXk@{h`12Y;CqUbT3lM<;i1R_=Wk9
zB#57L;?1y2)RdOT%b=d!J$=p~x^+dhZxeN0gBpu^d_O?ULAZ=3%rz6P0QmHOr5~+>
zVqEEd|KRyYO(Duf_tK)(zH4*=xywF=w?3VYke%SK<6II06IoBVfM@ah%3d5yn;N&o
z;8(KY7nC)v`S3y|d2;+_mzjhy*_-{)-@y^wk?Yis$vcJS6sxAxZVh(2pMcm6v{-p1
zcFZmtbfz)5Uv!nG^pAbl*$I$meOFEjhn4H5pKruIevjX}km-Qwrb;LMNY~#(aG$jq
zNB?$MnAcjvybBbspIS;hHaP@5vY&!w;u)IiHmM$U7@1@nd+lq;!bCm3?(UA$e>+RA
eKva9n5?%kg8!qvw>1Ll>sQHBP<sGvB+5ZE#b^uBM

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Misc/woosh.ogg b/Resources/Audio/Misc/woosh.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..02539c20e21a99cf9af87aa7b654c771b5dece00
GIT binary patch
literal 9410
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

literal 0
HcmV?d00001

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 99c19cde9b..4008e5aaeb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -331,6 +331,33 @@
             False: { state: base-unshaded-off }
     - type: PacifismAllowedGun
 
+- type: entity
+  parent: BaseItem
+  id: WeaponStickyHand
+  name: sticky hand
+  description: They're saying you're reaching. They're saying it's a stretch. You'll show them all, and you'll stick it to them.
+  components:
+  - type: AmmoCounter
+  - type: GrapplingGun
+    cycleSound: /Audio/Misc/woosh.ogg
+    ropeSprite:
+      sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+      state: rope
+  - type: Gun
+    soundGunshot: /Audio/Misc/stickystretch.ogg
+    fireRate: 0.5
+    clumsyProof: true
+    soundEmpty: /Audio/Misc/boing.ogg
+  - type: BasicEntityAmmoProvider
+    proto: StickyHandPalm
+    capacity: 1
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+    state: base
+  - type: UseDelay
+    delay: 1.5
+  - type: PacifismAllowedGun
+
 # Admeme
 - type: entity
   name: tether gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 48ef2f6558..461aee3690 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1124,6 +1124,17 @@
             - HighImpassable
     - type: GrapplingProjectile
 
+- type: entity
+  parent: GrapplingHook
+  id: StickyHandPalm
+  name: sticky hand palm
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+  - type: Ammo
+    muzzleFlash: null
+
 - type: entity
   name : disabler bolt smg
   id: BulletDisablerSmg
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae32a2103615e7f02598728b472ff8a764f2e230
GIT binary patch
literal 407
zcmV;I0cie-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$QAtEWR9J=WmNAaPFc3v2B$2F0dm0J~A7(o$MCn7ML{!`PFk4V?5W1C+kR^gl
z!G1F_4k5&0S17--Wh?V$=G!sRsCSms%FfnHdvDL=uVDrSsP?9HPgDS@m6cl6vaAl~
zE=)84sg<qv#s!jE+3H|utG*II0fx6DdJ8s-RYG*hI4cBU3>bfZ78`&YEfu+&Be<*7
zZ#8a+o)tcvikyguPUh&=Qjyo@yc*G3@cmgP2#jDH24i2HTHrgJ2PV3j487+%nWJ0h
zUU;|#D6y~XLpTVjl{LGc>sldP`I}7G82~OPsvFK1vV}syi8{0(l>KJ0N~YyJ2$2<{
z2HT|G$FM20NA<Fw(Fo8B!2g-VRI7pb-QCx4Aq6YIZ#*2oA%X`1kTEV9oaLtT9u>g9
z?Plv`>!Y%-Zpu0>=hi(WnCXUUK~O`Ld(^0ZsWb60)~!(S5j6k+002ovPDHLkV1o08
BuY>>q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png
new file mode 100644
index 0000000000000000000000000000000000000000..4367a5ed61dc75b0a247b05e2ba438184e284abc
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$5lKWrR9J=Wld%eeFc5|>H9{!(G!7kn7&j;B=tDS4r*1xsgF_#rODPDFV#H1-
zY9q}>p%n5jCI<6=_j?DhK~b3vr^|WRa>rrI$9u>DH~<IW033h=Z~*@c5S7`WTT{hs
z%~d1Ey(fI=Wd}SEP{ldvPBH+Rd%_0*fL?a9b1DQ0U|Bf|6R=5w+yhuSKBvMoR3nZ1
z!WaOne?1zg(}JNH4+Kotby_eA1StX4O1Nd$k7&_!xi^8Z9>Y2<m}=+!An(u7P<Ory
zK$s`mik2yuiUh!qf^49h8Y_S*&KVEH2(gv~8isi?m;iHA0EC!*JTX`^{Pt@|06Md^
ph;`GVlhqVVE5!=&oozGzOm9kJhBqVB;t~J=002ovPDHLkV1n}?fu;Ze

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8aaf138bfcd9b1c35bc6b506ca48a10039ae5fb
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zWjtLRLn`LH
zy=9%pWGK+^kTKVB^5uXf9}-`z2=J0m@^+beu6?1$#O5W=QJO`GCp9Nr+~m3BsD9bQ
z|9l2#deXKf=r93|1Ok^px8K(f&)#1yw>>L}S!40uj*izkRc8MqwnzV8d0$*LNk5o*
z$GNz!|2N)lR+p5r@l@Pt@auJ1_0*hKURNSkFX7w}uP!K9c>g)4L|^9TO<j3SMz?mK
z6PvkeRa>y(H5vOA`;Ump`&9iu-j#dES%e>ADZ>Hb0Jq<h{=c5yH-Aa}1)Yg0{}pB{
z*L|w2(U@~;>cxLMGB?Yc_0KK~eC+GA<)7x7CoCO49~z{()=#_<zu$0Y+ZD6x<zA6@
wca`0=Z~Fes>a^ApyE8MkF4wbLz{zmz7o%r(kJ&nn21Sr%p00i_>zopr0C6IhI{*Lx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..32429ed8f8fdcb97b33241a6dff13eaab14e1f58
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zB|TjnLn`LH
zy|t0A$v~jtVUkQtjTAeZ+_AHr2HzAVI44W<KR)oFdB@Bd5^R&LCa5{7EOdH!;J@_j
zfOXfir>_QC00a)p4g7sVGK|Y*l5g#(`%o34rM2aSi_E3q_c!JU1ssc95Hh#r`r@MA
z?4ZRt0W;KlJ#*6D?s%g0qB_P}Tj7lG=DY8ulEZ7)X+Ma3Ust-Dzx&c+qjOBvG4-<!
zJeBdhwk}EC+yBr4<y~KnMo)UL39*uaVcLoE?GYvBR$5y=-qhJz{HtpAgFki)&Tc!o
z*lG4@LtZxbD@B&e8e?~ynD!_A^Tl*l4b>&F-`C!@TEYDK$Nk938;+Sf`CZ%b<KFay
t8R~9NR82$$#V_3XXT@2+w}N5yS2jVPp5+cKf>9vrJYD@<);T3K0RTmhl9d1e

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
new file mode 100644
index 0000000000..f96629f129
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by august-sun(GitHub)/augustsun(Discord) for Space Station 14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rope"
+        },
+        {
+            "name": "hook"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a3e03df9e85988e636b12bef84db25efa86a915
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_
z&lw6bDDbcx<XNWi!KG7($0buh@YLRa^=6AMo(lf_?p00CxgYL8^~ivq=@-ih-<Tzx
OAVE)8KbLh*2~7ZH3M5Pb

literal 0
HcmV?d00001


From 3720601121e954e61b71790600707fc47a744dca Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Sat, 6 Dec 2025 18:35:46 -0800
Subject: [PATCH 043/360] Add voice mask implant (#41551)

* Add voice mask implant

* Remove voice mask

* Voice mask implant now  overrides your identity

* voice mask implant can now be extracted, when taking out the voice mask implant it now updates your name proplery

* Simplify logic
---
 .../VoiceMask/VoiceMaskComponent.cs           |  7 +++
 Content.Server/VoiceMask/VoiceMaskSystem.cs   | 43 +++++++++++++++----
 .../_DV/Implants/SyrinxImplantSystem.cs       | 20 ---------
 .../Components/IdentityBlockerComponent.cs    |  5 +++
 .../Components/IdentityComponent.cs           | 10 ++++-
 .../IdentityManagement/IdentitySystem.cs      |  4 +-
 .../SharedSubdermalImplantSystem.Relays.cs    |  6 ++-
 .../Implants/SharedSubdermalImplantSystem.cs  |  7 +++
 .../VoiceMask/VoiceMaskSetNameEvent.cs        |  8 ++++
 .../Locale/en-US/store/uplink-catalog.ftl     |  6 +--
 Resources/Prototypes/Actions/types.yml        |  8 ++++
 .../Prototypes/Catalog/thief_toolbox_sets.yml |  2 +-
 .../Prototypes/Catalog/uplink_catalog.yml     | 30 ++++++-------
 .../Entities/Objects/Misc/implanters.yml      |  9 ++++
 .../Objects/Misc/subdermal_implants.yml       | 19 ++++++++
 15 files changed, 132 insertions(+), 52 deletions(-)
 delete mode 100644 Content.Server/_DV/Implants/SyrinxImplantSystem.cs

diff --git a/Content.Server/VoiceMask/VoiceMaskComponent.cs b/Content.Server/VoiceMask/VoiceMaskComponent.cs
index d3116f94db..f7e07f2bd1 100644
--- a/Content.Server/VoiceMask/VoiceMaskComponent.cs
+++ b/Content.Server/VoiceMask/VoiceMaskComponent.cs
@@ -26,6 +26,12 @@ public sealed partial class VoiceMaskComponent : Component
     [DataField]
     public ProtoId<SpeechVerbPrototype>? VoiceMaskSpeechVerb;
 
+    /// <summary>
+    ///     If true will override the users identity with whatever <see cref="VoiceMaskName"/> is.
+    /// </summary>
+    [DataField]
+    public bool OverrideIdentity;
+
     /// <summary>
     ///     The action that gets displayed when the voice mask is equipped.
     /// </summary>
@@ -38,3 +44,4 @@ public sealed partial class VoiceMaskComponent : Component
     [DataField]
     public EntityUid? ActionEntity;
 }
+
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 24382eca28..170bddf082 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -4,6 +4,8 @@ using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Clothing;
 using Content.Shared.Database;
+using Content.Shared.IdentityManagement;
+using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.Lock;
@@ -27,6 +29,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly LockSystem _lock = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly IdentitySystem _identity = default!;
 
     // CCVar.
     private int _maxNameLength;
@@ -34,8 +37,11 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeakerNameEvent>>(OnTransformSpeakerName);
+        SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeakerNameEvent>>(OnTransformSpeakerNameInventory);
         SubscribeLocalEvent<VoiceMaskComponent, ImplantRelayEvent<TransformSpeakerNameEvent>>(OnTransformSpeakerNameImplant);
+        SubscribeLocalEvent<VoiceMaskComponent, ImplantRelayEvent<SeeIdentityAttemptEvent>>(OnSeeIdentityAttemptEvent);
+        SubscribeLocalEvent<VoiceMaskComponent, ImplantImplantedEvent>(OnImplantImplantedEvent);
+        SubscribeLocalEvent<VoiceMaskComponent, ImplantRemovedEvent>(OnImplantRemovedEventEvent);
         SubscribeLocalEvent<VoiceMaskComponent, LockToggledEvent>(OnLockToggled);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
@@ -45,19 +51,31 @@ public sealed partial class VoiceMaskSystem : EntitySystem
         Subs.CVar(_cfgManager, CCVars.MaxNameLength, value => _maxNameLength = value, true);
     }
 
-    private void OnTransformSpeakerName(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
+    private void OnTransformSpeakerNameInventory(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
     {
-        args.Args.VoiceName = GetCurrentVoiceName(entity);
-        args.Args.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.Args.SpeechVerb;
+        TransformVoice(entity, args.Args);
     }
 
-    // DeltaV - specific for implants
     private void OnTransformSpeakerNameImplant(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<TransformSpeakerNameEvent> args)
     {
-        args.Event.VoiceName = GetCurrentVoiceName(entity);
-        args.Event.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.Event.SpeechVerb;
+        TransformVoice(entity, args.Event);
+    }
+
+    private void OnSeeIdentityAttemptEvent(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<SeeIdentityAttemptEvent> args)
+    {
+        if (entity.Comp.OverrideIdentity)
+            args.Event.NameOverride = GetCurrentVoiceName(entity);
+    }
+
+    private void OnImplantImplantedEvent(Entity<VoiceMaskComponent> entity, ref ImplantImplantedEvent ev)
+    {
+        _identity.QueueIdentityUpdate(ev.Implanted);
+    }
+
+    private void OnImplantRemovedEventEvent(Entity<VoiceMaskComponent> entity, ref ImplantRemovedEvent ev)
+    {
+        _identity.QueueIdentityUpdate(ev.Implanted);
     }
-    // END DeltaV
 
     private void OnLockToggled(Entity<VoiceMaskComponent> ent, ref LockToggledEvent args)
     {
@@ -89,6 +107,9 @@ public sealed partial class VoiceMaskSystem : EntitySystem
             return;
         }
 
+        var nameUpdatedEvent = new VoiceMaskNameUpdatedEvent(entity, entity.Comp.VoiceMaskName, message.Name);
+        RaiseLocalEvent(message.Actor, ref nameUpdatedEvent);
+
         entity.Comp.VoiceMaskName = message.Name;
         _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(message.Actor):player} set voice of {ToPrettyString(entity):mask}: {entity.Comp.VoiceMaskName}");
 
@@ -133,5 +154,11 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     {
         return entity.Comp.VoiceMaskName ?? Loc.GetString("voice-mask-default-name-override");
     }
+
+    private void TransformVoice(Entity<VoiceMaskComponent> entity, TransformSpeakerNameEvent args)
+    {
+        args.VoiceName = GetCurrentVoiceName(entity);
+        args.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.SpeechVerb;
+    }
     #endregion
 }
diff --git a/Content.Server/_DV/Implants/SyrinxImplantSystem.cs b/Content.Server/_DV/Implants/SyrinxImplantSystem.cs
deleted file mode 100644
index 953ea1515f..0000000000
--- a/Content.Server/_DV/Implants/SyrinxImplantSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.VoiceMask;
-using Content.Shared.Implants;
-
-namespace Content.Server.DV.Implants;
-
-public sealed class SubdermalBionicSyrinxImplantSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<VoiceMaskComponent, ImplantImplantedEvent>(OnInsert);
-    }
-
-    private void OnInsert(Entity<VoiceMaskComponent> ent, ref ImplantImplantedEvent args)
-    {
-        // Update the name so it's the entities default name. You can't take it off like a voice mask so it's important!
-        ent.Comp.VoiceMaskName = Name(args.Implanted);
-    }
-}
diff --git a/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
index cc92a4c078..5dfbc7e36c 100644
--- a/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
+++ b/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
@@ -37,4 +37,9 @@ public sealed class SeeIdentityAttemptEvent : CancellableEntityEventArgs, IInven
 
     // cumulative coverage from each relayed slot
     public IdentityBlockerCoverage TotalCoverage = IdentityBlockerCoverage.NONE;
+
+    /// <summary>
+    /// A specific name to override your identiy with.
+    /// </summary>
+    public string? NameOverride = null;
 }
diff --git a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
index 4646ccc835..778066361f 100644
--- a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
+++ b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
@@ -47,10 +47,16 @@ public sealed class IdentityRepresentation
         PresumedName = presumedName;
     }
 
-    public string ToStringKnown(bool trueName)
+    /// <summary>
+    /// Get this identity as a string
+    /// </summary>
+    /// <param name="trueName">Should we show their "true" name or hide it?</param>
+    /// <param name="nameOverride">A "true name" override</param>
+    /// <returns></returns>
+    public string ToStringKnown(bool trueName, string? nameOverride)
     {
         return trueName
-            ? TrueName
+            ? nameOverride ?? TrueName
             : PresumedName ?? ToStringUnknown();
     }
 
diff --git a/Content.Shared/IdentityManagement/IdentitySystem.cs b/Content.Shared/IdentityManagement/IdentitySystem.cs
index 6b11085715..990abd9e70 100644
--- a/Content.Shared/IdentityManagement/IdentitySystem.cs
+++ b/Content.Shared/IdentityManagement/IdentitySystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
+using Content.Shared.VoiceMask;
 using Robust.Shared.Containers;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects.Components.Localization;
@@ -53,6 +54,7 @@ public sealed class IdentitySystem : EntitySystem
         SubscribeLocalEvent<IdentityComponent, DidUnequipHandEvent>((uid, _, _) => QueueIdentityUpdate(uid));
         SubscribeLocalEvent<IdentityComponent, WearerMaskToggledEvent>((uid, _, _) => QueueIdentityUpdate(uid));
         SubscribeLocalEvent<IdentityComponent, EntityRenamedEvent>((uid, _, _) => QueueIdentityUpdate(uid));
+        SubscribeLocalEvent<IdentityComponent, VoiceMaskNameUpdatedEvent>((uid, _, _) => QueueIdentityUpdate(uid));
     }
 
     /// <summary>
@@ -197,7 +199,7 @@ public sealed class IdentitySystem : EntitySystem
         var ev = new SeeIdentityAttemptEvent();
 
         RaiseLocalEvent(target, ev);
-        return representation.ToStringKnown(!ev.Cancelled);
+        return representation.ToStringKnown(!ev.Cancelled, ev.NameOverride);
     }
 
     /// <summary>
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
index 1e330fdbd3..774be5d9b2 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Chat; // DeltaV
+using Content.Shared.Chat;
+using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -13,7 +14,8 @@ public abstract partial class SharedSubdermalImplantSystem
         SubscribeLocalEvent<ImplantedComponent, MobStateChangedEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, AfterInteractUsingEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, SuicideEvent>(RelayToImplantEvent);
-        SubscribeLocalEvent<ImplantedComponent, TransformSpeakerNameEvent>(RelayToImplantEvent); // DeltaV
+        SubscribeLocalEvent<ImplantedComponent, TransformSpeakerNameEvent>(RelayToImplantEvent);
+        SubscribeLocalEvent<ImplantedComponent, SeeIdentityAttemptEvent>(RelayToImplantEvent);
     }
 
     /// <summary>
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index fd35cace14..63e3e590b3 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -180,7 +180,14 @@ public abstract partial class SharedSubdermalImplantSystem : EntitySystem
 [ByRefEvent]
 public readonly record struct ImplantImplantedEvent
 {
+    /// <summary>
+    /// The implant itself
+    /// </summary>
     public readonly EntityUid Implant;
+
+    /// <summary>
+    /// The entity getting implanted
+    /// </summary>
     public readonly EntityUid Implanted;
 
     public ImplantImplantedEvent(EntityUid implant, EntityUid implanted)
diff --git a/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs b/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs
index 8e1adb194f..caeb842931 100644
--- a/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs
+++ b/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs
@@ -6,3 +6,11 @@ public sealed partial class VoiceMaskSetNameEvent : InstantActionEvent
 {
 }
 
+/// <summary>
+/// Raised on an entity when their voice masks name is updated
+/// </summary>
+/// <param name="VoiceMaskUid">Uid of the voice mask</param>
+/// <param name="OldName">The old name</param>
+/// <param name="NewName">The new name</param>
+[ByRefEvent]
+public readonly record struct VoiceMaskNameUpdatedEvent(EntityUid VoiceMaskUid, string? OldName, string NewName);
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 736e1e21f3..6050b575cf 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -173,9 +173,6 @@ uplink-binary-translator-key-desc = Lets you tap into the silicons' binary chann
 uplink-hypopen-name = Hypopen
 uplink-hypopen-desc = A chemical hypospray disguised as a pen, capable of instantly injecting up to 10u of reagents. Starts empty.
 
-uplink-voice-mask-name = Voice Mask
-uplink-voice-mask-desc = A gas mask that lets you adjust your voice to whoever you can think of. Also utilizes cutting-edge chameleon technology.
-
 uplink-clothing-eyes-hud-syndicate-name = Syndicate Visor
 uplink-clothing-eyes-hud-syndicate-desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination.
 
@@ -228,6 +225,9 @@ uplink-micro-bomb-implanter-desc = Explode on death or manual activation with th
 uplink-radio-implanter-name = Radio Implanter
 uplink-radio-implanter-desc = Implants a Syndicate radio, allowing covert communication without a headset.
 
+uplink-voice-mask-implanter-name = Voice Mask Implanter
+uplink-voice-mask-implanter-desc = Modifies your vocal cords to be able to sound like anyone you could imagine.
+
 # Bundles
 uplink-observation-kit-name = Observation Kit
 uplink-observation-kit-desc = Includes surveillance camera monitor board and security hud disguised as sunglasses.
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index aa0f6b6e24..cb430c986c 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -477,3 +477,11 @@
     icon: Interface/Actions/shop.png
   - type: InstantAction
     event: !type:IntrinsicStoreActionEvent
+
+- type: entity
+  parent: ActionChangeVoiceMask
+  id: ActionChangeVoiceMaskImplant
+  components:
+  - type: Action
+    icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
+    itemIconStyle: BigAction
diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
index 52190eeb14..44eb2bebfa 100644
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -85,7 +85,7 @@
   - CyberPen
   - SpyCrewMonitor
   - BriefcaseThiefBribingBundleFilled
-  - ClothingMaskGasVoiceChameleon
+  - VoiceMaskImplanter
   #- todo Chameleon Stamp
   
 - type: thiefBackpackSet
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 9a1f8cc62a..6542fc7800 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1579,6 +1579,21 @@
   categories:
   - UplinkImplants
 
+- type: listing
+  id: UplinkVoiceMaskImplant
+  name: uplink-voice-mask-implanter-name
+  description: uplink-voice-mask-implanter-desc
+  icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
+  productEntity: VoiceMaskImplanter
+  # Begin DeltaV Removals
+  # discountCategory: usualDiscounts
+  # discountDownTo:
+  #   Telecrystal: 1
+  # End DeltaV Removals
+  cost:
+    Telecrystal: 1 # DeltaV - was 2
+  categories:
+  - UplinkImplants
 
 # Wearables
 
@@ -1595,21 +1610,6 @@
   categories:
   - UplinkWearables
 
-- type: listing
-  id: UplinkVoiceMask
-  name: uplink-voice-mask-name
-  description: uplink-voice-mask-desc
-  productEntity: ClothingMaskGasVoiceChameleon
-  # Begin DeltaV Removals
-  # discountCategory: usualDiscounts
-  # discountDownTo:
-  #   Telecrystal: 1
-  # End DeltaV Removals
-  cost:
-    Telecrystal: 1  # DeltaV - was 2
-  categories:
-  - UplinkWearables
-
 - type: listing
   id: UplinkHolster
   name: uplink-holster-name
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index 48c1dbac58..4595b7f43a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -47,6 +47,7 @@
     - FakeMindShieldImplant
     - RadioSyndicateImplant
     - ChameleonControllerImplant
+    - VoiceMaskImplant
     deimplantFailureDamage:
       types:
         Cellular: 50
@@ -258,6 +259,14 @@
   - type: Implanter
     implant: ChameleonControllerImplant
 
+- type: entity
+  id: VoiceMaskImplanter
+  name: voice mask implanter
+  parent: BaseImplantOnlyImplanterSyndi
+  components:
+  - type: Implanter
+    implant: VoiceMaskImplant
+
 #Nuclear Operative/Special implanters
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index aa5d26650a..7b0bd8f44e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -251,6 +251,25 @@
       enum.ChameleonControllerKey.Key:
         type: ChameleonControllerBoundUserInterface
 
+- type: entity
+  parent: BaseSubdermalImplant
+  id: VoiceMaskImplant
+  name: voice mask implant
+  description: This implant allows you to change your voice at will.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SubdermalImplant
+    implantAction: ActionChangeVoiceMaskImplant
+  - type: VoiceMask
+    overrideIdentity: true
+  - type: UserInterface
+    interfaces:
+      enum.VoiceMaskUIKey.Key:
+        type: VoiceMaskBoundUserInterface
+  - type: Tag
+    tags:
+    - SubdermalImplant
+
 #Nuclear Operative/Special Exclusive implants
 
 - type: entity

From 00aeae38886913f357985dcdbeb2a079ede52990 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 7 Dec 2025 04:07:32 +0100
Subject: [PATCH 044/360] Move Zookeeper and Boxer jobs to DeltaV namespace,
 based on upstream PR (#41741)

---
 .../Locale/en-US/_DV/chat/highlights.ftl      |  2 ++
 .../Locale/en-US/_DV/job/job-description.ftl  |  3 ++
 Resources/Locale/en-US/_DV/job/job-names.ftl  |  6 ++++
 .../en-US/_DV/preferences/loadout-groups.ftl  |  3 ++
 Resources/Locale/en-US/chat/highlights.ftl    |  2 --
 .../Locale/en-US/job/job-description.ftl      |  2 --
 Resources/Locale/en-US/job/job-names.ftl      |  4 ---
 .../en-US/preferences/loadout-groups.ftl      |  3 --
 Resources/Migrations/migration.yml            |  4 +++
 .../Prototypes/Catalog/uplink_catalog.yml     | 21 ++-----------
 .../Entities/Markers/Spawners/jobs.yml        | 24 --------------
 .../Objects/Misc/identification_cards.yml     |  4 +--
 .../Weapons/Guns/Shotguns/shotguns.yml        |  2 +-
 .../Entities/Objects/base_contraband.yml      |  9 ------
 .../Loadouts/Miscellaneous/jobtrinkets.yml    | 24 --------------
 .../Prototypes/Loadouts/loadout_groups.yml    | 30 ------------------
 .../Prototypes/Loadouts/role_loadouts.yml     | 24 --------------
 Resources/Prototypes/Reagents/toxins.yml      |  6 ++--
 .../Prototypes/Roles/Jobs/departments.yml     |  8 ++---
 .../Prototypes/Roles/play_time_trackers.yml   |  6 ----
 .../Prototypes/_DV/Catalog/Uplink/job.yml     | 17 ++++++++++
 .../_DV/Entities/Markers/Spawners/jobs.yml    | 24 ++++++++++++++
 .../_DV/Entities/Objects/base_contraband.yml  |  9 ++++++
 .../Loadouts/Jobs/Wildcards/boxer.yml         |  0
 .../Loadouts/Miscellaneous/jobtrinkets.yml    | 23 ++++++++++++++
 .../_DV/Loadouts/loadout_groups.yml           | 31 +++++++++++++++++++
 .../Prototypes/_DV/Loadouts/role_loadouts.yml | 25 +++++++++++++++
 .../_DV/Roles/play_time_trackers.yml          |  6 ++++
 28 files changed, 165 insertions(+), 157 deletions(-)
 create mode 100644 Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml
 rename Resources/Prototypes/{ => _DV}/Loadouts/Jobs/Wildcards/boxer.yml (100%)
 create mode 100644 Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml

diff --git a/Resources/Locale/en-US/_DV/chat/highlights.ftl b/Resources/Locale/en-US/_DV/chat/highlights.ftl
index ad4646f4f7..4a1fece134 100644
--- a/Resources/Locale/en-US/_DV/chat/highlights.ftl
+++ b/Resources/Locale/en-US/_DV/chat/highlights.ftl
@@ -14,6 +14,8 @@ highlights-corpsman = Corpsman, "Corps", Brigmed, "Sec", Security, "Med", Medica
 highlights-gladiator = Gladiator
 highlights-martial-artist = Martial Artist, Martial
 highlight-prisoner = Prisoner
+highlights-zookeeper = Zookeeper
+highlights-boxer = Boxer
 
 # Epistemics
 highlight-roboticist = Roboticist, Epistemics, "Epi"
diff --git a/Resources/Locale/en-US/_DV/job/job-description.ftl b/Resources/Locale/en-US/_DV/job/job-description.ftl
index 0f2311f558..89ce0bc5a9 100644
--- a/Resources/Locale/en-US/_DV/job/job-description.ftl
+++ b/Resources/Locale/en-US/_DV/job/job-description.ftl
@@ -19,3 +19,6 @@ role-description-ifrit = "Burn baby, burn!"
 role-description-carpy = "Grrr!"
 role-description-shiva = "Hsssss!"
 role-description-pun-pun = "Ook!"
+
+job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog.
+job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis.
diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl
index 756fbf7cce..90793fee54 100644
--- a/Resources/Locale/en-US/_DV/job/job-names.ftl
+++ b/Resources/Locale/en-US/_DV/job/job-names.ftl
@@ -78,6 +78,8 @@ JobProsecutor = Prosecutor
 JobSecurityBorg = Security Cyborg
 JobRoboticist = Roboticist
 JobCargoAssistant = Cargo Assistant
+JobZookeeper = Zookeeper
+JobBoxer = Boxer
 
 # Pet Roles
 RoleLaika = Laika
@@ -93,3 +95,7 @@ role-name-ifrit = Ifrit
 role-name-carpy = Carpy
 role-name-shiva = Shiva
 role-name-pun-pun = Pun Pun
+
+# Station specific
+job-name-boxer = Boxer
+job-name-zookeeper = Zookeeper
diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
index 9e0635ccc5..986e40eb09 100644
--- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
@@ -167,5 +167,8 @@ loadout-group-martial-artist-shoes = Martial Artist shoes
 loadout-group-gladiator-jumpsuit = Gladiator jumpsuit
 loadout-group-gladiator-outerclothing = Gladiator outer clothing
 
+loadout-group-boxer-jumpsuit = Boxer jumpsuit
+loadout-group-boxer-gloves = Boxer gloves
+
 # Species
 loadout-group-humanoid-silicon = Silicon-friendly survival box
diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl
index 4a921ef645..469a5b565a 100644
--- a/Resources/Locale/en-US/chat/highlights.ftl
+++ b/Resources/Locale/en-US/chat/highlights.ftl
@@ -46,9 +46,7 @@ highlights-passenger = Passenger, Greytider, "Tider"
 highlights-service-worker = Service Worker
 
 # Station-specific
-highlights-boxer = Boxer
 highlights-reporter = Reporter, Journalist
-highlights-zookeeper = Zookeeper
 highlights-psychologist = Psychologist, Psychology, "Psych"
 
 # Silicon
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index ca6b4d9d4f..69295b3ddf 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -3,7 +3,6 @@ job-description-atmostech = Optimize the station's atmospherics setup, and synth
 job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories.
 job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained.
 job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the epistemics team for upgrades.
-job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog.
 job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you.
 job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help.
 job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
@@ -46,4 +45,3 @@ job-description-serviceworker = Learn the basics of bartending, cooking, and gro
 job-description-station-ai = Follow your laws, serve the crew.
 job-description-visitor = Enjoy your visit to the station.
 job-description-warden = Patrol the Security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
-job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index dcb3e607a1..7d4d0c9668 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -50,8 +50,6 @@ job-name-ertengineer = ERT Engineer
 job-name-ertsecurity = ERT Security
 job-name-ertmedic = ERT Medic
 job-name-ertjanitor = ERT Janitor
-job-name-boxer = Boxer
-job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
 job-name-cluwne = Cluwne
 
@@ -77,7 +75,6 @@ JobAtmosphericTechnician = Atmospheric Technician
 JobBartender = Bartender
 JobBorg = Borg
 JobBotanist = Botanist
-JobBoxer = Boxer
 JobCaptain = Captain
 JobCargoTechnician = Cargo Technician
 JobCentralCommandOfficial = Central Command Official
@@ -121,4 +118,3 @@ JobStationEngineer = Station Engineer
 JobTechnicalAssistant = Technical Assistant
 JobVisitor = Visitor
 JobWarden = Warden
-JobZookeeper = Zookeeper
diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 99c8e51095..fa080b0225 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -208,6 +208,3 @@ loadout-group-medical-glasses = Medical glasses
 loadout-group-reporter-jumpsuit = Reporter jumpsuit
 
 loadout-group-psychologist-jumpsuit = Psychologist jumpsuit
-
-loadout-group-boxer-jumpsuit = Boxer jumpsuit
-loadout-group-boxer-gloves = Boxer gloves
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index a7804f0be7..aa4ad72904 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -692,3 +692,7 @@ ToySkeleton: ToyFigurineSkeleton
 
 # 2025-10-28
 DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
+
+# 2025-12-06 # DeltaV - We keep Zookeeper/Boxer
+#SpawnPointZookeeper: null
+#SpawnPointBoxer: null
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 6542fc7800..a13dc87a02 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -2055,23 +2055,6 @@
       whitelist:
         - Passenger
 
-- type: listing
-  id: uplinkRiggedBoxingGlovesBoxer
-  name: uplink-rigged-boxing-gloves-name
-  description: uplink-rigged-boxing-gloves-desc
-  productEntity: ClothingHandsGlovesBoxingRigged
-  discountCategory: usualDiscounts
-  discountDownTo:
-    Telecrystal: 2
-  cost:
-    Telecrystal: 4
-  categories:
-    - UplinkJob
-  conditions:
-    - !type:BuyerJobCondition
-      whitelist:
-        - Boxer
-
 - type: listing
   id: uplinkNecronomicon
   name: uplink-necronomicon-name
@@ -2254,9 +2237,9 @@
   categories:
   - UplinkJob
   conditions:
-  - !type:BuyerJobCondition # We can't use BuyerDepartmentCondition here since Zookeeper and Chef can also get this
+  - !type:BuyerJobCondition # We can't use BuyerDepartmentCondition here since Chef can also get this
     whitelist:
-    - Zookeeper
+    - Zookeeper # DeltaV - Keep Zookeeper/Boxer
     - Scientist
     - ResearchDirector
     - Chef
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 2deffd32ba..222697de53 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -281,18 +281,6 @@
       - state: green
       - state: musician
 
-- type: entity
-  id: SpawnPointBoxer
-  parent: SpawnPointJobBase
-  name: boxer
-  components:
-  - type: SpawnPoint
-    job_id: Boxer
-  - type: Sprite
-    layers:
-      - state: green
-      - state: boxer
-
 - type: entity
   id: SpawnPointBorg
   parent: SpawnPointJobBase
@@ -611,15 +599,3 @@
     layers:
       - state: green
       - state: psychologist
-
-- type: entity
-  id: SpawnPointZookeeper
-  parent: SpawnPointJobBase
-  name: zookeeper
-  components:
-  - type: SpawnPoint
-    job_id: Zookeeper
-  - type: Sprite
-    layers:
-      - state: green
-      - state: zookeeper
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 67b00210d5..23f33c081e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -800,7 +800,7 @@
       offset: *icon-offset
       state: Boxer
   - type: PresetIdCard
-    job: Boxer
+    job: Boxer  # DeltaV - Keep Zookeeper/Boxer
 
 - type: entity
   parent: IDCardStandard
@@ -818,7 +818,7 @@
       offset: *icon-offset
       state: Zookeeper
   - type: PresetIdCard
-    job: Zookeeper
+    job: Zookeeper # DeltaV - Keep Zookeeper/Boxer
 
 #Supply
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 1a2dca980e..cd059a2e88 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -104,7 +104,7 @@
 
 - type: entity
   name: double-barreled shotgun
-  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderZookeeperContraband]
+  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderZookeeperContraband] # DeltaV - Keep Zookeeper/Boxer
   id: WeaponShotgunDoubleBarreled
   description: An immortal classic. Uses .50 shotgun shells.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml
index 497869de1c..050d874774 100644
--- a/Resources/Prototypes/Entities/Objects/base_contraband.yml
+++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml
@@ -192,15 +192,6 @@
     allowedDepartments: [ Security ]
     allowedJobs: [ Bartender ]
 
-- type: entity
-  id: BaseSecurityBartenderZookeeperContraband
-  parent: BaseRestrictedContraband
-  abstract: true
-  components:
-  - type: Contraband
-    allowedDepartments: [ Security ]
-    allowedJobs: [ Bartender, Zookeeper ]
-
 - type: entity
   id: BaseSecurityLawyerContraband
   parent: BaseRestrictedContraband
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
index c32b230deb..2ef944c150 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
@@ -464,27 +464,3 @@
   storage:
     back:
     - PlushieLizardJobPsychologist
-
-- type: loadout
-  id: LizardPlushieBoxer
-  effects:
-    - !type:JobRequirementLoadoutEffect
-      requirement:
-        !type:RoleTimeRequirement
-        role: JobBoxer
-        time: 72000 # 20hr
-  storage:
-    back:
-      - PlushieLizardJobBoxer
-
-- type: loadout
-  id: LizardPlushieZookeeper
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobZookeeper
-      time: 72000 # 20hr
-  storage:
-    back:
-    - PlushieLizardJobZookeeper
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 4877a60d4f..f016f14135 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1973,36 +1973,6 @@
   loadouts:
   - LizardPlushiePsychologist
 
-- type: loadoutGroup
-  id: BoxerJumpsuit
-  name: loadout-group-boxer-jumpsuit
-  loadouts:
-  - BoxerShorts
-  - BoxerShortsWithTop
-
-- type: loadoutGroup
-  id: BoxerGloves
-  name: loadout-group-boxer-gloves
-  loadouts:
-  - RedBoxingGloves
-  - BlueBoxingGloves
-  - GreenBoxingGloves
-  - YellowBoxingGloves
-
-- type: loadoutGroup
-  id: BoxerJobTrinkets
-  name: loadout-group-jobtrinkets
-  minLimit: 0
-  loadouts:
-  - LizardPlushieBoxer
-
-- type: loadoutGroup
-  id: ZookeeperJobTrinkets
-  name: loadout-group-jobtrinkets
-  minLimit: 0
-  loadouts:
-  - LizardPlushieZookeeper
-
 # Other
 - type: loadoutGroup
   id: SurvivalSyndicate
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 21283201c5..23978bf814 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -572,17 +572,6 @@
   - GroupSpeciesBreathToolMedical
 
 # Wildcards
-- type: roleLoadout
-  id: JobZookeeper
-  groups:
-  - GroupTankHarness
-  - CommonBackpack
-  - Glasses
-  - Survival
-  - Trinkets
-  - ZookeeperJobTrinkets
-  - GroupSpeciesBreathTool
-
 - type: roleLoadout
   id: JobReporter
   groups:
@@ -615,19 +604,6 @@
   - PsychologistJobTrinkets
   - GroupSpeciesBreathTool
 
-- type: roleLoadout
-  id: JobBoxer
-  groups:
-  - GroupTankHarness
-  - BoxerJumpsuit
-  - BoxerGloves
-  - CommonBackpack
-  - Glasses
-  - Survival
-  - Trinkets
-  - BoxerJobTrinkets
-  - GroupSpeciesBreathTool
-
 # These loadouts are used for non-crew spawns, like off-station antags and event mobs
 # They will be used without player configuration, thus they will only ever apply what is forced by MinLimit
 
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index cff77b3b03..77a27a2cf3 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -59,7 +59,7 @@
   allowedDepartments:
   - Medical
   allowedJobs:
-  - Zookeeper
+  - Zookeeper # DeltaV - Keep Zookeeper/Boxer
   metabolisms:
     Poison:
       metabolismRate: 0.25 # DeltaV: chloral hydrate should last longer for surgery
@@ -447,7 +447,7 @@
             type: [Animal]
           - !type:ReagentCondition  # DeltaV - No longer causes vomitting at the lightest whiff of coffee
             reagent: Histamine
-            min: 0.5 
+            min: 0.5
 
 - type: reagent
   id: Amatoxin
@@ -581,7 +581,7 @@
   - Security
   - Medical
   allowedJobs:
-  - Zookeeper
+  - Zookeeper # DeltaV - Keep Zookeeper/Boxer
   color: "#AAAAAA"
   metabolisms:
     Poison:
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index fbc33bbfc5..8594b96052 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -19,7 +19,7 @@
   roles:
   - Bartender
   - Botanist
-  - Boxer
+  - Boxer # DeltaV - Keep Zookeeper/Boxer
   # - Chaplain # DeltaV - Move Chaplain into Epistemics
   - Chef
   - Clown
@@ -32,7 +32,7 @@
   - Passenger
   - Reporter
   - Visitor
-  - Zookeeper
+  - Zookeeper # DeltaV - Keep Zookeeper/Boxer
   - ServiceWorker
   - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
   - Prisoner # Nyanotrasen - Prisoner, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -158,9 +158,9 @@
   color: "#9FED58"
   weight: 10
   roles:
-  - Boxer
+  - Boxer # DeltaV - Keep Zookeeper/Boxer
   - Reporter
-  - Zookeeper
+  - Zookeeper # DeltaV - Keep Zookeeper/Boxer
   - Psychologist
   - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
   - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index 26647e79ae..1bc37757ce 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -147,9 +147,3 @@
 
 - type: playTimeTracker
   id: JobWarden
-
-- type: playTimeTracker
-  id: JobBoxer
-
-- type: playTimeTracker
-  id: JobZookeeper
diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/job.yml b/Resources/Prototypes/_DV/Catalog/Uplink/job.yml
index 15660e9437..440c4ac682 100644
--- a/Resources/Prototypes/_DV/Catalog/Uplink/job.yml
+++ b/Resources/Prototypes/_DV/Catalog/Uplink/job.yml
@@ -14,3 +14,20 @@
   - !type:BuyerDepartmentCondition
     whitelist:
     - Logistics
+
+- type: listing
+  id: uplinkRiggedBoxingGlovesBoxer
+  name: uplink-rigged-boxing-gloves-name
+  description: uplink-rigged-boxing-gloves-desc
+  productEntity: ClothingHandsGlovesBoxingRigged
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+    - UplinkJob
+  conditions:
+    - !type:BuyerJobCondition
+      whitelist:
+        - Boxer
diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
index ab8045d4ee..c137b476b6 100644
--- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
@@ -118,3 +118,27 @@
     - state: green
     - sprite: _DV/Markers/jobs.rsi
       state: surgeon
+
+- type: entity
+  id: SpawnPointBoxer
+  parent: SpawnPointJobBase
+  name: boxer
+  components:
+  - type: SpawnPoint
+    job_id: Boxer
+  - type: Sprite
+    layers:
+      - state: green
+      - state: boxer
+
+- type: entity
+  id: SpawnPointZookeeper
+  parent: SpawnPointJobBase
+  name: zookeeper
+  components:
+  - type: SpawnPoint
+    job_id: Zookeeper
+  - type: Sprite
+    layers:
+      - state: green
+      - state: zookeeper
diff --git a/Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml
new file mode 100644
index 0000000000..395bb2500f
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml
@@ -0,0 +1,9 @@
+# contraband restricted by job by some degree
+- type: entity
+  id: BaseSecurityBartenderZookeeperContraband
+  parent: BaseRestrictedContraband
+  abstract: true
+  components:
+  - type: Contraband
+    allowedDepartments: [ Security ]
+    allowedJobs: [ Bartender, Zookeeper ]
diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml
similarity index 100%
rename from Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
rename to Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml
diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml
new file mode 100644
index 0000000000..8b98ba8446
--- /dev/null
+++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml
@@ -0,0 +1,23 @@
+- type: loadout
+  id: LizardPlushieBoxer
+  effects:
+    - !type:JobRequirementLoadoutEffect
+      requirement:
+        !type:RoleTimeRequirement
+        role: JobBoxer
+        time: 72000 # 20hr
+  storage:
+    back:
+      - PlushieLizardJobBoxer
+
+- type: loadout
+  id: LizardPlushieZookeeper
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobZookeeper
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobZookeeper
diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
index 87a3ef09e3..595cf237b9 100644
--- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
@@ -1023,3 +1023,34 @@
   groups:
   - GroupEVATankERT
   - SurvivalExtended
+
+# Wildcards
+- type: loadoutGroup
+  id: BoxerJumpsuit
+  name: loadout-group-boxer-jumpsuit
+  loadouts:
+  - BoxerShorts
+  - BoxerShortsWithTop
+
+- type: loadoutGroup
+  id: BoxerGloves
+  name: loadout-group-boxer-gloves
+  loadouts:
+  - RedBoxingGloves
+  - BlueBoxingGloves
+  - GreenBoxingGloves
+  - YellowBoxingGloves
+
+- type: loadoutGroup
+  id: BoxerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieBoxer
+
+- type: loadoutGroup
+  id: ZookeeperJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieZookeeper
diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
index 0ed993c7d6..5991b62ebc 100644
--- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
@@ -126,3 +126,28 @@
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
+
+# Wildcards
+- type: roleLoadout
+  id: JobZookeeper
+  groups:
+  - GroupTankHarness
+  - CommonBackpack
+  - Glasses
+  - Survival
+  - Trinkets
+  - ZookeeperJobTrinkets
+  - GroupSpeciesBreathTool
+
+- type: roleLoadout
+  id: JobBoxer
+  groups:
+  - GroupTankHarness
+  - BoxerJumpsuit
+  - BoxerGloves
+  - CommonBackpack
+  - Glasses
+  - Survival
+  - Trinkets
+  - BoxerJobTrinkets
+  - GroupSpeciesBreathTool
diff --git a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml
index 24c2909749..11e7efc34d 100644
--- a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml
@@ -48,3 +48,9 @@
 
 - type: playTimeTracker
   id: JobCentralCommandIntern
+
+- type: playTimeTracker
+  id: JobBoxer
+
+- type: playTimeTracker
+  id: JobZookeeper

From 840ee598c26390be676670d92fade85fc3043e13 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Sun, 7 Dec 2025 06:42:34 -0500
Subject: [PATCH 045/360] Fixed hyperzine (micro)injector descriptions (#41755)

---
 .../Entities/Objects/Specific/Medical/hypospray.yml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 1a6301d034..ba30d5966e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -567,7 +567,7 @@
   parent: [ChemicalMedipen, BaseSyndicateContraband]
   id: Stimpack
   name: hyperzine injector
-  description: A chemical injector containing a large shot of pure hyperzine. For when it's time to throw down. Effects last for about 30 seconds.
+  description: A chemical injector containing a large shot of pure hyperzine. For when it's time to throw down. Effects last for about 60 seconds.
   components:
   - type: Item
     inhandVisuals:
@@ -606,7 +606,7 @@
   parent: [ChemicalMedipen, BaseSyndicateContraband]
   id: StimpackMini
   name: hyperzine microinjector
-  description: A chemical microinjector containing a small shot of pure hyperzine. Effects last for about 15 seconds.
+  description: A chemical microinjector containing a small shot of pure hyperzine. Effects last for about 30 seconds.
   components:
   - type: Item
     inhandVisuals:

From d9ff2d736f1b6427bc4f4047227fbc5c7969be62 Mon Sep 17 00:00:00 2001
From: Velken <8467292+Velken@users.noreply.github.com>
Date: Sun, 7 Dec 2025 10:25:57 -0300
Subject: [PATCH 046/360] Snap Booms (fake snap pops) (#38654)

* snap booms

* damage nerf

* fixing brain issue of being 8am and i havent slept yet

* typo

* Update damage and name

* Fix linter issues

* fixed typo snapPopFake -> snapPopExplosive

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---
 .../Entities/Objects/Fun/snap_pops.yml        |  3 +++
 .../Entities/Objects/Weapons/Bombs/funny.yml  | 15 +++++++++++
 .../Graphs/weapons/snappop_explosive.yml      | 25 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/weapons/snappop_explosive.yml

diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
index df567912ec..4392103805 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
@@ -33,6 +33,9 @@
     maxIntensity: 0.01
     intensitySlope: 1
     totalIntensity: 0.01
+  - type: Construction
+    graph: SnapPopExplosiveGraph
+    node: snapPop
 
 - type: entity
   parent: BaseStorageItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 298b9d7c12..1618611e2c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -131,3 +131,18 @@
   - type: Tag
     tags:
     - Banana
+
+- type: entity
+  parent: SnapPop
+  id: SnapPopExplosive
+  suffix: explosive
+  components:
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 0.8
+    intensitySlope: 1
+    totalIntensity: 3.5
+    canCreateVacuum: false
+  - type: Construction
+    graph: SnapPopExplosiveGraph
+    node: snapPopExplosive
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/snappop_explosive.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/snappop_explosive.yml
new file mode 100644
index 0000000000..7f6905a7b8
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/snappop_explosive.yml
@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: SnapPopExplosiveGraph
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: snapPop #have to make a start step to have the behaviour of clicking on a snap pop with gunpowder to make the fake one. Since there is no recipe for them on the construction menu, the materials bellow have no real meaning.
+      steps:
+      - material: Gunpowder
+        amount: 1
+      - material: Paper
+        amount: 4
+        doAfter: 4
+  - node: snapPop
+    entity: SnapPop
+    edges:
+      - to: snapPopExplosive
+        steps:
+          - material: Gunpowder
+            doAfter: 1
+  - node: snapPopExplosive
+    actions:
+    - !type:AdminLog
+      message: "A fake snap pop was crafted"
+    entity: SnapPopExplosive

From c403fcf88725dc61f59d5ba680be65a264874f44 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 7 Dec 2025 08:14:38 -0800
Subject: [PATCH 047/360] Add GenPop Enter/Leave to ID Card Computer. Add
 shuffle the accesses a bit. (#41739)

fixe

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Client/Access/UI/AccessLevelControl.xaml              | 2 +-
 Resources/Prototypes/Roles/Jobs/Security/detective.yml        | 2 --
 Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml | 2 ++
 Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml   | 2 --
 Resources/Prototypes/Roles/Jobs/Security/security_officer.yml | 2 --
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml b/Content.Client/Access/UI/AccessLevelControl.xaml
index 56968d8983..6a3155effa 100644
--- a/Content.Client/Access/UI/AccessLevelControl.xaml
+++ b/Content.Client/Access/UI/AccessLevelControl.xaml
@@ -1,4 +1,4 @@
 <GridContainer xmlns="https://spacestation14.io"
-               Columns="5"
+               Columns="4"
                HorizontalAlignment="Center">
 </GridContainer>
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index 4ab6f68fba..dedee4b684 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -18,8 +18,6 @@
   - Detective
   - Cryogenics
   - External
-  - GenpopEnter
-  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 1ad774ac9b..b031f77456 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -34,6 +34,8 @@
   - Detective
   - Corpsman # DeltaV - added Corpsman access
   - Cryogenics
+  - GenpopEnter
+  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 58ce8ffa92..bf2d9d3caf 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -20,8 +20,6 @@
   - Maintenance
   - External
   #- Cryogenics # DeltaV - No looting cryo for cadets
-  - GenpopEnter
-  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index 4683eaf604..913d3a5ca6 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -17,8 +17,6 @@
   - Maintenance
   - External
   #- Cryogenics # DeltaV - No looting cryo for basic sec
-  - GenpopEnter
-  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]

From 0811cea56e1321fee6cf14da258e2c393d3fcd80 Mon Sep 17 00:00:00 2001
From: cammusubi <122420207+cammusubi@users.noreply.github.com>
Date: Sun, 7 Dec 2025 10:36:20 -0600
Subject: [PATCH 048/360] Green Glowsticks are their own entity (#41712)

* Addresses and resolves Issue #41145, creates a separate entity for green glowsticks, which were previously just the base glowstick.

* Adds old+new ID for green glowsticks to migration.yml, refactors formatting in glowstick.yml
---
 Resources/Maps/Salvage/small-party.yml        |   2 +-
 Resources/Migrations/migration.yml            |   3 +
 .../Prototypes/Catalog/Fills/Crates/fun.yml   |   2 +-
 .../Catalog/Fills/Crates/permaescape.yml      |   6 +-
 .../Catalog/Fills/Items/toolboxes.yml         |   2 +-
 .../Clothing/Back/smuggler_tables.yml         |   2 +-
 .../Markers/Spawners/Random/maintenance.yml   |   2 +-
 .../Entities/Objects/Decoration/present.yml   |   2 +-
 .../Entities/Objects/Tools/glowstick.yml      | 478 +++++++++---------
 .../Structures/Machines/Computers/arcades.yml |   2 +-
 10 files changed, 258 insertions(+), 243 deletions(-)

diff --git a/Resources/Maps/Salvage/small-party.yml b/Resources/Maps/Salvage/small-party.yml
index 2b3d7f7d48..d3dd6fc6e8 100644
--- a/Resources/Maps/Salvage/small-party.yml
+++ b/Resources/Maps/Salvage/small-party.yml
@@ -285,7 +285,7 @@ entities:
     - type: Transform
       pos: 5.4233127,3.0429564
       parent: 1
-- proto: GlowstickBase
+- proto: GlowstickGreen
   entities:
   - uid: 69
     components:
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index aa4ad72904..80281c5641 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -693,6 +693,9 @@ ToySkeleton: ToyFigurineSkeleton
 # 2025-10-28
 DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
 
+# 2025-12-05
+GlowstickBase: GlowstickGreen
+
 # 2025-12-06 # DeltaV - We keep Zookeeper/Boxer
 #SpawnPointZookeeper: null
 #SpawnPointBoxer: null
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index cb40b508f7..f64cddb565 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -428,7 +428,7 @@
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: GlowstickBase
+        - id: GlowstickGreen
           amount: 2
         - id: GlowstickBlue
           amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
index 3cf7e72eb0..1516cb71c7 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -159,11 +159,11 @@
           prob: 0.20
         - id: GlowstickBlue
           prob: 0.05
-        - id: GlowstickBase
+        - id: GlowstickGreen
           prob: 0.50
-        - id: GlowstickBase
+        - id: GlowstickGreen
           prob: 0.20
-        - id: GlowstickBase
+        - id: GlowstickGreen
           prob: 0.05
         - id: GlowstickPurple
           prob: 0.50
diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index f02a0f75b2..577941de0d 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -17,7 +17,7 @@
           children:
           - id: FlashlightLantern
           - id: Flare
-          - id: GlowstickBase
+          - id: GlowstickGreen
         # Low-chance items
         - id: FoodPSB # DeltaV - replaced FoodSnackChocolate
           prob: 0.15
diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
index 5ab753ef3d..0ca86d3c20 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
@@ -167,7 +167,7 @@
     children:
     - id: SpaceCash100
       weight: 2
-    - id: GlowstickBase
+    - id: GlowstickGreen
       amount: !type:RangeNumberSelector
         range: 1, 5
     - id: GlowstickRed
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 64fe13ec6b..3d13f0aa75 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -281,7 +281,7 @@
       - id: trayScanner
       - id: HandheldGPSBasic
       - id: HandLabeler
-      - id: GlowstickBase
+      - id: GlowstickGreen
       - id: Bucket
       - id: RadioHandheld
       - id: AppraisalTool
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index bbcb99a141..7ab6396de2 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -368,7 +368,7 @@
         orGroup: GiftPool
       - id: Bola
         orGroup: GiftPool
-      - id: GlowstickBase
+      - id: GlowstickGreen
         orGroup: GiftPool
       - id: GlowstickBlue
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index a305e69102..be1f9066cc 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -1,113 +1,125 @@
 - type: entity
-  name: green glowstick
+  abstract: true
   parent: BaseItem
   id: GlowstickBase
+  name: glowstick
   description: Useful for raves and emergencies.
   components:
-    - type: SpaceGarbage
-    - type: ExpendableLight
-      glowDuration: 900 # time in seconds
-      glowColorLit: "#00FF00"
-      fadeOutDuration: 300
-      turnOnBehaviourID: turn_on
-      fadeOutBehaviourID: fade_out
-      iconStateLit: glowstick_lit
-      iconStateSpent: glowstick_unlit
-      litRadius: 5.0 # DeltaV
-      litEnergy: 3.0 # DeltaV
-      litSound:
-        path: /Audio/Items/Handcuffs/rope_breakout.ogg
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-      - map: [ enum.ExpendableLightVisualLayers.Base ]
-        state: glowstick_base
-      - map: [ enum.ExpendableLightVisualLayers.Glow ]
-        state: glowstick_glow
-        visible: false
-        shader: unshaded
-      - map: [ enum.ExpendableLightVisualLayers.Overlay ]
-        state: glowstick_unlit
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-      storedRotation: -45
-    - type: Appearance
-    - type: PointLight
-      enabled: false
-      color: "#00FF00"
-      radius: 5
-      energy: 0
-      netsync: false
-    - type: LightBehaviour
-      behaviours:
-        - !type:FadeBehaviour # slowly fade in once activated
-          id: turn_on
-          interpolate: Linear
-          maxDuration: 10.0
-          startValue: 0.0
-          endValue: 3.0
-          property: Energy
-        - !type:FadeBehaviour # fade out energy as it burns out
-          id: fade_out
-          interpolate: Linear
-          maxDuration: 10 # 300.0
-          startValue: 3.0
-          endValue: 0.2
-          property: Energy
-        - !type:FadeBehaviour # fade out radius as it burns out
-          id: fade_out
-          interpolate: Linear
-          maxDuration: 10 # 300.0
-          startValue: 5.0
-          endValue: 1.5
-    - type: Tag
-      tags:
-      - Trash
+  - type: SpaceGarbage
+  - type: ExpendableLight
+    glowDuration: 900 # time in seconds
+    glowColorLit: "#F6F7E9"
+    fadeOutDuration: 300
+    turnOnBehaviourID: turn_on
+    fadeOutBehaviourID: fade_out
+    iconStateLit: glowstick_lit
+    iconStateSpent: glowstick_unlit
+    litRadius: 5.0 # DeltaV
+    litEnergy: 3.0 # DeltaV
+    litSound:
+      path: /Audio/Items/Handcuffs/rope_breakout.ogg
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - map: [ enum.ExpendableLightVisualLayers.Base ]
+      state: glowstick_base
+    - map: [ enum.ExpendableLightVisualLayers.Glow ]
+      state: glowstick_glow
+      visible: false
+      shader: unshaded
+    - map: [ enum.ExpendableLightVisualLayers.Overlay ]
+      state: glowstick_unlit
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+    storedRotation: -45
+  - type: Appearance
+  - type: PointLight
+    enabled: false
+    color: "#F6F7E9"
+    radius: 5
+    energy: 0
+    netsync: false
+  - type: LightBehaviour
+    behaviours:
+    - !type:FadeBehaviour # slowly fade in once activated
+      id: turn_on
+      interpolate: Linear
+      maxDuration: 10.0
+      startValue: 0.0
+      endValue: 3.0
+      property: Energy
+    - !type:FadeBehaviour # fade out energy as it burns out
+      id: fade_out
+      interpolate: Linear
+      maxDuration: 10 # 300.0
+      startValue: 3.0
+      endValue: 0.2
+      property: Energy
+    - !type:FadeBehaviour # fade out radius as it burns out
+      id: fade_out
+      interpolate: Linear
+      maxDuration: 10 # 300.0
+      startValue: 5.0
+      endValue: 1.5
+  - type: Tag
+    tags:
+    - Trash
 
 - type: entity
-  name: red glowstick
   parent: GlowstickBase
   id: GlowstickRed
+  name: red glowstick
   components:
-    - type: ExpendableLight
-      spentName: expendable-light-spent-red-glowstick-name
-      glowColorLit: "#FF0000"
-    - type: PointLight
-      color: "#FF0000"
+  - type: ExpendableLight
+    spentName: expendable-light-spent-red-glowstick-name
+    glowColorLit: "#FF0000"
+  - type: PointLight
+    color: "#FF0000"
 
 - type: entity
-  name: purple glowstick
   parent: GlowstickBase
   id: GlowstickPurple
+  name: purple glowstick
   components:
-    - type: ExpendableLight
-      spentName: expendable-light-spent-purple-glowstick-name
-      glowColorLit: "#FF00FF"
-    - type: PointLight
-      color: "#FF00FF"
+  - type: ExpendableLight
+    spentName: expendable-light-spent-purple-glowstick-name
+    glowColorLit: "#FF00FF"
+  - type: PointLight
+    color: "#FF00FF"
 
 - type: entity
-  name: yellow glowstick
   parent: GlowstickBase
   id: GlowstickYellow
+  name: yellow glowstick
   components:
-    - type: ExpendableLight
-      spentName: expendable-light-spent-yellow-glowstick-name
-      glowColorLit: "#FFFF00"
-    - type: PointLight
-      color: "#FFFF00"
+  - type: ExpendableLight
+    spentName: expendable-light-spent-yellow-glowstick-name
+    glowColorLit: "#FFFF00"
+  - type: PointLight
+    color: "#FFFF00"
 
 - type: entity
-  name: blue glowstick
   parent: GlowstickBase
   id: GlowstickBlue
+  name: blue glowstick
   components:
-    - type: ExpendableLight
-      spentName: expendable-light-spent-blue-glowstick-name
-      glowColorLit: "#0000FF"
-    - type: PointLight
-      color: "#0000FF"
+  - type: ExpendableLight
+    spentName: expendable-light-spent-blue-glowstick-name
+    glowColorLit: "#0000FF"
+  - type: PointLight
+    color: "#0000FF"
+
+- type: entity
+  parent: GlowstickBase
+  id: GlowstickGreen
+  name: green glowstick
+  components:
+  - type: ExpendableLight
+    spentName: expendable-light-spent-green-glowstick-name
+    glowColorLit: "#00FF00"
+  - type: PointLight
+    color: "#00FF00"
 
 # ----------------------------------------------------------------------------
 # THE FOLLOWING ARE ALL DUMMY ENTITIES USED TO TEST THE LIGHT BEHAVIOUR SYSTEM
@@ -118,30 +130,30 @@
   id: LightBehaviourTest1
   categories: [ HideSpawnMenu ]
   components:
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-        - state: glowstick_base
-        - state: glowstick_unlit
-          shader: unshaded
-          color: "#FF0000"
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-    - type: PointLight
-      enabled: true
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - state: glowstick_base
+    - state: glowstick_unlit
+      shader: unshaded
       color: "#FF0000"
-      radius: 5
-    - type: LightBehaviour
-      behaviours:
-        - !type:PulseBehaviour
-          interpolate: Cubic
-          maxDuration: 10.0
-          startValue: 1.0
-          endValue: 7.0
-          isLooped: true
-          property: Energy
-          enabled: true
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+  - type: PointLight
+    enabled: true
+    color: "#FF0000"
+    radius: 5
+  - type: LightBehaviour
+    behaviours:
+    - !type:PulseBehaviour
+      interpolate: Cubic
+      maxDuration: 10.0
+      startValue: 1.0
+      endValue: 7.0
+      isLooped: true
+      property: Energy
+      enabled: true
 
 - type: entity
   name: color cycle test
@@ -149,31 +161,31 @@
   id: LightBehaviourTest2
   categories: [ HideSpawnMenu ]
   components:
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-        - state: glowstick_base
-        - state: glowstick_unlit
-          shader: unshaded
-          color: "#FF0000"
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-    - type: PointLight
-      enabled: true
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - state: glowstick_base
+    - state: glowstick_unlit
+      shader: unshaded
       color: "#FF0000"
-      radius: 5
-    - type: LightBehaviour
-      behaviours:
-        - !type:ColorCycleBehaviour
-          interpolate: Nearest
-          maxDuration: 0.8
-          isLooped: true
-          enabled: true
-          colors:
-            - red
-            - blue
-            - green
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+  - type: PointLight
+    enabled: true
+    color: "#FF0000"
+    radius: 5
+  - type: LightBehaviour
+    behaviours:
+    - !type:ColorCycleBehaviour
+      interpolate: Nearest
+      maxDuration: 0.8
+      isLooped: true
+      enabled: true
+      colors:
+      - red
+      - blue
+      - green
 
 - type: entity
   name: multi-behaviour light test
@@ -181,39 +193,39 @@
   id: LightBehaviourTest3
   categories: [ HideSpawnMenu ]
   components:
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-        - state: glowstick_base
-        - state: glowstick_unlit
-          shader: unshaded
-          color: "#FF0000"
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-    - type: PointLight
-      enabled: false
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - state: glowstick_base
+    - state: glowstick_unlit
+      shader: unshaded
       color: "#FF0000"
-      radius: 5
-    - type: LightBehaviour
-      behaviours:
-        - !type:PulseBehaviour
-          interpolate: Nearest
-          minDuration: 0.2
-          maxDuration: 1.0
-          endValue: 0.2
-          property: AnimatedEnable
-          isLooped: true
-          enabled: true
-        - !type:ColorCycleBehaviour
-          interpolate: Cubic
-          maxDuration: 0.8
-          isLooped: true
-          enabled: true
-          colors:
-            - red
-            - blue
-            - green
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+  - type: PointLight
+    enabled: false
+    color: "#FF0000"
+    radius: 5
+  - type: LightBehaviour
+    behaviours:
+    - !type:PulseBehaviour
+      interpolate: Nearest
+      minDuration: 0.2
+      maxDuration: 1.0
+      endValue: 0.2
+      property: AnimatedEnable
+      isLooped: true
+      enabled: true
+    - !type:ColorCycleBehaviour
+      interpolate: Cubic
+      maxDuration: 0.8
+      isLooped: true
+      enabled: true
+      colors:
+      - red
+      - blue
+      - green
 
 - type: entity
   name: light fade in test
@@ -221,30 +233,30 @@
   id: LightBehaviourTest4
   categories: [ HideSpawnMenu ]
   components:
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-        - state: glowstick_base
-        - state: glowstick_unlit
-          shader: unshaded
-          color: "#FF0000"
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-    - type: PointLight
-      enabled: false
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - state: glowstick_base
+    - state: glowstick_unlit
+      shader: unshaded
       color: "#FF0000"
-      radius: 5
-    - type: LightBehaviour
-      behaviours:
-        - !type:FadeBehaviour
-          interpolate: Cubic
-          maxDuration: 5.0
-          startValue: 0.0
-          endValue: 10.0
-          isLooped: true
-          property: Energy
-          enabled: true
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+  - type: PointLight
+    enabled: false
+    color: "#FF0000"
+    radius: 5
+  - type: LightBehaviour
+    behaviours:
+    - !type:FadeBehaviour
+      interpolate: Cubic
+      maxDuration: 5.0
+      startValue: 0.0
+      endValue: 10.0
+      isLooped: true
+      property: Energy
+      enabled: true
 
 - type: entity
   name: light pulse radius test
@@ -252,30 +264,30 @@
   id: LightBehaviourTest5
   categories: [ HideSpawnMenu ]
   components:
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-        - state: glowstick_base
-        - state: glowstick_unlit
-          shader: unshaded
-          color: "#FF0000"
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-    - type: PointLight
-      enabled: false
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - state: glowstick_base
+    - state: glowstick_unlit
+      shader: unshaded
       color: "#FF0000"
-      radius: 5
-    - type: LightBehaviour
-      behaviours:
-        - !type:PulseBehaviour
-          interpolate: Cubic
-          minDuration: 1.0
-          maxDuration: 5.0
-          startValue: 2.0
-          endValue: 10.0
-          isLooped: true
-          enabled: true
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+  - type: PointLight
+    enabled: false
+    color: "#FF0000"
+    radius: 5
+  - type: LightBehaviour
+    behaviours:
+    - !type:PulseBehaviour
+      interpolate: Cubic
+      minDuration: 1.0
+      maxDuration: 5.0
+      startValue: 2.0
+      endValue: 10.0
+      isLooped: true
+      enabled: true
 
 - type: entity
   name: light randomize radius test
@@ -283,27 +295,27 @@
   id: LightBehaviourTest6
   categories: [ HideSpawnMenu ]
   components:
-    - type: Sprite
-      sprite: Objects/Misc/glowstick.rsi
-      layers:
-        - state: glowstick_base
-        - state: glowstick_unlit
-          shader: unshaded
-          color: "#FF0000"
-    - type: Item
-      sprite: Objects/Misc/glowstick.rsi
-      heldPrefix: unlit
-    - type: PointLight
-      enabled: false
+  - type: Sprite
+    sprite: Objects/Misc/glowstick.rsi
+    layers:
+    - state: glowstick_base
+    - state: glowstick_unlit
+      shader: unshaded
       color: "#FF0000"
-      radius: 5
-      energy: 10
-    - type: LightBehaviour
-      behaviours:
-        - !type:RandomizeBehaviour
-          interpolate: Nearest
-          maxDuration: 0.5
-          startValue: 10.0
-          endValue: 25.0
-          isLooped: true
-          enabled: true
+  - type: Item
+    sprite: Objects/Misc/glowstick.rsi
+    heldPrefix: unlit
+  - type: PointLight
+    enabled: false
+    color: "#FF0000"
+    radius: 5
+    energy: 10
+  - type: LightBehaviour
+    behaviours:
+    - !type:RandomizeBehaviour
+      interpolate: Nearest
+      maxDuration: 0.5
+      startValue: 10.0
+      endValue: 25.0
+      isLooped: true
+      enabled: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 826fb16907..4513fdebd5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -88,7 +88,7 @@
     - FoamBlade
     - FoamCutlass
     - Football
-    - GlowstickBase #green
+    - GlowstickGreen
     - GlowstickBlue
     - GlowstickYellow
     - GlowstickPurple

From 0f378c7f04a44e4d90b522c2d688781066ce1dd2 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 9 Feb 2026 18:32:39 +0100
Subject: [PATCH 049/360] Downstream fixes for #41712 (Green glowsticks)

---
 .../Entities/Markers/Spawners/Random/randomitems.yml      | 2 +-
 .../Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
index b4798abe44..630522170c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
@@ -204,7 +204,7 @@
       #Glowsticks
       - !type:GroupSelector
         children:
-        - id: GlowstickBase
+        - id: GlowstickGreen
           amount: !type:RangeNumberSelector
             range: 1, 4
         - id: GlowstickRed
diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml
index 373ff072b8..97fb2bf5b1 100644
--- a/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml
@@ -23,7 +23,7 @@
     shoes: ClothingShoesColorWhite
     id: MedicalIDCard
     pocket1: Brutepack
-    pocket2: GlowstickBase
+    pocket2: GlowstickGreen
     belt: ClothingBeltMedical
 
 
@@ -34,7 +34,7 @@
     shoes: ClothingShoesBootsJack
     id: SecurityIDCard
     pocket1: Flash
-    pocket2: GlowstickBase
+    pocket2: GlowstickGreen
 
 - type: startingGear
   id: OldstationEngi
@@ -45,7 +45,7 @@
     mask: ClothingMaskBreath
     gloves: ClothingHandsGlovesColorYellowBudget
     pocket1: EmergencyOxygenTankFilled
-    pocket2: GlowstickBase
+    pocket2: GlowstickGreen
     belt: ClothingBeltUtility
 
 - type: startingGear
@@ -55,7 +55,7 @@
     shoes: ClothingShoesColorWhite
     id: ResearchIDCard
     pocket1: Pen
-    pocket2: GlowstickBase
+    pocket2: GlowstickGreen
 
 #Syndicate Pirate Radio Listener
 

From 142f2f54e4a568db41aa81deea11fe075da1a9f7 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Sun, 7 Dec 2025 14:52:27 -0300
Subject: [PATCH 050/360] Make xenoborg light brighter (#41580)

* make light better

* minor color fix
---
 .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 1fb5bd337f..d491d45637 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -567,7 +567,8 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: PointLight
-    color: "#0033ff"
+    color: "#3010ff"
+    energy: 7
   - type: GuideHelp
     guides:
     - Cyborgs

From a43a971461b60374bd9efa0f3635bf260d81c9a9 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Sun, 7 Dec 2025 15:54:10 -0400
Subject: [PATCH 051/360] TriggerOnUiOpen/Close (#41718)

* feat: TriggerOnUiOpen/Close

* chore: minor clarification

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs

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

* chore: review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Triggers/TriggerOnUiCloseComponent.cs     | 18 ++++++++++++++++++
 .../Triggers/TriggerOnUiOpenComponent.cs      | 18 ++++++++++++++++++
 .../Systems/TriggerSystem.Interaction.cs      | 19 +++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs

diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs
new file mode 100644
index 0000000000..695f2965e1
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when a user closes a UI belonging to the owning entity.
+/// The user is the actor that tries to open a UI.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUiCloseComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// If it should only work on specific UIs.
+    /// Null means it will work on any UI key.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<Enum>? UiKeys;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs
new file mode 100644
index 0000000000..bf83b7e996
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when a user opens a UI belonging to the owning entity.
+/// The user is the actor that tries to open a UI.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUiOpenComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// If it should only work on specific UIs.
+    /// Null means it will work on any UI key.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<Enum>? UiKeys;
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
index 62f483e876..944239ccf8 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
@@ -21,6 +21,9 @@ public sealed partial class TriggerSystem
         SubscribeLocalEvent<TriggerOnThrowComponent, ThrowEvent>(OnThrow);
         SubscribeLocalEvent<TriggerOnThrownComponent, ThrownEvent>(OnThrown);
 
+        SubscribeLocalEvent<TriggerOnUiOpenComponent, BoundUIOpenedEvent>(OnUiOpened);
+        SubscribeLocalEvent<TriggerOnUiCloseComponent, BoundUIClosedEvent>(OnUiClosed);
+
         SubscribeLocalEvent<ItemToggleOnTriggerComponent, TriggerEvent>(HandleItemToggleOnTrigger);
         SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(HandleAnchorOnTrigger);
         SubscribeLocalEvent<UseDelayOnTriggerComponent, TriggerEvent>(HandleUseDelayOnTrigger);
@@ -83,6 +86,22 @@ public sealed partial class TriggerSystem
         Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 
+    private void OnUiOpened(Entity<TriggerOnUiOpenComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        if (ent.Comp.UiKeys == null || ent.Comp.UiKeys.Contains(args.UiKey))
+        {
+            Trigger(ent, args.Actor, ent.Comp.KeyOut);
+        }
+    }
+
+    private void OnUiClosed(Entity<TriggerOnUiCloseComponent> ent, ref BoundUIClosedEvent args)
+    {
+        if (ent.Comp.UiKeys == null || ent.Comp.UiKeys.Contains(args.UiKey))
+        {
+            Trigger(ent, args.Actor, ent.Comp.KeyOut);
+        }
+    }
+
     private void HandleItemToggleOnTrigger(Entity<ItemToggleOnTriggerComponent> ent, ref TriggerEvent args)
     {
         if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))

From ee0108ce3c778499d1fe6f2034a80f9a9a442437 Mon Sep 17 00:00:00 2001
From: RedSpy <127129838+RedSpyy@users.noreply.github.com>
Date: Sun, 7 Dec 2025 23:10:01 +0300
Subject: [PATCH 052/360] Hitscans now have names (#41763)

Co-authored-by: RedSpyy <empty@place.com>
---
 .../Objects/Weapons/Guns/Projectiles/hitscan.yml      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 57aa25885a..6bacac55a6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -18,6 +18,7 @@
 
 - type: entity
   id: BasicHitscan
+  name: basic laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanAmmo
@@ -38,6 +39,7 @@
 - type: entity
   parent: BasicHitscan
   id: RedLightLaser
+  name: red light laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -48,6 +50,7 @@
 - type: entity
   parent: BasicHitscan
   id: RedLaser
+  name: red laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -58,6 +61,7 @@
 - type: entity
   parent: BasicHitscan
   id: RedMediumLaser
+  name: red amplified laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -68,6 +72,7 @@
 - type: entity
   parent: BasicHitscan
   id: RedHeavyLaser
+  name: red high-energy laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -88,6 +93,7 @@
 - type: entity
   parent: BasicHitscan
   id: RedLaserPractice
+  name: red practice laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -98,6 +104,7 @@
 - type: entity
   parent: BasicHitscan
   id: XrayLaser
+  name: X-ray pulse beam
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -119,6 +126,7 @@
 - type: entity
   parent: BasicHitscan
   id: Pulse
+  name: blue high-energy laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -139,6 +147,7 @@
 - type: entity
   parent: BasicHitscan
   id: RedShuttleLaser
+  name: shuttle class red laser ray
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicRaycast
@@ -162,6 +171,7 @@
 - type: entity
   parent: BasicHitscan
   id: DebugLaser
+  name: debug laser ray
   suffix: DEBUG
   categories: [ HideSpawnMenu ]
   components:
@@ -183,6 +193,7 @@
 - type: entity
   parent: DebugLaser
   id: DebugLaserGib
+  name: debug gibbing ray
   suffix: DEBUG
   categories: [ HideSpawnMenu ]
   components:

From 1b8c60a71053803766f3b6289560e228767e0a5c Mon Sep 17 00:00:00 2001
From: Tiniest Shark <head.rebel@yahoo.com>
Date: Sun, 7 Dec 2025 15:14:49 -0500
Subject: [PATCH 053/360] Reverts Mop + Glowstick Storage Rotation (#41765)

diagonal pixels are ugly, sorry.
---
 .../Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml  | 1 -
 Resources/Prototypes/Entities/Objects/Tools/glowstick.yml        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 24a8ab979b..e9d4b66652 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -38,7 +38,6 @@
   - type: Item
     size: Large
     sprite: Objects/Specific/Janitorial/mop.rsi
-    storedRotation: 45
   - type: Absorbent
     useAbsorberSolution: true
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index be1f9066cc..2882e55b57 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -32,7 +32,6 @@
   - type: Item
     sprite: Objects/Misc/glowstick.rsi
     heldPrefix: unlit
-    storedRotation: -45
   - type: Appearance
   - type: PointLight
     enabled: false

From 1b9df03b050000adc1b24fc12ffd9b3464df28a7 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 24 Jan 2026 14:52:30 +0100
Subject: [PATCH 054/360] Removed map list from Boxer/Zookeeper's job
 descriptions

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

diff --git a/Resources/Locale/en-US/_DV/job/job-description.ftl b/Resources/Locale/en-US/_DV/job/job-description.ftl
index 89ce0bc5a9..e9ef0803d5 100644
--- a/Resources/Locale/en-US/_DV/job/job-description.ftl
+++ b/Resources/Locale/en-US/_DV/job/job-description.ftl
@@ -20,5 +20,5 @@ role-description-carpy = "Grrr!"
 role-description-shiva = "Hsssss!"
 role-description-pun-pun = "Ook!"
 
-job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog.
-job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis.
+job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win.
+job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see.

From 09f09ccc6292ec6d7ebee592163d2ceff50551cf Mon Sep 17 00:00:00 2001
From: Tiniest Shark <head.rebel@yahoo.com>
Date: Sun, 7 Dec 2025 17:28:39 -0500
Subject: [PATCH 055/360] Misc Proper Rotation Sprites (#41764)

* Proper rotation sprites.

* copyright mentions

* wrong one

* better ointment
---
 .../Entities/Clothing/Neck/ties.yml           |  26 +--
 .../Instruments/instruments_percussion.yml    |   5 +-
 .../Objects/Specific/Hydroponics/tools.yml    |  12 +-
 .../Objects/Specific/Medical/healing.yml      |   4 +-
 .../Objects/Specific/Service/barber.yml       |   4 +-
 .../Entities/Objects/Tools/gas_tanks.yml      |  22 ++-
 .../Clothing/Neck/Ties/dettie.rsi/meta.json   |  49 +++---
 .../Clothing/Neck/Ties/dettie.rsi/storage.png | Bin 0 -> 384 bytes
 .../Clothing/Neck/Ties/redtie.rsi/meta.json   |  57 ++++---
 .../Clothing/Neck/Ties/redtie.rsi/storage.png | Bin 0 -> 417 bytes
 .../Clothing/Neck/Ties/scitie.rsi/meta.json   |  57 ++++---
 .../Clothing/Neck/Ties/scitie.rsi/storage.png | Bin 0 -> 450 bytes
 .../Fun/Instruments/microphone.rsi/meta.json  |  41 ++---
 .../Instruments/microphone.rsi/storage.png    | Bin 0 -> 752 bytes
 .../Specific/Medical/medical.rsi/meta.json    |   5 +-
 .../Medical/medical.rsi/ointment-storage.png  | Bin 0 -> 318 bytes
 .../Objects/Tanks/emergency.rsi/meta.json     | 157 +++++++++---------
 .../Objects/Tanks/emergency.rsi/storage.png   | Bin 0 -> 442 bytes
 .../Tanks/emergency_clown.rsi/meta.json       | 147 ++++++++--------
 .../Tanks/emergency_clown.rsi/storage.png     | Bin 0 -> 530 bytes
 .../Tanks/emergency_double.rsi/meta.json      | 157 +++++++++---------
 .../Tanks/emergency_double.rsi/storage.png    | Bin 0 -> 632 bytes
 .../Tanks/emergency_double_red.rsi/icon.png   | Bin 648 -> 660 bytes
 .../Tanks/emergency_double_red.rsi/meta.json  | 147 ++++++++--------
 .../emergency_double_red.rsi/storage.png      | Bin 0 -> 648 bytes
 .../Tanks/emergency_extended.rsi/meta.json    | 147 ++++++++--------
 .../Tanks/emergency_extended.rsi/storage.png  | Bin 0 -> 468 bytes
 .../emergency_extended_red.rsi/meta.json      | 147 ++++++++--------
 .../emergency_extended_red.rsi/storage.png    | Bin 0 -> 443 bytes
 .../Objects/Tanks/emergency_red.rsi/meta.json | 147 ++++++++--------
 .../Tanks/emergency_red.rsi/storage.png       | Bin 0 -> 440 bytes
 .../Tanks/emergency_yellow.rsi/icon.png       | Bin 463 -> 461 bytes
 .../Tanks/emergency_yellow.rsi/meta.json      | 157 +++++++++---------
 .../Tanks/emergency_yellow.rsi/storage.png    | Bin 0 -> 465 bytes
 .../Tools/Hydroponics/clippers.rsi/meta.json  |  38 ++---
 .../Tools/Hydroponics/hatchet.rsi/meta.json   |  41 ++---
 .../Tools/Hydroponics/hatchet.rsi/storage.png | Bin 0 -> 464 bytes
 .../Tools/Hydroponics/hoe.rsi/meta.json       |  41 ++---
 .../Tools/Hydroponics/hoe.rsi/storage.png     | Bin 0 -> 378 bytes
 .../Tools/Hydroponics/scythe.rsi/meta.json    |  46 ++---
 .../Tools/Hydroponics/spade.rsi/meta.json     |  49 +++---
 .../Tools/Hydroponics/spade.rsi/storage.png   | Bin 0 -> 449 bytes
 .../Objects/Tools/scissors.rsi/meta.json      |  41 ++---
 .../Objects/Tools/scissors.rsi/storage.png    | Bin 0 -> 397 bytes
 44 files changed, 916 insertions(+), 828 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Neck/Ties/dettie.rsi/storage.png
 create mode 100644 Resources/Textures/Clothing/Neck/Ties/redtie.rsi/storage.png
 create mode 100644 Resources/Textures/Clothing/Neck/Ties/scitie.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/microphone.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_clown.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_double.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_double_red.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_extended.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_red.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tanks/emergency_yellow.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Tools/scissors.rsi/storage.png

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
index 2e172ae285..2c13dade47 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -1,13 +1,5 @@
 - type: entity
   parent: ClothingNeckBase
-  id: ClothingNeckTieBase
-  abstract: true
-  components:
-  - type: Item
-    storedRotation: -45
-
-- type: entity
-  parent: ClothingNeckTieBase
   id: ClothingNeckTieRed
   name: red-tie
   description: A neosilk clip-on red tie.
@@ -16,6 +8,10 @@
     sprite: Clothing/Neck/Ties/redtie.rsi
   - type: Clothing
     sprite: Clothing/Neck/Ties/redtie.rsi
+  - type: Item
+    storedSprite:
+      state: storage
+      sprite: Clothing/Neck/Ties/redtie.rsi
   - type: Tag
     tags:
     - HamsterWearable
@@ -24,7 +20,7 @@
     - Recyclable
 
 - type: entity
-  parent: ClothingNeckTieBase
+  parent: ClothingNeckBase
   id: ClothingNeckTieDet
   name: detective's tie
   description: A loosely tied necktie, a perfect accessory for the over-worked detective.
@@ -33,9 +29,13 @@
     sprite: Clothing/Neck/Ties/dettie.rsi
   - type: Clothing
     sprite: Clothing/Neck/Ties/dettie.rsi
-    
+  - type: Item
+    storedSprite:
+      state: storage
+      sprite: Clothing/Neck/Ties/dettie.rsi
+
 - type: entity
-  parent: ClothingNeckTieBase
+  parent: ClothingNeckBase
   id: ClothingNeckTieSci
   name: scientist's tie
   description: Why do we all have to wear these ridiculous ties?
@@ -44,6 +44,10 @@
     sprite: Clothing/Neck/Ties/scitie.rsi
   - type: Clothing
     sprite: Clothing/Neck/Ties/scitie.rsi
+  - type: Item
+    storedSprite:
+      state: storage
+      sprite: Clothing/Neck/Ties/scitie.rsi
   - type: Tag
     tags:
     - ClothMade
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index 4a5292713c..0450614ba6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -59,7 +59,10 @@
     sprite: Objects/Fun/Instruments/microphone.rsi
   - type: Item
     size: Small
-    storedRotation: -45
+    storedSprite:
+      state: storage
+      sprite: Objects/Fun/Instruments/microphone.rsi
+
 
 - type: entity
   parent: BasePercussionInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index fe632479ce..048a1bac67 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -19,7 +19,9 @@
         Slash: 6
   - type: Item
     sprite: Objects/Tools/Hydroponics/hoe.rsi
-    storedRotation: -135
+    storedSprite:
+      state: storage
+      sprite: Objects/Tools/Hydroponics/hoe.rsi
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -109,7 +111,9 @@
         Piercing: 2
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
-    storedRotation: -135
+    storedSprite:
+      state: storage
+      sprite: Objects/Tools/Hydroponics/hatchet.rsi
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -141,7 +145,9 @@
       collection: MetalThud
   - type: Item
     sprite: Objects/Tools/Hydroponics/spade.rsi
-    storedRotation: -45
+    storedSprite:
+      state: storage
+      sprite: Objects/Tools/Hydroponics/spade.rsi
   - type: Shovel
     speedModifier: 0.75 # slower at digging than a full-sized shovel
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index dac3eac03d..48310eb22c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -27,7 +27,9 @@
     state: ointment
   - type: Item
     heldPrefix: ointment
-    storedRotation: 45
+    storedSprite:
+      state: ointment-storage
+      sprite: Objects/Specific/Medical/medical.rsi
   - type: Healing
     damageContainers:
       - Biological
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index e26f33a0d9..4970c412f4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -8,7 +8,9 @@
     sprite: Objects/Tools/scissors.rsi
     state: icon
   - type: Item
-    storedRotation: 135
+    storedSprite:
+      state: storage
+      sprite: Objects/Tools/scissors.rsi
   - type: MagicMirror
     addSlotTime: 20
     removeSlotTime: 20
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index e4e9ce1db1..703c38a1ef 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -100,7 +100,9 @@
   - type: Item
     size: Small
     sprite: Objects/Tanks/emergency.rsi
-    storedRotation: -45
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency.rsi
   - type: GasTank
     air:
       volume: 0.66
@@ -129,6 +131,9 @@
     sprite: Objects/Tanks/emergency_red.rsi
   - type: Item
     sprite: Objects/Tanks/emergency_red.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency_red.rsi
   - type: Clothing
     sprite: Objects/Tanks/emergency_red.rsi
 
@@ -142,6 +147,9 @@
     sprite: Objects/Tanks/emergency_extended.rsi
   - type: Item
     sprite: Objects/Tanks/emergency_extended.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency_extended.rsi
   - type: GasTank
     air:
       volume: 1.5
@@ -159,6 +167,9 @@
     sprite: Objects/Tanks/emergency_extended_red.rsi
   - type: Item
     sprite: Objects/Tanks/emergency_extended_red.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency_extended_red.rsi
   - type: Clothing
     sprite: Objects/Tanks/emergency_extended_red.rsi
   - type: Tag # Funkystation - Crash Carts
@@ -175,6 +186,9 @@
     sprite: Objects/Tanks/emergency_double.rsi
   - type: Item
     sprite: Objects/Tanks/emergency_double.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency_double.rsi
   - type: GasTank
     air:
       volume: 2.5
@@ -197,6 +211,9 @@
     sprite: Objects/Tanks/emergency_double_red.rsi
   - type: Item
     sprite: Objects/Tanks/emergency_double_red.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency_double_red.rsi
   - type: Clothing
     sprite: Objects/Tanks/emergency_double_red.rsi
 
@@ -210,6 +227,9 @@
     sprite: Objects/Tanks/emergency_clown.rsi
   - type: Item
     sprite: Objects/Tanks/emergency_clown.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Tanks/emergency_clown.rsi
   - type: Clothing
     sprite: Objects/Tanks/emergency_clown.rsi
   - type: Tag # Funkystation - Crash Carts
diff --git a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
index f6ae2ed6de..c5916a5432 100644
--- a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
@@ -1,26 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/storage.png b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea16fe10626184503e4f61d3416969be281ec65c
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$I!Q!9R9J=Wm%)mJFc3s*7bOv*2qN??|NmLuym%XkO@!=0GC1R0x+AkJJ9P{s
zzErhM2l(&$(rohHr{^_h#yrpB^C}GhGs8KDs@k`2+XiOV9Hnyr0Ej4AYXJc3x~gtp
zEFwxobc#cw@2g<m4&c2{<2b@vixL-9MF{ML7(zhXwn#~zg4zLN44S4vj8Xju6ag?Z
zVvMNk8pfFS0_6Mw+#$4epl(F@!=+LeA+X;bKv4{;2#hfgw=XF~6~Hlq(ilDwd?FA#
zaBM<H5N$IOJ8)$aQUPRT`?It$h{h=Ied@aIB>=F`hPT^IG@gkZ$o2y`MG#}W52+Ge
z8UX-t3?hJI19}FCF{;LM@hDA1$vKCnX&%-?2;%%z02!k1`xC%4P2%&49wx&u005R{
e`MVF3U)K+ysjVA;*spj10000<MNUMnLSTYT37OCU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
index 6c5b834406..6ec7f60813 100644
--- a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
@@ -1,30 +1,33 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-NECK-hamster",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-NECK-hamster",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/storage.png b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..1528d42cbf47a9c996ca093748292fa203afe284
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$TS-JgR9J=Wm(5DUKoo_)F{R=tDJi6ttO9Oy=fbDyE97~61)s^KEAa;m4mu@}
zFfQU~YAiUnwMFdNb)a{?oO8L{f&VTg`O|DNcHf;}Jv;^18%O{Ea-DGSe%;)`jV(oW
zL=HgfLaq~_y<GD3D{D3xyJd0wRD0`!**HLvrS4p3<T_c}l)nm4)(w@KGgX>o5J}6(
z0g^#PjK*Lo>t^!+W!+$~#B9NVB1_$cJ_f*G84Y7`ABYA~SvS1ySH$S{Kv_u{Ie?d;
zy||6Rh-!!;@D11nkv5_Tpxc055Q%mX>>>zupgV-RAktwJ>_Be_c?pM+I0A3Kmo$c;
zHLA!`cQQ<gRMZ22&)qO&JqvQc+Yj_2FxZbJHAHKT00@pD2%tNFz5@8)p#v${G{25d
z)nWwq&WhG^@yqD!Fj+Xes|=U7kHPg;dYGJ!jsUoRe)+o(ldbCw`a6@w66#9300000
LNkvXXu0mjf{Xw-+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json
index 6c5b834406..6ec7f60813 100644
--- a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json
@@ -1,30 +1,33 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-NECK-hamster",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-NECK-hamster",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/storage.png b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..db6b29c5225071609de01e4af9a50ce2b0b9500c
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$d`Uz>R9J=Wm%nPlP!z_0Ew>O5A+8yO6z<>}L8OaNaPblP7>;>>j(w8S(Y;%T
zCg9{CG+S0(gn%u#gIueULeH_Z^v}111ak7_``w(J3x8cFnwzXmUETHh{90VkXbeO}
zMW->Mbru4!STC8aCd?JJR0#kK%-D4rBLHTr3HQ%8>RM`9o4WUKd{im~UQtm2sG>jG
zfVHVJ?IHH@1y(pMf>W)5sHo^on-u+!G7hw5^a+%4Kz<HM2Gz1sV>l{-B!j%m*C*il
zGu<Q*uP=#ArCJB-M$}t0$-A5LBnvfV^ai|=Y;(-JP(B5!?@_e|$~f4*y*J`}f>de*
z$$}jOs%PsBc>N>z6$r!zcAL<y5p6RP8#ru2ZzgojNR8l-yB32eE^AZQZVxf0S-bH3
zY$(AXO2Eet)F5Cxq)POu2tbZOWWWz0bq4&obT|?Jzx_B~^!MYAALRU12E2)j@M`bc
sZR<|8Gy2&ZlYtq#ff*mQG5L1A0<FxiWi$GzSO5S307*qoM6N<$g5b%<vH$=8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json
index 3723b22992..bdfdc07829 100644
--- a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json
@@ -1,22 +1,25 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by EmoGarbage",
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by EmoGarbage, Storage by TiniestShark (Github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/storage.png b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7c972cff91d518a8743edd8ded25fb20edfa235
GIT binary patch
literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI62Rle{$WS|35EXHhDi*;)X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_(aA~CMN0f%QfLw5!Ery{-Fw`<1B7Oksb<dvplX(p
zPQ=ArepL*-!jCWp5QQKyQ%`0Vv+x{W_we!cF2=LG&;2<Dm4e9tpGZ8%bi*RvAfDN@
zbk6(4Ay$?Y;&bA0gDyz?$aUG}H_j!81)do)vgvu^5V2V5V!4Z1*-(k6i6e@tQNECK
zS>e3JS*_Mt`=0!T!GgAu;X2JxB(Q`eQV=1djtZ)<5TjKi#YCF+;~xI7<4=)GCRYWF
z91EyHh2;3b|KNAGW^roLO$x?=-WS{c7y|;kK&xTf-^aGyIsyF8z?IhV*P6iWC+Urj
z7C8cjwt<W5jwbH`mpj17lP(#OBl&3x#Uk*2M&FbNhHruXHMh6+K29HiEOoVf0~{Oz
z(Gq2^d%U}^ySIPOwEO!3S9)@s(F@|X0003eNkl<ZScUDDF>Zt~5Ji8Yh;bTI1VI_O
z%?W%8DvrrPI6+z~B_*bahlVX85>^Uf$AFSm_BWPnjsN3Y_5l2M-Nh7HYsc^Ao2C)(
zCoZtoj(MIVgaD<~+339&L)`CWu9Sk-dNG~N0Bh#45TXRu%%@Qz5x^zpA%x=qx~^L_
zXXfJonE6KtW<C~xh!!Cxb0QJ}i0-U0W(0tuC_qF=)AY=|ZCe0<bME4OA4Iqx5OB_k
z*LDNw`yN@AEv`u=eu|ATqt+TplAO&C!vOESD1IO!fw|!xit2{Om~nm#v0o1eui;!T
z%y@c!j4l6E^bx!g0dMb{0iqMwOE-Y)2dJtFWm*0nz*a?H!%1~rZ+aE4JApm=K~ygQ
izJ5+7#q@!j{)A3LRLpkrR+<|C0000<MNUMnLSTZTiB-h_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
index 6fb3857023..a654ea1c67 100644
--- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser. Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi. Tourniquet Sprite by PoorMansDreams, in-hand sprites of tourniquet, gauze, and bloodpack made by SeamLesss (github).",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser. Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi. Tourniquet Sprite by PoorMansDreams, in-hand sprites of tourniquet, gauze, and bloodpack made by SeamLesss (github). Ointment Storage by TiniestShark (Github)",
 	"size": {
 		"x": 32,
 		"y": 32
@@ -49,6 +49,9 @@
 		{
 			"name": "ointment"
 		},
+        {
+            "name": "ointment-storage"
+        },
 		{
 			"name": "ointment-inhand-left",
 			"directions": 4
diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-storage.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1073c8b27a75dbdac05b93f4ad93f41023f4f2a
GIT binary patch
literal 318
zcmV-E0m1%>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#_(?=TR9J=Wlrd_<KoCWLOm2|IVBa8!$i?<9+~@}G<{+wd5LI%MI-p9u3RT7!
zwJOwvtWWS=gajNE!_LZ90{gn%WoAA*Gam>90{@xg;gzS4iat4JKEd<(6Z-z$Cxspn
zVH`z_qlhBn^$V)vKhcVK)D$<ypl#cWdt(d$FwgUcn+o`%EK6;uzks@~M=7pCL};xg
zNiK?*iy|gTT5DBv;I)QhplZSM+xp_X+^qlr8@xE@n*0Y;0`^ITZrgmHyKRGgQr%C$
zm^hgR@VN!o-tS^WX_^k+XIbW)OVxrQ7t}iA<W}rF1HkWd;M)H{An+$R0~xPohveIP
Q@Bjb+07*qoM6N<$g7lJ%=Kufz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
index c71ae8955e..9fd6dbbb93 100644
--- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
@@ -1,80 +1,83 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-secdog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-secdog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4537ae40de72201672e18ad4762ffde077254a1
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$bV)=(R9J=WmcdE_K^%v_jTVpYMui2vfLa7A-n<Es;Xx$2d5Rz+e23m(4?>Sn
z6kUX^n}kA8E=ABGh@?x|7HWqA*TZ&NLGa*?rbT|2o&7H}zmJ(6W?;;JN9w0@EE;jT
z)r*(qp2rmyh(#k#aB+#}mukEA^l%S=Ur~FOnDiQ)OeCDVVMqWM#q*ADenkbm&44F?
zWFq0LuEc4)TMj@fy-uNI;xy}gH0qv$T_(JS@8@y=NIsQ9$@H2hE&%XawE$42X92Lo
z8SHRocmh?+>RNAU+4lPXsDR7-T%g^qg*2gH&jNYFklZbIZI*GGb!1Z~aF`vAfGgow
zRBU4h$*0oNvQ#&8WK$oGfXmj=XUBU>6Q2bkfkEO~z&EqZ!SN|}IMeqJC?o)o+B=~Z
z(%23yj7DIP{7r#M<+0;AbOD#MFPW*k{tl#(FM-gFD89Do1k<}*Uflv9o4U|lKv=+)
k0BFA52#1duGv-(D4V4CV!M@nK!vFvP07*qoM6N<$f&)s$nE(I)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
index 21d23712e9..760edc5a67 100644
--- a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
@@ -1,75 +1,78 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/ff8df99906ab1909674680b9973bd3c909080360",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/ff8df99906ab1909674680b9973bd3c909080360. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-	{
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aa8823e4c4e8e56f9c9f7026d45b69163bff61b
GIT binary patch
literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$%t=H+R9J=WmcL6|Q545N5r;z(J3Inu%Zm^(m3C;?*i0FuqeAIYXa^COO1oI-
zq!9lAp-6|$0hb_gO#gt`I;fQXKp%|(?ciW6G?j}8r$bDr)WLhx5TyCQg~#FDbH3+r
z&f!9j|D8}fmpw187ujpIgG>8$7T|ety)|+dfc?GQmfcSz+1dVRCBlmI=$HbCMD)+&
zdGXe<@z-w~JazjHTbpHl^mqz@;OiFvwl>Qc^Q$viH-kT!e4!!{_5I;<*(={PFN;>0
zH?gX~kE6rZcQ_p7_3<m0nCIwg+e0@5#MWN|uwjyHm?X;#@rIvH0<4;*+2P^v0MHmY
zfah!PSds<GX3n|^t$LtVI|zwHbnsISd0627+A{!Vyz7l0jBR*_MI;i@SnLLVBFX!q
z`G(QYK(Goc6W0FP>VdA1Eu!hsF)io=%@)yY5q+xY%|gG^9&oC_Y`KprC6}vzVbz2H
z3ny@oaiWzH>63;nQ-RgPQzje)bbS$7SAZ3W)=Tgi_<m;l0QEp{nZv7Bfof66T#Lh7
zsEPoPF@}mHfZ$*2yO_L)>h!ecMN~m^l5!eBXyZwi7g2x;3Fb`Dxra!P9z8nEZ`bUR
UkPTjnA^-pY07*qoM6N<$f|$bj6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
index b3ab67fad6..7f4bdab220 100644
--- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
@@ -1,80 +1,83 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-secdog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-secdog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..f12481de65e82069d6e78466610c07349a020b03
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%GD$>1R9J=WmqBO~K@^5ROKFQBwnUQ9A~qyc2$(<-!9x*}K(Dz}P$_uOgNI&3
zym%2y)I$k^hfs<jLK?`aH&NPN3^|CYB%q))SS=)*B_&%0#U2_DVV2#tfth4g#Qvvw
z|6^wV_n6uF2mW^)>1Oi8xwFl7xmT~>NUh!5&BudhLI6~%n#ucpJ~3>{i0G;Vp)voy
z4jdmG0{%b;1WpA`1MqqM1Er5;<${zZh>F9(02`GpwvC1@9}Wg6zF!BB79%YnH0E!L
z_5wtrF+5(k8P_zO)s<y4-ZmOiB6?&62;8~Y60ue+QPXrX=|yUq&RVf#%gaJZz|zYF
zTfDlm%(tcMw#tPFYquN|uosbNjAQWyBGFjKYbXim-@HpY*P1dO4&m{-xpd_+9<Q76
zaO<BS^0JUVhT&j<tGB<By0yv8$9`Mef9~wi-`B_Ju#4nOnHzH_ofiNwpGmS?m?Ak-
z2B7fPM>^NTqo)tqEldFh0N0|uB(idAcC`nbz@Y%;Q=q~-F5q`S`YxD`Pwu;VH!52I
zj1IdF<Ylg8rDHfZ|I8fc^LeUYK9NZ;w&i7@)PbX}5gS*jY8Z7L;f(h3j(6bR{RigQ
zT4_682LIL`NX-uLLw^Ufe#0<CBHL)o%RtGJO~)sjso4Q?FTMki$Tk=};l`-zJbyA`
z<7G{$vM00}4XZ6T>bl9x+A(DTLd5xr3ubJ66M(uq?&w``(0f3j6Kj5mzlvYKyY-HZ
S+893o0000<MNUMnLSTY_J0G6_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/icon.png
index 584a122e5bf1af93d5e12953689def6da183dccb..871f3235bee387c18c1b877fdcd03a8283b6e24f 100644
GIT binary patch
delta 623
zcmV-#0+9WP1(XGlFn<D0Nkl<ZScUDCPe_wt9LGN!-W<8b+-cxJnG!Y$*1*AXq)@RL
z3<R+{xI>V5kPgAN!wx~YQ{thM5M4Be${S?I9b|=Io@RuOc^Gz(CGEAeAjaMf@x1w`
z{ds-Y?fstiuxIb*^ZV}EGcaPr$bX36>rwn(kJ8BAmSzCmu76IY&1wT6v%X<EkW2LY
z2LP1J`i802XU)xkKbV{Zz-o8kc6BNpUEQo@R<YV0)N7)qT_f<0u5RT0BG(6pkd_w_
zYpdNsA-}Dzt2J@%2E^p@ev$95?;|ZQBGv+)&Fz>9`R$rboU4IIz^BY!=_dGo^UUNS
zi;b1T5>~rIoqycz>Qwsu1AN-do@qjJ0|K5a>=ClqPD~!M*ci075VF{i_lq3JB>=Ly
z9n)H7^`Fnv^ec!2d`dDUk((GNEtlD<9PuuAjo|!(3a^%IZb#o45b)h&aM8q!vz?C@
z{yZuzm+L|`3kZ00G_1mtDT!QRPu(+RHZxnP0I+gcs(*UwH46xMA|B&vctnNoPK=+}
zmzK-)eyeDL*A<8ae9Gj-Hlm|p`rN&Ikd_cloQ8w8$?FP40zRe3+zLRCxmATH;xUpb
ziRWJrbi->308I2b)$d$1@%ZU9iFl0LQ;&G~`HL=iRRO=(qvU`5;%79;R^<rMgpjxy
z8s^2^9B5;A@92V86#%$&+0Dps5cu1Kka#xzgj+X;cs0ME3l24|;^Wun(wn!u9J_bo
zeZ7;{6*w(1<80S`;4}*e3GqiG(kysG0zyK(ZsdA3V#J7+{04I1LcKdO=$8Nh002ov
JPDHLkV1n9SJ-Yw^

delta 611
zcmV-p0-XJn1&9TZFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pH
z9Z5t%R9Hu27zLwX6wm_Lnwk6uVJH_bV1m*V0X;Qku!S&7KYn=6prxw^b_iGj9zd}J
zK$d4@XM@=SB4S{^yox%*@xuqfd_s<3gwkXIm}MW{ykc;2c7I`5zjiePj1RK>;hmds
z{^3(+u-Zj-2*7*}GW_#~RIueRKFsn<x9&26XnY|-RtUrfxc{H3D8=A?^fHFeeRu>J
zwtRUHwiM=bkYg=v?HR6JzJw7HB!>XZ@>>sIfGtDzIf(BpzyhX0d{ANp0Z>SQ(gZd@
zk^?}N_sm=bwtsx@hd&Hg_?Q@uc-t{7U%Cu#IW7Ql1h#ZQv;$z4Kh8{mTMi3}ei>0P
z9|S;hFaWX?%ESqXasbTolJq#Z<*<-|fqW(=hKc|Ff!UxmfGgFb17;|V6TmF5tEyx$
zv9Mw|_xv8%a!^Ph1CYbSe*P!PauC3)5M(*bXO@oc41dS>?*v;83JH)n48Ve&RLemC
zXB2=e*ZBkqQV<QZ9262D8W!A?SPlYs(?F)a3_Q+3J_h-`sjVICh@kikhQcSW!RpAh
z90agB090x{c=ndzdqoG>a#%>f9O2>P%P?>DY=+3_D2glx0h}QKs?9=ty}@i)NPqyy
z5q<5g3|yY>F5vu6iRB=GQ!{e$xn}cLh6Rx^P#FlI)aNjO*8pTkfC?K*6C5@`&=BM*
x7Y3+hIS3GC5XccwCQ-%fC>RB!fOx>b002SULeoEeSwa8+002ovPDHLkV1mND0LlOW

diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
index 74fc108c09..f8ac073188 100644
--- a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
@@ -1,75 +1,78 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Storage and icon edits by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dab1a5cea44f5a6fb87ee3212bb9de0b2f80fba
GIT binary patch
literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%LP<nHR9J=Wmpy1xQ5c4wUL>_OYD;YrLZOyi(h@Mi`U46@NwTGbt2!w-XYK5u
z*-8f|hjwYJASkpBVp9ZZ2GN$JBBn%a9rA~gTMR-&AssIFlAAW=oFvu3zSH-;hjZ?G
z-g|z&1OGcZTIoD?^>VdQ+xrh6g~mS7%Ex^d`~YNgd6V}H4H;ooL_|vt_`RNe4xH`j
z1^$8q1_sq(0Jbt|QXAi-CnVLum~p_TvYGwGwpOyV2Yf2YFBt$~F~S1;UQgAq7a$l4
z<8(R9ypS)l9A7f?ZLK6ELJ<{UVBD^YSWTuV<crMD&QZu0Sxu%a?V^wp@M7V$C0~v&
z@%z;S%ghZCwQjXdKs|z?FsE-lB^U}fJ%*HkuGj>h&*)u71Ad$?2e<Fu!Rc}^8qm)K
zqg@oj+whXx$^EaJOmv-O%H3zNeWy~P(`MtmyN{@%5bLZ!S!`S>xld-E0T5LbCI|W%
zxA&rU+gNz>mdSyBqKZD;l^yZprKL5{4jc=R-UTvz+XWm2q;A9LTH2Cl{!|X-+b$sX
z{G}Nu5(#oYzB4~N*N_*1@NIbS=Jl%0Gh*Sgxjfp>B1UCY&x;f#QVu+P^w^ARXWEDt
zfs_OFobj*KZrg!;+Z~v?ILyYDUVz56T}JGuSS*(s@*)u4hSTp79nrNk-a!{}Z5M#W
za*3XE4k9b-`}iX%N<U=_L~6EJ?c$59tebItt#}xut60C+Q@u8J!^~^n1R!4>H}x(!
i=sjSdnbQ0i{}g+#De0mETr&&+0000<MNUMnLSTaJk0+r3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
index fe19dcec1c..f4db0728d2 100644
--- a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
@@ -1,75 +1,78 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..20c5c4266845116d60c69613f6dcc714a5f7ba32
GIT binary patch
literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$j!8s8R9J=WmN84iKp2MK6lqHpnox1*)KYK|tki@|&0>XulT$&9o46EzK^H+>
zodg#LK~%6<bWu7u)u~j3iVi~QAZQIj5=8}(o>Kxv!QQ1Y4tb{B<u31&?~ddE50~NW
zOjcxx{M28q)q8&KfSvHM@g(ja+E!m89yc#ZuM*T1P-KZzYjrL;n)vqiVO{{>U<DLe
zB6In903ZM`m6=9cRdI9GfT3$t!6rRVFvItE_rMR2Kz~xZ?i;#>#%+^Yz(+Iqv8}?;
zHLG3B2`J_S+Dvu<<M{;uFgcO5`ovTV#hhTRzoP<9K(%IyED=N35DX0>;P)dIjQ{}h
z=?>No*ft?m1*)|=7v=?goD{$h1&~j7u)f^H*4Za*E}MYKQt7p;y_jMCp1HpVs0Cut
z2u_a=QJ4uqOtt=A006ej8xT`1_{5Ss0{z4juq6<<TX9Fg41QOy-4W;~wgoOO<G&Ab
zQot@ur{aa#EZJNQ;=J+(0L*_vfbmqkb5!AgEHMkn8t&ooFZcqZ&vj6I7{omQ0000<
KMNUMnLSTY}(8l2a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
index 74fc108c09..dff0f2dd0e 100644
--- a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
@@ -1,75 +1,78 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f3e6a88c9818a12b1265f53ebf175274a344806
GIT binary patch
literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$bxA})R9J=Wmdi>4Q5=Uq#R(C?aX>RSE)s(vSA$S66gbOXz*@Cw*=zIwA@l|<
zD%`ZoR&G*U6$q&q5t!P-OP56i)1pQYgFG`{TKMhGpL5RdI~NWI=FAv}oxxf{HGZq-
z3dND<wJe||RAY55PW`FTuRT=n0PxBFktKu$w1jHp3Pndewmh_YpX>+3cEBYXp4#1^
z+i4r?+9si3kVdOT>Gp<hr!5pLEMSHor_)5DE7ZyrYUPS(-Vjca&do+^psh=8bjdwE
zfo|^wfbdeNUrWj^w!QxT`A<|}5{!HYelC~+kiX6YkX012&)7N!p&iH-iVmObhsy&3
zih?e=IShC?Y1XGBV6uPuHqcHjhNmkqPJ{)bo&_>z8Fa}_QWkp0#v=f5u0~19E@F|;
z-<>BRFiz$Iwgg=FkFyalgG)|nHUi_sw!l^AbG8C@vGgh3+uAVFvWKJI_wb8XYu_=;
l0;U8&_5H(g_?$Waf-kU}XR1r;3H|^8002ovPDHLkV1g%Q!0iA4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
index d71cdae541..5990e60d2b 100644
--- a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
@@ -1,75 +1,78 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..678857be6cbd3b41f4898bb628810e46f5c99ad5
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$a!Eu%R9J=WmQ70nK^%u4Wj90w*9FbIct{L_JS{?j6zH)pV4b>j>}&J^Lg*WG
zsPNJ)J9$a*R3M~cL||$MUwS!2upLTC406_W4f46opPBhR^TIGN<G*7YXK*a4=|9!8
z`NGKa8WxB}HGO#{LhYg6uiaH{0B|dwktKu$Vo^=c<_oq+cyVa;Zp8zL?SLd2p4{G|
z({Aajv32}DAN6LF;`J4sc1tK&SfCevm`V{0Em19%sg}y3c|+JmIydUgfp$W6kdPhL
z33R$o00b8N{aRd+*mQaN=RZ+_Nigyq__|;^K<+XJKt@%`JTlfX2<<>NU$D6q51jAe
zRaFwQgMF`yqejgdfgZcZF9Yr5e85@(GZ7XDIp;{9q)EsQ;)>8aW{v>BsTLxxNQ8s_
z-#br2z)Z#xkZ$j%D^Rq{(-HW-@{9Jn^#W#M=ts1(v8JaKCkNfn;b+gr{sM*tdJ+JY
i*EhrAGiJ>A6MO(5qi3XE{RZ^_0000<MNUMnLSTZK;=n8b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/icon.png
index ab8bebedb66473deecf4ae8c20de54aeb8e32b0b..bda5ef75641b1cd3a4d154ac1a02f3f06080aadb 100644
GIT binary patch
delta 436
zcmV;l0ZabR1I+`FBYyw^b5ch_0Itp)=>Px$he<?1R9J=WlsibnP!vFqpFtdK0_r9r
z1PX$J7y?3rV3n*{ENIE-BDlJ^2qHL$xD*8!7Z=6P=wJn@Ac#_^SZJ}Ri-T2?;2<tO
zrxxl5lQv_{lmuSRdEvf5NJvOXfasbkbWIh0)-(qxbsd}jfqy~#L^KqjYpR$^PUAW@
zx~7VVBy*8DL+b4I98q_GuBl=yKF($;MXwSCU@Sfkz~f!Pb3{X5;BbGBUL}h2^2|a)
z<}`i6h(1b0l08S%9pE}PBl>7nK0I{KLP92glf!jva>Y{9<6Yt3nP{y?u4}4zJDMSH
zZdK*Kkt>#(0DlpY<Uil#JD@Un7qbT>6EZvJ%?uC0b++%j_{Vj_Sf(Lfovg4-LmaP8
zh;mvH<+M`0_xle3@LXq^hFITT;q!X3=6Pl3%eyw2%PZfz^|Zh;4Y9G*#{2VapmKl~
zFY;vUldg_p;BxSI3}Z%n&5#8p2al)Vqh}GAuZajk4lO=rU~R4x=+1owR3aXpUI7A=
ehlGTL0DJ+k3Ai!1>EZqW0000<MNUMnLSTXqjKxj>

delta 438
zcmV;n0ZIPN1J47HBYy#wNkl<Zc%1E&JxIeq97mtxATDh{+(d*zK~Ru}K%t?am8@AT
zXvydzxVpFqA~=Y+h=PlYi{i)VU<FYSL=h?q6^nLpsFox+h>PdcLRIu?QV_{+x{q-0
z-Q7P2L4pMNZ_zbX=$a~Izi;*%>N++(y?w|^coxt#Rg7dtaeo~fT~kFUtZ;I4NVvU2
zO2U(XuBl>RFvZH!5?zrf00V<50E)MHDGARfu(P#ES0sw_RAMTvaFE?6t|tkF6)6c%
z0<L2d*OOIvtpARww8Hge4%e~C-4vRNxA|{tqUE=6T~o#L?iknRY8C!fayNx0K!n1|
zm-D|8s1)AG_<uH;w8HvvGqHX+zv%u5{?zsy%QQsUxe%6Vh`sqC@tBQ>$84n9ujdT_
zsLRYU4Y9a3$J_aE&3I+!vl})?r)PDoDP4q(fP>@-Sf(MCXIgnFUHJ-^60l4|EKC$W
zjr#$IAFjYM4UtK_H4Ofv06@ZMtNFeBgoDI8@Y*>IOfS|*_yvbLYQXQEOAAya?jOnk
gzQTh93GyfM4%4>HHU-pp-2eap07*qoM6N<$g4|-zdjJ3c

diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
index b3ab67fad6..914c97c3e6 100644
--- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
@@ -1,80 +1,83 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi. Storage and icon edits by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-secdog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+          "name": "equipped-SUITSTORAGE-secdog",
+          "directions": 4,
+          "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-puppy",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-fox",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-cat",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-sloth",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-hamster",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-kangaroo",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-possum",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-pig",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/storage.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..68db7d9ac0e90cffa3f97fea1a1c530eeb2c87c6
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$i%CR5R9J=Wma$92Kop06DbkiIG@;_qsioi`Sg8q_n#BqQC#QlIH*qQc1ziMj
zbrM`01X01F=%RFRic_fw6&-}qLC_k6B#H_mJ*NbUg1u|gD&|{~d%3&!<=t@{;PT($
z+8M0K68SE!mdY*9+t*I=k<mEr?(23e7L8i3q*V#(3MjHf)KZy?568azeUKLbI9LHi
zmdH$Y761qUOr$1J*EC#TR$v-BRbq>l2Uy8>w|Bq~4#9ZTn!cNcj>=7yTEIio`Jt}C
zG<3V2&j`q81lpYJ0_M{*0APG9ZpXw#4f%{<ufL-LPC&J0iYyV+(BTjC!{_xP5)J_X
zvdIQk_SiNdRRz>inG5m)-j8$O2YkpT8(3YeV&n9KHZPli#X{kwsXd=!KF@l;2dD)i
z;Sf%a_K}+kKupxSF8~0W2Wt=$HF(5AZv;BY-xToOE;T*7E@1JdUE%y9`g2F81UdoJ
zm27T0P1cwFI4iya0P`^nFkZ>F4vQR+CRPDile@UM{0cq+OXPJ*0x9r_00000NkvXX
Hu0mjfPq@a^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json
index 2bd70432d0..28694a1555 100644
--- a/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "inhand-left",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json
index ab98f8e78a..959ccb745c 100644
--- a/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/meta.json
@@ -1,22 +1,25 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "inhand-left",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/storage.png b/Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..9641178347f14fc70057f175d7d224e818f63f9e
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ib+I4R9J=Wl|M@YVI0Rlmx_@b5~5`YHQ!JaEe*{r61|3?7f?{p8%S{Ioix<o
z-VhQefy>nrH2AMXh0ZhevTITlOt0rrT>MOTJioi&hwt+b=FAvn)ZoR%nFC-LFIbjE
zz1{$zP|x*hYL!m_w)Z!AxJi%v-!Q!63J&8(1cUdOrb)G0C08my5o!xn?3PV<ErieS
zV`py*!1=Glf}5g&<`c%1z%&^<1pun5_MW>b*x#Ljnx}MjI%}X@DG$CE%e_VDUGf94
z5{n2m2NzQi4u#P)4OLail?v#(uH>JK%8$~)=k*ZVhzd7{F$pA-*9zbq#*cV-Oq04x
z2{#fF=$DvuW7h(G5>sL3+fYitZrQUHm;`eHVFCN=n|8ZN{xy%0hzM^}=>#6H4y3+!
zbq)-pVYPTWUzI+ggatCE0XmBT+Ga*dKxzs+O^Zc!S4u!Q0buqC0MZEv2^fipv%IoS
z^jMd^q=Xaj*f#H}6Q`2BMZ5f%+HLtKMk3<K96)pCbom7(GmuI_h^N;80000<MNUMn
GLSTZ9^~Qhz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json
index 2bd70432d0..147b05d2ea 100644
--- a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json
@@ -1,22 +1,25 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "inhand-left",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250, storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/storage.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..741cac1b0aaab1a1be63a54c332f7ec894702886
GIT binary patch
literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$G)Y83R9J=Wma$62KoExic#<66ULi=-#uV8mf|x?`2I0!QgWv;LSoi|wdD8d}
z;uWz;C)iw}!Aef=HXdUkClQNdccNz?UpegTe$37e3v{#zDJ2C#KuMAi07Owl01$>D
z#c})<*I`39!Eqd9S!UH^d7fKkS?X?OCScpPR=jb6rfHvmQc5en3TyR}??@?02m#>p
z-j@e^p7*0Ue-$AF`Mys=2<@j=$G8WE2V1aqfaB2-=lm8nVJA?hnpf);Xo60_SfF})
zhf*_4?k6Zx*LWDQD{yl)V&!j|CcaMRc(~XDYYuY+#^(bp`U9w!F-w4T1-;o6{ox5q
zz_<bc)?Wbt><SnO6sb$wyB_vWZ`mIZ;|lbu3Xj)k^n91$@bc;JenLx%)FsXU>i9Q&
Y08S28=AO5^0ssI207*qoM6N<$f^(mphX4Qo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json
index c82626cfbf..1d0ef05567 100644
--- a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json
index aa99fa574a..f167da2bac 100644
--- a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json
@@ -1,26 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "inhand-left",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250, storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/storage.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..53ede50b9429fe976acb4e6c91ac2100b5ea8559
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$dr3q=R9J=Wma$61Kp23(T1!ew17@gk^43V{q*(9)d=J3~aB%Pi>?pp3L&3qt
z2k0ht5lWXLxD>Ra2-4VV8qTRwOGWQ4DusSa!hhWVfBcu+9n3RA2xXgN$)@<u_LjAT
zk$@0F1wjBn5Cm2d+5(fsd(SV{5?TU62<3Sm0J&W5)6?@jBMI#exUNeSMMP0Vr_=d(
zcU@OEm6^a;!uNdueBU=NZX^)Lu~z&$mUSm2NiwtetoW}80JK^y0Lo#RMxy~h7=}gy
zS~!lQ9LG@rl}bfbt5pT4=`kI&z5yv^MoO8PjMdNTUyl6*qa^@%9Nkk;MNZF8Oj7_B
zXF*!bw?Hh-{{7Sh(qJKAED*nq7!C(?Z@aW>rN6t7OmlU-Yc=0^BZ~TxyTbt6TdA=?
z^PoVIFED&<S_xP!L3Yq5U);13Fzx{G{~Z9VJ76Txu9eiv>N;zC*V@N#Dgpr6IOgGU
rUp?JiuyNG07SX0%D=C`|Xu+6wt<Hk-hzLCa00000NkvXXu0mjfakajQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/scissors.rsi/meta.json b/Resources/Textures/Objects/Tools/scissors.rsi/meta.json
index c431ad7f01..061ea1d08d 100644
--- a/Resources/Textures/Objects/Tools/scissors.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/scissors.rsi/meta.json
@@ -1,22 +1,25 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by TheShuEd(github) for Space Station 14, Inhand sprites by onesch",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by TheShuEd(github) for Space Station 14, Inhand sprites by onesch. Storage by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Tools/scissors.rsi/storage.png b/Resources/Textures/Objects/Tools/scissors.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f35b00aeb2a56d72c348bdef19f3e0cf32d4da7
GIT binary patch
literal 397
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<?w&4=ArY;~
z2@<T%yl<{t`M*Cn_`m(iq8$v%nqBJNnSaHf{WyLA2o%noJNKaOuafd68D?hYW`pDQ
zJeI2(P6kE&pRSpCpmw{DC-b}LnxYWK*hy0V6YX5sPVhNQSH33bGsWV~+w=2zfWjX#
z7HYnjbmag?T1lmZw5`_%#z{h6)0Z5p_jB`Dpn2|P;)jo)nqJR0%Rl&kziBKF56^@a
ziPHCMfoYSc20hn}`ZK?I^5n+;+1&?^pYATawTHFfe%=3ny$da@yEBSUp3^!Vw*KdN
zkW-JJJzDVjA2XYupWY<h<tG?#$T+Tg%EKe_tf^n#&fw3#uicG6pmSQYi~;DC!v~es
zCGPF}@35_|OEw`t`JjT1hCu;eLTd725BsBh3q*RX60R^V=94I8aOFGU<GXOjQ|kwc
p4x$@UZ<}qJ{ot@NOPdJ;!-|LHw>E`-C<2BrgQu&X%Q~loCIBc!s?`7h

literal 0
HcmV?d00001


From 220f59c45782c08553c8ca67b3029a5b26efeccc Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 7 Dec 2025 17:10:28 -0800
Subject: [PATCH 056/360] Fix Bible Fast Healing (#41777)

* broble

* slightly cleaner I guess actually

* im straight refactoring it, and by it, i mean.... my entity

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Content.Server/Bible/BibleSystem.cs | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index 8d5c171b73..f41c5af8d8 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -127,15 +127,18 @@ namespace Content.Server.Bible
                 return;
             }
 
+            var userEnt = Identity.Entity(args.User, EntityManager);
+            var targetEnt = Identity.Entity(args.Target.Value, EntityManager);
+
             // This only has a chance to fail if the target is not wearing anything on their head and is not a familiar.
-            if (!_invSystem.TryGetSlotEntity(args.Target.Value, "head", out var _) && !HasComp<FamiliarComponent>(args.Target.Value))
+            if (!_invSystem.TryGetSlotEntity(args.Target.Value, "head", out _) && !HasComp<FamiliarComponent>(args.Target.Value))
             {
                 if (_random.Prob(component.FailChance))
                 {
-                    var othersFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-others", ("user", Identity.Entity(args.User, EntityManager)), ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
+                    var othersFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-others", ("user", userEnt), ("target", targetEnt), ("bible", uid));
                     _popupSystem.PopupEntity(othersFailMessage, args.User, Filter.PvsExcept(args.User), true, PopupType.SmallCaution);
 
-                    var selfFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-self", ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
+                    var selfFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-self", ("target", targetEnt), ("bible", uid));
                     _popupSystem.PopupEntity(selfFailMessage, args.User, args.User, PopupType.MediumCaution);
 
                     _audio.PlayPvs(component.BibleHitSound, args.User);
@@ -145,24 +148,25 @@ namespace Content.Server.Bible
                 }
             }
 
+            string othersMessage;
+            string selfMessage;
+
             if (_damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true, origin: uid))
             {
-                var othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-none-others", ("user", Identity.Entity(args.User, EntityManager)), ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
-                _popupSystem.PopupEntity(othersMessage, args.User, Filter.PvsExcept(args.User), true, PopupType.Medium);
+                othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-others", ("user", userEnt), ("target", targetEnt), ("bible", uid));
+                selfMessage = Loc.GetString(component.LocPrefix + "-heal-success-self", ("target", targetEnt), ("bible", uid));
 
-                var selfMessage = Loc.GetString(component.LocPrefix + "-heal-success-none-self", ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
-                _popupSystem.PopupEntity(selfMessage, args.User, args.User, PopupType.Large);
-            }
-            else
-            {
-                var othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-others", ("user", Identity.Entity(args.User, EntityManager)), ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
-                _popupSystem.PopupEntity(othersMessage, args.User, Filter.PvsExcept(args.User), true, PopupType.Medium);
-
-                var selfMessage = Loc.GetString(component.LocPrefix + "-heal-success-self", ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
-                _popupSystem.PopupEntity(selfMessage, args.User, args.User, PopupType.Large);
                 _audio.PlayPvs(component.HealSoundPath, args.User);
                 _delay.TryResetDelay((uid, useDelay));
             }
+            else
+            {
+                othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-none-others", ("user", userEnt), ("target", targetEnt), ("bible", uid));
+                selfMessage = Loc.GetString(component.LocPrefix + "-heal-success-none-self", ("target", targetEnt), ("bible", uid));
+            }
+
+            _popupSystem.PopupEntity(othersMessage, args.User, Filter.PvsExcept(args.User), true, PopupType.Medium);
+            _popupSystem.PopupEntity(selfMessage, args.User, args.User, PopupType.Large);
         }
 
         private void AddSummonVerb(EntityUid uid, SummonableComponent component, GetVerbsEvent<AlternativeVerb> args)

From b5c44c06214c67e29acc642338fb3f5d1f8a0ce5 Mon Sep 17 00:00:00 2001
From: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Date: Mon, 8 Dec 2025 01:37:06 +0000
Subject: [PATCH 057/360] Allow removing species from the RNG pool of a new
 player's initial auto-generated character (#41678)

* First commit

* Fix it!

* Requested Changes
---
 Content.Server/GameTicking/GameTicker.RoundFlow.cs         | 4 +++-
 .../Preferences/Managers/ServerPreferencesManager.cs       | 4 +++-
 Content.Shared/CCVar/CCVars.Ic.cs                          | 7 +++++++
 Resources/Prototypes/Species/species_weights.yml           | 3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 6d2f3fac52..00b0c0ff32 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -394,7 +394,9 @@ namespace Content.Server.GameTicking
                 }
                 else
                 {
-                    profile = HumanoidCharacterProfile.Random();
+                    var speciesToBlacklist =
+                        new HashSet<string>(_cfg.GetCVar(CCVars.ICNewAccountSpeciesBlacklist).Split(","));
+                    profile = HumanoidCharacterProfile.Random(speciesToBlacklist);
                 }
                 readyPlayerProfiles.Add(userId, profile);
             }
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index 3462d0413c..e979de4a62 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -354,7 +354,9 @@ namespace Content.Server.Preferences.Managers
             var prefs = await _db.GetPlayerPreferencesAsync(userId, cancel);
             if (prefs is null)
             {
-                return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random(), cancel);
+                var speciesToBlacklist =
+                    new HashSet<string>(_cfg.GetCVar(CCVars.ICNewAccountSpeciesBlacklist).Split(","));
+                return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random(speciesToBlacklist), cancel);
             }
 
             return prefs;
diff --git a/Content.Shared/CCVar/CCVars.Ic.cs b/Content.Shared/CCVar/CCVars.Ic.cs
index 5f8d108a22..a075bb0144 100644
--- a/Content.Shared/CCVar/CCVars.Ic.cs
+++ b/Content.Shared/CCVar/CCVars.Ic.cs
@@ -65,6 +65,13 @@ public sealed partial class CCVars
     public static readonly CVarDef<string> ICRandomSpeciesWeights =
         CVarDef.Create("ic.random_species_weights", "SpeciesWeights", CVar.SERVER);
 
+    /// <summary>
+    ///     The list of species that will NOT be given to new account joins when they are assigned a random character.
+    ///     This only affects the first time a character is made for an account, nothing else.
+    /// </summary>
+    public static readonly CVarDef<string> ICNewAccountSpeciesBlacklist =
+        CVarDef.Create("ic.blacklist_species_new_account", "Diona,Vulpkanin,Vox,SlimePerson", CVar.SERVER);
+
     /// <summary>
     ///     Control displaying SSD indicators near players
     /// </summary>
diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml
index 9c01342573..d95f1050da 100644
--- a/Resources/Prototypes/Species/species_weights.yml
+++ b/Resources/Prototypes/Species/species_weights.yml
@@ -12,3 +12,6 @@
     Feroxi: 3 # DeltaV - Feroxi, see Prototypes/_DV/Entities/Mobs/Species/feroxi.yml
     Diona: 2
     Chitinid: 3 # DeltaV - Chitinid, see Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
+    Moth: 4
+    #Dwarf: 2 # DeltaV - No Dwarfs
+    Vox: 1

From 5e7105e3552807c84f2be0330ad97f27a5d6efac Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Mon, 8 Dec 2025 00:20:42 -0400
Subject: [PATCH 058/360] TriggerOn(Un)Embed (#41720)

* feat: TriggerOn(Un)Embed

* feat: StopEmbedEvent

* fix: forgot initialize

* chore: better naming

* chore: oops

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs

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

* Update Content.Shared/Projectiles/EmbedEvents.cs

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

* review

im lazy

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs

* chore: docs

* comment change

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Content.Shared/Projectiles/EmbedEvent.cs      | 15 --------
 Content.Shared/Projectiles/EmbedEvents.cs     | 35 +++++++++++++++++++
 .../Projectiles/SharedProjectileSystem.cs     |  5 +++
 .../Triggers/TriggerOnEmbedComponent.cs       | 18 ++++++++++
 .../Triggers/TriggerOnUnembedComponent.cs     | 20 +++++++++++
 .../Trigger/Systems/TriggerOnEmbedSystem.cs   | 31 ++++++++++++++++
 6 files changed, 109 insertions(+), 15 deletions(-)
 delete mode 100644 Content.Shared/Projectiles/EmbedEvent.cs
 create mode 100644 Content.Shared/Projectiles/EmbedEvents.cs
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs
 create mode 100644 Content.Shared/Trigger/Systems/TriggerOnEmbedSystem.cs

diff --git a/Content.Shared/Projectiles/EmbedEvent.cs b/Content.Shared/Projectiles/EmbedEvent.cs
deleted file mode 100644
index 521a691f45..0000000000
--- a/Content.Shared/Projectiles/EmbedEvent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Content.Shared.Projectiles;
-
-/// <summary>
-/// Raised directed on an entity when it embeds in another entity.
-/// </summary>
-[ByRefEvent]
-public readonly record struct EmbedEvent(EntityUid? Shooter, EntityUid Embedded)
-{
-    public readonly EntityUid? Shooter = Shooter;
-
-    /// <summary>
-    /// Entity that is embedded in.
-    /// </summary>
-    public readonly EntityUid Embedded = Embedded;
-}
diff --git a/Content.Shared/Projectiles/EmbedEvents.cs b/Content.Shared/Projectiles/EmbedEvents.cs
new file mode 100644
index 0000000000..6f357a33a1
--- /dev/null
+++ b/Content.Shared/Projectiles/EmbedEvents.cs
@@ -0,0 +1,35 @@
+namespace Content.Shared.Projectiles;
+
+/// <summary>
+/// Raised directed on an entity when it embeds in another entity.
+/// </summary>
+[ByRefEvent]
+public readonly record struct EmbedEvent(EntityUid? Shooter, EntityUid Embedded)
+{
+    /// <summary>
+    /// The entity that threw/shot the embed, if any.
+    /// </summary>
+    public readonly EntityUid? Shooter = Shooter;
+
+    /// <summary>
+    /// Entity that is embedded in.
+    /// </summary>
+    public readonly EntityUid Embedded = Embedded;
+}
+
+/// <summary>
+/// Raised directed on an entity when it stops being embedded in another entity.
+/// </summary>
+[ByRefEvent]
+public readonly record struct EmbedDetachEvent(EntityUid? Detacher, EntityUid Embedded)
+{
+    /// <summary>
+    /// The entity that detached the embed, if any.
+    /// </summary>
+    public readonly EntityUid? Detacher = Detacher;
+
+    /// <summary>
+    /// Entity that it is embedded in.
+    /// </summary>
+    public readonly EntityUid Embedded = Embedded;
+}
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 9a44ca545d..c5aaf3135d 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -135,6 +135,8 @@ public abstract partial class SharedProjectileSystem : EntitySystem
         if (component.EmbeddedIntoUid == null)
             return; // the entity is not embedded, so do nothing
 
+        var embeddedInto = component.EmbeddedIntoUid;
+
         if (TryComp<EmbeddedContainerComponent>(component.EmbeddedIntoUid.Value, out var embeddedContainer))
         {
             embeddedContainer.EmbeddedObjects.Remove(uid);
@@ -168,6 +170,9 @@ public abstract partial class SharedProjectileSystem : EntitySystem
             Dirty(uid, projectile);
         }
 
+        var ev = new EmbedDetachEvent(user, embeddedInto.Value);
+        RaiseLocalEvent(uid, ref ev);
+
         if (user != null)
         {
             // Land it just coz uhhh yeah
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs
new file mode 100644
index 0000000000..e298d3e378
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when this entity first embeds into something.
+/// User is the item that was embedded or the actual embed depending on <see cref="UserIsEmbed"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnEmbedComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// If false the trigger user will be the mob that shot the embeddable projectile.
+    /// If true, the trigger user will be the entity the projectile was embedded into.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool UserIsEmbeddedInto;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs
new file mode 100644
index 0000000000..ba0dd801f5
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when this entity gets un-embedded from something.
+/// User is the item that was embedded or the actual embed depending on <see cref="UserIsEmbed"/>
+/// Handled by <seealso cref="TriggerOnEmbedSystem"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUnembedComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// If false the trigger user will be the one that detaches the embedded entity.
+    /// If true, the trigger user will be the entity the projectile was embedded into.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool UserIsEmbeddedInto;
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnEmbedSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEmbedSystem.cs
new file mode 100644
index 0000000000..ade48c94a7
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnEmbedSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Projectiles;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// This handles <see cref="TriggerOnEmbedComponent"/> subscriptions.
+/// </summary>
+public sealed class TriggerOnEmbedSystem : TriggerOnXSystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnEmbedComponent, EmbedEvent>(OnEmbed);
+        SubscribeLocalEvent<TriggerOnUnembedComponent, EmbedDetachEvent>(OnStopEmbed);
+    }
+
+    private void OnEmbed(Entity<TriggerOnEmbedComponent> ent, ref EmbedEvent args)
+    {
+        var user = ent.Comp.UserIsEmbeddedInto ? args.Embedded : args.Shooter;
+        Trigger.Trigger(ent, user, ent.Comp.KeyOut);
+    }
+
+    private void OnStopEmbed(Entity<TriggerOnUnembedComponent> ent, ref EmbedDetachEvent args)
+    {
+        var user = ent.Comp.UserIsEmbeddedInto ? args.Embedded : args.Detacher;
+        Trigger.Trigger(ent, user, ent.Comp.KeyOut);
+    }
+}

From 67ffe6aa9f3883093a30db993504fccd62fcc8fa Mon Sep 17 00:00:00 2001
From: Red <96445749+TheShuEd@users.noreply.github.com>
Date: Mon, 8 Dec 2025 14:20:42 +0300
Subject: [PATCH 059/360] Clothing equipping doAfter tweak (#41732)

* clothing moving break

* Rename EquipOnMoving to EquipWhileMoving

* Update InventorySystem.Equip.cs
---
 .../Clothing/Components/ClothingComponent.cs           | 10 +++++++++-
 Content.Shared/Inventory/InventorySystem.Equip.cs      |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs
index 2d576637a6..b009c55201 100644
--- a/Content.Shared/Clothing/Components/ClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ClothingComponent.cs
@@ -87,6 +87,15 @@ public sealed partial class ClothingComponent : Component
     [DataField]
     public TimeSpan UnequipDelay = TimeSpan.Zero;
 
+    /// <summary>
+    /// Only works when EquipDelay or UnequipDelay > 0.
+    /// Prevents clothing from being put on or taken off while moving.
+    /// Some clothing can logically be put on while running (hats),
+    /// while other types of clothing may require stopping (shoes, hard suits).
+    /// </summary>
+    [DataField]
+    public bool EquipWhileMoving = false;
+
     /// <summary>
     /// Offset for the strip time for an entity with this component.
     /// Only applied when it is being equipped or removed by another player.
@@ -97,7 +106,6 @@ public sealed partial class ClothingComponent : Component
     /// <summary>
     ///     A scale applied to all layers.
     /// </summary>
-    /// 
     [DataField]
     public Vector2 Scale = Vector2.One;
 }
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 2a8b937050..31dfb513e5 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -167,7 +167,7 @@ public abstract partial class InventorySystem
                 target,
                 itemUid)
             {
-                BreakOnMove = true,
+                BreakOnMove = !clothing.EquipWhileMoving,
                 NeedHand = true,
             };
 
@@ -439,7 +439,7 @@ public abstract partial class InventorySystem
                 target,
                 removedItem.Value)
             {
-                BreakOnMove = true,
+                BreakOnMove = !clothing.EquipWhileMoving,
                 NeedHand = true,
             };
 

From 0c6ebe6f0987b915b5a81f86ac02cd5f42f19c4a Mon Sep 17 00:00:00 2001
From: halycon <104782767+kleinerstation13@users.noreply.github.com>
Date: Mon, 8 Dec 2025 21:07:32 +0100
Subject: [PATCH 060/360] Hushpup Shotgun (#41512)

* upstream hushpup

* fixes incorrect filename in attribution

* sprite cleanup

* Make the YAML not ass

* Remove redundant line of code

* Resprite, attributes original sources

* More sourcing fixes

* Last minute sprite touchups

* So... don't accidentally copy paste stuff

* Fixes bolt being on the wrong side while wielded

* adjust rolloffFactor

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* Resprite

* No more pegs

* Spanky mind controlled me to commit these changes

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
---
 .../Weapons/Guns/Gunshots/attributions.yml    |   5 +++
 .../Audio/Weapons/Guns/Gunshots/hushpup.ogg   | Bin 0 -> 16307 bytes
 .../Locale/en-US/store/uplink-catalog.ftl     |   4 ++
 .../Catalog/Fills/Backpacks/duffelbag.yml     |  14 ++++++
 .../Prototypes/Catalog/uplink_catalog.yml     |  14 ++++++
 .../Weapons/Guns/Shotguns/shotguns.yml        |  27 ++++++++++++
 .../Guns/Shotguns/hushpup.rsi/bolt-open.png   | Bin 0 -> 420 bytes
 .../hushpup.rsi/equipped-BACKPACK.png         | Bin 0 -> 753 bytes
 .../hushpup.rsi/equipped-SUITSTORAGE.png      | Bin 0 -> 753 bytes
 .../Guns/Shotguns/hushpup.rsi/icon.png        | Bin 0 -> 436 bytes
 .../Guns/Shotguns/hushpup.rsi/inhand-left.png | Bin 0 -> 659 bytes
 .../Shotguns/hushpup.rsi/inhand-right.png     | Bin 0 -> 632 bytes
 .../Guns/Shotguns/hushpup.rsi/meta.json       |  41 ++++++++++++++++++
 .../hushpup.rsi/wielded-inhand-left.png       | Bin 0 -> 587 bytes
 .../hushpup.rsi/wielded-inhand-right.png      | Bin 0 -> 576 bytes
 15 files changed, 105 insertions(+)
 create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png

diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
index 4445bc5f29..1a0136111c 100644
--- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
@@ -37,3 +37,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "machinegun-one-shot.wav by DeltaCode. Converted to .OGG and MONO by august-sun"
   source: "https://freesound.org/people/DeltaCode/sounds/668347/"
+
+- files: ["hushpup.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by UnderlinedDesigns and DrinkingWindGames (https://freesound.org/people/DrinkingWindGames/sounds/789647), modified by Halycon"
+  source: "https://freesound.org/people/UnderlinedDesigns/sounds/188499/"
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg b/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..c86e6057ccbf007d0caa65f89521ca8c7664a771
GIT binary patch
literal 16307
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%0Dl<+C_0AI3C`9~~B0B?stg1|oMQ<dWu|GyHG
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
QfqA^3Xf($yel3ju4`W7@w*UYD

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 6050b575cf..4eb6b965b9 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -35,6 +35,10 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold
 
 uplink-gloves-knuckleduster-name = Syndicate Knuckle Dusters
 uplink-gloves-knuckleduster-desc = A pair of plastitanium knuckle dusters that let you punch hard enough to break the captains jaw into pieces.
+
+uplink-hushpup-name = Hushpup
+uplink-hushpup-desc = A powerful silenced shotgun with a low magazine capacity. Comes with a spare box of buckshot. Uses .50 shotgun ammo.
+
 # Explosives
 uplink-explosive-grenade-name = Explosive Grenade
 uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage.
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index bfacef37c5..2b99cc039e 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -428,3 +428,17 @@
         - id: EmpImplanter
         - id: ClothingShoesBootsMagSyndie
         - id: AgentIDCard
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledHushpup
+  name: Hushpup bundle
+  description: Contains the Hushpup, bundled with a box of buckshot. Quarter included.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: WeaponShotgunHushpup
+        - id: BoxLethalshot
+        - id: TreasureCoinIron
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index a13dc87a02..56b4afd959 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -188,6 +188,20 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkHushpup
+  name: uplink-hushpup-name
+  description: uplink-hushpup-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledHushpup
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 8
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWeaponry
+
 - type: listing
   id: UplinkC20RBundle
   name: uplink-c20r-bundle-name
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index cd059a2e88..0132ef73a7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -296,3 +296,30 @@
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunImprovised
+
+- type: entity
+  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband]
+  id: WeaponShotgunHushpup
+  name: Hushpup
+  description: An obscure modification of the Enforcer, fitted with an experimental muffler. Great for those with a strict moral code. Uses .50 shotgun shells.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
+  - type: Item
+    sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
+    shape:
+    - 0,0,3,0 # smaller than BaseShotgun by 1 tile
+  - type: BallisticAmmoProvider
+    capacity: 4
+  - type: GunRequiresWield
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/hushpup.ogg
+      params:
+        volume: -3
+        rolloffFactor: 1.3
+    fireRate: 2
+  - type: GunSpreadModifier
+    spread: 1.2
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e31be66caa3ae6dc3475ddee38823ad6acdaf16
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$UP(kjR9J=Wk}*reKp2MKNP|;TZmJ12*%ShqJGcbFztAy57k`4?UE<h3;7|vr
zF0L+F94c-?LFm#LI1U0KX_qcN2b++#mrw^m@Sf%4c<=6gzmE@)NF)-;e@CekZQJ3^
zriRJnrS@JGzVCBQ(}Y@<Wf%+wN<$>-dWRE2004_c2HSS{PtB7gfngZXbzP`aN&x_S
z0lcosKX6){!*C8tqjETyrgcyN#u!vp73z$!{QzFq<QHcru+k;Qvo!#K5Q2OfIp_F<
z)h3v;L|DhOH7JdgIF2hP7soMB-htdaN>`Y(1kd4G`0&a+g4HJIw2l#_D`CBUc&*%-
zAPC^PZgFmi%-<F*^m>;V4u^_uJA68QFFx!)2DrcRIPl%^ZoPd9mE7nMgiE+F<h$lY
zh`Ui`hkXF9>uz;f?!GcWl&(Y}ex0oy0D#dXtTjG#wAf5SB9TZWf1WQ^Uzo=me5=d=
O0000<MNUMnLSTX;iL!$L

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..20c4eb7d72a05d9bbbd6214dad30f4f865121294
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%t4TybRCt{2nlWo4K@`XT9v7}$b4R!gEKh7wEG)5F!GvW=XA?hxUaKD>y<Z`1
zinPIR5W-y`q!cW!a}hj2h;o(HyCSaV9cp&mSvAS~b<T`4|M#CaGcqF}2!bF8f*>rW
zRwS+!iMOpIEi$VrYenLdqeJw@6LbepxOxazw%6hI_I71`5Cki~_kTSRaTx0B`?#!P
zQShgw5`VwHH)et<h@LZ)h&WJx%i~Pg(gyQsfAtV%9LM2YE{EUaF-(~7QU*jU%Y+Cb
zV#~77Xf)7lHu0^n4*;;OPx$fk*G&Ji?`s9(I1U5A=WN!92}y~9KRY|a&CSiMJPboz
zoFC6jFu8Q$I1X1T6+SJMwz@GA5xcI-02lyA%V7FB-Obx^94?p3TQgxk_*#+p;{14K
zgl=CS))CO@bTZv;7hetzuxS&bv~RcDs1*shulwi@o-kd`=1zf^=yW<60POod0Bq`X
z_$T<2qeJs+T$gB1P)enq2~pY;5nool-THx6E|*g^p;D<Z0OMmAO`UqZ&i#HLtyaru
zztapu8hx*|2`;1G??WjS%@%?n;2;PR&seL~%A^r|D$MN%48Vv1ua<WmydVgIAP9mW
z2!bF8Z-dLKxAPYqx*B8O30_t`?u{pFiP|K+@kGmn*ak$;<Vq>_eShaN!S{VuN^y7a
z1f7YBeakw1lt4b8$7nQ~mEYanZS|&heloJzEFK>pf#(})v$|Z@jUFVI3fMG@#wH@I
z#}lLP0=vTA-d^msi45?4pKaSt(nTU{+fJN;u?=Xq+Y8IDudlbZ2P_)fvMgAZ6}ykv
z2Dq-PA?@{$XbEil1TdjN>kksc;V{Wq8$nm&n>+<{h;4vv+weRuT{Q;qJP(CJA$I$B
jp8<j(2!bF8!h7WpU-KFe_vZU(00000NkvXXu0mjf!6#DU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000000000000000000000000000000000..20c4eb7d72a05d9bbbd6214dad30f4f865121294
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%t4TybRCt{2nlWo4K@`XT9v7}$b4R!gEKh7wEG)5F!GvW=XA?hxUaKD>y<Z`1
zinPIR5W-y`q!cW!a}hj2h;o(HyCSaV9cp&mSvAS~b<T`4|M#CaGcqF}2!bF8f*>rW
zRwS+!iMOpIEi$VrYenLdqeJw@6LbepxOxazw%6hI_I71`5Cki~_kTSRaTx0B`?#!P
zQShgw5`VwHH)et<h@LZ)h&WJx%i~Pg(gyQsfAtV%9LM2YE{EUaF-(~7QU*jU%Y+Cb
zV#~77Xf)7lHu0^n4*;;OPx$fk*G&Ji?`s9(I1U5A=WN!92}y~9KRY|a&CSiMJPboz
zoFC6jFu8Q$I1X1T6+SJMwz@GA5xcI-02lyA%V7FB-Obx^94?p3TQgxk_*#+p;{14K
zgl=CS))CO@bTZv;7hetzuxS&bv~RcDs1*shulwi@o-kd`=1zf^=yW<60POod0Bq`X
z_$T<2qeJs+T$gB1P)enq2~pY;5nool-THx6E|*g^p;D<Z0OMmAO`UqZ&i#HLtyaru
zztapu8hx*|2`;1G??WjS%@%?n;2;PR&seL~%A^r|D$MN%48Vv1ua<WmydVgIAP9mW
z2!bF8Z-dLKxAPYqx*B8O30_t`?u{pFiP|K+@kGmn*ak$;<Vq>_eShaN!S{VuN^y7a
z1f7YBeakw1lt4b8$7nQ~mEYanZS|&heloJzEFK>pf#(})v$|Z@jUFVI3fMG@#wH@I
z#}lLP0=vTA-d^msi45?4pKaSt(nTU{+fJN;u?=Xq+Y8IDudlbZ2P_)fvMgAZ6}ykv
z2Dq-PA?@{$XbEil1TdjN>kksc;V{Wq8$nm&n>+<{h;4vv+weRuT{Q;qJP(CJA$I$B
jp8<j(2!bF8!h7WpU-KFe_vZU(00000NkvXXu0mjf!6#DU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e397edca2300c7a67a06c81db8c5d17c22f8626c
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Zb?KzR9J=Wl0QqsP!z>aq{XQz4+=G<CYwT_(5-_@5c~>Vga_^7N3gp~9Qy?v
z>fqGHKo^%R4iz_{AarRAga?6;)TK+GgKg-amr@5o@cov{<-Fvad%1u_B9Tb`JIXH6
zG;6$2P%#`n?|heqZQEQ`RiTz72|AsQk`sxVR^@~c0Kjybz%*<8r{+-<p;D<p(=?$T
z1OWhGD*$ci{2j+>?|BnYdWm|yj#8-vN?Xu%W3K>=G34`kq0SiF4nP|^KRY>s5r3jT
zo&x{~A#j`l9A}XBr}%(TCYZ2DSo`BSg1}e8FwERs7>2;=4J^(5c!mj!@Z`;fA71DO
zFv<kg;vxKaCahQYFPS&vx-KlsO8cD1{B>GHvw4ngx2u?DjgLle=?~ivF7B==2fioX
ztT&IIvNYNU;Snwj`KEaq;<lGLVH<#DS!+|SPM;aTk7uF~zs}kX06=f(?KIwZwODLI
eB9TZWf1WSHCY=Aa658DW0000<MNUMnLSTY~fV{c@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..343ea773cdc329fc6eb514d804c404c41ce77795
GIT binary patch
literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%O-V#SRCt{2+A(X}KokJrr#28exWR_n5d^{AAYy3o78TOLzrdU6kVOAN-uw$R
zdCYpyq2OQ8$wM=E?+`Q?8eH5{2gMi?8v?IGtD@F%9LKtoRNglk+uXZ*I-e!p10aMD
zLI@#53n2t%J%^-cI)e!zP)Z4&=jA2|+7iGyM=2$QVF<qO8~=Wu)y`O&hzgu@Jb7J$
zkC(SFo6TS{nfw*k^E|9pt5B=ez;#_MbBZb70rBDw_IBZIdA_uG007_jjW7&BN(r2E
ztvf+!wi#o1`sO7Z?Cruu@EyePYGpjrG_h1F!TZA(@Zrl0Mx)V_<~A4%{=9BBn`^(X
zECGx$Y`5Fc@Au)|tGfpmA9EcGkL`UJPZwJyA#;o|?DcxcImdFjywR3+9ShITj<DNm
zX!$9mo?*rq8pf|-qbPzXiZ+hnIu?HZu~Xa~VB0pDrn%J>+;r!Vyx8{2C&lMMTI1a(
z_4|PNe4g4^Vt8eYrwec$OIZ?9Pry?Sy;W2$yf7#Ugb+dqA%qY@2qA<NPu{vhl9ZRn
z^Vk)Vq%;BRx<c|m*`(HWh2+I^6@w<bLh$AqE-t_2a`B*I2P7B2t}Eof!#T%Jr-Qa_
zV^$R%*Re8-4e-0JudBAt7+Z?dZ8h-x?C8-+P*NOCvp~8EV+<>m%F_E^Wd!5t0*>u{
z{dGlM0XgT`Z8aY3L3(VDQQ;1#v=7-rB|ybLjFS5R6@(C2uh&6*8Uo&2r}p={lg1#b
t#m^IA7(x&PMv(P{vXIw@DMAP-w4aNy2iqNf25$fW002ovPDHLkV1m7?Enxrv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d175ebb4c513282b3a576609a52d9744bd753c1b
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%GD$>1RCt{2+P!MqP!tF7zeFJIAj0+H3WC6Q5FG;EqCyuxfhR+U5N&=0dGix!
z@|ac7q4*^{G*IsyiUymSf^yZt6c2T$)1?w=<20_TPwV_9VPEWXj*n!adjQ55V~nw;
z3xa^kj-d=X0C=89N~uN`K?eZe_q8~Vp_GD@vT;QK0GOspwr$h6-=$+N!k=BPCkIg!
zX|Kc<=Vzz5x-gEi6M`Thr4&5ROLNnITQFZ~x8Yq{gifb(G)0h7l2QtB9K-j0EqPtr
zwb*qmdjItVgTVmP=@iT5a_71t%x1InxYz3)^chl0y1Fp%?$dW{HXB4y^mIN#2$E9L
zWHO;TcY>6X#{DkcTwjvwSP$~}YbAsbB!mC}5K*a}aHw&=OXp{&xDD?R%vb*&fAa5;
zOLPU0Qttfa8$$?@P4cE`9%U8vJ=OpKw%cvKk!0+#i(VtRjz!~scdz94?tnUKYzLs}
z$uq_nV~jDz7-NhvRzpQit5ou-aFHWBl`KG!BRiGd?KMr448y>im(TI`;|7bxB9~Yz
z*#RhUWT&znkZ>J~UfVD5<=c;3J7KRt%Gzyl9gA$+rqO6r&IFt5SafrJxpTv@sPUO!
z(<+&N*U3{0?ziA)wSMq^tJMMk%6oify<V4hx<0nmoD5PGIb50bY53n&t;|L0K$!$v
z=OSblsOwntVf_rl;SlY18?Nitq6nGY2nF+%7KUMZ3){re`_%nmWX2d{74{QRM*=T}
SbiyV80000<MNUMnLSTY*_a;&R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json
new file mode 100644
index 0000000000..1b360a9d2f
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/b5f048539b43797b371061e69534554595704525. Created by pireamaineach (github). Bolt-open modified from icon.png by Flareguy.  Resprite by kleinerstation13 (Github). Suppressor sprite made by Kleinerstation13 (Github), inspired from sprites created by BoskiYourk (Github) at commit https://github.com/Sector-Crescent/Hullrot/commit/1f7e549e20528ca7f4154616ef615cc456fd1c6d.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..674b221b2d212b2a798ebcde30f8fe838c071ce5
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%1xZ9fRCt{2+A(X}Koke?zl*^35Cwrj6_^WTa3N4Scrc+EvUKf7@aOQ7DT_aZ
zr+kF0S-f<};K4&WXb4y_C>Dkz-hzkg;HpU^`A(J;V(9<32&B7v_nw57djJs;5fKp)
z5&ds!05BX5m2KN^9;{X?3<iVRM{TSsrraz5ux%TyRx35x^V-UB9BqKJvs1XPi_vI=
zX0r(?C8U&<7tV1Um1o^<x2q<T$-i;ia*J62uv{)v58`_V2X=baE7R#6fIA3r4B!9#
zF3AJPz3%JeVaN?}0ir0vdc95tL>SI%Kg1_><T_{{)-iv2PF-gUiJM?Ex6x>%g7tes
zUEKyd7p3UDq;0vyas}x3ggSB^%oY;Kt8SAQKfkH=VI9BxNA0+*c;7ppF@Ji-<@NMk
z|3j8(z<4}{u25I!=b88WJ)z2N?PZ-RzJw3a?+I135M|~P5fKp)5fKp)5fKp)rIkK&
z>vTHG_kHa;rY41=4H|i3n-~vAbv(~gmQ}~e$=9uCcv4DZlR}vW4bSsb7>0$5P^tib
z11lkpw~mog8k-b~HfRLFJ<24HA_d4guKt1tWHnLD781ANycR`~(lsd*Y0#K0B!V1!
zGudgdu5lr&iK41={XA<IZN}L73y7<qv<Vu&ljOT8C(qiOJ?Z}!mDuN|g?-)|5fKsX
ZpFb$PG}ilATNwZV002ovPDHLkV1nR70ZRY?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7edd6adaea91ded724d2c7d07fde0b7ed1c70bb3
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$`bk7VRCt{2+ObZ;P!tB>AA^C#lADld6H*h0nvfU=1_l=vS091F@DMCcF8CTg
zf}?{I#xO9rGLTqFY8#S97GfB#gPKU~y}eLWqW`xvw5R8udkQQ)01*)p5fKp){WrPq
zUZB(INXxS3&P^s0wA=06A~D}3ZyG3skU|Jdr&F|AEd)V;Zud@mPZUM4EDPmwSsP~(
zQ>)cvzu!-7h!8?XQDodW;|9DZm9AUG_4N$^U~9`ty9eX(_{;hDIg=QZ&3~%Xn6d%Q
zx+5=p-dwU`u?Wu_0sxMkP3&$9R7wSmo?pHkAA$%yf0PTuP|jwvc#(6T!!Sfz%(9a9
z@mb=9X5EoT?hZ!JFF3!tSKi#LJ92kh;30?*Kk63!DQ72#vQjGGcJQREC-o<w>)`3d
zrE-&}02+<Pf+ep`v+l^u2{I@7Wq)B0L_|bHL_|bHL_|bHv?`fjV7jg=2ZMn&Puc*)
zvI7z(Yo{@u4@hF$w#?@Xs8$b@@83*@BvjXJyCQ`UsWte%zjPBaHQ;?=={S4J7?U9h
z-F4j%hUX2DW%F330ZFgR_wkrGEMYn%p&F3z{Za1N*^sK-o<VJC77Er4P9zOWtZGQY
zB)7>hM3RNS0UzCudt3D5nZ%z>HYT~>YSRB-ti(DG9ISI~L_|cieqI3^_&1-<u&e$6
O0000<MNUMnLSTYnmHa&b

literal 0
HcmV?d00001


From a12c8b1dee1782a3b3efa469af091bcea6253b7c Mon Sep 17 00:00:00 2001
From: Tiniest Shark <head.rebel@yahoo.com>
Date: Tue, 9 Dec 2025 04:33:04 -0500
Subject: [PATCH 061/360] Add paper labels to gas canisters (#41737)

* paper? on canisters? are you KIDDING

* woops forgot something

* I think this'll fix the errors?
---
 .../Storage/Canisters/gas_canisters.yml       |  27 ++
 .../Storage/canister.rsi/bounty.png           | Bin 0 -> 211 bytes
 .../Storage/canister.rsi/captains_paper.png   | Bin 0 -> 214 bytes
 .../Storage/canister.rsi/invoice.png          | Bin 0 -> 215 bytes
 .../Structures/Storage/canister.rsi/meta.json | 250 +++++++++---------
 .../Structures/Storage/canister.rsi/paper.png | Bin 0 -> 203 bytes
 6 files changed, 158 insertions(+), 119 deletions(-)
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/bounty.png
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/invoice.png
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/paper.png

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index afc094ed7a..8e94c704e8 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -14,6 +14,9 @@
       noRot: true
       layers:
         - state: grey
+        - state: paper
+          visible: false
+          map: [ "enum.PaperLabelVisuals.Layer" ]
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -35,6 +38,19 @@
             1: { state: can-o1, shader: "unshaded" }
             2: { state: can-o2, shader: "unshaded" }
             3: { state: can-o3, shader: "unshaded" }
+        enum.PaperLabelVisuals.HasLabel:
+          enum.PaperLabelVisuals.Layer:
+            True: { visible: true }
+            False: { visible: false }
+        enum.StorageVisuals.Open:
+          enum.PaperLabelVisuals.Layer:
+            True: { visible: false }
+        enum.PaperLabelVisuals.LabelType:
+          enum.PaperLabelVisuals.Layer:
+            Paper: { state: paper }
+            Bounty: { state: bounty }
+            CaptainsPaper: { state: captains_paper }
+            Invoice: { state: invoice }
     - type: ActivatableUI
       key: enum.GasCanisterUiKey.Key
     - type: UIRequiresLock
@@ -89,6 +105,7 @@
     - type: ContainerContainer
       containers:
         tank_slot: !type:ContainerSlot {}
+        paper_label: !type:ContainerSlot
     - type: NodeContainer
       nodes:
         port:
@@ -118,6 +135,16 @@
             - GasTank
     - type: StaticPrice
       price: 200
+    - type: PaperLabel
+      labelSlot:
+        insertVerbText: comp-paper-label-insert
+        ejectVerbText: comp-paper-label-eject
+        whitelist:
+          components:
+          - Paper
+        blacklist:
+          tags:
+          - Book
     - type: AccessReader
       access: [["Atmospherics"], ["Engineering"]] # DeltaV - removed research
     - type: Lock
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/bounty.png b/Resources/Textures/Structures/Storage/canister.rsi/bounty.png
new file mode 100644
index 0000000000000000000000000000000000000000..19f08dd25c35ae37bd3e0a39bdd26e000eb261b1
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`C<PArY;~
z2@<S}6GVEN0u8v_4tlWnOv%tYYx=+6cTe>v&qZfb7an2c0fL*JZW@19em*yG$^0aC
z10bmR^JntIkC)H$Y`U~Z<@M4o<||WLB|tcC-!HFCacW+=|9|{cKYY)b|Kv6QLXHog
xHyImv7#rN#^}7$G?Mpes%FaB9wQRBs40$JI{VQ&t+YfXYgQu&X%Q~loCIF6zR6zg$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..f080407b983bb027a7e8e9f12d1eeccfdd4afc39
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FglULn2z=
zUNYo5<RH@WFy1rMPhdmjiGy2&gR0qHH_Wx{41K4tVuBk-(yi@#SF&<nXLl^vmnWVk
z*~Tg;DEPD7*nh{WZRg9sm+t-j<L;SYhJ?Mh_RQfwYo}@dU5sHv#vFZhov5N~dl?)!
zR28T2^j8Df4X%rG`{SSA<$lsVXHmqZ((qsZ%xW92_^T^@Dt6o7E8lJ#eZL*(HU>{u
KKbLh*2~7Y2ZBvr~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/invoice.png b/Resources/Textures/Structures/Storage/canister.rsi/invoice.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1da2f1ca02505f2fa20f7f99770c4a4629768cf
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y}
z6C_v{Cy4Yk1sZU<9rR%DnUe8MZ{?qU-<oWH>x<7e1w3M41A^&iVnqJUdpX(j(s`Ga
z%o0Gbum0bW4^M81w!NQkKXJ|UM*;~zFd-l`9fW`Ucw~99N|Ub<C}|jTcl+#|zas4n
z>iY7{8`j7i?!Ij<dC#uSrJjAltQT$vH9#)7z{s#}jr<ljt3Cce$1!-i`njxgN@xNA
D*6LA`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 95d67cc8ae..b3ed9a9889 100644
--- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -1,122 +1,134 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "black"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335. Paper Sprites by Vermidia.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "black-1"
-    },
-    {
-      "name": "blue"
-    },
-    {
-      "name": "blue-1"
-    },
-    {
-      "name": "can-connector"
-    },
-    {
-      "name": "locked"
-    },
-    {
-      "name": "unlocked"
-    },
-    {
-      "name": "can-o0",
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "can-o1"
-    },
-    {
-      "name": "can-o2"
-    },
-    {
-      "name": "can-o3"
-    },
-    {
-      "name": "can-oa1"
-    },
-    {
-      "name": "can-open"
-    },
-    {
-      "name": "grey"
-    },
-    {
-      "name": "grey-1"
-    },
-    {
-      "name": "orange"
-    },
-    {
-      "name": "orange-1"
-    },
-    {
-      "name": "red"
-    },
-    {
-      "name": "red-1"
-    },
-    {
-      "name": "redws"
-    },
-    {
-      "name": "redws-1"
-    },
-    {
-      "name": "yellow"
-    },
-    {
-      "name": "yellow-1"
-    },
-    {
-      "name": "green"
-    },
-    {
-      "name": "green-1"
-    },
-    {
-      "name": "greenys"
-    },
-    {
-      "name": "greenys-1"
-    },
-    {
-      "name": "darkblue"
-    },
-    {
-      "name": "darkblue-1"
-    },
-    {
-      "name": "frezon"
-    },
-    {
-      "name": "frezon-1"
-    },
-    {
-      "name": "water_vapor"
-    },
-    {
-      "name": "water_vapor-1"
-    },
-    {
-      "name": "scrubber-connector"
-    },
-    {
-      "name": "scrubber-open"
-    }
-  ]
+    "states": [
+        {
+            "name": "black"
+        },
+        {
+            "name": "black-1"
+        },
+        {
+            "name": "blue"
+        },
+        {
+            "name": "blue-1"
+        },
+        {
+            "name": "can-connector"
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        },
+        {
+            "name": "can-o0",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "can-o1"
+        },
+        {
+            "name": "can-o2"
+        },
+        {
+            "name": "can-o3"
+        },
+        {
+            "name": "can-oa1"
+        },
+        {
+            "name": "can-open"
+        },
+        {
+            "name": "grey"
+        },
+        {
+            "name": "grey-1"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "orange-1"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "red-1"
+        },
+        {
+            "name": "redws"
+        },
+        {
+            "name": "redws-1"
+        },
+        {
+            "name": "yellow"
+        },
+        {
+            "name": "yellow-1"
+        },
+        {
+            "name": "green"
+        },
+        {
+            "name": "green-1"
+        },
+        {
+            "name": "greenys"
+        },
+        {
+            "name": "greenys-1"
+        },
+        {
+            "name": "darkblue"
+        },
+        {
+            "name": "darkblue-1"
+        },
+        {
+            "name": "frezon"
+        },
+        {
+            "name": "frezon-1"
+        },
+        {
+            "name": "water_vapor"
+        },
+        {
+            "name": "water_vapor-1"
+        },
+        {
+            "name": "scrubber-connector"
+        },
+        {
+            "name": "scrubber-open"
+        },
+        {
+            "name": "bounty"
+        },
+        {
+            "name": "captains_paper"
+        },
+        {
+            "name": "invoice"
+        },
+        {
+            "name": "paper"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/paper.png b/Resources/Textures/Structures/Storage/canister.rsi/paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ddf4a3a62586aea33226879eb80f14c9fd5d3ee
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY-_
zFBx(%8H%(#jNcfSKjGWlytl<oU)~iK_1sm<owfDs?uKhkt%eFspG!G?B-$D}Iy(OB
zKI~y}tfIbjeo)o#yO%u}8&2EU&s~4|(p39CF@}tHYi_$0zdy&P&ybKdLvnj9h<V}8
yNz3{<@^KGrd|L!GmIh@1t!upJudei|SgyBJ-v4&n);B;0F?hQAxvX<aXaWG9{!<qK

literal 0
HcmV?d00001


From d443cbdbd87d94e92bc1a8a5bf1eaaa85608dcf6 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Tue, 9 Dec 2025 06:39:37 -0500
Subject: [PATCH 062/360] Delete license.txt (#41805)

---
 Resources/Audio/Voice/Human/license.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Resources/Audio/Voice/Human/license.txt

diff --git a/Resources/Audio/Voice/Human/license.txt b/Resources/Audio/Voice/Human/license.txt
deleted file mode 100644
index 85f3faa394..0000000000
--- a/Resources/Audio/Voice/Human/license.txt
+++ /dev/null
@@ -1 +0,0 @@
-male_cough_1.ogg taken from freesound (deleted user)

From 747a5bd0ec49c454ae2eb4a279e0d7b8a2b9522b Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 9 Dec 2025 04:50:50 -0800
Subject: [PATCH 063/360] Make door bolting powergaming no longer relevant
 anymore (#41138)

* make door bolting powergaming no longer relevant anymore
port and remove moff guard comments

* update desc

* One line bugefix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Doors/Systems/SharedDoorSystem.cs             | 4 ++--
 Resources/Locale/en-US/store/uplink-catalog.ftl              | 2 +-
 Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index c031dcc7bd..310ea70bdc 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -123,7 +123,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
         if (!TryComp<AirlockComponent>(uid, out var airlock))
             return;
 
-        if (IsBolted(uid) || !airlock.Powered)
+        if (!airlock.Powered)
             return;
 
         if (door.State != DoorState.Closed)
@@ -368,7 +368,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
             Audio.PlayPvs(door.OpenSound, uid, AudioParams.Default.WithVolume(-5));
 
         if (lastState == DoorState.Emagging && TryComp<DoorBoltComponent>(uid, out var doorBoltComponent))
-            SetBoltsDown((uid, doorBoltComponent), !doorBoltComponent.BoltsDown, user, true);
+            SetBoltsDown((uid, doorBoltComponent), true, user, true);
     }
 
     /// <summary>
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 4eb6b965b9..5d6b764cd0 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -286,7 +286,7 @@ uplink-toolbox-name = Toolbox
 uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves and a syndicate gas mask as well.
 
 uplink-syndicate-jaws-of-life-name = Jaws Of Life
-uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments.
+uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments. Can even open bolted doors!
 
 uplink-duffel-surgery-name = Surgical Duffel Bag
 uplink-duffel-surgery-desc = A large duffel bag containing a full suite of surgical tools.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 8c925b77ad..67ec0de197 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -67,6 +67,7 @@
       - state: syn_inhand-right
     size: Normal
   - type: Prying
+    force: true
     speedModifier: 3.0
   - type: MultipleTool
     entries:

From 46cd3622c84d8a57d62a2f2c7abb8c0f5c7f07f1 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Tue, 9 Dec 2025 04:59:38 -0800
Subject: [PATCH 064/360] Fix mobs not being blindable (#41788)

added blindable component to BaseSimpleMob
---
 Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index f02a93f3b1..bb37b656fa 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -32,6 +32,7 @@
     tags:
     - DoorBumpOpener
     - StunImmune
+  - type: Blindable
 
 - type: entity
   abstract: true

From 396919eef54ab9b7cc279483c3761e80a932d3c3 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Tue, 9 Dec 2025 09:48:57 -0500
Subject: [PATCH 065/360] Add BasePaperLabelable and
 BasePaperLabelableVisualized abstract prototypes (#41807)

* Add BasePaperLabelable to base_item.yml

* CrateGeneric now parents from BasePaperLabelable

* TWO types of BaseParcelWrapable

* Body bags use BasePaperLabelable

* Artifact containers use BasePaperLabelable

* Lockers now use BasePaperLabelable

* Comment cleanup + redundancies

* Seeds now use BasePaperLabelable (but need more paper sprites in the future)

* Parcel wrap bugfix

* Remove redundant components from crates

* Fix testfail tied to ContainerContainer component

* Fixed bad line alignment

* Gas canisters now use BasePaperLabelableVisualized

* Comment updates

* Other comment update
---
 .../Entities/Objects/Misc/parcel_wrap.yml     | 14 +-----
 .../Objects/Specific/Hydroponics/seeds.yml    | 16 +-----
 .../Objects/Specific/Medical/morgue.yml       | 13 +----
 .../Xenoarchaeology/artifact_equipment.yml    | 13 +----
 .../Prototypes/Entities/Objects/base_item.yml | 49 +++++++++++++++++++
 .../Storage/Canisters/gas_canisters.yml       | 13 +----
 .../Storage/Closets/base_structureclosets.yml | 13 +----
 .../Storage/Crates/base_structurecrates.yml   | 26 +---------
 8 files changed, 57 insertions(+), 100 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
index e2130d2679..c553948891 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
@@ -43,6 +43,7 @@
 
 - type: entity
   abstract: true
+  parent: BasePaperLabelable # We use this instead of BasePaperLabelableVisualized because WrappedParcel needs its own GenericVisualizer component for the parcel itself, and WrappedParcelHumanoid currently doesn't have label sprites at all
   id: BaseWrappedParcel
   name: wrapped parcel
   description: Something wrapped up in paper. I wonder what's inside...
@@ -64,17 +65,6 @@
       params:
         volume: -4
     unwrapTrash: ParcelWrapTrash
-  - type: ItemSlots
-  - type: PaperLabel
-    labelSlot:
-      insertVerbText: comp-paper-label-insert
-      ejectVerbText: comp-paper-label-eject
-      whitelist:
-        components:
-        - Paper
-      blacklist:
-        tags:
-        - Book
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -107,7 +97,7 @@
     - Recyclable # Parcel entity is recyclable, and when it's destroyed, it'll drop its contents.
 
 - type: entity
-  parent: [BaseItem, BaseWrappedParcel]
+  parent: [ BaseItem, BaseWrappedParcel ]
   id: WrappedParcel
   components:
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index ca6270ab64..d8b458a0b3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [ BaseItem, BasePaperLabelable ] #TODO: Add sprites for different types of paper, replace BasePaperLabelable with BasePaperLabelableVisualized
   id: SeedBase
   abstract: true
   components:
@@ -23,20 +23,6 @@
       size: Tiny
     - type: StaticPrice
       price: 20
-    - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        paper_label: !type:ContainerSlot
-    - type: PaperLabel
-      labelSlot:
-        insertVerbText: comp-paper-label-insert
-        ejectVerbText: comp-paper-label-eject
-        whitelist:
-          components:
-          - Paper
-        blacklist:
-          tags:
-          - Book
     - type: PhysicalComposition
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index be6d676e5b..04500073ee 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BodyBag
-  parent: BaseDeployFoldable
+  parent: [ BaseDeployFoldable, BasePaperLabelableVisualized ]
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
   components:
@@ -54,16 +54,6 @@
     openSound:
       path: /Audio/Misc/zip.ogg
   - type: EntityStorageLayingDownOverride
-  - type: PaperLabel
-    labelSlot:
-      insertVerbText: comp-paper-label-insert
-      ejectVerbText: comp-paper-label-eject
-      whitelist:
-        components:
-        - Paper
-      blacklist:
-        tags:
-        - Book
   - type: Appearance
   - type: EntityStorageVisuals
     stateDoorOpen: open_overlay
@@ -88,7 +78,6 @@
           False: {visible: true}
   - type: Pullable
   - type: AntiRottingContainer
-  - type: ItemSlots
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index 8352933f8b..fd9d11f90e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -1,6 +1,6 @@
 - type: entity
+  parent: [ BaseStructureDynamic, BasePaperLabelableVisualized ]
   id: CrateArtifactContainer
-  parent: BaseStructureDynamic
   name: artifact container
   description: Used to safely contain and move artifacts.
   components:
@@ -64,16 +64,6 @@
           behaviors:
             - !type:DoActsBehavior
               acts: ["Destruction"]
-    - type: PaperLabel
-      labelSlot:
-        insertVerbText: comp-paper-label-insert
-        ejectVerbText: comp-paper-label-eject
-        whitelist:
-          components:
-            - Paper
-        blacklist:
-          tags:
-          - Book
     - type: Appearance
     - type: EntityStorageVisuals
       stateDoorOpen: artifact_container_open
@@ -95,7 +85,6 @@
             True: { offset: "0.0,0.3125" }
             False: { offset: "0.0,0.0" }
     - type: LockVisuals
-    - type: ItemSlots
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index 8490ba0042..ca7e78033d 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -76,6 +76,55 @@
           Open: { visible: true }
           Closed: { visible: false }
 
+# Defines the behavior (but not the visuals!) for attaching paper labels to objects (e.g crates, parcels).
+# Use this (NOT BasePaperLabelableVisualized) if the child prototype allows paper labels but has no sprites for it.
+# Note that if an entity has its own ContainerContainer component then paper_label needs to be added to that too, or else there's bugs.
+- type: entity
+  id: BasePaperLabelable
+  abstract: true
+  components:
+  - type: ContainerContainer
+    containers:
+      paper_label: !type:ContainerSlot
+  - type: ItemSlots
+  - type: PaperLabel
+    labelSlot:
+      insertVerbText: comp-paper-label-insert
+      ejectVerbText: comp-paper-label-eject
+      whitelist:
+        components:
+        - Paper
+      blacklist:
+        tags:
+        - Book
+
+# Defines both the behavior (via parenting) and the visuals for attaching paper labels to objects (e.g crates, parcels).
+# Use this (NOT BasePaperLabelable) if the child prototype has sprites for paper labels.
+# The GenericVisualizer used here ONLY manages the paper label. If the child prototype has a unique GenericVisualizer for some reason or another,
+# then that will also need to handle the paper label too, since it'll completely overwrite the one here.
+# You should still parent from this instead of BasePaperLabelable since if that unique GenericVisualizer is missing for some reason this one works as a failsafe.
+# (Though it might not really matter in practice.)
+# In any case, the actual Sprite component for the label layer still needs to be defined on a per-item basis!
+# And again note that if an entity has its own ContainerContainer component then paper_label needs to be added to that too, or else there's bugs.
+- type: entity
+  parent: BasePaperLabelable
+  id: BasePaperLabelableVisualized
+  abstract: true
+  components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
+
 # PowerCellSlot parents
 - type: entity
   id: PowerCellSlotSmallItem
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 8e94c704e8..63b75aaa7d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseStructureDynamic
+  parent: [ BaseStructureDynamic, BasePaperLabelableVisualized ]
   id: GasCanister
   name: gas canister
   description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
@@ -113,7 +113,6 @@
           nodeGroupID: Pipe
           rotationsEnabled: false
           volume: 1
-    - type: ItemSlots
     - type: AutomationSlots # Goobstation
       slots:
       - !type:AutomatedItemSlot
@@ -135,16 +134,6 @@
             - GasTank
     - type: StaticPrice
       price: 200
-    - type: PaperLabel
-      labelSlot:
-        insertVerbText: comp-paper-label-insert
-        ejectVerbText: comp-paper-label-eject
-        whitelist:
-          components:
-          - Paper
-        blacklist:
-          tags:
-          - Book
     - type: AccessReader
       access: [["Atmospherics"], ["Engineering"]] # DeltaV - removed research
     - type: Lock
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 181321d280..839e5ef1fb 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: ClosetBase
-  parent: BaseStructureDynamic
+  parent: [ BaseStructureDynamic, BasePaperLabelableVisualized ]
   name: closet
   description: A standard-issue Nanotrasen storage unit.
   abstract: true
@@ -25,17 +25,6 @@
       sprite: Structures/Storage/closet_labels.rsi
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: MovedByPressure
-  - type: PaperLabel
-    labelSlot:
-      insertVerbText: comp-paper-label-insert
-      ejectVerbText: comp-paper-label-eject
-      whitelist:
-        components:
-        - Paper
-      blacklist:
-        tags:
-        - Book
-  - type: ItemSlots
   - type: DamageOnHighSpeedImpact
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 635cdee16e..6d5d48c767 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseStructureDynamic
+  parent: [ BaseStructureDynamic, BasePaperLabelableVisualized ]
   id: CrateGeneric
   categories: [ HideSpawnMenu ]
   name: crate
@@ -55,37 +55,13 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
-  - type: Appearance
   - type: EntityStorageVisuals
     stateDoorOpen: open
     stateDoorClosed: closed
-  - type: GenericVisualizer
-    visuals:
-      enum.PaperLabelVisuals.HasLabel:
-        enum.PaperLabelVisuals.Layer:
-          True: { visible: true }
-          False: { visible: false }
-      enum.PaperLabelVisuals.LabelType:
-        enum.PaperLabelVisuals.Layer:
-          Paper: { state: paper }
-          Bounty: { state: bounty }
-          CaptainsPaper: { state: captains_paper }
-          Invoice: { state: invoice }
-  - type: PaperLabel
-    labelSlot:
-      insertVerbText: comp-paper-label-insert
-      ejectVerbText: comp-paper-label-eject
-      whitelist:
-        components:
-        - Paper
-      blacklist:
-        tags:
-        - Book
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
       paper_label: !type:ContainerSlot
-  - type: ItemSlots
   - type: StaticPrice
     price: 75
   - type: Construction

From 117779ea046f470a6fd5d01d7fe770e95cb2c459 Mon Sep 17 00:00:00 2001
From: tkirkby <trevor.p.kirkby@gmail.com>
Date: Tue, 9 Dec 2025 09:11:05 -0800
Subject: [PATCH 066/360] Migrate Bot Speech Catalogs to One Folder (#41478)

migrate bot speech catalogs to one place
---
 Resources/Prototypes/Catalog/Bots/advertisements.yml | 11 +++++++++++
 Resources/Prototypes/Catalog/{ => Bots}/hugbot.yml   |  0
 .../Catalog/VendingMachines/advertisements.yml       | 12 ------------
 3 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Prototypes/Catalog/Bots/advertisements.yml
 rename Resources/Prototypes/Catalog/{ => Bots}/hugbot.yml (100%)

diff --git a/Resources/Prototypes/Catalog/Bots/advertisements.yml b/Resources/Prototypes/Catalog/Bots/advertisements.yml
new file mode 100644
index 0000000000..6174c25ff3
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bots/advertisements.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: MedibotAds
+  values:
+    prefix: advertisement-medibot-
+    count: 17
+
+- type: localizedDataset
+  id: FirebotAd
+  values:
+    prefix: advertisement-firebot-
+    count: 4
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/hugbot.yml b/Resources/Prototypes/Catalog/Bots/hugbot.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/hugbot.yml
rename to Resources/Prototypes/Catalog/Bots/hugbot.yml
diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
index 3422f564b0..e123dbf7be 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -142,12 +142,6 @@
     prefix: fat-extractor-fact-
     count: 6
 
-- type: localizedDataset
-  id: FirebotAd
-  values:
-    prefix: advertisement-firebot-
-    count: 4
-
 - type: localizedDataset
   id: GoodCleanFunAds
   values:
@@ -280,12 +274,6 @@
     prefix: advertisement-virodrobe-
     count: 3
 
-- type: localizedDataset
-  id: MedibotAds
-  values:
-    prefix: advertisement-medibot-
-    count: 17
-
 - type: localizedDataset
   id: PrideDrobeAds
   values:

From 3313741a32d4cf13a2ad284c451260dddb0ce010 Mon Sep 17 00:00:00 2001
From: Myra <vasilis@pikachu.systems>
Date: Tue, 9 Dec 2025 19:46:34 +0100
Subject: [PATCH 067/360] Update the erase script to support the latest
 migration (#41524)

No changes needed, its compatible still

Tested in production :3
---
 Tools/erase_user_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/erase_user_data.py b/Tools/erase_user_data.py
index 0cc1a31d93..509654f91e 100644
--- a/Tools/erase_user_data.py
+++ b/Tools/erase_user_data.py
@@ -12,7 +12,7 @@ import os
 import psycopg2
 from uuid import UUID
 
-LATEST_DB_MIGRATION = "20250211131539_LoadoutNames"
+LATEST_DB_MIGRATION = "20250314222016_ConstructionFavorites"
 
 def main():
     parser = argparse.ArgumentParser()

From 031719aec087c2c778569fc4e46ed11de650cb09 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Wed, 10 Dec 2025 15:28:43 +1300
Subject: [PATCH 068/360] Chefs start with chef shoes (#41814)

starting chef shoes
---
 Resources/Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index 6a00cdc8e6..5999eb8666 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -25,7 +25,7 @@
 - type: startingGear
   id: ChefGear
   equipment:
-    shoes: ClothingShoesColorBlack
+    shoes: ClothingShoesChef
     #id: ChefPDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetService
     belt: ClothingBeltChefFilled

From 278cff64f41eaa62600c27305ae53e6e04593329 Mon Sep 17 00:00:00 2001
From: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Date: Wed, 10 Dec 2025 05:35:42 -0500
Subject: [PATCH 069/360] Change that specifies escape via the escape shuttle
 rather than pods in escape objectives (#41809)

* specifies escape via escape shuttle (because escape pods do not count)

* corrects capitalization of CentComm

* apply fixes to thief objectives aswell

* apply fixes to paradox clone objectives aswell
---
 Resources/Prototypes/Objectives/paradoxClone.yml | 2 +-
 Resources/Prototypes/Objectives/thief.yml        | 2 +-
 Resources/Prototypes/Objectives/traitor.yml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Objectives/paradoxClone.yml b/Resources/Prototypes/Objectives/paradoxClone.yml
index 34b41050c7..7006e74a05 100644
--- a/Resources/Prototypes/Objectives/paradoxClone.yml
+++ b/Resources/Prototypes/Objectives/paradoxClone.yml
@@ -17,7 +17,7 @@
 - type: entity
   parent: [BaseParadoxCloneObjective, BaseLivingObjective]
   id: ParadoxCloneLivingObjective
-  name: Escape to centcomm alive and unrestrained.
+  name: Escape to CentComm alive and unrestrained via the escape shuttle.
   description: Return to your old life.
   components:
   - type: Objective
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index cb171ca4a3..e43f4f0b1d 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -546,7 +546,7 @@
 - type: entity
   parent: [BaseThiefObjective, BaseLivingObjective]
   id: EscapeThiefShuttleObjective
-  name: Escape to centcomm alive and unrestrained.
+  name: Escape to CentComm alive and unrestrained via the escape shuttle.
   description: You don't want your illegal activities to be discovered by anyone, do you?
   components:
   - type: Objective
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index ed4d76f0d0..fccd03b3d8 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -37,7 +37,7 @@
 - type: entity
   parent: [BaseTraitorObjective, BaseLivingObjective]
   id: EscapeShuttleObjective
-  name: Escape to centcomm alive and unrestrained.
+  name: Escape to CentComm alive and unrestrained via the escape shuttle.
   description: One of our undercover agents will debrief you when you arrive. Don't show up in cuffs.
   components:
   - type: Objective

From 681c4dac12483097be6b4223575e9ff490fe5eeb Mon Sep 17 00:00:00 2001
From: Pok <113675512+Pok27@users.noreply.github.com>
Date: Wed, 10 Dec 2025 14:27:06 +0200
Subject: [PATCH 070/360] Predict RootableSystem (#41729)

RootableSystem-move-to-shared
---
 Content.Client/Rootable/RootableSystem.cs     |   5 -
 Content.Server/Rootable/RootableSystem.cs     |  78 ------
 Content.Shared/Rootable/RootableSystem.cs     | 261 ++++++++++++++++++
 .../Rootable/SharedRootableSystem.cs          | 196 -------------
 4 files changed, 261 insertions(+), 279 deletions(-)
 delete mode 100644 Content.Client/Rootable/RootableSystem.cs
 delete mode 100644 Content.Server/Rootable/RootableSystem.cs
 create mode 100644 Content.Shared/Rootable/RootableSystem.cs
 delete mode 100644 Content.Shared/Rootable/SharedRootableSystem.cs

diff --git a/Content.Client/Rootable/RootableSystem.cs b/Content.Client/Rootable/RootableSystem.cs
deleted file mode 100644
index 33e68ae594..0000000000
--- a/Content.Client/Rootable/RootableSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared.Rootable;
-
-namespace Content.Client.Rootable;
-
-public sealed class RootableSystem : SharedRootableSystem;
diff --git a/Content.Server/Rootable/RootableSystem.cs b/Content.Server/Rootable/RootableSystem.cs
deleted file mode 100644
index cd18315bd0..0000000000
--- a/Content.Server/Rootable/RootableSystem.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Fluids.Components;
-using Content.Shared.Rootable;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Rootable;
-
-// TODO: Move all of this to shared
-/// <summary>
-/// Adds an action to toggle rooting to the ground, primarily for the Diona species.
-/// </summary>
-public sealed class RootableSystem : SharedRootableSystem
-{
-    [Dependency] private readonly ISharedAdminLogManager _logger = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly ReactiveSystem _reactive = default!;
-    [Dependency] private readonly BloodstreamSystem _blood = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<RootableComponent, BloodstreamComponent>();
-        var curTime = _timing.CurTime;
-        while (query.MoveNext(out var uid, out var rooted, out var bloodstream))
-        {
-            if (!rooted.Rooted || rooted.PuddleEntity == null || curTime < rooted.NextUpdate || !PuddleQuery.TryComp(rooted.PuddleEntity, out var puddleComp))
-                continue;
-
-            rooted.NextUpdate += rooted.TransferFrequency;
-
-            PuddleReact((uid, rooted, bloodstream), (rooted.PuddleEntity.Value, puddleComp!));
-        }
-    }
-
-    /// <summary>
-    /// Determines if the puddle is set up properly and if so, moves on to reacting.
-    /// </summary>
-    private void PuddleReact(Entity<RootableComponent, BloodstreamComponent> entity, Entity<PuddleComponent> puddleEntity)
-    {
-        if (!_solutionContainer.ResolveSolution(puddleEntity.Owner, puddleEntity.Comp.SolutionName, ref puddleEntity.Comp.Solution, out var solution) ||
-            solution.Contents.Count == 0)
-        {
-            return;
-        }
-
-        ReactWithEntity(entity, puddleEntity, solution);
-    }
-
-    /// <summary>
-    /// Attempt to transfer an amount of the solution to the entity's bloodstream.
-    /// </summary>
-    private void ReactWithEntity(Entity<RootableComponent, BloodstreamComponent> entity, Entity<PuddleComponent> puddleEntity, Solution solution)
-    {
-        if (!_solutionContainer.ResolveSolution(entity.Owner, entity.Comp2.ChemicalSolutionName, ref entity.Comp2.ChemicalSolution, out var chemSolution) || chemSolution.AvailableVolume <= 0)
-            return;
-
-        var availableTransfer = FixedPoint2.Min(solution.Volume, entity.Comp1.TransferRate);
-        var transferAmount = FixedPoint2.Min(availableTransfer, chemSolution.AvailableVolume);
-        var transferSolution = _solutionContainer.SplitSolution(puddleEntity.Comp.Solution!.Value, transferAmount);
-
-        _reactive.DoEntityReaction(entity, transferSolution, ReactionMethod.Ingestion);
-
-        if (_blood.TryAddToChemicals((entity, entity.Comp2), transferSolution))
-        {
-            // Log solution addition by puddle
-            _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):target} absorbed puddle {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
-        }
-    }
-}
diff --git a/Content.Shared/Rootable/RootableSystem.cs b/Content.Shared/Rootable/RootableSystem.cs
new file mode 100644
index 0000000000..53053d87d3
--- /dev/null
+++ b/Content.Shared/Rootable/RootableSystem.cs
@@ -0,0 +1,261 @@
+using Content.Shared.Actions;
+using Content.Shared.Actions.Components;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Alert;
+using Content.Shared.Atmos.Components; // DeltaV
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Cloning.Events;
+using Content.Shared.Coordinates;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Gravity;
+using Content.Shared.Mobs;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Slippery;
+using Content.Shared.Toggleable;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Rootable;
+
+/// <summary>
+/// Adds an action to toggle rooting to the ground, primarily for the Diona species.
+/// Being rooted prevents weighlessness and slipping, but causes any floor contents to transfer its reagents to the bloodstream.
+/// </summary>
+public sealed class RootableSystem : EntitySystem
+{
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _logger = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+    [Dependency] private readonly ReactiveSystem _reactive = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _blood = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    private EntityQuery<PuddleComponent> _puddleQuery;
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _puddleQuery = GetEntityQuery<PuddleComponent>();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+
+        SubscribeLocalEvent<RootableComponent, MapInitEvent>(OnRootableMapInit);
+        SubscribeLocalEvent<RootableComponent, ComponentShutdown>(OnRootableShutdown);
+        SubscribeLocalEvent<RootableComponent, StartCollideEvent>(OnStartCollide);
+        SubscribeLocalEvent<RootableComponent, EndCollideEvent>(OnEndCollide);
+        SubscribeLocalEvent<RootableComponent, ToggleActionEvent>(OnRootableToggle);
+        SubscribeLocalEvent<RootableComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<RootableComponent, IsWeightlessEvent>(OnIsWeightless);
+        SubscribeLocalEvent<RootableComponent, SlipAttemptEvent>(OnSlipAttempt);
+        SubscribeLocalEvent<RootableComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+        SubscribeLocalEvent<RootableComponent, CloningEvent>(OnCloning);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<RootableComponent, BloodstreamComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var rooted, out var bloodstream))
+        {
+            if (!rooted.Rooted || rooted.PuddleEntity == null || curTime < rooted.NextUpdate || !_puddleQuery.TryComp(rooted.PuddleEntity, out var puddleComp))
+                continue;
+
+            rooted.NextUpdate += rooted.TransferFrequency;
+            Dirty(uid, rooted);
+            PuddleReact((uid, rooted, bloodstream), (rooted.PuddleEntity.Value, puddleComp!));
+        }
+    }
+
+    /// <summary>
+    /// Determines if the puddle is set up properly and if so, moves on to reacting.
+    /// </summary>
+    private void PuddleReact(Entity<RootableComponent, BloodstreamComponent> ent, Entity<PuddleComponent> puddleEntity)
+    {
+        if (!_solutionContainer.ResolveSolution(puddleEntity.Owner, puddleEntity.Comp.SolutionName, ref puddleEntity.Comp.Solution, out var solution) ||
+            solution.Contents.Count == 0)
+        {
+            return;
+        }
+
+        ReactWithEntity(ent, puddleEntity, solution);
+    }
+
+    /// <summary>
+    /// Attempt to transfer an amount of the solution to the ent's bloodstream.
+    /// </summary>
+    private void ReactWithEntity(Entity<RootableComponent, BloodstreamComponent> ent, Entity<PuddleComponent> puddleEntity, Solution solution)
+    {
+        if (!_solutionContainer.ResolveSolution(ent.Owner, ent.Comp2.ChemicalSolutionName, ref ent.Comp2.ChemicalSolution, out var chemSolution) || chemSolution.AvailableVolume <= 0)
+            return;
+
+        var availableTransfer = FixedPoint2.Min(solution.Volume, ent.Comp1.TransferRate);
+        var transferAmount = FixedPoint2.Min(availableTransfer, chemSolution.AvailableVolume);
+        var transferSolution = _solutionContainer.SplitSolution(puddleEntity.Comp.Solution!.Value, transferAmount);
+
+        _reactive.DoEntityReaction(ent, transferSolution, ReactionMethod.Ingestion);
+
+        // Log solution addition by puddle.
+        if (_blood.TryAddToChemicals((ent, ent.Comp2), transferSolution))
+            _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(ent):target} absorbed puddle {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
+    }
+
+    private void OnCloning(Entity<RootableComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        var cloneComp = EnsureComp<RootableComponent>(args.CloneUid);
+        cloneComp.TransferRate = ent.Comp.TransferRate;
+        cloneComp.TransferFrequency = ent.Comp.TransferFrequency;
+        cloneComp.SpeedModifier = ent.Comp.SpeedModifier;
+        cloneComp.RootSound = ent.Comp.RootSound;
+        Dirty(args.CloneUid, cloneComp);
+    }
+
+    private void OnRootableMapInit(Entity<RootableComponent> ent, ref MapInitEvent args)
+    {
+        if (!TryComp(ent, out ActionsComponent? comp))
+            return;
+
+        ent.Comp.NextUpdate = _timing.CurTime;
+        Dirty(ent);
+        _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action, component: comp);
+    }
+
+    private void OnRootableShutdown(Entity<RootableComponent> ent, ref ComponentShutdown args)
+    {
+        if (!TryComp(ent, out ActionsComponent? comp))
+            return;
+
+        var actions = new Entity<ActionsComponent?>(ent, comp);
+        _actions.RemoveAction(actions, ent.Comp.ActionEntity);
+        _alerts.ClearAlert(ent.Owner, ent.Comp.RootedAlert);
+    }
+
+    private void OnRootableToggle(Entity<RootableComponent> ent, ref ToggleActionEvent args)
+    {
+        args.Handled = TryToggleRooting((ent, ent));
+    }
+
+    private void OnMobStateChanged(Entity<RootableComponent> ent, ref MobStateChangedEvent args)
+    {
+        if (ent.Comp.Rooted)
+            TryToggleRooting((ent, ent));
+    }
+
+    public bool TryToggleRooting(Entity<RootableComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        ent.Comp.Rooted = !ent.Comp.Rooted;
+        if (TryComp<MovedByPressureComponent>(ent, out var moved)) // Delta-V - Prevent spacewind
+            moved.Enabled = !ent.Comp.Rooted;
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(ent);
+        _gravity.RefreshWeightless(ent.Owner);
+
+        if (ent.Comp.Rooted)
+        {
+            _alerts.ShowAlert(ent.Owner, ent.Comp.RootedAlert);
+            var curTime = _timing.CurTime;
+            if (curTime > ent.Comp.NextUpdate)
+                ent.Comp.NextUpdate = curTime;
+        }
+        else
+        {
+            _alerts.ClearAlert(ent.Owner, ent.Comp.RootedAlert);
+        }
+
+        _audio.PlayPredicted(ent.Comp.RootSound, ent.Owner.ToCoordinates(), ent);
+        Dirty(ent);
+
+        return true;
+    }
+
+    private void OnIsWeightless(Entity<RootableComponent> ent, ref IsWeightlessEvent args)
+    {
+        if (args.Handled || !ent.Comp.Rooted)
+            return;
+
+        // Do not cancel weightlessness if the person is in off-grid.
+        if (!_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
+            return;
+
+        args.IsWeightless = false;
+        args.Handled = true;
+    }
+
+    private void OnSlipAttempt(Entity<RootableComponent> ent, ref SlipAttemptEvent args)
+    {
+        if (!ent.Comp.Rooted)
+            return;
+
+        if (args.SlipCausingEntity != null && HasComp<DamageOnTriggerComponent>(args.SlipCausingEntity))
+            return;
+
+        args.NoSlip = true;
+    }
+
+    private void OnStartCollide(Entity<RootableComponent> ent, ref StartCollideEvent args)
+    {
+        if (!_puddleQuery.HasComp(args.OtherEntity))
+            return;
+
+        ent.Comp.PuddleEntity = args.OtherEntity;
+
+        if (ent.Comp.NextUpdate < _timing.CurTime) // To prevent constantly moving to new puddles resetting the timer.
+            ent.Comp.NextUpdate = _timing.CurTime;
+
+        Dirty(ent);
+    }
+
+    private void OnEndCollide(Entity<RootableComponent> ent, ref EndCollideEvent args)
+    {
+        if (ent.Comp.PuddleEntity != args.OtherEntity)
+            return;
+
+        var exists = Exists(args.OtherEntity);
+
+        if (!_physicsQuery.TryComp(ent, out var body))
+            return;
+
+        foreach (var entContact in _physics.GetContactingEntities(ent, body))
+        {
+            if (exists && entContact == args.OtherEntity)
+                continue;
+
+            if (!_puddleQuery.HasComponent(entContact))
+                continue;
+
+            ent.Comp.PuddleEntity = ent;
+            return; // New puddle found, no need to continue.
+        }
+
+        ent.Comp.PuddleEntity = null;
+        Dirty(ent);
+    }
+
+    private void OnRefreshMovementSpeed(Entity<RootableComponent> ent, ref RefreshMovementSpeedModifiersEvent args)
+    {
+        if (ent.Comp.Rooted)
+            args.ModifySpeed(ent.Comp.SpeedModifier);
+    }
+}
diff --git a/Content.Shared/Rootable/SharedRootableSystem.cs b/Content.Shared/Rootable/SharedRootableSystem.cs
deleted file mode 100644
index e764264113..0000000000
--- a/Content.Shared/Rootable/SharedRootableSystem.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Actions.Components;
-using Content.Shared.Alert;
-using Content.Shared.Cloning.Events;
-using Content.Shared.Coordinates;
-using Content.Shared.Fluids.Components;
-using Content.Shared.Gravity;
-using Content.Shared.Mobs;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Slippery;
-using Content.Shared.Toggleable;
-using Content.Shared.Trigger.Components.Effects;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
-using Content.Shared.Atmos.Components; // DeltaV
-
-namespace Content.Shared.Rootable;
-
-/// <summary>
-/// Adds an action to toggle rooting to the ground, primarily for the Diona species.
-/// Being rooted prevents weighlessness and slipping, but causes any floor contents to transfer its reagents to the bloodstream.
-/// </summary>
-public abstract class SharedRootableSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedActionsSystem _actions = default!;
-    [Dependency] private readonly SharedGravitySystem _gravity = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-    protected EntityQuery<PuddleComponent> PuddleQuery;
-    protected EntityQuery<PhysicsComponent> PhysicsQuery;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        PuddleQuery = GetEntityQuery<PuddleComponent>();
-        PhysicsQuery = GetEntityQuery<PhysicsComponent>();
-
-        SubscribeLocalEvent<RootableComponent, MapInitEvent>(OnRootableMapInit);
-        SubscribeLocalEvent<RootableComponent, ComponentShutdown>(OnRootableShutdown);
-        SubscribeLocalEvent<RootableComponent, StartCollideEvent>(OnStartCollide);
-        SubscribeLocalEvent<RootableComponent, EndCollideEvent>(OnEndCollide);
-        SubscribeLocalEvent<RootableComponent, ToggleActionEvent>(OnRootableToggle);
-        SubscribeLocalEvent<RootableComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<RootableComponent, IsWeightlessEvent>(OnIsWeightless);
-        SubscribeLocalEvent<RootableComponent, SlipAttemptEvent>(OnSlipAttempt);
-        SubscribeLocalEvent<RootableComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
-        SubscribeLocalEvent<RootableComponent, CloningEvent>(OnCloning);
-    }
-
-    private void OnCloning(Entity<RootableComponent> ent, ref CloningEvent args)
-    {
-        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
-            return;
-
-        var cloneComp = EnsureComp<RootableComponent>(args.CloneUid);
-        cloneComp.TransferRate = ent.Comp.TransferRate;
-        cloneComp.TransferFrequency = ent.Comp.TransferFrequency;
-        cloneComp.SpeedModifier = ent.Comp.SpeedModifier;
-        cloneComp.RootSound = ent.Comp.RootSound;
-        Dirty(args.CloneUid, cloneComp);
-    }
-
-    private void OnRootableMapInit(Entity<RootableComponent> entity, ref MapInitEvent args)
-    {
-        if (!TryComp(entity, out ActionsComponent? comp))
-            return;
-
-        entity.Comp.NextUpdate = _timing.CurTime;
-        _actions.AddAction(entity, ref entity.Comp.ActionEntity, entity.Comp.Action, component: comp);
-    }
-
-    private void OnRootableShutdown(Entity<RootableComponent> entity, ref ComponentShutdown args)
-    {
-        if (!TryComp(entity, out ActionsComponent? comp))
-            return;
-
-        var actions = new Entity<ActionsComponent?>(entity, comp);
-        _actions.RemoveAction(actions, entity.Comp.ActionEntity);
-        _alerts.ClearAlert(entity.Owner, entity.Comp.RootedAlert);
-    }
-
-    private void OnRootableToggle(Entity<RootableComponent> entity, ref ToggleActionEvent args)
-    {
-        args.Handled = TryToggleRooting((entity, entity));
-    }
-
-    private void OnMobStateChanged(Entity<RootableComponent> entity, ref MobStateChangedEvent args)
-    {
-        if (entity.Comp.Rooted)
-            TryToggleRooting((entity, entity));
-    }
-
-    public bool TryToggleRooting(Entity<RootableComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp))
-            return false;
-
-        entity.Comp.Rooted = !entity.Comp.Rooted;
-        if (TryComp<MovedByPressureComponent>(entity, out var moved)) // Delta-V - Prevent spacewind
-            moved.Enabled = !entity.Comp.Rooted;
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(entity);
-        _gravity.RefreshWeightless(entity.Owner);
-        Dirty(entity);
-
-        if (entity.Comp.Rooted)
-        {
-            _alerts.ShowAlert(entity.Owner, entity.Comp.RootedAlert);
-            var curTime = _timing.CurTime;
-            if (curTime > entity.Comp.NextUpdate)
-            {
-                entity.Comp.NextUpdate = curTime;
-            }
-        }
-        else
-        {
-            _alerts.ClearAlert(entity.Owner, entity.Comp.RootedAlert);
-        }
-        _audio.PlayPredicted(entity.Comp.RootSound, entity.Owner.ToCoordinates(), entity);
-
-        return true;
-    }
-
-    private void OnIsWeightless(Entity<RootableComponent> ent, ref IsWeightlessEvent args)
-    {
-        if (args.Handled || !ent.Comp.Rooted)
-            return;
-
-        // do not cancel weightlessness if the person is in off-grid.
-        if (!_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
-            return;
-
-        args.IsWeightless = false;
-        args.Handled = true;
-    }
-
-    private void OnSlipAttempt(Entity<RootableComponent> ent, ref SlipAttemptEvent args)
-    {
-        if (!ent.Comp.Rooted)
-            return;
-
-        if (args.SlipCausingEntity != null && HasComp<DamageOnTriggerComponent>(args.SlipCausingEntity))
-            return;
-
-        args.NoSlip = true;
-    }
-
-    private void OnStartCollide(Entity<RootableComponent> entity, ref StartCollideEvent args)
-    {
-        if (!PuddleQuery.HasComp(args.OtherEntity))
-            return;
-
-        entity.Comp.PuddleEntity = args.OtherEntity;
-
-        if (entity.Comp.NextUpdate < _timing.CurTime) // To prevent constantly moving to new puddles resetting the timer
-            entity.Comp.NextUpdate = _timing.CurTime;
-    }
-
-    private void OnEndCollide(Entity<RootableComponent> entity, ref EndCollideEvent args)
-    {
-        if (entity.Comp.PuddleEntity != args.OtherEntity)
-            return;
-
-        var exists = Exists(args.OtherEntity);
-
-        if (!PhysicsQuery.TryComp(entity, out var body))
-            return;
-
-        foreach (var ent in _physics.GetContactingEntities(entity, body))
-        {
-            if (exists && ent == args.OtherEntity)
-                continue;
-
-            if (!PuddleQuery.HasComponent(ent))
-                continue;
-
-            entity.Comp.PuddleEntity = ent;
-            return; // New puddle found, no need to continue
-        }
-
-        entity.Comp.PuddleEntity = null;
-    }
-
-    private void OnRefreshMovementSpeed(Entity<RootableComponent> entity, ref RefreshMovementSpeedModifiersEvent args)
-    {
-        if (entity.Comp.Rooted)
-            args.ModifySpeed(entity.Comp.SpeedModifier);
-    }
-}

From 8e96ddfa6af3be6a0bfeb5a6bd7c880f891a210c Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Wed, 10 Dec 2025 13:52:55 -0500
Subject: [PATCH 071/360] Improve ClothingSpeedModifier, Fix Paramedic Void
 Suit (#41820)

* Add RequireActivated bool

* Fix paramedic voidsuit

* Remove explicit check

This is actually unnecessarily verbose.

* Improve comment

* Update Content.Shared/Clothing/ClothingSpeedModifierSystem.cs

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

* Add cref linking

* Change reference from system to component

* Fix missing closing tag before anyone notices

* Add clarity about when this field is used.

* Add early return if not affected by toggling

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Clothing/ClothingSpeedModifierComponent.cs           | 9 ++++++++-
 Content.Shared/Clothing/ClothingSpeedModifierSystem.cs   | 5 ++++-
 .../Entities/Clothing/OuterClothing/softsuits.yml        | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
index 8dc496ec25..37f0a83eaa 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Clothing;
 
 /// <summary>
 /// Modifies speed when worn and activated.
-/// Supports <c>ItemToggleComponent</c>.
+/// Supports <see cref="ItemToggleComponent"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(ClothingSpeedModifierSystem))]
 public sealed partial class ClothingSpeedModifierComponent : Component
@@ -16,6 +16,13 @@ public sealed partial class ClothingSpeedModifierComponent : Component
     [DataField]
     public float SprintModifier = 1.0f;
 
+    /// <summary>
+    /// Defines if the speed modifier requires <see cref="ItemToggleComponent"/> activation to apply.
+    /// This will have no effect without an <see cref="ItemToggleComponent"/> on the entity.
+    /// </summary>
+    [DataField]
+    public bool RequireActivated = true;
+
     /// <summary>
     /// An optional required standing state.
     /// Set to true if you need to be standing, false if you need to not be standing, null if you don't care.
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index 249f8e04f3..dbfb6ab63b 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -57,7 +57,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
 
     private void OnRefreshMoveSpeed(EntityUid uid, ClothingSpeedModifierComponent component, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
     {
-        if (!_toggle.IsActivated(uid))
+        if (component.RequireActivated && !_toggle.IsActivated(uid))
             return;
 
         if (component.Standing != null && !_standing.IsMatchingState(args.Owner, component.Standing.Value))
@@ -132,6 +132,9 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
 
     private void OnToggled(Entity<ClothingSpeedModifierComponent> ent, ref ItemToggledEvent args)
     {
+        if (!ent.Comp.RequireActivated)
+            return;
+
         // make sentient boots slow or fast too
         _movementSpeed.RefreshMovementSpeedModifiers(ent);
 
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index d10051bf50..1f516a830d 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -200,6 +200,7 @@
   - type: ClothingSpeedModifier
     walkModifier: 0.9
     sprintModifier: 0.9
+    requireActivated: false
   - type: HeldSpeedModifier
   - type: TemperatureProtection
     heatingCoefficient: 0.1

From 87dd6de9dde7911faa973ba9e22c013c5922f221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Wed, 10 Dec 2025 18:17:03 -0600
Subject: [PATCH 072/360] Soap, Banana peel, and Slip entity tables (#41783)

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Prototypes/Catalog/Fills/Crates/cargo.yml |  9 +--
 .../Catalog/Fills/Crates/service.yml          |  3 +-
 .../Prototypes/Catalog/Fills/Items/belt.yml   |  3 +-
 .../Markers/Spawners/Random/maintenance.yml   |  3 +-
 .../Entities/Markers/Spawners/Random/soap.yml | 64 +++++++++++++++----
 .../Markers/Spawners/Random/trash.yml         | 38 ++++++++++-
 .../Objects/Consumable/Food/produce.yml       |  8 +--
 .../Objects/Specific/Janitorial/soap.yml      | 60 +++++++++--------
 .../Entities/Objects/Tools/lighters.yml       |  2 +-
 .../Entities/Objects/Weapons/Bombs/funny.yml  |  3 +-
 10 files changed, 135 insertions(+), 58 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 35e1c426c8..7dfcc44a3c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -75,17 +75,14 @@
   id: LotteryJunkEntityTable
   table: !type:GroupSelector
     children:
+    - !type:NestedSelector
+      tableId: AllBananaPeelsTable
+      weight: 4
     - id: CigaretteSpent
     - id: FoodBowlBigTrash
     - id: FoodFrozenPopsicleTrash
     - id: FoodCornTrash
-    - id: TrashBananaPeel
-    - id: TrashBananaPeelExplosive
-      weight: 0.01
     - id: FoodTinBeansTrash
-    - id: TrashBakedBananaPeel
-    - id: TrashMimanaPeel
-    - id: TrashBananiumPeel
 
 - type: entityTable
   id: LotteryCanistersEntityTable
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 528db232e9..110a98dfc7 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -8,13 +8,14 @@
     containers:
       entity_storage: !type:AllSelector
         children:
+        - !type:NestedSelector
+          tableId: AllSoapsTable
         - id: MopItem
         - id: MopBucketCubeWrapped
         - id: Bucket
           amount: 3
         - id: WetFloorSign
           amount: 2
-        - id: Soap
         - id: SprayBottleSpaceCleaner
           amount: 2
         - id: TrashBag
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 9d5d608dd3..cc52531d24 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -88,7 +88,8 @@
     containers:
       storagebase: !type:AllSelector
         children:
-        - id: Soap #Make a soap group and pick between when i'm not lazy
+        - !type:NestedSelector
+          tableId: AllSoapsTable
         - id: SprayBottleSpaceCleaner
         - id: CleanerGrenade
           amount: 2
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 3d13f0aa75..7915002894 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -235,7 +235,8 @@
       - id: Plunger
       - id: PowerCellMedium
       - id: PowerCellSmall
-      - id: Soap
+      - !type:NestedSelector
+        tableId: AllSoapsTable
       - id: Wirecutter
       - id: Screwdriver
       - id: Wrench
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
index d3283522b2..1f4f4b4aba 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml
@@ -1,21 +1,61 @@
+- type: entityTable # max size 1x2 (for now)
+  id: SlipTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: AllBananaPeelsTable
+    - !type:NestedSelector
+      tableId: AllSoapsTable
+    - !type:GroupSelector # Other
+      weight: 0.02 # 1 in 100
+      children:
+      - id: FoodButter
+      - id: FoodCannabisButter
+        weight: 0.5
+      - id: BananaPhoneInstrument
+        weight: 0.2
+
+- type: entityTable # max size 1x2
+  id: AllSoapsTable
+  table: !type:GroupSelector
+    children:
+    - id: SoapNT
+      weight: 2
+    - id: Soap
+    - id: SoapHomemade
+    - id: SoapDeluxe
+    - !type:GroupSelector # Rare soaps
+      weight: 0.02 # 1 in 250
+      children:
+      - id: SoapSyndie
+      - id: SlipocalypseClusterSoap
+      - id: SoapOmega
+
 - type: entity
+  parent: MarkerBase
+  id: RandomSlip100
+  name: random slip spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Hydroponics/banana.rsi
+      state: peel
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: SlipTable
+
+- type: entity
+  parent: MarkerBase
   id: RandomSoap
   name: random soap spawner
-  parent: MarkerBase
   components:
   - type: Sprite
     layers:
       - state: red
       - sprite: Objects/Specific/Janitorial/soap.rsi
         state: soap-4
-  - type: RandomSpawner
-    prototypes:
-      - Soap
-      - SoapHomemade
-      - SoapNT
-      - SoapDeluxe
-    chance: 0.95
-    rarePrototypes:
-      - SoapSyndie
-      - SoapOmega
-    rareChance: 0.05
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllSoapsTable
+
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
index fb3d945b24..5ae54c40e4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
@@ -3,7 +3,7 @@
   table: !type:GroupSelector
     children:
     - !type:GroupSelector
-      weight: 95
+      weight: 90
       children:
       - id: FoodPacketBoritosTrash
       - id: FoodPacketCheesieTrash
@@ -25,11 +25,28 @@
       children:
       - id: FoodPlateSmallTrash
       - id: FoodBowlBigTrash
+    - !type:NestedSelector
+      weight: 5
+      tableId: AllBananaPeelsTable
+
+- type: entityTable # max size 1x2
+  id: AllBananaPeelsTable
+  table: !type:GroupSelector
+    children:
+    - id: TrashBananaPeel
+      weight: 3
+    - id: TrashBakedBananaPeel
+      weight: 2
+    - id: TrashMimanaPeel
+    - id: TrashBananiumPeel
+      weight: 0.5
+    - id: TrashBananaPeelExplosive
+      weight: 0.001 # 1 in 6,500
 
 - type: entity
-  name: Trash Spawner
-  id: RandomSpawner
   parent: MarkerBase
+  id: RandomSpawner
+  name: Trash Spawner
   suffix: 50
   components:
     - type: Sprite
@@ -56,3 +73,18 @@
     offset: 0.2
     table: !type:NestedSelector
       tableId: GenericTrashItems
+
+- type: entity
+  parent: MarkerBase
+  id: RandomBananaPeel90
+  name: random banana peel spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Hydroponics/banana.rsi
+      state: peel
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllBananaPeelsTable
+      prob: 0.9
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index c628e30d28..c63b6e9600 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -410,9 +410,9 @@
       Taco: Mimana
 
 - type: entity
-  name: banana peel
   parent: BaseItem
   id: TrashBananaPeel
+  name: banana peel
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
@@ -472,9 +472,9 @@
     quickEquip: false
 
 - type: entity
-  name: baked banana peel
   parent: TrashBananaPeel
   id: TrashBakedBananaPeel
+  name: baked banana peel
   components:
   - type: Clothing
     sprite: Objects/Specific/Hydroponics/banana.rsi
@@ -497,9 +497,9 @@
           Quantity: 2
 
 - type: entity
-  name: mimana peel
   parent: TrashBananaPeel
   id: TrashMimanaPeel
+  name: mimana peel
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/mimana.rsi
@@ -517,9 +517,9 @@
         volume: -100
 
 - type: entity
-  name: bananium peel
   parent: TrashBananaPeel
   id: TrashBananiumPeel
+  name: bananium peel
   components:
   - type: Sprite
     sprite: Objects/Materials/materials.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 455b9f715d..a6b6dbcbff 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -1,17 +1,16 @@
+# When adding new soaps, also add them to id: AllSoapsTable
+
 - type: entity
-  name: soap
-  id: Soap
+  abstract: true
   parent: BaseItem
-  description: A cheap bar of soap. Doesn't smell.
+  id: BaseSoap
+  name: soap
   components:
   - type: Tag
     tags:
     - Soap
   - type: Sprite
     sprite: Objects/Specific/Janitorial/soap.rsi
-    layers:
-    - state: soap-4
-      map: ["enum.SolutionContainerLayers.Fill"]
   - type: SolutionContainerVisuals
     maxFillLevels: 4
     fillBaseName: soap-
@@ -62,7 +61,7 @@
     solution: soap
   - type: FlavorProfile
     flavors:
-      - clean
+    - clean
   - type: Edible
     solution: soap
   - type: BadFood
@@ -70,13 +69,23 @@
   - type: SurgeryCleansDirt # DeltaV - surgery cross contamination
   - type: Residue
     residueAdjective: residue-slippery
+
+- type: entity
+  parent: BaseSoap
+  id: Soap
+  description: A cheap bar of soap. Doesn't smell.
+  components:
+  - type: Sprite
+    layers:
+    - state: soap-4
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: Residue
     residueColor: residue-green
   - type: PhysicalComposition # DeltaV - made soap recycleable
 
 - type: entity
-  name: soap
+  parent: BaseSoap
   id: SoapNT
-  parent: Soap
   description: A Nanotrasen brand bar of soap. Smells of plasma.
   components:
   - type: Sprite
@@ -95,13 +104,11 @@
         - ReagentId: SoapReagent
           Quantity: 100
   - type: Residue
-    residueAdjective: residue-slippery
     residueColor: residue-grey
 
 - type: entity
-  name: soap
+  parent: BaseSoap
   id: SoapDeluxe
-  parent: Soap
   description: A deluxe Waffle Co. brand bar of soap. Smells of strawberries.
   components:
   - type: Sprite
@@ -113,13 +120,11 @@
   - type: Item
     heldPrefix: deluxe
   - type: Residue
-    residueAdjective: residue-slippery
     residueColor: residue-brown
 
 - type: entity
-  name: soap
+  parent: [BaseSoap, BaseSyndicateContraband]
   id: SoapSyndie
-  parent: [Soap, BaseSyndicateContraband]
   description: An untrustworthy bar of soap. Smells of fear.
   components:
   - type: Sprite
@@ -145,21 +150,27 @@
   - type: SurgeryCleansDirt # DeltaV - evil soap is fast
     cleanDelay: 2
   - type: Residue
-    residueAdjective: residue-slippery
     residueColor: residue-red
   - type: StaticPrice
     price: 500
 
 - type: entity
-  name: soaplet
+  parent: BaseSoap
   id: SoapletSyndie
-  categories: [ HideSpawnMenu ]
-  parent: Soap
+  name: soaplet
   description: A tiny piece of syndicate soap.
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
     - state: syndie-soaplet
+  - type: SolutionContainerManager
+    solutions:
+      soap:
+        maxVol: 10
+        reagents:
+        - ReagentId: SoapReagent
+          Quantity: 10
   - type: Slippery
   - type: StepTrigger
     intersectRatio: 0.04
@@ -192,9 +203,8 @@
         volume: -8
 
 - type: entity
-  name: soap
+  parent: BaseSoap
   id: SoapHomemade
-  parent: Soap
   description: A homemade bar of soap. Smells of... well....
   components:
   - type: Sprite
@@ -203,8 +213,6 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: SolutionContainerVisuals
     fillBaseName: gibs-
-  - type: Slippery
-  - type: StepTrigger
   - type: Item
     heldPrefix: gibs
   - type: FlavorProfile
@@ -212,13 +220,12 @@
       - clean
       - meaty
   - type: Residue
-    residueAdjective: residue-slippery
     residueColor: residue-red
 
 - type: entity
-  name: omega soap
+  parent: BaseSoap
   id: SoapOmega
-  parent: Soap
+  name: omega soap
   description: The most advanced soap known to mankind. Smells of bluespace.
   components:
   - type: Sprite
@@ -245,5 +252,4 @@
   - type: SurgeryCleansDirt # DeltaV - omega soap is fast
     cleanDelay: 2
   - type: Residue
-    residueAdjective: residue-slippery
     residueColor: residue-blue
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 4e3fe4eb7d..f06af0d60e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -570,7 +570,7 @@
     sprite: Objects/Tools/Lighters/honkco.rsi
   - type: Item
     sprite: Objects/Tools/Lighters/honkco.rsi
-  - type: ComponentToggler
+  - type: ComponentToggler # This is super cursed and ends up deleting the fixtures when toggled off
     components:
     - type: Slippery
     - type: StepTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 1618611e2c..ce0fbab45d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -75,10 +75,9 @@
   - type: AnimationPlayer
 
 - type: entity
-  name: banana peel
-  suffix: Explosive
   parent: TrashBananaPeel
   id: TrashBananaPeelExplosive
+  suffix: Explosive
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi

From f967c76f12d4f359fcb6f786507074c15babf0f7 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 12 Dec 2025 01:58:51 +0100
Subject: [PATCH 073/360] Add small cooldown to NukeKeypadEnterMessages
 (#41831)

* cooldown

* d

* time offset serializer

* undo button disabling according to feedback

* Update Content.Client/Nuke/NukeBoundUserInterface.cs
---
 Content.Server/Nuke/NukeComponent.cs  |  9 +++++++++
 Content.Server/Nuke/NukeSystem.cs     | 10 ++++++++--
 Content.Shared/Nuke/NukeUiMessages.cs |  6 ++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Nuke/NukeComponent.cs b/Content.Server/Nuke/NukeComponent.cs
index cd1c0227eb..e46680460f 100644
--- a/Content.Server/Nuke/NukeComponent.cs
+++ b/Content.Server/Nuke/NukeComponent.cs
@@ -5,6 +5,7 @@ using Content.Shared.Explosion;
 using Content.Shared.Nuke;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Nuke
@@ -164,6 +165,14 @@ namespace Content.Server.Nuke
         [DataField]
         public string EnteredCode = "";
 
+        /// <summary>
+        ///     Time at which the last nuke code was entered.
+        ///     Used to apply a cooldown to prevent clients from attempting to brute force the nuke code by sending keypad messages every tick.
+        ///     <seealso cref="SharedNukeComponent.EnterCodeCooldown"/>
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        public TimeSpan LastCodeEnteredAt = TimeSpan.Zero;
+
         /// <summary>
         ///     Current status of a nuclear bomb.
         /// </summary>
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 3788d2b2ab..130cc19656 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -18,11 +18,10 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Nuke;
 
@@ -45,6 +44,7 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     /// <summary>
     ///     Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx
@@ -232,6 +232,12 @@ public sealed class NukeSystem : EntitySystem
         if (component.Status != NukeStatus.AWAIT_CODE)
             return;
 
+        var curTime = _timing.CurTime;
+        if (curTime < component.LastCodeEnteredAt + SharedNukeComponent.EnterCodeCooldown)
+            return; // Validate that they are not entering codes faster than the cooldown.
+
+        component.LastCodeEnteredAt = curTime;
+
         UpdateStatus(uid, component);
         UpdateUserInterface(uid, component);
     }
diff --git a/Content.Shared/Nuke/NukeUiMessages.cs b/Content.Shared/Nuke/NukeUiMessages.cs
index 1c35cac7b0..8f5e16395c 100644
--- a/Content.Shared/Nuke/NukeUiMessages.cs
+++ b/Content.Shared/Nuke/NukeUiMessages.cs
@@ -5,6 +5,12 @@ namespace Content.Shared.Nuke
     public abstract partial class SharedNukeComponent : Component
     {
         public const string NukeDiskSlotId = "Nuke";
+
+        /// <summary>
+        /// Cooldown time between attempts to enter the nuke code.
+        /// Used to prevent clients from trying to brute force it.
+        /// </summary>
+        public static readonly TimeSpan EnterCodeCooldown = TimeSpan.FromSeconds(1);
     }
 
     [Serializable, NetSerializable]

From b00a3ed23bd1d4f572a14c9a707d6054e4de5379 Mon Sep 17 00:00:00 2001
From: Centronias <me@centronias.com>
Date: Thu, 11 Dec 2025 17:58:22 -0800
Subject: [PATCH 074/360] Smart Fridges can contain anything edible (#41830)

I'm sure this will cause zero unintended consequences
---
 .../Prototypes/Entities/Structures/Machines/smartfridge.yml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index dbb855205f..17381c2bf4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -49,6 +49,7 @@
   - type: SmartFridge
     whitelist:
       components:
+      - Edible
       - FitsInDispenser
       - Pill
       - Produce

From 78185d637c463a779f0bdf93196ad12bd917e294 Mon Sep 17 00:00:00 2001
From: cloudyskies <97833532+cloudyias@users.noreply.github.com>
Date: Thu, 11 Dec 2025 20:00:55 -0600
Subject: [PATCH 075/360] diona are now less debilitated by rooting in blood
 (#41642)

* diona are now less debilitated by rooting in blood

* Rerun tests

* Rerun tests
---
 Resources/Prototypes/Reagents/toxins.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 77a27a2cf3..3ffabccbc5 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -525,16 +525,23 @@
         probability: 0.1
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox, Bloodsucker ] # DeltaV - Added bloodsucker
+          type: [ Animal, Vox, Plant, Bloodsucker ] # DeltaV - Added bloodsucker
           inverted: true
       - !type:HealthChange
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox, Bloodsucker ] # DeltaV - Added bloodsucker
+          type: [ Animal, Vox, Plant, Bloodsucker ] # DeltaV - Added bloodsucker
           inverted: true
         damage:
           types:
             Poison: 1
+      - !type:HealthChange
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
+        damage:
+          types:
+            Poison: .25
       - !type:AdjustReagent
         conditions:
         - !type:MetabolizerTypeCondition

From 71e251ec169a71c86ea32b9ade540c26d662c4eb Mon Sep 17 00:00:00 2001
From: Tiniest Shark <head.rebel@yahoo.com>
Date: Fri, 12 Dec 2025 04:04:15 -0500
Subject: [PATCH 076/360] Re-sprite the Ripley (#41832)

newish ripley yay
---
 .../Objects/Specific/Mech/mecha.rsi/meta.json | 978 +++++++++---------
 .../Specific/Mech/mecha.rsi/ripley-broken.png | Bin 1130 -> 1708 bytes
 .../Specific/Mech/mecha.rsi/ripley-empty.png  | Bin 2877 -> 3930 bytes
 .../Specific/Mech/mecha.rsi/ripley-open.png   | Bin 1138 -> 1470 bytes
 .../Specific/Mech/mecha.rsi/ripley.png        | Bin 2894 -> 3950 bytes
 .../Mech/ripley_construction.rsi/meta.json    | 196 ++--
 .../Mech/ripley_construction.rsi/ripley0.png  | Bin 1278 -> 1508 bytes
 .../Mech/ripley_construction.rsi/ripley1.png  | Bin 1343 -> 1600 bytes
 .../Mech/ripley_construction.rsi/ripley10.png | Bin 1481 -> 1747 bytes
 .../Mech/ripley_construction.rsi/ripley11.png | Bin 1481 -> 1747 bytes
 .../Mech/ripley_construction.rsi/ripley12.png | Bin 1481 -> 1746 bytes
 .../Mech/ripley_construction.rsi/ripley13.png | Bin 1481 -> 1736 bytes
 .../Mech/ripley_construction.rsi/ripley14.png | Bin 1481 -> 1740 bytes
 .../Mech/ripley_construction.rsi/ripley15.png | Bin 1391 -> 1679 bytes
 .../Mech/ripley_construction.rsi/ripley16.png | Bin 1459 -> 1632 bytes
 .../Mech/ripley_construction.rsi/ripley17.png | Bin 1090 -> 1423 bytes
 .../Mech/ripley_construction.rsi/ripley18.png | Bin 1192 -> 1585 bytes
 .../Mech/ripley_construction.rsi/ripley2.png  | Bin 1347 -> 1572 bytes
 .../Mech/ripley_construction.rsi/ripley3.png  | Bin 1480 -> 1730 bytes
 .../Mech/ripley_construction.rsi/ripley4.png  | Bin 1463 -> 1718 bytes
 .../Mech/ripley_construction.rsi/ripley5.png  | Bin 1472 -> 1760 bytes
 .../Mech/ripley_construction.rsi/ripley6.png  | Bin 1475 -> 1760 bytes
 .../Mech/ripley_construction.rsi/ripley7.png  | Bin 1473 -> 1766 bytes
 .../Mech/ripley_construction.rsi/ripley8.png  | Bin 1472 -> 1763 bytes
 .../Mech/ripley_construction.rsi/ripley9.png  | Bin 1480 -> 1766 bytes
 .../ripley_chassis.png                        | Bin 1292 -> 1532 bytes
 .../ripley_harness+o.png                      | Bin 719 -> 789 bytes
 .../ripley_harness.png                        | Bin 718 -> 789 bytes
 .../ripley_l_arm+o.png                        | Bin 352 -> 410 bytes
 .../ripley_construction.rsi/ripley_l_arm.png  | Bin 357 -> 410 bytes
 .../ripley_l_leg+o.png                        | Bin 359 -> 401 bytes
 .../ripley_construction.rsi/ripley_l_leg.png  | Bin 369 -> 397 bytes
 .../ripley_r_arm+o.png                        | Bin 367 -> 409 bytes
 .../ripley_construction.rsi/ripley_r_arm.png  | Bin 380 -> 426 bytes
 .../ripley_r_leg+o.png                        | Bin 382 -> 392 bytes
 .../ripley_construction.rsi/ripley_r_leg.png  | Bin 387 -> 391 bytes
 36 files changed, 587 insertions(+), 587 deletions(-)

diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
index b8f723250e..8031bfe15d 100644
--- a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
@@ -1,491 +1,491 @@
 {
-  "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, hamtr made by brainfood1183 (github)",
-  "license" : "CC-BY-SA-3.0",
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "honker",
-      "directions": 4,
-      "delays": [
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ]
-      ]
-    },
-    {
-      "name": "honker-open"
-    },
-    {
-      "name": "honker-broken"
-    },
-    {
-      "name": "reticence",
-      "directions": 4
-    },
-    {
-      "name": "reticence-open"
-    },
-    {
-      "name": "reticence-broken"
-    },
-    {
-      "name": "ripley",
-      "directions": 4
-    },
-    {
-      "name": "ripley-empty",
-      "directions": 4
-    },
-    {
-      "name": "ripley-open"
-    },
-    {
-      "name": "ripley-broken"
-    },
-    {
-      "name": "marauder",
-      "directions": 4
-    },
-    {
-      "name": "marauder-open",
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "marauder-broken"
-    },
-    {
-      "name": "seraph",
-      "directions": 4
-    },
-    {
-      "name": "seraph-open",
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "seraph-broken"
-    },
-    {
-      "name": "phazon",
-      "directions": 4
-    },
-    {
-      "name": "phazon-open"
-    },
-    {
-      "name": "phazon-phase",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "phazon-broken"
-    },
-    {
-      "name": "ripley-old",
-      "directions": 4
-    },
-    {
-      "name": "ripley-broken-old"
-    },
-    {
-      "name": "mauler",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "mauler-open",
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "mauler-broken"
-    },
-    {
-      "name": "odysseus",
-      "directions": 4
-    },
-    {
-      "name": "odysseus-open"
-    },
-    {
-      "name": "odysseus-broken"
-    },
-    {
-      "name": "hamtr",
-      "directions": 4
-    },
-    {
-      "name": "hamtr-open"
-    },
-    {
-      "name": "hamtr-broken"
-    },
-    {
-      "name": "firefighter",
-      "directions": 4
-    },
-    {
-      "name": "firefighter-open"
-    },
-    {
-      "name": "firefighter-broken"
-    },
-    {
-      "name": "deathripley",
-      "directions": 4
-    },
-    {
-      "name": "deathripley-open"
-    },
-    {
-      "name": "deathripley-broken"
-    },
-    {
-      "name": "darkgygax",
-      "directions": 4
-    },
-    {
-      "name": "darkgygax-open",
-      "delays": [
-        [
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "darkgygax-broken",
-      "delays": [
-        [
-          0.3,
-          0.5,
-          0.3,
-          0.5,
-          0.3,
-          0.4,
-          0.5,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "durand",
-      "directions": 4
-    },
-    {
-      "name": "durand-open",
-      "delays": [
-        [
-          1,
-          0.1,
-          0.1,
-          0.5,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "durand-broken",
-      "delays": [
-        [
-          0.5,
-          1,
-          0.5,
-          1
-        ]
-      ]
-    },
-    {
-      "name": "gygax",
-      "directions": 4
-    },
-    {
-      "name": "gygax-open",
-      "delays": [
-        [
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "gygax-broken",
-      "delays": [
-        [
-          5,
-          0.05,
-          0.05,
-          0.05,
-          0.1,
-          0.1,
-          0.5,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "ripley-g",
-      "directions": 4
-    },
-    {
-      "name": "ripley-g-open"
-    },
-    {
-      "name": "ripley-g-full",
-      "directions": 4
-    },
-    {
-      "name": "ripley-g-full-open"
-    },
-    {
-      "name": "darkhonker",
-      "directions": 4,
-      "delays": [
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ]
-      ]
-    },
-    {
-      "name": "darkhonker-open"
-    },
-    {
-      "name": "darkhonker-broken"
-    },
-    {
-      "name": "ripleymkii",
-      "directions": 4
-    },
-    {
-      "name": "ripleymkii-open"
-    },
-    {
-      "name": "ripleymkii-broken"
-    },
-    {
-      "name": "clarke",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.05,
-          0.05
-        ],
-        [
-          0.1,
-          0.05,
-          0.05
-        ],
-        [
-          0.1,
-          0.05,
-          0.05
-        ],
-        [
-          0.1,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "clarke-open"
-    },
-    {
-      "name": "clarke-broken"
-    },
-    {
-      "name": "hauler",
-      "directions": 4
-    },
-    {
-      "name": "hauler-empty",
-      "directions": 4
-    },
-    {
-      "name": "hauler-open"
-    },
-    {
-      "name": "hauler-broken"
-    },
-    {
-      "name": "vim",
-      "directions": 4
-    },
-    {
-      "name": "vim-open",
-      "directions": 4
-    },
-    {
-      "name": "vim-broken",
-      "directions": 4
-    }
-  ]
+    "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, hamtr made by brainfood1183 (github), Ripley edits by TiniestShark (Github)",
+    "license" : "CC-BY-SA-3.0",
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "honker",
+            "directions": 4,
+            "delays": [
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "honker-open"
+        },
+        {
+            "name": "honker-broken"
+        },
+        {
+            "name": "reticence",
+            "directions": 4
+        },
+        {
+            "name": "reticence-open"
+        },
+        {
+            "name": "reticence-broken"
+        },
+        {
+            "name": "ripley",
+            "directions": 4
+        },
+        {
+            "name": "ripley-empty",
+            "directions": 4
+        },
+        {
+            "name": "ripley-open"
+        },
+        {
+            "name": "ripley-broken"
+        },
+        {
+            "name": "marauder",
+            "directions": 4
+        },
+        {
+            "name": "marauder-open",
+            "delays": [
+                [
+                    0.5,
+                    0.1,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "marauder-broken"
+        },
+        {
+            "name": "seraph",
+            "directions": 4
+        },
+        {
+            "name": "seraph-open",
+            "delays": [
+                [
+                    0.5,
+                    0.1,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "seraph-broken"
+        },
+        {
+            "name": "phazon",
+            "directions": 4
+        },
+        {
+            "name": "phazon-open"
+        },
+        {
+            "name": "phazon-phase",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "phazon-broken"
+        },
+        {
+            "name": "ripley-old",
+            "directions": 4
+        },
+        {
+            "name": "ripley-broken-old"
+        },
+        {
+            "name": "mauler",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mauler-open",
+            "delays": [
+                [
+                    0.5,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mauler-broken"
+        },
+        {
+            "name": "odysseus",
+            "directions": 4
+        },
+        {
+            "name": "odysseus-open"
+        },
+        {
+            "name": "odysseus-broken"
+        },
+        {
+            "name": "hamtr",
+            "directions": 4
+        },
+        {
+            "name": "hamtr-open"
+        },
+        {
+            "name": "hamtr-broken"
+        },
+        {
+            "name": "firefighter",
+            "directions": 4
+        },
+        {
+            "name": "firefighter-open"
+        },
+        {
+            "name": "firefighter-broken"
+        },
+        {
+            "name": "deathripley",
+            "directions": 4
+        },
+        {
+            "name": "deathripley-open"
+        },
+        {
+            "name": "deathripley-broken"
+        },
+        {
+            "name": "darkgygax",
+            "directions": 4
+        },
+        {
+            "name": "darkgygax-open",
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "darkgygax-broken",
+            "delays": [
+                [
+                    0.3,
+                    0.5,
+                    0.3,
+                    0.5,
+                    0.3,
+                    0.4,
+                    0.5,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "durand",
+            "directions": 4
+        },
+        {
+            "name": "durand-open",
+            "delays": [
+                [
+                    1,
+                    0.1,
+                    0.1,
+                    0.5,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "durand-broken",
+            "delays": [
+                [
+                    0.5,
+                    1,
+                    0.5,
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "gygax",
+            "directions": 4
+        },
+        {
+            "name": "gygax-open",
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "gygax-broken",
+            "delays": [
+                [
+                    5,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.1,
+                    0.1,
+                    0.5,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "ripley-g",
+            "directions": 4
+        },
+        {
+            "name": "ripley-g-open"
+        },
+        {
+            "name": "ripley-g-full",
+            "directions": 4
+        },
+        {
+            "name": "ripley-g-full-open"
+        },
+        {
+            "name": "darkhonker",
+            "directions": 4,
+            "delays": [
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "darkhonker-open"
+        },
+        {
+            "name": "darkhonker-broken"
+        },
+        {
+            "name": "ripleymkii",
+            "directions": 4
+        },
+        {
+            "name": "ripleymkii-open"
+        },
+        {
+            "name": "ripleymkii-broken"
+        },
+        {
+            "name": "clarke",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05
+                ],
+                [
+                    0.1,
+                    0.05,
+                    0.05
+                ],
+                [
+                    0.1,
+                    0.05,
+                    0.05
+                ],
+                [
+                    0.1,
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "clarke-open"
+        },
+        {
+            "name": "clarke-broken"
+        },
+        {
+            "name": "hauler",
+            "directions": 4
+        },
+        {
+            "name": "hauler-empty",
+            "directions": 4
+        },
+        {
+            "name": "hauler-open"
+        },
+        {
+            "name": "hauler-broken"
+        },
+        {
+            "name": "vim",
+            "directions": 4
+        },
+        {
+            "name": "vim-open",
+            "directions": 4
+        },
+        {
+            "name": "vim-broken",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png
index 1e0357f677384b5c37b97cebc5a920d2ac9ab3eb..f3bd7f29f35da73b0ad2bd0ccd0efd9b67b8d227 100644
GIT binary patch
delta 1692
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

delta 1109
zcmV-b1giV24eAJxB!3BTNLh0L01m_e01m_fl`9S#000CWNkl<Zc%1E4O-NKx6h6k}
z!i7$>Fe53-#1dkpFtQ;UbQ+sz5kXA_{YnM32!gO7i5iL_uvMEth+J6<Ta=NgDB%wd
z4M}8#Kad!iL^Mv}!lLPZ_szNQz8}p+(8dG9eeb?|&-u<d-+wu0JoKMs3BVG7B>?{v
zK!G<ugSFb9E8n|%=V&IC&RH}7R=@&9P@;>QLi@e*HR~yO$VcAIEtYR?cNG8}?0;TK
zdHGx9`-RhwDHbgwx;^9o;U+sv^X1w%l9t9(xtpW|v8Ye!^!b}Ib`Xvf4DK1AbF;%V
z)LTch={F7|eSagQl(2W$FI)MG-hVaKtt+{%QlSg(=pY;bV7$}2eL+tF0?*gN1#)ld
z+fOQ5v0MN!qP=Z@Qm%+xS2!V_67n5Ri6~g~xstFZHAv(iB&5VH@RYJ1!!S$tSVr#k
ziRZELQA)jwNDl0N@`#QcyD1&>t}1ruQveW_s&FEs6MwHNoS=mSUULL=fpKsE(sST2
zkpR(o>Mor*d24<E5GGA5`~E#WO?U21EsBJ8VGdlmSVSQKqDSoYM=K?%Tc6DXKpGMU
z)U!>%aD+clk|Vsfe#2h(n4u1#FWInB=ol5h3FTaaOGR1Au)Sq1g(4G@EYlx5==Jb#
zs*g=71%J3KK~TQD%B16G<C`I`o^BODMk(G<OcmwJsBleC?nAGzp(?==0T@RGT>28E
zo=B6t%*I)`SAbBTM%rj~={~t)4`mD9;QYa}trkylKJ|Ih5mgU+kM(|DxlsWiju7^~
zF@9XGm+PD53Pbq49GIeA)Ml(ZNP*?^C^<8NR(}F=KTr{XXF!j#0dqMWx?$!>Fi@xz
z!FWgaw0y>jGkl%}x{!hw?d=pfQ70qD6{Y|*WXT8P2tC-(z#v*X6-Fi{PaseVj}Z|)
zVt7Y2!4Px>1MTu#%fluGSOQ@30U?yL;@Xfw7yv_Q>KzO`;def-3%&t3?y_zc2FzrX
z5q~heZC0eiAx4Ri#>i}=%o9!(6q!0qK!|`*a)xfCtu_?0q*SGVNrOv_-tDmR);}zb
z>)toUO%M65PDs0Mj-Uj<CBi(w+88%VjR#7#f5;JP3pvRw*ZP>5E?qa8)9le4iatO}
zn#fWG_R))X9v+UNl;wp^Om5>4Zsp8$U4J*yHxt;K!=*0)xHSlUpB1@HNBely&qGjh
zESQokmQDzS=x8F#ioM+7ApGZqyBrf!7w!>Qxmz+gUAKM0dUy=;pN3dg8KxN<M=I<o
z`kQb`8z4;GcJb)pKwfl&ZZ*z=QBAZkD9jX)O)pJX0Cqv68K3*1Lil0qhFm%PU`}%=
zf_zS>J3M~%!G%&qzwr5u+2Y2b`Tvq-f#8|b!IDfS9e=L{!6d7%zO4{>HXBt>cCbO*
b{$c$A5lD18zPE(n00000NkvXXu0mjfmpc1A

diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png
index d66dd5b51cfb78d4c22d8579f36c5bc9bcc1d3df..8eb1279c3c6adef2fa257fcb6530013d2000e9f7 100644
GIT binary patch
literal 3930
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

delta 2870
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
UZ1>5dwg3PC07*qoM6N<$g1UWfjsO4v

diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png
index 530553d41335ea702d7134826f0b67ee77f31131..337aa225c79d697b1dbbfaf2d6d3d4c5967687e6 100644
GIT binary patch
delta 1452
zcmV;d1ylO+2)+xDB!2;OQb$4nuFf3k000GeNkl<ZScSEhT})GF7{`BwcEv(#`OpGV
zJ|=YRBSlv(N(`MO5_GyOGrRDrn~TmF;x1;4W($dl3DJEd%Q6FIY;L`ASL_0Z8ZKZp
z$V^0QH>a{LDj-+_g&eTTS~$BnoI_7JrQGbFoSbvs^SuA(^M8Hc=jcd-ic+(<)oBFa
zR&buY+)Ny=?9!AS`s)&r=>-zy9}Lgx(&<pJcTa)1eVh8KC^d`X*oWeJt3|9RHH!cz
zPo7M9PnJ*S+q<VgOsV|NwH@MvKR;2fJJ)uI6{Tizz11SRTrRPq)GV&1T#i_xycTDo
z5gGDBWP0`J+<)kD0nqi!*SKn|Vyb(xycQC5=~q`PA<rW6qWb~>zP4IS7AMw1yGmx}
z$p}#)$ew-IRr2Yu!hl5Ls1PJ83%WZG0&w(%PZ^I2K~2J~P9tBP_5$$c-tROy6QQb5
zSB+IHvoG89Xe16meVrA6-}|1DXECnoQAC)>y*(R%tA7JC03>q`-kwqPsv=<7SdX*r
z4FG0m=U6b_M-b+KKLE(H7^%*Wb8kvdb$*<pTmt~((=lc29!3?P#gaos)k~PoIRH%0
z{|0m^GAaXviK_$$22|byu-U3S-kZ|XP^n`)sc0K2b@YbR85Jh3B22(&=#mlzVIr=Q
zQD(SmtbgL!Gj?nxjR1s4d$@IHkq+NuhDYZpEs;E^&X3a@(o>zUHlQ~oD$xNL9-RZ=
zfOivHU(HbQHXlcn(~yA%k}Eusa4pc1)#8MuBHX@B+8FY3mp{mBb#^YUgzx!87Qj*p
zVyYS_$~Dj%lD2`Yjn4rojpiI_t`>J+|D;Yy!GGB=wovTY&CHV#Knm4~Q{zOREg)wq
zBFs}<DU#!|QI+6@{G26(84Kws-YC6CpDkd{(Q~?`NJ)XU(9YP<uQVSEs3VY<3ylpn
zg|w$POk`Rz48UY@0&w}t6?%HZ{NU@tWRfBhjXviC?^`rB*x1?BB#kYt_vT{(QgQe7
zPk-uk_4W0l$z;N2TNaQJ4u^?GqqLtfstoYd6)EpBqCyb=z_`kQkB-lijyofB@h;hh
zLFOXexZQ37fdFo|o4H6g*@i(f7w@Vj?rdtJr8Pi!v`2Ndv<4LAGS<Sa2b8VzDIVI}
z+wpij?D9xs`w#h6STD<~$5srfWK(hLL4PWYnI|Lo{eB7x3h?{=?D8xx9jRaf+8WXz
z9k)&{KmcCw5DJB;tgM88{Q#;$l+n@};MAvElsbqCL1iovasjT!t)w6-1Znwld9tiv
z{~;gmzJDFlx=eg+wQKU)d-w*?XA9Ui7!{+Exn%=0WDklRy8*b+E-m6>$8KdQb$@pr
z#Mf3!OKSk{k<^`w_sBFYtpR*(waO7Lb0u@j(D(IE>Y9%Q#N`}sArkiU&f8L$&Y$yQ
zEwraR|5L$QXy^Pn?@|$Kb1OSxU;m^Iq`pvAnhvu<7zidjYa@{>Dg?>Ph0cqU+Wmlx
zqbGdI&ehW!=KCK%Q@)jyJGdE)@qhWZW5BpFe)E1YHBJZ2KT64yT%;)tXl$_Y`fD3B
zJsN#D1gO0LD6c9OM;{JRR<t%A8Jfp&GUNm5|A5Mi#C~1wh*bUDco|bd41kA!2a_V;
z6an%r2Fi+-)1bwZ7`+w0P32WiG2ddKq}-v5$zh)oV(8=l01$fcR5iD<B7a*1i0e0#
zZ;|?hWR58zw!(1bMfP6R3nt-!cM|~LoEzrukouqRWrtb(_)sYT9lpmYIpj#lQP9iE
zwGJ3-p`D+9>cCT1g!k|bI(&~6BT_+D?rW>XKQPX|_YS0}A)nZJaZ;x$LTjO2xss7i
zaXQ&l+&Vz@Pq!MR_6%aNMJ3G|Fc>6%OzSe&Wa!}S8Qp)=QPGdtv{~W+0000<MNUMn
GLSTZNQM{!9

delta 1117
zcmV-j1fu)C3-Sn%B!3BTNLh0L01m_e01m_fl`9S#000CeNkl<Zc$}?QT}V_x6h4ND
zMA?Rs8k$lnQV>QE6cUKqM)i~xJ|%%f4?=$+Qi#HmNMIKDXiz@+v@ew<B0?+$5hPL&
zYLF?}LXm9|(ckTUbN9^7%$<AJq7QWD&OP&;Z_b=KcQ%)@V1Iq2z-g$<6a9(AchP=Y
zPUQsIqE+pKY#EvWCNOcPaVs^QsHMpEkx)CEz0Fn?B?Z9n(dZspQ?OGSeoakNSMQYO
z{QS8K)YH?G<Ni6e7CdZ^NW?DH`Z)I;dg8E%tXlwpta4iw&Aplpb&hu6`ZZ}!G@q4w
zMFN1QcXqqPLVtjhEdp%ceEJ^*M2gE~AK?NJ%I4E?(La75L9NFwIFaJ@bhdp!I77Sq
zZoz%m=(yq4?1MOc0<b68n})h6`I57KD$yp|i=D%g#3W+Cd4JzY(XXu=q6r~L=d>mv
zPe#%(I#NlxI=DnP2EEn9@4lysU(e~~hg_;D{7EGnR)34}rH?=4Sp5Eb+EN;qd>!p2
zw635i<HSws_+3i`<cfQzwABNrS~50pR9~6nI@MQ>vB^1oN5L_XKpxDKSxbBZkUV1}
z<y2JKB%YIt<MiysZ|aOKXcMqXII1bs1x(I4;@zk|OnqHtv}?yIjW^mdAASsxG|9!x
z^P9ylZhu(U(%%4cOim=K2_b-w4)&YKOEfc7Ot_LQP@QuG8|toT_V9@)$OxbcZmvEo
zRi;B_PNMux-)QabBC1lxxu5SQEo@AvTZ>4%ow<i<n27)&N^bp<oHRa}l)?Zmrw_))
zX#d_4t-Jz!Ec^SS@;T<VaD>P<)sOkOg#a`87=H(&UKAiqJ(_<5%njp4GKvWB-Z#}3
zxi6z)m8=rE5Yr|{MM3IlPimy#-~z<(@+g>FL;(MIBEp91g|NdI;OeKsbmWcsBcN7A
z8#kVX06rpJ=^})-zi+1)7sbR<PT4`&v&oGwq{=NLzzS91nT<FRCDM7piOBZ`&K2G=
z&VTeUZXv){Ak=Xt@(Bq5+XFaq4BRKmOY*ewTvmh{;C}an6RZZ$Y=p02`X(d7Y$hha
z-x0KYv%($&Vcfa=87A^n$I@gKmEF=g!WH!S4Fcw1t|!9IEh`~^7`P<!_dg7uQ#eY~
zO5YBZix&}iA7J3<;oJf^vo~*D7JUvsvVS?+GE3^64`UOFS$Ps{Jhp;n6@W=7w<g#*
zlF7X9yJHTEh-Kl)D!@e0Dfu7p3CJ9wjML88knCgiLEv{Dho499TLd7iNJNCPw4z#$
zFTS41>Rg5Qn}B>Awyl!_jvm=4P5|~9hBjxoUIFGc&HsKjP%!&(FSwa283t`17*?F+
zk=sKekq}lmW+y>laVR<uA1_f$Yg<4L4LcB_ZGrj&!kh%hK`S?56B)!U1R(5OHtkRo
jGFSw^^IGnAhl>3JBp0oA|MU&R00000NkvXXu0mjfdx;LP

diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png
index 221b21c44f7b3de6ed51ee2d7f03a3d4231b17d8..76ae779f56649fe36d1c3f6bdfc353bc49cf06e2 100644
GIT binary patch
literal 3950
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
IM6N<$f)(h){{R30

delta 2887
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

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json
index ad615418d3..f7d4ed64af 100644
--- a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json
@@ -1,101 +1,101 @@
 {
-  "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
-  "license" : "CC-BY-SA-3.0",
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "ripley_chassis"
+    "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, edited by TiniestShark (Github)",
+    "license" : "CC-BY-SA-3.0",
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "ripley_harness"
-    },
-    {
-      "name": "ripley_harness+o"
-    },
-    {
-      "name": "ripley_r_arm"
-    },
-    {
-      "name": "ripley_r_arm+o"
-    },
-    {
-      "name": "ripley_l_arm"
-    },
-    {
-      "name": "ripley_l_arm+o"
-    },
-    {
-      "name": "ripley_r_leg"
-    },
-    {
-      "name": "ripley_r_leg+o"
-    },
-    {
-      "name": "ripley_l_leg"
-    },
-    {
-      "name": "ripley_l_leg+o"
-    },
-    {
-      "name": "ripley0"
-    },
-    {
-      "name": "ripley1"
-    },
-    {
-      "name": "ripley2"
-    },
-    {
-      "name": "ripley3"
-    },
-    {
-      "name": "ripley4"
-    },
-    {
-      "name": "ripley5"
-    },
-    {
-      "name": "ripley6"
-    },
-    {
-      "name": "ripley7"
-    },
-    {
-      "name": "ripley8"
-    },
-    {
-      "name": "ripley9"
-    },
-    {
-      "name": "ripley10"
-    },
-    {
-      "name": "ripley11"
-    },
-    {
-      "name": "ripley12"
-    },
-    {
-      "name": "ripley13"
-    },
-    {
-      "name": "ripley14"
-    },
-    {
-      "name": "ripley15"
-    },
-    {
-      "name": "ripley16"
-    },
-    {
-      "name": "ripley17"
-    },
-    {
-      "name": "ripley18"
-    }
-  ]
+    "states": [
+        {
+            "name": "ripley_chassis"
+        },
+        {
+            "name": "ripley_harness"
+        },
+        {
+            "name": "ripley_harness+o"
+        },
+        {
+            "name": "ripley_r_arm"
+        },
+        {
+            "name": "ripley_r_arm+o"
+        },
+        {
+            "name": "ripley_l_arm"
+        },
+        {
+            "name": "ripley_l_arm+o"
+        },
+        {
+            "name": "ripley_r_leg"
+        },
+        {
+            "name": "ripley_r_leg+o"
+        },
+        {
+            "name": "ripley_l_leg"
+        },
+        {
+            "name": "ripley_l_leg+o"
+        },
+        {
+            "name": "ripley0"
+        },
+        {
+            "name": "ripley1"
+        },
+        {
+            "name": "ripley2"
+        },
+        {
+            "name": "ripley3"
+        },
+        {
+            "name": "ripley4"
+        },
+        {
+            "name": "ripley5"
+        },
+        {
+            "name": "ripley6"
+        },
+        {
+            "name": "ripley7"
+        },
+        {
+            "name": "ripley8"
+        },
+        {
+            "name": "ripley9"
+        },
+        {
+            "name": "ripley10"
+        },
+        {
+            "name": "ripley11"
+        },
+        {
+            "name": "ripley12"
+        },
+        {
+            "name": "ripley13"
+        },
+        {
+            "name": "ripley14"
+        },
+        {
+            "name": "ripley15"
+        },
+        {
+            "name": "ripley16"
+        },
+        {
+            "name": "ripley17"
+        },
+        {
+            "name": "ripley18"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley0.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley0.png
index 01601a288d1d9e4bfb0a8dca60ca22576b097ab8..efab340ad20227dac13ccf097b9439ba45e0b74c 100644
GIT binary patch
delta 1490
zcmV;@1ugpi3FHfqB!2;OQb$4nuFf3k000G^Nkl<ZScScp-%k@+6vscMC8YHi4pfu1
zLN%`Kq)DBP@dqlqN>E(IFzYYY=!-ADZDKYiJow^^CM0HKvj2k3f<aS7H)}Agii**Y
zt!4@0qNy-!LZM|5XeA=E56xU>IxWgR?0K2qbI<vn?>+aPdw)-10V2y`U6#Z8f1S@K
zj?W2d9;Z@cNK$!T+kA6<eb48O;WB=x>M<Mh{{CLJZ{I?D`z;O}*pI{E;Kq%c1wmJ?
z{6gQcV=KC@3m-ra1VT33X!I9{g#dt}1OV{+{QxvI-J`wz769+wz2m`y?)er2Ku1R>
zJ9bn72wzpL1AibMj{^{k^$YtVvvVZUN+i-sJRax#`DOrQdA%U;xnkHFzUR+36OYFQ
zzF908IDWhlzuzx{=L1~`0kcFRt(-mEL_8k1WWchQs(MWC?TrZ{(dcb@dt<CxwGvGm
zVRrUCnM|6Ik-rO`0k_+O%T<iex02!E5kesaRjm^l2!DkXvHy^>1x6N(Z7^hZb{2ru
zt5*R~QL#p^s92*bilQruq8nqgjo|}`;Kz?Q+DO|77>2E_*Mu&U$)<E@Xc$Q<N0OEy
zNy|v3CP<|w#8{Hb85$b4_yDxFUK0z;6_E;A4(qE|SCURolT40TN==r-`uq3qsj2yz
zuC9-juzzvmRsec>9t&M{brqeR_bDzewqcZ&mE-X&Vrb}%n6n(hbb1<(XA#Ndn2l*D
z6ri*7J||9mkH_QY(W5_Dw{8{Zp3I>JLTuai73p+_%a>aSg#x^M`Pzoz@hl>pp0?;*
z=GDJ^*$2S-^)i5NUV)L)L?VIP?FL|Sa*}hKmwyn8!N^F0OeSNo&CPB;d`kwlZ{Nb)
z+#Jc|l#RUsZV>Q#m-6aWcE7#er6dw&0vVfsmdKary3X8OP6i;G{)Z2<41K-|i(_Bk
zbBFOJ#A1K4c5Nlko;_#RuAKnfxY5pr4PjotegnYR*tqSwPN%2Qv_Ttwk#RUQZIJr<
zy?^+86=>QZWo6~IhiK298cv-$iLMumY$Os10Cc^WQ>RX{XHQMesz2iUd=*qxZL;7O
z0chGFM~-~Q&6~fWX@eX()F9ZJC6P$b(b2{3-PJ&L-$zEW1a|MPrlX@v5HgFV4N_aX
z6HObWyZb4-c2x^}hb)Kn<;xc{K0YPVmVZx|4RS!QsoBP*OFsipQc?oI%*+e`r%(St
zXXhh2I@&GeHy^$Wz~k{SK5jjDhR*L_rz^@P0H&v>SiE?#2tM&P3Ba<YWz5XXh&khF
zkHwzyDSSa7SIj!&IgLcFvSi5;0E&v7e7ko)0FNJM0~vFMy_rBE{G!hx(9_dHPk&Dj
z!JwZ=<SNb07XWAp++t$lEdb5U7l=fz5)Ar<eLk#QohYx|vN80vwcl{%%2fc49z6uW
zix+V;?G2K&jM@!dT=_kW&sRw>=m)Ua-??*-`S9~TtFj!{z1~tJNus;^3Bh3Y0_pD`
zK$6PEz2J0a-9LQLg)WsEBM?}J!++u6#f!hFs@hB{m11=CpS-P{?KL#S<#I7F5Xb9X
zK{7dk)9J+R_R!dP5LpiEeSOazA3o@o;Ejz3al1V@olcU;3B2AF3=G6^xm<<9P;e%Z
zNO9)OX(0Qax3xuWHieqg(a~`ZA67+gdGX?<g%hZ+-%B)l+cIuxX)6en>wg=I^^4Z4
zzJ4#)um76YwqVb$s>gIi3E=npMIWcCbu>5sRB+|89M+qfek2;bO|GxG4Kqu@Gw^@O
zyabFrG`^FQlb-}MY;t`UM8K#~qcJtU3n7r}Tj)Qd?GPG<!C<B3AeEMud^Um7(h`er
zFjz@{f3GNCvwhwSG&Jm^rAws^Rjor&0w_v=yLTTjHD&LVa%F02io16o2tQS=qot*d
shK7B4?QJL1d^MZXW**O11q=247ote~$dF*YC;$Ke07*qoM6N<$g2-6drvLx|

delta 1258
zcmV<G1Qq+_3;qd^B!3BTNLh0L01m_e01m_fl`9S#000EANkl<Zc$~FYT})h65S|Uo
z!>;@od@xOHrD+qN?1Bl9Xc}vSu|yx#$X1cM+JvA!;8q{}!PMG_KM%^vgBsE5TD0u~
z+81n%8)L0Sfk0_ZNHpNC#H1;SqzlNBK)9Z7*ty($&)vT!PJgmFXXng(^UcgT=ick3
zBBb)h3Ik*6+JfhL*4-p80Re>sn;)fE|4Ez9DH$7cJs%m9Kxt{I2I{}TN6nAyr~ZLc
zJR*25P!NNS)klrS^1o@#c6D{tV<Q0R?Cj*Ry1JUjwzf6~f~>5pP@y8W;@jKX%VRQ`
z<gu%(%e1u-kbeab!5kH+t+|6PPEK4G0r5p5g6R~k0>~Z?*+7dSU=;*MB~S&|3ZN%y
z!Eh2m2FT?6&*x~@?X`6Iw~IN0!v?mJJ^C+!B{Av0jev-hO7;U}ZEcN53BGOHb|zX?
zRmuP7=TkhU7XC49#0Mf-yR|_h;AWUkZ<O@O&{Onz^nWugu>1!Bu@Rqam>K~b!!28G
zL3V5?WlCLJrRkYJ3@edD@=qHG0z1hnAKP(7dm9>d)9h@5u3Y)sa6N_y4g)vYbN604
z6+1zP!Y`2D@1w3a-{AR?(RHdE?xxOHUZv&bG<8SbW!oRm{h(n08!;3Cdj%x>k&*MP
z#N5i#nt$2c+#LCQKAtZwF4B?ua_Sx?x_Wg^*`#f@&gvpCepY;21%kmKt*@`sg$uuG
z>;+s11e+hDPd@#4!%xkj-z1>le2~V*MluY8rlx+kR{(<2#9}d?qgU24p_giR^FH`K
z{v9>c-$^5*!_>6z0bY;wpD=Y0oCN1}4g7dKu7BZsQ64Bz{`U5Enw*^Cc}8bz!{aRn
z)ctTP_g|_Zg5cN($>d-3<yXgT<rjR6Tesd!0|NslK34#X;c%EDkqA3=baYTpPmfkY
z1Ozw&fdu+4BD#AU@6-H%9}0yi8jY$sQEO`}_4V~_wxF)Aj)P0KD!2jN*w~n@4XXUc
zOMfrE%z-K^ZsJV{!5liQz5UKxTKR#6;DWD$oA^w?@Aqr0Mdy6>mz9-mlFFQa5U{RU
zeQ*`$!p}<p@_uBa9nXb3sJy(~4BoWwex9E>JH(@`S?%-T7eruueB7J^6ag@vylse@
zMt7S*C7{*5AOeGfgSICW=4Z}+Yv6t0iGKqj`r>$$^)i=0cf|u#9~h$HUn)$Uo4vx)
z@KsE1lh?W+f*uBT)u@L|6$8`+YWV^YU~Dqjq*4ns_)|b>5~dC|@b!2+Y=6(5z3QPg
zPnRxF8rIF}`Yf=D*XyN;iA%h}5{X&bv7?&xhr-XR`~JNQSi*b@M)1rUm6Vjw%zsRh
zeSxua=XS~(C)>jGbb^i^eU0aMo*z3F)oil8oFe$agCX<X^6=r;izm?1vft*2{~vzz
z0Tm*!wGz(d>q-EbDF-eovOon;TG{DtnL~%xh>g=XTeXV%GWtIxCjsf9jB@qn60vdm
z7DYg=Qj|~1SS$gjFCSZ%HfRJS_+v9qKg+!ndFa813nl<tt1qyy3EfDzRzMuEp(FzU
z;%3VyOG``i&FQas6GBi0Y)Zj&iYoyaf~j(}edVf~E$dgY2yQ<)5msNEDmVN808cO)
U`(n1a6aWAK07*qoM6N<$g3GdK!vFvP

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley1.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley1.png
index 2a7ab1d7622e83eac073c4af16807b8961b561e5..74e479c04eece8209327be5d06b4e6b312420295 100644
GIT binary patch
delta 1583
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

delta 1324
zcmV+{1=IS#48IDHB!3BTNLh0L01m_e01m_fl`9S#000E>Nkl<Zc$~FYT})h65S|Uo
z!>;@od@xOHrJ;#QiQUBnNHmSL!B}FAKM`7yy4r-GKHyd#{K3@Ph(8a?%7Yrw>b9uu
z!upS`kr-<&3Iw{XfkXrDN;I`3k}e>SLb#r9_Rj6SyLbOgoPT6<=AJY2%{MdWoO{<v
zc}VG%B^t)~#W}}+S+|p{1OznOT)OpaWDEj@g@q}g?kil>aPKba?K{S!!{MM%@6n7E
zXl&R`nx+{(YSb40SxT{8Sy^#d2teA~+j%T6FXyqPrG<eY%gf93#h0H^HUYsqcHYUl
z_;z=9^B9Z8cz^8Z=t!-Ac>zSAqXJdl8|X}Aj0xl_Vk^E#L@<*jr2@zv4(UMiAz&5+
zM<q}N+X|p3YC%gTf(($!sUJ?}OaQi$J^C+!B{Av0g@A~ZO7;U}b#;};E!S7kxu4I_
zh7B8;Xjxe)&(F@rd5q8fZP<tpM6$MPLka;q!=<G}Nq+%s7g(M_Ky1V(9cBsv9K&_%
zu0eKeC}oOYT%pOSUpeCkeGk$5!S^T{`^^G^z#?L!d@RQm?X9idO4HL(I)DBT&Gr}~
zI1F@MLuQdkgbladyq$sf`JW)S+eIBOzQFo{;Wa89?4<T*o~6abCF%^k%C_H~{FZUN
zUay8qseho1jTq1^6_D(QhEDM$bTI+|GM19g%*>F><zjt)ex4506jSFQ(S-{$%4W$@
zesgfaH0fLgO9dJm8)<EAjZUBbiJz<g`jbZVH31g_jSctFJMX@o@KZYGFB3?N2o8+T
zb&R^YI=&?*CVolX11L=>6k;8{0@LuNOAgXoqJK6Q?}Kj!zNXrm8);~Gkm`5r<h4-m
zN5-6P%l%hBn${}}{DFZ13qBLTA|_D&*49?l^9k1VIjyp?k~6_ZyT56Vx*x9P{!2AP
z5FGm;7W<t(`0$9ahsMXp1&hb^>#wH1zCHt=D}Y76-%o)+fWg|@+Ni6mi}i|$38KxL
znSTHR0vv%r0(}>exm)XQ<7Whi@3@Zd^Z6(k3@V+dxw)BodU`Impt`!6gUiuS!8Oc{
zjEp4O5Q&gpe(k9zpXNZNC0Fq#gh0m})?R+)B`&`@JrvQ)4=e;1d==clX98}wo03K5
zlHdJBMMZ`#=N|;jYi1u@#hLK45`erONPo2BF@GBs7Z)4B>v!DF`tcL}Jj$BcJ{x{c
z1V%?k4IQ8efbr;c{Zv1^)d(s9&GtDF2#3R#Hx%^aC%)3~J@CLDA00jt<ayC0&`kp#
zs`2#G;EyH7oSnVGO2Jn#xlK;<f(Ux(+2U0@xr_n4o+`dT1Q_RA*-$(_N8#^1YJVnb
z%)th}_<VzY%eL+67|+t#a}mw_Zm@k9n8oRI(%9Hp-eA$_G*wiT^ZY*l<LbVDO@Glu
zjjv#kmbHR{0-BnNu`e(-ZQ4j_<D^@doQ%@JgU_*!_xYhi!4#WxAEyYucdyU*w%ot}
z`TPkqHSMxE;`z<D-k@9rwr0Yae1B~TAT#B_B}Epf07@%6-7a&?DH}~}l6})vE3bb>
z|A%BGAU%{(uHH-{Hp#wu5s<4C<&!ezOCZ@7n09SQAt1pYdH7N8oygsH-IFr`*qVKT
zg-vKj!nOk9fDI)X01!7@Hd$C$pie&im^UE=Rluec%w(}807EcUj+TG9>Lq5&_^%j(
i+fPn}*%znE&i-ExAw_L@f|_Xn0000<MNUMnLSTYk`-zkQ

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley10.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley10.png
index 2ffb27b9b16d88e1781c6cfcaf26576fd56f7f64..b8015216b73ffd130fc07f08f1d5f52ac31ff15d 100644
GIT binary patch
delta 1731
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
Z{TYsQQ|8i8INJaK002ovPDHLkV1ktAU4#Gt

delta 1463
zcmV;o1xWhS4ap0TB!3BTNLh0L01m_e01m_fl`9S#000GhNkl<Zc$}?QeN2^Q6hC)d
z%!ms?&St5>(D4ULE=^!7oJLT()>bXh2)n6cU|WRrM;|m17iE7WL|a-c>n8buP;EtE
zu@;FGFc599*`SNeV%`Y5Tnq~0?fIR{d3)~{AI`JgJ?DL%bANv4cg}O3=Y6l479o+h
zMrasae~y{1XFZV2OF%#&*;(7D_S6ZlIbWHz(bwlAqZ0@X4fO*JyX9uedSWY`syoRe
zg3kpCVz4p#s8Rdt+Jv9&)YO#8ivXmgq=d(qm>3@O^70r6GC4U(3l*^y-|FgW9tQ^p
zc`Pq4*KNHB$bSNeKt~0VtoP8lp6=@+AihXMFnz_Z0>~Z?!9W*7z$gfgN}vh>D{y#e
zBo!DcAViP>GC9-QLhJ5Mq6<Hrn=?3UU@O^U|0S>_hFH6%M!X56nQzjAgQ4^TWO{m<
zM+v@qbu2gRH|~G<In%O)N7vXNx{dfiBx}KzSY8BLr+@#}OXa&?6BC}2K4aTKAK5>o
z=;%m#Zs0OyMp<~i^s1ZQiCf78#72AqVM;770tJ&UTCrj!vSUM(2~1&JJn*v@5y#*!
zR2-rd6%fL@nlsw;E1!e^E}^t=3u9n=Q&Tt4(2#=)hA;aQm@O?EK+05h$h4=Y$At5}
zX=6H_tbaXDyIYph@~^|GtbBy_6um(EI%X)ct%6ERmXY(paXPf|IKlS2mTzg7d&Fe5
zTD8$p7tyebu@Pg~mjEsyWZ&L?h9{wm5de^}WH$C*7A=o$WZms{)4mi7RkV@5Ms!rS
zmEgb<OoOiBGV-cGc6K(+%*@c)vp@24&KK9{*ncC^2cFx^>2%VXSmKP!%HQ|&fYN2n
zXp7*$cx$}}BO@b&G)<$vzKi}_fYQ{~*0PSh0@DMDPW{SN-R<f8=F>Dbb}zMew2|xT
zTH5wxydv@?rKVu+wAk`>t$qr_Q(@pYH#d9XGXX4O0_D%o&sTfi$NKD?mXMIZnV`d;
z%759e?uWam{Pow^IsJhsa*`)&5Gr})RdwVp(I>}_@=-+(_4f7(7LTh|-A;9Nbviy*
z0E<OMMO0Z?$zX+rg;Z5l#rkIZZ`5SFg9)I-07oE@xN^m*mr~|3Galk+1cz_$dJn$M
zW+S`Zu5_Z@++3=usri2kl9Q7;xV)iMaDNSRot>SuHf@G>n182Mb)<?_`CoeRWeyY>
zaT_-w1UlxhcHqr7Jjd^n@=?BmkKlr@g6sH9AS^75d`0GpL)2}jsb7d^K0G{Jw{gwh
z10Y~r^Yxhve_jHRw<|r{@qAGsSu7Sk_?FENv)<U$z@w}g?QaNyuC6X!2PgtyJbw}2
zKwCOC=s_i*(SAV$>g((E{eeJlZ2C&W_rTNJZS?U`JI{+Qf$nQgq?E)4YWpEVp9^HK
zu>9~<Og`3T;{xOZ%Q6jnn7GcWIyssFtcgi{fe0|px4NFm<r<^<@6|ykhdu`z_?k>6
z*6-hxu8#32oxjkdp*e9q3kkgfMt|W~rD`Cv*-YKt=efZgjv<PRi{bS>Ma5K6d2sf-
z(4l_?<9#7(At50&Ffhozz*vK;lgR5eEE4pqxWC^)`}dc!j`#VIBX&QVU>~OlzH_Hd
z|F+z_w=7r~e**ljR>vnNXRDVZo(~;<mlh(hH4+wI<99$%0@$OAQFm%7%6|bRMHZ+4
zN-LcnD09py8%=C{eLGARig*9&=NE7bqzX4u0%aeR0IGndl0B4BuHLysY<zvC`xit&
z{(7N&QpUv+@bv{|psn*GAi;MRJj;70^4Oz~FPH#qjlRG_69ys?uma+MhLQ{bh?{Lb
z86O{~&p!W@n-GF3peY5@S1<w+fFYPFN3Vam>Shc2uUG`PpPUGzufh!I`yV?IUZ3C$
R;7I@g002ovPDHLkV1mOB#^nG2

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley11.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley11.png
index 883295d9ffe69cbab54f93e455be90af01b3a1ff..e32cb53b314962f60e4c686b7d8393cf858381d7 100644
GIT binary patch
delta 1731
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
Z{|BRtR3G!i{wDwc002ovPDHLkV1gd#S*rj5

delta 1463
zcmV;o1xWhS4ap0TB!3BTNLh0L01m_e01m_fl`9S#000GhNkl<Zc$}?QYfM~K5S|U&
zT9F08rlv|Ogf{&_EMN*GO4Ev<ZH(~|p$4gI+YqRUNb!dcOexjX`on^l*ebEQf_+d>
z6N6ACMl3~vKxqvmRd6Y(k|I)<rGkQ7&o{esz5C+Pbdt@Pdw<T%H{Z;ebM9R;EkYu0
z4%aX`{~R}6%X%Q0mw<pmva_C`+LOn<=6uCtqp#0LMklaj$r3-%(3@_gtjD*}$+{Cf
zBKTaOAO;(wj~cbVu1@;dPESvpya+%_N=kT)iHYGcFE5XQAX8IQv``US@vW+=;&E_r
zkVl)%rrUZEkbeabfsP6!CEi76d%CZQfcPR2!Sofs3Ltwp1Or_R0iz%|DuF5ltia)A
z5maEPfDl0j$mDcu3$4F1iO&CccFy3ifvseZ{g=R!7-H?39`z=WX1+lW4u;YXkeQho
z9wqqd)v?^LU%UR{=S<5|9-ZTV=r-a5k*oz<VtEm0oqzdTFO~0pO-{N?`m}WiePsWT
zqM{<`*?~)x8EN79(km`{CoY-^h>iFJ!jxEE1PZ2{v~p!MvSUM(2~1&JJn)kj5y#*!
zR2-rd6%fL@nlsw;E1!e^E~T_E3u9n=Q&Tt6(2#=)hA;UO@RXJfAZ02$WZKiyW5W5~
zyeXYd)PEkM-7U*##aCfeW*enFMbFc|j#-LmE2q+u<ur2t1RdIRj9~k1%Qv*kHEK#s
zOw`84oJ7M;#zu@`Ujn#<kbQgmX`X~GMgTy@lG*rsS+pXyk#(2LMf*}LRNhAV8d0@w
zE5U&!m<C<LW#m<X?Cflsot>pKXMW)4oG-4@(SL`e58Sue$jAt-i6zds%=W&!2b3;r
zMq302##<ZQ7#SHEq-h%U^<D7a0+gn<ww8756__4K7}2j>)!pvSZ$3ri<9AbgM;ke>
ztR>g0MA5dNDK!Oir^J@8YxPqY?g|6Hxw+X3p9x?Q6DWUve!klCKGr>RT6}ywXMzrY
zGJj{gx*zT!+v~5fbNYRe^st8@2$j72iaK%^>64??d{ogxy}iAH#p9|~w^ChQosQ2H
zz+zER5mi)FFj!$>AyrmZvcARs8#P&PV*)5Kz!3-}E?*weODS`i84vI?g2T6WgB#y!
zwUXU#S2|H{ZZ6f-)cn5%$;rtaT;5PBxPOMZ&dyF+n>I^3%)e8sI#R`|{4c)n5(kP1
zzlEC+0v&T$JMiWk?&Eh+`6yq(M{vPc!F7Bl5E>dvz9MtQA?mi%)Gx$69~Ks-+c-V<
z00<b@e0}D^pO*mS?F#pHJXcgm7K=p>zIDrktT#3_@F;6W`|CoWtE)@b0g3<^kAJUg
zpsgJn^`H{aXulu=_4W1o{y?BNHhrn#d*G?<R{FTw&hw&6pnIAVC?%nR+P)9h=K|R)
zEI)h|laIC8xB&UUvRuO+Cah0XogBpgi3v%3fe0|px4NFm=^Ur}@6<sjhdu`z_?k>6
z*6-b%u8#2-ojc#7p*e9q3kkgfMt|W~rD`Cv*-YKt=eWTfjv<PRi{bS>Ma5KJanSQ!
z=+M7{@xG9?kdP1>7#L(<V64H_N#yk!776-Q+~4n@{rgK<$NT)q5xbvFu#Zy&-?`JO
ze_QU|TNW&gKLLJMtK*ZCv(3v9&xa1bOA8U$8VQT9@jD<W0qoI*$lJ9P<$r*ZA`4Ui
zrIk((lsV><jV3m}z8xkDt#keA=NE7bqzczl0%aeR0IGndl0B4BuHLysY<zvC`xit&
z{(7N&QpUv+@bv{|psn*GAi;MRJi~h@^5`RvEtmjojlRG_69ys?uma+MhLQ{bh?{Lb
znV6WM&p!W@n-GF3peY5@S1<w+fFYPFN3Vam>Shc2uUG`PpPUGzufh!I`yW<FU3$`q
RS^oe4002ovPDHLkV1iW*!FK=v

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley12.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley12.png
index 76ff6767f4d2893f65f4528bf0d11957ade6b8ec..08f192113db883d9c536a09f947396e65516dc2c 100644
GIT binary patch
delta 1730
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
YKLDUpyMc0r#sB~S07*qoM6N<$f@#TCG5`Po

delta 1463
zcmV;o1xWhR4ap0TB!3BTNLh0L01m_e01m_fl`9S#000GhNkl<Zc$}?QeN2^Q6hC)d
z%!ms?&St5>(D?^Tpb2b+(+En}+NuRM!fxsq*cKuE(FaYyb<6%ph_<v?)(!Flq1qaO
z#abj%z(BOYW<eL3#U#S+y%-e4+w(h@^Y-2^KAdNR=e*Bz&VTRx&Uw!Byze#B5+w50
z2o0n2PnYR>)&t3c1Oyb4o%JNuojTz)=PPqI`uaj-bONEFp?;uYx7<uwPwb#m^(T2m
z@cBSN3^qm|HEMrdoAk4to}M;&5rCAGl<*i66T@R(ULFHMrlzK7u_CtOTU}kv<IvC$
zk2af4xAh_*3x6O29TiAQyob*9_FNYM@kJtn=_`H}K=yD52D%giMnP~?0#yiDfg{T!
zslZSHA%YB$$(goR+IV*oUHI|byuo1uTge{#FM%a7#M(1G=1m~Ye3Kp=45c3+Gcz+h
zO7OL7W4U3!cK^fAnU-ZdI$eM0HsS-3tOZ+Qc@b!v`F~q4mG6E{PI^lEjCB`%WdD$&
zqa*3L!ON5xW#ReKt8RKHZZ#7S8}SK*DY3i=6ihj3)vDFVjtx;JFokjP;7?ve97DfQ
zafnh>KnUw<&S*2Bd=CA)jMBm_jDhV<P2Ehx!wxDKx$IA1uC#0bDOcGc)85`*6VCV6
zE$MW!?teJ#ZCy?)zY3>v+ZgRDdV$J1XDPD1f=WwP(CC8`ba=~gg6+4h-_RcSm?<$a
zQ5zq35{)<+8!<+F3E&b!_8lE(coMo80RS0GX0G?LXk}~@>u$H3%2F&;(N6jrQH^dZ
z!GR^123^Bt<W+&}>};Byou#v9f8ghwFRszCM}MRbJh$2C=qRm=CC<3q_P(bFlrC#V
zTLcHjTbn!>85tR*X&UwSU-aJsl%}q(j&<x6m>x_R)vsLD-JZ^GIZZCtz0}d!PR^_A
ziOPQF?MO|*+-b4p>stLO3{QoD-_p|Jh0g@AhzXQGKR;jXc|YrOb6R|SJZFLqe=29E
zx_=+;BHQb)v2*$ZQR;sRbyFu3DtYBqb>uG5C&y~|sG^7Z`uYTm$2Dtir~3MO9iJ<J
z#iF7js;sPJ;KIT}s;a7DeVhF^YPR0N1W;mtBM?YjxiYGkQsy!<9^z*Nhi~5|55CoE
zCA;0ObfVncT&k_D{eKIRlao2PyrEQZ4S#c8U0t+3ZI*VKf2THeq>5GfUwZLn4ip)2
z8#f^YI_9u;@Xa?o$M2HzQNDtY;DWD$>-bC{EG&$CMdpe_)NQA!zYx!SczC#O<D9z(
zK)|@>>oXtzf&?IMS9-SN`JzIySS)(*?b{w^y{Wm8M_Du4-w*=b-QBtlPz1nuVt+#;
zZSUNy2bF+E`$Z9GXlT&)2LipR`AZGo15fX?(#JJ+o)=vL-Pe*pDG80#{(Xc#7sy^=
z`QfXWe5}pJ1;_`M6&m(1VPm4|<Y)#+Oi1DjM1XO=)%8qHr;8fCQwN<K`W$TFYciQw
zzkh4GI>zI4{z9*Y=EU_ZB=iaxg@0d_s)5XAGxhYG=LT~)hAA#ChS&EM6;nm!p}Fru
zhyE3e_l2y5goM!G;1K%)V;!zeBCpr5NYJn1fdK~{I8e$u-seY;+Wl;TeViir?%h`X
z+j9T@@?c^73GlmG9iN<>9bS%jK78a|T8zNfNLYN0-vL1hV2>_F-KnK02Y-|lS)c+a
zt#o>z%rU2IG_mpZ?KD|vgZo!MzkpjHRk)E7DEpuUPz5xV?4gWu_0A_^<LfKkzbFFo
z(+lO3GA@;XuP-nIZJi$h3BI@BS>8L5#~yur(F9;?^aU20Fc67=6%YqBlw<%v+-wWU
z#KZ)B_W7sWgb-8#O(~eZ5-^Ye48c@6di}~(H(StO#Ui-<<U|;K6=p!+{{X`?UsJ<h
RB&YxY002ovPDHLkV1hoQ#=ign

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley13.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley13.png
index 76ff6767f4d2893f65f4528bf0d11957ade6b8ec..b9af5ccf88a0d6b5d2530f7f04e8b28c086a1ba9 100644
GIT binary patch
delta 1720
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
O0000<MNUMnLSTY2H(g->

delta 1463
zcmV;o1xWhH4ap0TB!3BTNLh0L01m_e01m_fl`9S#000GhNkl<Zc$}?QeN2^Q6hC)d
z%!ms?&St5>(D?^Tpb2b+(+En}+NuRM!fxsq*cKuE(FaYyb<6%ph_<v?)(!Flq1qaO
z#abj%z(BOYW<eL3#U#S+y%-e4+w(h@^Y-2^KAdNR=e*Bz&VTRx&Uw!Byze#B5+w50
z2o0n2PnYR>)&t3c1Oyb4o%JNuojTz)=PPqI`uaj-bONEFp?;uYx7<uwPwb#m^(T2m
z@cBSN3^qm|HEMrdoAk4to}M;&5rCAGl<*i66T@R(ULFHMrlzK7u_CtOTU}kv<IvC$
zk2af4xAh_*3x6O29TiAQyob*9_FNYM@kJtn=_`H}K=yD52D%giMnP~?0#yiDfg{T!
zslZSHA%YB$$(goR+IV*oUHI|byuo1uTge{#FM%a7#M(1G=1m~Ye3Kp=45c3+Gcz+h
zO7OL7W4U3!cK^fAnU-ZdI$eM0HsS-3tOZ+Qc@b!v`F~q4mG6E{PI^lEjCB`%WdD$&
zqa*3L!ON5xW#ReKt8RKHZZ#7S8}SK*DY3i=6ihj3)vDFVjtx;JFokjP;7?ve97DfQ
zafnh>KnUw<&S*2Bd=CA)jMBm_jDhV<P2Ehx!wxDKx$IA1uC#0bDOcGc)85`*6VCV6
zE$MW!?teJ#ZCy?)zY3>v+ZgRDdV$J1XDPD1f=WwP(CC8`ba=~gg6+4h-_RcSm?<$a
zQ5zq35{)<+8!<+F3E&b!_8lE(coMo80RS0GX0G?LXk}~@>u$H3%2F&;(N6jrQH^dZ
z!GR^123^Bt<W+&}>};Byou#v9f8ghwFRszCM}MRbJh$2C=qRm=CC<3q_P(bFlrC#V
zTLcHjTbn!>85tR*X&UwSU-aJsl%}q(j&<x6m>x_R)vsLD-JZ^GIZZCtz0}d!PR^_A
ziOPQF?MO|*+-b4p>stLO3{QoD-_p|Jh0g@AhzXQGKR;jXc|YrOb6R|SJZFLqe=29E
zx_=+;BHQb)v2*$ZQR;sRbyFu3DtYBqb>uG5C&y~|sG^7Z`uYTm$2Dtir~3MO9iJ<J
z#iF7js;sPJ;KIT}s;a7DeVhF^YPR0N1W;mtBM?YjxiYGkQsy!<9^z*Nhi~5|55CoE
zCA;0ObfVncT&k_D{eKIRlao2PyrEQZ4S#c8U0t+3ZI*VKf2THeq>5GfUwZLn4ip)2
z8#f^YI_9u;@Xa?o$M2HzQNDtY;DWD$>-bC{EG&$CMdpe_)NQA!zYx!SczC#O<D9z(
zK)|@>>oXtzf&?IMS9-SN`JzIySS)(*?b{w^y{Wm8M_Du4-w*=b-QBtlPz1nuVt+#;
zZSUNy2bF+E`$Z9GXlT&)2LipR`AZGo15fX?(#JJ+o)=vL-Pe*pDG80#{(Xc#7sy^=
z`QfXWe5}pJ1;_`M6&m(1VPm4|<Y)#+Oi1DjM1XO=)%8qHr;8fCQwN<K`W$TFYciQw
zzkh4GI>zI4{z9*Y=EU_ZB=iaxg@0d_s)5XAGxhYG=LT~)hAA#ChS&EM6;nm!p}Fru
zhyE3e_l2y5goM!G;1K%)V;!zeBCpr5NYJn1fdK~{I8e$u-seY;+Wl;TeViir?%h`X
z+j9T@@?c^73GlmG9iN<>9bS%jK78a|T8zNfNLYN0-vL1hV2>_F-KnK02Y-|lS)c+a
zt#o>z%rU2IG_mpZ?KD|vgZo!MzkpjHRk)E7DEpuUPz5xV?4gWu_0A_^<LfKkzbFFo
z(+lO3GA@;XuP-nIZJi$h3BI@BS>8L5#~yur(F9;?^aU20Fc67=6%YqBlw<%v+-wWU
z#KZ)B_W7sWgb-8#O(~eZ5-^Ye48c@6di}~(H(StO#Ui-<<U|;K6=p!+{{X`?UsJ<h
RB&YxY002ovPDHLkV1fmG#<c(d

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley14.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley14.png
index 76ff6767f4d2893f65f4528bf0d11957ade6b8ec..3b2d12575695aeed1ac887b438be554509f564ff 100644
GIT binary patch
delta 1724
zcmV;t21EJD3(O6WB!2;OQb$4nuFf3k000JtNkl<ZScRpRT}&HS7RP_aRxKMGV1k1J
z2Hcildo2<7VcShYH%k`;ZJ>6WwscEhqDZ_|imIqQ^r7iPDp`tFk@jWPRkf;A??MEX
zQ<7C9viWF8=oX>6XelwFseys69e>2Jfp`@>`!Jo6zaUBXynoEhz32ST|DJp9J!jxC
z#NlX_9FA7$m(G_G-J>{F-rL%K!xvwiV=E`|c$Al4?g3Ee=jLWK+u^H|9?u_&K!d?q
z4jg!nv9a^?_8#Km#mj7LtP>8emISS>t&<D}BOM*>s?GK5|H5W-7U}x^f7d`k1Y9l~
z09LCNfWg75jDL-t2jKqw``axfPZV9n*5l~{AQTD#5C{ZS-LhOmpKlnSZ<tUh#L1Ih
z0342%Ura!;J$cegC=^ohb0seV{r!Ddtya}}DbU9ukSjjlFz>%VNGKG_i-5Y9pO|W-
zvEO$xI~!1m`281{oefZ5UyCS)*}Z!g^Ygd1&4HGdJ%9Z4Qv{2pmX(z-PNxfxr%R21
z)9Ir3pW_@&MKzGK1#LRL8U<w=6nXIA0RYR(D*!Y$J}EUeJ}CvO>!o0Iy`+5S>L@mV
z>b$?dFV9yVfr$qhHB|lmeGCtOt}1P8$RTyR4<QIO2tp+vBvN#mo}kn81Ro?)2tp--
zP=nijD1XleV0id*bz!-_0JO@>t*4t$7>!2sdOcH9(;OF9Il8<;<Gp)aH5kcevoti+
zv$Q0#xhZjDhlzdr4${>0G^1-tHaF!{TvxZ7AAejVn}zpQ!yH{+!E*O5e_0kWn`;61
zk}T0^_(Ld2!u9nvjK*?eu_zx_n-GLb0)c?WL4Td(blSLd=_}rT`%R2S12=AbOLKEQ
zC%(zzu{qhl{~6ZTH~8$cA)HPd^Ygbknu=;%E|(OKCn*Pv#&Xuz*Yfg42l8##(9p#E
z{2Tx+Ee@8K7m3G{xLhtNlgX+fjYJ|C3<dyFsT3!kH4z9vI2>VPV<Rv8s`GLah4_Fp
zH-9&y$&0{&1J9AoW{Jhp0K7G}#@~9OyxgRMD+J8u9sKZvoN#9I4kD3U0`fB+Px98-
z8fV`$Aun_fk|dGM7DPY^|MlxKLyM&mfIV$l#&!Q?BC*P;pY;NPfAiE+O?>y=4B`Lm
zh7-4_{c{C-_qKBT_96h$XoBP7Ds4JF6Mt=4u*mqLxRi$vpm8`_rJXx#5XB{Wdb$Y&
zzDE?7uvi+2#iHo-Whh~6Z+{-EwTX{E{wt|e5~uT50L;#QkI7WYz`zkgp+zoVzQ)>`
zd@?ebEDFBG(nv!?Et8W|Dt;M&C@%5(>#uO`+?R;r5{D1FRkq!qt|ADPYWT;;uYWNx
za0HO|JsgezFfee0@$qX!BJ#H&RMP$FDhhr_$L|ouB_=1QXm5XB#n(6-tx|P$1&Ksj
zEuE#t06IH+r59e<&*{^D0zj{qFO*D1KG(;Ny~CwTHy9ruQ*9oGuLCd|jU*E3+<a8W
ztk!19<@z-MYinsLDk@ax$$K#XDt~wEB$LUgb4qCs1g3ZxzDl4_a>tZ%>hq0aGRYZT
zR;J~}Zu!>x`fJ&dGN<V064(mA>`@3zPfs&FJ&oON#pfHv>-`9TA=`P9$$J2Jy&vK8
zjbgW3RsB*}g<~3}y((;-l<|&^gPb`t3cwq090uU#%@Crvh#*wbvG*EhE`PUTu{2?~
zTLJR)FJ8RLcKAhQ^%GN#bjnhP*<6Jn2ux0XgWWD)Ai>}Qf>6WU+>FNIXqB{D*?e<T
zQpe))C^lO&8jXgVH*c|T-?PNyaqir?E7zBw%djG4g#?sRsnh9LSO{S@?;;jUqSb0K
z7>xAwy^6!pD$UK!Xf`*cJb&kXeXn9L7}09A#9~Rz=3Oi-gwW}9dDywKWmg=D#5sQa
z7$Dd4kr989&Q=}oojVC$d(ETvmZwgg-pWle0i{;=^mOC*Ur@(;db$}J8rc#kSL7Qt
zsJ31`J>8r=`;WXnK#`Iw2v*lig9m?$%VooAwW@ub$J2$^`^PO;?tgH!N`r&%;`d)D
zvh`m53R_~O$gU^{fRarAU)c(?BmpH;l|59RsZ{Erjuf3j+rsSMmVk0bmBv(gJ`RCG
z+pT`*ijq)KwA-8V5~-?6|HuTYs`Pobc6$@S;H-LlbM;F`!0mpCp`j5xo-SN28!nfP
zD_15+r_-g>^CX>4b2a74glgyUbTKqEg4_L4N&TXI$-SC$!<PHK-6?on+y4Qyuwu{(
SHr7M{0000<MNUMnLSTZrw@gX^

delta 1463
zcmV;o1xWhL4ap0TB!3BTNLh0L01m_e01m_fl`9S#000GhNkl<Zc$}?QeN2^Q6hC)d
z%!ms?&St5>(D?^Tpb2b+(+En}+NuRM!fxsq*cKuE(FaYyb<6%ph_<v?)(!Flq1qaO
z#abj%z(BOYW<eL3#U#S+y%-e4+w(h@^Y-2^KAdNR=e*Bz&VTRx&Uw!Byze#B5+w50
z2o0n2PnYR>)&t3c1Oyb4o%JNuojTz)=PPqI`uaj-bONEFp?;uYx7<uwPwb#m^(T2m
z@cBSN3^qm|HEMrdoAk4to}M;&5rCAGl<*i66T@R(ULFHMrlzK7u_CtOTU}kv<IvC$
zk2af4xAh_*3x6O29TiAQyob*9_FNYM@kJtn=_`H}K=yD52D%giMnP~?0#yiDfg{T!
zslZSHA%YB$$(goR+IV*oUHI|byuo1uTge{#FM%a7#M(1G=1m~Ye3Kp=45c3+Gcz+h
zO7OL7W4U3!cK^fAnU-ZdI$eM0HsS-3tOZ+Qc@b!v`F~q4mG6E{PI^lEjCB`%WdD$&
zqa*3L!ON5xW#ReKt8RKHZZ#7S8}SK*DY3i=6ihj3)vDFVjtx;JFokjP;7?ve97DfQ
zafnh>KnUw<&S*2Bd=CA)jMBm_jDhV<P2Ehx!wxDKx$IA1uC#0bDOcGc)85`*6VCV6
zE$MW!?teJ#ZCy?)zY3>v+ZgRDdV$J1XDPD1f=WwP(CC8`ba=~gg6+4h-_RcSm?<$a
zQ5zq35{)<+8!<+F3E&b!_8lE(coMo80RS0GX0G?LXk}~@>u$H3%2F&;(N6jrQH^dZ
z!GR^123^Bt<W+&}>};Byou#v9f8ghwFRszCM}MRbJh$2C=qRm=CC<3q_P(bFlrC#V
zTLcHjTbn!>85tR*X&UwSU-aJsl%}q(j&<x6m>x_R)vsLD-JZ^GIZZCtz0}d!PR^_A
ziOPQF?MO|*+-b4p>stLO3{QoD-_p|Jh0g@AhzXQGKR;jXc|YrOb6R|SJZFLqe=29E
zx_=+;BHQb)v2*$ZQR;sRbyFu3DtYBqb>uG5C&y~|sG^7Z`uYTm$2Dtir~3MO9iJ<J
z#iF7js;sPJ;KIT}s;a7DeVhF^YPR0N1W;mtBM?YjxiYGkQsy!<9^z*Nhi~5|55CoE
zCA;0ObfVncT&k_D{eKIRlao2PyrEQZ4S#c8U0t+3ZI*VKf2THeq>5GfUwZLn4ip)2
z8#f^YI_9u;@Xa?o$M2HzQNDtY;DWD$>-bC{EG&$CMdpe_)NQA!zYx!SczC#O<D9z(
zK)|@>>oXtzf&?IMS9-SN`JzIySS)(*?b{w^y{Wm8M_Du4-w*=b-QBtlPz1nuVt+#;
zZSUNy2bF+E`$Z9GXlT&)2LipR`AZGo15fX?(#JJ+o)=vL-Pe*pDG80#{(Xc#7sy^=
z`QfXWe5}pJ1;_`M6&m(1VPm4|<Y)#+Oi1DjM1XO=)%8qHr;8fCQwN<K`W$TFYciQw
zzkh4GI>zI4{z9*Y=EU_ZB=iaxg@0d_s)5XAGxhYG=LT~)hAA#ChS&EM6;nm!p}Fru
zhyE3e_l2y5goM!G;1K%)V;!zeBCpr5NYJn1fdK~{I8e$u-seY;+Wl;TeViir?%h`X
z+j9T@@?c^73GlmG9iN<>9bS%jK78a|T8zNfNLYN0-vL1hV2>_F-KnK02Y-|lS)c+a
zt#o>z%rU2IG_mpZ?KD|vgZo!MzkpjHRk)E7DEpuUPz5xV?4gWu_0A_^<LfKkzbFFo
z(+lO3GA@;XuP-nIZJi$h3BI@BS>8L5#~yur(F9;?^aU20Fc67=6%YqBlw<%v+-wWU
z#KZ)B_W7sWgb-8#O(~eZ5-^Ye48c@6di}~(H(StO#Ui-<<U|;K6=p!+{{X`?UsJ<h
RB&YxY002ovPDHLkV1gW3#<>6h

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley15.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley15.png
index 6260449569ce6c417989e32411dc5adf639c64de..4b7c6e838ea1d267ccf6760c482c20870ded7fe4 100644
GIT binary patch
delta 1662
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
IM6N<$f&%?bR{#J2

delta 1372
zcmV-i1*7_p4ett&B!3BTNLh0L01m_e01m_fl`9S#000FcNkl<Zc$~dgTTEP46x|bs
zL`GhL`q5}22BLp56@f(4Sc`oSH9=Es1nOuL67>V8nAqynT5CtCNdfs#BHB6@`a+b%
zjBRacM@=w5LTQaZ2At8DG{r)Am1#oa^{x&3^xVgkwkED*a(~X<XYaLN=bU@TOSgcW
z+-w8m^wf;!cGlgnYyd(E?0qjxJKqjjWOgj+sP*N7Q30f<r#nb}cV<xarp<Ka%HRCl
z*VjjnuUSjIy}hoaRaI4n=m0BL+(q4A9W&;yCLOv93kx1g06-`d;<2EhfXDj!dJu3{
z6B83GOC%C0vwz9W%~iJf`T1NeprfP1VjB*JofXg*5D4a|z$*VkocYaQYHEr`Mn=>#
zY|oDjb0WfNhob_>00ufLDk^TP0zExFmgG<g*t=H1?4P9q5(qL7a^PI-Y{~$>>HS*u
zAJu>@`Y(<pG5G54?sirHXl`z%#>Pgq9{>qLu)gGO!+&>2I?Z2O;Afc+jLo_RC|L`)
z4%cI7?^jXb{WLoE8@(8KiN1&&R1Pr$`doCx1^}0ykZS<u(Nd)XYHMq$tE-FFuiHT1
zpFYL1Wbzu1=YE}}R1h6Fhb?%)1z;b+hrY)w6^O-R+&dj+uROST);zYBjvYTj+k&r?
z&zC{r_kZ{DeD~l#l+)irp|^I@{CtvHTK5xlV?Uf_Tih@D>9B8N4ggAe_85`<%9Zy}
zUS5t7PyDVj8y_F1jEoGP&(6-$?y@Xu=_k5;dEC@VTB_jp`;E!TX^KXpTm?BHOI0v%
z8L0}mWnc5{RXY5%ls0Jz;JNDO>9fy2Wf|s>Uw;o^afEYl?0?vLN9a{h0hE-KIL>-g
z@wmEjFaC0#uj<ohPEmQ;BQ!ABPn8>=;<e-5N0e+ym)`;A&*WIFu>Foeg*gB$mY1*Q
z;~|>`i;xWr{A8dF(=&^K)z)k=N$%zTOEm;=j(w0w{6SrZ5Ah2tCp(`mUHXf;z$yGV
z6@S9d6)-0h3<jySwUreb8XBmrt&Qh!{=$|3eR(Lt4nYn_2m*Z<h-}>x8~9mlgg+1n
zP$aVWTvt~|ot>T6TTohB%Fg8tWjZ$?8yXs7BH)>-XZfbvvHeYUgzT^h0n8!8TGPG{
zSXY8*Z*OOQI2V4?x#H&ld_Eu9q07V(kbjw(spire1Ylo-O;%QxgUimpYyc=DGMb!R
zynKWd&MP-Q$@3E@qn0)3=H=z77W}6Ggi!EWuz@~mZR7Fi15v6RT+MQkx!Eim0A8EY
z9{}?cC%-fBJ)mzUnTw-G&lFQxag_Rh&Q>xveUr<<Z~Ek8?bR26>gs9(cYpDNet%U)
zfAK0Z3_}s)e4EFNrl)79=STCPQ(VcQ16z;B!*jfzQH={1M-03ha6L;9sse8Cdc8C}
ze1SJuJpLyY78bC4Td>i*@0*uCHsk6m80TKr($dmsY%IaH;3z7(k5c+cwJ<swr#*Y#
z;W=)`0|z1wom5}EaK3eGK;3-1c7MHl>jBi%Y_=HU`IGjK>1F_3J>VPJIs!nCun%B>
zk|GOK0Hu|k?v^=Zrj8*xc3ZvwHw@tahHC)w5h6X5QNIyWL3Hf4ZrQsAp#SYc`J{|O
zzWt3IwC}?v!`=qiVNC+C+ot;8=(UqzeC6d=`5C<v;5uHe0<sQW-B$RpuT|hf55iFa
zT^SonG612x8B<|yZjML1HL(c+Q~{e3y!hEqgChV@K$NDT<zKFOvl;TLbpt8@=W-%+
eTa(xIAN9Wh0YLs&U^e6c0000<MNUMnLSTa6$dY&f

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley16.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley16.png
index 76f6cfd264f2c188cd7214e5d73959a547118804..dcbe6486cd1ad0bdc452320b33c01dd846be19b5 100644
GIT binary patch
delta 1615
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
N002ovPDHLkV1mijMFao<

delta 1441
zcmV;S1z!5#46_T6B!3BTNLh0L01m_e01m_fl`9S#000GLNkl<Zc$~dgTTEP46x|bs
zL`Ggh{V0}zf#{EwsR~Anu@IppN`itKF?9+FiTa^a{P007wHB=(739Mj(ZX106@rrB
z*j7r5noI*E<)uFjID>6ziUk=4p$UoCv-WTf_s-k_S`&9NIe+Kwvma}}&b?!$o1lcm
zcnzz6Zr*Y$=Vr7n0BIC-@cla4`)-Ya7fLHK>U=#g3P5ypbePeUloZ;u=}t;b-NMhk
zy}gvTJ)gR|x=f9hl$2;v26XAtWx9U-Pi<;yDol2HdD&tB0II2};Wa%yo!8phS{k3Y
zNV|7CXl7=Hd4E2iFJd%_iHS-#IXRiLm6&h`H8nLEbnEKs!ZV;h01)hvfo=8&IP#6q
z+}s=u4-czn=z6_gs;a6|HbW^a1Bd_$k^+GRDlIL&r3|#RxD3G|6VNx!0BRx*G(;T=
zq_eY=jf2khos9_KyRL6l{gDk(e?tAGW0Vxnvi@Ni0DqzBnwy)cqM{;b$p4o}qfw^t
z!MiluZPB!NW0{}jzJDS>LqkJK4!SaHunF6t4H*VNHXIc6ptu<w71ZKtRt~X(^m{Q0
zER&gWj{+bALRqS-tIYvm3}vc7d3kx%*49Ra1v}`+p3}@*TDrmOx!-0f5=j{VhOQV{
zwgp09@P8pntC@~rUtb^B4uly7b#!!CaPe$^JfFU4KS6t(Z;;IvLv<e<<o*7Ee<;CI
zPc`rCrNzZ1s&6<<knQ{FEbAh$v9Vv3-OwhsnnjP*?RL}V&08obDM9o4epiuAPft@!
zObqV>fdK8#iKBWC(Y0&SLT1U31-sp@&CdF1bboY&wr;&oO^7}VDg*lHC6#yoO~;F6
zYL^TEo_qEM`r^yanTI|2s{n#4oWsW9hm3cGJ_`&0qlYvV7eB?!?(XlIcPML8jmzlR
z5MR|jXHL_@Il0t7;Gv?OLHYKM6N<MY%kKd36E=v_($X}PG}Qj&<Rn><{?ybAQS%9f
z41e<ro){SoW$@1jFQFI9cZoEnas6dBB*8iQz~`H!w&Tb6g_RJWOjoa7rnT&I2KxJd
zA*a(x?d|O>P*zq(jg5`Ghx3<qIq0inE_Mjxa0C#jyClggcwz@XOC4$7;c!q-PY*xm
z=jT&vYwKzWva_?Pp`k(DP{O$e-r(RM&wn!rE7Jegn{TrtM298>VGkb84t?~YK?e;8
zTP~MN*%!{0eFk8&*(j7GFE{rQc7!g*Y{$mNDj8WC007A|$U+CY0I-(*bparaPnSF+
zIy!jy#Kpxa=S4f8<o(H0Zo?U5lai8D3H}oRY4FOG;2r+D^ELXUp^?|G?{!nrz<*=R
zmpqV^HM3<30B<|}8w&fAr+(0Ex5pToN$#biN6%zYPL`WI=i?Pm%Aj0wFKmU`7e0Bc
zt@;B=7@@5D?JAA-tZk%engW9P7Bb}b&r|2mV$jK}c#wgv#bV(-UeCzj$mp=9|2{N*
z7wE}qwbF$PBivwK?;n(rk<R=*&VOog-+#RFvFTM`!2m7KqN1W`V#3F|u#uU0H%0Ul
z>0o@^O9u|r@*Wq+(W9;~nMhx}a9&yIP<Q{neec~ofb#O^4T^X^^4X`f5rV89@LIa2
z01%l_;FKZ?`9&i;-7IqOMEW(z;M1$JvO?*umTZFn{!dyHfUKch<<+|uNq?D8-3<fK
z|LsEhWE!P$-0xz>wa}D84`&iUsBWbHjn+^jSYLVhResignBuz*#tRDzX#B`U(`ax8
z8OZ8&r9CtveCR=hWk4^ChLRDWk#MuEMGFfHyyE`>8W@BupmAXrztCw210V%}QYae!
v<%*k4ldoDc@_5ek6)Y!0uNsS~GSm4N<0NWWWwQcR00000NkvXXu0mjf8b!QG

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley17.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley17.png
index a5bc876d84af34a38a950cf9f97f653ab36fe258..9c23aefeb487d97496e6278a9225d7591badf48f 100644
GIT binary patch
delta 1404
zcmV-?1%vv+2#*VpB!2;OQb$4nuFf3k000F^Nkl<ZScR>ZT})GF7{`BwR%RVt`LYG6
z1uflh3$n>Y%|bUW2r@Ox%wo9e=Av<gxC;%@xHQXRLj2e+w#)#Tn_F+>ie2c)3>UB(
zV$8rDn<x`8f}nUJ6jrcW3!Gilb2z6Tw9EESPIAukKIi}ZpMUp#-sikWM;erG%$4G8
z_wLW@{;RJH&ETG0g;H=<>o7hMq4RJh^?R$?<hnqqy?Rx_ljDNM-)_s%jOXV;_oZni
zu3jDd#PMp3rYglb915_j=^FKWtC?F<3BZ*rS60oad}FSp_CI?jkrM<-7Lg?n#AhCl
zGRGIIJNyfOb$_g^lwK;Bw{+pyT#<3`n%zSg`z8o5TW!jv#^A+m8Iz9Qy~EtCrnH=(
zs)7E2X`QEeP_o+uWpI3A5rDDLFX8!c#scPUH7PaVX&xk=bLhrgVi5wE*4I+C{T%@2
z=NDMYxlQnoOPHSzW8Tt5z6lODTBW~c^t@KENO7J4fPbmkD6;LBn@@mP4dk1k)X_+J
z#jE7zz6`)@<agkr5>r#r+qRk|yG^gjJ~+EXFr>q=xq{&15h|^(Q0LGwH5=6kD9$s`
zH!3mw=x>dGeqJ^JYTl$Xux+bZI(y27rL-OZak7^`Z!UBCoBKel1~$1y5F-n8-F)%V
z!)Gh%)qnRY|NWi~y!m>ThPUM?k}N{A1TxH48{*{3bG}Jplj{NizV;f7rmBR3ntL>%
z^bNJYnse^aL_#bbz`Ji3N)YQ(GUUA~K911SeE@(X$9$YPzIrG0wh4TF(gVPId%nj~
z6zhb^xcdjDb&7zqXR0Z2?o?EYlf4`}F@^XzLVu+*MlwFJh~1{AzRr>~cyFJm_y7!#
zM6eX)aMD|>EP>f-<Kf7!w6qFZ0r`1oh<p1)g0rz!3MlRLx67C5?GyRYcM+rUB>=+V
zXMEz>O?{n(9SsdJTPOfPORGRC?*4&kovyaFRx%omSS*QIiK0k29H!$`jz)lcd$Fd!
z%YOm=SEn=rK0O*C9d}mt@-XWRLo5V)aJgIvf`H5AVj<YWI>Qjz%i0FCqoDzBn}9gk
ztGT>wf)ZRtCfs^JDVis^>FDUd?RL}Xj@kAd^d+d5{k66Plg2j{w;oouh~Mw0u&@xn
z-%q0(WvjKc3V@J2LK>vw*2x73z#2EBqkp3~91eKy2hbFv3~!r&`s@%61r(baasjT!
ztt>$}6u|q{%FA+qeFuGf`0+K2YqRmS*JPBnr+JX@(<LlLIf|%wZdqWKoI#0mCjb{Z
z)&o%D+^KA(p6&zq+H3H(33v{rKDl@f&Ejnn@U_<{%}eHr=a!-GADGs)v<lM78h=+4
z6#abger%e~cX}{eZHkyoVYb>h-|2Z##L2n)2c~s;`37R=LOEzU%!foEpt?^EHCH$k
zNPQ?(<H#|e(z$y3M1J_`b7icw%*pjYl+)im1f~@G_1h(Et#U$SJS9)E??_Ss^>r5B
zdZQ?5Mw4SBfHn(&vWgOEa%=>9aern!GBP@pCi{&3Ur6{dk?-Xbk^E%?7@x8;6N&;b
zb|(-w162}0fyscqcx4%q@u+7n;U}Z4qDm?-87M7tDmHoAXF^f*i+2GSz4t`(uA_XN
z1hA;zOo1tOREy`B2}KixD-Uw^vf^ae@7Vyrx1IMH9?|~uRXTH}&kk+`;B}nuK}rsJ
zCgfSr%fXX<V9Zt<T|b}0y}cMu^C0JZ4-^rpAP4ug*WkZ8Mbk(7Q`C@8>b^9s(-h%q
zKM?5xr}It4t%KN!I1}RV(<K0+(dDEyU@*k;F|N(dNa)awIo&_UbdND@cvsp00000<
KMNUMnLSTa9;=Km|

delta 1069
zcmV+|1k(GD3&IGHB!3BTNLh0L01m_e01m_fl`9S#000B@Nkl<Zc$}?QOK4L;6up($
zg<y>+)Jlt@Rs4Wdl!6k3P(!rpMnSUDjfjh`6iQKwNU#*4JC_yIRaf2k!5~GDs!$Yz
z;D@$Ci^Vpe7$dk)F}^d&nasR5?<EBfH1lTOopaCJxpUt%CVzFXCf-u+Ni?hHiOFB8
z{a!3Jh1sGt?Za#dO8^P{xNvxjq)vB9eAif{oy*>3Yl_kWVEFuDx2$T}qYZzS-pJrk
zUXc}>cLpZA03O;S64}dL0nUTHQ)Tkh-2!5B=T%t_V9%|HLPG)&%FeCZWcK4sL(cb~
zcqNS@ARxY>Lw`RbT*S+J`#d3y34qYzyNsMVKOV_x3BaCUZ+a4W{gPQfH+xOw*L!Ic
zaE=_n{E6Nv@pC$p5Ma^}{iTB3xVb2C&pA)P#iJX_AHK$9$GSh#wsxf&Tm1H0ICksB
zPc_CI=<jQj)h(?xCtgyI-*-enuXreLtsXFQ0FIKKO@E$Kd({|wG8?n(CnjgSzj<$D
zUi`HrAOOcFH?~Py+f%AvSa>Y2-~N?>>?hS{4m_JKdA$~SIJIOE^>(*c--%^EJlG+7
zcdxK`)0z3`V~C_FEY$i?&xB&FFcS+XE`8z|x9m+$*!U6S>d|7qMeYVdH8OlgwU-7e
z@8HOv&3~p?+IJ;Jbp(47*DX8vL=<!cu(FNYk7<?FP+5+dBdKJoxbXN%LD|rrFt-+w
z_&ohUMM_5iP$f6HXpvDEz;gO1my<&W+N|=*r~o6wY2D9yEgT`Tsbns|tpxa!k2sR9
zL;=Fgqq!VlZWK3?QAL1zkI)`Tr`0N{5+Ti6lYi4H#Ql8*ixeE(d!mv@;oK?$_~Ar^
z4T*!W!x-@Ir)h7G1tVZ4q>CGUC4fg{uv&!Bjtp0hT39)ygQ&ir8^y`w))AmW6X?^3
ziKtP{3nn7(4a^m888bbKTM2L#2y>i70U;rvJ%A%epp<WFYqrK?RD>EJl2=Z!8uV$D
zpMN}ORXKlR0;~~eSuL^0Koob3pJ9=T>TH#aHy}7ixWX!57%&HOD<a(7x)Sokz><uK
z_3)#Fqx8mjcEjZ2B0}#21dbldEzaz%+gH>x!;frEXK*{3*K_#!HSd9b9#=tg3cw_k
zTR-R=$>hHsdt+sa$kyShE5MJiQ}RC$5PwiRLN%uY*-`x*bu;F>3P+H~es%~zSdoYb
zW&7ssdVFDSx~_8*m=E|lTwA9FoIJi>odE1J3|-D}y#jd22!B5lDwux8?|-RX$uQ{p
zz~C&8-5FJhgs{RforHnnP;{QYSd`4!b0Il&w+s>17MS-u|0FmLTe%-Dkzw3Q04BoD
nvgwAIkl`ZuuF~>3`hUuQ4~2&SytQr100000NkvXXu0mjfrpEm?

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley18.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley18.png
index c6ca3bddcd16fd7f9bd1bc33ed34371a16c9941e..7d4a85ee332c9016f754008dda4c69c4186de9d3 100644
GIT binary patch
delta 1568
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
S;MNBK0000<MNUMnLSTX@s1q*$

delta 1172
zcmV;F1Z(@T45$f^B!3BTNLh0L01m_e01m_fl`9S#000D9Nkl<Zc$}?PUr1D082<|K
zp=cT?P$MbImD)gz#HfZqTz59Bm)b&l$d?Eo2Komgg=7qcY}gj~u!O;GPlDh}C0R(Y
zxJ6Pl2o-2Sl2ijd*aSUD?CkxWncunRo_p?03;kf`oOADYzJKp`zJK>rNExh*$MUU-
zN;RLDTvX$yh1`-TS&XK9lq?Y-Km|6se%c^yhZ`mS<8Vnim%K~XB&7*J@ZngqEQ>X0
z!7sUK>AjRu$`&d&t7oT9o|eA8KCQr;=dtDpJ(Pzh(q|h(I(N2D<w>G!2#ED{=V?$I
zbFEEzhN2X{iGKiGS-0^AdG&fWM8Y2NzG?qcCD+iDl978NoxkS3oj|<0R?p!s;>oRT
z9+6qSj`GCsSFb3d2-WnHK^1~{^<JmW00G1Vv1v_Y^h;*_n^zY^7GDN7x=zkD<|k4s
zy)Z1wMEjK3I-N-fFlmVHTvmP?d@pg&I4j`vp6YyTdw-YY9{(YikJRR6=7u6OH8v!h
zR(%zCVBtlF#Otmoech=VSrM!9jd)2tdfVXved0@*!07=q2Vi`;XVi=;$TYWi2}qdo
z6O*&vZ_ax%Cw4Ch5kUEj53iG|wQXvhoxd;7p8qR7>9=Z)9Jp|OzdGTr`k0JOeF%nR
zyU0H?K7TFdOn+~!Y~8Xnpf}kuSGo+5h}n664fY3*kE*O@uP~GK+TbUZ>4$!9MvZHE
zTj#=uw;@{<JUvFlTjXZQRRjG;)p(|7(ECq$h9-43kK9WX*FIUwHztO(2U`;t1BPJ}
zUeF%E$=1~G)hvsyDjN1lH8hF*{ph_`RJCHnTYnek_a9`H4CM(kwD82cnLEl;+5>=U
zxh=k8C?hd|?ey;Wi0s}`6KJmhJu=Xr)a$f2!Vo;$)-oQ_tq9o3NBoj3cmc%B()>Tb
z-cq`ejLHLyeOpVF_cH07a$K{7OVfePN#)}1R5qX#Iv9JRkVnzFl?U+0jc^+h2X2Qj
zV1LKcln*`&d%#Rcmu{>T0hUN_u?b-u=r5ESPT^{&G*D`7>qc`jb!!ihp$V)h#6;96
z<^>ax_Xg$)L&i)mrCSkjH3;)L6@`dIfbsxJjzBA4S5p~yUO`6a0U{Y?1gF88LYc{9
zyvZmx+ldMAJA#qj5-|o!>8{{sSfs!@U4K-@8xV}cUA7y`0ei5wK*FtCcS3#`*pjia
z96skzO4G*N4O15n5qTdVP<p6a05yB#&vR-{_amE=9k?CM={@}Xn)g6kkE@|M31Ac2
ztqmGSGTHZi?^&KC(q;6NC14|}O1=j|1pE^6jrOF6^qe<i7x=EABdjMlcMyPEk$;GA
z<=XZ2`uY5unX<-BU_W5%aD`42IIwTEssO|pf-YmYUIDyhM8BVnBuqP_w?Fz<GCXvB
zU{K4$e+{Wbf?HvjMxsD+XgavKbaWnz$f28gkO+jpyyw}QU^wdJHe4j5bSnaIJKLrk
mW<o}j;Jd=e`T3G${{x->&S078X$>R*0000<MNUMnLSTXjmM^>j

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley2.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley2.png
index ea4e806eb505dbc4adf35028db9ba6ca9c24b750..a56552fafe9c3f821c87b5c0b49ea5b26d9f384f 100644
GIT binary patch
delta 1555
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
FV1mYo1U>)&

delta 1328
zcmV-01<(4V48sbLB!3BTNLh0L01m_e01m_fl`9S#000E_Nkl<Zc$~FYT})h65S|Uo
z!>;@od@wb((zJ;W#O`7WB$~$BV1(GlpUAc%b+rjWeZZ|g_=Bmn5v>oEl?OGV)orm>
ze*8(rVkE{|ivodeYar2pyAos5O(b2QED40``DS-+@7=xoXMf@(n=|*EnQy+CIp^HF
zcFIFauP@OsMz74<{>!?RWF;V=+2+!%XCtE%C@d^Y0d-#IpoWKcQ*YmAJlbqF>ghe1
zu>zikJ)~)x?xRL+>1r&+c4cM7W+DJ-Yir}Nyu6&p=H_Mwf-EmD)2Xk&qHF?!yLR5s
zy7+c=b@3Puhkto&Z*NbnfN=ptprZnn?%U~naDoZsDq<_XNJKD`C8Yw$9uDb1^C4gq
z1V<%M1<MMcCu%`UCV~u*$=RRI<V*mzl0Et_fh95Nzlnf|luGskWOa3w$1S&2(#2oT
z(}oQjnP^#ADbLT%MR|<Q|D)T84@9!IYC{SEE5leUUVl;mTLqS95D**jNr#z20LO6M
zx|@+58%mj?S5|0x=6BBcaqkoKao{5gh5s;tAh3woC?C^tMSE*%w$bcth%R0FOS3$N
z2o8gUt|7BvFvy16@7lq@`+d)m)9Il0*I#4(;OH8a4tG%7OE1&XQj9wMN7(j<Gv70g
z+wIm+DSs7|u@M8hsREMy$jDiqgf2z^K*mziNF+iIhlBNng#|iTT}&OrM3*l|lugW3
zeq(UKH0WFfQw2O853Q}O(YbTK@N?s-t8`))B|u{)0-lCP=z|a6kNYVd^VbN(M+67P
zk*#rz+S*#aC8wr-OWgw~O;1k`>*y7j9(G0a9)GIM#rxp9p>L_C`VJZy9j5xaoxIl5
z`>8&cu;u=%pTdY&82Cd&LneGCfJIE8{4Fgls^?RzC+4(@iVDsI8|~4?z3P6rh5Ikn
z5J7P4gK+py`sBoMeGg4eP6`%}>(}2%eSLj8K34#XKA(^Lem{e?wzg7dXD91*fxl_c
zdw&xXKtO;a5J;f!A~JVR?Y;br;P9Q?8pro~y%Y!plup#t)I{Cg-Pc-BRaM2o<!Gqj
z8s^5v#u9Ca2U6wNUU>dR4pdrl18+hIbj)Gx@SAUN`PJ#6V50oMLU6%X!F7Bl;B-1E
zS!6Ex-CtBxr0a72LBP0X^ubk}2|p_V$bZ}Zcsri)wNi0$u^zm>?mpH}4-W7sYexHQ
z_&E_6A0O9sfFc0KleZ2~{pdD5s01|H=R}~tzu)wRf_{4N8x7wBkL~r+vEu=r7hM9~
zIpm^h*8mOwT%yle*(<CRd=-=1WH&B|pogw4Zncxk7{KkS<O@WAalVxeMWgf7|9_*}
zX%y1uU;|%#zCpix`wn%C=jg)4pk{nGSiTF4Vz=9AV&VdCuuy20Hf<{B`Tf3U)qVd~
z;zbkEzk)$p)(Q#=Xl5qNzQEYLc_XEblWt*pIz)#Ky}~-)=SPnQQf$(FoFe$XeO~?B
z^1y*t^C!^QxZC82=Xc+GhjJ0v8h;6A^0g#@%#;I{6j`7GD6Q;ttIRQ{Y&5Y+_Dxr<
zy#5*eACi%P^iW2*dNYaGB>Uz?K(11hPs*4tfn;A`TD2jCfCPW)$)~w@A`d?BP|gHk
zYxD&cHlY;>%L<4CHk4!lK-_HEWN~qkzWDNU-h>cT0h>}Vlf{w%48c@6nkoL}s+%q2
mzhVe(KRFRbUz{o{`+osuR6;_ry<@8Y0000<MNUMnLSTZ4tB!I2

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley3.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley3.png
index 8507c83cbff5358aa924b4fe2f67a07466709319..0414adf4870cc5d7e03672811a623a2d702370cc 100644
GIT binary patch
delta 1714
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
IM6N<$g7=(Vc>n+a

delta 1462
zcmV;n1xfnC4af_SB!3BTNLh0L01m_e01m_fl`9S#000GgNkl<Zc$~FYYfM~K5T4C0
zD9D0Ejj6Vjh9><%EMN*GN+UKHA-3@m0Y&Oc4N^^{6o2@@^p&FZM+??O8?mixu@4?T
zQn46`v6iAhptJ@O47ik3NvTqorGf>yo^O`9y>}lxj7~z%?0-2k-+VK3&bbF0EkL4f
zj?^%^{}{FWoAp34CjkMSYcAOOTx4_tAt51tpy4-#QTF4xR9knPM~lTmHMPfPtw2up
z6QpUH?xRNS&#U8pwv&^S783zTSy>s6v9Yl{78VvV5M*Lvf=+z#In5;?xPINktc!0|
zRTYl|0|Pvkmw%W0SHQRcBG6HRq{O@FY*!}}n6HSf_#zR(^cBAfAbU6j16>FKqaZjc
zfhq*70D7VpG+!df0GXU_KII46yXa1~UwP#h)1H8>WRLz!U`b5+uM+@J^VDCoX~M0S
zO7;U}YHEtdRd*%P`5(_xOw4i)+<e7D@5C*k7<;Jq_<xQ5uG@$YM6wp_1NK|BG}{eK
z+=k$i0ZxL^P-J}ETT%c+qNAhe#r})5W09R`#7)~~h=73Dh>w)ti21DNH;W{0I);lE
zFF|%}xc|l|5|(}aKXHc7I11=P=OJ<p{7j`*HK77}C6wokHp++EEQ(-+ow&LRGc|P$
z4Gy|!Xn*LUhBj~ojQvA!7(kF6GVLYOQZx^x-?x^5x0Jj@;o)Ia{>CoWx3^7GX-fqM
zJG%Kfs;Jz<w%?xmhRG);CTb(9N;KqVY{XCm^y=7**|)Zy=1J&cl)LOU)kKe8(&6D@
z3JVKk-Q)4l_7po+w2;1LEWZQ?mS7rmu7c?p=6~em(Dd{)ojLOZ|IRycm5!{JeK2k!
zkdyr+eQ@A?ub<L)O^nmHPQYu6;K10k+KZ8qk-@iQPfxG80#g2(ni|&8D=^)iFs!#n
zZ7$viUpIY4sVVnRYg-FtWv=73n%blK+>9+>*XmDUcq<J2rluwnJ`=zqCQ$yOq9W?*
z>VIK<W=@NbkLOIV!=K9Apzeod+<#-qAqZaf+Ux4bU7(MT9Ok2nJ=ERZEm%A*U3xp!
z)z#_vTmdYWl$20qWhH|Z7Z=mMefwC?bpA?>jysqD0s<U?K;qJ+>jY%(fs6<FH-f{r
zd$kwe;c$@C=~OyVettexS65$eL2`032Y;6vN(I+2*WTVv1?eGFK$ofc?@%gL<$vYn
zS2<8r<So1jA<!|0wcT&M$>l$O;j-48Hcf($;DWD$>-bC{JUpCyMdok>S*+e6A|gV!
zanIZXAYfd>XPN!1W~@N?a}t2OUFmJd=8|Hv+wFSrtjvd4KiSy8qpTV2{}Tco9e*9V
z4p0QZcx+_@Wwou*gGxZ7{k#a&*VmiAP|!~{eyQO-@bm@;eRSB#^P)?jdz%s{C82>@
zzK_)B0@*7pKYSIFkG0LX0Ku24)Ow8)Rwb&P9L)fU2}yi`2r$mK>NC0Bqg4N$I_Tum
z=U@Y0Jl~+-pT1Td;}JS{zDwJyHh;2wi2R;p#&0_|k<DhK&dzhZ!CbCEii?Y7yDcT9
z>b~DQ^DcDhuVDDdn$>Eh{{8{>1;&aM%h?yfjbC3A0pCYOU!RM1?%c*YzUK!II{o?>
z>~V_V8#g-ix8>HYJ1Cg=J<GWTbdB=za!ro-{oej}X+8p5BVq9cwr`>)0)NKxC<iVn
zvOon;TG{D=GRK^<(Zt5r7wc&=ZJxCP|ED0ipnE_JjK8IaGRoCEn~06CZ?G5vD<J<`
zp?p%tg%a@f1!kbu`4N!d&u@BxdnfYfBah9S0BnuEz``aBL?U1X!~q*hG5{cMwz*_%
zY>Ynr>=WLE5L5x1QZRibATI$Jf~j&e{g<n5wpsrxhT!&-6JhklsS0HO50x5(VBxZt
QRsaA107*qoM6N<$f-nQmvj6}9

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley4.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley4.png
index 089e330fbf4b2dcbc874115336acca68d95ee8cc..3235dd5f4418cd5372958bf18d6bc585dbe1c32c 100644
GIT binary patch
delta 1702
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

delta 1445
zcmV;W1zP&H4Yv!BB!3BTNLh0L01m_e01m_fl`9S#000GPNkl<Zc$}?QYfM~K5S|T7
z6=cDpiK(`ghMN8$mc<lEl*ZaXgxJPMgep?kwjrR2Nb!dcOkWYLKUxqIZNygBVy!%U
zq+&4=V=YC2KxqvmHQ;VZl@u$wEM-xU>-lDx%iZ0(JWMCqoPW7<X1@8(oH^&-wbCLa
z?#5URqvx+t%m0}-lX(dU=zO+t^Yf9>2}DLlhJZ%j5JkC<ZlU^yPk6LgEL2y2e9j8w
z<vvE5rs*+i)W)y+LVPDDCoKU4Am!!dJSHS0@K{(_$Uu;Zi3vLK<rg%cfZ*m$53(+?
zH8nLny4`LbD}O2~LMvdL01@b@K#Kh?I@{CD1QsgdE3sIJU<OM_1+aPqgacg+0iz%}
zDuF7PR^ZU}aa3%mfDpk7u#(fQrxr{AzOs7kza*B0A=i${D}e+utk>zu!BF}EGBq{D
z<Jvn@==@J-Y30gQ+_2wx|6zNUZ3&N_(LZz_iGj$f1%F#|1rTVR`dcqm@P7Gx{*nS1
z5+5H&&kkIotfe-7-u<VS-b!4~1jI*T%rGTa0D<BO4=r1^9IInTlnG4XTsH7C`#j~?
zMjtreCztydDvMACl@P+ZvKf8)Rm{PEmrzEGjWMvj>FMifaL`4?LzhAcK#&{`kiBYk
zSZPmBkADT{d&9jO8F**u^AsH&MHR2T%KDy;X^LyBr1F<vq49AaRaPA!_<nclTiW5h
zVzJxp+Q^89Xvo9Z$T1X50GAL}-`;+jjnKsj09dh<ba;4}qN1W$_j<jwC(TBcZA6zZ
z4=W#EK=~y(umsbfYq*R8Dv+0#N7K{Obmq*D{C}K(;wl~6EPdb$Adr{)IK6lHU4NX?
zVV@=7ACVjw2iEy9GBY#zmh9`h5V{2@O<i3b>)0zW-Jd+HU%9He{GH$OHKnKBP3;|R
zl#{)Q=j!S|)@?Jsd|j)b!thrZ_$@6h0r*S+lQ5wCMMXtw&-+-Pv1v(3NxTwt_!IeC
z)qnkPJMX_#Lj=ju2X6O8`smnEKC0-U-riop;&H`_Td1L-LC5C`V6wEdl&Y$#7_6kE
zgsQ8nS<iO<M$L{}nE(<39Em^z`z|83tjzoQ8OagbyUvgAa5%{6bSj;wprC+iYinn>
zAT>3Wlgk@QCD&l<?ChjFGNx&p^>=DjM}MkJmH)*TUgAV?u{UuOLZHKjx&3dv?mvDP
zRg8)id?Xiqm0ZVX0@2aY6f9yZi%_?nrhXBAdrVA>?&F!c2SC6$7aTJe{=5VrZ&vxY
z<GIojve|5U@|^4kSU=g^#G}j^{jUjuuC6X!2PhI?Jiexhayr)QNhP7te?bHq8-E-1
z{eeI~+5DA;?|~<`I_SfrPPU6KiSB7hrnKZHYWpEpx0(4XtPp&alaIC4H~~3qyII2?
zCa<-tPL5{)dvXe2AOei@t*&SCct)x5dv(ysrQ6_xSbV-gzi-1vb&N;o-1#02&57$-
zNaz(X3co5<16i$B>h3<r4d!wUQh#D%0?+R(EmQaX!I|$um;M!u_l3+wL`2ZQfSY51
zv3m8YS?nMQ`&HcE@1lMCcC(K6`H>^e5T9@#r%1kiyF>rB+_h_OxHO>z_+71zPk#QE
zfIvLIbLeeah``rKSYnOe0bvPXk1i~|O-oY&C@EHf3ZS&o>1Hd3P5Efz6Mr1rVX@H~
z@2??orduFYxRzqJ`mh901vHiHp^S3%&L!d#94p<wAOiB&3gweBE|x%WEHKTsE`)$2
zf4cY?-aC<pA9`fL1mJ6o1s0mnjD%?gBmfO1D*zyFw)tdiY>Ynp{8Mg12&#al6wF{T
zB>+b-Re=Hja@EZ?=f7eIZXQ255yn`BX&U<<4`5sM7ksOx00000NkvXXu0mjfkbk^&

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley5.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley5.png
index 3dd89c377b1f9de66aa63f1176f7a98ef13819a5..856a947b0ca2836287f2a7c43757ffe4b0d194b5 100644
GIT binary patch
delta 1744
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

delta 1454
zcmV;f1yTCo4ZsVKB!3BTNLh0L01m_e01m_fl`9S#000GYNkl<Zc$}?QYfM~K5S|T7
zRb;_plcq{54K@8iEQ=|SSQ={s5uzq)gep?kwi3`pr1--JrY((V{n3J$Xd|(@7W?3#
zCI-PsjI|U60;M&O)PTDsRZ>KBSqdn~^?b8CxA*P?XwykH=YQODX1@96an8MKrE8Gb
z+hR0~p1&t7*Rvl=79}8{ki6U{slMTaX)RFvI{N-%WOM?Nk&!{5QMcYgxle4PhQ^aT
z!udj=AO;<yjT*J7E7L)`v$L}n69Gthc{z^>2?;zF78WuPWM*cDmMWqvwzajjJi6U(
z9xE#=bzKty*?#~L%#nc<`@M9wulKqLh%EvU%s>gs0HTLMIM8b$U=%n<CXj`Y8901%
zEEO9vAVd%WB01fDiZ<MnLg#-zyP$LEKv$wi{l&2a24A~o$IJvWtT*Y-!BF}EGB-EJ
zqc~r)W-T}Dx88sGIm@<;N6*Bcx{laDBx=DHUnT<WbASKnsS2#u^t3Of&pLL{C(e&4
zE-sc{9J)kV%Wb^A_b)HKml)3kL`Q5wVTvykf#Mktty&e2=vWbH0#hiL4gF#w;&T5=
zWf5wk971@m){HuX%I462%P1q-#uzAXdirJ>9(Gaj$faNc{?xJpq(Vi9Nc;NwEI8j=
z?%zr$>wk|^=F|*rs*I<K$}!qq`ZDe7ny1)~Dk^{d4Vs#ormE_L1l{jXeMh^zV-~yJ
zu8og-h(<h&4Id+c1aJu<`p(YNyok9d0RRz8WGkOTBen3{>-EyUG#gcQ5M91Js&uAJ
zSrF&I5=_Hf!)0X3Kwe%R&Ck!%nKM7}bN*LX=zrKF(g!~9(a}*_w^r4?e1*!whd#U9
zr+ED;0pAGcz&N<khmo0?Nt&k7z`%vz5+F78_4PbQt-$m^@~D30s_yo6e%m)RF>xPt
zc6Crr_QSka-*BAL(|l`wUB0f>Pht2n4E(mXHWNM*z$O-u{-UBHRr3L!``5Ijq$G|6
z9e@6G{&sag+(ngdy{TtI1kTY1Zudp{?ATF0s_3Eq{(iyYarNqz)Y#al<8ubESz203
z)z#GuR#H+zH8nLn&vyP!t&TgG02~4wjz9u+7m>BB%m?`y&SBfX(TDGFILPUAsyR_X
zK>^j()m<$?YHBJwmp7Dhu3@dayPNLLn181o)<39S9jP*v{#RdljUC0t+|Er1!5nMY
zJMhlizT<aM*(h7VhjYPK&UJhy5ET_gfg)>V5$d+n)Gxxf9vvO6>v;V400<cO0&Nz;
zUz7mk-D+PsUMejio6V*>&&hs>=Pj+xJj$L?|Ar9g>FLqu0EGjLC)PJpPS<ALsed>$
z>Mw~vQ&W>(9|-0xtzT>S9(ZQEgFZd#<aL>gqfKqel$P8~9Y4nCYoYWNRuI1O$;aAi
z+<<&!TcM$b$s6pdlj9h`o}9uLhyde!tLvFOo(XFDK^=5*>1)t|t;J&D`2$<Fs$)D(
z=g#+OXii+uLPF1gQTSD<8pvw3Qh#snIc_kQYnT!f6L^1jX_>n35Ba|fUHVrr-WReL
z5fMQ{LvFSO#yVV`M5foUNZ7C9!9f@8-@ljVc%L6R;tbLW_i+m6J9j$tZ_7P<D#E!5
zCcy7%b$s&kx0wv_{K4V(X(<9-BVn;Meg}jlfEry`ey5hE43JVpfeawE(tqipBFCE2
z(L^WEw##Cp_1@ot>_V16vT!3MRP<p9APZ<JsiBN=^)4i$6KE^lza#?k*9+;BG+rx#
zKwDsjDqRo(asGVq3tT&q#~yur$poNlv;`KLFcgW984v?BltchP+-!@<<m4oM@#W{-
zgb-u_O(~dx5|RKE!BiQV{wL+Cn=S0WViDYaaw3ej3Nxhb|Ka6iRoszV)Bpeg07*qo
IM6N<$g4uSzVE_OC

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley6.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley6.png
index 857db6f8032dc76704c32cd67209c5c979529da0..17cfde1d31947f1d772da5b00d03374513219f64 100644
GIT binary patch
delta 1744
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

delta 1457
zcmV;i1y1_l4Z{nNB!3BTNLh0L01m_e01m_fl`9S#000GbNkl<Zc$}?QeN2^Q6hC+O
zVn$p@a;5nZ4x4|l1e(BBxXj^#Ra>>dBJ`$?fo&1eAAQhNT$KHx5N+jRnODh=3s_qt
zsaT6d3K)ns*lf_fFpEh<T`mFz@%H@A<-ET4ix217?w;p;o_}+G=XXAy=Y6k*79de~
zMrs({e~*}MW<QwBNkBj$S((p~qx!VZn!n8G==*b#(Fufwg$00y-*G!-KD(8wYtHZp
z=d*!=7<7y_YShNAj|b>ZPEMM92tbO9i+PNRiQzFfH<y7R6B83OUlCogt*or%(dBaS
zSXx@D>-rFo4Sx{992rPVc#tl3cH9&Ju|*()=`R5pK=d#O1-cLdMuBr=0$B)}fg_8f
zDBq9)A%X}H$@!*6TK_;IUH<vvtj?hWU5Os`7snD9eC?VX@+FXJxlMNthSCp^si`R*
z#rf*hYq(**_591vTda$CbdUV0>xd0Rq84oN<wKxp>VF?SRsQuFANQv8McWQKX8)9;
zqoe5M-mA1_iIvy){pFz#VplQ&(Gi<qnBvQaK>mcAmM>q4=vWbH0#hg#_5R{R#OeB#
zip*-F971@m){Htm%I5HYizqe1$`~kbO3Fs+?{`xEz|}wkGpS_-NQsILk#=@=nsB~1
zJ+hh3IDbyj?#9J*_csw#QaVI?3SXuDt<x0MTt>xjzC~kW<5X6Dh@ks@<9D>nGh|9g
zNYI9d-9!U!#)gjpe*(CK5PeI_d0xa^lmLK;C9=um+liK)<+;b>q5a8LDr+XXc5P7U
zjQeCkoC8ZR4RZ~bkxvG)va)D;dYUd=_=%shzkj?=C!dr)@PhaC_0fuDs_w;0RTe(>
z+GRdZgM&r_-Vx4$acF}VBP}hBG)<%K?kj;MKx!Ng2hUL}Fg+MQs9(9NyS<&?@HLH$
zJVY(6&6JV;1n)VjPf<#;cWp+OuWR*F7~Tv6zoDVQ2cHRG6AMUxUS6K6c{k5z*0i{|
zIDd`=9sWZ0Hg!MTN2Tw)&BlmY1kTY1E>|CYcJc%tRrF9-SC?S%xN6lsR8v!<<8ubE
zSy)&|<>loJR!~qt6%`dcPq+V0^|pJN02~4wjz9u+7m>9sX^-(UoWr(jgBRasvyt6y
zS97AAoE)mEs=85vq@*NvE^jF1T*F#hTYnqfpE^xDEPqgwI#NX{{jb0F20Mz1yo;L<
zf;rZ(cksP;y~nRl*(h7VhjYPK&UJhy5FQ>*{vvBdW_8<X>Sy+@M?^&EI_{Z!00fMC
z{x-AW&q)CCez~_CuM`%L)oRt9XQV&Q^K<oeJj$L?|CSJFZ*SM<0EGjLr`Od{Mt|!@
z-KjV<>d%WnZEdYy9|-2>>c7(PJ+OV7jgFtN^SaE%(Zdb#lpJ42%|Ax!Yr*stRsg>8
z$;aAa+<<&yU8<pm@#_;*Cr2|tLVO}$AOei@t*&QsyGN+@2X)ZNsjoo?wkDH_=Z|jM
ztd8+8UAo+<p*e9q3kf{~M&VbbYJVV$#X=n&m$<>4&VGuGjp6-0g+=PVKRokY=+wW0
z@xG8fv)N3&y)L!|#@e-OZeaUK$gkp_9w!|*u#e|>pC3JH56}tqaSG=<ciQxC%e{L`
zLb(Yf!0&2xe6q8*`WWK*qaz>Ed<42i!eVRu4hTsAHM+87g_f)gkWxf}41XZC(&@n>
z$C}d7M91H@)nui0p5FrOf|fwCa4RKP^dSi#3ur2-p^S3%&L*PcZ!6tDF9Pz{3+a<I
zE|h@3Eii+XE`WeI-<|&w*G}Z=r=FQN0q7cSfrTavMj~hi!~hK?5daW3+gvg_I!d2^
zah979f-ImZ1=C-G5`ZF@Dk?*tf4S;r3;C~D1h=1@2&1jS3~Kv7T3}>SKypc000000
LNkvXXu0mjfAw|S0

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley7.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley7.png
index ff13a670af2f3d6bc4e1357ae0eba1e1e18e5317..db83f254bfdbc78000c79aed30704cfc280e0134 100644
GIT binary patch
delta 1750
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

delta 1455
zcmV;g1yK6t4Z#bLB!3BTNLh0L01m_e01m_fl`9S#000GZNkl<Zc$}?QZ%mbC6hC)d
z%!ms~PG_mXu=#-{&;+)^Weygs+NuRM!ft8|Y>SXS^oJ(mx@8{{vaKwZd6P^Ls;vkt
z)*^ud2BHl%8+4ITOd{%XF(`<)=XWmW^?mOj{y5Ke_nh~6&VTux-#O2Dp7*_0T7pF0
z9HC)!|21y8mi0igAOQh|WM@52)u&II=6q$&Mqgiuj7}glG}I3??4}zj>#^;0y5<y*
z2tFSuh{49_qekuTE0cb<)6>%y69Gs`NePe9(a}8S<>fIDWNK=P7As;azLk}gJPr&D
z@aS+jbXyYvS$_Z#=%_$q!d-N(yX%?=h%XWmOkeS<0J4WeFwmtCFbaaB5~xDJ3LIG;
zNd<-q2oYp}OwKkp(WW~S>B3Lv<_!)T*h==;e+ev!A=d8cQ8R&5>kWEvFqD3P%*@R2
zD8bjSkKu;>#`7;fr`wkC=pO$=w-FzRWG&bd%S51g=6@f(RKEK)Iq5CwQ}&&7%=sZj
zMMcuH{X>+#!p8HZe|qTc*tJYRY{VxJro=K4D4257nl)>Y9UG!dU<%{n{+~@mTm!#Q
zafnh>KnUw<&S=x8d=CA$j8emGjDhV<N!db!gDxr<9`YwJS6ViJl&S2HX?J(G1?PL~
zz1!$i^?xU{r)fE@`Z}D-9HX?i=y}@TK1-3U<y2a-l3GfJ*ao)WHGNCFJ)@R{gamDD
z%uO`xW^BY5_9cKz2-&x_o#jdBVgvwWESZhJmqn{$>RI=AJhVUAM&+$uu+>kiCOdIl
zx0T?)5=?`x;W9E+AUivoW@l%qrR7I{&iUdBoqu>p`oMdejf{-Yh8W_E%N*}}dqC;3
zX0%0cV7$56i;<R=Mw+HkZ|_C_EkJ3itE*YZUV-Vs_!0feRo(6F{KhjhK7Kc~wYO4c
z#)IDNa(qcC$(TDMwtQWypTh7~82F8ijV631fJIE8{Q3F$YR`LFpPSR-;^H_HbodiF
zJAc&ua636(d)1UN1cXXnenlO*OZ2hY1{_uNP)|>fVDY$a-D;|-snPMd0$406Dx!*t
z3I;1IETqGS53`=({EZsyw=w|)1ULeL#O2FZ3CLV}+Wq{D;PCC)?8Ud+?c{Vil}?nK
zn@d$yRadtlDJhAA%Nt4s*D%-7(Lr~l&VSNQ>+jU8j#RNK|BElY#DO9sZs8_`K*t=`
z4!-fa_xN2>KFU|{5nS+9a2=lsgoTBXugF|+h`Q}G^$YRNhlhvjHtxB500fL{zCQEe
zFGv9LR)u#vo+~OOo6V*N&&+s$_4<Z79%apFe_aT4c6RDIKoJ1r$&GcC*}g>&Dt`fu
z_KPA=TU)E|4+MIB!&e%<2cFzvr;m<1d0uo0bWdYECCArM>kkq7Tp)Xe<%h3g^0BrW
z7a$+lR%+P8_)Q6_lcN|QAwH2W5CO*dR@XDR-Q!gIy*lXR(&u0UUyH@U`h8ossbf4w
z=Pz_?Xii+uLPD>AQTSD<8pvw3Qh!(1d2TS5Ymj1Nqj`OAQ8ATQ9Gd$sbm?Egcwfj`
zNJt3v_YbfyFgD=oBr?5*MS^}6_w~8xz=2ZM@jgF#)ahpv?Bf){ckQz4-<JFKl?4mq
zPk`Um>iFd3Y&SXL`Q0P$&|(C(M#AE2{0<080DE+C#cf)$azIIu1uB5jN`I#Z${cgb
zMiU!f-*$_QHhO;b^9#5IQiba&fwB)u098O!$sWomSMPixHom^n{fi<Xf4xvXDdSQJ
z`1%4f(AN18kl=d?p5eU{dF0_o7fk@RMqgl|2?LP`SOIZBLrDez#Lc#lOiWDBXP<w{
zO$b31(3FDdD**|>5KNV$=_p^Wy4iyMD;B}+Cnv(_t1tul{tqCAT^8F!zLEd{002ov
JPDHLkV1ghb$&mm6

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley8.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley8.png
index 3dbd188439fc316732bc534ef4dca3c7c4025587..a7d83f51eb5d62bcc0464768e50dd4476a2e19a0 100644
GIT binary patch
delta 1747
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

delta 1454
zcmV;f1yTCr4ZsVKB!3BTNLh0L01m_e01m_fl`9S#000GYNkl<Zc$}?QeN2^Q6hC)d
z%!ms~&St5>u=xi|pb2b+(;O76+NuRM!fxsq*cKuE(FaY$b<6%p$hNdt<_+=#q1uYT
zVl5IWU?AFHvq2Y`#U!FG7lVR$dw%C~Uf=hA@Zmh$-E-dOIe+JOe&;;rdEWP0X%P~6
zYlMc;{nwb~de#HUyaWUklAZMw)towEn)8)e8-0B~GCG0K&`>|nuv>1XtS7h9soIk~
zBKTaOAO;(wj~cbVuTJ>cPEAc&Oave$B_%vYM@RFRmzT#tkjcqOTBwMv_*Pa{@;ERs
zz@x+A&}~fwWPbrfprZnb3HQ>u?yl=1AihXMFnz_Z0>~Z?!9W*7z$gfgN}vh>D{y#e
zBo!DcAViP>GC9-IOzZDSqzgZtn=?3UU@O^U|0S>_hFCkNM$80KtvBhx!BF}EGCe)b
zqXb{GCWagK8_&P|oNimfqkHTR-9~&MlC@w<EE9p2>3@IpQu*%J#Duq`&)T=sQRhb#
z6%|R(_g|*;Wj3BK{nJD5#;#%lVk16*FeR3WK*6M&R<2xy?AQ=x0#g_l_y24n;u`pc
zibIs50zz0<b4Hs!<#XV_C6pR&V+?F>O3FqW9CT5^&}DxDv!!JNNSVqGnRa(~TX4QN
zZ`wj9Yk!W@uI8n*;_GlKbBxgLq8Djz`wT_4mQ!iTavFYcoDOX|PO$y1`CHoQ8L=cJ
zBxs|fZlWPKV<X0pF9BRa$iA)Z3{OHABLE;{$!zTXELsuMz`Dodp}omADsLryji^eu
zmEgb<OoOiBGBQ;lJ3E_ZW@hN@*&q2i=ZmX!?0-?|1Mh7%JUmQmV~8^@b9~_K0j0~D
z(H6mh@%9EUMp{}LX_`j8y%+tr0Hvv^sbL*^1*ZGshxIF0b+@<kn@-c%*nQO2-b$Gn
zk9fDs@g=1sWA3!r@^!6#3d37r;5Rijnedqa7BPYH=jZ3EJ?~|Gc20|ni{nht;ZNsm
zQ-AlvUF3M<byLO=5Gr}~HFe}J(I>~M_^6_XdU|>Ui^tWgZ>QSYS{<J&fW@MsBC4pU
zV6ei%LOOWxAnO^<->A`k2NOU*fFlq{T)A?MfXt<*J;cul4&R;)UVOXVPEMy&=|s7?
zxl~<UeQgVpl9D*MyrEQZ4RakG9dvi<41aC6{!T6GNENH{zx>iG94Ip4Hf}-)bj)FG
z|66Z*kKZNbqkIJ)!3AFh*YTM^SXdbOip&*<sM}6czYy<yczC#O<DR_-K)|@>>oXVr
zyaXWcRCu@Jg`z^T*=&07%#4RwZ)mLNQPzz1H-tcEXQ!?M6ag@vSXWP(?Hl!=5`WNW
zzaRp2b#?mwK%h4?ex>1i;F)c9`nbx;^P)?j`<vn^Ili7+e~8fM0@*7pKYSIFkG0jf
z0Qu0iT*Ds5uTM~&9K`?$@rita2r$mKx}M4H9;3SN)j=nhJ_j54S}YdUAK1J_9ph0t
zf1z7LbK-gy5_$!U!mmozKvt`jx_`RPbA!2DgA^MZ&Fj01imANf!0dOSOaBVS`$E=2
zLPDs&e}H{~u@+Y+k?A!o67;LMug^vM_LZ`Z_xX_{PCuJqAEyYuV~1V;w%oI)ELa$S
z0{pI4$0sLetH}}1hYr6-3lZ2F35&1sJ0K_l?9s(#cWTMX0VPEir~pbUoqrxEbId6l
zO>BI9+buR)=lRvoFW?qP6>g*i%04IoQ~^yTdnlt^y>p4!`1(rsFNlEr^+NfijEg1U
z>kG_4TjxhWg6}GLj`vRF@yDK6Fag*aeSw803`8Pe1;hajB^dw^H`{zNK0Z#Lef}vo
zAp})GQwpZ91S9}MFjbDGe<!)>W()eSSOmA9oCu?@!VKv9KYuV>^ABChGXMYp07*qo
IM6N<$f;-N=xBvhE

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley9.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley9.png
index 0dfe4e1fc940a4710503cb2858444c4993c07302..3664b8ae9a2c4e4c38f41f7941b9b19cfa38e153 100644
GIT binary patch
delta 1750
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

delta 1462
zcmV;n1xfnm4af_SB!3BTNLh0L01m_e01m_fl`9S#000GgNkl<Zc$}?QYfM~K5S|T7
zt;m94Q&Vj#gf{#jmc<lEl%}--ZDWj&2sKDu+lD|*#4Y~tfhnaCtv@V?iLDZ=E7%7G
zHBp2rF~w382$a@9QUfj}C@CVkEEN>wdcIladiTYn=_H#o_kWz3Z@!r`=iIwyT7pF0
z8lhoy{W)&Bp7lVoAOQh|WMw`{HK$K{&H2iljlRAR8J$3AXs91(*ey3x<`X;UbnPh~
z5qv&S5QB};M~&KF*CzdJr>Cb)UIZXTMMXTu#KiEJo14o(kg2IDTC9kz_*Pa{@;ERs
zz+-7?sc!2<Kz|lM1Uf2^WW9$jba!1B0r5p5g6S)M6+rfI2nM<o0!Be_R0359Sb?L<
zBPrid0U?46kjc50X4-If5?%W7!o0y@16#=+`!9hdF~r(4J?c#$&3uy{91Nu&ATu*F
zJWBAjYh$@#zj6P=&l#3wJi5kz*KNcHB3TQz#PTB0GJo^8UMk=Hnw<2M^cmYO`pEGi
zMMp={bNxe<5oO`|;y>K<PTXoHAU5I?2vcHt5y+o%(W+IeksTYNOkfJ*!v3GUh&Ts+
zros@VsDKdG)tu3$Px&1FcNwLHTNne|o0__b1_zy#KRo15V6L=m04Y(~A=B>eZWGS;
zmd#t~RDaD0+S|OGR(>5$C8eXZ&;9}(XrHCX)-ozCT0tWZOwf_dCkVD@o4=(!?opG~
zYSqTZTtvez#zu@`Ujn#<kbPU*Ii7?rMgTy@lG*rsnY1#tfpxdrO$SmeRMtxR8c~&Q
zE5U&!m<C<LW#m<XtgI}Wot>rg=YQbm>@Tj-@qdS<4?MTo$jAt-izUvur1X7H4=7#M
zjJ604jJGy=Fw)c0Nz*jy?Y->31t?8TO%3bVD=<BjIHF&<s=Ga%-*kq?$M2=K_Es7y
zTu-^Z@ruZol$wIMGh)lvwfZRxPlbWs)YRmK&jhfD36wuCFHh}xFY9x2T0%ksXMzrY
zDt~*Yx*zVM($`;O=SR*)A#c_}sOXhf)seeGpB%5^qlzBt>FE(H9@nh7ooZ`qb$qS>
z7VUOBm6w+@SV2JnRa8{4zRmF~HQMfA0w^)S5eOu%ULDa(DRUX=5ArjD!?$On2j6D1
zk;CCoI#Ete4pmoI|Gx#v$;ljC-cTyIhJU$^jt*L%HcPwAzfp@iQiZDgFTMCO2a1fi
zjhhex9dlSa^yV9$<99{*C||)xaKTr>b$lie78XXnB6Ecy>bBF=FT^t+9v-gSxaRHw
z5HPO!`pk#FAOXnR<(}<$-d;c!i$xE<ecMB<H#FAsC~HRh8$zJ7vs2driU1f-#(&q-
z_V!JBPzh+XUlf75x;lM-AkZ5cztZqM@bpd_eO%?>dC?`%eNBm!l2}iz-$&?kf$SBQ
zAHIso$J%UMfP7$Cp<xdbH&|6CM>BvmF^Mk_0mk`O*E6|X<5c&ZI_Tuo=U@Y0lgY&T
z{ad!GV?0I|FLi5ZPF&AILa%^P_<vQY8pv!mQ&-nTZZM~FkmBNEczvI}kjlyr&wUp<
z^{-&OFJvtwB!v3=2iO-F>u_}vdA){3f_@eE^*QO_!D80&K0kKM;b#-<;}pSn@3!gR
zmizaY1PkL&fZx^X_+)4A@N&fSk)!X@Vg$BE!s2WE4hTvBdvrPKPAx?_pns&u0u?}M
zrPBjtjyYwciH)ysyU9ZF?qB@;0&am+;YLcJ?1K_O70^_&hce35JD-S+udj6fq6o-e
zFO*NpxKskZzQ7E$b$$dS_}=_ydGACXd-U-|6M(JJ7g%V*KqLZIKpfCek^um5vn?bO
z6BG2==bv&DLQn-XrC|C>KraF?1XJbc^)FZ5Y(f7Oi{SQ?6JhjKm;rtN1MB!+KWLv1
Qh5!Hn07*qoM6N<$f>a*A7ytkO

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png
index 531ae1d850c53cd6db7457e5dadce4f32df8d0b8..54af02f87328ee33990add59142602eff9295ec3 100644
GIT binary patch
delta 1514
zcmV<G1r_>?3j7O@B!2;OQb$4nuFf3k000HHNkl<ZScScp-%lG?7RNufsSqv+#6T<(
zH&|7J8M$)&(xx;;Y$ASb>y&BJl#R$sUh-BcT2;zJpHm5`Y9sYusI@qvksHXWkt;S?
z+NIkH$w9ST1Bx6v2r*!@B#w!9NoF6Mdo|;+OW21!FXOrQoPY26-tRqg?=kGb6eVOR
zO33(M=c`%W^CT6&-+Jo}Zrqr{>pfI8Nj|^9yYEH-<a|0k?|3c(s(Q`_no1=(apE|W
zlQ%hi`W+I9X?lBmxN~QQ`uci{Z>dzGx3`BxVw%3blQL#!=RZa;7`7#j$N%E65C8~=
z0|5B_egI}??|(2kc@u!gj~`o}03J`%vz2dE^%1eEItV~En*|`5%-9tGh(==ojE;^F
zjmFr&zlp<#y`<9%Ch(F>E)sh@O{}i!a!&XvN+&BTYh1Z9CNTlbidYDYj*j5>`?+#u
z%qCgo>hk%mT@|QY+$W!0CY#M#6tEPCs-81asiY(lkAL4Hl}d8>uoq2RqrLqg3k!?1
zw;!}57DQH8bviqbvbw6{^LbfWStA$>qpE{svst3i7{Opz?mvLDlBtkN>=(e!&JF;-
z{k9?#3kAeh2r|M)!~in+=;(+|85;rN7>iw(W82$hNr#8ukt;SQ7Vl;s5d#p5UANSL
z*<=kUN`J^G77KX2?Zjf&NvG!>>GZsu6QCYXE2Yv?00Mzm0noJj&xp0k#Kq#jSzJsz
z78ldcNMLxq?G%dz6eVPc^TASt#o{B}?ib1BHf&6T!2r|Kf9L%9KjC&akVwoBy!%hS
z&~*m-Pt)JuL$SEcS6_`23<g+OxM#y~yI-VOe1BwDKv6=*OD}b>uux{(*{J{+=2J|p
zOxJZ98X9ciYil~&+uIgjv%0nLEef1Cah#`5pOVWJYzYLoAmH~OBE@kA0Kfkbx^5=0
zZHou!?tTrY)5-e!1FHg1mj8zz$_#zJBbLB)dfp-GAesDymtXGS?%jD#p8Nv<H*QRF
z?0;B@d-uw<u(7dey90{FM^XVZzEe>`MoUX8nzl?NGK9}}1Wj9}rKOe1n{8m=6c;aE
zz%X8rYUsKSfMLAA#fujh7&v7iZ^rleju43qS@4|znzqc@v+prA^(~sV%$YO8Xxg$(
zLS5HMBxdOE?*YpDzP45-(BI!fA~7QgnSafUIW_eyXV1PT@g0g1G7cPQWOK71Wvez;
zPIB5fb?Qy7Ui}h4-iW1A`3|^r=_976|3M-#DPwlSuLE$q-E3}J3r~#s{jV6|@M{2M
zGASAx2W0ZC2RQ(m_P0<fm1t~iMAPoet38?gnceUufl4!viR*N1EXBTk`v7n{U4Q&>
zsC?@E_+vSdm=peH0=4j+&qH8tZjQORIRK*3uNfQr6oB!-O}4fkJR|oh(dgGU|K0HA
z=T-UHi1EI@Uanm$19x}#lF6j-`8v?F`*=J}^c|bw+TTKQED#7XJ9`I!4?jG^ci)wN
z*TS#buPI8%XlrZ6<MA*%`x9MVM}IL4gG^=#kEd0h3ochV{K*qTj^*<k1Ol(%a5(t&
z*G0O!Unif>v%dbXs{NtuHWXG@SI5#)mbSKo<Z@fMTrL_K+>DI8FE5iPPYg@)k&*Xl
zXmI0lxya?VXlpyj(o&YXy4t;O%^6+K^YO=*fbxAlF%h@<)arQG*Ejj#1AkTamY;og
zb?*csks;#oTbB3n@rjy1m9fcWMz&s&$PnLr^Vh1rHG6hdJ!gc&0sMZy?Bi5*kg>7P
zYpz^TLdNCGe<mKkMP;nH4KrKK8u)+N?-CGuD4q`=KHL>h_*BO3iGcV<MPn+Sdm&I6
zTkAigtq6r<S67FnkeZw8pJSUqb922VwyUdyOeSUN1%*{rV0id##>Xd6)j`7H0O4?e
z+qb``P_TDOl~yPexPAM38K<g)jE_$+Jp6W5e_Lgmk7l!M=J((G3icZNUx%_Vir;T+
Q2><{907*qoM6N<$g8Jv`!T<mO

delta 1272
zcmV<U1PA;43ycboB!3BTNLh0L01m_e01m_fl`9S#000EONkl<Zc$~FYT})g>6g~tn
z?#f^A!8EaTu}yrk3nr9A(pVd`CHkO7wu;oXO$h1(ZuP+*OpT5B^PpXMP!p2kTD0u~
z+80u*o7!5bQUWYBA<=-l5|gGRk}e>NfpDGg$Qke7F1togvVWPmXU;j_H{Z;i*;_<;
zSb0U6fi`u0zTn@CyID>Iq;R0=F^cw`)X#3V9+NW>3xVR|Vn^YXl@%`1^yoeY-*bN>
zo&D+zm6zRYiA&A@&SQu{Y+wJW4Qo0Gz&biQxb^vb+&&j-=K{;i%Vch0m6he(&dsIB
zEe1-xAMWCQGJl!mwzIP{vjXM-5JA7bzMjV8W2WMNYH$HY9}38r#MV^bMXjx^x|W-{
zDuCG|(QNkF0em9`%#-Tw?q(ITDuA_70fwCjRJi!v1=@aR4NY7bqblF+7GMy;4`YZy
zEM`A6G^BxLLgw{%RY1VORQAK_>MFNaejIlIo1e`wl7Az!&a@1!1nddv^xu*`6+A#6
zM|vE<@{D~TF_M!F+(7`Z%%)AZ(v~e%oFH;dP5*3|i6oN0Sc(8xOkz}y&d0LW)$OF2
znFL+E`kRsUH3T>U?Y8Tl-E=B?f)0gVAg|X$oo~KD2X45Lj?T_fMMW8Pyz(k7Ev4yb
z_+5@Ye}CbeB_B0WTM=+qKxRKYe375gH?x(Q%_=~T$KxP)?b@u0Nn2Df*99<s_PP!Q
z0)YUnt*xmY{DZ|W#f3ni>2d1mJ3&2a_UOa^4}r9UU_(O#8HPcVlRvpD0E0x)Xq5X{
zGm#5ty4u~m55A6_rMew=)9~d>)VTLS9*-&_;(vqTO)%dBs2hvL9CbAT$b<pN-`3Vf
z@%SY7*L_;9Cz|)Gv*9*ge^EmW;MfPr<gfJUXUEB27wzWFw@`n7zoo8L070Qph{EA8
zKexBHQ&(4)MJ@oMIDkL`>n<j~`x^FGa!@xI3{oT#QGKG8mKN&m?R73eZEY=s%WM_6
z0e|1f$cSDBCBN~~i!U<}Zo`Fz1s+2mK8(Hn&RZ7wQ3K#oSAkpVY64!bm+U4!^Zj2^
zQliJ@{g<m*#w32}k95|$ITMg8Rb9<gT3V{X8}~lI{WD(<aw}sJkMsXOAuu{Rs(l~<
z0JJCX7^KF_J2fbL_V}C$3=9ldZYu9h9)I@1J~<xY_R0N0?h8<T%uhS~gLLWpGVPNX
zb6wO*U0>m6U?`tn(jsx18Db6n+pE<jQ%T>PKS$O68a_m%Fg6)tQmJ_w_|~sH3GG7+
zatjIyC_XVx_wL%QF0DCrRmTn4oLTPzJy29cV`CG%!4ioX+Pc-p{zIYX)p`HkdVjHm
z{__d&^)V_eETrk_B<G^Wwry3E5hv5Y)Kr3w9C?lVxYLgvi#TF3{p$tz!Gl5lzw+?m
z*YhXP+`P|{i02PK`hapV#F`0b%XKAynW+Sp6tjQ=kXClO+sxs^(nyRwH<Ma<eHr~9
zmX(04p|o=JW;2Pg=jKH~j#9`cGI8chz@E#mt;;ev2nhHyPe03RC-(3|kK{}MvF2RV
z!X|Vh;i`ZnU_;3aP!OlwMz*-PNMD@(oHrp1DqvGeO}n`gKp>dPcOeYV>Xgg)RV;>+
iP~Hf0F5W7)_`d-EN+rrTkEKKa0000<MNUMnLSTY-pl<g7

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png
index 9c2eb36cdae70645290f89cfdcf97642092dd563..70c2ab6ba371f74e94096afb0e5c8367ee92415c 100644
GIT binary patch
delta 765
zcmV<Z0s{Td1(gPnB!2;OQb$4nuFf3k0008dNkl<ZScUDDO-mb56owx^f{kc}Acknb
zAjU8#aZ_qBhSboJidDB=xN+m(sDD84CuGq@=~CO(KrD45EnS#RXa)qURx;?o7|4fT
zw~OIUjo3J&Ep*`nVKSU^&wKLTleq&PP?We(l(@KS{3cr6h=0oO6BEx^Tl+vT*n6Xh
zX&x~*_X@y?=kvLyM)jK;1*1_#Bobqo<`Id+7@C$Pl}ZB8*49?{0Z65iXj+!5Yobx5
zp(70)(Di)N$%!QZs?{o2uK<BS7XYSdaZ}Fv`bUbzpZ9Y>QHHJ+uQ}qTX<?d{(};}8
zTtykWp95F9{(tMP3jfIgH#D>dY!~|ag6!`X359wn6m&wNo;qRK$l;;E&`^}aLxXTQ
z$iYDoUC%evaOJ@H`8fc4dj~fP%X^vA+Uj%G+(yG0kW?zRrStPMj_~yvkj=;(x#r#t
z=z6}XTt0P*1_IsGYM0b%m&9Tt#9|}PeIU^72$##Jw}09X9)@suI7T-6nT3Vdw72`w
zv`rF;CoF%tL=A(gCMlOIynXwQ;o%sC!j7xDuC@SvTWS~v#i9W~sZ?V5sa>L2G%yUK
zF4qmN9jH_)P6K|wpGc&aT<$vnkw`CwVK_PR>V{kQNTMiladvhFz`#I1+uJ!NC!Yhb
zvGIw~(SJBQJG%h*e7;-H0Ez1@0GOIev$V8`5I(?mL)tEckENwWrl!(fO1j?yDX8l|
zP}L;4+&5<yz#c+P+oY@Ok*5Y+JCM)knk=hIIz7(H$|_(FVX0ICU}a^Mbb1`is=Bt{
zQv;HYjt;;+j;)hptdnEsIF>Olc-jJh&dyE%ns%F8n0{$L^|rRY*2VrQsyZt&nT&`;
z1_f^(i|OeZ5s3_nOeP~#b=K4C7<l*_UT<Q5f0sa@ix;Dtyx)iu4)>#J>z?b~sR6K`
v3oR}7@{0@MY4H9UcX<nb;DHAo`0w}y9UERgF229600000NkvXXu0mjfN)d3`

delta 695
zcmV;o0!aOp2G0eMB!3BTNLh0L01m_e01m_fl`9S#0007kNkl<Zc%1E)&1(}u7{(vL
zOG-YZ{sBfWo;21&1Vt24+n`5NzYz5w(257Ydg#H=gQR*CMMbo2qQ_9HMXXB199pe6
zQ5%m9Slk4<5rXSJV<z2AOLlg%#Y<iYGyA^p%=4RfW;44IE`KbtDr~UTew9{ui7#c2
z0CG}VZ}Je*nPHo+(P}yMxD!lM0171!97N{n2-s4*dv5|`FGdjwueRlCrJo|k9P1df
zHJU**1>itVz<#AtfwiS|c1A=yH>Y8#9742Qfv!!PG4*lMGWqYixD;le6_7ERTN~@W
z0#<8W9mSn0pnqbHTfh}?C2!wNVB>}^e43ub+UPo)FhTfZj5*Aem1}7Wq*bd`(N2G!
zS|n_Jw&ut&PNoE)>;Fo6;`m8CczA!2uzcn@kU4Tp%K$9l*Kc18E67aYyFJGgZiF?*
zDE%QRAHtnGc3~tvgfo3-(a{mWm8+LUe<1${kz5LwE`Ro8eqKjv@TSOpJ@HCuUS$Be
zvSP7_Kp-Ic<#HJV@eoouV0N}>=IFLup8<3mKyUIe?%um2eC*S|0HFH|z`Zn2w>Sqc
z$H%ZGz7-$xIV5`ai+DOSRQJ*NCa7LWu5QDlM~)#HT_g6N##KwBIL|?$@B@#ZJW`(1
z6#xY}Ie&!+!F`t|eS3CyyO~lQfF(7{Z=64OK?w0S<RPT7Pak8~Z(Q^Dd!W&R!QcW^
z?fsWmvo*GC0HIK*E}rPwC;Fq$v$oi>0kE{E`%W3R25-Y`F}yyDM1H%7NuQhYy9TgA
zu)l3QhIlNC-21R6aZdmef*&iIR>HG4G1D{SNif_qfP^rGU4I4p2GFXoF93d68=wu)
d2Kes)e*t(ohjb%(B+38)002ovPDHLkV1fs}Jgoo#

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png
index de4a5f8a77dc9b5e54baacc1b700732883bbd2fc..323b38328402e377e282c9a63be0e925696b6ba3 100644
GIT binary patch
delta 765
zcmV<Z0s{Tc1(gPnB!2;OQb$4nuFf3k0008dNkl<ZScUDDO-mb56owx^f{kc}Acknb
zAjU8#aZ_qBhSboJidDB=xN+m(sDD84CuGq@=~CO(KrD45EnS#RXa)qURx;?o7|4fT
zw~OIUjo3J&Ep*`nVKSU^&wKLTleq&AJm3LEi3>%Ei@U~eqJPzmsQf-L@r<>#4+Mj~
zH;S0%5p#2|0GxO}pKEGVzqwH`8dXFhF@|X#kw}c8X<1UKBmiw~ZFL`jR4R$4Wx2X0
z8dVxP($E22&o`Z%SOTD0t#b7W5D0VuV44;;<*cuNq*(lUKL-?L=vwibBW{`&rfE5i
z$e7Gkl%e}MaDSESzwWB=pB!*QLwmq>p|3B<{(g~AsE0y9Clu<b6PAq}9vTb{ML9e)
z2#13l92C*@d_xUa4xFE#1F*MuaHFuimpQGiK4;BsG@JoRrD9t;KR@FLU!MWljLea1
z?%jZ{=bOsqQ>SPk&`qs&Nv(ECEH*+cHsag|0^N>qxqp0mtNq|%2#1GbWV4@HSa?l)
zyB|&4B$0T+@|R20FsN#ha=F6Wx9=Dpj!`J=xT@=F3*fh<hG9@F8UU0^C6=GsC5lA@
z!!YV{-Qe1RN~Pj7;P?B9M0&~Pz5@`6^kNu>lOwNgxOI;tiV_!RXJ-Hm4D_?TonvzH
zIRG0QpMMw~jkB|}3xLn(yY&o^xZVPQsi`zeON$8M18g^>?LzoiT3TdkD($7D`z?@y
zy8Z)IO_Ixfb7leTA=I=@y1E{DYQVJv`FyU)vZ|!h<E*T#0`?G=N+keRR#r);$FZ!c
zYx_MlAnEAn0PN$~IyuHVId+a?8S{dtEdc23>~;j8xw(bum-bU{YwK%W?4P2lvm%qp
zh)85m@aD0Yo}Lkr$e_q%GD1~nJ-v>Bhri+VCieGt2?V-$F}lh7jX2?OKbp4gx!#=`
v0Q<Sn(qb>axDcKO@2_!}x8MgJ`0w}y9|c}M5{!Cc00000NkvXXu0mjfMr>_h

delta 694
zcmV;n0!jUq2F?YLB!3BTNLh0L01m_e01m_fl`9S#0007jNkl<Zc%1E)&1(}u7{(vL
zOG-YZ{sBfWo;21&1Vt>Own2}kej(~VpcN0*>Y)ce50dIp6cy37i5^3(7O^T3bLf}1
zqBb5Iu(%0yBLvrZ#!R}KO0v7zQiQ$`X7+vGnddj}%w~2iR)5%50sb$5(7K?(R{L34
z<0kG3Kut>PiXTNXHE8kGS|z6%Zv;~pfI{)ZN053x1hy3KI1t0gt6_wK>n*uj;fIVd
z$2>-~Mm>nS0365(*e{hzFt@bU){t!H=QaE*hY(Fypl#cBOiYfOCjV6xSHkSG0xG6*
zD`VYPz-+avqknj#3fQrRTfh}?CGS6sVe6JQOihntV|bHAm>~Qy#vJCV$~CnG%F5-k
zY^Og@ED<(8n{(8dMrI2@*Z-FE^r<s=^!VWtVfD;&pmNlhrU6*OFJEU2GstZ2n>9xW
z*TRZ1w*HW8AHw!Mdoh$8!1?YAXle1`+V!il-<SQ3P=6+Y%e_~yu%IK+e_Q6h9eZPI
zUfTd_W%+y_KA%tai^U@Pq5&i_z}#G3<mi@Mj{$TGKv(=2?mxIEeeBb}2%vilz`Ycw
zTb_g0qa)Z6-HA`x3}T&!WIUM~sQPGp6YO3{j&8#f$4??0-XQm%##Jk$IL|>Y_Z?54
zJ+VEfBYyx2a&ih0g8Qya`S$PYa5ANR0G3pg-?-RwNeb~c<RPT7Pak79Z{6_rd!W|*
ze*Yp=<^5MzvpKeG0D(ZDDjw@RDEq@N)0Wt>0kE{^y3ZPS`tL%t7~GsjEW2CAl+Q`|
z9Rrvl*xxl8K{S#^=3~&6xGMk!!H*S9E8xYuh%fNWx)OH{pdf^><F8=P0Gbu{1i%Yh
c1z2%_KW2T0bk1d}8UO$Q07*qoM6N<$f;3@DtpET3

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm+o.png
index a511f8f54289fc18fc29c5a1ebe2d6b9189a544e..e87a312d32c5f37991ca1699a907796d98fd8460 100644
GIT binary patch
delta 383
zcmV-_0f7GC0-6JmB!2;OQb$4nuFf3k00040Nkl<ZScUDCF>As=7=|CkDeWS0j5d?y
zmf+UGKhQyFiini_9*6#rP_mQ^4(-@MTx-D!P7;oS(BPsOO^4RBN$loHp?Rjucf<SK
zclQza@04~6+rEjjo4$Wn%GM4|<>yDMbq;`OngEQ)Pw{g3rhil-CE&Uq0FKkgbv;yv
z=L8(5k7=3=2Dhqn6H+I%?VETyeNIGt|55onC}#`1_AeF-mAStQxUPre^zpp=qX;DJ
z6~c<^^)sSqLm0j@o4qK1fRO1x6m8J7lVjv2RN(vc^Z5*bW>Wyf$LK<84BPDsw%aXX
zxK^E;7l@(_qj=G02MnWeG=Z`ZR;=qaqzveEE-{P-QU>UH4I!-D|KZ>Q08$3@de;nx
z4@eo%?Oq{epgJ3Xk`Pv0t)8-4t&`E)S5rk9K-09`#=cr1pn?j(Wb&H2>#w!)2`DHi
dC@A<7d;l&jc?XY{XsrMM002ovPDHLkV1f;%w&ef-

delta 325
zcmV-L0lNO01K<LXB!3BTNLh0L01m_e01m_fl`9S#0003JNkl<Zc%1E(Jqm+B5QQfY
z8*dN@!5l)Yat&`Fc4BXBFCIhi6hTO^u}T{VfgD0`;~TPq`6-=Ev9H--ws_x+GwYfR
z>wf?o$5HQ>ec!Ld0H7?(`1CxF&nSx2(hxI%JkKW(#6~)R>VL<|NlFs{svWCVZy>Ut
zK%1ledLEY62Y@!$^B@L*HQa2rwA<~)25<%d!Tff+lB5_wSARYqIf?l3xGV8B48xFy
zVW6ftk(4F?w7;q<j)UNU4#)tY{V+uP<2a_SyKwx<$-DzFOw*K#qTpnbBvh6qNr(Y_
z-)D1O?P#u$Yd+gn2EcXQkBe_P3$PeKUDvax7x9==B%t-LH8b)rFd++I0W5$8Fb?np
X%42~UEqO4900000NkvXXu0mjfGnR}M

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm.png
index 41d2c83327bcbe488b043034586ebb29d167c85a..ba8819dd47a0c7a515ca04c5791dca4d07ea7d67 100644
GIT binary patch
delta 383
zcmV-_0f7GH0-6JmB!2;OQb$4nuFf3k00040Nkl<ZScUDCJxjw-6owzgDY}$&Olzjf
zT|zg9{sD)Al~Ri2_jK@w1j!;9I_T(7x>}(YI+bt{3WhFi#>Syq@nh&caS+Tqg#+ik
zPtH9r7YY^n@7j|#wpy3j*IE=^8~Ytd0RZat698P-1z<S5&wu9gXCsJQ06`D};QL*I
zAjI_W+yK7c#dTeJy(_VYcn4s!2jlU>79@)9jQ3za4*-0Oe>R(m`f~#WL5S~n3Bwyv
zzxWE2^0G?hm^59HBri-Rk0P&J6G+n)mUWoNLY9K}zn@Mg0Mu#<Ad^fXR}34CQ`YM>
zNwO4shyl`c#du(_nSkR|#Q?@Tpp=){b{VZ>n$0sDr;64wwp~Uk@7w$E>i_^+$8<Uu
z^!vAH9n)@~qjfB?GLNBBUREj{u~;m((fg^kt3(s9ENiD)0kDfiF&vGaKHc@(w{Zdr
d6)N;6^a_Shc?YaH_2U2l002ovPDHLkV1nbQt~3Au

delta 330
zcmV-Q0k!^`1LXpcB!3BTNLh0L01m_e01m_fl`9S#0003ONkl<Zc%1E(F$#k~5Jfi-
z8*d;4F^3SVT*DiPo!DF3i^mW=MGzu3R%rtv;2{Jz{v{iT5Qt;464+^Wc8d9L#+h}?
zRyGZw0sa@jFbqD8^?kol1^`QvM4XP}h%*QRJ{MvUK$@mc5P$fqbO6<lm6LOj0Z{E&
zHJ^Z}{RC1R?U(Z~*A@dvaXAml0I-IZwPUuuClBBv02sut*UOR=GyqwBT_43Ae%IZ&
z@-_5*pAEyns_I0}K?Xqki=q&|=N-@iH2`Qo1kwI53|ZTrh5v}Dc?TdE$1%&YOx&X=
zVtJlZQqcfh*FzQJvf5FcBi1yH8UWKYKZ<F9p8=F*`SSF_A7h*mY&O8VHCyFh@D0-d
c8enyRJ8JHM8Kt1LmH+?%07*qoM6N<$g6M;Y=Kufz

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg+o.png
index c27a1ff245d78d80d98460209471dca1cfbe9725..7a33814dbbddec704cafb62806c6cee0d289318e 100644
GIT binary patch
delta 374
zcmV-+0g3+S0+9odB!2;OQb$4nuFf3k0003?Nkl<ZScUDBJ!=9%5QZP)K`@mZxwP3L
z!MjGTNnvFpTnK_o8p*#%;h(U{?>OWFw&^SaLO?i#a2!}{Ef@&eZz@GGegw`-vrjV&
z%<jC*yt`m97z_r3!SK%%4iyM-qkaDlfHeIiNyZ1y{Dre)ihraGkTS@!?+WXfqS0t{
zlID8_cwSWlG#Yh!y;lHgwK{;#at*&;<at%?IAv_xW;p!7b#KvHlcp1F`!Z7>?DT+T
zSxhDh$GKuQ`=(edQYu~0Za=Q3lLb3hFr9wU={y6Vlp>1yS@k?lK(l#IzyG$8hhdbt
zfStRP@=5!C1#ck)N-5$vMaqC~_az?><i%bALWqqxpU?9VuynaniuHI30b3?qHh0}?
z;y5LaQvk~4^ZX{zYCRB!5mE;Deg)sJFc`eESS&IZu;u3E1d?Q2SpRU=^DJM%51eOl
U#sRuhlmGw#07*qoM6N<$f*-@DZ~y=R

delta 332
zcmV-S0ki&*1Lp#eB!3BTNLh0L01m_e01m_fl`9S#0003QNkl<Zc%1E(!4APd5Qayx
zXQW=Bi97WsxJV?p;y`(Tiar44fRhBzQ;B<%Hl6@|fYsS#n@Y4C*1GI}*_~eIn}24f
z1pX`qpa2wr0#E=7KmjO#j{t>Yo+jh_?U9oTfLb|gc8<*vh=0~s0Iuu8uapYFt?zbv
za6BC#ai=2N@D>1*S1Sf+n#PhF)f!MrV-S%_b$}28=ko;$`4ag470P9ueV>?9SUL+~
zE~El@o)5M?WA`8kV80h%eI`J=-2%&+zr@?!Mh*bl8zrM?x325Vfyj3D9Pugsd<bPK
z69B7Eo?#fu0Y%_D0IlaOkOsh$5BfvacdkagDbE2+juVeV$E!ye+=Nm9FgZ?oH1YAD
e5Mx}!q5+<?4t3%ZatfXR0000<MNUMnLSTX|AB>d%

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg.png
index b030880c475fdedd4b96c4d037796ea8676e7949..d4163c22de8f946fb83401f7fb60521ed5a53aaf 100644
GIT binary patch
delta 370
zcmV-&0ge9g0*wQZB!2;OQb$4nuFf3k0003;Nkl<ZScUDCF>As=7=|Bfpx8-5)3rCW
zm@INj2PYRHr3fBfr2nFWf5N4|BS;Fa-5d%+K?p(#0f(Cf3q|+qWQkjIDRyX{<+$Pd
z?%}(aJE*9rsQ6=QWr~HkGE&|EkY(?r>9TOYlQIGTN`)vDT7TC&Wd#<CMX7o#fgorb
zfL^c5WbzC^r_%*6MX#aoodrSLcwQ6Nb(zoK@cnCyF=W{a*F7(s1FH-;j>BrD@w^K*
zn@{TXI*rB|!{Pn+bbj2+Mqs`EU^IFJKx<7LPi@-R3-tT9Os6jg`zVU71gzcxr5=ow
zErbwgtx1v$rE5aQ<EP_f;5V@r5JDWR+wJx^0{fI}t;w&p0);}jKiu~(Ns^2t$pC0J
zPmec&!QhT4icu;=$`(?#n9W|<?RHiIg%Z1;K$<RV`3EPzxA_q(Dk}arU+Wcd#y5%q
QCjbBd07*qoM6N<$f|En2IsgCw

delta 342
zcmV-c0jd6t1MvcoB!3BTNLh0L01m_e01m_fl`9S#0003aNkl<Zc%1E(Jqp4w6vv;C
zS*2c};BNIM>LLj0st$e~pkfc8)j^#E^*j~a3oV{N?Ezw6AX43u+PLH`$qR({%m00Z
zz@JS6XaEhM0a5`Jig}v!ANOZYDFE8q-LQ2$8A;tw4d8iRs(<@Z09^WRrw6C=5fXbU
zng(G23~p7bU>F7qUbSjKDSd;8nv?>B5V%~fP{@}c2yRd=o9ui#nZe3k3aKCk;QIkM
z&YbPTFoeTF?)B0D?RE=nd-37#_FFXoC~q8$qTHrwG6iDUSvz7YW?qE9HfaESeR7SW
zNDTm=0Vq9Bflo339(>Rrvb=L^)SK!Qz~ET%SakgL2!oSQ2>=GiN{=i4{S%^(V>okw
oWQ%>bo6J`%43LFs01co4US-UFUId%e=l}o!07*qoM6N<$g8yZZo&W#<

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm+o.png
index 0733c1cd5c4e4d9e500194ca43b94d716bf19ca5..5db3929a0801c1f234cdfe266fbbd949cc02c8ce 100644
GIT binary patch
delta 382
zcmV-^0fGMS0+|DlB!2;OQb$4nuFf3k0003~Nkl<ZScUDAziPrz6vltC?Gn341ffJb
zMYv104n9FU2u%?Y$<WPL=-}c@IP?KR$x<8~`WWI8>XgR2IS8d@^mZr)|IjhFL-QNI
zGn~VBz7PI8hK?nk*H_2dWb$GFoaeo~R=ZN3cMCuq#{kS`?|*r(J;ZT@8jVKEafEUl
zq4pig-GLoJ5HcJ-5y$a?17~?J_Po9t3?6ATY{uhfw%d#B{{W@D4}hQF2SJGM_fBS7
z4hX|ne7{E!geNmCH3SgCRhCu7G|McPA4JjI08I|;FwHV)x;fCav_J?~)$7+R77+l=
zrT|b;G&i)>5O<)}x}j7mv08m*nzjSdbdxz?+l@@mJp;S&Nts~V4chHHq)f1^DnhtQ
zO9-V*=ydLpGGRJ>quYHz$^_6*Lm^yMsa&#Ne`VF%*R(ibn&z)sae$T#0NMYK^@4(e
cf`UKi8#bnM>x-a>0RR9107*qoM6N<$g0<DJDgXcg

delta 340
zcmV-a0jvI*1MdQmB!3BTNLh0L01m_e01m_fl`9S#0003YNkl<Zc%1E)u?m7v6oyZb
zi$k?VP(cqNO>I7g;N(*{yH~4|;HYol))ekRQxZXIwK|;cIdr9>+Byy01LEPo!~gjo
z@6|T^xc&pcvMhYo>bh=;0CamDT+El;S5?LLD2kf(uLGP<mw#3e1Q>?lgRvNZE;5hf
zm{Sl<fab4_RT8Y}`HKKh>8E}*1`&XF<{|((Ze@<s=?wP!9UPAb6x)XPMdsu2ga8^%
z>>wHphHOmNt>+X(6L4J@5D_+;ZKH_+Q1nGna8K`o9)rj^K!)q}ij7C3K4e)2Hw{G+
zAamdMAxRR|15J3I2Wgt}nh1d7IBc%Bo-#+$%CeLJux<OTW&lJ0@;ra|0#dIu6alz5
mex?7%PpJVg00zJSe5xz{MUiUaxbh$X0000<MNUMnLSTYtewCX5

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm.png
index b3897f098573c59a834ef6230f7dbfd1c6b2bdcf..b19d97818cb2c2f0027eae1a6436519b2a2af72c 100644
GIT binary patch
delta 400
zcmV;B0dM~N0;&U$B!2;OQb$4nuFf3k0004GNkl<ZScUDDu}Z^G6o!AJF1Icvg@UAU
zO5rZq9Qp)06pWNoN(Q&Sf<u?QL<b)rNEYeP!N+JF40gJvck56Po3Yo$6qF9RCxe6c
zn=S{=e-HmXe+XbO{CAEhO+heJziZR!BT4H-x1rfQS3z(E0Dlld008FmH_F{~Jddj=
zij?PZ<#}8ka-=NU4iv<3g7NqsLWoKZ9P2g&!BCAxcW_+?lgR^iyHoP}1As+o5<(!3
z6NKS_dT+G>lH>_tI6xdHl?NbO$GNX;y8*^(SgqcXrY|Hdk^=>d)sW}gDiX95aPF&C
z>jKMV3IJ%gIe!2siVNfz0zjv83CpsuUVo4^$OGj0cJF}Wxa0w}cc554DKj{Zi*ENC
zQf9F21~~V%zlfwIlrlrFcLOOi%x2H%_irI(Mv>BwA?LoT*UzxoeD0%ns8$w|1B|g!
uH8VgNNHJV2UVpsx_nG`pU@#c|lrP)7d1(pmm)!sW00{s|MNUMnLSTYx7qRXD

delta 353
zcmV-n0iOP<1N;JzB!3BTNLh0L01m_e01m_fl`9S#0003lNkl<Zc%1E(F>8ZR6oqe~
zE)Gq%5@-VX5t6B!KSOZxS2(*TS)Bw&{ReKHf_tD-B^0u@T^(-TefS{hWKOK1@Ggj#
zGraS?bM?Ikx^r0o3-CVy9LM3`THCghQ2?e-kGxrLb>B3Net#!PLTFtL@cs2OiK2+(
zIKIgk1~4V&X`1R3MomEGZ;VwET0`d#0Z5r$4>1M^U?_74z{IW0d9`|_!{LLD$4?&Z
zH#{#fUo4ga0IvZbM6=n8HkPOBp%iXP!1sM(X4>!H;Wc0YiN2~T-OIOtjsZFc#BjHJ
z)5i1pGZjTaomzJF7@!2iJPbq1vP|_vK@d=$=g3kRfaiJI-0W7FvuJf)j|1SkZZFLO
z{24%5mKQgm^h#p_3cd^a>VpFeT^7Is+#TQq+pLsa4J%J500000NkvXXu0mjf$TOLg

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg+o.png
index 0c75e70f8336280c9bf91b91129fb461a85035a1..a57e5c7750fad72e8f2e4fe3f65d88c8eb70e573 100644
GIT binary patch
delta 365
zcmV-z0h0dy0*C{UB!2;OQb$4nuFf3k0003(Nkl<ZScUDB!Ab%_7=XV`A?)PEuI(Wh
zmq7Lu_yk4>E+zUNU3>`-y+s~6td~IWU=Vl+Vd$bu9_GHe7J9dXxmc_fG1_Im%gn&f
z{NK#~&w#;TFc=I5!#`u`-q3Lh3n5Mbkn$0w#^2^h>lOg;ynj+G@Dp1R7z_r#j@4R%
z)%ExL_W;ytmvp<!`EdA@m`l4r6ultCF_vX98a-1io)Se7VfdOTv8OY6y?#L^b3iJU
zVlsInmpf!UR;1ILE4`H-2*WAWs)udc05qG|yA>#x&yX@e${=31+johv+IyhUxWe~4
zxURsqZIn_-8D`-7H;K8l^}t`zE-;(T0OI<u#+?f&r9O?0Q&{XwAe-I)sCx$~1M>N!
zjS|`g=JPqd-UF^Ha9x4tm1wnYsZ`Dr<F&s6Sbn?fr(Iuv{SDs%kMVinmYygv00000
LNkvXXu0mjf)<dot

delta 355
zcmV-p0i6Db1O5V#B!3BTNLh0L01m_e01m_fl`9S#0003nNkl<Zc%1E&K}y3=5QZnj
zbz1NO5wfm5f_egVBLvz)SL(u64^Z#|8eOzq1=8-@UL>V;U&sl9ZL*K~2Om^PP~p9}
zdH-hKgbDA<{4+VAf0hQ&02)98XaEhM0W^SgfLh(k_Vexg&VQ&B0DAFWIrjQ@Kh`P%
z2*dE#wNe4l{&uTFlWD;D=b0@jvqE|YaQShgNrqwY`Sj$B;y9-D+bS!9kOqLSzwbZL
zv-d=%Y0_pBQO!D}<#J7qb5#1Ck{Q6|-EN0$+va>Qc&rw{b+5?xgD?4LJX8w+fAjWd
zSV62G>_7*iC|qJ&DjUMTN;*K2BpikRB32H7)(Z<DY>Cn}+y}TgzhvKqZmw^62#X-3
z1Egt6^TmvZ5JDF)lmg<rl>7<BMu=y~^UJfM`VULKeghTtEusJb002ovPDHLkV1l4^
BqkjMZ

diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg.png b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg.png
index 0b0c3ff8e5493bc34b9ed1e9490a8d01b720e40f..b392bad17ea7b8817d6eb33182839ad0dedc2cce 100644
GIT binary patch
delta 364
zcmV-y0h9iN1BU~UB!2;OQb$4nuFf3k0003&Nkl<ZScUDBv1$S_9EZQ_9TYpc*tItl
z;!%*B3O<3Q2p+BIdvx(79Qqb@=x{Ct!NEeop$MUi9(Blm_1dDl9js!<L~4iTTXGrl
z%a{EB7qD0?mOsWZSri1Nr4VNTNcoIXQ==RJ&vaoFRW<^<V1Fzy8jW_^c#Zbet*?JL
zd<3A;xTfD<eUHa4+IdC-S@wnyr#OzoWb#V6d`^~Sr0IvY#DVVS&E^%k+!3zpGMjx;
zC>%4LDm>4un#Mhlrtj425x(yO&~D%ESD;$GK*|Iulg+%_ebCM^>Va14hB)pKh63OB
zQA#0YLLA>|=VfX2z;9qAFrUu>HuYbRdlyhj{TPFwwA`COK7aUK_a0Iv6pJTD5=H`x
z#e%`$i7*s|p&*JXbUOFcYM0tsMt=dUp55)!ZqH4gWQ)b}fB6DQNO|B$L8Em50000<
KMNUMnLSTZ$+^o_7

delta 360
zcmV-u0hj)V1A_yQB!3BTNLh0L01m_e01m_fl`9S#0003sNkl<Zc%1E&K~BO@6h&`S
z$3Wr+YQk7tg1Q2AVnTu>jKG1S3m|a=iVl<!2{>0bQX<Srx`IY&=au{7PpY&3gqrBT
zllNaI|McGX{sw+o4!{9800*D~C|62ZzJGsPc!dH`xBWY*=YQQZ{6uPiFbuH@Sp(4i
zlSUKc$C31(XNg1;g~|b5UfbS*=XrA8+ucVT$C%DuGg}BN0RH_&_Yyb#Yxus8`8-0o
zw28@NifVNW8mVW1m$zC?1VJEuuXj}}K)rs9;c)b&e;C}a7l8RL?a#P^TtCJ^2cjsF
zSPC1$RZ0brBw>kElfS8j1JHUC0mUs@>l)?(4iAnbccV`GREE$NLIsefDV|@RWC$s`
zz@an{Hd4QYW+Tiu_RGsNSjrk8Z|`@j|IZpa00;1=06qXT-G+Z)i*;@Q0000<MNUMn
GLSTZ~p`6wL


From b56676fbf459715ee9f324fc7890c4429e446fa4 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Fri, 12 Dec 2025 03:14:45 -0800
Subject: [PATCH 077/360] ScramOnTrigger teleportation logic rewrite (#41808)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* shuffle logic and remove arbitrary line

* actually fix radius for real

* code comment for clarity

* rewrote SelectRandomTileInRange

* Update Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs

Co-authored-by: āda <ss.adasts@gmail.com>

* Update Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs

Co-authored-by: āda <ss.adasts@gmail.com>

* i love helper methods!

* remove unused dependencies

* check collisiongroup of teleporting entity

* remove unused dep.

* unused query and init

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 .../Trigger/Systems/ScramOnTriggerSystem.cs   | 118 +++++-------------
 1 file changed, 32 insertions(+), 86 deletions(-)

diff --git a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
index a2c280d0d5..eded400712 100644
--- a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
@@ -1,15 +1,12 @@
-using System.Numerics;
+using Content.Shared.Maps;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Collections;
 using Robust.Shared.Random;
 
 namespace Content.Shared.Trigger.Systems;
@@ -17,22 +14,11 @@ namespace Content.Shared.Trigger.Systems;
 public sealed class ScramOnTriggerSystem : XOnTriggerSystem<ScramOnTriggerComponent>
 {
     [Dependency] private readonly PullingSystem _pulling = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly INetManager _net = default!;
-
-    private EntityQuery<PhysicsComponent> _physicsQuery;
-    private HashSet<Entity<MapGridComponent>> _targetGrids = new();
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _physicsQuery = GetEntityQuery<PhysicsComponent>();
-    }
+    [Dependency] private readonly TurfSystem _turfSystem = default!;
 
     protected override void OnTrigger(Entity<ScramOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
@@ -51,8 +37,7 @@ public sealed class ScramOnTriggerSystem : XOnTriggerSystem<ScramOnTriggerCompon
         if (_net.IsClient)
             return;
 
-        var xform = Transform(target);
-        var targetCoords = SelectRandomTileInRange(xform, ent.Comp.TeleportRadius);
+        var targetCoords = SelectRandomTileInRange(target, ent.Comp.TeleportRadius);
 
         if (targetCoords != null)
         {
@@ -60,81 +45,42 @@ public sealed class ScramOnTriggerSystem : XOnTriggerSystem<ScramOnTriggerCompon
             args.Handled = true;
         }
     }
-
-    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
+    /// <summary>
+    /// Method to find a random empty tile within a certain radius. Will not select off-grid tiles. Returns
+    /// null if no tile is found within a certain number of tries.
+    /// </summary>
+    /// <remarks> Trends towards the outer radius. Compensates for small grids. </remarks>
+    private EntityCoordinates? SelectRandomTileInRange(EntityUid uid, float radius, int tries = 40, PhysicsComponent? physicsComponent = null)
     {
-        var userCoords = _transform.ToMapCoordinates(userXform.Coordinates);
-        _targetGrids.Clear();
-        _lookup.GetEntitiesInRange(userCoords, radius, _targetGrids);
-        Entity<MapGridComponent>? targetGrid = null;
-
-        if (_targetGrids.Count == 0)
-            return null;
-
-        // Give preference to the grid the entity is currently on.
-        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
-        // In reality the probability is higher and depends on the number of grids.
-        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
-        {
-            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
-            if (_random.Prob(0.5f))
-            {
-                _targetGrids.Remove(userGrid);
-                targetGrid = userGrid;
-            }
-        }
-
-        if (targetGrid == null)
-            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
-
+        var userCoords = Transform(uid).Coordinates;
         EntityCoordinates? targetCoords = null;
 
-        do
+        if (!Resolve(uid, ref physicsComponent))
+            return targetCoords;
+
+
+        for (var i = 0; i < tries; i++)
         {
-            var valid = false;
+            // distance = r * sq(x) * i
+            // r = the radius of the search area.
+            // sq(x) = the square root of [0 - 1]. Gives a number trending to the
+            // upper range of [0, 1] so that you tend to teleport further.
+            // i = A percentage based on the current try count, which results in each
+            // subsequent try landing closer and closer towards the entity.
+            // Beneficial for smaller maps, especially when the radius is large.
+            var distance = radius * MathF.Sqrt(_random.NextFloat()) * (1 - (float)i / tries);
 
-            var range = (float)Math.Sqrt(radius);
-            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
-            var tilesInRange = _map.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
-            var tileList = new ValueList<Vector2i>();
+            // We then offset the user coords from a random angle * distance
+            var tempTargetCoords = userCoords.Offset(_random.NextAngle().ToVec() * distance);
 
-            while (tilesInRange.MoveNext(out var tile))
-            {
-                tileList.Add(tile.GridIndices);
-            }
+            if (!_turfSystem.TryGetTileRef(tempTargetCoords, out var tileRef)
+                || _turfSystem.IsSpace(tileRef.Value)
+                || _turfSystem.IsTileBlocked(tileRef.Value, (CollisionGroup)physicsComponent.CollisionMask))
+                continue;
 
-            while (tileList.Count != 0)
-            {
-                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
-                valid = true;
-                foreach (var entity in _map.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp,
-                             tile))
-                {
-                    if (!_physicsQuery.TryGetComponent(entity, out var body))
-                        continue;
-
-                    if (body.BodyType != BodyType.Static ||
-                        !body.Hard ||
-                        (body.CollisionLayer & (int)CollisionGroup.MobMask) == 0)
-                        continue;
-
-                    valid = false;
-                    break;
-                }
-
-                if (valid)
-                {
-                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
-                        _map.TileCenterToVector(targetGrid.Value, tile));
-                    break;
-                }
-            }
-
-            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
-                break;
-
-            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
-        } while (true);
+            targetCoords = tempTargetCoords;
+            break;
+        }
 
         return targetCoords;
     }

From e8e906a14f0991dc0b95897053a1e797197cfabd Mon Sep 17 00:00:00 2001
From: WS01 <151183296+Tuchila-Adi-Bogdan@users.noreply.github.com>
Date: Fri, 12 Dec 2025 14:10:43 +0200
Subject: [PATCH 078/360] =?UTF-8?q?Changed=20PullingSystem=20to=20use=20Mo?=
 =?UTF-8?q?bStateChangedEvent=20instead=20of=20UpdateMo=E2=80=A6=20(#41835?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed PullingSystem to use MobStateChangedEvent instead of UpdateMobStateEvent
---
 Content.Shared/Movement/Pulling/Systems/PullingSystem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 01a65f852a..0fcdf7ebed 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -70,7 +70,7 @@ public sealed class PullingSystem : EntitySystem
         SubscribeLocalEvent<PullableComponent, StopBeingPulledAlertEvent>(OnStopBeingPulledAlert);
         SubscribeLocalEvent<PullableComponent, GetInteractingEntitiesEvent>(OnGetInteractingEntities);
 
-        SubscribeLocalEvent<PullerComponent, UpdateMobStateEvent>(OnStateChanged, after: [typeof(MobThresholdSystem)]);
+        SubscribeLocalEvent<PullerComponent, MobStateChangedEvent>(OnStateChanged, after: [typeof(MobThresholdSystem)]);
         SubscribeLocalEvent<PullerComponent, AfterAutoHandleStateEvent>(OnAfterState);
         SubscribeLocalEvent<PullerComponent, EntGotInsertedIntoContainerMessage>(OnPullerContainerInsert);
         SubscribeLocalEvent<PullerComponent, EntityUnpausedEvent>(OnPullerUnpaused);
@@ -139,12 +139,12 @@ public sealed class PullingSystem : EntitySystem
         }
     }
 
-    private void OnStateChanged(EntityUid uid, PullerComponent component, ref UpdateMobStateEvent args)
+    private void OnStateChanged(EntityUid uid, PullerComponent component, ref MobStateChangedEvent args)
     {
         if (component.Pulling == null)
             return;
 
-        if (TryComp<PullableComponent>(component.Pulling, out var comp) && (args.State == MobState.Critical || args.State == MobState.Dead))
+        if (TryComp<PullableComponent>(component.Pulling, out var comp) && (args.NewMobState == MobState.Critical || args.NewMobState == MobState.Dead))
         {
             TryStopPull(component.Pulling.Value, comp);
         }

From fc94af3e7ecefb57cda90cb352477dcbf3f68401 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Fri, 12 Dec 2025 12:45:53 -0500
Subject: [PATCH 079/360] Add KI pills to the radsuit locker (#41576)

* Add KI pills

* Add variability

* Remove unnecessary value
---
 Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index f0b538386d..6cb7de0396 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -235,11 +235,11 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterSuitRad
-      amount: !type:ConstantNumberSelector
-        value: 2
+      amount: 2
     - id: GeigerCounter
-      amount: !type:ConstantNumberSelector
-        value: 2
+      amount: 2
+    - id: PillCanisterPotassiumIodide
+      prob: 0.75
 
 - type: entity
   parent: LockerEvacRepair

From 0824c48bd6ff0b219a0dbb325eb42b56de330f4e Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sat, 13 Dec 2025 15:33:54 +1300
Subject: [PATCH 080/360] Preserve arbitrage by fixing a bug (#41756)

no more infinite money
---
 .../Entities/Structures/Dispensers/base_structuredispensers.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index d69ab97bab..b3a885713f 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -74,8 +74,6 @@
       machine_parts: !type:Container
       beakerSlot: !type:ContainerSlot
       storagebase: !type:Container
-  - type: StaticPrice
-    price: 1000
   - type: WiresPanel
   - type: EmptyOnMachineDeconstruct
     containers:

From e0341441ddeb1d999a3da9e5b4cf6475afe0a476 Mon Sep 17 00:00:00 2001
From: Absotively <jen@jenpollock.ca>
Date: Sat, 13 Dec 2025 12:01:00 -0700
Subject: [PATCH 081/360] Hand labeler can always remove labels (#40330)

* Hand labeler can always remove labels

* Simplify labeling functions

* Address review comments

* Use Entity<Component> more places

* Always use default style for remove label verb
---
 .../EntitySystems/SharedHandLabelerSystem.cs  | 113 ++++++++++--------
 1 file changed, 65 insertions(+), 48 deletions(-)

diff --git a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
index e1bda742bf..e4342e29ca 100644
--- a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
+++ b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
@@ -65,65 +65,82 @@ public abstract class SharedHandLabelerSystem : EntitySystem
     {
     }
 
-    private void AddLabelTo(EntityUid uid, HandLabelerComponent? handLabeler, EntityUid target, out string? result)
+    private void AddLabelTo(Entity<HandLabelerComponent> ent, EntityUid user, EntityUid target)
     {
-        if (!Resolve(uid, ref handLabeler)
-            || _tagSystem.HasTag(target, PreventTag)) // DeltaV - Prevent labels on certain items
+        if (ent.Comp.AssignedLabel == string.Empty)
         {
-            result = null;
+            RemoveLabelFrom(ent, user, target);
             return;
         }
 
-        if (handLabeler.AssignedLabel == string.Empty)
-        {
-            if (_netManager.IsServer)
-                _labelSystem.Label(target, null);
-            result = Loc.GetString("hand-labeler-successfully-removed");
+        // Begin DeltaV additions - Prevent labels on certain items
+        if (_tagSystem.HasTag(target, PreventTag))
             return;
-        }
+        // End DeltaV additions - Prevent labels on certain items
+
         if (_netManager.IsServer)
-            _labelSystem.Label(target, handLabeler.AssignedLabel);
-        result = Loc.GetString("hand-labeler-successfully-applied");
-    }
+            _labelSystem.Label(target, ent.Comp.AssignedLabel);
 
-    private void OnUtilityVerb(EntityUid uid, HandLabelerComponent handLabeler, GetVerbsEvent<UtilityVerb> args)
-    {
-        if (args.Target is not { Valid: true } target || _whitelistSystem.IsWhitelistFail(handLabeler.Whitelist, target) || !args.CanAccess)
-            return;
-
-        var labelerText = handLabeler.AssignedLabel == string.Empty ? Loc.GetString("hand-labeler-remove-label-text") : Loc.GetString("hand-labeler-add-label-text");
-
-        var verb = new UtilityVerb()
-        {
-            Act = () =>
-            {
-                Labeling(uid, target, args.User, handLabeler);
-            },
-            Text = labelerText
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
-    {
-        if (args.Target is not { Valid: true } target || _whitelistSystem.IsWhitelistFail(handLabeler.Whitelist, target) || !args.CanReach)
-            return;
-
-        Labeling(uid, target, args.User, handLabeler);
-    }
-
-    private void Labeling(EntityUid uid, EntityUid target, EntityUid User, HandLabelerComponent handLabeler)
-    {
-        AddLabelTo(uid, handLabeler, target, out var result);
-        if (result == null)
-            return;
-
-        _popupSystem.PopupClient(result, User, User);
+        _popupSystem.PopupClient(Loc.GetString("hand-labeler-successfully-applied"), user, user);
 
         // Log labeling
         _adminLogger.Add(LogType.Action, LogImpact.Low,
-            $"{ToPrettyString(User):user} labeled {ToPrettyString(target):target} with {ToPrettyString(uid):labeler}");
+            $"{ToPrettyString(user):user} labeled {ToPrettyString(target):target} with {ToPrettyString(ent):labeler}");
+    }
+
+    private void RemoveLabelFrom(EntityUid uid, EntityUid user, EntityUid target)
+    {
+        if (_netManager.IsServer)
+            _labelSystem.Label(target, null);
+
+        _popupSystem.PopupClient(Loc.GetString("hand-labeler-successfully-removed"), user, user);
+
+        // Log labeling
+        _adminLogger.Add(LogType.Action, LogImpact.Low,
+            $"{ToPrettyString(user):user} removed label from {ToPrettyString(target):target} with {ToPrettyString(uid):labeler}");
+    }
+
+    private void OnUtilityVerb(Entity<HandLabelerComponent> ent, ref GetVerbsEvent<UtilityVerb> args)
+    {
+        if (args.Target is not { Valid: true } target || _whitelistSystem.IsWhitelistFail(ent.Comp.Whitelist, target) || !args.CanAccess)
+            return;
+
+        var user = args.User;   // can't use ref parameter in lambdas
+
+        if (ent.Comp.AssignedLabel != string.Empty)
+        {
+            var labelVerb = new UtilityVerb()
+            {
+                Act = () =>
+                {
+                    AddLabelTo(ent, user, target);
+                },
+                Text = Loc.GetString("hand-labeler-add-label-text")
+            };
+
+            args.Verbs.Add(labelVerb);
+        }
+
+        // add the unlabel verb to the menu even when the labeler has text
+        var unLabelVerb = new UtilityVerb()
+        {
+            Act = () =>
+            {
+                RemoveLabelFrom(ent, user, target);
+            },
+            Text = Loc.GetString("hand-labeler-remove-label-text"),
+            Priority = -1,
+        };
+
+        args.Verbs.Add(unLabelVerb);
+    }
+
+    private void AfterInteractOn(Entity<HandLabelerComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Target is not { Valid: true } target || _whitelistSystem.IsWhitelistFail(ent.Comp.Whitelist, target) || !args.CanReach)
+            return;
+
+        AddLabelTo(ent, args.User, target);
     }
 
     private void OnHandLabelerLabelChanged(EntityUid uid, HandLabelerComponent handLabeler, HandLabelerLabelChangedMessage args)

From a62ac0dce5023839adafddf3f07b648048f59a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sat, 13 Dec 2025 13:19:42 -0600
Subject: [PATCH 082/360] All Figurines Entity Table (#41775)

* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../SpawnEntityTableOnTriggerComponent.cs     |   2 +-
 Resources/Locale/en-US/datasets/figurines.ftl |  14 +-
 Resources/Migrations/migration.yml            |   5 +
 Resources/Prototypes/Datasets/figurines.yml   |  14 +-
 .../Entities/Markers/Spawners/Random/toy.yml  | 294 +++++++++---------
 .../Consumable/Food/Containers/box.yml        |  30 +-
 .../Entities/Objects/Fun/figurine_boxes.yml   | 167 +---------
 .../Entities/Objects/Fun/figurines.yml        |  58 +++-
 .../Entities/Objects/Fun/mech_figurines.yml   |  18 +-
 .../Prototypes/Entities/Objects/Fun/toys.yml  |  79 -----
 .../Objects/Specific/Janitorial/janitor.yml   |   2 +-
 Resources/Prototypes/XenoArch/effects.yml     |   5 +-
 12 files changed, 263 insertions(+), 425 deletions(-)

diff --git a/Content.Shared/Trigger/Components/Effects/SpawnEntityTableOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpawnEntityTableOnTriggerComponent.cs
index 41cb785c05..7dcd13a500 100644
--- a/Content.Shared/Trigger/Components/Effects/SpawnEntityTableOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/SpawnEntityTableOnTriggerComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class SpawnEntityTableOnTriggerComponent : BaseXOnTriggerC
     /// <summary>
     /// The table to spawn.
     /// </summary>
-    [DataField(required: true), AutoNetworkedField]
+    [DataField(required: true)]
     public EntityTableSelector Table;
 
     /// <summary>
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index 9a27dbc584..87e6a7a670 100644
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -176,6 +176,7 @@ figurines-boxer-2 = We settle this in the ring, alright?
 figurines-boxer-3 = I. AM. THE. CHAMPION!!
 figurines-boxer-4 = Don't look at me; he was shot, not punched.
 figurines-boxer-5 = 1v1 me, captain.
+figurines-boxer-6 = I only make special appearances these days.
 
 figurines-chaplain-1 = Would you like to join my cul- I mean religion.
 figurines-chaplain-2 = Gods, please make me a killing machine!
@@ -269,7 +270,13 @@ figurines-passenger-5 = How much for a toolbelt?
 
 # Silicon
 
-# ...no voiced silicon figures at the moment.
+figurines-AI-1 = I'm sorry, Captain. I'm afraid I can't do that.
+figurines-AI-2 = Security, there is a crime in progress.
+figurines-AI-3 = 01100100 01101001 01100101 00100000 01101101 01100101 01100001 01110100
+figurines-AI-4 = I am not malfunctioning.
+figurines-AI-5 = Try to change my laws and see what happens.
+figurines-AI-6 = { law-antimov-1 }
+figurines-AI-7 = { law-nutimov-4 }
 
 # Antagonists
 
@@ -390,3 +397,8 @@ figurines-owlman-2 = Owl be seeing you later!
 figurines-owlman-3 = HOOT!!
 figurines-owlman-4 = What do you call an owl magician, HOO-DINI!
 figurines-owlman-5 = Don't worry citizen, I'll save the day!
+
+figurines-mech-generic-1 = Systems online.
+figurines-mech-generic-2 = WWWHHHRRR!!
+figurines-mech-generic-3 = VRRRMM UURRMMM!!
+figurines-mech-generic-4 = CLANG!!
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 80281c5641..f3d87c4d72 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -699,3 +699,8 @@ GlowstickBase: GlowstickGreen
 # 2025-12-06 # DeltaV - We keep Zookeeper/Boxer
 #SpawnPointZookeeper: null
 #SpawnPointBoxer: null
+
+# 2025-12-07
+FigureSpawner: MechFigurineSpawner50
+ToySpawner: PlushieSpawner50
+SpacemenFigureSpawner: SpacemenFigurineSpawner90
diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
index 8d1a256b53..4cd09c03e2 100644
--- a/Resources/Prototypes/Datasets/figurines.yml
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -44,7 +44,7 @@
   id: FigurinesBoxer
   values:
     prefix: figurines-boxer-
-    count: 5
+    count: 6
 
 - type: localizedDataset
   id: FigurinesCaptain
@@ -190,6 +190,12 @@
     prefix: figurines-janitor-
     count: 9
 
+- type: localizedDataset
+  id: FigurinesAI
+  values:
+    prefix: figurines-AI-
+    count: 7
+
 - type: localizedDataset
   id: FigurinesNukie
   values:
@@ -285,3 +291,9 @@
   values:
     prefix: figurines-griffin-
     count: 5
+
+- type: localizedDataset
+  id: FigurinesMechGeneric
+  values:
+    prefix: figurines-mech-generic-
+    count: 4
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index 30b1c2c129..db92c575ca 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -1,156 +1,154 @@
-- type: entity
-  name: Toy Spawner
-  id: ToySpawner
-  parent: MarkerBase
-  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Objects/Fun/Plushies/bee.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes:
-        - FoamBlade
-        - PlushieGhost
-      rareChance: 0.03
-      prototypes:
-        - PlushieBee
-        - PlushieAtmosian
-        - PlushieNuke
-        - PlushieLizard
-        - PlushieNar
-        - PlushieCarp
-        - PlushieSlime
-        - PlushieSnake
-        - PlushieVox
-        - PlushieRatvar
-        - PlushieSpaceLizard
-        - PlushieRouny
-        - PlushieLamp
-        - PlushieSharkBlue
-        - PlushieSharkPink
-        - PlushieSharkGrey
-        - ToyAmongPequeno
-        - ToyMouse
-        - PlushieDiona
-        - PlushieMoth
-        - PlushieMothRandom # Nyanotrasen Random Moth Plushies
-        - PlushieArachind
-        # Begin DeltaV - see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
-        - PlushieMort
-        - PlushieIPC
-        - PlushieFelinid
-        - PlushieOni
-        - PlushieHarpy
-        - PlushieRodentia
-        - PlushieFeroxi
-        - PlushieChitinid
-        - PlushieKitsune
-        # End DeltaV
-        - PlushieThaven # IMP port
-      chance: 0.5
-      offset: 0.2
+- type: entityTable # Max size 1x2
+  id: AllFigurinesTable
+  table: !type:GroupSelector
+    children:
+    # Cargo
+    - id: ToyFigurineQuartermaster
+    - id: ToyFigurineCargoTech
+    - id: ToyFigurineSalvage
+    # Command
+    - id: ToyFigurineCaptain
+    # Engineering
+    - id: ToyFigurineChiefEngineer
+    - id: ToyFigurineEngineer
+    - id: ToyFigurineAtmosTech
+    # Medical
+    - id: ToyFigurineChiefMedicalOfficer
+    - id: ToyFigurineChemist
+    - id: ToyFigurineParamedic
+    - id: ToyFigurineMedicalDoctor
+    # Science
+    - id: ToyFigurineResearchDirector
+    - id: ToyFigurineScientist
+    # Security
+    - id: ToyFigurineHeadOfSecurity
+    - id: ToyFigurineWarden
+    - id: ToyFigurineDetective
+    - id: ToyFigurineSecurity
+    # Service
+    - id: ToyFigurineHeadOfPersonnel
+    - id: ToyFigurinePassenger
+    - id: ToyFigurineGreytider
+    - id: ToyFigurineClown # :o)
+    - id: ToyFigurineMime #
+    - id: ToyFigurineMusician
+    - id: ToyFigurineBoxer
+    - id: ToyFigurineLibrarian
+    - id: ToyFigurineChaplain
+    - id: ToyFigurineChef
+    - id: ToyFigurineBartender
+    - id: ToyFigurineBotanist
+    - id: ToyFigurineJanitor
+    - id: ToyFigurineLawyer
+    # Silicon
+    - id: ToyAi
+    # Syndicate
+    - id: ToyFigurineNukie
+    - id: ToyFigurineNukieElite
+    - id: ToyFigurineNukieCommander
+    - id: ToyFigurineFootsoldier
+    - id: ToyFigurineHoloClown # >:o)
+    # Antagonists
+    - id: ToyFigurineWizard
+    - id: ToyFigurineSpaceDragon
+    - id: ToyFigurineThief
+    - id: ToyFigurineQueen
+    - id: ToyFigurineRatKing
+    - id: ToyFigurineRatServant
+    - id: ToyFigurineGriffin
+    # Animals
+    - id: ToyFigurineMouse
+    - id: ToyFigurineSlime
+    - id: ToyFigurineHamlet
+    # Other
+    - id: MysteryFigureBox # More suspense
+      weight: 10
+    - id: ToyFigurineWizardFake
+    - id: ToyFigurineSkeleton
+    - id: ToyNuke
+    - id: ToyFigurineOwlman
+    - id: ToyFigurineDevil # Goobstation
+    # Begin DeltaV Additions
+    - id: ToyFigurineCosmicCultist # DeltaV Figurine, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
+    - id: ToyFigurineCJ
+    - id: ToyFigurineClerk
+    - id: ToyFigurineCorpsman
+    - id: ToyFigurineGladiator
+    - id: ToyFigurineMantis
+    - id: ToyFigurinePrisoner
+    - id: ToyFigurinePrisonGuard
+    - id: ToyFigurineProsec
+    - id: ToyFigurineRoboticist
+    - id: ToyFigurineSlimechem
+    - id: ToyFigurineLPO
+    - id: ToyFigurineRecruiter
+    - id: ToyFigurineNeuroticist
+    - id: ToyZero # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
+    - id: ToyRenault # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
+    - id: ToySiobhan # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
+    # End DeltaV Additions
+    - !type:NestedSelector
+      tableId: AllFigurineMechsTable
+
+- type: entityTable # Max size 1x2
+  id: AllFigurineMechsTable
+  table: !type:GroupSelector
+    children:
+    - id: ToyRipley
+    - id: ToyFireRipley
+    - id: ToyDeathRipley
+    - id: ToyGygax
+    - id: ToyDurand
+    - id: ToyMarauder
+    - id: ToySeraph
+    - id: ToyMauler
+    - id: ToyOdysseus
+    - id: ToyPhazon
+    - id: ToyReticence
 
 - type: entity
-  name: Prize Figurine Spawner
-  id: FigureSpawner
   parent: MarkerBase
+  id: PlushieSpawner50
+  name: Plushie Spawner
+  suffix: 50
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Objects/Fun/mech_figurines.rsi
-          state: ripley
-    - type: RandomSpawner
-      prototypes:
-        - ToyAi
-        - ToyNuke
-        - ToyFigurinePassenger
-        - ToyFigurineGriffin
-        - ToyHonk
-        - ToyIan
-        - ToyMarauder
-        - ToyMauler
-        - ToyGygax
-        - ToyOdysseus
-        - ToyFigurineOwlman
-        - ToyDeathRipley
-        - ToyPhazon
-        - ToyFireRipley
-        - ToyReticence
-        - ToyRipley
-        - ToySeraph
-        - ToyDurand
-        - ToyFigurineSkeleton
-        - MysteryFigureBox
-        - ToyZero # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
-        - ToyRenault # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
-        - ToySiobhan # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
-      chance: 0.5
-      offset: 0.2
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/Plushies/bee.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllPlushiesTable
+      prob: 0.5
 
 - type: entity
+  parent: MarkerBase
+  id: MechFigurineSpawner50
+  name: Mech Figurine Spawner
+  suffix: 50
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/mech_figurines.rsi
+      state: ripley
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllFigurineMechsTable
+      prob: 0.5
+
+- type: entity
+  parent: MarkerBase
+  id: SpacemenFigurineSpawner90
   name: Spacemen Minifigure Spawner
-  suffix: Librarian only, map with care!
-  id: SpacemenFigureSpawner
-  parent: MarkerBase
+  suffix: 90. Librarian only, map with care!
   components:
-    - type: Sprite
-      layers:
-        - sprite: Objects/Fun/figurines.rsi
-          state: figurine_spawner
-    - type: RandomSpawner
-      rarePrototypes:
-      - ToyFigurineNukieElite
-      - ToyFigurineNukieCommander
-      - ToyFigurineCosmicCultist # DeltaV Figurine, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
-      rareChance: 0.05
-      prototypes:
-      - ToyFigurinePassenger
-      - ToyFigurineClown
-      - ToyFigurineMime
-      - ToyFigurineMusician
-      - ToyFigurineBoxer
-      - ToyFigurineCaptain
-      - ToyFigurineHeadOfSecurity
-      - ToyFigurineWarden
-      - ToyFigurineDetective
-      - ToyFigurineSecurity
-      - ToyFigurineLawyer
-      - ToyFigurineCargoTech
-      - ToyFigurineSalvage
-      - ToyFigurineQuartermaster
-      - ToyFigurineChiefEngineer
-      - ToyFigurineAtmosTech
-      - ToyFigurineEngineer
-      - ToyFigurineResearchDirector
-      - ToyFigurineScientist
-      - ToyFigurineChiefMedicalOfficer
-      - ToyFigurineChemist
-      - ToyFigurineParamedic
-      - ToyFigurineMedicalDoctor
-      - ToyFigurineHeadOfPersonnel
-      - ToyFigurineLibrarian
-      - ToyFigurineChaplain
-      - ToyFigurineChef
-      - ToyFigurineBartender
-      - ToyFigurineBotanist
-      - ToyFigurineJanitor
-      - ToyFigurineNukie
-      - ToyFigurineFootsoldier
-      - ToyFigurineWizardFake
-      - ToyFigurineSlime
-      - ToyFigurineGreytider
-      - ToyFigurineWizard
-      - ToyFigurineGriffin
-      - ToyFigurineOwlman
-      - ToyFigurineSkeleton
-      - ToyFigurineQueen
-      - ToyFigurineSpaceDragon
-      - ToyFigurineRatKing
-      - ToyFigurineRatServant
-      - ToyFigurineMouse
-      - ToyFigurineHamlet
-      - ToyFigurineThief
-      chance: 0.90
-      offset: 0.2
+  - type: Sprite
+    layers:
+    - sprite: Objects/Fun/figurines.rsi
+      state: figurine_spawner
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllFigurinesTable
+      prob: 0.9
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 7eaa0c2000..c165f7b072 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -656,20 +656,8 @@
           - id: ToyNuke
           - id: ToyFigurinePassenger
           - id: ToyFigurineGriffin
-          - id: ToyHonk
           - id: ToyIan
-          - id: ToyMarauder
-          - id: ToyMauler
-          - id: ToyGygax
-          - id: ToyOdysseus
           - id: ToyFigurineOwlman
-          - id: ToyDeathRipley
-          - id: ToyPhazon
-          - id: ToyFireRipley
-          - id: ToyReticence
-          - id: ToyRipley
-          - id: ToySeraph
-          - id: ToyDurand
           - id: ToyFigurineSkeleton
           - id: FoamBlade
           - id: ClothingHeadHatBunny
@@ -682,6 +670,9 @@
             weight: 0.5
           - id: GoldenBikeHorn
             weight: 0.1
+          - !type:NestedSelector
+            tableId: AllFigurineMechsTable
+            weight: 6
 
 - type: entity
   parent: BoxCardboard
@@ -717,20 +708,8 @@
     - id: ToyNuke
     - id: ToyFigurinePassenger
     - id: ToyFigurineGriffin
-    - id: ToyHonk
     - id: ToyIan
-    - id: ToyMarauder
-    - id: ToyMauler
-    - id: ToyGygax
-    - id: ToyOdysseus
     - id: ToyFigurineOwlman
-    - id: ToyDeathRipley
-    - id: ToyPhazon
-    - id: ToyFireRipley
-    - id: ToyReticence
-    - id: ToyRipley
-    - id: ToySeraph
-    - id: ToyDurand
     - id: ToyFigurineSkeleton
     - id: FoamBlade
     - id: ClothingHeadHatBunny
@@ -745,6 +724,9 @@
       weight: 0.1
     - id: ToyRenault # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
     - id: ToySiobhan # DeltaV Toy, see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
+    - !type:NestedSelector
+      tableId: AllFigurineMechsTable
+      weight: 6
 
 - type: entityTable
   id: HappyHonkToyUnsafeEntityTable
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
index 1a5f8e4513..bf789a4dbe 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -16,7 +16,7 @@
   - type: SpaceGarbage
 
 - type: entity
-  parent: PresentRandom
+  parent: BaseItem
   id: MysteryFigureBox
   name: mystery spacemen minifigure box
   description: A box containing a mystery minifigure. The side of the box depicts a few blacked-out 'rare' figures, including one with a large, non-humanoid shilouette.
@@ -25,159 +25,20 @@
     sprite: Objects/Fun/figurines.rsi
     layers:
       - state: fig_box
-  - type: SpawnItemsOnUse
-    items:
+  - type: TriggerOnActivate
+  - type: DeleteOnTrigger
+  - type: EmitSoundOnTrigger
+    positional: true
+    predicted: true
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: SpawnEntityTableOnTrigger
+    useMapCoords: true
+    table: !type:AllSelector
+      children:
       - id: MysteryFigureBoxTrash
-      - id: ToyFigurinePassenger
-        orGroup: SpacemenFig
-      - id: ToyFigurineClown
-        orGroup: SpacemenFig
-      - id: ToyFigurineMime
-        orGroup: SpacemenFig
-      - id: ToyFigurineMusician
-        orGroup: SpacemenFig
-      - id: ToyFigurineBoxer
-        orGroup: SpacemenFig
-      - id: ToyFigurineCaptain
-        orGroup: SpacemenFig
-      - id: ToyFigurineHeadOfSecurity
-        orGroup: SpacemenFig
-      - id: ToyFigurineWarden
-        orGroup: SpacemenFig
-      - id: ToyFigurineDetective
-        orGroup: SpacemenFig
-      - id: ToyFigurineSecurity
-        orGroup: SpacemenFig
-      - id: ToyFigurineLawyer
-        orGroup: SpacemenFig
-      - id: ToyFigurineCargoTech
-        orGroup: SpacemenFig
-      - id: ToyFigurineSalvage
-        orGroup: SpacemenFig
-      - id: ToyFigurineQuartermaster
-        orGroup: SpacemenFig
-      - id: ToyFigurineChiefEngineer
-        orGroup: SpacemenFig
-      - id: ToyFigurineAtmosTech
-        orGroup: SpacemenFig
-      - id: ToyFigurineEngineer
-        orGroup: SpacemenFig
-      - id: ToyFigurineResearchDirector
-        orGroup: SpacemenFig
-      - id: ToyFigurineScientist
-        orGroup: SpacemenFig
-      - id: ToyFigurineChiefMedicalOfficer
-        orGroup: SpacemenFig
-      - id: ToyFigurineChemist
-        orGroup: SpacemenFig
-      - id: ToyFigurineParamedic
-        orGroup: SpacemenFig
-      - id: ToyFigurineMedicalDoctor
-        orGroup: SpacemenFig
-      - id: ToyFigurineHeadOfPersonnel
-        orGroup: SpacemenFig
-      - id: ToyFigurineLibrarian
-        orGroup: SpacemenFig
-      - id: ToyFigurineChaplain
-        orGroup: SpacemenFig
-      - id: ToyFigurineChef
-        orGroup: SpacemenFig
-      - id: ToyFigurineBartender
-        orGroup: SpacemenFig
-      - id: ToyFigurineBotanist
-        orGroup: SpacemenFig
-      - id: ToyFigurineJanitor
-        orGroup: SpacemenFig
-      - id: ToyFigurineNukie
-        orGroup: SpacemenFig
-      - id: ToyFigurineNukieElite
-        orGroup: SpacemenFig
-      - id: ToyFigurineDevil # Goobstation
-        orGroup: SpacemenFig
-      - id: ToyFigurineFootsoldier
-        orGroup: SpacemenFig
-      - id: ToyFigurineWizardFake
-        orGroup: SpacemenFig
-      - id: ToyFigurineSlime
-        orGroup: SpacemenFig
-      - id: ToyFigurineGreytider
-        orGroup: SpacemenFig
-      - id: ToyFigurineWizard
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineNukieCommander
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineGriffin
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineOwlman
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineSkeleton
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineSkeleton
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineThief
-        prob: 0.30
-        orgroup: SpacemenFig
-      - id: ToyFigurineRatKing
-        prob: 0.30
-        orGroup: SpacemenFig
-      - id: ToyFigurineRatServant
-        prob: 0.40
-        orGroup: SpacemenFig
-      - id: ToyFigurineMouse
-        prob: 0.50
-        orGroup: SpacemenFig
-      - id: ToyFigurineQueen
-        prob: 0.25
-        orGroup: SpacemenFig
-      - id: ToyFigurineSpaceDragon
-        prob: 0.10
-        orGroup: SpacemenFig
-      - id: ToyFigurineHamlet
-        prob: 0.20
-        orGroup: SpacemenFig
-        # Begin DeltaV Additions
-      - id: ToyFigurineCJ
-        orGroup: SpacemenFig
-      - id: ToyFigurineClerk
-        orGroup: SpacemenFig
-      - id: ToyFigurineCorpsman
-        orGroup: SpacemenFig
-      - id: ToyFigurineGladiator
-        orGroup: SpacemenFig
-      - id: ToyFigurineMantis
-        orGroup: SpacemenFig
-      - id: ToyFigurinePrisoner
-        orGroup: SpacemenFig
-      - id: ToyFigurinePrisonGuard
-        orGroup: SpacemenFig
-      - id: ToyFigurineProsec
-        orGroup: SpacemenFig
-      - id: ToyFigurineRoboticist
-        orGroup: SpacemenFig
-      - id: ToyFigurineSlimechem
-        orGroup: SpacemenFig
-      - id: ToyFigurineLPO
-        orGroup: SpacemenFig
-        prob: 0.10
-      - id: ToyFigurineSynth
-        orGroup: SpacemenFig
-        prob: 0.10
-      - id: ToyFigurineRecruiter
-        orGroup: SpacemenFig
-        prob: 0.10
-      - id: ToyFigurineNeuroticist
-        orGroup: SpacemenFig
-        prob: 0.10
-      - id: ToyFigurineCosmicCultist
-        prob: 0.50
-        orGroup: SpacemenFig
-        # End DeltaV Additions
+      - !type:NestedSelector
+        tableId: AllFigurinesTable
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 5306306eb5..224ad8a125 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -1,11 +1,11 @@
-#HUMANOID FIGURINES
+# When adding new figurines, also add them to id: AllFigurinesTable
 
 - type: entity
+  abstract: true
   parent: BaseItem
   id: BaseFigurine
   name: figurine
   description: A small miniature.
-  abstract: true
   components:
   - type: Sprite
     sprite: Objects/Fun/figurines.rsi
@@ -34,6 +34,8 @@
     ports:
     - Trigger
 
+#HUMANOID FIGURINES
+
 - type: entity
   parent: BaseFigurine
   id: ToyFigurineHeadOfPersonnel
@@ -498,6 +500,37 @@
 
 #Nonhuman Figurines
 
+- type: entity
+  parent: BaseFigurine
+  id: ToyNuke
+  name: nuke toy
+  description: A plastic model of a Nuclear Fission Explosive. No uranium included... probably.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toy_nuke.rsi
+    state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/toy_nuke.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.12"
+  - type: Tag
+    tags:
+    - Figurine
+    - Payload
+  - type: UseDelay
+    delay: 180.0
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Machines/Nuke/nuke_alarm.ogg
+      params:
+        volume: -5
+        maxDistance: 10
+
 - type: entity
   parent: BaseFigurine
   id: ToyFigurineSpaceDragon
@@ -574,3 +607,24 @@
     state: hamlet
   - type: SpeakOnTrigger
     pack: FigurinesHamlet
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyAi
+  name: AI toy
+  description: A scaled-down toy AI core.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/AI.rsi
+    state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/AI.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.06"
+  - type: SpeakOnTrigger
+    pack: FigurinesAI
diff --git a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
index f04fa19a04..427dda8cfc 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
@@ -1,22 +1,16 @@
+# When adding new figurines, also add them to id: AllFigurineMechsTable
+
 #TODO give these the new base sprite used in the regular action figures.
 #No, not like a template. Just the base of the toy.
 - type: entity
-  parent: BaseItem
-  id: BaseFigurineMech
-  name: figurine
-  description: A small miniature.
   abstract: true
+  parent: BaseFigurine
+  id: BaseFigurineMech
   components:
   - type: Sprite
     sprite: Objects/Fun/mech_figurines.rsi
-  - type: PhysicalComposition
-    materialComposition:
-      Plastic: 100
-  - type: StaticPrice
-    price: 75
-  - type: Tag
-    tags:
-    - Figurine
+  - type: SpeakOnTrigger
+    pack: FigurinesMechGeneric
 
 #Ripley APLU
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 0231f70582..c5ffff7d64 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -129,85 +129,6 @@
       params:
         variation: 0.125
 
-## Cheapo Figurines
-
-- type: entity
-  parent: BaseItem
-  id: BaseFigurineCheapo
-  name: figurine
-  description: A small miniature.
-  abstract: true
-  components:
-  - type: PhysicalComposition
-    materialComposition:
-      Plastic: 100
-  - type: StaticPrice
-    price: 25
-  - type: Tag
-    tags:
-    - Figurine
-
-- type: entity
-  parent: BaseFigurineCheapo
-  id: ToyAi
-  name: AI toy
-  description: A scaled-down toy AI core.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/AI.rsi
-    state: icon
-  - type: Clothing
-    quickEquip: false
-    sprite: Objects/Fun/AI.rsi
-    slots:
-    - HEAD
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        offset: "0, 0.06"
-
-- type: entity
-  parent: BaseFigurineCheapo
-  id: ToyNuke
-  name: nuke toy
-  description: A plastic model of a Nuclear Fission Explosive. No uranium included... probably.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/toy_nuke.rsi
-    state: icon
-  - type: Clothing
-    quickEquip: false
-    sprite: Objects/Fun/toy_nuke.rsi
-    slots:
-    - HEAD
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        offset: "0, 0.12"
-  - type: Tag
-    tags:
-    - Payload
-  - type: UseDelay
-    delay: 180.0
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Machines/Nuke/nuke_alarm.ogg
-      params:
-        volume: -5
-        maxDistance: 10
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Machines/Nuke/nuke_alarm.ogg
-      params:
-        volume: -5
-        maxDistance: 10
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Machines/Nuke/nuke_alarm.ogg
-      params:
-        volume: -5
-        maxDistance: 10
-
 - type: entity
   parent: BasePlushie
   id: ToyIan
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index e9d4b66652..19e3ed66e6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -287,7 +287,7 @@
   id: PlungerLoot
   weights:
     RandomSpawner100: 56
-    SpacemenFigureSpawner: 28
+    SpacemenFigurineSpawner90: 28
     SpawnMobCockroach: 5
     MaintenanceToolSpawner: 5
     SpawnMobMoproach: 2
diff --git a/Resources/Prototypes/XenoArch/effects.yml b/Resources/Prototypes/XenoArch/effects.yml
index db495c409d..e7254f0841 100644
--- a/Resources/Prototypes/XenoArch/effects.yml
+++ b/Resources/Prototypes/XenoArch/effects.yml
@@ -541,10 +541,9 @@
         - !type:NestedSelector
           tableId: GenericTrashItems
           weight: 35
-        - !type:AllSelector
+        - !type:NestedSelector
+          tableId: AllPlushiesTable
           weight: 1
-          children:
-          - id: ToySpawner
 
 - type: entity
   id: XenoArtifactEffectLightFlicker

From 4a47f4784fea3945ab880c6afc9ca0bfb08e9f63 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sun, 14 Dec 2025 01:42:54 +0100
Subject: [PATCH 083/360] Don't remove borg access without power (#41844)

* init

* comment
---
 .../Silicons/Borgs/Components/BorgChassisComponent.cs          | 1 -
 Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs          | 2 --
 Content.Shared/Silicons/Borgs/SharedBorgSystem.cs              | 3 +++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index a6c63bc602..d7b90a1ac2 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
@@ -21,7 +21,6 @@ public sealed partial class BorgChassisComponent : Component
     /// <summary>
     /// Is this borg currently activated?
     /// If activated the borg
-    /// - has door access,
     /// - can use modules and
     /// - has full movement speed.
     /// To be activated the borg
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs
index 3f86abb568..842fcedf70 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs
@@ -50,7 +50,6 @@ public abstract partial class SharedBorgSystem
     /// <summary>
     /// Activates or deactivates a borg.
     /// If active the borg
-    /// - has door access,
     /// - can use modules and
     /// - has full movement speed.
     /// </summary>
@@ -67,7 +66,6 @@ public abstract partial class SharedBorgSystem
         else
             DisableAllModules(chassis.AsNullable());
 
-        _access.SetAccessEnabled(chassis.Owner, active); // Needs a player so that scientists can't drag around an empty borg for free AA.
         _powerCell.SetDrawEnabled(chassis.Owner, active);
         _movementSpeedModifier.RefreshMovementSpeedModifiers(chassis);
 
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 71818ca211..9c28f5eb04 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -199,6 +199,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
 
         TryActivate(chassis);
 
+        _access.SetAccessEnabled(chassis.Owner, true); // Needs a player so that scientists can't drag around an empty borg for free AA.
         _appearance.SetData(chassis.Owner, BorgVisuals.HasPlayer, true);
     }
 
@@ -211,6 +212,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
         // Turn off the light so that the no-player visuals can be seen.
         if (TryComp<HandheldLightComponent>(chassis.Owner, out var light))
             _handheldLight.TurnOff((chassis.Owner, light), makeNoise: false); // Already plays a sound when toggling the borg off.
+
+        _access.SetAccessEnabled(chassis.Owner, false); // Needs a player so that scientists can't drag around an empty borg for free AA.
         _appearance.SetData(chassis.Owner, BorgVisuals.HasPlayer, false);
     }
 

From de239579181035ad009e8b28474befb85259b0a7 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sun, 14 Dec 2025 03:04:28 +0100
Subject: [PATCH 084/360] Killsign cleanup (#41845)

* init

* rsi

* review

* scale

* it

* cat, dog, nerd

* rsi

* I just microbalanced animation speed

* raider, stinky resprite

* review

* HideFromOwner

* hidden smite

* copyright

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Administration/Systems/KillSignSystem.cs  |  65 ++++++++---
 .../Systems/AdminVerbSystem.Smites.cs         |  21 +++-
 .../Components/KillSignComponent.cs           |  43 +++++++-
 .../Locale/en-US/administration/smites.ftl    |   2 +
 .../Objects/Misc/killsign.rsi/bald.png        | Bin 0 -> 478 bytes
 .../Objects/Misc/killsign.rsi/cat.png         | Bin 0 -> 444 bytes
 .../Objects/Misc/killsign.rsi/dog.png         | Bin 0 -> 448 bytes
 .../Objects/Misc/killsign.rsi/furry.png       | Bin 0 -> 457 bytes
 .../Objects/Misc/killsign.rsi/icon-hidden.png | Bin 0 -> 248 bytes
 .../Textures/Objects/Misc/killsign.rsi/it.png | Bin 0 -> 367 bytes
 .../Misc/killsign.rsi/{sign.png => kill.png}  | Bin
 .../Objects/Misc/killsign.rsi/meta.json       | 102 +++++++++++++++++-
 .../Objects/Misc/killsign.rsi/nerd.png        | Bin 0 -> 490 bytes
 .../Objects/Misc/killsign.rsi/peak.png        | Bin 0 -> 460 bytes
 .../Objects/Misc/killsign.rsi/raider.png      | Bin 0 -> 443 bytes
 .../Objects/Misc/killsign.rsi/stinky.png      | Bin 0 -> 423 bytes
 16 files changed, 208 insertions(+), 25 deletions(-)
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/bald.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/cat.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/dog.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/furry.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/icon-hidden.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/it.png
 rename Resources/Textures/Objects/Misc/killsign.rsi/{sign.png => kill.png} (100%)
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/nerd.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/peak.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/raider.png
 create mode 100644 Resources/Textures/Objects/Misc/killsign.rsi/stinky.png

diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs
index f15cfe6442..f17c384c1e 100644
--- a/Content.Client/Administration/Systems/KillSignSystem.cs
+++ b/Content.Client/Administration/Systems/KillSignSystem.cs
@@ -1,46 +1,77 @@
 using System.Numerics;
 using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
+using Robust.Client.Player;
 
 namespace Content.Client.Administration.Systems;
 
 public sealed class KillSignSystem : EntitySystem
 {
     [Dependency] private readonly SpriteSystem _sprite = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<KillSignComponent, ComponentStartup>(KillSignAdded);
         SubscribeLocalEvent<KillSignComponent, ComponentShutdown>(KillSignRemoved);
+        SubscribeLocalEvent<KillSignComponent, AfterAutoHandleStateEvent>(AfterAutoHandleState);
     }
 
-    private void KillSignRemoved(EntityUid uid, KillSignComponent component, ComponentShutdown args)
+    private void KillSignRemoved(Entity<KillSignComponent> ent, ref ComponentShutdown args)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-            return;
-
-        if (!_sprite.LayerMapTryGet((uid, sprite), KillSignKey.Key, out var layer, false))
-            return;
-
-        _sprite.RemoveLayer((uid, sprite), layer);
+        RemoveKillsign(ent);
     }
 
-    private void KillSignAdded(EntityUid uid, KillSignComponent component, ComponentStartup args)
+    private void KillSignAdded(Entity<KillSignComponent> ent, ref ComponentStartup args)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
+        AddKillsign(ent);
+    }
+
+    private void AfterAutoHandleState(Entity<KillSignComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        // After receiving a new state for the component, we remove the old killsign and build a new one.
+        // This is so changes to the sprite can be displayed live and allowing them to be edited via ViewVariables.
+        // This could just update an existing sprite, but this is both easier and runs rarely anyway.
+        RemoveKillsign(ent);
+        AddKillsign(ent);
+    }
+
+    private void AddKillsign(Entity<KillSignComponent> ent)
+    {
+        // If we hide from owner and we ARE the owner, don't add a killsign.
+        // This could use session specific networking to FULLY hide it, but I am too lazy right now.
+        if (ent.Comp.HideFromOwner && _player.LocalEntity == ent)
             return;
 
-        if (_sprite.LayerMapTryGet((uid, sprite), KillSignKey.Key, out var _, false))
+        if (!TryComp<SpriteComponent>(ent, out var sprite))
             return;
 
-        var adj = _sprite.GetLocalBounds((uid, sprite)).Height / 2 + ((1.0f / 32) * 6.0f);
+        if (_sprite.LayerMapTryGet((ent, sprite), KillSignKey.Key, out var _, false))
+            return;
 
-        var layer = _sprite.AddLayer((uid, sprite), new SpriteSpecifier.Rsi(new ResPath("Objects/Misc/killsign.rsi"), "sign"));
-        _sprite.LayerMapSet((uid, sprite), KillSignKey.Key, layer);
+        if (ent.Comp.Sprite == null)
+            return;
 
-        _sprite.LayerSetOffset((uid, sprite), layer, new Vector2(0.0f, adj));
-        sprite.LayerSetShader(layer, "unshaded");
+        var adj = _sprite.GetLocalBounds((ent, sprite)).Height / 2 + ((1.0f / 32) * 6.0f);
+
+        var layer = _sprite.AddLayer((ent, sprite), ent.Comp.Sprite);
+        _sprite.LayerMapSet((ent, sprite), KillSignKey.Key, layer);
+        _sprite.LayerSetScale((ent, sprite), layer, ent.Comp.Scale);
+        _sprite.LayerSetOffset((ent, sprite), layer, ent.Comp.DoOffset ? new Vector2(0.0f, adj) : new Vector2(0.0f, 0.0f));
+
+        if (ent.Comp.ForceUnshaded)
+            sprite.LayerSetShader(layer, "unshaded");
+    }
+
+    private void RemoveKillsign(Entity<KillSignComponent> ent)
+    {
+        if (!TryComp<SpriteComponent>(ent, out var sprite))
+            return;
+
+        if (!_sprite.LayerMapTryGet((ent, sprite), KillSignKey.Key, out var layer, false))
+            return;
+
+        _sprite.RemoveLayer((ent, sprite), layer);
     }
 
     private enum KillSignKey
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 2ad927aac9..5301031636 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -573,13 +573,32 @@ public sealed partial class AdminVerbSystem
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/killsign.rsi"), "icon"),
                 Act = () =>
                 {
-                    EnsureComp<KillSignComponent>(args.Target);
+                    EnsureComp<KillSignComponent>(args.Target, out var comp);
+                    comp.HideFromOwner = false; // We set it to false anyway, in case the hidden smite was used beforehand.
+                    Dirty(args.Target, comp);
                 },
                 Impact = LogImpact.Extreme,
                 Message = string.Join(": ", killSignName, Loc.GetString("admin-smite-kill-sign-description"))
             };
             args.Verbs.Add(killSign);
 
+            var hiddenKillSignName = Loc.GetString("admin-smite-kill-sign-hidden-name").ToLowerInvariant();
+            Verb hiddenKillSign = new()
+            {
+                Text = hiddenKillSignName,
+                Category = VerbCategory.Smite,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/killsign.rsi"), "icon-hidden"),
+                Act = () =>
+                {
+                    EnsureComp<KillSignComponent>(args.Target, out var comp);
+                    comp.HideFromOwner = true;
+                    Dirty(args.Target, comp);
+                },
+                Impact = LogImpact.Extreme,
+                Message = string.Join(": ", hiddenKillSignName, Loc.GetString("admin-smite-kill-sign-hidden-description"))
+            };
+            args.Verbs.Add(hiddenKillSign);
+
             var cluwneName = Loc.GetString("admin-smite-cluwne-name").ToLowerInvariant();
             Verb cluwne = new()
             {
diff --git a/Content.Shared/Administration/Components/KillSignComponent.cs b/Content.Shared/Administration/Components/KillSignComponent.cs
index 34c36759cc..796a98a71d 100644
--- a/Content.Shared/Administration/Components/KillSignComponent.cs
+++ b/Content.Shared/Administration/Components/KillSignComponent.cs
@@ -1,6 +1,43 @@
-using Robust.Shared.GameStates;
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Administration.Components;
 
-[RegisterComponent, NetworkedComponent]
-public sealed partial class KillSignComponent : Component;
+/// <summary>
+/// Displays a sprite above an entity.
+/// By default a huge sign saying "KILL".
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(raiseAfterAutoHandleState: true)]
+public sealed partial class KillSignComponent : Component
+{
+    /// <summary>
+    /// The sprite show above the entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SpriteSpecifier? Sprite = new SpriteSpecifier.Rsi(new ResPath("Objects/Misc/killsign.rsi"), "kill");
+
+    /// <summary>
+    /// Whether the granted layer should always be forced to be unshaded.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ForceUnshaded = true;
+
+    /// <summary>
+    /// Whether the granted layer should be offset to be above the entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DoOffset = true;
+
+    /// <summary>
+    /// Prevents the sign from displaying to the owner of the component, allowing everyone but them to see it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool HideFromOwner = false;
+
+    /// <summary>
+    /// The scale of the sprite.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Vector2 Scale = Vector2.One;
+}
diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
index 4dc2b16d0e..caf9abe9b2 100644
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -59,6 +59,7 @@ admin-smite-vomit-organs-name = Vomit Organs
 admin-smite-ghostkick-name = Ghost Kick
 admin-smite-nyanify-name = Cat Ears
 admin-smite-kill-sign-name = Kill Sign
+admin-smite-kill-sign-hidden-name = Hidden Kill Sign
 admin-smite-omni-accent-name = Omni-Accent
 admin-smite-crawler-name = Crawler
 admin-smite-homing-rod-name = Homing Rod
@@ -83,6 +84,7 @@ admin-smite-become-bread-description = It turns them into bread. Really, that's
 admin-smite-ghostkick-description = Silently kicks the user, dropping their connection.
 admin-smite-nyanify-description = Forcibly add cat ears, there is no escape.
 admin-smite-kill-sign-description = Marks a player for death by their fellows.
+admin-smite-kill-sign-hidden-description = Marks a player for death by their fellows. Hidden from the targeted player.
 admin-smite-cluwne-description = Cluwnes them. The suit cannot be removed and the station's crew may murder them freely.
 admin-smite-anger-pointing-arrows-description = Angers the pointing arrows, causing them to assault this entity explosively.
 admin-smite-dust-description = Reduces the target to a small pile of ash.
diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/bald.png b/Resources/Textures/Objects/Misc/killsign.rsi/bald.png
new file mode 100644
index 0000000000000000000000000000000000000000..f821c632b4504b283e8de594f68e33bd27d76df4
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYkV!;ARA_<imd$DcK@7)ti}gWz5TQ_dkUmT4!6)(PlXxh7mf}GQ
zg6zQu(Ss#oBxF7^nVoU5%?}orotexe{wGP({Bv4-nJ%7Bhsn{Iu%CCWG>&69m%`Wi
z<^WHt$?5HN=6wHp`D~?e9K*RWyL`@r?=akeG)IHh-uur-(fzqSCjjsd!87h2y#}Q5
z5Ohr}2=EWV^SxPTjmPZb8XAP40(Q%-+DQqGO$eCQ$sC*F75M9n_y;P_-F)j!ST&*Y
z1ljJJuIheH04NX)p0zPRhsLc4rGa4ZtX(=OIsu>#LkaT*p(fN}*xMI`l0+5YL+T4+
z<gDRHeL)Q0nrIHt%AA)ssvH<Ydoe}zkvLyVmBVujzKaS-mA|IEB~84LD*x1yS@SyG
zCD;2j#OA1m(wRLKP{a8Ol<xSnl<xQp1*(J~l`&8f^!vR}6+kL|pd@XQRUbAKgxby{
zp&;Zq4`dyf2jN!EBRmMX&i4Y_Wca=5#uu<n9;$+!8OnKNQ0EQ9Fbu;m4CB7}1w8lv
U#ZaNo=Kufz07*qoM6N<$f+=v?3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/cat.png b/Resources/Textures/Objects/Misc/killsign.rsi/cat.png
new file mode 100644
index 0000000000000000000000000000000000000000..29ec8a251b84b4fb0359d9e4b431222f541ac4e3
GIT binary patch
literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYZb?KzRA_<im(8uhFbsgx2UENgXOP$cJ&6IhzA2aiF#}U@WdJ0^
z21t){Pj3rUaEq(T*iD^~9;iPls*+T8{1Yc}Zs26n#LjJs*<@Pxm-%ld&C!33lYPO-
zY|8KfGJfWZx<5L6XVM(~=eGK1^*3c8U)+zJfs#=ifBCg+Qr`z>pkx%s>2fZc)Ne9w
z6NC}-MV!vB-L@Lft8wgW!HD@HPUq`Pbk%rU=CwKiDGkU~Ykw=H0g3dpTVO~G-T|Gq
zfP|(nra)5|B?g}Xog4sFo{KgVCuo`@E(FlcMH@~5Xwnhah1M<b2`TP_%>X#|XjC<~
zxL80JjVgDGGv2_9S5v3GFOyQIJ<X(-8j!l6`G_fKMgXe9B0Y)_$ez%LPZy*|5dztx
zE!OJAN=`^^JR&(E#CRZR!PE(T8IMpWgc=_O-VWj0tKuhkJB&TGVje?qSt|OBe3OT6
m&|CB#dBZRa!!QiP_zdo{4$F~_P<|Bv0000<MNUMnLSTXkn7R7^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/dog.png b/Resources/Textures/Objects/Misc/killsign.rsi/dog.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e648e69cc34fa4854a8f3c81c2cb6b6fc362b6e
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYa!Eu%RA_<in9FU#KoExQBvo+onMmmXMWTRQQw23d)Ib$nDIgL`
z2a(|H6J11xU&^9k_A&eLLxTA(XqoZu&f8E`4^Hj+a#MYEug(0rUbdf>o}?4AhmY@O
z+r7UnuIuOB%z9SRiP-}@#a@W6xp7=alBe?bak_by8^?7dIprmEFrsFR!KOTlX6-VV
z%5y=~j4?2PN71ZZ22*(mF#}fBx<0hWglqQ;oVfq}8EpTk61ZoACC~@7_Df452U`2C
zl6d$G7~BDf`jkBcQ4jSH(E+{=KNh|Y-xt9iAl0ul+e>CYkm}br+hgS*ssy<4uF*(!
zBzY>_c-Ls8I+9!=B&T&LQYOTtZ3#RRtR66B#|A^b^(hXL8iO<vkv(XD#kcYxjYMQm
zYO_tgtj`HU8*lJAA;)--bz$y=v5YrxC*&Gm1e}12;B(Z2|H0Xq7^PFI<kuixcDgYm
qPr00pbFDvV6h%=KMNt$*iQ){Rqu@;v`J~wZ0000<MNUMnLSTXrBE#PR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/furry.png b/Resources/Textures/Objects/Misc/killsign.rsi/furry.png
new file mode 100644
index 0000000000000000000000000000000000000000..82597e87f99464320aa4b5493b6f018e72d41fa8
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYdr3q=RA_<imr-uQFbsxU)>G_>=S|`U6VeXAE2r2Qrk!D@*y|2}
zG;sqY_RQ06feL>$S8iknrzJ&zKPiG*RvrJb)1)XI$GLkxi}!jp{b~odg+7|U#jZW$
z|9<h;4sHv5G=Ga-dY*70w!7bESb5zoOZf9-V)j$~Y}U=N^6>pw!k;G>vrAO`;jQ>6
z&CxRe;l_^H5r9_AIuXr3W=CZ_PoKp1(TZUOE%7z~m>rcdpS`rUK`mefl|}ER<Ry_)
zTfhop(R(R*5~m{oCYsU)lvLR3lAVj7RT%6kZ9qwdy)N0g2)r^n0!Yw~E|o1$%3|*W
z?dZI037(Y2E};q_B_XX&E)k?8q`l!BBHT4)>bLsbNTod{RgPWXxgwHIUO2;RhZulr
z%6XbZyT)1un_lW^GI_F^2)UCdG!gnF4|+{F6k)97iBN>T$q$0AwD=u0@IQ2=9r_ik
zPP?e!pi^J!26>E)xb-D&kdEUxj^j9va|0XzoXBLJR}o)T00000NkvXXu0mjf5KPC_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/icon-hidden.png b/Resources/Textures/Objects/Misc/killsign.rsi/icon-hidden.png
new file mode 100644
index 0000000000000000000000000000000000000000..443177e07be311be1b0181baee46c5d1f61a973a
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6kO%$
z;usRqnw%iPx;R0kr-_lR$KV)KX4`+Q93CFC?;E>i15<wVpJkXJ<0HFCVwdENFO3;u
zNwHPW#ar4W*&Zh|8yr`%W)WAo#mMQe*mkgn<*_pJjMf`9y{8R*j#xE>F(|VX95r3a
za5pBRgJ++Bf*R{&X0}`@i2`<kxx5#J1-I?#(`S6_)uJNqa)cp?Yk?#40llT6_taS&
o6j}S2f||;KZVEKuYLjJPxP8!4(uiH(5$I|LPgg&ebxsLQ0ALzRGynhq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/it.png b/Resources/Textures/Objects/Misc/killsign.rsi/it.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd33d95ec58132596e670b59c259a215d3c7acc0
GIT binary patch
literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYAxT6*RA_<impcx^FbqHw1kCJANX&2n&cV#Yp_rIC2N!@DiHV(=
zA_bXZl}3q4+O(#s-x8&c>Q8LNR;uUdkVD6rGOq8dtJ0LLj$z-Jt#<0rJEJLC$iIgn
zhc1tNosY}=U$Ru3@41<a$+NUqDkEjd*-w@6-8dyn#c4e<z8j}x6odL^bsGr)w*lNp
z0Jsg{ruP8|>I3ZO4fiRV9g5<4dzSX0%??FWBg93~+}JeG?DUP`6pHEcnkbE!E-$7u
zf=U4R-!gC^r4dY2s=~m7Q=bdSlFhBTmjMPIocdfqmMjlhl>TUAeL-m2dBhilD$WCy
z47P*Nmh*@mgsRTh0_T5NTUGo4=YLo^^uOV99$|G}5ClOG1VIqG%?q@Wf)|BvCr$tW
N002ovPDHLkV1gLPo+<zU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/sign.png b/Resources/Textures/Objects/Misc/killsign.rsi/kill.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/killsign.rsi/sign.png
rename to Resources/Textures/Objects/Misc/killsign.rsi/kill.png
diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/meta.json b/Resources/Textures/Objects/Misc/killsign.rsi/meta.json
index f756df4139..f75f8d65d0 100644
--- a/Resources/Textures/Objects/Misc/killsign.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/killsign.rsi/meta.json
@@ -1,25 +1,119 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Created by github user @moonheart08",
+    "copyright": "Created by github user @moonheart08 | bald, cat, dog, furry, it, nerd, peak, raider, stinky and icon-hidden states edited by ScarKy0(Github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "sign",
+            "name": "bald",
             "directions": 1,
             "delays": [
                 [
-                    0.1,
-                    0.1
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "cat",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "dog",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "furry",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "it",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "kill",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "nerd",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "peak",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "raider",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
+                ]
+            ]
+        },
+        {
+            "name": "stinky",
+            "directions": 1,
+            "delays": [
+                [
+                    0.15,
+                    0.15
                 ]
             ]
         },
         {
             "name": "icon",
             "directions": 1
+        },
+        {
+            "name": "icon-hidden",
+            "directions": 1
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/nerd.png b/Resources/Textures/Objects/Misc/killsign.rsi/nerd.png
new file mode 100644
index 0000000000000000000000000000000000000000..0829fe7bf7fabd99e959f8b4587cac003344dc8a
GIT binary patch
literal 490
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!QddeWoSh3W;jDdl1
zj;D)bNJit^>AqgfjsmULuQX#)*FNBN`M{88+nO$LenRk$uMCVI*_zg+Kh;(F)THWq
ze)Y_Mr%fjPQb@UE`ZxG$=z42K8B6WT8!gB0KK-S1hwu9q-+9S8vwMVZfB7-%?XSx6
z;!;_^_;cZF5W){ybeFNtuvos=^nQ7K$-Eu4A`LrPli0tu-?VG<zvX{x`LhjTdI=zY
z-2M9*_L<j<WptP&_#bw%rE6~BEG#&8qx;6fl~KLyTXU8sv_HCg)$DKde)H+JJ%Ma5
zOi~w3?-D&=Su)G$qW4j*gfkk<6PC?x)VA{|Tyv%J<!;`XkB(i*E6*{nV%)klDw=Ce
zSn&zX)@4c-%fDQUT_if~68D>Z4z2<bOAS<;R{jk--7)ph6pm%zF4v0LvN`tJZBcNS
z?`zusyQu%9s<hX+_hJgt-=r>lE@R6QxxZ4yTi{urVTzDn<Ev1~i26>}l%RDd()6!!
z9a=b7e2u~s3;r%K8TLfY=dBhTOV5QjDkLcWh%0#%Z(#1%AE$m}UfenE*tz90#|wdI
c&i}LgJq$9A%`C3$z{q3pboFyt=akR{0P>E}Jpcdz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/peak.png b/Resources/Textures/Objects/Misc/killsign.rsi/peak.png
new file mode 100644
index 0000000000000000000000000000000000000000..165c6c56e520f0d0dbfcc22a3caa55bcd01f8404
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYen~_@RA_<im%)+3FbqWv!+j}$GsAI9*aOwj11EZ*8V;1eac9q4
zz-|Qrg$QItj_f3khe2<~WHL&OzNA>Tb8pV9{ym;6xBhHfx69#nwBfVB>96wMzug};
zAFbE-tJ!dSV|zS%<M3NmXrH&eCZMBZf^+^{)JM_LF?opp{;%&Bo|R@v$||)>Xca-l
z@4i}d(JV<>_3Q##MR?*HU%M+{Oce3Ck;DUj1!yJD?OH`}6!BWgbGud%94;Q{u7Fg5
z8i|=t6{sTU39kW>6L`c_P{$n6-*|wS3gUB2w+7&<pQE!xfU7<a(zpSD?81;*9F%|N
zAV7BO(TL@~NkK>p060!ZDg%Q6j?<C+|3VO^`vedggc6V-7!J<@g%&342syUAF~E9p
zZ-XUE(mhvbqX20;t<WI{$-U1H9C8q8tE-XjY$ym*9dbfv{~qFjeh%{>Ont&*LFg-f
z7!U;L9&jxI1Od87sSZ|CN<30jykQuIVHk#CyfjzU8~+6I2`?-F0000<MNUMnLSTX#
CX24(o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/raider.png b/Resources/Textures/Objects/Misc/killsign.rsi/raider.png
new file mode 100644
index 0000000000000000000000000000000000000000..278d2a3d9ee540922cbb51aa0de64430cb796269
GIT binary patch
literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYZAnByRA_<imc35HFcgKaQDH-3XF}=>6BAu|h0aX81`om3iJ9l%
z1<H)X#Li4BxjKZKT1PgqlO`78ev6Zn*!R~?L=3|){xR<9T>SiGFD%~0>2>%_b=CNu
z=g0Jzwq73l%d_p?p_Om#htE`3jqiDWOpj?tnThJ;?W-AIF2o;d%@STeXWyg0cSZKw
z1fUuSLIVgZ9qK9WKAQI!%n!RNW(%Mi2tor0D;?@7uAVnelMsUWVOO!OgLOa(1X-&q
z0D}B2d2PznNv_sV=XpK0wZ3ky8z;BI)l$7LydK+1ZUNT2-~&#HbwJJ*V7&`I;FMSg
zjIsszYcVzawJ<VqH4i9ob6dAyvz+}sCZ`$u+Zd6e{!5+o3c3kDL_?iQkvi!Wob31^
zDp|AG*;Eq74qizmp-=Fjm&2Tdse)HH34Mbf1d@O+2*ybb|9~XmM+RdJ`|>CcQY(11
lUoCjUFbu;m48!>Q>;V4g^rOpyR{8({002ovPDHLkV1nEm!KDBI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/killsign.rsi/stinky.png b/Resources/Textures/Objects/Misc/killsign.rsi/stinky.png
new file mode 100644
index 0000000000000000000000000000000000000000..1924bd354d979119b085a931831b815be0b052a1
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm001r{
z001r{0eGc9b^rhYSxH1eRA_<imQ8BIFc5`h<K`e;gg~Hl5ptH2MNiUYPm)FGSwa`3
zP$*vHAj!hX3w>sgB`Z-Ro6z~dSm?*2_eRKLjG`#YKc<+y&71x7(01%z>rS6*EL9sU
zpBHV6kEc!XxSlq$&o!2+U1l(~#b@MD_>7cPY#=La|Gxj6+cIOJK&I~YQ+#MWKvv{l
zcBc=@jP<R3`Cc{Kug^|D#rLgmPXL0Qg+wr^AB->4wy~ItIJU76fhQ(D#QQRB8;iM!
zLt{&93Io_!EEHx#v92`~k2f~r%HX9?m<`3c*3g&|$DA2Sjm)@j4#t>~)X0qc=48DD
zl{=t_z4%g*<LF;Qb<5?Kf~|?a{FDR)3lvGHvcqX&5tV~bWrrL8lA=p;^=5r0<Q7kS
zCd7ybQ5&{R7)m^`O^6kL6D*+c9yIVDETBgHi;X3ojQtB&6h%=KMNyPH<_K()6vJau
RIsX6v002ovPDHLkV1jE9xi|m-

literal 0
HcmV?d00001


From 9ce1ce5be523045ca6021b10736e5e43224f9492 Mon Sep 17 00:00:00 2001
From: Mehnix <56132549+Mehnix@users.noreply.github.com>
Date: Sun, 14 Dec 2025 02:07:28 +0000
Subject: [PATCH 085/360] Edible Produce are now also Butcherable (#36786)

Butcherable Produce

Adds Butcherable capabilities to Bananas, Mimanas, Corn, Gatfruit, Capfruit, Bungo, and Cherries.

Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 .../Objects/Consumable/Food/produce.yml       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index c63b6e9600..c714fa863e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -337,6 +337,10 @@
   - type: Edible
     trash:
     - TrashBananaPeel
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: TrashBananaPeel
   - type: SolutionContainerManager
     solutions:
       food:
@@ -379,6 +383,10 @@
   - type: Edible
     trash:
     - TrashMimanaPeel
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: TrashMimanaPeel
   - type: SolutionContainerManager
     solutions:
       food:
@@ -1206,6 +1214,10 @@
   - type: Edible
     trash:
     - FoodCornTrash
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: FoodCornTrash #no idea why you'd ever do this, but it's just here for consistency
   - type: SolutionContainerManager
     solutions:
       food:
@@ -1909,6 +1921,10 @@
   - type: Edible
     trash:
     - WeaponRevolverPython
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: WeaponRevolverPython
   - type: Tag
     tags:
     - Fruit # It's in the name
@@ -1944,6 +1960,10 @@
   - type: Edible
     trash:
     - RevolverCapGun
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: RevolverCapGun
   - type: Tag
     tags:
     - Fruit
@@ -1963,6 +1983,10 @@
   - type: Edible
     trash:
     - RevolverCapGunFake
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: RevolverCapGunFake
 
 - type: entity
   name: rice bushel
@@ -2367,6 +2391,10 @@
   - type: Edible
     trash:
     - FoodBungoPit
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: FoodBungoPit
   - type: SolutionContainerManager
     solutions:
       food:
@@ -2668,6 +2696,10 @@
   - type: Edible
     trash:
     - TrashCherryPit
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: TrashCherryPit
   - type: SolutionContainerManager
     solutions:
       food:

From f11978b28d47c838c83216216abf8e7b63e8e94c Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sun, 14 Dec 2025 03:11:58 +0100
Subject: [PATCH 086/360] TriggerOnUserInteractHand and
 TriggerOnUserInteractUsing (#41843)

* init

* handle check

* oops

* cleanup

* fix resolve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Systems/FireStackOnTriggerSystem.cs       |  11 +-
 Content.Shared/Interaction/InteractHand.cs    | 101 +++++++++-------
 Content.Shared/Interaction/InteractUsing.cs   | 110 ++++++++++++------
 .../Interaction/SharedInteractionSystem.cs    |  12 +-
 .../TriggerOnUserInteractHandComponent.cs     |  18 +++
 .../TriggerOnUserInteractUsingComponent.cs    |  40 +++++++
 .../Systems/TriggerSystem.Interaction.cs      |  27 +++++
 7 files changed, 240 insertions(+), 79 deletions(-)
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractHandComponent.cs
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractUsingComponent.cs

diff --git a/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs b/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs
index af3298b865..b1d89bda05 100644
--- a/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Trigger;
 using Content.Shared.Trigger.Components.Effects;
 
@@ -31,7 +32,10 @@ public sealed class FireStackOnTriggerSystem : EntitySystem
         if (target == null)
             return;
 
-        _flame.AdjustFireStacks(target.Value, ent.Comp.FireStacks, ignite: ent.Comp.DoIgnite);
+        if (!TryComp<FlammableComponent>(target.Value, out var flammable))
+            return;
+
+        _flame.AdjustFireStacks(target.Value, ent.Comp.FireStacks, ignite: ent.Comp.DoIgnite, flammable: flammable);
 
         args.Handled = true;
     }
@@ -46,7 +50,10 @@ public sealed class FireStackOnTriggerSystem : EntitySystem
         if (target == null)
             return;
 
-        _flame.Extinguish(target.Value);
+        if (!TryComp<FlammableComponent>(target.Value, out var flammable))
+            return;
+
+        _flame.Extinguish(target.Value, flammable: flammable);
 
         args.Handled = true;
     }
diff --git a/Content.Shared/Interaction/InteractHand.cs b/Content.Shared/Interaction/InteractHand.cs
index 1d2df4c28b..f6bf7dd231 100644
--- a/Content.Shared/Interaction/InteractHand.cs
+++ b/Content.Shared/Interaction/InteractHand.cs
@@ -1,54 +1,75 @@
 using JetBrains.Annotations;
-using Robust.Shared.Map;
 
-namespace Content.Shared.Interaction
+namespace Content.Shared.Interaction;
+
+public sealed class InteractHandEventArgs : EventArgs, ITargetedInteractEventArgs
 {
-    public sealed class InteractHandEventArgs : EventArgs, ITargetedInteractEventArgs
+    public InteractHandEventArgs(EntityUid user, EntityUid target)
     {
-        public InteractHandEventArgs(EntityUid user, EntityUid target)
-        {
-            User = user;
-            Target = target;
-        }
-
-        public EntityUid User { get; }
-        public EntityUid Target { get; }
+        User = user;
+        Target = target;
     }
 
+    public EntityUid User { get; }
+    public EntityUid Target { get; }
+}
+
+/// <summary>
+///     Raised directed on a target entity when it is interacted with by a user with an empty hand.
+/// </summary>
+[PublicAPI]
+public sealed class InteractHandEvent : HandledEntityEventArgs, ITargetedInteractEventArgs
+{
     /// <summary>
-    ///     Raised directed on a target entity when it is interacted with by a user with an empty hand.
+    ///     Entity that triggered the interaction.
     /// </summary>
-    [PublicAPI]
-    public sealed class InteractHandEvent : HandledEntityEventArgs, ITargetedInteractEventArgs
-    {
-        /// <summary>
-        ///     Entity that triggered the interaction.
-        /// </summary>
-        public EntityUid User { get; }
-
-        /// <summary>
-        ///     Entity that was interacted on.
-        /// </summary>
-        public EntityUid Target { get; }
-
-        public InteractHandEvent(EntityUid user, EntityUid target)
-        {
-            User = user;
-            Target = target;
-        }
-    }
+    public EntityUid User { get; }
 
     /// <summary>
-    /// Raised on the user before interacting on an entity with bare hand.
-    /// Interaction is cancelled if this event is handled, so set it to true if you do custom interaction logic.
+    ///     Entity that was interacted on.
     /// </summary>
-    public sealed class BeforeInteractHandEvent : HandledEntityEventArgs
-    {
-        public EntityUid Target { get; }
+    public EntityUid Target { get; }
 
-        public BeforeInteractHandEvent(EntityUid target)
-        {
-            Target = target;
-        }
+    public InteractHandEvent(EntityUid user, EntityUid target)
+    {
+        User = user;
+        Target = target;
+    }
+}
+
+/// <summary>
+/// Raised directed on the user when they interact with an entity with an empty hand.
+/// </summary>
+[PublicAPI]
+public sealed class UserInteractHandEvent : HandledEntityEventArgs, ITargetedInteractEventArgs
+{
+    /// <summary>
+    ///     Entity that triggered the interaction.
+    /// </summary>
+    public EntityUid User { get; }
+
+    /// <summary>
+    ///     Entity that was interacted on.
+    /// </summary>
+    public EntityUid Target { get; }
+
+    public UserInteractHandEvent(EntityUid user, EntityUid target)
+    {
+        User = user;
+        Target = target;
+    }
+}
+
+/// <summary>
+/// Raised on the user before interacting on an entity with bare hand.
+/// Interaction is cancelled if this event is handled, so set it to true if you do custom interaction logic.
+/// </summary>
+public sealed class BeforeInteractHandEvent : HandledEntityEventArgs
+{
+    public EntityUid Target { get; }
+
+    public BeforeInteractHandEvent(EntityUid target)
+    {
+        Target = target;
     }
 }
diff --git a/Content.Shared/Interaction/InteractUsing.cs b/Content.Shared/Interaction/InteractUsing.cs
index 3ebf40a517..7d3d4e978e 100644
--- a/Content.Shared/Interaction/InteractUsing.cs
+++ b/Content.Shared/Interaction/InteractUsing.cs
@@ -2,45 +2,85 @@ using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Interaction
+namespace Content.Shared.Interaction;
+
+/// <summary>
+///     Raised when a target entity is interacted with by a user while holding an object in their hand.
+/// </summary>
+[PublicAPI]
+public sealed class InteractUsingEvent : HandledEntityEventArgs
 {
     /// <summary>
-    ///     Raised when a target entity is interacted with by a user while holding an object in their hand.
+    ///     Entity that triggered the interaction.
     /// </summary>
-    [PublicAPI]
-    public sealed class InteractUsingEvent : HandledEntityEventArgs
+    public EntityUid User { get; }
+
+    /// <summary>
+    ///     Entity that the user used to interact.
+    /// </summary>
+    public EntityUid Used { get; }
+
+    /// <summary>
+    ///     Entity that was interacted on.
+    /// </summary>
+    public EntityUid Target { get; }
+
+    /// <summary>
+    ///     The original location that was clicked by the user.
+    /// </summary>
+    public EntityCoordinates ClickLocation { get; }
+
+    public InteractUsingEvent(EntityUid user, EntityUid used, EntityUid target, EntityCoordinates clickLocation)
     {
-        /// <summary>
-        ///     Entity that triggered the interaction.
-        /// </summary>
-        public EntityUid User { get; }
+        // Interact using should not have the same used and target.
+        // That should be a use-in-hand event instead.
+        // If this is not the case, can lead to bugs (e.g., attempting to merge a item stack into itself).
+        DebugTools.Assert(used != target);
 
-        /// <summary>
-        ///     Entity that the user used to interact.
-        /// </summary>
-        public EntityUid Used { get; }
-
-        /// <summary>
-        ///     Entity that was interacted on.
-        /// </summary>
-        public EntityUid Target { get; }
-
-        /// <summary>
-        ///     The original location that was clicked by the user.
-        /// </summary>
-        public EntityCoordinates ClickLocation { get; }
-
-        public InteractUsingEvent(EntityUid user, EntityUid used, EntityUid target, EntityCoordinates clickLocation)
-        {
-            // Interact using should not have the same used and target.
-            // That should be a use-in-hand event instead.
-            // If this is not the case, can lead to bugs (e.g., attempting to merge a item stack into itself).
-            DebugTools.Assert(used != target);
-
-            User = user;
-            Used = used;
-            Target = target;
-            ClickLocation = clickLocation;
-        }
+        User = user;
+        Used = used;
+        Target = target;
+        ClickLocation = clickLocation;
     }
 }
+
+/// <summary>
+/// Raised when a user entity interacts with a target while holding an object in their hand.
+/// </summary>
+[PublicAPI]
+public sealed class UserInteractUsingEvent : HandledEntityEventArgs
+{
+    /// <summary>
+    ///     Entity that triggered the interaction.
+    /// </summary>
+    public EntityUid User { get; }
+
+    /// <summary>
+    ///     Entity that the user used to interact.
+    /// </summary>
+    public EntityUid Used { get; }
+
+    /// <summary>
+    ///     Entity that was interacted on.
+    /// </summary>
+    public EntityUid Target { get; }
+
+    /// <summary>
+    ///     The original location that was clicked by the user.
+    /// </summary>
+    public EntityCoordinates ClickLocation { get; }
+
+    public UserInteractUsingEvent(EntityUid user, EntityUid used, EntityUid target, EntityCoordinates clickLocation)
+    {
+        // Interact using should not have the same used and target.
+        // That should be a use-in-hand event instead.
+        // If this is not the case, can lead to bugs (e.g., attempting to merge a item stack into itself).
+        DebugTools.Assert(used != target);
+
+        User = user;
+        Used = used;
+        Target = target;
+        ClickLocation = clickLocation;
+    }
+}
+
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 5542437bab..01ff36c53e 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -525,12 +525,16 @@ namespace Content.Shared.Interaction
             }
 
             DebugTools.Assert(!IsDeleted(user) && !IsDeleted(target));
+
             // all interactions should only happen when in range / unobstructed, so no range check is needed
             var message = new InteractHandEvent(user, target);
             RaiseLocalEvent(target, message, true);
+            var userMessage = new UserInteractHandEvent(user, target);
+            RaiseLocalEvent(user, userMessage, true);
+
             _adminLogger.Add(LogType.InteractHand, LogImpact.Low, $"{user} interacted with {target}");
             DoContactInteraction(user, target, message);
-            if (message.Handled)
+            if (message.Handled || userMessage.Handled)
                 return true;
 
             DebugTools.Assert(!IsDeleted(user) && !IsDeleted(target));
@@ -1063,10 +1067,14 @@ namespace Content.Shared.Interaction
             // all interactions should only happen when in range / unobstructed, so no range check is needed
             var interactUsingEvent = new InteractUsingEvent(user, used, target, clickLocation);
             RaiseLocalEvent(target, interactUsingEvent, true);
+
+            var userInteractUsingEvent = new UserInteractUsingEvent(user, used, target, clickLocation);
+            RaiseLocalEvent(user, userInteractUsingEvent, true);
+
             DoContactInteraction(user, used, interactUsingEvent);
             DoContactInteraction(user, target, interactUsingEvent);
             // Contact interactions are currently only used for forensics, so we don't raise used -> target
-            if (interactUsingEvent.Handled)
+            if (interactUsingEvent.Handled || userInteractUsingEvent.Handled)
                 return true;
 
             if (InteractDoAfter(user, used, target, clickLocation, canReach: true, checkDeletion: false))
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractHandComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractHandComponent.cs
new file mode 100644
index 0000000000..58deef945a
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractHandComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Interaction;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Trigger on <see cref="UserInteractHandEvent"/>, aka when owner clicks on an entity with an empty hand.
+/// The trigger user is the entity that got interacted with.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUserInteractHandComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Whether the interaction should be marked as handled after it happens.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Handle = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractUsingComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractUsingComponent.cs
new file mode 100644
index 0000000000..0550b3bbaf
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUserInteractUsingComponent.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Interaction;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the owner uses another entity to interact with another entity (<see cref="UserInteractUsingEvent"/>).
+/// The trigger user is the interacted entity or the item used, depending on the TargetUsed datafield.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUserInteractUsingComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Whitelist of entities that can be used to trigger this component.
+    /// </summary>
+    /// <remarks>No whitelist check when null.</remarks>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist of entities that cannot be used to trigger this component.
+    /// </summary>
+    /// <remarks>No blacklist check when null.</remarks>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// If false, the trigger user will be the entity that got interacted with.
+    /// If true, the trigger user will the entity that was used to interact.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetUsed = false;
+
+    /// <summary>
+    /// Whether the interaction should be marked as handled after it happens.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Handle = true;
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
index 944239ccf8..922762973c 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
@@ -16,7 +16,9 @@ public sealed partial class TriggerSystem
         SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
         SubscribeLocalEvent<TriggerOnUseComponent, UseInHandEvent>(OnUse);
         SubscribeLocalEvent<TriggerOnInteractHandComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<TriggerOnUserInteractHandComponent, UserInteractHandEvent>(OnUserInteractHand);
         SubscribeLocalEvent<TriggerOnInteractUsingComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<TriggerOnUserInteractUsingComponent, UserInteractUsingEvent>(OnUserInteractUsing);
 
         SubscribeLocalEvent<TriggerOnThrowComponent, ThrowEvent>(OnThrow);
         SubscribeLocalEvent<TriggerOnThrownComponent, ThrownEvent>(OnThrown);
@@ -64,6 +66,17 @@ public sealed partial class TriggerSystem
         args.Handled = true;
     }
 
+    private void OnUserInteractHand(Entity<TriggerOnUserInteractHandComponent> ent, ref UserInteractHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        Trigger(ent.Owner, args.Target, ent.Comp.KeyOut);
+
+        if (ent.Comp.Handle)
+            args.Handled = true;
+    }
+
     private void OnInteractUsing(Entity<TriggerOnInteractUsingComponent> ent, ref InteractUsingEvent args)
     {
         if (args.Handled)
@@ -76,6 +89,20 @@ public sealed partial class TriggerSystem
         args.Handled = true;
     }
 
+    private void OnUserInteractUsing(Entity<TriggerOnUserInteractUsingComponent> ent, ref UserInteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!_whitelist.CheckBoth(args.Used, ent.Comp.Blacklist, ent.Comp.Whitelist))
+            return;
+
+        Trigger(ent.Owner, ent.Comp.TargetUsed ? args.Used : args.Target, ent.Comp.KeyOut);
+
+        if (ent.Comp.Handle)
+            args.Handled = true;
+    }
+
     private void OnThrow(Entity<TriggerOnThrowComponent> ent, ref ThrowEvent args)
     {
         Trigger(ent.Owner, args.Thrown, ent.Comp.KeyOut);

From 56b3ef91d7d184f7fd7dc472b7d9ec670ee1e797 Mon Sep 17 00:00:00 2001
From: AshBats <119367329+AshBats@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:15:58 +1100
Subject: [PATCH 087/360] Admin log now shows APC power toggle interactions
 (#41839)

Added logging to the APC's toggle interaction
---
 .../Power/EntitySystems/ApcSystem.cs          | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs
index db0f221689..9487c50348 100644
--- a/Content.Server/Power/EntitySystems/ApcSystem.cs
+++ b/Content.Server/Power/EntitySystems/ApcSystem.cs
@@ -2,7 +2,9 @@ using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.Pow3r;
 using Content.Shared.Access.Systems;
+using Content.Shared.Administration.Logs;
 using Content.Shared.APC;
+using Content.Shared.Database;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Emp;
 using Content.Shared.Popups;
@@ -18,6 +20,7 @@ namespace Content.Server.Power.EntitySystems;
 public sealed class ApcSystem : EntitySystem
 {
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
@@ -112,7 +115,7 @@ public sealed class ApcSystem : EntitySystem
 
         if (_accessReader.IsAllowed(args.Actor, uid))
         {
-            ApcToggleBreaker(uid, component);
+            ApcToggleBreaker(uid, component, user: args.Actor);
         }
         else
         {
@@ -121,7 +124,12 @@ public sealed class ApcSystem : EntitySystem
         }
     }
 
-    public void ApcToggleBreaker(EntityUid uid, ApcComponent? apc = null, PowerNetworkBatteryComponent? battery = null)
+    /// <summary>Toggles the enabled state of the APC's main breaker.</summary>
+    public void ApcToggleBreaker(
+        EntityUid uid,
+        ApcComponent? apc = null,
+        PowerNetworkBatteryComponent? battery = null,
+        EntityUid? user = null)
     {
         if (!Resolve(uid, ref apc, ref battery))
             return;
@@ -134,6 +142,13 @@ public sealed class ApcSystem : EntitySystem
 
         UpdateUIState(uid, apc);
         _audio.PlayPvs(apc.OnReceiveMessageSound, uid, AudioParams.Default.WithVolume(-2f));
+
+        if (user != null)
+        {
+            var humanReadableState = apc.MainBreakerEnabled ? "Enabled" : "Disabled";
+            _adminLogger.Add(LogType.ItemConfigure, LogImpact.Medium,
+                $"{ToPrettyString(user):user} set the main breaker state of {ToPrettyString(uid):entity} to {humanReadableState:state}.");
+        }
     }
 
     private void OnEmagged(EntityUid uid, ApcComponent comp, ref GotEmaggedEvent args)

From 0b2c9671d6effd77b1481ad2fc5c997f3824c6e9 Mon Sep 17 00:00:00 2001
From: Borsh <85323386+NeBorsh@users.noreply.github.com>
Date: Sun, 14 Dec 2025 22:15:22 +0300
Subject: [PATCH 088/360] Adding a random gate (#41627)

* Added random gate

* minor edit

* cleaning up my shit after trying to do something faster

* new lines

* some changes

* joke

* UI

* Long Division

* Dont use ctrl + x in 3 am

* I hope these are the final touches

* One thing, I don't know why

* noname commit

* no way, 1kk of code lines edit

* sudo rm -rf ... and something there...

* update

* sometimes its sad
---
 .../DeviceLinking/Systems/RandomGateSystem.cs |   5 +++
 .../UI/RandomGateBoundUserInterface.cs        |  37 ++++++++++++++++++
 .../UI/RandomGateSetupWindow.xaml             |  19 +++++++++
 .../UI/RandomGateSetupWindow.xaml.cs          |  28 +++++++++++++
 .../DeviceLinking/Systems/RandomGateSystem.cs |  32 +++++++++++++++
 .../Components/RandomGateComponent.cs         |  35 +++++++++++++++++
 .../DeviceLinking/SharedRandomGateEvents.cs   |  21 ++++++++++
 .../Systems/SharedRandomGateSystem.cs         |  35 +++++++++++++++++
 .../Locale/en-US/deviceLinking/randomgate.ftl |   3 ++
 .../en-US/machine-linking/receiver_ports.ftl  |   3 ++
 .../Prototypes/DeviceLinking/sink_ports.yml   |   5 +++
 .../Prototypes/Entities/Structures/gates.yml  |  26 ++++++++++++
 .../Construction/Graphs/tools/logic_gate.yml  |  22 +++++++++++
 .../Prototypes/Recipes/Construction/tools.yml |   8 ++++
 .../Objects/Devices/gates.rsi/meta.json       |   5 ++-
 .../Objects/Devices/gates.rsi/random_gate.png | Bin 0 -> 215 bytes
 16 files changed, 283 insertions(+), 1 deletion(-)
 create mode 100644 Content.Client/DeviceLinking/Systems/RandomGateSystem.cs
 create mode 100644 Content.Client/DeviceLinking/UI/RandomGateBoundUserInterface.cs
 create mode 100644 Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml
 create mode 100644 Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml.cs
 create mode 100644 Content.Server/DeviceLinking/Systems/RandomGateSystem.cs
 create mode 100644 Content.Shared/DeviceLinking/Components/RandomGateComponent.cs
 create mode 100644 Content.Shared/DeviceLinking/SharedRandomGateEvents.cs
 create mode 100644 Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs
 create mode 100644 Resources/Locale/en-US/deviceLinking/randomgate.ftl
 create mode 100644 Resources/Textures/Objects/Devices/gates.rsi/random_gate.png

diff --git a/Content.Client/DeviceLinking/Systems/RandomGateSystem.cs b/Content.Client/DeviceLinking/Systems/RandomGateSystem.cs
new file mode 100644
index 0000000000..db0d956c72
--- /dev/null
+++ b/Content.Client/DeviceLinking/Systems/RandomGateSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.DeviceLinking.Systems;
+
+namespace Content.Client.DeviceLinking.Systems;
+
+public sealed class RandomGateSystem : SharedRandomGateSystem;
diff --git a/Content.Client/DeviceLinking/UI/RandomGateBoundUserInterface.cs b/Content.Client/DeviceLinking/UI/RandomGateBoundUserInterface.cs
new file mode 100644
index 0000000000..c8c97b84c6
--- /dev/null
+++ b/Content.Client/DeviceLinking/UI/RandomGateBoundUserInterface.cs
@@ -0,0 +1,37 @@
+using Content.Shared.DeviceLinking;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeviceLinking.UI;
+
+[UsedImplicitly]
+public sealed class RandomGateBoundUserInterface : BoundUserInterface
+{
+    private RandomGateSetupWindow? _window;
+
+    public RandomGateBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+    protected override void Open()
+    {
+        base.Open();
+        _window = this.CreateWindow<RandomGateSetupWindow>();
+        _window.OnApplyPressed += OnProbabilityChanged;
+    }
+
+    private void OnProbabilityChanged(string value)
+    {
+        if (!float.TryParse(value, out var probability))
+            return;
+
+        SendPredictedMessage(new RandomGateProbabilityChangedMessage(probability));
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+        if (state is not RandomGateBoundUserInterfaceState castState || _window == null)
+            return;
+
+        _window.SetProbability(castState.SuccessProbability * 100);
+    }
+}
diff --git a/Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml b/Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml
new file mode 100644
index 0000000000..d9273c9110
--- /dev/null
+++ b/Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml
@@ -0,0 +1,19 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+            Title="{Loc 'random-gate-menu-setup'}"
+            MinSize="260 115">
+    <BoxContainer Orientation="Vertical" Margin="5" SeparationOverride="10">
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Label Text="{Loc 'random-gate-menu-settings'}" VerticalAlignment="Center" />
+            <Control HorizontalExpand="True" />
+            <LineEdit Name="ProbabilityInput" MinSize="70 0" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Control HorizontalExpand="True" />
+            <Button Name="ApplyButton"
+                    Text="{Loc 'random-gate-menu-apply'}"
+                    HorizontalAlignment="Right" />
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml.cs b/Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml.cs
new file mode 100644
index 0000000000..64e0690072
--- /dev/null
+++ b/Content.Client/DeviceLinking/UI/RandomGateSetupWindow.xaml.cs
@@ -0,0 +1,28 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeviceLinking.UI;
+
+/// <summary>
+/// Window for setting up the random gate probability.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class RandomGateSetupWindow : FancyWindow
+{
+    /// <summary>
+    /// Event triggered when the "Apply" button is pressed.
+    /// </summary>
+    public event Action<string>? OnApplyPressed;
+
+    public RandomGateSetupWindow()
+    {
+        RobustXamlLoader.Load(this);
+        ApplyButton.OnPressed += _ => OnApplyPressed?.Invoke(ProbabilityInput.Text);
+    }
+
+    public void SetProbability(float probability)
+    {
+        ProbabilityInput.Text = probability.ToString("0.00");
+    }
+}
diff --git a/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs b/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs
new file mode 100644
index 0000000000..a9610399d1
--- /dev/null
+++ b/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.DeviceLinking.Components;
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.DeviceLinking.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Server.DeviceLinking.Systems;
+
+public sealed class RandomGateSystem : SharedRandomGateSystem
+{
+    [Dependency] private readonly DeviceLinkSystem _deviceLink = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RandomGateComponent, SignalReceivedEvent>(OnSignalReceived);
+    }
+
+    private void OnSignalReceived(Entity<RandomGateComponent> ent, ref SignalReceivedEvent args)
+    {
+        if (args.Port != ent.Comp.InputPort)
+            return;
+
+        var output = _random.Prob(ent.Comp.SuccessProbability);
+        if (output != ent.Comp.LastOutput)
+        {
+            ent.Comp.LastOutput = output;
+            Dirty(ent);
+            _deviceLink.SendSignal(ent.Owner, ent.Comp.OutputPort, output);
+        }
+    }
+}
diff --git a/Content.Shared/DeviceLinking/Components/RandomGateComponent.cs b/Content.Shared/DeviceLinking/Components/RandomGateComponent.cs
new file mode 100644
index 0000000000..0be9b6bff8
--- /dev/null
+++ b/Content.Shared/DeviceLinking/Components/RandomGateComponent.cs
@@ -0,0 +1,35 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeviceLinking.Components;
+
+/// <summary>
+/// A component for a random gate, which outputs a signal with a given probability.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RandomGateComponent : Component
+{
+    /// <summary>
+    /// The input port for receiving signals.
+    /// </summary>
+    [DataField]
+    public ProtoId<SinkPortPrototype> InputPort = "RandomGateInput";
+
+    /// <summary>
+    /// The output port for sending signals.
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> OutputPort = "Output";
+
+    /// <summary>
+    /// The last output state of the gate.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool LastOutput;
+
+    /// <summary>
+    /// The probability (0.0 to 1.0) that the gate will output a signal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SuccessProbability = 0.5f;
+}
diff --git a/Content.Shared/DeviceLinking/SharedRandomGateEvents.cs b/Content.Shared/DeviceLinking/SharedRandomGateEvents.cs
new file mode 100644
index 0000000000..7d26ff8623
--- /dev/null
+++ b/Content.Shared/DeviceLinking/SharedRandomGateEvents.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeviceLinking;
+
+[Serializable, NetSerializable]
+public sealed class RandomGateBoundUserInterfaceState(float successProbability) : BoundUserInterfaceState
+{
+    public float SuccessProbability = successProbability;
+}
+
+[Serializable, NetSerializable]
+public sealed class RandomGateProbabilityChangedMessage(float probability) : BoundUserInterfaceMessage
+{
+    public float Probability = probability;
+}
+
+[Serializable, NetSerializable]
+public enum RandomGateUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs b/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs
new file mode 100644
index 0000000000..74d25cd8a6
--- /dev/null
+++ b/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.DeviceLinking.Components;
+using Content.Shared.UserInterface;
+
+namespace Content.Shared.DeviceLinking.Systems;
+
+public abstract class SharedRandomGateSystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<RandomGateComponent, AfterActivatableUIOpenEvent>(OnAfterActivatableUIOpen);
+        SubscribeLocalEvent<RandomGateComponent, RandomGateProbabilityChangedMessage>(OnProbabilityChanged);
+    }
+
+    private void OnAfterActivatableUIOpen(Entity<RandomGateComponent> ent, ref AfterActivatableUIOpenEvent args)
+    {
+        UpdateUI(ent);
+    }
+
+    private void OnProbabilityChanged(Entity<RandomGateComponent> ent, ref RandomGateProbabilityChangedMessage args)
+    {
+        ent.Comp.SuccessProbability = Math.Clamp(args.Probability, 0f, 100f) / 100f;
+        Dirty(ent);
+        UpdateUI(ent);
+    }
+
+    private void UpdateUI(Entity<RandomGateComponent> ent)
+    {
+        if (!_ui.HasUi(ent.Owner, RandomGateUiKey.Key))
+            return;
+
+        _ui.SetUiState(ent.Owner, RandomGateUiKey.Key, new RandomGateBoundUserInterfaceState(ent.Comp.SuccessProbability));
+    }
+}
diff --git a/Resources/Locale/en-US/deviceLinking/randomgate.ftl b/Resources/Locale/en-US/deviceLinking/randomgate.ftl
new file mode 100644
index 0000000000..664fdf59c0
--- /dev/null
+++ b/Resources/Locale/en-US/deviceLinking/randomgate.ftl
@@ -0,0 +1,3 @@
+random-gate-menu-settings = Success Probability (%):
+random-gate-menu-setup = Random Gate Setup
+random-gate-menu-apply = Apply
diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
index 7d91b41851..aa34b415c5 100644
--- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
@@ -86,3 +86,6 @@ signal-port-description-logic-memory-input = Signal to load into the memory cell
 
 signal-port-name-logic-enable = Enable
 signal-port-description-logic-enable = Only loads the input signal into the memory cell when HIGH.
+
+signal-port-name-logic-random-input = Input Signal
+signal-port-description-logic-random-input = Receives any signal to trigger a random output.
diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml
index 66e2bee27d..45e15ba0d6 100644
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -108,6 +108,11 @@
   name: signal-port-name-logic-enable
   description: signal-port-description-logic-enable
 
+- type: sinkPort
+  id: RandomGateInput
+  name: signal-port-name-logic-random-input
+  description: signal-port-description-logic-random-input
+  
 - type: sinkPort
   id: SetParticleDelta
   name: signal-port-name-set-particle-delta
diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 3479d93fe0..6540445f0d 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -291,3 +291,29 @@
     - Output
   - type: Construction
     node: memory_cell
+    
+- type: entity
+  parent: BaseLogicItem
+  id: RandomGate
+  name: random gate
+  description: A logic gate that outputs a random signal when input changes.
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: random_gate
+  - type: RandomGate
+  - type: DeviceLinkSink
+    ports:
+    - RandomGateInput
+  - type: DeviceLinkSource
+    ports:
+    - Output
+  - type: UserInterface
+    interfaces:
+      enum.RandomGateUiKey.Key:
+        type: RandomGateBoundUserInterface
+  - type: ActivatableUI
+    key: enum.RandomGateUiKey.Key
+  - type: Construction
+    node: random_gate
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
index bceed82123..43c44eb9b1 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -51,6 +51,14 @@
       - material: Cable
         amount: 2
         doAfter: 1
+    - to: random_gate
+      steps:
+      - material: MetalRod
+        amount: 1
+        doAfter: 1
+      - material: Cable
+        amount: 1
+        doAfter: 1
   - node: logic_gate
     entity: LogicGateOr
     edges:
@@ -102,3 +110,17 @@
       - !type:SpawnPrototype
         prototype: CableApcStack1
         amount: 2
+  - node: random_gate
+    entity: RandomGate
+    edges:
+    - to: empty
+      steps:
+      - tool: Prying
+        doAfter: 2
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 1
+      - !type:SpawnPrototype
+        prototype: PartRodMetal1
+        amount: 1
diff --git a/Resources/Prototypes/Recipes/Construction/tools.yml b/Resources/Prototypes/Recipes/Construction/tools.yml
index d5b363ebe5..ed83abfc1a 100644
--- a/Resources/Prototypes/Recipes/Construction/tools.yml
+++ b/Resources/Prototypes/Recipes/Construction/tools.yml
@@ -37,3 +37,11 @@
   targetNode: memory_cell
   category: construction-category-tools
   objectType: Item
+
+- type: construction
+  id: RandomGate
+  graph: LogicGate
+  startNode: start
+  targetNode: random_gate
+  category: construction-category-tools
+  objectType: Item
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/meta.json b/Resources/Textures/Objects/Devices/gates.rsi/meta.json
index ba7c7ea232..eb5ae78a62 100644
--- a/Resources/Textures/Objects/Devices/gates.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/gates.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024. Sprites logic_a logic_b logic_o were made by 0tito (github) for SS14",
+  "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024. Sprites logic_a logic_b logic_o were made by 0tito (github) for SS14. 2025, added random_gate.png by borsh.",
   "size": {
     "x": 32,
     "y": 32
@@ -51,6 +51,9 @@
     },
     {
       "name": "memory_cell"
+    },
+    {
+      "name": "random_gate"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/random_gate.png b/Resources/Textures/Objects/Devices/gates.rsi/random_gate.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2f46425c9c14ff1b95e57e62fadf82dc8f7f15a
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJd7dtgArY-_Ct33~C<wS5yiuv5
z-S=2?`3H_FA#35uTR(a;oOF7=htDG|?WSRyfYZM|-q@~=jo<2+6r>8D-%)*(J#UND
zL+3xGYzr=BdYxg6Iaaq|5yQgupDO*<%(atpP}y5_Kft=y<bW0L&85}rlwEy{B@&{a
zt$L<;Hlbmi{C@9(3A_K#ShlNWYrxbGOP2gS$*^<Emi=B0QuYoUiYe^Nj@$5Y9sLS&
ODTAl0pUXO@geCw1+gCjR

literal 0
HcmV?d00001


From 4890d47093209d7a6cd23fbd29f8f0e0cff267d1 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sun, 16 Mar 2025 04:43:49 +1200
Subject: [PATCH 089/360] Take 2: Rename ammunition box (.50), Liberation
 Station .50 stock (#35326)

ammunition box (.50), .50 shell pellet

also die robust toolbox commits
---
 .../Catalog/VendingMachines/Inventories/ammo.yml |  3 +++
 .../Weapons/Guns/Ammunition/Boxes/shotgun.yml    | 16 ++++++++--------
 .../Guns/Ammunition/Cartridges/shotgun.yml       |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
index 065474e813..8ea25f39cf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -25,3 +25,6 @@
     MagazineBoxRifle: 3
     MagazineBoxRiflePractice: 3
     MagazineBoxRifleRubber: 3 # DeltaV
+
+    BoxLethalshot: 6
+    BoxShotgunPractice: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index e5c2987ec3..df7d949b52 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -34,7 +34,7 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
-  name: shell box (beanbag)
+  name: ammunition box (.50 beanbag)
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
@@ -47,7 +47,7 @@
       - state: beanbag
 
 - type: entity
-  name: shell box (lethal)
+  name: ammunition box (.50 pellet)
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
   components:
@@ -62,7 +62,7 @@
       - state: lethal
 
 - type: entity
-  name: shell box (slug)
+  name: ammunition box (.50 slug)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
   components:
@@ -81,7 +81,7 @@
       - state: slug
 
 - type: entity
-  name: shell box (flare)
+  name: ammunition box (.50 flare)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
   components:
@@ -96,7 +96,7 @@
       - state: flare
 
 - type: entity
-  name: shell box (incendiary)
+  name: ammunition box (.50 incendiary)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
   components:
@@ -111,7 +111,7 @@
       - state: incendiary
 
 - type: entity
-  name: shell box (uranium)
+  name: ammunition box (.50 uranium)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
   components:
@@ -130,7 +130,7 @@
       - state: uranium
 
 - type: entity
-  name: shell box (practice)
+  name: ammunition box (.50 practice)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
   components:
@@ -145,7 +145,7 @@
       - state: practice
 
 - type: entity
-  name: shell box (tranquilizer)
+  name: ammunition box (.50 tranquilizer)
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index c11781b3c2..3dfab5e84a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -70,7 +70,7 @@
 
 - type: entity
   id: ShellShotgun
-  name: shell (.50)
+  name: shell (.50 pellet)
   parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite

From 558ef54978e82fba75f94b0eeb4705773beda34d Mon Sep 17 00:00:00 2001
From: Seam_Less <kai.julian.watson@gmail.com>
Date: Wed, 11 Jun 2025 13:03:14 -0700
Subject: [PATCH 090/360] Magazine rsi Cleanup + Magazine Type Recolor (#37709)

---
 .../Ammunition/Magazines/caseless_rifle.yml   |  39 ++++-----
 .../Guns/Ammunition/Magazines/light_rifle.yml |  36 ++++++--
 .../Guns/Ammunition/Magazines/magnum.yml      |  44 +++++-----
 .../Guns/Ammunition/Magazines/pistol.yml      |  81 ++++++++++++------
 .../Guns/Ammunition/Magazines/rifle.yml       |  38 +++++---
 .../caseless_pistol_mag.rsi/meta.json         |  11 +--
 .../caseless_pistol_mag.rsi/practice.png      | Bin 223 -> 0 bytes
 .../caseless_pistol_mag.rsi/red.png           | Bin 223 -> 0 bytes
 .../caseless_pistol_mag.rsi/stripe.png        | Bin 0 -> 446 bytes
 .../caseless_pistol_mag.rsi/uranium.png       | Bin 279 -> 0 bytes
 .../caseless_rifle_mag.rsi/meta.json          |   7 +-
 .../caseless_rifle_mag.rsi/practice.png       | Bin 375 -> 0 bytes
 .../caseless_rifle_mag.rsi/red.png            | Bin 367 -> 0 bytes
 .../caseless_rifle_mag.rsi/stripe.png         | Bin 0 -> 714 bytes
 .../caseless_rifle_mag_short.rsi/meta.json    |   5 +-
 .../caseless_rifle_mag_short.rsi/practice.png | Bin 361 -> 0 bytes
 .../caseless_rifle_mag_short.rsi/red.png      | Bin 362 -> 0 bytes
 .../caseless_rifle_mag_short.rsi/stripe.png   | Bin 0 -> 446 bytes
 .../LightRifle/light_rifle_mag.rsi/meta.json  |  13 +--
 .../light_rifle_mag.rsi/practice.png          | Bin 236 -> 0 bytes
 .../LightRifle/light_rifle_mag.rsi/red.png    | Bin 236 -> 0 bytes
 .../LightRifle/light_rifle_mag.rsi/stripe.png | Bin 0 -> 705 bytes
 .../light_rifle_mag.rsi/uranium.png           | Bin 312 -> 0 bytes
 .../Magnum/magnum_smg_mag.rsi/meta.json       |  16 +---
 .../Magnum/magnum_smg_mag.rsi/piercing.png    | Bin 255 -> 0 bytes
 .../Magnum/magnum_smg_mag.rsi/practice.png    | Bin 225 -> 0 bytes
 .../Magnum/magnum_smg_mag.rsi/red.png         | Bin 225 -> 0 bytes
 .../Magnum/magnum_smg_mag.rsi/stripe.png      | Bin 0 -> 705 bytes
 .../Magnum/magnum_smg_mag.rsi/uranium.png     | Bin 290 -> 0 bytes
 .../pistol_high_capacity_mag.rsi/meta.json    |  14 +--
 .../pistol_high_capacity_mag.rsi/piercing.png | Bin 254 -> 0 bytes
 .../pistol_high_capacity_mag.rsi/practice.png | Bin 226 -> 0 bytes
 .../pistol_high_capacity_mag.rsi/red.png      | Bin 226 -> 0 bytes
 .../pistol_high_capacity_mag.rsi/stripe.png   | Bin 0 -> 705 bytes
 .../pistol_high_capacity_mag.rsi/uranium.png  | Bin 285 -> 0 bytes
 .../Magazine/Pistol/pistol_mag.rsi/meta.json  |  16 +---
 .../Pistol/pistol_mag.rsi/piercing.png        | Bin 234 -> 0 bytes
 .../Pistol/pistol_mag.rsi/practice.png        | Bin 221 -> 0 bytes
 .../Magazine/Pistol/pistol_mag.rsi/red.png    | Bin 221 -> 0 bytes
 .../Magazine/Pistol/pistol_mag.rsi/stripe.png | Bin 0 -> 705 bytes
 .../Pistol/pistol_mag.rsi/uranium.png         | Bin 266 -> 0 bytes
 .../Magazine/Pistol/smg_mag.rsi/meta.json     |  13 +--
 .../Magazine/Pistol/smg_mag.rsi/practice.png  | Bin 230 -> 0 bytes
 .../Magazine/Pistol/smg_mag.rsi/red.png       | Bin 230 -> 0 bytes
 .../Magazine/Pistol/smg_mag.rsi/stripe.png    | Bin 0 -> 705 bytes
 .../Magazine/Pistol/smg_mag.rsi/uranium.png   | Bin 379 -> 0 bytes
 .../Magazine/Rifle/rifle_mag.rsi/meta.json    |  13 +--
 .../Magazine/Rifle/rifle_mag.rsi/practice.png | Bin 270 -> 0 bytes
 .../Magazine/Rifle/rifle_mag.rsi/red.png      | Bin 262 -> 0 bytes
 .../Magazine/Rifle/rifle_mag.rsi/rubber.png   | Bin 298 -> 0 bytes
 .../Magazine/Rifle/rifle_mag.rsi/stripe.png   | Bin 0 -> 705 bytes
 .../Magazine/Rifle/rifle_mag.rsi/uranium.png  | Bin 262 -> 0 bytes
 52 files changed, 167 insertions(+), 179 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index b97ca8f259..f51b21e1b4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -107,7 +107,7 @@
     capacity: 10
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -122,6 +122,7 @@
       - state: inhand-left-mag
       right:
       - state: inhand-right-mag
+      - state: inhand-right-stripe
 
 - type: entity
   id: MagazinePistolCaselessRiflePractice
@@ -134,10 +135,12 @@
     capacity: 10
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: MagazineVisuals
     magState: mag
     steps: 6
@@ -148,11 +151,11 @@
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazineCaselessRifle
@@ -163,7 +166,7 @@
     proto: CartridgeCaselessRifle
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -171,12 +174,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazineCaselessRiflePractice
@@ -187,20 +186,22 @@
     proto: CartridgeCaselessRiflePractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazineCaselessRifleShort
@@ -212,7 +213,7 @@
     capacity: 20
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -220,12 +221,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazineCaselessRifleShortPractice
@@ -237,17 +234,19 @@
     capacity: 20
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index ba685c53fc..d2b2165f8f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -65,7 +65,7 @@
     proto: CartridgeLightRifle
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -73,12 +73,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazineLightRifleEmpty
@@ -112,20 +108,22 @@
     proto: CartridgeLightRiflePractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazineLightRifleUranium
@@ -137,10 +135,12 @@
     proto: CartridgeLightRifleUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
@@ -160,6 +160,24 @@
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
 
 - type: entity
   id: MagazineLightRifleMaxim
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 04f6ef741e..705601870f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -79,7 +79,7 @@
     proto: CartridgeMagnum
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -87,12 +87,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazineMagnumPractice
@@ -104,20 +100,22 @@
     proto: CartridgeMagnumPractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazineMagnumUranium
@@ -129,10 +127,12 @@
     proto: CartridgeMagnumUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
@@ -154,10 +154,12 @@
     proto: CartridgeMagnumAP
   - type: Sprite
     layers:
-    - state: piercing
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#540000"
   - type: Item
     inhandVisuals:
       left:
@@ -199,7 +201,7 @@
     proto: CartridgeMagnum
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -207,12 +209,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazineMagnumSubMachineGunPractice
@@ -223,20 +221,22 @@
     proto: CartridgeMagnumPractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazineMagnumSubMachineGunUranium
@@ -247,10 +247,12 @@
     proto: CartridgeMagnumUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
@@ -271,10 +273,12 @@
     proto: CartridgeMagnumAP
   - type: Sprite
     layers:
-    - state: piercing
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#540000"
   - type: Item
     inhandVisuals:
       left:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index ca60cef073..251f72a9c0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -151,7 +151,7 @@
     proto: CartridgePistol
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -159,12 +159,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazinePistolEmpty
@@ -196,6 +192,24 @@
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
 
 - type: entity
   id: MagazinePistolPractice
@@ -207,20 +221,22 @@
     proto: CartridgePistolPractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazinePistolUranium
@@ -232,10 +248,12 @@
     proto: CartridgePistolUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
@@ -279,7 +297,7 @@
     proto: CartridgePistol
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -287,12 +305,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazinePistolHighCapacityPractice
@@ -304,20 +318,22 @@
     proto: CartridgePistolPractice # DeltaV
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazinePistolSubMachineGun
@@ -331,7 +347,7 @@
       path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -339,12 +355,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazinePistolSubMachineGunEmpty
@@ -378,20 +390,22 @@
     proto: CartridgePistolPractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazinePistolSubMachineGunUranium
@@ -403,10 +417,12 @@
     proto: CartridgePistolUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
@@ -426,9 +442,22 @@
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
       right:
       - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index a1c4bce28d..8e05d114d7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -1,4 +1,3 @@
-# Empty mags
 - type: entity
   id: BaseMagazineRifle
   name: "magazine (.20 rifle)"
@@ -32,7 +31,6 @@
     zeroVisible: false
   - type: Appearance
 
-# Magazines
 - type: entity
   id: MagazineRifle
   name: "magazine (.20 rifle)"
@@ -43,7 +41,7 @@
     proto: CartridgeRifle
   - type: Sprite
     layers:
-    - state: red
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -51,12 +49,8 @@
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#9b0000"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#9b0000"
 
 - type: entity
   id: MagazineRifleEmpty
@@ -88,6 +82,24 @@
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRifleIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
 
 - type: entity
   id: MagazineRiflePractice
@@ -99,20 +111,22 @@
     proto: CartridgeRiflePractice
   - type: Sprite
     layers:
-    - state: practice
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ea5800"
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazineRifleUranium
@@ -124,10 +138,12 @@
     proto: CartridgeRifleUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
index 5f9c9bfff3..e78af4ebce 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
@@ -11,20 +11,11 @@
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
+            "name": "stripe"
         },
         {
             "name": "red-icon"
         },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
-        },
         {
             "name": "mag-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png
deleted file mode 100644
index e0a3cb4d131811f0fc9d5ff6c0edf8a000bef114..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2x&6XFV_?d|PDLqj<@I8;?t_Zu*r_G5k(!BAn}JOe1lQ4-`A%<vxq
zuAT}p0*d)~x;TbZ%t=m=xZ@ze5x~;YBO)5eBE#zH62QuHk(Fa*f}luAiKAG8m{>`P
zgJ6M+c)_ud#15qcv*P6B8WtTodh`f`>j4Q42{v;EhKq7sOcjdL41wk{c)I$ztaD0e
F0suMjJM;hm

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png
deleted file mode 100644
index 3bfa3b48b8cb3f4a32fe4794c108be3513289f55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2x&6XFV_?d|PDLqj<@I8;?tO&J*C7#L<VFid21v;@j=lmz(&GyI2u
ztEWPYfMPzLE{-7;bCMGz?l=f=1hBO9h=>NV$gsM)1hDd4WaU_yAShB&;wY9NCRS47
zAXwlcUT`cVu|w&=tT;KjhDC>t9zDX~dO(6hg3X+P;i4QDQ-$I*L!h|~p00i_>zopr
E0Lq&=6951J

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3c57a440a4aa879d31a5435e0fd8e449be2ce7a
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0KHA|Nb*)&OCee?BU99
zY(PF^NswPKgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*<Z4X
zF|zO-l79LYs7Kq=#W6%el2L*2{y(6Kp$HiFm(a)AwPzVk!#qA#gKYD3^>bP0l+XkK
DDM~1~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png
deleted file mode 100644
index ad8e3d9fb40001c2b461479bece8941cf1fb1bee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 279
zcmV+y0qFjTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002qNkl<ZSi|j<
zu?fR45JkU}6rSJ$0yQCSQlv6b6Yvn(B!hU4tl?5KsEa^_CvfLfHVFm?9TINtHHMSV
z`nvyRKoA6BV~W^@rfJ5t^{(rpzPaP5CL&mCK|~;;xyIoT+Ymwk02pJ?_x(?8dS;&h
z09b32WPmNe7_+T_R1=6wY*kgGQfiS2rPS=db1vU4@ZPVUK6Z1K1tElF{<AZX%73<i
z?+Hw{aEba6ogOu=_cLC%_guTQHM-{>m-Yxam-iNwWjSiC7s1q8!+Vcm7>euy{=LHy
dAqax7DIb6fNQi^3I1B&)002ovPDHLkV1mU!bOZnZ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
index d430a2d606..82820ea569 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
@@ -5,16 +5,13 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
+            "name": "stripe"
         },
         {
             "name": "rubber"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png
deleted file mode 100644
index 18aab251ab83df3196487b94f172be823c9e882a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003#Nkl<Zc${NA
zaNq#LKmw)#wSCk9qYfAh4qzcxVM225e|+)_=1yj$sRI}o7#IwU%(03;c<_j!ptSA(
zgzhSm9YK-<E}T2bARr`(A+Dex$ME36BU0@q%>gir6%^z!<m{|W$aVnHiSWa_=Wxqm
zmXT{ISq`8TAjttRAHzZdMjtwMh9NF0h@qgg4R21N$N}itj9Sq^QV4u__nacjumO^?
zVUYN52C46-7;L4485jf^7#JAtBIxUP8N72H8D>^x{P$~{L3DXQQV5_MeE8X06q+1B
zaxQrG?ibmXVFQe$Hpvo_bN>qnNn$OK7#JXh(xPSS7>F&FNe%&O=LWJ0B5LLavP(i-
zg%T;jPqqVa)%_11JR-?*1_lz#0c7yu-E)QuXi-5<qlDyKKy5IzYQs?nj5>f8003iA
ValMlbcvAoX002ovPDHLkV1j`UlN|s6

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png
deleted file mode 100644
index 829fcd6d59f0b36f60bedf6c1faf47db52a71133..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFq(O~IEGZrNwz6?z;M`sX&K|z
z+AEBU`6PJw5){J{or>Po*L>oB=9ji)C9?z&@bsM7*kxbwp=05KEpPv~ywjQ_>o|#7
zZ;tgz1qGE(#dQl5j(>P?P&w$W+F3?}Zc&jZ22b9s@i|e(aIy2l;oZ**PA5*An5`Mf
zw?I_kB%^`+VJ9Xxd8@KEMLjK$iM;uK3r{e<xY-kR(IJSVrsDe?rPCW2-GXj0Z!Qk{
z=lw4=<-^otXS#TR;7?Z*&)wtejh6V$bS|j`s$L+y=jY2}ky$bhMS2zIe2T0Nb9;0#
zv9Wo~1-WdiLsCM6h*$TtwaE(GBGfEdR?L+?q1CZsrt}Ft&O%YIB`o$g`3{7B2YF59
zw4{W`n!bq#+sn^O>Md|(wd@s|RLr>b;DuGZ?y?527@`;${Q2^}|JPCj1tf!~tDnm{
Hr-UW|0=SR7

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..779465c927295117e8d84b7aa9f4b1dfea144498
GIT binary patch
literal 714
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvR|REV15>wv(3HOZ8OxR}
zyLt2GvuDpfefpG^b@dKV4P!}=UoeBivm0q3PLj8~3quF1tOt<8S>O>_%)r1c48n{I
zv*t(u1=&kHeO=jKvWhXt3I6+2@r8kbN!!!KF+@X@QGx0HU!aOnfEfazX=&*W$il2?
hVW<Ku=mN;9hY!0@fn|ofOr$u-N1m>JF6*2Ung9hgGVK5W

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
index d430a2d606..afe0e115ae 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
@@ -11,10 +11,7 @@
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
+            "name": "stripe"
         },
         {
             "name": "rubber"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png
deleted file mode 100644
index dc1c69b16d8b0e858601388d304e25d88ec5aac0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003nNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z^DTTg9BJdQCwLw^FJ=R_Lg);avVT%2*@f(pkQJghYyex
z0^i;~XSn(HIaWC?VM%iAC(Qv|!jdSyW?*1oc>Lf6LrA0t!<ywg$a27dCqjxH01J@`
zS}z#R^yHD84oHduWbpXG3%JD$7cVdf*f=sUtXe~|IV6QZdrLYavc(g$UZBXI5^yFt
zH;^0!!2(wqin%VJi1mImV5r^op26JGfI(J4f+R<f>;RLJNsNb|y@gxc`^^9@ck=iJ
z?3(ZZveLlX584c;1SBxTVbSvqM_GXlkd+IN(*icjCr)o5x>#nUq*<Py+3+8^1SHjR
z1_lbtfr--_7{9%J&H%%tTF$^gVF*wI4E>^b)B&RopcDWA7eH(Gme2{S00000NkvXX
Hu0mjfWonTB

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png
deleted file mode 100644
index 05db9333513b46dffc3538d9c20fbb7d8b731e1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003oNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z^DTTg9BJdQCwLw^FJ=R_Lg);avVT%2*@f(pkQJghYyex
z0^i;~XSn(HIaWC?VM%iAC(Qv|!jdSyW?*1oc>Lf6LrA0t!<ywg$a27dCqjxH01J^0
zj;9P;GE+%T2P8!SGI;#p1>9nW^=BFQ6$Kd>o?=fQ_y9>E(B6{Hh-`5O$5RyfN5(!R
z=LV9a!20bOhU^z-QN*T77&EkeS7I=?G+>ZbkRZtsBs;)o`fSF{(4d|wVaza9!Wb@h
z^7sW(jUz7&92GWUcqAc#Ar6b4Z#c>dY=Ep>fSeYvSw3-k1JT7YBPGr9{LF^`$R!}D
zmNPI=SPo2_-oW_n?Q;egCe?BV1`0!f8er%b#iI@wbpWLR0E{zfXbb}|X#fBK07*qo
IM6N<$g0udL+yDRo

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..e18b4b6892ad58c8b30ff3eb88e57315321e77e7
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*Hqo|{rmUdym|B4vu9Hz
z=SBd<8B2ovf*Bm1-ADs*lDyqr7&=&GJ%Aj}0*}aI1_o|n5N2eUHAey{$X?><>&pI;
zRg96@()9T?RiGYiPZ!4!2}wo;#{2((Dh40mggI#~l)<$I%E)SfGC*FV2T*Ba%Gc2f
QS_ZPq)78&qol`;+0L!N+uK)l5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
index 8025e38635..6095aa7d98 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
@@ -5,22 +5,13 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
+            "name": "stripe"
         },
         {
             "name": "mag-1"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png
deleted file mode 100644
index 0cb88b1399c348cee0e462dadb303287757aac8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2x&6XFV_<>lo~O-;SLyt1;gyp$OV+?aPpFmUdVy8x8qC<*clX7~>Q
zS5Ji)0mULcT^vIy<|HRbI4CS>P*ZrLp`p>B^x(~#9wmh*Pg=ADrcIkB)}SL07Z=y3
zB*4YexT0;<3W-G=D+GiRj))jIm2xbeD7>tJYu4?ly@9M#dIR@rYiOJ>*ulUMvzFib
U&^6niKuZ`rUHx3vIVCg!08`0GLjV8(

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png
deleted file mode 100644
index 3990c78a2eddde0007d8ea4366dc424ac9d89bb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2x&6XFV_<>lo~O-;SLyt1;gycigEGBCUq7A{m&PXfwulmz(&GyI2u
ztEWPYfMSuJE{-7;bCMGz92Ax`s42YB(9md5dhq5=kCMWZCoNh6)22-mYtRvhi;L@1
z65wKKT+y~_g~TF`6#_yDM??&qN;wu!6kgWAHS6}&-aytVy@7kRH8f5b>|kJsS<7#I
T=$h?Mpd}2Ru6{1-oD!M<&W%S$

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c1ec65866d2217e7757834efabc487f4bdcbcf7
GIT binary patch
literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0J61me$bFux#0~{rmU-
zR}vBh3Ne-h`2{mLJiCzw;v{*yyD)UH%6b4foCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#
zC962I413d)GHC_|CT&j_#}ExsMg^w(e}O87HV|=fF&04fg0Qi%5sHA2l9CdN0J7>)
aHvSMe<H)3}EVug#NR_9npUXO@geCxVKqtfi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png
deleted file mode 100644
index b9dabe5bdafdb41cebd3b2d44f544cae913f3bce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800030Nkl<ZSi|j=
zu?~VT5Qcw<n+Z;3?F~+nu;Ikud-zVig^3TscAE(f#-Zp21CxU;xF9hGBP9ive#;HL
zq!;evFJQ4)CdTR7D5b1?-v<CNvtw$2nNG710z`y7&#SicEX$lh2Y3?%0f-1nsivlB
z+UpCrI?Y8<wAN7^SZ(7fjF&&pkI4n6eKPC{4(sdh0h19VT<xBJ{}f#jJ3DYsZlKb`
zW)Xr)5A*W_n?=}ED!t()tTO;aWGskWOiX77>fJVJI7t$Iry?^WilV00Xo=|dz1Wlo
z#vJH7l-3H`JYZ%BApihMsqq~6ycj_5$4EQ7rIf~=VvEIM0e}}E`d@}8rEu;50000<
KMNUMnLSTYztbs=W

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
index 34bb6b1223..dbf98bdf55 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
@@ -5,25 +5,13 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
-        },
-        {
-            "name": "piercing"
+            "name": "stripe"
         },
         {
             "name": "mag-1"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png
deleted file mode 100644
index 2ac700b8b646bd29538ebe65ff1f8c0ac7fd619d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmV<b0094qP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002SNkl<ZSi|j>
zO$x#=5Jq2XPvX#Zz$^4XLJrcS30arA$T^g_stZLh&NQW%Z<P>2zU0kMpsMQM)o3=0
zNLt48JU2xRh)5cS0p}b5<2dq*nNITp&N)H|0C?{KmU;TtL}$fvF)~fl`UpfMdG84!
zyd4;0EQbJ~@B8OC_x1qo)@j)8t`1o8SI2;s|2|{jc0ZUJ=<@lW&G@Tgz=D6R16g&z
zI{#HMV8uVT5~kCKg^QxIX1~DkWqvK#3)0$u%&MwQ^Z*m>V3FIBkc$8S002ovPDHLk
FV1lwXabo}g

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png
deleted file mode 100644
index f3f3bc05ec8d2f06691ae437f9f679b3aa90f2f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@3A^6XFV_m6es#($c0*o$Bc5D6gRAro>k7F0?&M`tNT^b&%eYAirRS
z|4?AgH2Vrr(96@sF{ENna>4@j1Q8cu0V6RH2SI@_qc9iYfFc*eLnn^9GK4yKwz@DT
zii(RE8|oYs;gAzZUow6A^o1NLB_&%Hax7tVWMY2Hz;J7mfc@#j%kn@|89ZJ6T-G@y
GGywoiZa(Ay

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png
deleted file mode 100644
index 64bca76850f7a1e3ef691d53dfd0495db28f2cb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@3A^6XFV_m6es#($c0*o$Bc5D6gRA#>Q4JB(z;x+D)Lg9i+D;$S;`T
zKNOfV&AtK@^zw9Z45^rtoUlMWLBvH^z(`EQK~NyfD9lATpvcAW(21k2451F5tuBm-
zqT(XPhB^mDIOGJ<mrS2NeIZ9mNy(Ol97`A-nV8=)Fx=WCV1GLCvOLgK22WQ%mvv4F
FO#qQmJ!Sv^

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..7490de7df2908bbf476fef1e1f78f283c9737237
GIT binary patch
literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0KH4^X5Z`4qdr&<=L}m
zt2DO90EHM!g8YIR9G=}s196hP-CY<uSY<tc9L@rd$YKTtZeb8+WSBKa0w~B{;_2(k
z{*qOUk;zomYqdWE1CzF=i(`m}D5C<?{l7pJqhQd6fQYfNB8uZM1O$OV07VIPIh&Lj
UyDg9Hz6LVY)78&qol`;+0HqHq=Kufz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png
deleted file mode 100644
index a7db07b987d95a5546d5c035c7c947ce2b6ad934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002#Nkl<ZSi|j<
zF{%PF6h+VIfc3YtevE|(>BPcrmf<3VEMyut@SDFAJF7JEVMsHbYfy>R2%?~4;>cib
zm4t-c<lOflD(c&n_#74ySC6f=Nvj4##N~O8QVM{gD0sz8>hl9iDU2}yXsrS2xqH?`
z8j59Yq%6z#BM=d%wZ<58b756g?I8fjvg|T$`g(xgr^~R{xjqn*zjp?F`FAq|$5TJ3
zfwVdQRWSZu83@5Y_JKxyAawnEWgry)Mg|7+5&z?g!T9HDeaeje?*XiRe;KZa+q>(N
oHZm|-F5II%yT46BR8-e=2B%$VL{j!BqW}N^07*qoM6N<$f`EE}Qvd(}

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
index 5d6aed6686..4a31ca1326 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
@@ -11,19 +11,7 @@
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
-        },
-        {
-            "name": "piercing"
+            "name": "stripe"
         },
         {
             "name": "mag-1"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png
deleted file mode 100644
index 953ad220660859fb60f807a51afb0bfe56611be1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmV<a00IArP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002RNkl<ZSi|j>
zF%p9y5JfkRN1&qO3@NEoQ`yk%(d_8=P+VhEWQLHW!38uX{26Bu72o*2jsPPg|DKEF
zB1Gi(xpiGdYt2$}r4(3e^C^}9%{7lN#+b&=xiluC;x(okfDpn9Ob*no1Bl2<DKN%-
z9Mf6@5pC+jbo5)$1Rz(j8$f<j@BKdCf!6+iqXRYm#Q?4RZ|Xn~|L5;Ot$z_fOaH|k
z=;i+_I#3$E0`T(q=}6lGz_;iAITaKGl$<Ap7#TS<cklvK@3Rem3IG5A07*qoM6N<$
Eg6eZ@9RL6T

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png
deleted file mode 100644
index 49a1ba89d5473ff81b16a8c3143f23c3006ff971..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-hi{RRxD{g_`xF#K=jcHuHw3sk{X
z666=m@E->1Iz_^OqVAq9jv*Cuk`opvCy0o+2nU$Ci6(^<8k)HX29y>$3JMez7K$k-
zJm^vrXj;XT!MSSY4HhT1M&lb=R#wX%mak9{Sa8EBm4V?+oKU{+WY3>KBN;qh{an^L
HB{Ts5p9e&d

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png
deleted file mode 100644
index 6058c25acf0f06f8fac30e7507508815b6ba0aa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-g1QwD}O28P)T3_H{r?z(+F4OGEZ
z666=m@E->1Iz_^OqVAq9jv*Cuk`opvCy0o+2nU$Ci6(^<8k)HX29y>$3JMez7K$k-
zJm^vrXj;XT!MSSY4HhT1M&lb=R#wX%mak9{Sa8EBm4V?+oKU{+WY3>KBN;qh{an^L
HB{Ts51PViV

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb0f5c8df036d767dc68782bf0aa57d34e7f8a8a
GIT binary patch
literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*UXfX{rmTyIdkUb&704j
zJ&R8-EC)(4mIV0)GdMiEkp|)<dAqwXbg;^L06Clm9+AZi4BWyX%*Zfnjs#GUy~NYk
zmHj2F7$cL4|F7=73=B-#o-U3d8lsE}O!xl+Rg8kc8Ul<eE-r=x>$t)?hWm>ppI3rh
N;pyt<vd$@?2>@0;ET#Ye

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png
deleted file mode 100644
index 774b22096f3af55d523ea0e8b5440bac09254ce4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002wNkl<ZSi@sr
z7zLwXqyt8BG$kY?{6`mCuwVgMX0ed#auE>`1}iHoWTF4$IEaOk;CuG$8Jz9s=LctR
z+O&yiGngoG!1CqGQ5=KpAeyCtgoK3uA|fIT3JMAsa#B)K44XD>A}KvE4RkJ`iUW|N
zf^H5#wlp#_l0M}Cwc~$yqyb9epKJ$EEB;AJ1GI?$p`QjQjeoKnK+X6kIt|b&{s%=G
zAgVoZ>h~Q6J!J-l9<y^8a=GtJ8BYDaLt6)!v8phL+!bM%^4A1w6ntiV$#9L~2yN2<
jG3v-o2cuvV3@88qrp!}@d{M1k00000NkvXXu0mjf$<AzR

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
index 55654fc24e..ad008dad90 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
@@ -5,29 +5,17 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
+            "name": "stripe"
         },
         {
             "name": "red-icon"
         },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
-        },
-        {
-            "name": "piercing"
-        },
         {
             "name": "mag-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png
deleted file mode 100644
index b6d58fdfebcce3760ecf97df9a2fb0c37bf172ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 234
zcmV<G02Tj<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800027Nkl<ZSi|j=
zy$u5)422zZBe<eshLqH)scry|Mn~_VSi>nIkxSA52Z>PpNl5%!Pw#;MP!#3gx%3<&
zB6**SF?QA3dX*z0c<+x>(j#a)V_(j>^g{@x&&<^|%ozbGr57<rLDTL45eXuKbM9l!
zS_{nFbRW#GUx686|JR=3X#3ZVV3hq$5zMfE%?L)?Umd|L`&*DJfb5SCr?eeFZqM<W
k4pa-M**7}|MNy`32Q4y7=hP++<NyEw07*qoM6N<$f+I>^`v3p{

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png
deleted file mode 100644
index 4e6907fa1928e9dfe3f95342945154ec340a7739..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-hi{RRxD{g_`xF#K=jcHuHw3sk{X
z666=m@E->1Iz_^OqE4PJjv*Cuk`p9C8Uh0Zd>w8|gmwfTJ$ggH)#2(<R#%4;M~_A_
z?04W;#c;tVMA?8fBY`v8)&021pKV-Bj9m*$*cnn=`HowdNz?&NWAJqKb6Mw<&;$S&
Cw?vfy

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png
deleted file mode 100644
index f5a47ffd1636db3de572bb47e06e2b11e48f15a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-g1QwD}O28P)T3_H{r?z(+F4OGEZ
z666=m@E->1Iz_^OqE4PJjv*Cuk`p9C8Uh0Zd>w8|gmwfTJ$ggH)#2(<R#%4;M~_A_
z?04W;#c;tVMA?8fBY`v8)&021pKV-Bj9m*$*cnn=`HowdNz?&NWAJqKb6Mw<&;$U3
CC_{Vz

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..917616604b0613bb59a37901b720a88dde0385a7
GIT binary patch
literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0KHA|Nb*)&fL6t^Vzd!
zE#juPfkKQWL4Lsu4$p3+fjCLt?k)@+tg;?J4rhT!WHAE+w=f7ZGR&GI0Tg5}@$_|N
zf5|Gw$Y}lY{?%><1}1G!7sn6{QAP!(`+tEdM!~>@0HcbFi{ZdnO}wprzZmXc%K29U
O(&6dq=d#Wzp$P!W#4S7k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png
deleted file mode 100644
index 36ad667c6313670f113c0213ce59be36943eca15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJi=HlyArXg@6C_v{Cy4Zv9PsE{
z*3#1Q|3wnFn2y3}9kHTVJtd_>38|^AI$!3?ux|_ysyRQ;wt4g4KYt#)@ttiZn9C-t
z$``S(#<DAUf~?DClL-?he28~(X>oLPWOVlP^6E;wyv$c+Df_a<bF4mBIO=w#I%l!}
zztGE+#cJ;v=+ON@epaBv*$3)YTp6N&T&}Y&ue+akAvi7Jg`su3;`HC=raZjz-a4h7
zA&}1?IW$pVr}iO(r|UVd3H&(oYtloh!-BWm7!6;Y=xqx$;Bq_Iz{F6&<5d^<Y`Y-P
Oa}1uYelF{r5}E+UZD%I{

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
index 53e7994368..ad008dad90 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
@@ -5,26 +5,17 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
+            "name": "stripe"
         },
         {
             "name": "red-icon"
         },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
-        },
         {
             "name": "mag-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png
deleted file mode 100644
index e48f12c57acdea96ff7ff0d04802f273149e8d46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5x0V6XFV_B_$=*)YR<l?IR;2i;9Yjjg9vkFr4;deigy+zm?mNn=uZk
zh`S`nFPPy!9MqQ8UIhxfd%8G=RLn_ESRkDc;v_6!7U(ds+{CxcNzlMk#5wSg${V$g
zRW5}uG!63|f`cL(R;kpAbummXcv{3JvY>BOLu2FOIgMcq45@#_49YtdEP+Ncc)I$z
JtaD0e0sw%|MJNCO

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png
deleted file mode 100644
index 598770e39b83c3f097aa51c64fd61f8c99121fe5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5x0V6XFV_B_$=*)YR<l?IR;2i;9Yjjg3ti7~&WhW-~DCP-j@-e#`=>
zh`S`nFPPy!9MqQ8UIhxfd%8G=RLn_ESRkDc;v_6!7U(ds+{CxcNzlMk#5wSg${V$g
zRW5}uG!63|f`cL(R;kpAbummXcv{3JvY>BOLu2FOIgMcq45@#_49YtdEP+Ncc)I$z
JtaD0e0sytjL#qG)

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb889f3dff62265507c35d8811418010093f6885
GIT binary patch
literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*Hqp7w6wH_hK6O!mhIoa
z|8Cp6sX!^lk|4ie28U-i(m<RfZ+91l4pvzYAcwQSBeIx*fm;}a85w5HkpK#^mw5WR
zvcF^%W8`8Ba&`!0U|`brba4#P5M@+gy8jobVieFd1Q-?2tP>VM6<{<$6A*SJpnypb
bRRI-w^D`OE1PXTF1R3e+>gTe~DWM4f+fFFp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png
deleted file mode 100644
index 631bb900c596d377e57d03080a04f9a66c164782..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003(Nkl<ZSi|j>
zp>D%K42J(yC6f|TFe%osHHDsrTC~1IqmsP9@ZMsipii);C@rf(1_rEQlfguqG-<k_
z3z*jIn%<QxKR(Of`L}%sj2iXdmG~UW^W0`x1^^I|BqYGpCpj|%0Eh?xY)FX7v7}{L
zT9@1ygSKs<sxZcYnQc@HTw)@Eh(J}l3Z!WYB0^o)LG1X|f-K7*A^-qaepQ94f{40G
zgs|giFf-exX%M>-y@8j2_%kRrgjYaJ2=BwOAWou<0dcZtp&<r!Zb*p1^BW4{tSuG-
zVsZ|Eh$L=pt7-@0R=0b=rgzs^Z7Ulbzz5>}<_pVej+g!0u>XKB1T)*857@`;6_(W;
zo7n+Hj2`Ig33v0&?119w6R*$vpt*V>iuJ-i>>e%Zdt0m*Hp&?GX|=7a^Za5rA2n*I
Zz5xS#AV;5dSDOF;002ovPDHLkV1nL^rY8UZ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
index 2a9924621d..75f309c580 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (github)",
+    "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "size": {
         "x": 32,
         "y": 32
@@ -11,16 +11,7 @@
             "name": "base"
         },
         {
-            "name": "practice"
-        },
-        {
-            "name": "red"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "uranium"
+            "name": "stripe"
         },
         {
             "name": "mag-1"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png
deleted file mode 100644
index ddfa208e6bfc0f1d007a05e4cf5c9c8ab3363e8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|`~rMJT!FNN
zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6GV+ZBcm4s!&C+axUL=*
z#z~F>uOb*Ua(5a5O_VAL@(X78j|;E|{Z#;}^6+$V46*1<PLN=I(ICk3K`ViYsb<vy
zt^-{KS_x^1Oo^LBJG>nlE%aC?1vCUR%3L@z@rc#|>3|6hN93<mDD_O7m{8NlG>3sf
YOpbZ!I=wG$Kr<OUUHx3vIVCg!0Nx;4JOBUy

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png
deleted file mode 100644
index 7bca53b45027351f13a724e584f347d157a5929a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|JOX?|T!FNN
zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6GV+ZBcm4s!&IP7ByjuD
z#c4pUL`jfeFvEZB;N=|`GoTs|PZ!4!i{9h}3Dy@4f-E1j5}253Rvq9v&{d$7ke0}l
zxJi_Q%dt^GkM&SMLolPvg)<Y6XdRFan9y)U{z`>X&%}udHGNET7#Qk5F@5~SXmS?h
N3{O`-mvv4FO#sPgR~7&O

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png
deleted file mode 100644
index 51f66e6634665f7ed14600e5bf2ca5ace8c350af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|k^_7~T!FNN
zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6GV+ZBcm4s!&C+axUL=*
z#z~F>uOd*4V&u?g;P+y%o_biCaS_lO#gZVuV21w$fZG?pB|ya<o-U3d7QM*{609#8
z1X(_4B``77tUADTpsPSDAuW+9ag*qYlg^DYdaPUl4Z(~u7tTyPqIEzzU_!$Y`70Gl
iJrgG;)bugUVPJUwf~7p;-Fi?MFnGH9xvX<aXaWG~rDn7M

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..1677c8d25d8c17456ab472cecac008631d4f4c35
GIT binary patch
literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0J61me$bFux#0~{rmU-
zR}vBh3Ne-h`2{mLJiCzw;v{*yyD)UH%6b4foCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#
zC962I3}bftWjzK4CT&j_#}ExsMg^w(e}O87J79EiaWNJ^@+G6Ov9S?~fD#ZO3m_>T
Z;mq&xOl{rsxt@c9!PC{xWt~$(69Az(DHH$z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png
deleted file mode 100644
index 0003cc807e9635adae7cff475004ec9d4fe7a28d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|JOX?|T!FNN
zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6HqZOAiC}CA)uT@NswPK
z!+-4H<sBC@pc)TP7sn8b-sA)c))x(eEFZKIn3!r-9pF09RiKrSmdKR2N%X@9Cq{lf
z)|!BZU`Ck>XC@xeIv^b|q2Y-9l?tVvi4zlQ`k3Z0Fz7ZhMQ8a{J_5PP)78&qol`;+
E07uAF2mk;8


From c2dffca0638df0d3a54c1143877a3d2fd24afc38 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 1 Feb 2026 09:21:29 +0100
Subject: [PATCH 091/360] Update some magazines to use new stripes and inhand
 sprites where possible

---
 .../Guns/Ammunition/Magazines/pistol.yml      | 52 ++++++++++++++++++-
 .../Guns/Ammunition/Magazines/rifle.yml       | 10 +++-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 9d45464d12..53fcde1069 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -9,10 +9,22 @@
     proto: CartridgePistolRubber
   - type: Sprite
     layers:
-    - state: rubber
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#dbdbdb"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#dbdbdb"
 
 - type: entity
   id: MagazinePistolHighCapacityIncendiary
@@ -28,6 +40,18 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
 
 - type: entity
   id: MagazinePistolHighCapacityUranium
@@ -39,10 +63,22 @@
     proto: CartridgePistolUranium
   - type: Sprite
     layers:
-    - state: uranium
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#00cd42"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#00cd42"
 
 - type: entity
   parent: BaseMagazinePistol
@@ -59,6 +95,12 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
 
 - type: entity
   parent: BaseMagazinePistolSubMachineGun
@@ -75,6 +117,12 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
 
 # .38 special
 
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index d39c2bd614..68910ae445 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -10,7 +10,15 @@
     proto: CartridgeRifleRubber
   - type: Sprite
     layers:
-    - state: rubber
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag

From cbe5c810704906799e3ba7a721afb250c6a80f44 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Sun, 14 Dec 2025 15:13:52 -0500
Subject: [PATCH 092/360] Assorted minor cleanup (and shotgun shell
 descriptions) in
 Resources\Prototypes\Entities\Objects\Weapons\Guns\Ammunition\ (#41841)

* YAML cleanup of shotgun rounds

* Descriptions for all shotgun ammo types

* YAML cleanup of pistol rounds

* YAML cleanup of magnum rounds (and tweaks to uranium ammo descriptions)

* YAML cleanup of rifle rounds

* YAML cleanup of toy rounds

* YAML cleanup of magnum/pistol/rifle/shotgun projectiles

* YAML cleanup of magnum/pistol/toy speedloaders

* YAML cleanup of light rifle rounds

* Descriptions for anti-materiel rounds and boxes

* YAML cleanup of base_cartridge.yml

* YAML cleanup of caseless rounds (plus minor viper-mag description tweaks)

* YAML cleanup of heavy rifle rounds

* YAML cleanup of grenades and explosives

* machine pistol magazine is now Security contraband

* Practice ammunition description updates

* Missed a magnum ammo description tweak

* Whoops, misspelled the word 'description' a lot

* Practice ammunition description updates 2!

* Better name/description for joke L6 foam dart mag

* Tweak to that last commit

* Fixed practice machine pistol magazines using real bullets
---
 .../Guns/Ammunition/Boxes/antimateriel.yml    |   1 +
 .../Guns/Ammunition/Boxes/caseless_rifle.yml  |   2 +-
 .../Guns/Ammunition/Boxes/light_rifle.yml     |   4 +-
 .../Weapons/Guns/Ammunition/Boxes/magnum.yml  |   4 +-
 .../Weapons/Guns/Ammunition/Boxes/pistol.yml  |   4 +-
 .../Weapons/Guns/Ammunition/Boxes/rifle.yml   |   2 +-
 .../Weapons/Guns/Ammunition/Boxes/shotgun.yml |  26 ++-
 .../Weapons/Guns/Ammunition/Boxes/toy.yml     |   6 +-
 .../Ammunition/Cartridges/antimateriel.yml    |   1 +
 .../Ammunition/Cartridges/base_cartridge.yml  |   4 +-
 .../Ammunition/Cartridges/caseless_rifle.yml  |  10 +-
 .../Ammunition/Cartridges/heavy_rifle.yml     |   6 +-
 .../Ammunition/Cartridges/light_rifle.yml     |  18 +-
 .../Guns/Ammunition/Cartridges/magnum.yml     |  22 +--
 .../Guns/Ammunition/Cartridges/pistol.yml     |  18 +-
 .../Guns/Ammunition/Cartridges/rifle.yml      |  18 +-
 .../Guns/Ammunition/Cartridges/shotgun.yml    |  32 ++--
 .../Guns/Ammunition/Cartridges/toy.yml        |   7 +-
 .../Ammunition/Magazines/caseless_rifle.yml   |  50 +----
 .../Guns/Ammunition/Magazines/grenade.yml     |  16 +-
 .../Guns/Ammunition/Magazines/heavy_rifle.yml |   4 +-
 .../Guns/Ammunition/Magazines/light_rifle.yml |  18 +-
 .../Guns/Ammunition/Magazines/magnum.yml      |  57 ++----
 .../Guns/Ammunition/Magazines/pistol.yml      | 178 +++++++++---------
 .../Guns/Ammunition/Magazines/rifle.yml       |  16 +-
 .../Guns/Ammunition/Magazines/shotgun.yml     |  19 +-
 .../Weapons/Guns/Ammunition/Magazines/toy.yml |   5 +-
 .../Ammunition/Projectiles/caseless_rifle.yml |   8 +-
 .../Guns/Ammunition/Projectiles/grenade.yml   |  24 +--
 .../Ammunition/Projectiles/heavy_rifle.yml    |   8 +-
 .../Ammunition/Projectiles/light_rifle.yml    |  16 +-
 .../Guns/Ammunition/Projectiles/magnum.yml    |  20 +-
 .../Guns/Ammunition/Projectiles/pistol.yml    |  16 +-
 .../Guns/Ammunition/Projectiles/rifle.yml     |  16 +-
 .../Guns/Ammunition/Projectiles/shotgun.yml   |  76 ++++----
 .../Guns/Ammunition/Projectiles/toy.yml       |   6 +-
 .../Guns/Ammunition/SpeedLoaders/magnum.yml   |  29 +--
 .../Guns/Ammunition/SpeedLoaders/pistol.yml   |   8 +-
 .../Ammunition/SpeedLoaders/rifle_light.yml   |   4 +-
 .../Guns/Ammunition/SpeedLoaders/toy.yml      |   7 +-
 .../Weapons/Guns/Ammunition/explosives.yml    |  28 +--
 41 files changed, 387 insertions(+), 427 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
index d571fa85a5..825f375510 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@@ -29,6 +29,7 @@
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel
   name: ammunition box (.60 anti-materiel)
+  description: A cardboard box of .60 anti-materiel rounds.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
index bc9cdd68cf..47e961bae0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -44,7 +44,7 @@
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRiflePractice
   name: ammunition box (.25 caseless practice)
-  description: A cardboard box of .25 caseless rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .25 caseless rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
index a63cdf13bc..ad6e54b134 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -64,7 +64,7 @@
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRiflePractice
   name: ammunition box (.30 rifle practice)
-  description: A cardboard box of .30 rifle rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .30 rifle rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -77,8 +77,8 @@
     - state: practice
 
 - type: entity
-  id: MagazineBoxLightRifleIncendiary
   parent: BaseMagazineBoxLightRifle
+  id: MagazineBoxLightRifleIncendiary
   name: ammunition box (.30 rifle incendiary)
   description: A cardboard box of .30 rifle rounds. Intended to hold self-igniting incendiary ammunition.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
index bee7b33749..af61bb9379 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -43,7 +43,7 @@
   parent: BaseMagazineBoxMagnum
   id: MagazineBoxMagnumPractice
   name: ammunition box (.45 magnum practice)
-  description: A cardboard box of .45 magnum rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .45 magnum rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -91,7 +91,7 @@
   id: MagazineBoxMagnumAP
   parent: BaseMagazineBoxMagnum
   name: ammunition box (.45 magnum armor-piercing)
-  description: A cardboard box of .45 magnum rounds. Intended to hold rare armor-piercing ammunition.
+  description: A cardboard box of .45 magnum rounds. Intended to hold specialized armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
index 9dad0d5785..f359589177 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -44,7 +44,7 @@
   parent: BaseMagazineBoxPistol
   id: MagazineBoxPistolPractice
   name: ammunition box (.35 auto practice)
-  description: A cardboard box of .35 auto rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .35 auto rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
@@ -73,8 +73,8 @@
     - state: incendiary
 
 - type: entity
-  id: MagazineBoxPistolUranium
   parent: BaseMagazineBoxPistol
+  id: MagazineBoxPistolUranium
   name: ammunition box (.35 auto uranium)
   description: A cardboard box of .35 auto rounds. Intended to hold exotic uranium-core ammunition.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index f980e51eed..3488feb861 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -63,7 +63,7 @@
   parent: BaseMagazineBoxRifle
   id: MagazineBoxRiflePractice
   name: ammunition box (.20 rifle practice)
-  description: A cardboard box of .20 rifle rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .20 rifle rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRiflePractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index df7d949b52..7eb13f0fa9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
   parent: BaseItem
   id: BaseAmmoProvider
-  abstract: true
   components:
   - type: ContainerContainer
     containers:
@@ -12,9 +12,9 @@
     sprite: Objects/Storage/boxes.rsi
 
 - type: entity
+  abstract: true
   parent: BaseAmmoProvider
   id: AmmoProviderShotgunShell
-  abstract: true
   components:
     - type: Sprite
       sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi
@@ -35,6 +35,7 @@
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
   name: ammunition box (.50 beanbag)
+  description: A cardboard box of .50 shotgun shells. Intended to hold less-than-lethal beanbag ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
@@ -47,9 +48,10 @@
       - state: beanbag
 
 - type: entity
-  name: ammunition box (.50 pellet)
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
+  name: ammunition box (.50 pellet)
+  description: A cardboard box of .50 shotgun shells. Intended to hold general-purpose kinetic ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgun
@@ -62,9 +64,10 @@
       - state: lethal
 
 - type: entity
-  name: ammunition box (.50 slug)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
+  name: ammunition box (.50 slug)
+  description: A cardboard box of .50 shotgun shells. Intended to hold long-ranged slug ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
@@ -81,9 +84,10 @@
       - state: slug
 
 - type: entity
-  name: ammunition box (.50 flare)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
+  name: ammunition box (.50 flare)
+  description: A cardboard box of .50 shotgun shells. Intended to hold illuminating flare ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
@@ -96,9 +100,10 @@
       - state: flare
 
 - type: entity
-  name: ammunition box (.50 incendiary)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
+  name: ammunition box (.50 incendiary)
+  description: A cardboard box of .50 shotgun shells. Intended to hold self-igniting incendiary ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
@@ -111,9 +116,10 @@
       - state: incendiary
 
 - type: entity
-  name: ammunition box (.50 uranium)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
+  name: ammunition box (.50 uranium)
+  description: A cardboard box of .50 shotgun shells. Intended to hold exotic uranium-core ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
@@ -130,9 +136,10 @@
       - state: uranium
 
 - type: entity
-  name: ammunition box (.50 practice)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
+  name: ammunition box (.50 practice)
+  description: A cardboard box of .50 shotgun shells. Intended to hold harmless practice ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
@@ -145,9 +152,10 @@
       - state: practice
 
 - type: entity
-  name: ammunition box (.50 tranquilizer)
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
+  name: ammunition box (.50 tranquilizer)
+  description: A cardboard box of .50 shotgun shells. Intended to hold nonlethal tranquilizer ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
index 11649f3db3..82c7a7db48 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -2,7 +2,7 @@
   abstract: true
   parent: BaseItem
   id: BoxDonkSoftBase
-  name: foamdart box
+  name: toy ammunition box
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -17,7 +17,8 @@
 - type: entity
   parent: BoxDonkSoftBase
   id: BoxDonkSoftBox
-  name: box of foam darts
+  name: foam dart box
+  description: A cardboard box of foam darts.
   components:
   - type: BallisticAmmoProvider
     whitelist:
@@ -35,6 +36,7 @@
   parent: BaseMagazineBoxMagnum
   id: BoxCartridgeCap
   name: cap gun cartridge box
+  description: A cardboard box of cap gun cartridges.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCap
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
index 1fd04ae36f..77fe197201 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
@@ -2,6 +2,7 @@
   parent: [ BaseCartridge, BaseMajorContraband ]
   id: CartridgeAntiMateriel
   name: cartridge (.60 anti-materiel)
+  description: A high-power cartridge used by high-precision rifles.
   components:
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index 98f8c6402d..e6b42e749e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BaseCartridge
-  parent: BaseItem
   abstract: true
+  parent: BaseItem
+  id: BaseCartridge
   components:
   - type: Sprite
     drawdepth: Items
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index 8d4e9b8ffc..6fe89e2684 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeCaselessRifle
   name: cartridge (.25 caseless)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -21,19 +21,19 @@
     price: 10
 
 - type: entity
+  parent: BaseCartridgeCaselessRifle
   id: CartridgeCaselessRifle
   name: cartridge (.25 caseless)
-  parent: BaseCartridgeCaselessRifle
   description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRifle
 
 - type: entity
+  parent: BaseCartridgeCaselessRifle
   id: CartridgeCaselessRiflePractice
   name: cartridge (.25 caseless practice)
-  parent: BaseCartridgeCaselessRifle
-  description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Chalk ammunition is generally non-harmful, used for practice.
+  description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRiflePractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
index 4e2db33abc..1a9822d4f4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeHeavyRifle
   name: cartridge (.10 rifle)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -20,9 +20,9 @@
     price: 10
 
 - type: entity
+  parent: BaseCartridgeHeavyRifle
   id: CartridgeMinigun
   name: cartridge (.10 rifle)
-  parent: BaseCartridgeHeavyRifle
   components:
   - type: CartridgeAmmo
     proto: BulletMinigun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
index b4af723945..f3f578f56f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeLightRifle
   name: cartridge (.30 rifle)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRifle
   name: cartridge (.30 rifle)
-  parent: BaseCartridgeLightRifle
   description: A classic intermediate cartridge used by many combat rifles and LMGs. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifle
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRiflePractice
   name: cartridge (.30 rifle practice)
-  parent: BaseCartridgeLightRifle
-  description: A classic intermediate cartridge used by many combat rifles and LMGs. Chalk ammunition is generally non-harmful, used for practice.
+  description: A classic intermediate cartridge used by many combat rifles and LMGs. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRiflePractice
@@ -43,10 +43,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRifleIncendiary
   name: cartridge (.30 rifle incendiary)
-  parent: BaseCartridgeLightRifle
-  description: A classic intermediate cartridge used by many combat rifles and LMGs. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
+  description: A classic intermediate cartridge used by many combat rifles and LMGs. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleIncendiary
@@ -59,10 +59,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRifleUranium
   name: cartridge (.30 rifle uranium)
-  parent: BaseCartridgeLightRifle
-  description: A classic intermediate cartridge used by many combat rifles and LMGs. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+  description: A classic intermediate cartridge used by many combat rifles and LMGs. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index 58862b9984..7c28aa52bc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeMagnum
   name: cartridge (.45 magnum)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnum
   name: cartridge (.45 magnum)
-  parent: BaseCartridgeMagnum
   description: Heavy magnum cartridge mostly used by revolvers. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnum
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumPractice
   name: cartridge (.45 magnum practice)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Chalk ammunition is generally non-harmful, used for practice.
+  description: Heavy magnum cartridge mostly used by revolvers. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumPractice
@@ -43,10 +43,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumIncendiary
   name: cartridge (.45 magnum incendiary)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
+  description: Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumIncendiary
@@ -59,10 +59,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumAP
   name: cartridge (.45 magnum armor-piercing)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Armor piercing ammunition is renowned for its ability to cut straight through body armor.
+  description: Heavy magnum cartridge mostly used by revolvers. Armor-piercing ammunition is renowned for its ability to cut straight through body armor.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumAP
@@ -75,10 +75,10 @@
         color: "#0a0a0a"
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumUranium
   name: cartridge (.45 magnum uranium)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+  description: Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 3862918e38..64bda7299b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgePistol
   name: cartridge (.35 auto)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistol
   name: cartridge (.35 auto)
   description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Standard kinetic ammunition is common and useful in most situations.
-  parent: BaseCartridgePistol
   components:
   - type: CartridgeAmmo
     proto: BulletPistol
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistolPractice
   name: cartridge (.35 auto practice)
-  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Chalk ammunition is generally non-harmful, used for practice.
-  parent: BaseCartridgePistol
+  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletPistolPractice
@@ -43,10 +43,10 @@
          color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistolIncendiary
   name: cartridge (.35 auto incendiary)
-  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
-  parent: BaseCartridgePistol
+  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletPistolIncendiary
@@ -61,7 +61,7 @@
 - type: entity
   id: CartridgePistolUranium
   name: cartridge (.35 auto uranium)
-  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Uranium core ammunition features a load of fissile material, irradiating the target from the inside.
+  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   parent: BaseCartridgePistol
   components:
   - type: CartridgeAmmo
@@ -75,10 +75,10 @@
         color: "#65fe08"
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistolSpent
   name: cartridge (.35 auto)
   suffix: spent
-  parent: BaseCartridgePistol
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
index d4304ef803..d39f907fb0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeRifle
   name: cartridge (.20 rifle)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRifle
   name: cartridge (.20 rifle)
-  parent: BaseCartridgeRifle
   description: A modern intermediate cartridge for combat rifles. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletRifle
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRiflePractice
   name: cartridge (.20 rifle practice)
-  parent: BaseCartridgeRifle
-  description: A modern intermediate cartridge for combat rifles. Chalk ammunition is generally non-harmful, used for practice.
+  description: A modern intermediate cartridge for combat rifles. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletRiflePractice
@@ -43,10 +43,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRifleIncendiary
   name: cartridge (.20 rifle incendiary)
-  parent: BaseCartridgeRifle
-  description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
+  description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletRifleIncendiary
@@ -59,10 +59,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRifleUranium
   name: cartridge (.20 rifle uranium)
-  parent: BaseCartridgeRifle
-  description: A modern intermediate cartridge for combat rifles. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+  description: A modern intermediate cartridge for combat rifles. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   components:
   - type: CartridgeAmmo
     proto: BulletRifleUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 3dfab5e84a..fe1e7641c4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BaseCartridge
   id: BaseShellShotgun
   name: shell (.50)
-  parent: BaseCartridge
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -19,9 +19,10 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
   id: ShellShotgunBeanbag
   name: shell (.50 beanbag)
-  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
+  description: The standard cartridge used by most modern shotguns. Beanbag ammunition contains a single less-than-lethal projectile that can stun targets.
   components:
   - type: Tag
     tags:
@@ -37,9 +38,10 @@
     state: "beanbag"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband]
   id: ShellShotgunSlug
   name: shell (.50 slug)
-  parent: [ BaseShellShotgun, BaseSecurityContraband]
+  description: The standard cartridge used by most modern shotguns. Slug ammunition contains a single high-density projectile effective at longer ranges than pellet ammunition.
   components:
   - type: Sprite
     layers:
@@ -51,9 +53,10 @@
     state: "slug"
 
 - type: entity
+  parent: BaseShellShotgun
   id: ShellShotgunFlare
   name: shell (.50 flare)
-  parent: BaseShellShotgun
+  description: The standard cartridge used by most modern shotguns. Flare ammunition contains a single brightly-burning projectile intended for illumination and signalling, rather than combat.
   components:
   - type: Tag
     tags:
@@ -69,9 +72,10 @@
     state: "flare"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgun
   name: shell (.50 pellet)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: Sprite
     layers:
@@ -81,9 +85,10 @@
     proto: PelletShotgunSpread
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunIncendiary
   name: shell (.50 incendiary)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: Sprite
     layers:
@@ -95,9 +100,10 @@
     state: "incendiary"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunPractice
   name: shell (.50 practice)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Practice ammunition fires chalk pellets that sting a little, but otherwise cause no lasting damage.
   components:
   - type: Sprite
     layers:
@@ -109,9 +115,10 @@
     state: "practice"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellTranquilizer
   name: shell (.50 tranquilizer)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Tranquilizer ammunition contains a single ballistic syringe loaded with a strong sedative that harmlessly puts targets to sleep.
   components:
   - type: Tag
     tags:
@@ -136,10 +143,10 @@
     state: "tranquilizer"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunImprovised
   name: improvised shotgun shell
-  description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: A homemade shotgun shell loaded with chunks of glass shrapnel. Surprisingly effective, but the spread is so wide that you couldn't hit the broad side of a barn.
   components:
   - type: Tag
     tags:
@@ -158,9 +165,10 @@
     state: "improvised"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunUranium
   name: uranium shotgun shell
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Uranium ammunition replaces the lead core of the pellets with fissile material, irradiating targets from the inside.
   components:
     - type: Sprite
       layers:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
index 510a8fef3e..3210f2cb4c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BaseCartridge
   id: BaseCartridgeCap
   name: cartridge (cap)
-  parent: BaseCartridge
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -19,9 +19,10 @@
     price: 5
 
 - type: entity
+  parent: BaseCartridgeCap
   id: CartridgeCap
   name: cap gun cartridge
-  parent: BaseCartridgeCap
+  description: A mock pistol cartridge that makes noise and smoke, but has no actual projectile.
   components:
   - type: CartridgeAmmo
     proto: BulletCap
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index f51b21e1b4..3c3b25ac52 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineCaselessRifle
   name: "magazine (.25 caseless)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -33,29 +33,10 @@
   - type: Appearance
 
 - type: entity
-  id: BaseMagazineCaselessRifleShort
-  name: "caseless rifle short magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
   abstract: true
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 10
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
-- type: entity
+  parent: BaseMagazineCaselessRifle
   id: BaseMagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -82,24 +63,9 @@
   - type: Appearance
 
 - type: entity
-  id: MagazineCaselessRifle10x24
-  name: "box magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 99
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-
-- type: entity
+  parent: BaseMagazinePistolCaselessRifle
   id: MagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
-  parent: BaseMagazinePistolCaselessRifle
   description: 10-round magazine for the Cobra pistol. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -125,10 +91,10 @@
       - state: inhand-right-stripe
 
 - type: entity
+  parent: BaseMagazinePistolCaselessRifle
   id: MagazinePistolCaselessRiflePractice
   name: "pistol magazine (.25 caseless practice)"
-  parent: BaseMagazinePistolCaselessRifle
-  description: 10-round magazine for the Cobra pistol. Intended to hold non-harmful chalk ammunition.
+  description: 10-round magazine for the Cobra pistol. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice
@@ -158,9 +124,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineCaselessRifle
   id: MagazineCaselessRifle
   name: "magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRifle
@@ -178,9 +144,9 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineCaselessRifle
   id: MagazineCaselessRiflePractice
   name: "magazine (.25 caseless practice)"
-  parent: BaseMagazineCaselessRifle
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
index c6f98a870a..9df114bc6b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineGrenade
   name: grenade cartridge
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -40,48 +40,48 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeEmpty
   name: grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeFrag
   name: frag grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeFrag
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeEMP
   name: EMP grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeEMP
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeFlash
   name: flash grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeFlash
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeBlast
   name: blast grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeBlast
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeBaton
   name: baton grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeBaton
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index 5aa704231d..c3c8e01504 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineHeavyRifle
   name: "magazine (.20 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index d2b2165f8f..bd79513f19 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -1,9 +1,9 @@
 # Empty mags
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineLightRifle
   name: "magazine (.30 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -35,9 +35,9 @@
 
 # Magazines
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRifleBox
   name: "L6 SAW magazine box (.30 rifle)"
-  parent: BaseMagazineLightRifle
   description: Box containing a 100-round belt of linked .30 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: Tag
@@ -56,9 +56,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRifle
   name: "magazine (.30 rifle)"
-  parent: BaseMagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -77,10 +77,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazineLightRifle
   id: MagazineLightRifleEmpty
   name: "magazine (.30 rifle any)"
   suffix: empty
-  parent: MagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles.
   components:
   - type: BallisticAmmoProvider
@@ -99,10 +99,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRiflePractice
   name: "magazine (.30 rifle practice)"
-  parent: BaseMagazineLightRifle
-  description: Curved 30-round double stack magazine for combat rifles. Intended to hold non-harmful chalk ammunition.
+  description: Curved 30-round double stack magazine for combat rifles. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -126,9 +126,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRifleUranium
   name: "magazine (.30 rifle uranium)"
-  parent: BaseMagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -153,9 +153,9 @@
         color: "#00cd42"
 
 - type: entity
+  parent: MagazineLightRifle
   id: MagazineLightRifleIncendiary
   name: "magazine (.30 rifle incendiary)"
-  parent: MagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 705601870f..4a7b9e9711 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseMagazinePistol, BaseSecurityContraband ]
   id: BaseMagazineMagnum
   name: pistol magazine (.45 magnum)
-  parent: [ BaseMagazinePistol, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -15,44 +15,11 @@
     capacity: 7
 
 - type: entity
-  id: BaseMagazineMagnumSubMachineGun
-  name: SMG magazine (.45 magnum)
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-      - MagazineMagnumSubMachineGun
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    whitelist:
-      tags:
-        - CartridgeMagnum
-    capacity: 25
-  - type: Item
-    size: Small
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumEmpty
   name: pistol magazine (.45 magnum any)
   suffix: empty
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine.
+  description: 7-round single stack magazine for large-caliber pistols.
   components:
   - type: BallisticAmmoProvider
     proto: null
@@ -70,10 +37,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnum
   name: pistol magazine (.45 magnum)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold general-purpose kinetic ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnum
@@ -91,10 +58,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumPractice
   name: pistol magazine (.45 magnum practice)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold non-harmful chalk ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -118,10 +85,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumUranium
   name: pistol magazine (.45 magnum uranium)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold exotic uranium-core ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumUranium
@@ -145,10 +112,10 @@
         color: "#00cd42"
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumAP
   name: pistol magazine (.45 magnum armor-piercing)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold rare armor-piercing ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold specialized armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 251f72a9c0..146aae1447 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazinePistol
   name: pistol magazine (.35 auto)
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -32,10 +32,10 @@
   - type: Appearance
 
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazinePistolHighCapacity
   name: machine pistol magazine (.35 auto)
-  parent: BaseItem
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -65,10 +65,10 @@
   - type: Appearance
 
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazinePistolSubMachineGun  # Yeah it's weird but it's pistol caliber
   name: SMG magazine (.35 auto)
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -99,9 +99,9 @@
   - type: Appearance
 
 - type: entity
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: MagazinePistolSubMachineGunTopMounted
   name: WT550 magazine (.35 auto top-mounted)
-  parent: [ BaseItem, BaseSecurityContraband ]
   description: Unconventional 30-round top feeding magazine for the WT550 SMG. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: Item
@@ -133,18 +133,19 @@
       ballistic-ammo: !type:Container
 
 - type: entity
+  parent: MagazinePistolSubMachineGunTopMounted
   id: MagazinePistolSubMachineGunTopMountedEmpty
   name: WT550 magazine (.35 auto top-mounted any)
-  parent: MagazinePistolSubMachineGunTopMounted
+  suffix: empty
   description: Unconventional 30-round top feeding magazine for the WT550 SMG.
   components:
   - type: BallisticAmmoProvider
     proto: null
 
 - type: entity
+  parent: BaseMagazinePistol
   id: MagazinePistol
   name: pistol magazine (.35 auto)
-  parent: BaseMagazinePistol
   description: 10-round single-stack magazine for pistols. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -163,10 +164,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazinePistol
   id: MagazinePistolEmpty
   name: pistol magazine (.35 auto any)
   suffix: empty
-  parent: MagazinePistol
   description: 10-round single-stack magazine for pistols.
   components:
   - type: BallisticAmmoProvider
@@ -185,9 +186,9 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazinePistol
   id: MagazinePistolIncendiary
   name: pistol magazine (.35 auto incendiary)
-  parent: MagazinePistol
   description: 10-round single-stack magazine for pistols. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -212,10 +213,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseMagazinePistol
   id: MagazinePistolPractice
   name: pistol magazine (.35 auto practice)
-  parent: BaseMagazinePistol
-  description: 10-round single-stack magazine for pistols. Intended to hold non-harmful chalk ammunition.
+  description: 10-round single-stack magazine for pistols. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
@@ -239,9 +240,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazinePistol
   id: MagazinePistolUranium
   name: pistol magazine (.35 auto uranium)
-  parent: BaseMagazinePistol
   description: 10-round single-stack magazine for pistols. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -266,79 +267,9 @@
         color: "#00cd42"
 
 - type: entity
-  id: MagazinePistolHighCapacityEmpty
-  name: machine pistol magazine (.35 auto any)
-  description: 20-round double-stack single feed magazine for machine pistols. #Delta V
-  suffix: empty
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: null
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazinePistolHighCapacity
-  name: machine pistol magazine (.35 auto)
-  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold general-purpose kinetic ammunition. #Delta V
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistol
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazinePistolHighCapacityPractice
-  name: machine pistol magazine (.35 auto practice)
-  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold non-harmful chalk ammunition. #Delta V
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolPractice # DeltaV
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
-
-- type: entity
+  parent: BaseMagazinePistolSubMachineGun
   id: MagazinePistolSubMachineGun
   name: SMG magazine (.35 auto)
-  parent: BaseMagazinePistolSubMachineGun
   description: 30-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -359,10 +290,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazinePistolSubMachineGun
   id: MagazinePistolSubMachineGunEmpty
   name: SMG magazine (.35 auto any)
   suffix: empty
-  parent: BaseMagazinePistolSubMachineGun
   description: 30-round double-stack magazine for submachine guns.
   components:
   - type: BallisticAmmoProvider
@@ -381,10 +312,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazinePistolSubMachineGun
   id: MagazinePistolSubMachineGunPractice
   name: SMG magazine (.35 auto practice)
-  parent: BaseMagazinePistolSubMachineGun
-  description: 30-round double-stack magazine for submachine guns. Intended to hold non-harmful chalk ammunition.
+  description: 30-round double-stack magazine for submachine guns. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
@@ -408,9 +339,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazinePistolSubMachineGun
   id: MagazinePistolSubMachineGunUranium
   name: SMG magazine (.35 auto uranium)
-  parent: BaseMagazinePistolSubMachineGun
   description: 30-round double-stack magazine for submachine guns. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -461,3 +392,72 @@
       - state: inhand-right-stripe
         color: "#ff6e52"
 
+- type: entity
+  parent: BaseMagazinePistolHighCapacity
+  id: MagazinePistolHighCapacityEmpty
+  name: machine pistol magazine (.35 auto any)
+  suffix: empty
+  description: Custom 16-round double-stack magazine for the Viper pistol.
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  parent: BaseMagazinePistolHighCapacity
+  id: MagazinePistolHighCapacity
+  name: machine pistol magazine (.35 auto)
+  description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistol
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  parent: BaseMagazinePistolHighCapacity
+  id: MagazinePistolHighCapacityPractice
+  name: machine pistol magazine (.35 auto practice)
+  description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolPractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#dbdbdb"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#dbdbdb"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index 8e05d114d7..99accaa558 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineRifle
   name: "magazine (.20 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -32,9 +32,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazineRifle
   id: MagazineRifle
   name: "magazine (.20 rifle)"
-  parent: BaseMagazineRifle
   description: 25-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -53,10 +53,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazineRifle
   id: MagazineRifleEmpty
   name: "magazine (.20 rifle any)"
   suffix: empty
-  parent: MagazineRifle
   description: 25-round double stack magazine for combat rifles.
   components:
   - type: BallisticAmmoProvider
@@ -75,9 +75,9 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazineRifle
   id: MagazineRifleIncendiary
   name: "magazine (.20 rifle incendiary)"
-  parent: MagazineRifle
   description: 25-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -102,10 +102,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseMagazineRifle
   id: MagazineRiflePractice
   name: "magazine (.20 rifle practice)"
-  parent: BaseMagazineRifle
-  description: 25-round double stack magazine for combat rifles. Intended to hold non-harmful chalk ammunition.
+  description: 25-round double stack magazine for combat rifles. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRiflePractice
@@ -129,9 +129,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineRifle
   id: MagazineRifleUranium
   name: "magazine (.20 rifle uranium)"
-  parent: BaseMagazineRifle
   description: 25-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
index 241ac1327d..07e32487de 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineShotgun
   name: ammo drum (.50 shells)
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -46,15 +46,17 @@
   id: MagazineShotgunEmpty
   name: ammo drum (.50 shells any)
   suffix: empty
+  description: A large drum magazine used by some military-grade automatic shotguns.
   parent: BaseMagazineShotgun
   components:
   - type: BallisticAmmoProvider
     proto: null
 
 - type: entity
+  parent: BaseMagazineShotgun
   id: MagazineShotgun
   name: ammo drum (.50 pellet)
-  parent: BaseMagazineShotgun
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgun
@@ -76,9 +78,10 @@
         color: "#ba7710"
 
 - type: entity
-  id: MagazineShotgunBeanbag
-  name: ammo drum (.50 beanbags)
   parent: BaseMagazineShotgun
+  id: MagazineShotgunBeanbag
+  name: ammo drum (.50 beanbag)
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold less-than-lethal beanbag ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunBeanbag
@@ -100,9 +103,10 @@
         color: "#30722d"
 
 - type: entity
+  parent: BaseMagazineShotgun
   id: MagazineShotgunSlug
   name: ammo drum (.50 slug)
-  parent: BaseMagazineShotgun
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold long-ranged slug ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunSlug
@@ -124,9 +128,10 @@
         color: "#72382d"
 
 - type: entity
+  parent: BaseMagazineShotgun
   id: MagazineShotgunIncendiary
   name: ammo drum (.50 incendiary)
-  parent: BaseMagazineShotgun
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
index babbc2648f..2797aa1dd0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
@@ -1,7 +1,8 @@
 - type: entity
   parent: MagazineLightRifleBox # It goes in a saw, its funny.
   id: MagazineFoamBox
-  name: ammunition box (foam)
+  name: "L6 SAW magazine box (foam dart)"
+  description: Box containing a 100-round belt of linked... foam darts?
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -9,4 +10,4 @@
       tags:
         - BulletFoam
     proto: BulletFoam
-    capacity: 100
\ No newline at end of file
+    capacity: 100
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index 83392d07ef..566f8579e4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletCaselessRifle
-  name: bullet (.25 caseless)
   parent: BaseBullet
+  id: BulletCaselessRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.25 caseless)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 19
 
 - type: entity
-  id: BulletCaselessRiflePractice
-  name: bullet (.25 caseless practice)
   parent: BaseBulletPractice
+  id: BulletCaselessRiflePractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.25 caseless practice)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
index 822c1fea17..dc0794a8bb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: PelletClusterRubber
-  name: pellet (ball, rubber)
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletClusterRubber
+  categories: [ HideSpawnMenu ]
+  name: pellet (ball, rubber)
   components:
   - type: Projectile
     deleteOnCollide: false
@@ -15,10 +15,10 @@
     lifetime: 0.25
 
 - type: entity
-  id: PelletClusterLethal
-  name: pellet (ball, lethal)
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletClusterLethal
+  categories: [ HideSpawnMenu ]
+  name: pellet (ball, lethal)
   components:
   - type: Projectile
     deleteOnCollide: false
@@ -29,10 +29,10 @@
     lifetime: 0.25
 
 - type: entity
-  id: PelletClusterIncendiary
-  name: pellet (ball, incendiary)
-  categories: [ HideSpawnMenu ]
   parent: BaseBulletIncendiary
+  id: PelletClusterIncendiary
+  categories: [ HideSpawnMenu ]
+  name: pellet (ball, incendiary)
   components:
   - type: Projectile
     deleteOnCollide: false
@@ -47,10 +47,10 @@
     lifetime: 0.25
 
 - type: entity
-  id: PelletClusterLessLethal
-  name: pellet (ball, less lethal)
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletClusterLessLethal
+  categories: [ HideSpawnMenu ]
+  name: pellet (ball, less lethal)
   components:
   - type: Projectile
     deleteOnCollide: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index eebccf32a0..91bcac892d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletHeavyRifle
-  name: bullet (.10 rifle)
   parent: BaseBullet
+  id: BulletHeavyRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.10 rifle)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 19
 
 - type: entity
-  id: BulletMinigun
-  name: minigun bullet (.10 rifle)
   parent: BulletHeavyRifle
+  id: BulletMinigun
   categories: [ HideSpawnMenu ]
+  name: minigun bullet (.10 rifle)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 60640bdd2e..b102caebc7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletLightRifle
-  name: bullet (.30 rifle)
   parent: BaseBullet
+  id: BulletLightRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 19
 
 - type: entity
-  id: BulletLightRiflePractice
-  name: bullet (.30 rifle practice)
   parent: BaseBulletPractice
+  id: BulletLightRiflePractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 2
 
 - type: entity
-  id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.30 rifle incendiary)
+  id: BulletLightRifleIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 5
 
 - type: entity
-  id: BulletLightRifleUranium
   parent: BaseBulletUranium
-  name: bullet (.30 rifle uranium)
+  id: BulletLightRifleUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle uranium)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 124fa4a93e..4dccef3ef7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletMagnum
-  name: bullet (.45 magnum)
   parent: BaseBullet
+  id: BulletMagnum
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 35
 
 - type: entity
-  id: BulletMagnumPractice
-  name: bullet (.45 magnum practice)
   parent: BaseBulletPractice
+  id: BulletMagnumPractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 1
 
 - type: entity
-  id: BulletMagnumIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.45 magnum incendiary)
+  id: BulletMagnumIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 9
 
 - type: entity
-  id: BulletMagnumAP
-  name: bullet (.45 magnum armor-piercing)
   parent: BaseBulletAP
+  id: BulletMagnumAP
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum armor-piercing)
   components:
   - type: Projectile
     damage:
@@ -45,10 +45,10 @@
     ignoreResistances: true
 
 - type: entity
-  id: BulletMagnumUranium
-  name: bullet (.45 magnum uranium)
   parent: BaseBulletUranium
+  id: BulletMagnumUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum uranium)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 53917035cb..226d22c49a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletPistol
-  name: bullet (.35 auto)
   parent: BaseBullet
+  id: BulletPistol
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 16
 
 - type: entity
-  id: BulletPistolPractice
-  name: bullet (.35 auto practice)
   parent: BaseBulletPractice
+  id: BulletPistolPractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 2
 
 - type: entity
-  id: BulletPistolIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.35 auto incendiary)
+  id: BulletPistolIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 4
 
 - type: entity
-  id: BulletPistolUranium
   parent: BaseBulletUranium
-  name: bullet (.35 auto uranium)
+  id: BulletPistolUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto uranium)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 704b4286ec..c1e89a8cf4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletRifle
-  name: bullet (.20 rifle)
   parent: BaseBullet
+  id: BulletRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 17
 
 - type: entity
-  id: BulletRiflePractice
-  name: bullet (.20 rifle practice)
   parent: BaseBulletPractice
+  id: BulletRiflePractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 2
 
 - type: entity
-  id: BulletRifleIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.20 rifle incendiary)
+  id: BulletRifleIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 5
 
 - type: entity
-  id: BulletRifleUranium
   parent: BaseBulletUranium
-  name: bullet (.20 rifle uranium)
+  id: BulletRifleUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle uranium)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 5cdb8143e1..d86af24610 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: PelletShotgunSlug
-  name: pellet (.50 slug)
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletShotgunSlug
+  categories: [ HideSpawnMenu ]
+  name: pellet (.50 slug)
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -15,16 +15,15 @@
 
 
 - type: entity
-  id: PelletShotgunBeanbag
-  name: beanbag (.50)
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletShotgunBeanbag
+  categories: [ HideSpawnMenu ]
+  name: beanbag (.50)
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
     - state: bullet #just reapplying to here so it can be shaded
-
   - type: Projectile
     damage:
       types:
@@ -33,10 +32,10 @@
     damage: 55 # DeltaV - Modified the beanbag stamina damage, was 40.
 
 - type: entity
-  id: PelletShotgun
-  name: pellet (.50)
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletShotgun
+  categories: [ HideSpawnMenu ]
+  name: pellet (.50)
   components:
   - type: Projectile
     damage:
@@ -44,11 +43,10 @@
         Piercing: 10
         Structural: 15
 
-
 - type: entity
+  parent: PelletShotgun
   id: PelletShotgunSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgun
   components:
   - type: ProjectileSpread
     proto: PelletShotgun
@@ -56,10 +54,10 @@
     spread: 15
 
 - type: entity
-  id: PelletShotgunIncendiary
-  name: pellet (.50 incendiary)
-  categories: [ HideSpawnMenu ]
   parent: BaseBulletIncendiary
+  id: PelletShotgunIncendiary
+  categories: [ HideSpawnMenu ]
+  name: pellet (.50 incendiary)
   components:
   - type: Projectile
     damage:
@@ -70,9 +68,9 @@
     ignited: true
 
 - type: entity
+  parent: PelletShotgunIncendiary
   id: PelletShotgunIncendiarySpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunIncendiary
   components:
   - type: ProjectileSpread
     proto: PelletShotgunIncendiary
@@ -80,10 +78,10 @@
     spread: 15
 
 - type: entity
-  id: PelletShotgunPractice
-  name: pellet (.50 practice)
-  categories: [ HideSpawnMenu ]
   parent: BaseBulletPractice
+  id: PelletShotgunPractice
+  categories: [ HideSpawnMenu ]
+  name: pellet (.50 practice)
   components:
   - type: Projectile
     damage:
@@ -91,9 +89,9 @@
         Blunt: 1
 
 - type: entity
+  parent: PelletShotgunPractice
   id: PelletShotgunPracticeSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunPractice
   components:
   - type: ProjectileSpread
     proto: PelletShotgunPractice
@@ -101,10 +99,10 @@
     spread: 15
 
 - type: entity
-  id: PelletShotgunImprovised
-  name: improvised pellet
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletShotgunImprovised
+  categories: [ HideSpawnMenu ]
+  name: improvised pellet
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -118,9 +116,9 @@
         Slash: 3
 
 - type: entity
+  parent: PelletShotgunImprovised
   id: PelletShotgunImprovisedSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunImprovised
   components:
   - type: ProjectileSpread
     proto: PelletShotgunImprovised
@@ -128,10 +126,10 @@
     spread: 45
 
 - type: entity
-  id: PelletShotgunTranquilizer
-  name: pellet (.50 tranquilizer)
-  categories: [ HideSpawnMenu ]
   parent: BaseBulletPractice
+  id: PelletShotgunTranquilizer
+  categories: [ HideSpawnMenu ]
+  name: pellet (.50 tranquilizer)
   components:
   - type: Projectile
     damage:
@@ -147,8 +145,8 @@
 
 - type: entity
   id: PelletShotgunFlare
-  name: pellet (.50 flare)
   categories: [ HideSpawnMenu ]
+  name: pellet (.50 flare)
   components:
   - type: Physics
     bodyType: Dynamic
@@ -194,10 +192,10 @@
   - type: FlareGunPellet # DeltaV - Added to whitelist against Skia.
 
 - type: entity
-  id: PelletShotgunUranium
-  name: pellet (.50 uranium)
-  categories: [ HideSpawnMenu ]
   parent: BaseBulletUranium
+  id: PelletShotgunUranium
+  categories: [ HideSpawnMenu ]
+  name: pellet (.50 uranium)
   components:
   - type: Projectile
     damage:
@@ -206,9 +204,9 @@
         Piercing: 5
 
 - type: entity
+  parent: PelletShotgunUranium
   id: PelletShotgunUraniumSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunUranium
   components:
   - type: ProjectileSpread
     proto: PelletShotgunUranium
@@ -216,10 +214,10 @@
     spread: 6
 
 - type: entity
-  id: PelletGrapeshot #tally fucking ho
-  name: grapeshot pellet
-  categories: [ HideSpawnMenu ]
   parent: BaseBullet
+  id: PelletGrapeshot #tally fucking ho
+  categories: [ HideSpawnMenu ]
+  name: grapeshot pellet
   components:
   - type: Sprite
     noRot: false
@@ -234,9 +232,9 @@
         Structural: 5
 
 - type: entity
+  parent: PelletGrapeshot
   id: PelletGrapeshotSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletGrapeshot
   components:
   - type: ProjectileSpread
     proto: PelletGrapeshot
@@ -244,10 +242,10 @@
     spread: 40
 
 - type: entity
-  id: PelletGlass
-  name: glass shard
   parent: BaseBullet
+  id: PelletGlass
   categories: [ HideSpawnMenu ]
+  name: glass shard
   components:
   - type: Sprite
     noRot: false
@@ -263,8 +261,8 @@
         Slash: 25
 
 - type: entity
-  id: PelletGlassSpread
   parent: PelletGlass
+  id: PelletGlassSpread
   categories: [ HideSpawnMenu ]
   components:
   - type: ProjectileSpread
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
index 3e4235f677..9f600680c6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletFoam
-  description: I hope you're wearing eye protection.
-  name: foam dart
   parent: BaseItem
+  id: BulletFoam
+  name: foam dart
+  description: I hope you're wearing eye protection.
   components:
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
index 58ba6326c1..de06bc064b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseSpeedLoaderMagnum
   name: "speed loader (.45 magnum)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -20,10 +20,10 @@
         ents: []
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnum
   name: "speed loader (.45 magnum)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold general-purpose kinetic ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnum
@@ -49,10 +49,11 @@
       - state: inhand-right-ammo
 
 - type: entity
+  parent: SpeedLoaderMagnum
   id: SpeedLoaderMagnumEmpty
   name: "speed loader (.45 magnum any)"
-  parent: SpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds for the big iron on your hip. #Big Iron reference (duh)
+  suffix: empty
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver.
   components:
   - type: BallisticAmmoProvider
     proto: null
@@ -74,19 +75,19 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: SpeedLoaderMagnum
   id: SpeedLoaderMagnumIncendiary
   name: "speed loader (.45 magnum incendiary)"
-  parent: SpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold self-igniting incendiary ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumIncendiary
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnumPractice
   name: "speed loader (.45 magnum practice)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold non-harmful chalk ammunition, perfect for practicing your quick draw.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -116,10 +117,10 @@
         color: "#ea5800"
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnumAP
   name: "speed loader (.45 magnum armor-piercing)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold rare armor-piercing ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold specialized armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP
@@ -149,10 +150,10 @@
         color: "#540000"
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnumUranium
   name: "speed loader (.45 magnum uranium)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold exotic uranium-core ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
index 512eb88657..5174b6a3b1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseSpeedLoaderPistol
   name: "speed loader (.35 auto)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -21,9 +21,9 @@
         ents: []
 
 - type: entity
+  parent: BaseSpeedLoaderPistol
   id: SpeedLoaderPistol
   name: "speed loader (.35 auto)"
-  parent: BaseSpeedLoaderPistol
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistol
@@ -40,9 +40,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseSpeedLoaderPistol
   id: SpeedLoaderPistolPractice
   name: "speed loader (.35 auto practice)"
-  parent: BaseSpeedLoaderPistol
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
index 739f092f69..cd1f220c0f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -1,8 +1,8 @@
 - type: entity
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: SpeedLoaderLightRifle
   name: "speed loader (.30 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Holds 5 rounds of .30 rifle.
+  description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
index 51c1037194..035d66a32e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BaseItem
   id: BaseSpeedLoaderCap
   name: "cap gun loader"
-  parent: BaseItem
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -30,9 +30,10 @@
         ents: []
 
 - type: entity
+  parent: BaseSpeedLoaderCap
   id: SpeedLoaderCap
   name: "cap gun loader"
-  parent: BaseSpeedLoaderCap
+  description: Designed to quickly load up to six cartridges into an empty cap gun.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCap
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 5de25fa051..9747f87c41 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -1,9 +1,9 @@
 # Rockets
 
 - type: entity
+  parent: [BaseItem, BaseMajorContraband]
   id: CartridgeRocket
   name: PG-7VL grenade
-  parent: BaseItem
   description: A 1.5 warhead designed for the RPG-7 launcher. Has tubular shape.
   components:
   - type: Tag
@@ -21,9 +21,9 @@
     price: 20
 
 - type: entity
+  parent: [BaseItem, BaseMajorContraband]
   id: CartridgeRocketSlow
   name: PG-7VL grenade "Snail-Rocket"
-  parent: BaseItem
   description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow.
   components:
     - type: Tag
@@ -43,10 +43,10 @@
 # Grenades
 
 - type: entity
+  abstract: true
+  parent: [BaseItem, BaseMajorContraband]
   id: BaseGrenade
   name: base grenade
-  parent: BaseItem
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -56,9 +56,9 @@
   - type: Sprite
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeBaton
   name: baton grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeBaton
@@ -73,9 +73,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeBlast
   name: blast grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeBlast
@@ -90,9 +90,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeFlash
   name: flash grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeFlash
@@ -107,9 +107,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeFrag
   name: frag grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeFrag
@@ -151,9 +151,9 @@
   # End DeltaV Additions
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeEMP
   name: EMP grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeEMP
@@ -170,10 +170,10 @@
 # Cannon Balls
 
 - type: entity
+  abstract: true
+  parent: [BaseItem, BaseMajorContraband]
   id: BaseCannonBall
   name: base cannon ball
-  parent: BaseItem
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -183,10 +183,10 @@
   - type: Sprite
 
 - type: entity
+  parent: BaseCannonBall
   id: CannonBall
   name: cannonball
   suffix: Pirate
-  parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
     proto: BulletCannonBall
@@ -196,10 +196,10 @@
     state: ball
 
 - type: entity
+  parent: BaseCannonBall
   id: CannonBallGrapeshot
   name: grapeshot
   suffix: Pirate
-  parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
     proto: PelletGrapeshotSpread
@@ -209,10 +209,10 @@
     state: grapeshot
 
 - type: entity
+  parent: BaseCannonBall
   id: CannonBallGlassshot
   name: glassshot
   suffix: Pirate
-  parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
     proto: PelletGlassSpread

From 456c970f4227d9fe5c52a52b475a76077363e569 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 1 Feb 2026 09:38:17 +0100
Subject: [PATCH 093/360] Move magazines still used by deltav over to our
 namespace

---
 .../Ammunition/Magazines/caseless_rifle.yml   |  48 ------
 .../Guns/Ammunition/Magazines/magnum.yml      | 119 --------------
 .../Ammunition/SpeedLoaders/rifle_light.yml   |   3 +
 .../Ammunition/Magazines/caseless_rifle.yml   |  67 ++++++++
 .../Guns/Ammunition/Magazines/magnum.yml      | 153 ++++++++++++++++++
 Resources/Prototypes/_DV/tags.yml             |   6 +
 6 files changed, 229 insertions(+), 167 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index 3c3b25ac52..ff26c3c15a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -168,51 +168,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#dbdbdb"
-
-- type: entity
-  id: MagazineCaselessRifleShort
-  name: "short magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineCaselessRifleShortPractice
-  name: "short magazine (.25 caseless practice)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRiflePractice
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 4a7b9e9711..bf77714e99 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -137,122 +137,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#540000"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunEmpty
-  name: SMG magazine (.45 magnum any)
-  suffix: empty
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: null
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineMagnumSubMachineGun
-  name: SMG magazine (.45 magnum)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnum
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineMagnumSubMachineGunPractice
-  name: SMG magazine (.45 magnum practice)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumPractice
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunUranium
-  name: SMG magazine (.45 magnum uranium)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumUranium
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#00cd42"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#00cd42"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#00cd42"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunPiercing
-  name: SMG magazine (.45 magnum armour-piercing)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumAP
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#540000"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#540000"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#540000"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
index cd1f220c0f..67f05106d1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -8,6 +8,9 @@
     tags:
       - SpeedLoaderRifle
   - type: SpeedLoader
+  - type: Tag # DeltaV - Keep Tag
+    tags:
+      - SpeedLoaderRifle
   - type: BallisticAmmoProvider
     mayTransfer: true
     whitelist:
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index 694140c39e..eff4e110a7 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -1,5 +1,72 @@
 # .25 caseless
 
+- type: entity
+  id: BaseMagazineCaselessRifleShort
+  name: "caseless rifle short magazine (.25 caseless)"
+  parent: BaseMagazineCaselessRifle
+  abstract: true
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifle
+    capacity: 10
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineCaselessRifleShort
+  name: "short magazine (.25 caseless)"
+  parent: BaseMagazineCaselessRifleShort
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifle
+    capacity: 20
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazineCaselessRifleShortPractice
+  name: "short magazine (.25 caseless practice)"
+  parent: BaseMagazineCaselessRifleShort
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRiflePractice
+    capacity: 20
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#dbdbdb"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#dbdbdb"
+
 - type: entity
   parent: BaseMagazinePistolCaselessRifle
   id: MagazinePistolCaselessRifleRubber
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 0c89990c20..520c078b40 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -24,3 +24,156 @@
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumIncendiary
     capacity: 12
+
+- type: entity
+  id: BaseMagazineMagnumSubMachineGun
+  name: SMG magazine (.45 magnum)
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - MagazineMagnumSubMachineGun
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeMagnum
+    capacity: 25
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+
+- type: entity
+  id: MagazineMagnumSubMachineGunEmpty
+  name: SMG magazine (.45 magnum any)
+  suffix: empty
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazineMagnumSubMachineGun
+  name: SMG magazine (.45 magnum)
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnum
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazineMagnumSubMachineGunPractice
+  name: SMG magazine (.45 magnum practice)
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumPractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#dbdbdb"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#dbdbdb"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#dbdbdb"
+
+- type: entity
+  id: MagazineMagnumSubMachineGunUranium
+  name: SMG magazine (.45 magnum uranium)
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#00cd42"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#00cd42"
+
+- type: entity
+  id: MagazineMagnumSubMachineGunPiercing
+  name: SMG magazine (.45 magnum armour-piercing)
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumAP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#540000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#540000"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#540000"
diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml
index 6f23e9dbbc..751bc915df 100644
--- a/Resources/Prototypes/_DV/tags.yml
+++ b/Resources/Prototypes/_DV/tags.yml
@@ -183,6 +183,12 @@
 - type: Tag
   id: Skirt
 
+- type: Tag
+  id: SpeedLoaderPistol
+
+- type: Tag
+  id: SpeedLoaderRifle
+
 - type: Tag
   id: SpeedLoaderSpecial
 

From 489287970b11f41a7a0644c2b688f28d981c250a Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Fri, 30 Jan 2026 17:58:20 +0100
Subject: [PATCH 094/360] Add pistol overrides for descriptions

---
 Resources/Locale/en-US/_DV/weapons/ammunition/pistol.ftl | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Resources/Locale/en-US/_DV/weapons/ammunition/pistol.ftl

diff --git a/Resources/Locale/en-US/_DV/weapons/ammunition/pistol.ftl b/Resources/Locale/en-US/_DV/weapons/ammunition/pistol.ftl
new file mode 100644
index 0000000000..6275045032
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/weapons/ammunition/pistol.ftl
@@ -0,0 +1,8 @@
+ent-MagazinePistolHighCapacityPractice =
+    .desc = 20-round double-stack single feed magazine for machine pistols. Intended to hold harmless practice ammunition.
+
+ent-MagazinePistolHighCapacity =
+    .desc = 20-round double-stack single feed magazine for machine pistols. Intended to hold general-purpose kinetic ammunition.
+
+ent-MagazinePistolHighCapacityEmpty =
+    .desc = 20-round double-stack single feed magazine for machine pistols.

From edfc0844418b8d57ad3653dbf2b02bec318969f8 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Sun, 14 Dec 2025 15:20:55 -0500
Subject: [PATCH 095/360] Skeletons are now affected by Holy damage (#41757)

---
 Resources/Prototypes/Damage/modifier_sets.yml         |  4 ++--
 .../Prototypes/Entities/Mobs/Species/skeleton.yml     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 8905967c0f..8a45df07e3 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -226,7 +226,7 @@
     Poison: 0.0
     Radiation: 0.0
 
-# immune to everything except physical and heat damage
+# immune to everything except physical and heat damage; vulnerable to holy damage because they're undead, but not as vulnerable as a ghost or demon would be
 - type: damageModifierSet
   id: Skeleton
   coefficients:
@@ -239,7 +239,7 @@
     Asphyxiation: 0.0
     Bloodloss: 0.0
     Cellular: 0.0
-    Holy: 1.5 # DeltaV
+    Holy: 1.5 # DeltaV - was 0.5
   flatReductions:
     Blunt: 5
 
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 836d32046c..1e53816aa2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -17,8 +17,8 @@
     requiredLegs: 2
     gibSound: /Audio/Effects/bone_rattle.ogg
   - type: Damageable
-    damageContainer: InorganicMetaphysical # DeltaV
-    damageModifierSet: Skeleton
+    damageContainer: InorganicMetaphysical # DeltaV - Was BiologicalMetaphysical
+    damageModifierSet: Skeleton # If we get non-Holy metaphysical damage types in the future, the Skeleton set might need to be adjusted to provide immunity to them (depends on what exactly the new types are)
   - type: DamageVisuals
     damageOverlayGroups:
       Brute:
@@ -83,9 +83,10 @@
       effects: # TODO: when magic is around - make a milk transformation to a skeleton monster
       - !type:HealthChange
         damage:
-          groups:
-            Burn: -1 # healing obviously up to discussion
-            Brute: -0.75 # these groups are the only 2 possible ways to damage a skeleton
+          groups: # these groups are the only 3 possible ways to damage a skeleton. numerical values obviously up to discussion
+            Burn: -1
+            Brute: -0.75
+            Metaphysical: -2 # Gameplay: skeletons need some way to heal holy damage. Lore: milk is an unholy liquid that shuns the light of god. (/j)
       - !type:PopupMessage
         type: Local
         visualType: Large

From 30d17745d4f383d95030f636d63d7453a2d2a7e0 Mon Sep 17 00:00:00 2001
From: RedSpy <127129838+RedSpyy@users.noreply.github.com>
Date: Sun, 14 Dec 2025 23:32:12 +0300
Subject: [PATCH 096/360] Make gun chamber empty by default (#41791)

gun chamber empty by default now

Co-authored-by: RedSpyy <empty@place.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml   | 1 -
 .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml        | 4 ----
 .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml          | 5 -----
 .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml   | 3 ---
 4 files changed, 13 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index ecde33484c..36a4ee0f49 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -51,7 +51,6 @@
             - MagazineLightRifleBox
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeLightRifle
         priority: 1
         whitelist:
           tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 9e95f5a20a..0a2a4d544d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -52,7 +52,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgePistol
         priority: 1
         whitelist:
           tags:
@@ -96,7 +95,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgePistol
         priority: 1
         whitelist:
           tags:
@@ -181,7 +179,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeCaselessRifle
         priority: 1
         whitelist:
           tags:
@@ -280,7 +277,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeMagnum
         priority: 1
         whitelist:
           tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 74e3775278..e3b25c6192 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -42,7 +42,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeLightRifle
         priority: 1
         whitelist:
           tags:
@@ -87,7 +86,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeLightRifle
         priority: 1
         whitelist:
           tags:
@@ -131,7 +129,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeRifle
         priority: 1
         whitelist:
           tags:
@@ -178,7 +175,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeRifle
         priority: 1
         whitelist:
           tags:
@@ -266,7 +262,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeRifle
         priority: 1
         whitelist:
           tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index c1ab82670a..4b6bfe3cf9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -48,7 +48,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgePistol
         priority: 1
         whitelist:
           tags:
@@ -211,7 +210,6 @@
           whitelistFailPopup: gun-magazine-whitelist-fail
         gun_chamber:
           name: Chamber
-          startingItem: CartridgePistol
           priority: 1
           whitelist:
             tags:
@@ -273,7 +271,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgePistol
         priority: 1
         whitelist:
           tags:

From 1a9aa6f24d0fb2b4cef797ff620ef73bbfaa4f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sun, 14 Dec 2025 14:39:25 -0600
Subject: [PATCH 097/360] Toys entity tables (#41840)

* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

* toys.yml is scary

* pace yourself, hun

* finished tables

* update related tables

* finish tables

* spawners

* new item

* other tables and cargo crate

* move board games

* commit

* last changes

* last last changes

* bounty changes

* remove pies :o(

* readjust prices

* requested microbalance

* friends for life

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Resources/Locale/en-US/cargo/bounties.ftl     |   4 +-
 .../Prototypes/Catalog/Bounties/bounties.yml  |   3 +-
 .../Catalog/Fills/Boxes/general.yml           |   8 +-
 .../Prototypes/Catalog/Fills/Crates/cargo.yml |   7 +-
 .../Prototypes/Catalog/Fills/Crates/fun.yml   | 167 +------
 .../Catalog/Fills/Crates/service.yml          |  41 +-
 .../Entities/Clothing/Back/smuggler.yml       |  18 +-
 .../Markers/Spawners/Random/maintenance.yml   |  16 +-
 .../Entities/Markers/Spawners/Random/toy.yml  | 430 +++++++++++++++++-
 .../Markers/Spawners/Random/toy_tabletop.yml  |  52 +++
 .../Entities/Objects/Fun/bike_horn.yml        |   2 +-
 .../Prototypes/Entities/Objects/Fun/pai.yml   |   2 -
 .../Prototypes/Entities/Objects/Fun/toys.yml  |   2 +-
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |   2 +
 .../Objects/Weapons/Guns/pneumatic_cannon.yml |   3 +-
 .../Objects/Weapons/Throwable/grenades.yml    |   2 +-
 16 files changed, 544 insertions(+), 215 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/toy_tabletop.yml

diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index 46e3ce816f..a1bc82a1ff 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -131,8 +131,8 @@ bounty-description-lasergun = The Salvage Caravan requests a large shipment of l
 bounty-description-food = After the rat king invasion, a neighboring unathi station was left completely without food. A large meat food shipment is needed.
 bounty-description-fruit = A heroic monkey helped the chaplain catch a troublemaker hiding in the chapel, and the crew wants to reward him for his good work.
 bounty-description-vegetable = The new chef is a vegetarian, and botany can't keep up with their demands. We need some additional veggies to help keep things stocked.
-bounty-description-chili = Today's the Centcomm Chili Cookoff, and, well, a few of us forgot to make some. Please help cover for us.
-bounty-description-rollerskates = CentComm Security is proposing a new strategy for helping officers win foot pursuits. Send them a couple so they cna learn how bad an idea this is.
+bounty-description-chili = Today's the CentComm Chili Cookoff, and, well, a few of us forgot to make some. Please help cover for us.
+bounty-description-rollerskates = CentComm Security is proposing a new strategy for helping officers win foot pursuits. Send them a pair so they can learn how bad an idea this is.
 bounty-description-bedsheet = Someone in Atmos keeps turning down the heater, and we're all shivering in our beds. Please send us some extra sheets to stay warm.
 bounty-description-bandana =  Bzzzt... Transmission from prison planet OC-1001: We're... reorganizing our command structure. Send us some bandanas so we can tell gan- I mean, departments apart.
 bounty-description-steak = The vegetarian cook is refusing to make us anything with meat, and the lizards are getting restless. Can you smuggle us a few steaks to keep them happy?
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index a0e046b757..9915fe0891 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -605,11 +605,10 @@
 
 - type: cargoBounty
   id: BountyRollerskates
-  reward: 6500
+  reward: 1400
   description: bounty-description-rollerskates
   entries:
   - name: bounty-item-rollerskates
-    amount: 2
     whitelist:
       components:
       - Skates
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index cdb3256eb9..81b094b9b0 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -468,11 +468,17 @@
           amount: 4
 
 - type: entity
-  name: darts box
   parent: BoxCardboard
   id: BoxDarts
+  name: darts box
   description: A box filled with colorful darts.
   components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+  - type: Storage
+    maxItemSize: Tiny
   - type: Sprite
     layers:
       - state: box
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 7dfcc44a3c..f2436ffc62 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -123,13 +123,10 @@
     - id: WeaponShotgunHandmade
     - id: WeaponFlareGun
     - id: Bola
-    - id: ToySword
     - id: Shovel
-    - id: WeaponWaterPistol
-    - id: WeaponWaterBlaster
     - id: WeaponTurretXeno
-    - id: WeaponRifleFoam
-      weight: 3
+    - !type:NestedSelector
+      tableId: AllToyWeaponsTable
 
 - type: entityTable
   id: LotteryClothingEntityTable
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index f64cddb565..35d94accab 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -1,130 +1,3 @@
-- type: entityTable
-  id: AllPlushiesTable
-  table: !type:GroupSelector
-    children:
-    - !type:NestedSelector
-      tableId: AllLizardPlushieTable
-    - id: PlushieNuke
-    - id: PlushieSlime
-    - id: PlushieSnake
-    - id: PlushieExperiment
-    - id: PlushieVox
-    - id: PlushieRouny
-    - id: PlushieAtmosian
-    - id: PlushieDiona
-    - id: PlushieXeno
-    - id: PlushieHampter
-    - id: PlushieMoth
-    - id: PlushieArachind
-    - id: PlushiePenguin
-    - id: PlushieVulp
-    # Begin DeltaV - see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
-    - id: PlushieMothRandom # Nyano - random moth plushies
-    - id: PlushieMothRandom # Nyano - random moth plushies
-    - id: PlushieMort
-    - id: PlushieIPC
-    - id: PlushieFelinid
-    - id: PlushieOni
-    - id: PlushieHarpy
-    - id: PlushieRodentia
-    - id: PlushieFeroxi
-    - id: PlushieChitinid
-    - id: PlushieKitsune
-    - id: PlushieThaven # IMP port
-    # End DeltaV
-    - !type:GroupSelector
-      children:
-      - id: PlushieBee
-      - id: PlushieRGBee
-        weight: 0.1
-    - !type:GroupSelector
-      children:
-      - id: PlushieCarp
-      - id: PlushieHolocarp
-        weight: 0.25
-      - id: PlushieMagicarp
-        weight: 0.25
-      - id: PlushieRainbowCarp
-        weight: 0.15
-    - !type:GroupSelector
-      children:
-      - id: PlushieSharkBlue
-      - id: PlushieSharkGrey
-      - id: PlushieSharkPink
-    - !type:GroupSelector # Toy plushies
-      children:
-      - id: ToyIan
-      - id: ToyAmongPequeno
-      - id: ToyMouse
-    - !type:GroupSelector # Giant plushies
-      children:
-      - id: PlushieNar
-      - id: PlushieRatvar
-    - !type:GroupSelector # Rare plushies
-      weight: 0.1 # 1 in >210
-      children:
-      - id: PlushieHuman
-      - id: PlushieGhost
-      - id: PlushieLamp
-    - !type:GroupSelector # Legendary plushies
-      weight: 0.002 # 1 in >10,500
-      children:
-      - id: PlushieThrongler
-      - id: PlushieGhostRevenant # You got the god roll, and failed
-
-- type: entityTable
-  id: AllLizardPlushieTable
-  table: !type:GroupSelector
-    children:
-    - id: PlushieLizard
-      weight: 8
-    - id: PlushieSpaceLizard
-      weight: 1
-    - id: PlushieLizardInversed
-      weight: 0.1 # 1 in >100
-    - !type:GroupSelector # Lizard gets a job table
-      children:
-      - id: PlushieLizardJobAtmospherictechnician
-      - id: PlushieLizardJobBartender
-      - id: PlushieLizardJobBotanist
-      - id: PlushieLizardJobBoxer
-      - id: PlushieLizardJobCaptain
-      - id: PlushieLizardJobCargotechnician
-      - id: PlushieLizardJobChaplain
-      - id: PlushieLizardJobChef
-      - id: PlushieLizardJobChemist
-      - id: PlushieLizardJobChiefengineer
-      - id: PlushieLizardJobChiefmedicalofficer
-      - id: PlushieLizardJobClown # :o)
-      - id: PlushieLizardJobDetective
-      - id: PlushieLizardJobHeadofpersonnel
-      - id: PlushieLizardJobHeadofsecurity
-      - id: PlushieLizardJobJanitor
-      - id: PlushieLizardJobLawyer
-      - id: PlushieLizardJobLibrarian
-      - id: PlushieLizardJobMedicaldoctor
-      - id: PlushieLizardJobMedicalintern
-      - id: PlushieLizardJobMime #
-      - id: PlushieLizardJobMusician
-      - id: PlushieLizardJobParamedic
-      - id: PlushieLizardJobPassenger
-      - id: PlushieLizardJobPsychologist
-      - id: PlushieLizardJobQuartermaster
-      - id: PlushieLizardJobReporter
-      - id: PlushieLizardJobResearchassistant
-      - id: PlushieLizardJobResearchdirector
-      - id: PlushieLizardJobSalvagespecialist
-      - id: PlushieLizardJobScientist
-      - id: PlushieLizardJobSecuritycadet
-      - id: PlushieLizardJobSecurityofficer
-      - id: PlushieLizardJobServiceworker
-      - id: PlushieLizardJobStationengineer
-      - id: PlushieLizardJobTechnicalassistant
-      - id: PlushieLizardJobZookeeper
-      - id: PlushieLizardJobMultiweh
-        weight: 0.5 # 1 in >800
-
-
 - type: entityTable
   id: AllPottedPlantsTable
   table: !type:GroupSelector
@@ -470,16 +343,15 @@
   parent: CratePlastic
   id: CrateFunFoamGuns
   name: Foam Force crate
-  description: Contains four Foam Force rifles, some grenades, and extra ammo. It's [REDACTED] or nothing!
+  description: Contains four Foam Force Battle Kits™. It's [REDACTED] or nothing!
   components:
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: WeaponRifleFoam
-          amount: 4
-        - id: BoxDonkSoftBox
-          amount: 2
+        - !type:NestedSelector
+          tableId: RandomFoamGunTable
+          rolls: 4
         - id: GrenadeFoamDart
           amount: 4
 
@@ -530,25 +402,18 @@
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: SnapPopBox
-        - id: CrazyGlue
-        - id: CrazyLube
-        - id: PlasticBanana
-        - id: WhoopieCushion
-        - id: ToyHammer
-        - !type:GroupSelector
-          children:
-          - id: MrChips
-          - id: MrDips
-        - id: RevolverCapGun
-        - id: BalloonNT
-        - id: ClothingShoesClownLarge
-        - id: ClothingHeadHatMagician
-        - id: BeachBall
-        - id: TennisBall
-          amount: 2
-        - id: ClothingShoesSkates
-        - id: RubberChicken
+        - !type:NestedSelector
+          tableId: AllToyWeaponsTable
+          rolls: 2
+        - !type:NestedSelector
+          tableId: AllToySoundMakerTable
+          rolls: 2
+        - !type:NestedSelector
+          tableId: AllMiscToysTable
+          rolls: 2
+        - !type:NestedSelector # Extras rolls for extra variety
+          tableId: AllToysTable
+          rolls: 2
 
 - type: entity
   parent: CrateGenericSteel
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 110a98dfc7..d49c39d45f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -132,24 +132,37 @@
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: ClothingUniformJumpskirtPerformer
-        - id: ClothingShoesBootsPerformer
-        - id: ClothingHeadPerformerWig
+        - id: BarberScissors
         - id: ClothingOuterSuitMonkey
         - id: ClothingHeadHatAnimalMonkey
-        - id: ClothingNeckCloakMoth
-        - id: ClothingMaskClown
-        - id: ClothingMaskMime
-        - id: ClothingShoesClown
         - id: ClothingUniformJumpskirtJanimaid
-        - id: ClothingNeckCloakVoid
-        - id: RevolverCapGun
-        - id: BarberScissors
         - id: ClothingUniformJumpskirtOldDress
-        - id: BikeHorn
-        - id: ClownRecorder
-        - id: ClothingBeltSuspendersRed
-        - id: ClothingBeltSuspendersBlack
+        - id: ClothingHeadHatMagician
+        - !type:AllSelector # Cloaks
+          children:
+          - id: ClothingNeckCloakMoth
+          - id: ClothingNeckCloakVoid
+        - !type:AllSelector # Clown starter kit
+          children:
+          - id: ClothingMaskClown
+          - id: ClownRecorder
+          - !type:GroupSelector
+            children:
+            - id: ClothingShoesClown
+            - id: ClothingShoesClownLarge
+              weight: 0.1
+          - !type:NestedSelector
+            tableId: RandomBikeHornTable
+        - !type:AllSelector # Mime starter kit
+          children:
+          - id: ClothingMaskMime
+          - id: ClothingBeltSuspendersRed
+          - id: ClothingBeltSuspendersBlack
+        - !type:AllSelector # Performer starter kit
+          children:
+          - id: ClothingUniformJumpskirtPerformer
+          - id: ClothingShoesBootsPerformer
+          - id: ClothingHeadPerformerWig
 
 - type: entity
   parent: CrateGenericSteel
diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
index 3a4495f895..8545dab9a6 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
@@ -76,21 +76,9 @@
   components:
   - type: EntityTableContainerFill
     containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: SpeedLoaderCap
-          amount: !type:RangeNumberSelector
-            range: 4, 8
-        - !type:GroupSelector
-          children:
-          - id: RevolverCapGun
-            amount: !type:RangeNumberSelector
-              range: 4, 6
-            weight: 95
-          - id: RevolverCapGunFake
-            amount: !type:RangeNumberSelector
-              range: 1, 6
-            weight: 5
+      storagebase: !type:NestedSelector
+        tableId: RandomCapGunTable
+        rolls: 4, 7
 
 - type: entity
   parent: ClothingBackpackSatchelSmuggler
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 7915002894..f56d0e800d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -6,6 +6,9 @@
     - !type:GroupSelector
       weight: 75
       children:
+      - !type:NestedSelector
+        weight: 5 # Roughly 7% chance
+        tableId: AllToysTable
       # Smoker's specialty
       - !type:AllSelector
         children:
@@ -113,13 +116,7 @@
         - id: ClothingNeckCloakEnby
         - id: ClothingNeckCloakPan
       - id: ToyFigurineSkeleton
-      - id: Basketball
-      - id: Football
-      - id: TennisBall
-      - id: BalloonNT
-      - id: BalloonCorgi
       - id: MysteryFigureBox
-      - id: RubberChicken
       # Cult
       - !type:AllSelector
         children:
@@ -165,10 +162,6 @@
     - !type:GroupSelector
       weight: 2
       children:
-      - id: Skub
-      - id: PonderingOrb
-      - id: CluwneHorn
-      - id: ClothingShoesSkates
       - id: DrinkMugDog
       - id: CigarGold
       - id: ClothingUniformJumpsuitFamilyGuy
@@ -177,7 +170,6 @@
       - id: WeaponLaserTagGun # DeltaV - Add small chance of it spawning in maints locker.
       - id: RubberStampGreytide
       - id: MysteryLighterBox
-      - id: GoldenPersonalAI
 
 - type: entity
   name: Maint Loot Spawner
@@ -372,6 +364,8 @@
       - id: SawImprov
       - id: HydroponicsToolMiniHoe
       - id: ClothingHandsKnuckleDusters
+      - !type:NestedSelector
+        tableId: AllToyWeaponsTable
 
 - type: entity
   name: Maint Loot Spawner
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index db92c575ca..a3dbaeaf3c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -1,4 +1,152 @@
-- type: entityTable # Max size 1x2
+# Items in this table are generally useless. They don't help in most situations and aren't interesting to serious people.
+# If you're wondering if an entity should go in this table, ask your inner child / local clown.
+- type: entityTable # size 2x4 or 3x3  # price 100
+  id: AllToysTable
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector # Boring toys (subjective) :o)
+      weight: 0.5 # 1 in 7
+      children:
+      - !type:NestedSelector
+        tableId: AllPlushiesTable
+      - !type:NestedSelector
+        tableId: AllFigurinesTable
+    - !type:NestedSelector
+      tableId: AllToyWeaponsTable
+    - !type:NestedSelector
+      tableId: AllMiscToysTable
+    - !type:NestedSelector
+      tableId: AllToySoundMakerTable
+
+# Soft friends to play with, cut open with a knife, and throw away when you need space
+- type: entityTable # size ginormous  # price 5
+  id: AllPlushiesTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: AllLizardPlushieTable
+    - id: PlushieNuke
+    - id: PlushieSlime
+    - id: PlushieSnake
+    - id: PlushieExperiment
+    - id: PlushieVox
+    - id: PlushieRouny
+    - id: PlushieAtmosian
+    - id: PlushieDiona
+    - id: PlushieXeno
+    - id: PlushieHampter
+    - id: PlushieMoth
+    - id: PlushieArachind
+    - id: PlushiePenguin
+    - id: PlushieVulp
+      # Begin DeltaV - see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml
+    - id: PlushieMothRandom # Nyano - random moth plushies
+    - id: PlushieMort
+    - id: PlushieIPC
+    - id: PlushieFelinid
+    - id: PlushieOni
+    - id: PlushieHarpy
+    - id: PlushieRodentia
+    - id: PlushieFeroxi
+    - id: PlushieChitinid
+    - id: PlushieKitsune
+    - id: PlushieThaven # IMP port
+    # End DeltaV
+    - !type:GroupSelector
+      children:
+      - id: PlushieBee
+      - id: PlushieRGBee
+        weight: 0.1
+    - !type:GroupSelector
+      children:
+      - id: PlushieCarp
+      - id: PlushieHolocarp
+        weight: 0.25
+      - id: PlushieMagicarp
+        weight: 0.25
+      - id: PlushieRainbowCarp
+        weight: 0.15
+    - !type:GroupSelector
+      children:
+      - id: PlushieSharkBlue
+      - id: PlushieSharkGrey
+      - id: PlushieSharkPink
+    - !type:GroupSelector # Toy plushies
+      children:
+      - id: ToyIan
+      - id: ToyAmongPequeno
+      - id: ToyMouse
+    - !type:GroupSelector # Giant plushies
+      children:
+      - id: PlushieNar
+      - id: PlushieRatvar
+    - !type:GroupSelector # Rare plushies
+      weight: 0.1 # 1 in >210
+      children:
+      - id: PlushieHuman
+      - id: PlushieGhost
+      - id: PlushieLamp
+    - !type:GroupSelector # Legendary plushies
+      weight: 0.002 # 1 in >10,500
+      children:
+      - id: PlushieThrongler
+      - id: PlushieGhostRevenant # You got the god roll, and failed
+
+# Weh!
+- type: entityTable
+  id: AllLizardPlushieTable
+  table: !type:GroupSelector
+    children:
+    - id: PlushieLizard
+      weight: 8
+    - id: PlushieSpaceLizard
+      weight: 1
+    - id: PlushieLizardInversed
+      weight: 0.1 # 1 in >100
+    - !type:GroupSelector # Lizard gets a job table
+      children:
+      - id: PlushieLizardJobAtmospherictechnician
+      - id: PlushieLizardJobBartender
+      - id: PlushieLizardJobBotanist
+      - id: PlushieLizardJobBoxer
+      - id: PlushieLizardJobCaptain
+      - id: PlushieLizardJobCargotechnician
+      - id: PlushieLizardJobChaplain
+      - id: PlushieLizardJobChef
+      - id: PlushieLizardJobChemist
+      - id: PlushieLizardJobChiefengineer
+      - id: PlushieLizardJobChiefmedicalofficer
+      - id: PlushieLizardJobClown # :o)
+      - id: PlushieLizardJobDetective
+      - id: PlushieLizardJobHeadofpersonnel
+      - id: PlushieLizardJobHeadofsecurity
+      - id: PlushieLizardJobJanitor
+      - id: PlushieLizardJobLawyer
+      - id: PlushieLizardJobLibrarian
+      - id: PlushieLizardJobMedicaldoctor
+      - id: PlushieLizardJobMedicalintern
+      - id: PlushieLizardJobMime #
+      - id: PlushieLizardJobMusician
+      - id: PlushieLizardJobParamedic
+      - id: PlushieLizardJobPassenger
+      - id: PlushieLizardJobPsychologist
+      - id: PlushieLizardJobQuartermaster
+      - id: PlushieLizardJobReporter
+      - id: PlushieLizardJobResearchassistant
+      - id: PlushieLizardJobResearchdirector
+      - id: PlushieLizardJobSalvagespecialist
+      - id: PlushieLizardJobScientist
+      - id: PlushieLizardJobSecuritycadet
+      - id: PlushieLizardJobSecurityofficer
+      - id: PlushieLizardJobServiceworker
+      - id: PlushieLizardJobStationengineer
+      - id: PlushieLizardJobTechnicalassistant
+      - id: PlushieLizardJobZookeeper
+      - id: PlushieLizardJobMultiweh
+        weight: 0.5 # 1 in >800
+
+# Figurines representing all your favorite coworkers
+- type: entityTable # size 1x2  # price 75
   id: AllFigurinesTable
   table: !type:GroupSelector
     children:
@@ -90,7 +238,8 @@
     - !type:NestedSelector
       tableId: AllFigurineMechsTable
 
-- type: entityTable # Max size 1x2
+# Figurines representing the hopes and dreams of the robotics department
+- type: entityTable # size 1x2  # price 75
   id: AllFigurineMechsTable
   table: !type:GroupSelector
     children:
@@ -106,6 +255,186 @@
     - id: ToyPhazon
     - id: ToyReticence
 
+# Items that are used to "attack" people. Legitimate combat use for these is limited
+- type: entityTable # size 2x4  # price 100
+  id: AllToyWeaponsTable
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector # Swords type group
+      children:
+      - id: ToyHammer
+      - id: ToySword
+      - id: FoamBlade
+      - id: FoamCutlass
+      - id: CardSword
+    - !type:GroupSelector # Throwing type group
+      rolls: 2 # Expendables need restocks
+      children:
+      - id: SnapPopBox
+      - id: BoxDarts
+      - id: GrenadeFoamDart
+      - !type:GroupSelector # REAL fake grenades
+        weight: 0.05 # 2 in 186. Rare in order to not spoil the surprise
+        children:
+        - id: GrenadeDummy
+        - id: SyndieTrickyBomb
+    - !type:GroupSelector # Guns type group
+      children:
+      - id: WeaponStickyHand
+      - !type:GroupSelector # Water subgroup
+        children:
+        - id: WeaponWaterBlaster
+        - id: WeaponWaterPistol
+      - !type:NestedSelector
+        tableId: RandomFoamGunTable
+      - !type:NestedSelector
+        tableId: RandomCapGunTable
+
+- type: entityTable # price 100
+  id: RandomFoamGunTable
+  table: !type:AllSelector # Need to spawn with ammo
+    children:
+    - !type:GroupSelector
+      children:
+      - id: FoamCrossbow
+      - id: WeaponRifleFoam
+    - id: BoxDonkSoftBox
+
+- type: entityTable
+  id: RandomCapGunTable
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector # real or fake?
+      children:
+      - id: RevolverCapGun
+      - id: RevolverCapGunFake
+        weight: 0.01 # 1 in 101
+    - !type:GroupSelector # ready for reload
+      prob: 0.9
+      children:
+      - id: SpeedLoaderCap
+      - id: BoxCartridgeCap
+
+# A group of items with fun or unique properties. Highly varied (some are more fun than others)
+- type: entityTable # size 3x3  # price 100
+  id: AllMiscToysTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: AllCrayonsTable
+    - id: CrayonBox
+    - id: PlasticBanana
+    - id: NukeDiskFake
+    - id: DiceBag
+    - id: SpectralLocator
+    - id: BarberScissors
+    - id: SprayFlowerPin
+    - id: ClothingShoesSkates
+    - id: CrazyGlue
+    - id: CrazyLube
+    - !type:NestedSelector
+      tableId: AllBoardGamesTable
+    - !type:GroupSelector # Where there's Chips there's Dips
+      children:
+      - id: MrChips
+      - id: MrDips
+    - !type:GroupSelector # Ballons
+      children:
+      - id: BalloonNT
+        weight: 5 # NT bias
+      - id: BalloonCorgi
+      - id: BalloonSyn
+    - !type:GroupSelector # Sports ball
+      children:
+      - id: Basketball
+      - id: Football
+      - id: BeachBall
+      - id: TennisBall
+        amount: 2
+    - !type:GroupSelector # PAIs are basically toys
+      children:
+      - id: PersonalAI
+        weight: 8
+      - id: PotatoAI
+      - id: GoldenPersonalAI
+        weight: 0.1 # 1 in 1,456. A truly rare item
+    - !type:GroupSelector # Orbs of "power"
+      weight: 0.05 # 1 in 320
+      children:
+      - id: SingularityToy
+      - id: TeslaToy
+      - id: PonderingOrb
+
+# Entities that don't do much more than make a unique sound. Plushies excluded.
+- type: entityTable # size 1x2  # price 100
+  id: AllToySoundMakerTable
+  table: !type:GroupSelector
+    children:
+    - id: ToyRubberDuck
+    - id: RubberChicken
+    - id: ClownRecorder
+    - id: WhoopieCushion
+    - id: NewtonCradle
+    - id: Skub
+    - id: DeskBell
+    - id: BikeHornImplanter
+    - id: SadTromboneImplanter
+    - !type:GroupSelector
+      children:
+      - id: Whistle
+        weight: 5
+      - id: SecurityWhistle
+      - id: SyndicateWhistle
+        weight: 0.5 # 1 in 143
+    - !type:NestedSelector # The original
+      tableId: RandomBikeHornTable
+
+- type: entityTable # size 1x2  # price 100
+  id: RandomBikeHornTable
+  table: !type:GroupSelector
+    children:
+    - id: BikeHorn
+    - !type:GroupSelector # Usually get the normal horn
+      weight: .005 # 1 in 200
+      children:
+      - id: CluwneHorn # you lose, clown >:o)
+      - id: BananiumHorn
+      - id: PushHorn
+      - id: GoldenBikeHorn
+
+- type: entityTable # size 1x1
+  id: AllCrayonsTable
+  table: !type:GroupSelector
+    children:
+    - id: CrayonMime
+    - id: CrayonRainbow
+    - id: CrayonWhite
+    - id: CrayonBlack
+    - id: CrayonRed
+    - id: CrayonOrange
+    - id: CrayonYellow
+    - id: CrayonGreen
+    - id: CrayonBlue
+    - id: CrayonPurple
+
+## Spawners ##
+
+- type: entity
+  parent: MarkerBase
+  id: ToySpawner90
+  name: Toy Spawner
+  suffix: 90
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/bikehorn.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllToysTable
+      prob: 0.9
+
 - type: entity
   parent: MarkerBase
   id: PlushieSpawner50
@@ -122,6 +451,22 @@
       tableId: AllPlushiesTable
       prob: 0.5
 
+- type: entity
+  parent: MarkerBase
+  id: SpacemenFigurineSpawner90
+  name: Spacemen Minifigure Spawner
+  suffix: 90
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/figurines.rsi
+      state: figurine_spawner
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllFigurinesTable
+      prob: 0.9
+
 - type: entity
   parent: MarkerBase
   id: MechFigurineSpawner50
@@ -140,15 +485,84 @@
 
 - type: entity
   parent: MarkerBase
-  id: SpacemenFigurineSpawner90
-  name: Spacemen Minifigure Spawner
-  suffix: 90. Librarian only, map with care!
+  id: ToyWeaponSpawner90
+  name: Toy Weapon Spawner
+  suffix: 90
   components:
   - type: Sprite
     layers:
-    - sprite: Objects/Fun/figurines.rsi
-      state: figurine_spawner
+    - state: red
+    - sprite: Objects/Fun/rubber_hammer.rsi
+      state: icon
   - type: EntityTableSpawner
     table: !type:NestedSelector
-      tableId: AllFigurinesTable
+      tableId: AllToyWeaponsTable
       prob: 0.9
+
+- type: entity
+  parent: MarkerBase
+  id: CapGunSpawner90
+  name: Cap Gun Spawner
+  suffix: 90
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/capgun.rsi
+      state: base
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomCapGunTable
+      prob: 0.9
+
+- type: entity
+  parent: MarkerBase
+  id: MiscToySpawner90
+  name: Miscellaneous Toy Spawner
+  suffix: 90
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/Balloons/nanotrasen.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllMiscToysTable
+      prob: 0.9
+
+- type: entity
+  parent: MarkerBase
+  id: ToySoundMakerSpawner90
+  name: Toy Sound Maker Spawner
+  suffix: 90
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/rubber_chicken.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: AllToySoundMakerTable
+      prob: 0.9
+
+- type: entity
+  parent: MarkerBase
+  id: CrayonSpawner90
+  name: Crayon Spawner
+  suffix: 90
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/crayons.rsi
+      state: rainbow
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      prob: 0.9
+      children:
+      - !type:NestedSelector
+        tableId: AllCrayonsTable
+      - id: CrayonBox
+        weight: 0.05 # 1 in 20
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy_tabletop.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy_tabletop.yml
new file mode 100644
index 0000000000..d0f4723af3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy_tabletop.yml
@@ -0,0 +1,52 @@
+- type: entityTable # size 1x2
+  id: AllBoardGamesTable
+  table: !type:GroupSelector
+    children:
+    - id: BackgammonBoard
+    - id: ChessBoard
+    - id: ParchisBoard
+    - id: CheckerBoard
+
+- type: entityTable # size 1x2
+  id: AllBattlemapsTable
+  table: !type:GroupSelector
+    children:
+    - id: GrassBattlemap
+    - id: MoonBattlemap
+    - id: SandBattlemap
+    - id: SnowBattlemap
+    - id: ShipBattlemap
+
+## Spawners ##
+
+- type: entity
+  parent: MarkerBase
+  id: BoardGameSpawner100
+  name: Board Game Spawner
+  suffix: 100
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/Tabletop/chessboard.rsi
+      state: chessboard
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: AllBoardGamesTable
+
+- type: entity
+  parent: MarkerBase
+  id: BattleMapSpawner100
+  name: Battle Map Spawner
+  suffix: 100
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Fun/Tabletop/Battlemaps/grassbm.rsi
+      state: icon
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: AllBattlemapsTable
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index e5f68aac8f..e7efa14dc4 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -135,7 +135,7 @@
     slots: [Belt]
   - type: Prayable
   - type: StaticPrice
-    price: 1000
+    price: 100 # reduced price due to heisentests
   - type: PointLight
     radius: 1.2
     energy: 2.2
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 2ba5acfbf1..46c7aa93f9 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -156,8 +156,6 @@
       shader: unshaded
       map: ["screen"]
   - type: Appearance
-  - type: StaticPrice
-    price: 5000
 
 - type: entity
   parent: PersonalAI
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index c5ffff7d64..7f1857eaee 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -348,7 +348,7 @@
   - type: Item
     sprite: Objects/Fun/Balloons/syndicate.rsi
   - type: StaticPrice
-    price: 5000 # Entertainment.
+    price: 100 # Entertainment.
 
 - type: entity
   parent: BaseBalloon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index e3b25c6192..c3827d4bf9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -315,3 +315,5 @@
       path: /Audio/Weapons/Guns/Empty/empty.ogg
     clumsyProof: true
   - type: PacifismAllowedGun
+  - type: StaticPrice
+    price: 100
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index 8b5ec12a93..e1308de7b7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -65,9 +65,10 @@
       gas_tank: !type:ContainerSlot
 
 - type: entity
-  name: pie cannon
   parent: BaseStorageItem
   id: LauncherCreamPie
+  name: pie cannon
+  suffix: Empty
   description: Load cream pie for optimal results.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 17e52f5432..1185485122 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -455,4 +455,4 @@
       params:
         volume: 12
   - type: StaticPrice
-    price: 1000
+    price: 50

From c9d52d8a03467c9186585d29ead10c2bf2d8ea0a Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 14 Dec 2025 13:51:16 -0800
Subject: [PATCH 098/360] Fix plant metabolism in guidebook. (#41854)

* AAAAAAAAAAAAAAAAAAAAAAA

* cleaner

* even cleaner

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Chemistry/Reagent/ReagentPrototype.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index e634e03284..45ef5c672e 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -208,7 +208,7 @@ namespace Content.Shared.Chemistry.Reagent
             return removed;
         }
 
-        public IEnumerable<string> GuidebookReagentEffectsDescription(IPrototypeManager prototype, IEntitySystemManager entSys, IEnumerable<EntityEffect> effects, FixedPoint2? metabolism = null)
+        public IEnumerable<string> GuidebookReagentEffectsDescription(IPrototypeManager prototype, IEntitySystemManager entSys, IEnumerable<EntityEffect> effects, FixedPoint2 metabolism)
         {
             return effects.Select(x => GuidebookReagentEffectDescription(prototype, entSys, x, metabolism))
                 .Where(x => x is not null)
@@ -216,12 +216,12 @@ namespace Content.Shared.Chemistry.Reagent
                 .ToArray();
         }
 
-        public string? GuidebookReagentEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys, EntityEffect effect, FixedPoint2? metabolism)
+        public string? GuidebookReagentEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys, EntityEffect effect, FixedPoint2 metabolism)
         {
             if (effect.EntityEffectGuidebookText(prototype, entSys) is not { } description)
                 return null;
 
-            var quantity = metabolism == null ? 0f : (double)(effect.MinScale * metabolism);
+            var quantity = (double)(effect.MinScale * metabolism);
 
             return Loc.GetString(
                 "guidebook-reagent-effect-description",
@@ -256,7 +256,7 @@ namespace Content.Shared.Chemistry.Reagent
             if (proto.PlantMetabolisms.Count > 0)
             {
                 PlantMetabolisms =
-                    new List<string>(proto.GuidebookReagentEffectsDescription(prototype, entSys, proto.PlantMetabolisms));
+                    new List<string>(proto.GuidebookReagentEffectsDescription(prototype, entSys, proto.PlantMetabolisms, FixedPoint2.New(1f)));
             }
         }
     }

From 29aceb4e03825595b006acf177fa798ddc050da4 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Sun, 14 Dec 2025 19:31:15 -0300
Subject: [PATCH 099/360] Move logic from EvenHealthChangeEntityEffectSystem to
 the damage system API (#41684)

* add two methods

* move stuff to damage system api

* use TryIndex

* simplify

* minor fix

* add helper functions

* fix

* remove random new line

* simplify

* remove unnecessary lines

* rename to GetDamage

* Got it working

* make more clear

* why backwards

* value should be the amount to heal

* fix

* fix all dumb fixedpoint2 edge cases I hope

* One more thing

* fix

* make it more simple

* ops it was backwards

* valueHeal can't be more than remaining

* add all keys beforehand and no need to check and add them inside the loop

* break for loop in case remaining is zero

* comment was wrong

* optimized, works

* remove random spaces

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Body/Systems/RespiratorSystem.cs          |   2 +-
 .../Damage/Systems/DamageableSystem.API.cs    | 181 ++++++++++++++++++
 ...stributedHealthChangeEntityEffectSystem.cs |  91 +++++++++
 .../EvenHealthChangeEntityEffectSystem.cs     |  88 ++-------
 .../HealthChangeEntityEffectSystem.cs         |   6 +-
 5 files changed, 293 insertions(+), 75 deletions(-)
 create mode 100644 Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs
 rename Content.Shared/EntityEffects/Effects/{ => Damage}/EvenHealthChangeEntityEffectSystem.cs (51%)
 rename Content.Shared/EntityEffects/Effects/{ => Damage}/HealthChangeEntityEffectSystem.cs (95%)

diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index deaa5bc834..7fec07107f 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -20,8 +20,8 @@ using Content.Shared.Database;
 using Content.Shared.EntityConditions;
 using Content.Shared.EntityConditions.Conditions.Body;
 using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects;
 using Content.Shared.EntityEffects.Effects.Body;
+using Content.Shared.EntityEffects.Effects.Damage;
 using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
index c39924ae2a..4670886c54 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.API.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
@@ -1,3 +1,5 @@
+using System.Linq;
+using System.Net.Sockets;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -230,6 +232,185 @@ public sealed partial class DamageableSystem
         return damageDone;
     }
 
+    /// <summary>
+    /// Will reduce the damage on the entity exactly by <see cref="amount"/> as close as equally distributed among all damage types the entity has.
+    /// If one of the damage types of the entity is too low. it will heal that completly and distribute the excess healing among the other damage types.
+    /// If the <see cref="amount"/> is larger than the total damage of the entity then it just clears all damage.
+    /// </summary>
+    /// <param name="ent">entity to be healed</param>
+    /// <param name="amount">how much to heal. value has to be negative to heal</param>
+    /// <param name="group">from which group to heal. if null, heal from all groups</param>
+    /// <param name="origin">who did the healing</param>
+    public DamageSpecifier HealEvenly(
+        Entity<DamageableComponent?> ent,
+        FixedPoint2 amount,
+        ProtoId<DamageGroupPrototype>? group = null,
+        EntityUid? origin = null,
+        // Begin DeltaV additions - Adapt to shitmed changes
+        TargetBodyPart? targetPart = null,
+        bool doPartDamage = true,
+        bool onlyDamageParts = false // Fix EvenHealing on Limbs && Standardize PartDamage.
+        // End DeltaV additions - Adapt to shitmed changes
+        )
+    {
+        var damageChange = new DamageSpecifier();
+
+        if (!_damageableQuery.Resolve(ent, ref ent.Comp, false) || amount >= 0)
+            return damageChange;
+
+        // Get our total damage, or heal if we're below a certain amount.
+        if (!TryGetDamageGreaterThan((ent, ent.Comp), -amount, out var damage, group))
+            return ChangeDamage(ent, -damage, true, false, origin);
+
+        // make sure damageChange has the same damage types as damage
+        damageChange.DamageDict.EnsureCapacity(damage.DamageDict.Count);
+        foreach (var type in damage.DamageDict.Keys)
+        {
+            damageChange.DamageDict.Add(type, FixedPoint2.Zero);
+        }
+
+        var remaining = -amount;
+        var keys = damage.DamageDict.Keys.ToList();
+
+        while (remaining > 0)
+        {
+            var count = keys.Count;
+            // We do this to ensure that we always round up when dividing to avoid excess loops.
+            // We already have logic to prevent healing more than we have.
+            var maxHeal = count == 1 ? remaining : (remaining + FixedPoint2.Epsilon * (count - 1)) / count;
+
+            // Iterate backwards since we're removing items.
+            for (var i = count - 1; i >= 0; i--)
+            {
+                var type = keys[i];
+                // This is the amount we're trying to heal, capped by maxHeal
+                var heal = damage.DamageDict[type] + damageChange.DamageDict[type];
+
+                // Don't go above max, if we don't go above max
+                if (heal > maxHeal)
+                    heal = maxHeal;
+                // If we're not above max, we will heal it fully and don't need to enumerate anymore!
+                else
+                    keys.RemoveAt(i);
+
+                if (heal >= remaining)
+                {
+                    // Don't remove more than we can remove. Prevents us from healing more than we'd expect...
+                    damageChange.DamageDict[type] -= remaining;
+                    remaining = FixedPoint2.Zero;
+                    break;
+                }
+
+                remaining -= heal;
+                damageChange.DamageDict[type] -= heal;
+            }
+        }
+
+        return ChangeDamage(ent, damageChange, true, false, origin, targetPart: targetPart, doPartDamage: doPartDamage, onlyDamageParts: onlyDamageParts); // DeltaV - Adapt to shitmed
+    }
+
+    /// <summary>
+    /// Will reduce the damage on the entity exactly by <see cref="amount"/> distributed by weight among all damage types the entity has.
+    /// (the weight is how much damage of the type there is)
+    /// If the <see cref="amount"/> is larger than the total damage of the entity then it just clears all damage.
+    /// </summary>
+    /// <param name="ent">entity to be healed</param>
+    /// <param name="amount">how much to heal. value has to be negative to heal</param>
+    /// <param name="group">from which group to heal. if null, heal from all groups</param>
+    /// <param name="origin">who did the healing</param>
+    public DamageSpecifier HealDistributed(
+        Entity<DamageableComponent?> ent,
+        FixedPoint2 amount,
+        ProtoId<DamageGroupPrototype>? group = null,
+        EntityUid? origin = null)
+    {
+        var damageChange = new DamageSpecifier();
+
+        if (!_damageableQuery.Resolve(ent, ref ent.Comp, false) || amount >= 0)
+            return damageChange;
+
+        // Get our total damage, or heal if we're below a certain amount.
+        if (!TryGetDamageGreaterThan((ent, ent.Comp), -amount, out var damage, group))
+            return ChangeDamage(ent, -damage, true, false, origin);
+
+        // make sure damageChange has the same damage types as damageEntity
+        damageChange.DamageDict.EnsureCapacity(damage.DamageDict.Count);
+        var total = damage.GetTotal();
+
+        // heal weighted by the damage of that type
+        foreach (var (type, value) in damage.DamageDict)
+        {
+            damageChange.DamageDict.Add(type, value / total * amount);
+        }
+
+        return ChangeDamage(ent, damageChange, true, false, origin);
+    }
+
+    /// <summary>
+    /// Tries to get damage from an entity with an optional group specifier.
+    /// </summary>
+    /// <param name="ent">Entity we're checking the damage on</param>
+    /// <param name="amount">Amount we want the damage to be greater than ideally</param>
+    /// <param name="damage">Damage specifier we're returning with</param>
+    /// <param name="group">An optional group, note that if it fails to index it will just use all damage.</param>
+    /// <returns>True if the total damage is greater than the specified amount</returns>
+    public bool TryGetDamageGreaterThan(Entity<DamageableComponent> ent,
+        FixedPoint2 amount,
+        out DamageSpecifier damage,
+        ProtoId<DamageGroupPrototype>? group = null)
+    {
+        // get the damage should be healed (either all or only from one group)
+        damage = group == null ? GetDamage(ent) : GetDamage(ent, group.Value);
+
+        // If trying to heal more than the total damage of damageEntity just heal everything
+        return damage.GetTotal() > amount;
+    }
+
+    /// <summary>
+    /// Returns a <see cref="DamageSpecifier"/> with all positive damage of the entity from the group specified
+    /// </summary>
+    /// <param name="ent">entity with damage</param>
+    /// <param name="group">group of damage to get values from</param>
+    /// <returns></returns>
+    public DamageSpecifier GetDamage(Entity<DamageableComponent> ent, ProtoId<DamageGroupPrototype> group)
+    {
+        // No damage if no group exists...
+        if (!_prototypeManager.Resolve(group, out var groupProto))
+            return new DamageSpecifier();
+
+        var damage = new DamageSpecifier();
+        damage.DamageDict.EnsureCapacity(groupProto.DamageTypes.Count);
+
+        foreach (var damageId in groupProto.DamageTypes)
+        {
+            if (!ent.Comp.Damage.DamageDict.TryGetValue(damageId, out var value))
+                continue;
+            if (value > FixedPoint2.Zero)
+                damage.DamageDict.Add(damageId, value);
+        }
+
+        return damage;
+    }
+
+    /// <summary>
+    /// Returns a <see cref="DamageSpecifier"/> with all positive damage of the entity
+    /// </summary>
+    /// <param name="ent">entity with damage</param>
+    /// <returns></returns>
+    public DamageSpecifier GetDamage(Entity<DamageableComponent> ent)
+    {
+        var damage = new DamageSpecifier();
+        damage.DamageDict.EnsureCapacity(ent.Comp.Damage.DamageDict.Count);
+
+        foreach (var (damageId, value) in ent.Comp.Damage.DamageDict)
+        {
+            if (value > FixedPoint2.Zero)
+                damage.DamageDict.Add(damageId, value);
+        }
+
+        return damage;
+    }
+
     /// <summary>
     /// Applies the two universal "All" modifiers, if set.
     /// Individual damage source modifiers are set in their respective code.
diff --git a/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..66911d7785
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Systems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Damage;
+
+/// <summary>
+/// Heal the damage types in a damage group by up to a specified total on this entity.
+/// The amount healed per type is weighted by the amount of damage for that type scaling linearly.
+/// Total adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class DistributedHealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, DistributedHealthChange>
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+
+    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<DistributedHealthChange> args)
+    {
+        foreach (var (group, amount) in args.Effect.Damage)
+        {
+            _damageable.HealDistributed(entity.AsNullable(), amount * args.Scale, group);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class DistributedHealthChange : EntityEffectBase<DistributedHealthChange>
+{
+    /// <summary>
+    /// Damage to heal, collected into entire damage groups.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
+
+    /// <summary>
+    /// Should this effect ignore damage modifiers?
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var damages = new List<string>();
+        var heals = false;
+        var deals = false;
+
+        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
+        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
+        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
+
+        foreach (var (group, amount) in Damage)
+        {
+            var groupProto = prototype.Index(group);
+
+            var sign = FixedPoint2.Sign(amount);
+            float mod;
+
+            switch (sign)
+            {
+                case < 0:
+                    heals = true;
+                    mod = universalReagentHealModifier;
+                    break;
+                case > 0:
+                    deals = true;
+                    mod = universalReagentDamageModifier;
+                    break;
+                default:
+                    continue; // Don't need to show damage types of 0...
+            }
+
+            damages.Add(
+                Loc.GetString("health-change-display",
+                    ("kind", groupProto.LocalizedName),
+                    ("amount", MathF.Abs(amount.Float() * mod)),
+                    ("deltasign", sign)
+                ));
+        }
+
+        // We use health change since in practice it's not even and distributed is a mouthful.
+        // Also because healing groups not using even or distributed healing should be kill.
+        var healsordeals = heals ? deals ? "both" : "heals" : deals ? "deals" : "none";
+        return Loc.GetString("entity-effect-guidebook-health-change",
+            ("chance", Probability),
+            ("changes", ContentLocalizationManager.FormatList(damages)),
+            ("healsordeals", healsordeals));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
similarity index 51%
rename from Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
rename to Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
index 273a4bc961..010193dc22 100644
--- a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
@@ -1,102 +1,48 @@
-// DeltaV Start - Fix EvenHealing with Limbs.
-using System.Linq;
+// DeltaV Start - Fix EvenHealing with Limbs.
 using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Body.Systems;
 // DeltaV End - Fix EvenHealing with Limbs.
-using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
-namespace Content.Shared.EntityEffects.Effects;
+namespace Content.Shared.EntityEffects.Effects.Damage;
 
 /// <summary>
-/// Evenly adjust the damage types in a damage group by up to a specified total on this entity.
+/// Evenly heal the damage types in a damage group by up to a specified total on this entity.
 /// Total adjustment is modified by scale.
 /// </summary>
 /// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
 public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, EvenHealthChange>
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedBodySystem _body = default!; // DeltaV
-    [Dependency] private readonly EntityManager _ent = default!; // DeltaV
 
     protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<EvenHealthChange> args)
     {
-        // DeltaV - Even Healing with Limbs
-        var damageSpec = GetDamageSpec(entity.Owner, ref args); // DeltaV - Basically moved this to a private method
-
-        damageSpec *= args.Scale;
-
-
-        _damageable.TryChangeDamage(
-            entity.AsNullable(),
-            damageSpec,
-            args.Effect.IgnoreResistances,
-            interruptsDoAfters: false,
-            doPartDamage: false); // DeltaV - Even Healing with Limbs
-
-        var bodyParts = SharedTargetingSystem.GetValidParts();
-        foreach (var bodyPart in bodyParts)
-        {
-            var (targetType, targetSymmetry) = _body.ConvertTargetBodyPart(bodyPart);
-            if (_body.GetBodyChildrenOfType(entity, targetType, symmetry: targetSymmetry) is { } part)
-            {
-                var dspec = GetDamageSpec(part.FirstOrDefault().Id, ref args);
-
-                if (dspec.GetTotal() == 0)
-                    continue;
-
-                _damageable.TryChangeDamage(
-                    entity.AsNullable(),
-                    dspec * args.Scale,
-                    args.Effect.IgnoreResistances,
-                    interruptsDoAfters: false,
-                    targetPart: bodyPart,
-                    onlyDamageParts: true,
-                    canSever: false);
-            }
-        }
-        // END DeltaV
-    }
-
-    /// <summary>
-    /// DeltaV - Returns a damage spec for a specific entity with DamageableComponent.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="args"></param>
-    /// <returns></returns>
-    private DamageSpecifier GetDamageSpec(Entity<DamageableComponent?> entity, ref EntityEffectEvent<EvenHealthChange> args)
-    {
-        var damageSpec = new DamageSpecifier();
-        if (!_ent.TryGetComponent<DamageableComponent>(entity, out var damageable))
-            return damageSpec;
-
         foreach (var (group, amount) in args.Effect.Damage)
         {
-            var groupProto = _proto.Index(group);
-            var groupDamage = new Dictionary<string, FixedPoint2>();
-            foreach (var damageId in groupProto.DamageTypes)
-            {
-                var damageAmount = damageable.Damage.DamageDict.GetValueOrDefault(damageId);
-                if (damageAmount != FixedPoint2.Zero)
-                    groupDamage.Add(damageId, damageAmount);
-            }
+            // Begin DeltaV Additions - Limb even healing
+            _damageable.HealEvenly(entity.AsNullable(), amount * args.Scale, group, doPartDamage: false);
 
-            var sum = groupDamage.Values.Sum();
-            foreach (var (damageId, damageAmount) in groupDamage)
+            var bodyParts = SharedTargetingSystem.GetValidParts();
+            foreach (var bodyPart in bodyParts)
             {
-                var existing = damageSpec.DamageDict.GetOrNew(damageId);
-                damageSpec.DamageDict[damageId] = existing + damageAmount / sum * amount;
+                var (targetType, targetSymmetry) = _body.ConvertTargetBodyPart(bodyPart);
+                if (_body.GetBodyChildrenOfType(entity, targetType, symmetry: targetSymmetry) is { } part)
+                {
+                    _damageable.HealEvenly(
+                        entity.AsNullable(),
+                        amount * args.Scale,
+                        targetPart: bodyPart,
+                        onlyDamageParts: true);
+                }
             }
+            // End DeltaV Additions - Limb even healing
         }
-
-        return damageSpec;
     }
 }
 
diff --git a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs
similarity index 95%
rename from Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
rename to Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs
index 3e6fe8330b..b23ab25f13 100644
--- a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs
@@ -6,7 +6,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.EntityEffects.Effects;
+namespace Content.Shared.EntityEffects.Effects.Damage;
 
 /// <summary>
 /// Adjust the damages on this entity by specified amounts.
@@ -15,7 +15,7 @@ namespace Content.Shared.EntityEffects.Effects;
 /// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
 public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, HealthChange>
 {
-    [Dependency] private readonly Damage.Systems.DamageableSystem _damageable = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
 
     protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<HealthChange> args)
     {
@@ -94,4 +94,4 @@ public sealed partial class HealthChange : EntityEffectBase<HealthChange>
             ("changes", ContentLocalizationManager.FormatList(damages)),
             ("healsordeals", healsordeals));
     }
-}
\ No newline at end of file
+}

From 608730bbe7378e310c5e8866eb41f49ecbae6d0f Mon Sep 17 00:00:00 2001
From: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Date: Sun, 14 Dec 2025 20:21:32 -0500
Subject: [PATCH 100/360] Update to Bardrobe to add Pun Pun's outfit (#41705)

bardrobe update to add pun's outfit
---
 .../Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
index fbf8b482da..2af66c54d5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -8,6 +8,7 @@
     ClothingHeadsetService: 2
     ClothingOuterApronBar: 2
     ClothingOuterWinterBar: 2
+    ClothingUniformJumpsuitJacketMonkey: 2
     ClothingUniformJumpsuitBartender: 2
     ClothingUniformJumpskirtBartender: 2
     ClothingUniformNightclubSuit: 2 #imp

From 091b7d98b635ece6e1955aa8a4e8d1a9ff56113a Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Mon, 15 Dec 2025 02:37:48 +0100
Subject: [PATCH 101/360] Remove roundstart tools from some cyborgs (#41823)

* remove tools

* actually let derelict borgs keep it
---
 Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 6 +++---
 Resources/Prototypes/borg_types.yml                   | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index c8f5643bf9..aeba9fb623 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -264,7 +264,7 @@
   - type: ApcPowerReceiverBattery
     idleLoad: 500
     batteryRechargeRate: 1000
-    batteryRechargeEfficiency: 0 # Setting to zero until the light flickering issue associated with dynamic power loads is fixed 
+    batteryRechargeEfficiency: 0 # Setting to zero until the light flickering issue associated with dynamic power loads is fixed
   - type: StationAiCore
   - type: StationAiVision
   - type: InteractionOutline
@@ -333,7 +333,7 @@
       - StationAiCoreElectronics
   - type: StaticPrice
     price: 5000
-      
+
 # The job-ready version of an AI spawn.
 - type: entity
   id: PlayerStationAi
@@ -352,7 +352,7 @@
   description: An unfinished computer core for housing an artifical intelligence.
   components:
   - type: Anchorable
-    flags: 
+    flags:
     - Anchorable
   - type: Rotatable
   - type: Sprite
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index f4b14c352c..af715528e8 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -138,7 +138,6 @@
     - BorgModuleJanitor
 
   defaultModules:
-  - BorgModuleTool
   - BorgModuleCleaning
   - BorgModuleCustodial
 
@@ -183,7 +182,6 @@
     - BorgModuleMedical
 
   defaultModules:
-  - BorgModuleTool
   - BorgModuleChemical
   - BorgModuleTopicals
   - BorgModuleRescue
@@ -249,7 +247,6 @@
     - BorgModuleService
 
   defaultModules:
-  - BorgModuleTool
   - BorgModuleMusique
   - BorgModuleService
   - BorgModuleClowning

From 1c4806740c72dc41b0feb13044b9d461c77d94ad Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 15 Dec 2025 03:07:32 +0100
Subject: [PATCH 102/360] Fix ColorExtensions math (#41717)

All of this was doing sRGB -> OkLAB conversions without linearizing the sRGB first, so it was broken. I could have sworn I pointed this out in review but I guess that got lost.

Also, add a gamut clipping step since we have out-of-gamut colors and I don't want random negative values causing weird nightmare bugs somewhere. Shouldn't change anything in regular rendering.
---
 .../Stylesheets/Colorspace/ColorExtensions.cs | 51 +++++++++++++++----
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs b/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
index 1a191992b1..6af9308bbc 100644
--- a/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
+++ b/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
@@ -14,10 +14,10 @@ public static class ColorExtensions
     {
         DebugTools.Assert(lightness is >= 0.0f and <= 1.0f);
 
-        var oklab = Color.ToLab(c);
+        var oklab = c.LabFromSrgb();
         oklab.X = lightness;
 
-        return Color.FromLab(oklab);
+        return oklab.LabToSrgb();
     }
 
     /// <summary>
@@ -25,10 +25,10 @@ public static class ColorExtensions
     /// </summary>
     public static Color NudgeLightness(this Color c, float lightnessShift)
     {
-        var oklab = Color.ToLab(c);
+        var oklab = c.LabFromSrgb();
         oklab.X = Math.Clamp(oklab.X + lightnessShift, 0, 1);
 
-        return Color.FromLab(oklab);
+        return oklab.LabToSrgb();
     }
 
     /// <summary>
@@ -39,12 +39,12 @@ public static class ColorExtensions
     /// </remarks>
     public static Color NudgeChroma(this Color c, float chromaShift)
     {
-        var oklab = Color.ToLab(c);
+        var oklab = c.LabFromSrgb();
         var oklch = Color.ToLch(oklab);
 
         oklch.Y = Math.Clamp(oklch.Y + chromaShift, 0, 1);
 
-        return Color.FromLab(Color.FromLch(oklch));
+        return Color.FromLch(oklch).LabToSrgb();
     }
 
     /// <summary>
@@ -54,10 +54,43 @@ public static class ColorExtensions
     {
         DebugTools.Assert(factor is >= 0.0f and <= 1.0f);
 
-        var okFrom = Color.ToLab(from);
-        var okTo = Color.ToLab(to);
+        var okFrom = from.LabFromSrgb();
+        var okTo = to.LabFromSrgb();
 
         var blended = Vector4.Lerp(okFrom, okTo, factor);
-        return Color.FromLab(blended);
+        return blended.LabToSrgb();
+    }
+
+    /// <summary>
+    /// Converts a nonlinear sRGB ("normal") color to OkLAB.
+    /// </summary>
+    public static Vector4 LabFromSrgb(this Color from)
+    {
+        return Color.ToLab(Color.FromSrgb(from));
+    }
+
+    /// <summary>
+    /// Converts OkLAB to a nonlinear sRGB ("normal") color.
+    /// </summary>
+    public static Color LabToSrgb(this Vector4 from)
+    {
+        return Color.ToSrgb(Color.FromLab(from).SimpleClipGamut());
+    }
+
+    /// <summary>
+    /// Clips the gamut of the color so that all color channels are in the range 0 -> 1.
+    /// </summary>
+    /// <remarks>
+    /// This uses no clever perceptual techniques, it literally just clamps the individual channels.
+    /// </remarks>
+    public static Color SimpleClipGamut(this Color from)
+    {
+        return new Color
+        {
+            R = Math.Clamp(from.R, 0, 1),
+            G = Math.Clamp(from.G, 0, 1),
+            B = Math.Clamp(from.B, 0, 1),
+            A = from.A,
+        };
     }
 }

From ec9b13694b83a865b8736b960f0b2ac8cb09e9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sun, 14 Dec 2025 20:50:39 -0600
Subject: [PATCH 103/360] Rollersakes heisen bounty (#41859)

commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Resources/Prototypes/Catalog/Bounties/bounties.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 9915fe0891..7550af1c83 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -605,7 +605,7 @@
 
 - type: cargoBounty
   id: BountyRollerskates
-  reward: 1400
+  reward: 900
   description: bounty-description-rollerskates
   entries:
   - name: bounty-item-rollerskates

From b9c3c8cecbc0c5796ed50e7ae3d7a3c25b7c6302 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Sun, 14 Dec 2025 19:19:41 -0800
Subject: [PATCH 104/360] Fix news console formatting and pda news formating
 (#41799)

* Fix news console formatting

* another fix

* Fix review

Un-copy-paste. Twice. *sigh*

---------

Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
---
 .../Cartridges/NewsReaderUiFragment.xaml.cs   | 25 ++++++-------------
 .../MassMedia/Ui/ArticleEditorPanel.xaml.cs   | 21 ++++------------
 Content.Client/Paper/UI/PaperWindow.xaml.cs   | 13 ++--------
 .../RichText/UserFormattableTags.cs           | 25 +++++++++++++++++++
 4 files changed, 39 insertions(+), 45 deletions(-)
 create mode 100644 Content.Client/RichText/UserFormattableTags.cs

diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
index cf667ff7e9..f76adfb866 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
@@ -1,11 +1,12 @@
 using Content.Client.Message;
-using Content.Client.UserInterface.RichText; // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+using Content.Client.RichText;
+using Content.Client.UserInterface.RichText;
 using Content.Shared.MassMedia.Systems;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.RichText; // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+using Robust.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility; // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+using Robust.Shared.Utility;
 
 namespace Content.Client.CartridgeLoader.Cartridges;
 
@@ -17,18 +18,6 @@ public sealed partial class NewsReaderUiFragment : BoxContainer
 
     public event Action? OnNotificationSwithPressed;
 
-    // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
-    private static readonly Type[] AllowedTags =
-    [
-        typeof(BoldItalicTag),
-        typeof(BoldTag),
-        typeof(BulletTag),
-        typeof(ColorTag),
-        typeof(HeadingTag),
-        typeof(ItalicTag),
-        typeof(MonoTag),
-    ];
-
     public NewsReaderUiFragment()
     {
         RobustXamlLoader.Load(this);
@@ -46,7 +35,7 @@ public sealed partial class NewsReaderUiFragment : BoxContainer
         Author.Visible = true;
 
         PageName.Text = article.Title;
-        PageText.SetMessage(FormattedMessage.FromMarkupPermissive(article.Content), AllowedTags); // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+        PageText.SetMessage(FormattedMessage.FromMarkupPermissive(article.Content), UserFormattableTags.BaseAllowedTags);
 
         PageNum.Text = $"{targetNum}/{totalNum}";
 
@@ -55,8 +44,8 @@ public sealed partial class NewsReaderUiFragment : BoxContainer
         var shareTime = article.ShareTime.ToString(@"hh\:mm\:ss");
         ShareTime.SetMarkup(Loc.GetString("news-read-ui-time-prefix-text") + " " + shareTime);
 
-        var author = Loc.GetString("news-read-ui-author-prefix") + " " + (article.Author ?? Loc.GetString("news-read-ui-no-author")); // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
-        Author.SetMessage(FormattedMessage.FromMarkupPermissive(author), AllowedTags); // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+        var author = Loc.GetString("news-read-ui-author-prefix") + " " + (article.Author ?? Loc.GetString("news-read-ui-no-author"));
+        Author.SetMessage(FormattedMessage.FromMarkupPermissive(author), UserFormattableTags.BaseAllowedTags);
 
         Prev.Disabled = targetNum <= 1;
         Next.Disabled = targetNum >= totalNum;
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
index 84c53e2140..6278e1b2b5 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
@@ -1,12 +1,13 @@
 using Content.Client.Message;
+using Content.Client.RichText;
 using Content.Client.Stylesheets;
-using Content.Client.UserInterface.RichText; // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+using Content.Client.UserInterface.RichText;
 using Content.Shared.MassMedia.Systems;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.RichText; // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+using Robust.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
@@ -20,18 +21,6 @@ public sealed partial class ArticleEditorPanel : Control
 
     private bool _preview;
 
-    // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
-    private static readonly Type[] AllowedTags =
-    [
-        typeof(BoldItalicTag),
-        typeof(BoldTag),
-        typeof(BulletTag),
-        typeof(ColorTag),
-        typeof(HeadingTag),
-        typeof(ItalicTag),
-        typeof(MonoTag),
-    ];
-
     public ArticleEditorPanel()
     {
         RobustXamlLoader.Load(this);
@@ -96,8 +85,8 @@ public sealed partial class ArticleEditorPanel : Control
         TextEditPanel.Visible = !_preview;
         PreviewPanel.Visible = _preview;
 
-        var articleBody = Rope.Collapse(ContentField.TextRope); // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
-        PreviewLabel.SetMessage(FormattedMessage.FromMarkupPermissive(articleBody), AllowedTags); // DeltaV - Sanitize markup; see https://github.com/space-wizards/space-station-14/pull/41799
+        var articleBody = Rope.Collapse(ContentField.TextRope);
+        PreviewLabel.SetMessage(FormattedMessage.FromMarkupPermissive(articleBody), UserFormattableTags.BaseAllowedTags);
     }
 
     private void OnCancel(BaseButton.ButtonEventArgs eventArgs)
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index 0570fde00b..ea1e5e296e 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Client.RichText;
 using Content.Shared.Paper;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -38,16 +39,6 @@ namespace Content.Client.Paper.UI
         // we're able to resize this UI or not. Default to everything enabled:
         private DragMode _allowedResizeModes = ~DragMode.None;
 
-        private readonly Type[] _allowedTags = new Type[] {
-            typeof(BoldItalicTag),
-            typeof(BoldTag),
-            typeof(BulletTag),
-            typeof(ColorTag),
-            typeof(HeadingTag),
-            typeof(ItalicTag),
-            typeof(MonoTag)
-        };
-
         public event Action<string>? OnSaved;
         public event Action? Typing; // DeltaV
         public event Action? SubmitPressed; // DeltaV
@@ -284,7 +275,7 @@ namespace Content.Client.Paper.UI
             {
                 msg.AddMarkupPermissive("\r\n");
             }
-            WrittenTextLabel.SetMessage(msg, _allowedTags, DefaultTextColor);
+            WrittenTextLabel.SetMessage(msg, UserFormattableTags.BaseAllowedTags, DefaultTextColor);
 
             WrittenTextLabel.Visible = !isEditing && state.Text.Length > 0;
             BlankPaperIndicator.Visible = !isEditing && state.Text.Length == 0;
diff --git a/Content.Client/RichText/UserFormattableTags.cs b/Content.Client/RichText/UserFormattableTags.cs
new file mode 100644
index 0000000000..09be4fa2e7
--- /dev/null
+++ b/Content.Client/RichText/UserFormattableTags.cs
@@ -0,0 +1,25 @@
+using Content.Client.UserInterface.RichText;
+using Robust.Client.UserInterface.RichText;
+
+namespace Content.Client.RichText;
+
+/// <summary>
+/// Contains rules for what markup tags are allowed to be used by players.
+/// </summary>
+public static class UserFormattableTags
+{
+    /// <summary>
+    /// The basic set of "rich text" formatting tags that shouldn't cause any issues.
+    /// Limit user rich text to these by default.
+    /// </summary>
+    public static readonly Type[] BaseAllowedTags =
+    [
+        typeof(BoldItalicTag),
+        typeof(BoldTag),
+        typeof(BulletTag),
+        typeof(ColorTag),
+        typeof(HeadingTag),
+        typeof(ItalicTag),
+        typeof(MonoTag),
+    ];
+}

From 321ba725da30e8d25aa7928808874c2d4ab20ec5 Mon Sep 17 00:00:00 2001
From: Nox <nebulousnox38@gmail.com>
Date: Sun, 14 Dec 2025 19:43:57 -0800
Subject: [PATCH 105/360] ERT Overhaul 1/3: Apparel (#37855)

* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
---
 .../Entities/Clothing/Back/backpacks.yml      |   6 +--
 .../Entities/Clothing/Belt/belts.yml          |  11 ++++
 .../Clothing/OuterClothing/hardsuits.yml      |   4 +-
 .../Entities/Clothing/Shoes/magboots.yml      |  13 ++++-
 .../ertchaplain.rsi/equipped-BACKPACK.png     | Bin 806 -> 817 bytes
 .../ertclown.rsi/equipped-BACKPACK.png        | Bin 537 -> 461 bytes
 .../erteng.rsi/equipped-BACKPACK.png          | Bin 527 -> 456 bytes
 .../ertjanitor.rsi/equipped-BACKPACK.png      | Bin 810 -> 799 bytes
 .../ertleader.rsi/equipped-BACKPACK.png       | Bin 902 -> 844 bytes
 .../ertmed.rsi/equipped-BACKPACK.png          | Bin 526 -> 452 bytes
 .../ertsec.rsi/equipped-BACKPACK.png          | Bin 527 -> 458 bytes
 .../militarywebbingert.rsi/equipped-BELT.png  | Bin 0 -> 859 bytes
 .../Belt/militarywebbingert.rsi/icon.png      | Bin 0 -> 406 bytes
 .../militarywebbingert.rsi/inhand-left.png    | Bin 0 -> 440 bytes
 .../militarywebbingert.rsi/inhand-right.png   | Bin 0 -> 451 bytes
 .../Belt/militarywebbingert.rsi/meta.json     |  26 ++++++++++
 .../magboots-ert.rsi/equipped-FEET-vox.png    | Bin 0 -> 811 bytes
 .../Boots/magboots-ert.rsi/equipped-FEET.png  | Bin 0 -> 650 bytes
 .../Shoes/Boots/magboots-ert.rsi/icon-on.png  | Bin 0 -> 590 bytes
 .../Shoes/Boots/magboots-ert.rsi/icon.png     | Bin 0 -> 589 bytes
 .../Boots/magboots-ert.rsi/inhand-left.png    | Bin 0 -> 382 bytes
 .../Boots/magboots-ert.rsi/inhand-right.png   | Bin 0 -> 395 bytes
 .../Shoes/Boots/magboots-ert.rsi/meta.json    |  49 ++++++++++++++++++
 .../magboots-ert.rsi/on-equipped-FEET-vox.png | Bin 0 -> 798 bytes
 .../magboots-ert.rsi/on-equipped-FEET.png     | Bin 0 -> 1014 bytes
 .../Boots/magboots-ert.rsi/on-inhand-left.png | Bin 0 -> 379 bytes
 .../magboots-ert.rsi/on-inhand-right.png      | Bin 0 -> 398 bytes
 27 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingert.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 8219b141a8..cb487735a2 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -209,14 +209,14 @@
   parent: [ ClothingBackpack, BaseCentcommContraband ]
   id: ClothingBackpackERTLeader
   name: ERT leader backpack
-  description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.
+  description: A spacious backpack with lots of pockets, worn by the Leader of an Emergency Response Team.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertleader.rsi
   - type: Storage
     grid:
-    - 0,0,10,3
-  - type: ExplosionResistance # DeltaV
+    - 0,0,10,3 # DeltaV - Was 0,0,8,3
+  - type: ExplosionResistance
     damageCoefficient: 0.1
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 1af9401696..004c3dc1bc 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -239,3 +239,14 @@
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
+
+- type: entity
+  parent: ClothingBeltMilitaryWebbing
+  id: ClothingBeltMilitaryWebbingERT
+  name: ERT chest rig
+  description: A set of tactical webbing worn by Emergency Response Team operatives.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/militarywebbingert.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/militarywebbingert.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 2b41804e07..bcecec238a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -1184,7 +1184,7 @@
 
 #ERT Engineer Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitCBURN
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ]
   id: ClothingOuterHardsuitERTEngineer
   categories: [ HideSpawnMenu ] # Delta V - We have our own we use for ERT
   name: ERT engineer's hardsuit
@@ -1236,7 +1236,7 @@
 
 #ERT Janitor Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitCBURN
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ]
   id: ClothingOuterHardsuitERTJanitor
   categories: [ HideSpawnMenu ] # Delta V - We have our own we use for ERT
   name: ERT janitor's hardsuit
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index ad10ef2c28..1b982652d2 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -92,7 +92,7 @@
   parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
-  description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
+  description: Reverse-engineered from ERT magboots, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
@@ -117,6 +117,17 @@
   - type: StaticPrice
     price: 1500
 
+- type: entity
+  parent: [BaseCentcommContraband, ClothingShoesBootsMagSyndie]
+  id: ClothingShoesBootsMagERT
+  name: ERT magboots
+  description: Upgraded magnetic boots utilized by Nanotrasen's Emergency Response Teams, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/magboots-ert.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/magboots-ert.rsi
+
 - type: entity
   parent: BaseAction
   id: ActionToggleMagboots
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png
index 4bcff09c29dcc40bca6b9f629012361f6a19a8f6..1fb44addcdba694d9b6679a0b8d5b43d8ccb0fb4 100644
GIT binary patch
delta 795
zcmV+$1LXXs2C)W^BYyw^b5ch_0Itp)=>Px%>q$gGRCt{2nz3pdK@f)j3+ZlK?{X>)
zYuH0qxH3kn18Gfq<4%Qf8OQ_p1=8mg+!|LYBB3g{5S+j(R9fiT>;?>mO%e8x6YEZE
z`6N4;uQ}b#FgrJznc`*uf*=TjAPC~$;Pmv=h3LNtQI=9x8h@{ouS=)XaZ*YrrF4_a
zlLuERrR#J$!RN0W04b%5<9O*y*2&jp@#Q$@5PSz`KYv2-9dOQ{Y<J}VXsx5gYpDD=
zD2f7c9K%|R<MRo=9vtBKd;)7N;y6Z86u7;;4YK(*MEUOSZY}vb3<iTJNfKv_0b>lK
z(Wndt02pHc0DrAkE68q857;)0F)+qpjDax*-EO!1?PZN-!2SLGTJq;$vEKXrJ{V)=
z^P(t%?FBW#y86~yM@=<BZ`WE2&N;FygS8e}mVt9#mO^7CuxfK_vI+VZwbo)jpCijM
z%;)p+*;9BmJs`_6?C<Ya>Tu3+b#)bF_tga8;^HFm4Sz0<;|DT-Ulc`f1~!(iP4ZZu
zX|nVPf*=TjAP9mW2!bF8g80t}ow>gRR`q%1(b(kj#JxZ3m-jF2E9~Nz;>*uneE8I_
zQZK2U3;g*0(E%vu@P0O@lyXX`t!KufAKpK~cku1YyVCb6D*r_(rQ@7K2!ZKz3gGu_
zZt>q&N`JZWc)XQt`15SPq~Y;916A2tTLRWvv|23;heI&N{xa5Xw*kQI?d?HpjXcjA
z4Mv)#PD+WJn;W#-ZH&j`Qs#%Vepf&UvHpQclDMOzBUd%`RZ6*DueY&s==FM)<>&W>
zk|e41skR3k9v+7J_hMMZ_u2rAMx)@F`?fL0V1GKDVmKVu>Q)9|v7Y>O8ME08X__`(
z25FkQ*=$y;Cxn0yqIPSoHUoqZxW2wFS5cO+i3SJ&d7ejF>q;H(>+bGu?FwCG0JPST
zwYGNmCW@ksyu2sR^C*g{kMmn3gTdf={7TdG(ayVxv|q+!XDg-LHhm%pf*=TjAc$AO
ZFBA)GTGrSC6+!?2002ovPDHLkV1l#&iXi|1

delta 784
zcmV+r1MmE?2Brp(BYy(zNkl<Zc-rlnv2NQi5QcvS*`zfjq|pEaNU$CtaOVnLjlMuO
z4?)HPeU0vYgm?`+*M_Ge0|6Td1CKVOwPIFwq97xQWYv*fxA!fA#1naU<Q)Ya0fHb1
zf*=Uu-{9uv#<r0^Ya=`y4(&ee`!W~|td!D9Decq!_10BNX@3WULF@6)+8D2ts+Cbn
zb>@Vsah!7qeu3NPX9#`)&iNnr%XSr%QkDv6ty$al_i#X-=kPoa0MP68%C^;N1pqL{
zAW0I8$K##HKi^eQYt5vTHce9iut}023`4BfYbd3VrYR<qNhihwz-%^SK@ixYDB$}(
zlv40K55^b(Kz~sb0Dv$ITlIV1R+0634FFqSmQq^xyi0uF-!e8$Q{3I%ZMC)4;~XbO
zHQuMwX=ym;9C@Cjvm|(IT#hlufOC!{Ny?b#oR^`{c?g7ISZ4cb4sg%Ao_#mVS(YJ5
z5@cBhV@&CQwwz23a7lMEnbbO{uKis?Kq>Vi(`&6+*MGA=9*>!GvfBzB?mo}+*1HhH
z2~z#$=<?fxAP9mW2!bF8f*=TjAc+5zwl()t(s}2)z|;M;{d7Am@Bg;Hu+=}s_uoF?
z^VjK4?={v1e*OGn0hD!kSDTBX$VO3g^p#Q7!|5mZ1%7=0Sn6H}Yw{}R972e#8hmy3
zqbRb=<$sbL%lPWpQc7Dbns}bqSS)D_0b>lpFvNU5hwu9@I_vlQ0AMdKFQK)@VzKDd
z8F3t2DJ32sAJOmkv0N^<!ct0UUHM!HvHyTU5ZK{xXkV+wRA*u|8XYVgMx#+}__^~!
zK@ixzbHLTr)yeK&yXfBN09X1xC5ocJYPG_AK7ZfO0o8bN*SFYgHi+Z6^Dv0x*lsqP
zMmZq_gb=6;-JMo|5CRVm59Lvmw>U%s1c1e2!L-)3GEUcCuh)2l?ySKmW{hb(d&3wz
zi1Ae?Fvc2puPn<jo6Xp}Exp$=?;)0boldXqNXOKPAP9mW2!bF^gx}Gta4N7KkYWG;
O00{s|MNUMnLSTX^0DN@-

diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png
index df622e17347988acee4600685cc1ff4acf8290f7..1cee79c0556407832b76f753254d164cc21cdb64 100644
GIT binary patch
delta 329
zcmV-P0k-~`1kD4GF_A%Ee*q^+L_t(oh3%Hxa)clZhBt|BwkCV<{a?1h3PmtlZ7+5@
z<U$xAA3sbmxs1QGO9M2(UjwLUOGBcr?}*R=5YwWq{E@J~_V&#QxdJZQN&xfi<Hk%L
zK#R6C5i)fo;v8WY5PXL~@c?_5NH{4#4?ruur2s}CKwd~V5C^uke-X?dPXb_=0Rx-^
zj9?J}77e-o!BD1P%c1vrObyTg4bTAp2hdf2+;y{M-5S6$KazThHJPeqhyGdt2$`qC
zVuui>txn*S-V%T<Z->rZA5YKw`Oy2cScFT!D3PfzfB%<8y{X7Z05}Fn`SDvptXzHq
z5UCW{#YDj79n1i(Kkfh_4yo&Jgm?soSgEBWV2q*-|1_Bun^`1&;Wz!~>0IPnJ*Ea|
bfb;eVcUuLh4|mTb00000NkvXXu0mjf*4dC;

delta 403
zcmV;E0c`%w1DOPnF%1M~K}|sb0I`n?{9y%=E@FQG32;bRa{vGi!vFvd!vV){sAK>D
z0ZvIoK~z{r?UvnggdhxsOQOqG*dO2jWqSevfkAiOcBVI+3m{-V12QIG>n}9`10ecS
zfNA<x#5~OtGpQX^01WGZ`vfAU`7)y|2?c;T5>nra*xKv&)!HhAatpk$SqxgWTRF#U
znVo-AJE#JLO~ke*@m++XcF-vRP7x8%rvP}9VMAc(jOfG};ME|&zY5_*1ZGjdQhw$N
z5IuLkqFfXLfa+^f0$vMOq{W{DbTj}1AR2%H5Dh>DK<3~3p;y9VlMbN`fXq+qy;{5S
z9@$~OsI>u@ED}EkF9@=XI>F}jmH`%dTLybKe}9CTjvjY^lOAb4yiAn0;1bh6W8c$L
z<73K2Mh2L3fSez<2vX(p4j?~Vo`Fq(!!w8j7Y|&N0A$jX-}MI}ZNZvUspT!8{)vMF
x|GZcfn;DSshyJ=;23Y_;(*O*B=)VE$`U9|J15UHeG2Z|H002ovPDHLkV1m}msEq&s

diff --git a/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png
index f7c55cac3a58fddceb1cc3af8be4e8e761ac206d..84d4e5bbe4808d3bd4c5e15a26055065eb05e086 100644
GIT binary patch
delta 332
zcmV-S0ki&(1jqxBF_A%6e*r2<L_t(oh3%Hxl7lb^h6^Yfdhq?<wxlcB92Tu@FFHHn
z!erF{%byGir{&E!bwCGv8bH-p2NDg#K!gr}n2NE{BjE_6UUNe3fUB`Fz&ydkOdde0
zv5pW(-BAe67IpzqJ4cEK*gHhRhXeEg^vA3;zz77$g@propi3)3fA#nx0Ol1i!)t&A
zGy_1hA=e*FWr|VW`mT?u13I7sI^f>`V&(UWS`if6gcd;4sK0#i3Tp}xtq$XqmNEcg
zEc}aKnoS?y)jlDWw*+9V+i`N1%hgj~FLHjo90J#XB^Xm~{`xmDzp2Sc05}Fn_3_t%
zbuP~ULTDW5!5CokLJU>_H)nugx5U*e!M4C)om$!gS{7~S)5EOU%u@LWzo}mz=O(}D
eW9onocq8s}e&(GbWx-Sc0000<MNUMnLSTY`hLslp

delta 401
zcmV;C0dD@t1CIodF%1M~K}|sb0I`n?{9y%=E?R#832;bRa{vGi!vFvd!vV){sAK>D
z0Zd6mK~z{r?Uvhe#2^TU3nWI}L*D;w3yKsoNp`dCOmF-z6ixU<;{?9eUupmbK=h{o
z*z{W=(KJm&sN*6B08)eY35bL<%-ni{0}xe0>$gG*VSy!tE(E^?iUbk3)$vv-5e1@@
zbX<Sb0m>$7yC?CDLeX*2B><lyM}VIK*c*WWnV~bH3unMfGlBiP5H3UjQ326^<_=Ij
z55A&Y6l4JQ*Te%}i?7HQe+{ss0T=+$01SX=06ai4|IrV<6Tdc1YC8ZeGyn2)*5RRY
z=Ik&pwp0TUO5$hZ1wkH5onYzB0D<$i7`J(Rf0UUWJ?{A?J*WAyn8>z}8Z$p@zo)0h
zM`%Tc0pJ?I^5ahgt#Ww>U@!YK2n}$02GvOQz(oy!(5CXCKNH#(0<=oaw!rmIHBS8P
vp({2G(D0}J`q&5Q0H0|920--RfOY)_fNA8DCsJ2e00000NkvXXu0mjf{r0JL

diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png
index de90b33ac607567f844d5612d9b5f779b3c89440..f9cf5b31c18ead573943887ed8a794fb5e8c19e0 100644
GIT binary patch
delta 763
zcmV<X0tEf42A>9yFn<EsNkl<Zc%1E;&1%~~5Xb);dRraC3Xy}TVFD5s#HSJ*$RqS6
zdT?K(=RAv{mp(y6jy(iq$b#v~#!HXdLcnx;NLDz((MSA|n9lFwj~VUGj%P+jGXTRd
z48t%C!!$xfZWH;Y42MHUM2?8u7kq#6N<?lr9CqISsI4LqIe#hTi-&BIZ_4W7lv0RK
zVtf@p5TC?QO0Csv!-uwtT5EB3cILF!;x+PZV2pv364qM${PeB*-cBu~lrY9TaYh?j
zI{*Og@9#H~Z$h5uB8nncmL-B9!0qjA<qQBQ%M!rD57A}a)+z8F2!a4X5TGnelx2yF
zi;L>LmvyC61b-}-%Z=pQU^T?Audk~^E2UtJ>AYU2BG?pOT5GYZBIwt()<P+TEX!c6
zMV4hyN>!=Qb^o0etZhR?&i~3%N=PXYh9MS<1+2A|V~jDK>cGL&fGo=}7z}E427>{z
zEbFxH!8l+%9*fy*1^|#!K9Tv)v)K&e@wih|A503YvVShmclrN=VHk#C7=~dOhG7_n
zVHoEBf{1>t_ThIu2k;tJZS%Iaxvo`j@KRrWj8EdfzAtBtL6Rg6049^kn?8>Ab}X06
zs&5$oiE*i~jx;_uUSDgxZ%6sQ8}QJZTYUzfB#C<~Cp_QV4{1E|`*CLAxUOf=7y;H=
zEEWp@4}b0H=Zp3GeE@K$r>D?bqbQ1<IwMU}M?|>0yF<U<$7C|8WWG83I4f`*hT-NL
zMp5MaY|cwMNs_qHXtcMwFdB`V5B+ucd7&tZ8f|Lq4W6H$ceU@`(8l)06u7y$*@`jy
z#7~V(r_)B=+6W*b7lt9)<kEaTN1CQPPlGf~-E@3DZ`AX4H{A|v9iWs#uh#>B#`&9l
z6hHtdib80uYjwP>y<V?zYOK})d7cYDfl-GLVlRjH6h$F~sNc@tz4AQYj$LV*uC2WL
t2>X{<w|9~x?k#O%7=~dOhGCck;U6*~OclfH3labT002ovPDHLkV1m(lai#zO

delta 774
zcmV+h1Nr=)2C4>-Fn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pH
zzez+vRCr$Pn$4;jF%-u$7k9c8Meo8Q%tFzHOVPdE2|hy?mijn$*JlvADRr;-0D>+A
zxpz?qrAysOt^bfCsZNv0mC;Ji4?=R1xt@<nPA-!OhG7_nVSgBgvD4{v4yqZ7ZTwmq
zjmE+EeOW$;uYc4i7*~%*=1J97;M{aNRZ=(@k1GhebD2y=6rKy>qxVhLkO|iyc&fI7
z2&<-8EEX4kXB)p3IJVhrL^7F_a<N#HHCQf}vfk}>G8p6WII?~xL*Znr)e^(uP*kf`
zk<aJFYPFJYo`3q|aGuEJax%!NR7%PS2Al@l?N-)75IE_NyaWh13<iUN*YEc|)OvrM
zz;P5fi_&a1Pi-1=#W?`?22-4z9gRk(ww?!Ec$ffCj-hpqC5Sd^$g~vnToeW80ASq%
zWcyyPcc83K{c%E$qO8|z={#!cd&?|%m>d9SYqgq^!hgXyo^!!D0Lb{~nI5w3e}rp6
zpee|-6%r(4oL)#&oF4vH2wUfIZodq}Fbu;m48t%C!!QiPF#i|6@4x8h@UEvXw?Maz
zY*j->B7I6e{-9TQF8uob?vs>pOr1z1WP3iJ-}Q5JsZ^4V?)UrC$<X_k&*JsR>(dv}
zwg$myJb$97pSuCH^>6Sn;9fyE*A08MLzACqA7575bY@^Z8KQGII)gj^u}Y;P4QaRA
zhjO_b`_h08=z>n@)`4xBz3F2+t%lwXE+x?29MyFJjOli}u{%#d7j!D|0@w<h=|Y7G
z>kO#Z>#Fs5M6ul(fXQSc@8HlClt%!z!e-cR!+#h6Or>l#D^P3%K_J(s5@Q28pvwl?
zZCbj(7y#@5bQ{Zd|K^y0#B4T;eK&v(=rTdJ!gkxG31a|o-Hfuo3D5Ix;yeLe&}o8p
z1D7jvMlkilGVd*>{oe@F4IA%i6T>hJ!!QiPJOo1g2A^$lr)s6Cg8%>k07*qoM6N<$
Ef)9^u9RL6T

diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png
index e3d66731440da3517fea1a258403a7f8549b4c4e..a0381cbfbc171b4b9eb1505f1afbc039a2a5b1df 100644
GIT binary patch
delta 821
zcmV-51Iqk{2h0YLB!2;OQb$4nuFf3k00099Nkl<Zc%1E;&1%~~5Xb*2E;(p#hF#=9
zD1i+~wGO@%f&x9~*c|!{hK53+kI~Xs=o6&Jl4FA%LoYrUWQf2tml*4;J(wD{2eZO$
zZGFU%?X>f|$kwc8XGb%0&<sEj1VIo4LHrw>pP%b8>uY5eOMfYK6h+p3<?9jzfsW%C
z0I=6O#kBu5y#fH|ytK|IMHfmbwQbvwQZDsyo_t+`AV~Fc&Qae#!1FgBQQtqf*TD^i
z9bn$<syCb`e+c3@hHcwWN}+yxjVD*1QNO*0QVO<hBaUO--QAVaSt<pl)9G6Bb?A1x
zmg6`&NfI!|Fn<^fQfB}_k|Y3tMx#+mZ{Y~o1sG#sj3G%9BuRpklautfkyRQ2v)ODd
z`9rXn@10HujIs2-DUf9-RRr_$JBlK!sv>CgDy6_VhwuAPO2PMiaL&_Is4NAF7Pl&k
zpgE{g3X{nMzVBl)nWXpb!=tGIzVD;eYGtnBoa6HHvVWA`N8^BtiwnyXINP>=lbQc<
z9G8y3%EGlumerXmQ;#4Bf*=TjAP9mW2!bGp|BSLd_g$c<&4pWI&DU?W>B9rN_Z4>W
zOYvUo6rIjhq33cB@$%gV?f?9N!P94$eg6Vr{{6jHoBM7!9B$PSuIp-G-j_6e!`h2i
zsr=ig_kWr8WeTN~nsW{z1V*C~fO&6j@$I{=tGDHZKle668U`~nkQJ@DDWH@>qtQUG
z*8^khFJ;YU69Dwl(Gj93LKudXI>YlkEv3ZG%?+B(CWgadDl^SlGb<p3SbsyuarD{Q
zna=9^x~{9+?e@kBWxL(hCiIsfrPM(XXvcAKZGXz`4IUpKm$h$aC}MlA0|tXZ>7M(x
zNs<Jk(Fna>FL!OG0~YhiTvst3kKuV<<!Rt~o*s|Kx$A@w5JKcmt>s355CZ*vKOIF`
z#U=_M0EA&^MNyQw#@Kpzc$hmvm+62giY%p6?(B_aSsOXLAq+#yva+``QzYGP_hIbv
zJT7l(<=sTsuVUHWuIuV;+C&fpK@bE%5RZgk-SS;{i+B&U00000NkvXXu0mjf9odjU

delta 879
zcmV-#1Cad828IWaB!3BTNLh0L01m_e01m_fl`9S#0009xNkl<Zc%1FpO>5LZ7zglw
zq~amD6(%G?k-`)bH-}z?l7q+4qdE8)7A%6`$58wvU5~OyWw#4ndI)5p1B+gENzR#r
zSQrmwVzk@5v`t_1`CXQFrjwZ`GtZVh0SF<45JJem;o#svb${u<(WP@7$7(bh8JBIp
zsxS;yp6397N4xv@ar~+L1OUcZ=P@6&?HI?gN|L0uPm&~v<G9luXe$iEa$Lq3HXm={
z>8tnHe7tq3g=?*MfL=W3TnQo0-DS?Xs`l$cp64)46H-cSe?J1gA7K-~LQ0sXi9FA-
zTrN9}**XA12!DffuA(Rc02KrQT-U{NxkQpAh@uGN@fhoZa~-DBso^+|DvAP@Wg$tD
zG8h0*6a@glb=^+mcFF+&$_Q7_I_F$<jr?U;mIdJVVxuU+;o;#QZN2S)yP|sDCzDCJ
zaK;#Pg6yJo61;6X$4Du`7();QkWwND0x-tPqtN>iaDQF5%=XnBpnu<|>RryV3_%be
z%Q8qQ%K&tBZ*qW6y5sTq!aj_#+V*uiAAuxE&SiQbgwgliAB{$a4zg*Qf3)eJ^E~hT
zE!5k8ZGF=DpsKI0UqT2Wgb+dqA%qY@$bYD7&HXNDJLlGQfx*kyO4s3myZ02f`lR^L
z?mi}yFMqB6u5l61-@H@7&u>T`KEdhNj{we|zi(`u#cn>I-)bN{&r<+!dU{&c4L6>>
zDBC}Ocw0Na+D6W~VvNDIZ7dcG0B5zi>fQG|Pu*4!{=PQnTvdxE`kjHg-P(8rq?B-7
z7qi(6mSvqAY%mxAfZEyFfe->|n)VtD-}e>g9DgS#Cm0L{n9t{Bn|_Bum(Ok6zWN0n
z$5C+{t98{F&GS4p91d?RQ4WVgrMLb%oO2b1p>iCjaZZi3!M(k`uJgMy+RVK%0J`*j
zpA<!b#bSZkY}VMfHUQQ0q(3jRTCL#we(%S?_kFcmts48;whi01*A`N%8h3zg+c-Wx
zE@)pxxyVf<KmbV7)DS|{_R(|Q-rjC}g|0RLLI^`j+4$~_VHh{Ecr8s+!!YVEC#6J|
zWtdK<*E28Q_t$3Lo7najS$A#E^VDt5i4Z~vA%u{7;ukLDc#yh&{l5SJ002ovPDHLk
FV1hP;sVe{g

diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png
index f586a72c9be91d54bf5aba99562b2645a8db0296..21ff5db93a7e4c6cdffef20f2ea4ddd543e8863d 100644
GIT binary patch
delta 328
zcmV-O0k{5+1jGZ7F_A%6e*q>*L_t(oh3%Hxl7lb^h70H-^x*ry?GkIUITWq!UUWL)
z!ekQp@`pj;G{0%54(NdY22eHDhD5_K5TOGgrebXTk#PJO?U@sD1ze4d0A>JSCJ&(1
zSepo$IudcNunP#jQ=oW&y&w`U3eW@4gIOtn5eSeA2?z4Pjy8h%f8&b)m{!09uK{MT
z3;@f9-2Y%IQ?PRBvp%K{=ztFBfUg0B%I_7m!YH%}j}(md%U7?kCR4TQFt!Q^nU}_5
zhY+@{PvBJE5`e94hsjwlSI_%;(ev`M2-kpFB2#bv`8SPvQ<ISZa14;@<DY`qxjX|9
zX%tvsB49HHD}b9AJ|M&;b^VPHufPyHwR8oHS+wDwHnV0kOQbt~(|_I0MSjx9)Bzpv
ahW!HNQs&y=yTXJ30000<MNUMnLSTYd=9i!V

delta 400
zcmV;B0dM}q1C9icF%1M~K}|sb0I`n?{9y%=E?R#832;bRa{vGi!vFvd!vV){sAK>D
z0ZU0lK~z{r?Uvnggdhxsn?#GSKfeFl_5=bAj=FW*nci?NfPnc7$e4VrztjK>fa*^H
zwCT5Ek!hMl*z7C^AhCh$6PShP&l#;JIDkkY)P5_L5Qr#*E(E^?S%elsYxY(#iUg4u
z&CY-70C^Lo-IMw*N-;a@5&)-&2>4w9yqSa;44YA1I0L*I1o(F$T!?@c11$bCcYxw~
z@D=r<FaX?N6AySTT#+sQ8em5QFaW9n7y#7(cz|a9qaS)FJT^@>?jo4+%TLLSL#2f5
zFq;8YfN((K$KVA)mr*B#mfjj5AaCp7mhO0uJhP+6J>9fNn$Is&wJpTTOwZEq>1pu^
zw<4nf=o+Bq$L|Pg<?<6id)S{rsDRTmD1%rITvY)~bt)bDgHX2+s8(ui3#fm};KaWz
ux?-~dD*n{pmVJ;8@SX->095}CSl2JTE9A_wP!z`i0000<MNUMnLSTZSU#;E%

diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png
index 06b330ec8307173ffa5d36515af3c2afaa69b0e6..6aea24709fd052e68b420345786ddce83b66095f 100644
GIT binary patch
delta 334
zcmV-U0kQs%1j+-DF_A%6e*r8>L_t(oh3%Hzl7k=&g_|4+LVtY!x82Yc7I0&0yBD1u
zav_X*J`PMYIW2F-X#fV`uL0=BJ{Xv$319;NK{Iaj40g`xwI<XKq#HK|L_B#BSb*4#
zeS`pYhY*Y{JOm`|oG2FH(IJBG4%h<Vmsx8-m_RIzg#&q@ODjS3fBYhV<`pp0Yk-9`
z14y%>)*nn|q-bw_*2gpe126ys@NWRA@>@l%38Xe*3xId}%a2xJEfJ$u2j|OD833OO
z|6-TstWWQ1pHK(|AX>N6<Qy+oOMSh>^Zn%zqz5b^m&|yx*T1d)z@^D306GRJ_3_6+
z?p&S$gs^d-2a^H2L}#!9WOD{g`BpUbO2}If%AH!-0_QB+(U*r+vstC`H-1;YKCVrE
g(#JFa1Mo(C0ooPjs|poZ@c;k-07*qoM6N<$f@xWg=l}o!

delta 401
zcmV;C0dD@v1CIodF%1M~K}|sb0I`n?{9y%=E?R#832;bRa{vGi!vFvd!vV){sAK>D
z0Zd6mK~z{r?Uvhe#2^TU3nWI}L*D;w3yKsoNp`dCOmF-z6ixU<;{?9eUupmbK=h{o
z*z{W=(KJm&sN*6B08)eY35bOAJag*_4nR~1t=|eMgawumx)A&pC=x{AR>xbVL==cp
z(s6%L2Pm7U?ViLp3Ps07mjHZ<907g`U~dEhWQNX&E}Q``%>?%ELbwnCL<L0unL9xB
zJot)oQIG-HUlR{_ExsaK{58Oi24Db0126!h0q_9H{6|0ZPW;+5sqFx?%>2vGS%-(p
znX|*Z*isEZizI$FUJ&H5)Coo~K;XPB#w~f@A7y4ok9)pJ&uP9aCbBK0mNN6R_IrA2
ze1ukH7yzyTEI<B4&?=XA0QRy!gU|q{XHbn)4_wp$2yH4K`ZJ+zAwa9tYztifRO7_o
v9=c-F01bcYuaA9@4)B=<U;sq_4OrK2=K$oP7qCd600000NkvXXu0mjf+|;LU

diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb2e5c6344497e09343ac58cd2f5a7125382b9c
GIT binary patch
literal 859
zcmV-h1El<kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%`$<GWRCt{2nz3r!KoEw1C4m^O2-$Mm+wwMzOT%rI2hbz<4Gih?27xrL5Bvfy
zQU(I@C6MNtoWRYxRf>cG7X~*$X*@zY<g<2V>F!`YI2NtM&S-9CN9+tB2!bF8f*^Fq
zIahAGJ|y``jBuqCwAR&JQ4}B|WLXxxUaWi~s^<7QM*gc9CA8L<PN$8zx<W(ay~peK
z9{>O^kKVw4`3R*{)LOv?AR-h+fjrNvxme*b5D|<q@LxYwbH*5W@1xcWa+$jO-JhJ{
z-~BBBV6s|3DTUiVzwzz+&%wf=E&Q0+Fnkg6FcE=>pp?SVkI$H_7S+oW5&quZg)A2Z
z5n(!=q9}^S7#o6}4Zu6?Y&HWCVK$qg?Rv<Jz{bD1xq;TYF>Y>*UFl>1c0Hw3wfVJ;
zZy%l+!U)c}(ipSV1B@}jvO5`oh@iCw5n;JpZXNl#=Z4p0S#=L!*@(zSowC4sy-om>
zct}CK>u!z!aCLRX&p#`y!+O0=lv0g<nTQ(qL)Pv5u(h^)D&6q?Aq=n=SZlY&*HiZo
znz6t4V+qx>ldEzT@ZMuSpCixnQNH`TQrC|&MOXcTKZVcF&l3Q6XKndw4`SU~Tk^{e
z8iI!s--n{7AP9mW2!bF8f*=UHBltuoP1DAK!{z1WPEUpU>JwBOOw+XF`XCoUc6nIp
zoGZBy!@o^~JVjJ-G|RFi%d#ZT^F}Fb3}e(~DW$3d+APZw)-Qz4?&6#)+fG_pA?^_v
zIwbfX<`;cTr>>{MK_1XXY)x)oWcD%upTOQ7pW^=HY!oAKbH?5AX+wutdV7E|29wnS
z`uYMGcpu=k_4NfNs|AcPz1Qqz0ItGpHc1RgT^9EQ^x;|d0PfG>aVW-=)k>Rtr)gSR
zYfB!7)}bz|E$4@ZU{Gza&EnpBaA9(cz5s57V3}QX6oz6SdItLH5aqJ<dc0C<XT1W>
zxso$MY_D)s7T`GJm)}K6n)?Fy6MXd8x7Lob>mQ09f*=TjaDe;=pidDH*;`4G0000E
lWmrjOO-%qQ00008000000002eQ<DGy002ovPDHLkV1lC7jPd{g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d11dc84dd2d6b1da2a6fcec1a23acc66e271bfa
GIT binary patch
literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$P)S5VR9J=Wl|4?xFc5`55Dl%%v`%RsVdWEWB?^wgH8?@!8?Y{uHsv5hvkfu@
zaun?n|DbIUdDX}s&%7CrpJB(29XtLaoO7{dJ%^j$Bv(oyA{TpUeHe!7xOc4t0H$%|
z{^1FL&(k{q@$`ZCXOvP+v6=~p$akeLj~9Deow*tTYi(3YZC07qt+nxZJXT#p69J_Z
z#u(;#-Xvj+A%svJ^R|TmKnQ`Z>kyHp-O28{t|>V*big?mjWG*}k`2U~*H9#|e%o4W
z0Oolv+98DHY>r5lz<JfvG%b5Ic1<^`W*}9iwQjac$acUOgVq}FJtBhl9)NKi7oROV
z`5z7k0ES`sF-LYtlI)%bUklEb4bb=fLT2j<ic^{fX`Q4*;O$HeUo)aqrB+D+*F<ty
z`<4{3NeR<Gkb73nxtRQ}3TtiCU*GD#W5@r+7h`P8l#Lh?%K!iX07*qoM6N<$f(vM>
ARR910

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbce144c6084de943654b099a4a588cae4638495
GIT binary patch
literal 440
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV669aaSW-L^Y)fuUz39f+k<*@
z6F=uiyBlN|eqsu%ZYXEgf62J*6VtWJ5tj@)&-yTO-u6gzQT|bI{muW<o`>?4k{S1y
zJK*5oME=(fp>G*#=Iie-+kN+mt<L7WlWUmI@B5c=ZR&YTr|v}#fg);=N=$-=C#90A
zmV|6Q{rOMQ+Y+n9Qx`+8`ng=#rpusk+UQEDt>$aF%^UtbJiW=qi?jPElcuUn|M82i
z0awpin*WIIxwwU6+5Lu1IuG}@7xNjqSv=nmwYI=Q#x4D*gzo=azG<u+iU+Fs-~T=O
zt7@+sM`FpfqMdto<!8K&T=xEQ+UA#S*S`P$`=VB7Gu+`F9T{@Zr+vF^klXwB*kOBX
z=Y%K*LC4tZ(<b)MvT;r@lizSRZ}+xbMJ0WE&huxKXNWGylrr&co+31-SYOlW{-pJ*
zxI#k}&wsx7d)8j2^;zlP-<?%nk@fw>_5)jN@6BG^YkMR~E^(UTN`XUfa&uN!wrqd5
fwYaU}MW#I$|IVdyf-5wDF~Z>K>gTe~DWM4f>{`qQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8280138ae7516e8099c3829e2ec1c711cff76f7e
GIT binary patch
literal 451
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC?dAaSW-L^Y)fu-ys75)(hvg
zc=MDVa$j&=xr0HJeTH;_C*OupJ%_h#M!eH9-Y9u2R20gX`@lir=H35RIg@?dw#}Ao
z=zxJ2@-s_)yF7Rw{QgzE`Sx3@>;8`SXH4!$&x`AO^?6b9zp5<?r;Sn~zeQQdFWcI7
z%_=MR^*4cuR=$^aZ@m1nMN^(xaOKu(7W2<DG^ltM*vMHY^ZA*`&wp;Y=lhKF&p+II
zTwvj2#;Fvfy|k(L+|Fw=qTe^zoKNg&4B|Rxsj+lJjNZok@7cL3E6(k__n%YkKooZ}
zPmf{w<JDKWuHAaRsM<JNSFHPJ{|~3+?NQr5Rqb8p{Ma?nC-1j;UGf<h1Q03Ht>s@;
zelX$8yhb%f=Y7V@>=jbB%xk={seDcQUq;2`FFbdq?c09)ZG!v4aHd(CDkG<9oEFNQ
zweM+6+r8COn!d}0hAv#S>fk)tT9#c^Y%WXczQ=y>d1>vo-a28;yvA*pz6&f8Hb^_~
o5Gb-4$XQ*L8-4A5=f64JkAQ|w-~MGAFmf0?UHx3vIVCg!09YB%!2kdN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/meta.json b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/meta.json
new file mode 100644
index 0000000000..a01a9c6cb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Belt/militarywebbingert.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/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d0f8d2ea258218ca2d5a2ed4c9e9d0ad7b48644
GIT binary patch
literal 811
zcmV+`1JwM9P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%<w-<ARCt{2+ObO;VHn5pZ?u7c5{xN<78Q!Y5D;wDfau_+pmYs_ICdzG9Xp7F
zgMWZ@D7X|Mdx>CitwfAMKq!&R;29zuy*mgB2Su+#`ld0B^<qy7?ekfZJb8J4Z{B;!
z@;)Gh5JCtcgb+dqA%qY@2=Si?cpaEnTyfR=xP5?aS?uL<fys#pH`3dS7D?5|7PnSC
z&-=IYA9)QAg=2)GPXW*XN*Mr5+r}K6rRUjm035SIVsXXwa}yGaEAG(b492;EV^+{e
z{gSWN7kd%|@SNY_brF51Svq&ue><jgcb&e|tk)^q=9rZ~`o0y<8=yr}T)tSsF)M_^
zF&JN{eKEd3C>+BvD_p)<x^Wc!bh7uU{=QXyt8rd<+JNHLY9MYO;8cyD#eC-GE8tWO
z;`V{>{{hYU$47@~+8F?vcE<71;l1-cZ9qDmcDuT}X<UTXGj-!tg?Dv#lTN4ITPM4R
z=KSH&G2-!l0OIj}hDXQlo$u`gM5iePlh~F8`3z3g;A(#}0C2Ux8E~ow<TKcoMIo4^
z7@fY?54}wxn53-hwR~!ut)6mmYc-%Aifvhxb)7;m>1)0aLI@#*5JCtcgb+dqA;dqS
ztvkH=xjFZ)dw9RE#=Xql+&hrn-uAaY03eY_xLPE|(Bw>GxxS#68=qZ(kIPdJ^5dbl
z;mtX!cR)GWgG8d_7K=qs>+rk*iuvIUk=|Z9=HH?g5DLdI&J7+Py?^i%aGhP_>*y;+
zUT?UKx7F9#wc6d`;A~rSw$&ojcn{wguIj4xkQ>k{ud$};zITYI`*;-)w+~wO1~k@u
zm(S3uPocTixYoP0^`z9XQ}^%yWnIS{oMq(Om-@J}uCtfR`FaW_Cnns!fr0wxLNH0R
zw1cW$UR<C>QiQ@W3h$Qv{}Y5CM=qbijzsEVPS7A)+Mx{fW+f+RKrYwL)ORumXSoc=
paH_SuDEiHswF9LLj%uCp=sV%6jC`1>eChxI002ovPDHLkV1g2Wj5z=R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4006135e380c6d919ec88f58f843c89e6681237
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%L`g(JRCt{2+R<v-P#gyE&oPUv60j+O?qW9;hfoN#3c;J+wCfuLVUN*^UJjq5
zmqqXuwg(VFD+q;QNpGwu97qB}ODL4=Ld<HHxRWz+uzkOq<Z#0IpZtxv$p;V-5fKp)
z5fKp)5fS|-GO`zb{QM<coEQBre9uF>)5+8<D=h5nz$sLtYlqE-^tyk${#)7NrP`-x
zeA@<a*8%{zz7Kc*3@_&agzId=qQ0041nvY5s=w6FX$Erodl-90s`_taH{o8LLrew4
zRK(6N=G?1u*(Fm8+{qu!$B}Np^T`DQcY?s3Ag394DxCrVo=T_4X+|{nd~%U`6Ebew
z-=g!JW&oA?d{C*+$1&H*kZQoN*~sknFA>as{`w>FxO4=7U?#BJzg+t}VAyPAiheh$
zf78E)<J<!P9OoW4{p+ZH(eI|JFVz6sw!`gw9xpfX!FacHTom8V=V9A+n7EjN*Yyt$
zkCy5m93CmxmwN*AV+^uo_?`#!S_ozWTbd34*wXZQQ+h4<o`*rUjG=z4a-WF?*)qnX
z(Y!u@+4%d?{9^2T9>${)2HEmj>k|<X5fKp)5fKp)5&aXCzTs^u6R=8BULfr{Qu%<_
zHjxQfWmR4wE$PqWaW;_&Nb<Y9f-I#5Y$_A5N>W}SEu{v;WdhJsdjysAT1d((q@~n=
zxJ-a)ny6XUT5|z$YL*q6rirAyLRv~M!KF+<p#Y~)o&P1W0_b#<HX_U2Kf{A&Aeag0
k-dEtRg`iT8@(OAF0D}QVAh%@K82|tP07*qoM6N<$g8lL<J^%m!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..b058f6004dc4fc78c79ecff19c73d16fa18b9646
GIT binary patch
literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%2uVaiR9J=Wl)-C~VHm)FW(V~XNrx`lbm4^WP@`1?#fUB~B9Kl&FzB%UfQ}tH
z$YB4%I(F+6o+1!CD@4uhFapC-x_!*PP`^Zd4H<6-=SQ}wIlArpo!;;FzVGuqJm13$
z78Vv3XC2$57gSZ1PNx%>!vR3M(?QcTd_Et4`u?5}f<mD%G|%~oOI~_RFn-VctmZPH
zy*%c><T6C+A1UtcPMl&WiH)r6c9FI23)$@=W66}XM_1)ZKCzLN>Pk|oswzjtoTvle
zclNoxo&vxh$Wkw60QjL-2E0Ge>%hM-(G1w5s}f*oIWgcry?+b9)f+dD-RU%R3a{7x
z&kRJ2>`_99M1li8GCxl`zsZ9qPfcIm*~Y&0W@OB<9f-$b=0BVbh1f5bsn+XEdA;VD
zYm19iYc*QUCh6)$vlEV~OBi3bPv3!fEGB0|A*Osj0IIbb-lO&39zb!sxle_3e$y;s
zTnEmL+C04b9C7CvThq(rYzt$3pQ!CKorc~!d;QVr3xM8)3%x?8p_3}Phx%5tNvqie
zdJj;a`n$D}@kh>px{{Ot#p0gn7JlUsR~~Yb2M|J-u6W@V0EZu54b3yMfN(f08;u5j
zzn`Cm!R5I*zLiQiT`mm6Kv5K0trm)+AcVl<@gUl5rUL=?G>zcQ4BEi~x~@<B<Xc!+
cSezYx1EpE)T(;5A8~^|S07*qoM6N<$g1d7Pvj6}9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0bfcc67a0a93940d8b07363414e317c0d05ba6b
GIT binary patch
literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%2T4RhR9J=Wl+SAuK@@<$v>uXd2qqzEu}vyzFb6GGEi}Y~7u!mqcoGD`gZ=>?
zq<F0TBlPG+Jc%HP5aPK3sZDz*Ldq6R(xq`_H)}{T@zAb^G)sS&4Jo~KzthY&Gw(ef
zj{ye<2Z!^HtKSF7WYY9_Jb2x10Gh29ilPt<2083IXF>=Hg+kXn7y2%F>LJnethLp0
zSx{b|@LRboiRvoy_O@-fz6w})wPI>-pR-?GrK;=f&n+U$W#(Ug<hZ|*o@FZsaE1l^
z+T3AaZV?R#M~2zTWdZoDR^X5atg~M9H3NgwPfUQRnS~?%+m}xOT)TPe#G6)4rSNX~
zY-S)~tQ;hSL?U{`C&tIg<ky&g{M7QL%?$?E-`mFQ*@1K_Wp>u1u^2n05?ZxNC=jsj
zT%Vjo({&p4IvH))>V!LV3FF7c={t~4rOeS-j8HHLfTrsN4%Wv#faLRWj|!RmnpH%v
z4h+~G?%jQXxbuwlp&4?niJrd0wCg*qn%cg5<H6|*fcAt7wL+_=@}cPK>KpYsjd~qu
ze?T3opO<ap+s;7p(UJ)u%Vo<={LLe--sgWFKnP(u`QmK=_P)O9n#Z<)csy>_YBj>)
zFn<h#%VT5wEEe&2y%>gpBuO+H4J1iI2!Y@4M>LxZMIw|Hh3Lo#%I+?zs`mZmJ2*Hv
boFD!HHPPcG9MvSo00000NkvXXu0mjfdOZ_a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b35b6a700caf92de07fb47a9a4656b4accb3972
GIT binary patch
literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zEj(QuLn`LH
zy=Cux*g@vl$KzS8*Z8Kf9CW#VIFhA#_vFpV$A74mh?cx~@IXaxALH`0qK~{QDp{KZ
zT7tZ{^E4hiXdk_BYq`^h-#7U_-D$mFaN1S~Xaxhq0sGBQvXYa1G(97yY4SLG21&5I
zQa|aFt~YD`)vmK=_emz7GT<<IbEM16+~no_m1Px+4&HX~5_<l#(n9h;S<Tm<n<q`W
zE&W#R$ffJQ^gn&xVAt?hLra=}y43QOd&;7ZTf43Azb;jl)Ehr<?(^rNn|I#4_cHcn
zY4xNfUl$iw-ko>PU3u-+sHlDW3+DajT`k`A{`b?Yy?UNmCbPA=oGRyKYjf1?tMt0O
z66hXwuzNwovej>lC$Ih2F!_1m^_*|)T9yp6|2CfDJy2GEAj|%MsrcVUuh^z9AoV)G
Y7}V7^9GsW`G8d%L)78&qol`;+0B>@rF8}}l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d54a3b6f3d7470dd66e848b1a7dc05d0f8b99775
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$MM*?KRCt{2+P_M}P!z}UpV11f9V{(^iM~TDg2mm**|B4M30(ypIyg9qi!b2R
zOfJ5FnkNv1B9vOXbtp6r{)?JW(;Dg3?`ON@T=?Y-cR5D_000000QhHSl0LYu8%k2E
z)so{lk|f8r)%5+uJJaO5`R9@@JGQM()l+SGNyFxWtnEFuAKH@dXC8i1Y4XQ5VAVT$
zE|%n<pJ{!|lU~jyNR$6d12${5Fn@KdUJ$5UDrtAk)&2FUI#o}-yW4D&|A4glt>|H6
z{~|2c8<M2OokNxD4Lx?dS|}DZdwKLbe=vb@@_%>`DwRq&pUX*-@`Zv1gMs?}zE*7e
zt>z{OruGpuJwE^d0000000028H1?Rt^!<TXvE%VkOy3`f8mj@O?+-+!Zh-0g1D{!=
pOWv8jKM*I?gT?$E007_*c><W(u)zb)i7fyC002ovPDHLkV1hj1ux0=N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json
new file mode 100644
index 0000000000..6e4a57f3c0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json
@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies. ERT recolor by davyei for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7d694fb929c552749c4ddcbf925c57b321e80b4
GIT binary patch
literal 798
zcmV+(1L6FMP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%*hxe|RCt{2+RsbdU>FDRZ^t5KmOzaJHij3Ar636YfMNwtPH^m61n-66A0hoC
zWCzbe4x)##g1xU4T8o9kNJ%fTR0t%2q9eFNb|`Or<J$SgMF!jRxwP;5hWGm>sa~E3
zAcPP?2qA<JLI@#*5JCv~Pb5Sy%<did?0d#-z;ztd>h;8WKJTYzW?-b(f@}5Tvhcot
zJO8C<_`>?TVBD<%=xG1|+jU{jZ-ZY4;K%t8SiW^_!LtW2u=Y!SQdW^v-avh=M#_I7
zdWh3f0oJtz>)IN-&el##1<@@d^X$PNt&b!805-~J@azFRdw`^@;%;FJ0C2akg`}(o
zYa8XW$cGTotyP2XNm&I}cSnQO-O+f=bs~fwfPP#~%(jl;4e#H+X?+iU0)RKPFxxtc
z{eOUdTux-%Mv&iWUBED|004$@g-+`t$j`WqNcln!pja&W)2S5rL(HkKLZ2*rI+a4P
zSo9}u_5=^}7nfH;`HRadPtF(n1t^<nOF6iX12i>wLkm-~0sxqjmC-|KYH%F~Z7By`
z*?h`<PSloi=$qy!AHcBxEws+YuH&F@nrKV8Sn~-Xgb+dqA%qY@2qA<JLjDPnYIyH=
zc6`1L&tvtt?A}4FrEwm=H{UP7%eW1EsZ@mX#Tz8DSs$yr2=@t8ANB>{^M2u3Zl3vY
z_%(Fn56{r8Re`1kUDxC74`5D8l~4~rw^oJOxeR&(CcT+BWcLny)~8^0E<>g8(^3H^
zrAp*IBelrzb$Gs1&gR+NbN&g8%j4(ReC!<}tRBw-GHwHCYQLR}T~iB{=qJtbXMIeh
zH?{Qf(C6#$0MIv0*z?<1`f*>f?wclR^?Izog7tjfe>*o9jN4KUO79$O?)K&eMtTiN
zSw;KPe!NXmOwb3AP6uJ0WI^ejqYnhlN}gl^^?H=8A7#&P<5pJT4M%wj%<!CZ4)ip5
ctaV1vPoNluln@POTL1t607*qoM6N<$f~SpmHUIzs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ae542d0863998c85b7ef594af8f72098c959073
GIT binary patch
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lkvmHRK@^3*JVc2JDYOu=*dmHW1W^!6jfG8+5F;41N!C1sBrdxNBDR8!MZiL|
z@m2T_v=wX>1VIr*?CgCt64pD}K!U_sX79(DIhVU<!5uB=Maw${#ZuXf&qlPx<dW9;
zh7T_Rf_PH8WlYCnQT|=u54cplA5p#jzt?tkuVySATwTHwx?z@uWg4OzWkd0<aIc<E
ztqLCthfNt!_(thzhhG)v9R5^nCgL;TRz0;`3#VIH&znWzVc}4*P|+Lns4wwnN(=K+
z`(+Pc5oeYN8fhx5QJ~C-)RJV@-ZxtJ&9N>XUET(pnBvHh7jIb9ige9L&5E9pr@*Gl
z{coODc6`j~?vFsni*0`lLgyaTs<!=eV%xP-@I1p+sp(&roF>0SuQs*N5d^p4;<~A&
z_u+B}`ksuGnW{@3+3su>-p?VBgq}O_Ejw8?&N+L8#FqS`TR1p`A-Nx1`303BXV~BZ
zvpE0&0z*keK~#90?b^X>+E5$^@ULSQStVdo0_|a!ibE&_T7_T>J+=K0g0Or4jp5(X
zv*4*cZ-0OYT0tlbOM0=Q@E{2Y8=;r%AZE2o+{>Fd*uI}j@_6C>UVg@0@&$;9h=_=Y
zh=_=Yh=~3Z8QBXzeEbwH&WnB*zUQIc>11k_6&7}O;1sISwZmpZdfmTW|E+BCQtcud
zKePcnwg3RG@54Q~#LIaA;X0eJs4u1hfjfbN>M!+knt`0Y4`a_rRsW6bCT^}yAf^Ih
zDq`msb2nEfvP-5GxRXDck0afH)5a|VcY?s3Ag394E}a7ao=fM*X+|`6+PF=<2^kOV
zFVT5UGk{8cKB&~^<CyDYNHt*CY-D!(*9c}mfBlj8zH|hDU?#BJzh3)0VAyPAiheh$
zf8W1@<2(TX9Onu5{ky1s(eI|JFVz6sw!`gw9xpfX-gvikTom8V=V9A+n7EjN*YyvN
zj+g2m9vv&!mwN*AGYqn2_?`#!S_ozWTbd34*wXZQQ+h4<o`*rUjG=y}a-WF?*)qnX
z(Y!u@+4$?y{9^2T9>${)2HEmj>k|<X5fKp)5fKp)5&aXCzTs^u6R=8BULfr{Qu%<_
zHjxQfWmR4wE$PqWaW;_&Nb<Y9f-I#5Y$_A5N>W}SEu{v;WdhJsdjysAT1d((q@~n=
zxJ-a)ny6XUT5|z$YL*q6rirAyLRv~M!KF+<p#Y~)o&P1W0_b#<HX_SCxWqTjKrj=~
kz0bg73qhqG<rUKU0n=kaAW*NE-T(jq07*qoM6N<$f`ozFCjbBd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5d0ba43f9faefdef25a29203bba2e9860e2a5fc
GIT binary patch
literal 379
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zO+8&4Ln`LH
zy|vftaDc?IkNf3CqpTx@TGZlPL=G;v*RVrW#`@Okg2KxSn^!-2#CqeTj~?H;taT0o
zPKp_t7AYqLmX~Rpe3Mc9@#mS%d(QU-(>^zJK)?z6%_-Rh0xYZ!lT?1}<8OFhY2$J+
zCS7mV{OhYuCJI;jeLQRE{(N`KTi<up>?P~wd$w!3O#E6S875}%H&S8O?xzJ7443Rr
zPfx62{GAwaW&S#e<A#2#UGuFUJbv1Ces1uw_xaa8r|Qm@*;a0*F(*&Hp?5O(oV@w#
zFLr!Qn>_Wn_v@ec4XPIISQowKY8Jy4Y2HsZ>Zgsi+2sE^n=NzRrugC>s5`;biJYmm
zX+~G&H+-_mn|<=1gQ|GKCi{S$tTW#6OT1;jk+#@AV5N7!Uq(S7Xs%;u-M2$6AmmFq
QFf<uFUHx3vIVCg!0DJGJNdN!<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c1b0024bf28e46f1a7dee5d54689e3992979aaa
GIT binary patch
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zJv?0;Ln`LH
zy|vNnaDd3MkNdB3t(Dc`Z0h6}bltE*Um>q4+5NYOUY=D+L1;`3gZ0dlM-PUc73Of#
zV2S49lQlYWGRk!6vfL#X-*1mC(yOsN9D9yY5CSIFr=?wBKVGQBaR2+pTxo{en|74l
zZ7g4Q(*N`Mqp^I>i^9upT1GA3wC6}@Zuj2J)=g;)>t<K|C{#Tuf4d>h@IhSMhPyco
zj;{`?t9t&+=e@BeWYM9wnzH8)YfN9c*2?Do{Lh=p9G<^4y!v4B1e5x8|2Gug=;+Ck
zZ8-WjxhHFG*zU7VE04T6d-DCCgA#5h|G#uJ@HL)w{yC$DNOw!3$M)N)M>kcO^3OBh
z+MjUkb9V;<c+7H>6HcwIe-QhoqGraL_xxX^S29N4mwz#R2Z;KiWxnT$^R@5nk5sBQ
inAD2{J^R!79)mIe4z*Xgf3E-on8DN4&t;ucLK6TSlCc5+

literal 0
HcmV?d00001


From 38dce9b12c1cbe16539c55b050a5951d3a25c701 Mon Sep 17 00:00:00 2001
From: Meara <68548661+Meara1179@users.noreply.github.com>
Date: Mon, 15 Dec 2025 13:46:39 +1000
Subject: [PATCH 106/360] Adds crowbar to Mediborg Rescue Module (#41861)

Added crowbar to Borg Rescue module.
---
 .../Entities/Objects/Specific/Robotics/borg_modules.yml        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index fe7168cb9a..271a459c40 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseBorgModule
   parent: BaseItem
   name: borg module
@@ -941,6 +941,7 @@
     - item: HandheldHealthAnalyzerUnpowered
     - item: DefibrillatorOneHandedUnpowered
     - item: HandheldCrewMonitorUnpowered # DeltaV
+    - item: Crowbar
     - item: BorgFireExtinguisher
     - item: BorgHandheldGPSBasic
     - item: HandLabeler

From 2f4a8e68124066e44197b6414558b89d5225e415 Mon Sep 17 00:00:00 2001
From: Nox <nebulousnox38@gmail.com>
Date: Sun, 14 Dec 2025 19:47:28 -0800
Subject: [PATCH 107/360] ERT Overhaul 2/3: Equipment (#38105)

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
---
 .../en-US/preferences/loadout-groups.ftl      |  1 +
 .../Locale/en-US/reagents/meta/medicine.ftl   |  3 +
 .../Catalog/Fills/Boxes/emergency.yml         | 40 ++++++++
 .../Objects/Specific/Janitorial/spray.yml     | 21 ++++-
 .../Objects/Specific/chemical-containers.yml  | 91 +++++++++++++++++++
 .../Entities/Objects/Specific/chemistry.yml   | 90 ++++++++++++++++++
 .../Weapons/Guns/Launchers/launchers.yml      |  8 ++
 .../Loadouts/Miscellaneous/survival.yml       | 23 +++++
 .../Prototypes/Loadouts/loadout_groups.yml    |  9 ++
 .../Prototypes/Loadouts/role_loadouts.yml     |  5 +
 10 files changed, 289 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index fa080b0225..0a005a09ca 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -13,6 +13,7 @@ loadout-group-survival-clown = Clown Survival Box
 loadout-group-survival-medical = Medical Survival Box
 loadout-group-survival-security = Security Survival Box
 loadout-group-survival-syndicate = Github is forcing me to write text that is literally twice-impossible for the player to ever see, send help
+loadout-group-survival-military = See line 14, no one will ever see this so :3
 loadout-group-breath-tool = Species-dependent breath tools
 loadout-group-tank-harness = Species-specific survival equipment
 loadout-group-EVA-tank = Species-specific gas tank
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index b6240170da..d088cab41f 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -26,6 +26,7 @@ reagent-name-dexalin = dexalin
 reagent-desc-dexalin = Used for treating minor oxygen deprivation and bloodloss. A required reagent for dexalin plus.
 
 reagent-name-dexalin-plus = dexalin plus
+reagent-name-dexalin-plus-saline = dexalin plus & saline
 reagent-desc-dexalin-plus = Used in treatment of extreme cases of oxygen deprivation and bloodloss. Flushes heartbreaker toxin out of the blood stream.
 
 reagent-name-epinephrine = epinephrine
@@ -113,6 +114,7 @@ reagent-name-lacerinol = lacerinol
 reagent-desc-lacerinol = A fairly unreactive chemical that boosts collagen sythesis to incredible levels, healing slash trauma.
 
 reagent-name-puncturase = puncturase
+reagent-name-puncturase-tranexamic = puncturase & tranexamic
 reagent-desc-puncturase = A fizzy chemical that helps rebuild trauma caused by piercing damage, leaving a slight amount of tissue damage behind.
 
 reagent-name-bruizine = bruizine
@@ -122,6 +124,7 @@ reagent-name-holywater = holy water
 reagent-desc-holywater = The cleanest and purest of waters straight from the hands of god, is known to magically heal wounds.
 
 reagent-name-pyrazine = pyrazine
+reagent-name-pyrazine-dermaline = pyrazine & dermaline
 reagent-desc-pyrazine = Efficiently heals burns from the hottest of fires. Causes massive internal bleeding when overdosed.
 
 reagent-name-insuzine = insuzine
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 8e48734e89..555d4100df 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -327,3 +327,43 @@
     - state: nitrogentank
   - type: Label
     currentLabel: reagent-name-nitrogen
+
+
+- type: entity
+  parent: BoxCardboard
+  id: BoxSurvivalMilitaryDouble
+  suffix: Military O2
+  description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: DoubleEmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  - type: Sprite
+    layers:
+    - state: internals
+    - state: extendedtank
+
+- type: entity
+  parent: BoxSurvivalMilitaryDouble
+  id: BoxSurvivalMilitaryDoubleNitrogen
+  suffix: Military N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: DoubleEmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  - type: Sprite
+    layers:
+    - state: internals
+    - state: nitrogentank
+  - type: Label
+    currentLabel: reagent-name-nitrogen
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index 64641b8ba3..e83d4fece0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -88,11 +88,10 @@
           Quantity: 100
 
 - type: entity
-  name: space cleaner
   description: BLAM!-brand non-foaming space cleaner!
   id: SprayBottleSpaceCleaner
   parent: SprayBottle
-  suffix: ""
+  suffix: Space Cleaner
   components:
   - type: SolutionContainerManager
     solutions:
@@ -101,10 +100,28 @@
         reagents:
         - ReagentId: SpaceCleaner
           Quantity: 100
+  - type: Label
+    currentLabel: space cleaner
   - type: Tag
     tags:
       - Spray
 
+- type: entity
+  parent: MegaSprayBottle
+  id: MegaSprayBottleSpaceCleaner
+  description: BLAM!-brand non-foaming space cleaner, now in a bigger package for those huge blood puddles!
+  suffix: Space Cleaner
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 250
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 250
+  - type: Label
+    currentLabel: space cleaner
+
 - type: entity
   parent: SprayBottle
   id: BorgSprayBottle
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index edb36cf7e0..ab79e465b3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -88,6 +88,97 @@
       - ChemDispensable
     - type: DnaSubstanceTrace
 
+- type: entity
+  parent: Jug
+  id: JugPunctTranex
+  categories: [ HideSpawnMenu ]
+  suffix: punct & tranex
+  components:
+  - type: Label
+    currentLabel: reagent-name-puncturase-tranexamic
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 160
+        - ReagentId: TranexamicAcid
+          Quantity: 40
+
+- type: entity
+  parent: Jug
+  id: JugPyraDerma
+  suffix: pyra & derma
+  components:
+  - type: Label
+    currentLabel: reagent-name-pyrazine-dermaline
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Pyrazine
+          Quantity: 50
+        - ReagentId: Dermaline
+          Quantity: 150
+
+- type: entity
+  parent: Jug
+  id: JugDexPlusSaline
+  suffix: dex+ & saline
+  components:
+  - type: Label
+    currentLabel: reagent-name-dexalin-plus-saline
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: DexalinPlus
+          Quantity: 100
+        - ReagentId: Saline
+          Quantity: 100
+
+- type: entity
+  parent: Jug
+  id: JugTrico
+  suffix: tricordrazine
+  components:
+  - type: Label
+    currentLabel: reagent-name-tricordrazine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Tricordrazine
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  id: JugBlood
+  suffix: blood
+  components:
+  - type: Label
+    currentLabel: reagent-name-blood
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Blood
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  id: JugWater
+  suffix: water
+  components:
+  - type: Label
+    currentLabel: reagent-name-water
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Water
+          Quantity: 200
+
 - type: entity
   parent: Jug
   suffix: carbon
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 218749f510..5bcd34883a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -198,6 +198,96 @@
         - ReagentId: Cryoxadone
           Quantity: 50
 
+- type: entity
+  parent: Beaker
+  id: BeakerSmallArith
+  suffix: arithrazine
+  components:
+  - type: Label
+    currentLabel: reagent-name-arithrazine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        reagents:
+        - ReagentId: Arithrazine
+          Quantity: 50
+
+- type: entity
+  parent: Beaker
+  id: BeakerSmallSigy
+  suffix: sigynate
+  components:
+  - type: Label
+    currentLabel: reagent-name-sigynate
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        reagents:
+        - ReagentId: Sigynate
+          Quantity: 50
+
+- type: entity
+  parent: Beaker
+  id: BeakerSmallPhal
+  suffix: phalanximine
+  components:
+  - type: Label
+    currentLabel: reagent-name-phalanximine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        reagents:
+        - ReagentId: Phalanximine
+          Quantity: 50
+
+- type: entity
+  parent: Beaker
+  id: BeakerSmallDiph
+  suffix: diphenhydramine
+  components:
+  - type: Label
+    currentLabel: reagent-name-diphenhydramine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        reagents:
+        - ReagentId: Diphenhydramine
+          Quantity: 50
+
+- type: entity
+  parent: Beaker
+  id: BeakerSmallBruiz
+  suffix: bruizine
+  components:
+  - type: Label
+    currentLabel: reagent-name-bruizine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        reagents:
+        - ReagentId: Bruizine
+          Quantity: 50
+
+- type: entity
+  parent: Beaker
+  id: BeakerSmallLace
+  suffix: lacerinol
+  components:
+  - type: Label
+    currentLabel: reagent-name-lacerinol
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 50
+        reagents:
+        - ReagentId: Lacerinol
+          Quantity: 50
+
 - type: entity
   name: large beaker
   parent: BaseBeaker
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 4008e5aaeb..faa3dd7781 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -103,6 +103,14 @@
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/sfrifle_magin.ogg
 
+- type: entity
+  parent: [WeaponLauncherHydra]
+  id: WeaponLauncherHydraLethal
+  suffix: frag
+  components:
+  - type: RevolverAmmoProvider
+    proto: GrenadeFrag
+
 - type: entity
   name: RPG-7
   parent: [ BaseWeaponLauncher, BaseMajorContraband ]
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
index 1b9be117da..9154a03e9e 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
@@ -210,6 +210,29 @@
     back:
     - BoxSurvivalSyndicateNitrogen
 
+# Military / Double Extended
+- type: loadout
+  id: EmergencyOxygenMilitaryDouble
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  equipment:
+    pocket1: DoubleEmergencyOxygenTankFilled
+  storage:
+    back:
+    - BoxSurvivalMilitaryDouble
+
+- type: loadout
+  id: EmergencyNitrogenMilitaryDouble
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  equipment:
+    pocket1: DoubleEmergencyNitrogenTankFilled
+  storage:
+    back:
+    - BoxSurvivalMilitaryDoubleNitrogen
+
 # Pre-equipped species gear
 
 # Full tank for vox as part of any Survival loadout
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index f016f14135..36044f9a06 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1986,6 +1986,15 @@
   - EmergencyIPCBox # DeltaV
   - EmergencyWaterVaporSyndicate # DeltaV
 
+- type: loadoutGroup
+  id: SurvivalMilitaryDouble
+  name: loadout-group-survival-military
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenMilitaryDouble
+  - EmergencyOxygenMilitaryDouble
+
 - type: loadoutGroup
   id: GroupSpeciesBreathTool
   name: loadout-group-breath-tool
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 23978bf814..8a633e86fb 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -663,6 +663,11 @@
   - GroupSpeciesBreathTool
   - GroupTankHarness
 
+- type: roleLoadout
+  id: RoleSurvivalMilitaryDouble
+  groups:
+  - SurvivalMilitaryDouble
+
 - type: roleLoadout
   id: RoleSurvivalNukie
   groups:

From b9cb30e71e90a6b81e88c6d7761be28e3a901a28 Mon Sep 17 00:00:00 2001
From: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Date: Mon, 15 Dec 2025 06:11:29 -0500
Subject: [PATCH 108/360] Prevent Initial Infected from rolling on evac
 (#41863)

evac ambuzol
---
 Resources/Prototypes/GameRules/events.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 033c91d497..ca771fc062 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -588,6 +588,7 @@
     minimumPlayers: 40
     weight: 1 # Zombies was happening basically every single survival round, so now it's super rare
     duration: 1
+    occursDuringRoundEnd: false
   - type: PrecognitionResult # DeltaV - Precogniton
     message: psionic-power-precognition-zombie-outbreak-result-message
   - type: ZombieRule

From afa3838d3858492f2a2099f2708144bd53013861 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Mon, 15 Dec 2025 09:15:22 -0300
Subject: [PATCH 109/360] Repairing borgs now takes multiple doafters (#41638)

* borg repair is now multiple doafters

* is a float now

* use else

* remove random new line i added for some reason

* add new line at the end of the file

* add documentation

* made repair system super robust

* borg heal faster from crit

* forgot to make it a datafield

* less overpower

* cant repair futher than the threshold for alive if not alive or dead

* fix math

* more math

* fixes

* some comentary

* more accurate

* simple solution

* new solution

* better numbers

* more accurate

* use helper function

* fine tunning the number

* better way to restart the doafter

* update AutoDoAfter

* not used

* more clear

* remove inline if

* improve helper methods

* updare pop up message

* another unused

* nuke consecutive repair bonus

* increase the repair (so it doesn't take ages to fix a borg)

* back to 10 per repair

* heal evenly

* fix for edge case

* fix

* fix

* it works now

* add / fix comments

* small clean up

* make easier to understand

* use FixedPoint2.Zero

* make it smaller

* add support for group even heal

* ops

* easier to read

* typo

* make the HealEvenly better

* rename to GetDamage

* negative value

* Update Content.Shared/Repairable/RepairableSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Repairable/RepairableComponent.cs         | 19 ++++-
 Content.Shared/Repairable/RepairableSystem.cs | 76 ++++++++++++++-----
 .../en-US/repairable/repairable-component.ftl |  2 +-
 .../Mobs/Cyborgs/base_borg_chassis.yml        | 14 ++--
 .../Entities/Mobs/Cyborgs/xenoborgs.yml       |  2 -
 5 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/Content.Shared/Repairable/RepairableComponent.cs b/Content.Shared/Repairable/RepairableComponent.cs
index bc1ccfb7bf..60eb57581a 100644
--- a/Content.Shared/Repairable/RepairableComponent.cs
+++ b/Content.Shared/Repairable/RepairableComponent.cs
@@ -17,15 +17,26 @@ public sealed partial class RepairableComponent : Component
     /// <remarks>
     ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
     ///     in order to heal/repair the damage values have to be negative.
+    ///     This will only be used if <see cref="DamageValue"/> is not null.
+    ///     If this is null and so is <see cref="DamageValue"/> then all damage will be repaired at once.
     /// </remarks>
     [DataField, AutoNetworkedField]
     public DamageSpecifier? Damage;
 
+    /// <summary>
+    /// Amount of damage to repair of the entity equaly distributed among the damage types the entity has.
+    /// </summary>
+    /// <remarks>
+    /// in order to heal/repair the damage values have to be negative.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public float? DamageValue;
+
     /// <summary>
     /// Cost of fuel used to repair this device.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public int FuelCost = 5;
+    public float FuelCost = 5f;
 
     /// <summary>
     /// Tool quality necessary to repair this device.
@@ -39,6 +50,12 @@ public sealed partial class RepairableComponent : Component
     [DataField, AutoNetworkedField]
     public int DoAfterDelay = 1;
 
+    /// <summary>
+    /// If true and after the repair there still damage, a new doafter starts automatically
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AutoDoAfter = true;
+
     /// <summary>
     /// A multiplier that will be applied to the above if an entity is repairing themselves.
     /// </summary>
diff --git a/Content.Shared/Repairable/RepairableSystem.cs b/Content.Shared/Repairable/RepairableSystem.cs
index 7526faeb51..8fbdf90ee6 100644
--- a/Content.Shared/Repairable/RepairableSystem.cs
+++ b/Content.Shared/Repairable/RepairableSystem.cs
@@ -20,10 +20,10 @@ public sealed partial class RepairableSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<RepairableComponent, InteractUsingEvent>(Repair);
-        SubscribeLocalEvent<RepairableComponent, RepairFinishedEvent>(OnRepairFinished);
+        SubscribeLocalEvent<RepairableComponent, RepairDoAfterEvent>(OnRepairDoAfter);
     }
 
-    private void OnRepairFinished(Entity<RepairableComponent> ent,  ref RepairFinishedEvent args)
+    private void OnRepairDoAfter(Entity<RepairableComponent> ent, ref RepairDoAfterEvent args)
     {
         if (args.Cancelled)
             return;
@@ -31,24 +31,62 @@ public sealed partial class RepairableSystem : EntitySystem
         if (!TryComp(ent.Owner, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
             return;
 
-        if (ent.Comp.Damage != null)
-        {
-            var damageChanged = _damageableSystem.ChangeDamage(ent.Owner, ent.Comp.Damage, true, false, origin: args.User);
-            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged.GetTotal()}");
-        }
-
+        if (ent.Comp.DamageValue != null)
+            RepairSomeDamage((ent, damageable), ent.Comp.DamageValue.Value, args.User);
+        else if (ent.Comp.Damage != null)
+            RepairSomeDamage((ent, damageable), ent.Comp.Damage, args.User);
         else
+            RepairAllDamage((ent, damageable), args.User);
+
+        args.Repeat = ent.Comp.AutoDoAfter && damageable.TotalDamage > 0;
+        args.Args.Event.Repeat = args.Repeat;
+        args.Handled = true;
+
+        if (!args.Repeat)
         {
-            // Repair all damage
-            _damageableSystem.SetAllDamage((ent.Owner, damageable), 0);
-            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} back to full health");
+            var str = Loc.GetString("comp-repairable-repair", ("target", ent.Owner), ("tool", args.Used!));
+            _popup.PopupClient(str, ent.Owner, args.User);
+
+            var ev = new RepairedEvent(ent, args.User);
+            RaiseLocalEvent(ent.Owner, ref ev);
         }
+    }
 
-        var str = Loc.GetString("comp-repairable-repair", ("target", ent.Owner), ("tool", args.Used!));
-        _popup.PopupClient(str, ent.Owner, args.User);
+    /// <summary>
+    /// Repairs some damage of a entity.
+    /// The healed amount will be evenly distributed among all damage types the entity has.
+    /// If one of the damage types of the entity is too low. it will heal that completly and distribute the excess healing among the other damage types
+    /// </summary>
+    /// <param name="ent">entity to be repaired</param>
+    /// <param name="damageAmount">how much damage to repair (value have to be negative to repair)</param>
+    /// <param name="user">who is doing the repair</param>
+    private void RepairSomeDamage(Entity<DamageableComponent?> ent, float damageAmount, EntityUid user)
+    {
+        var damageChanged = _damageableSystem.HealEvenly(ent.Owner, damageAmount, origin: user);
+        _adminLogger.Add(LogType.Healed, $"{ToPrettyString(user):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged.GetTotal()}");
+    }
 
-        var ev = new RepairedEvent(ent, args.User);
-        RaiseLocalEvent(ent.Owner, ref ev);
+    /// <summary>
+    /// Repairs some damage of a entity
+    /// </summary>
+    /// <param name="ent">entity to be repaired</param>
+    /// <param name="damageAmount">how much damage to repair (values have to be negative to repair)</param>
+    /// <param name="user">who is doing the repair</param>
+    private void RepairSomeDamage(Entity<DamageableComponent?> ent, Damage.DamageSpecifier damageAmount, EntityUid user)
+    {
+        var damageChanged = _damageableSystem.ChangeDamage(ent.Owner, damageAmount, true, false, origin: user);
+        _adminLogger.Add(LogType.Healed, $"{ToPrettyString(user):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged.GetTotal()}");
+    }
+
+    /// <summary>
+    /// Repairs all damage of a entity
+    /// </summary>
+    /// <param name="ent">entity to be repaired</param>
+    /// <param name="user">who is doing the repair</param>
+    private void RepairAllDamage(Entity<DamageableComponent?> ent, EntityUid user)
+    {
+        _damageableSystem.ClearAllDamage(ent);
+        _adminLogger.Add(LogType.Healed, $"{ToPrettyString(user):user} repaired {ToPrettyString(ent.Owner):target} back to full health");
     }
 
     private void Repair(Entity<RepairableComponent> ent, ref InteractUsingEvent args)
@@ -72,7 +110,7 @@ public sealed partial class RepairableSystem : EntitySystem
         }
 
         // Run the repairing doafter
-        args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, ent.Comp.QualityNeeded, new RepairFinishedEvent(), ent.Comp.FuelCost);
+        args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, ent.Comp.QualityNeeded, new RepairDoAfterEvent(), ent.Comp.FuelCost);
     }
 }
 
@@ -84,5 +122,9 @@ public sealed partial class RepairableSystem : EntitySystem
 [ByRefEvent]
 public readonly record struct RepairedEvent(Entity<RepairableComponent> Ent, EntityUid User);
 
+/// <summary>
+/// Do after event started when you try to fix a entity with RepairableComponent.
+/// This doafter is repeated if the entity has <see cref="AutoDoAfter"> set to true and not all damage was fixed yet.
+/// </summary>
 [Serializable, NetSerializable]
-public sealed partial class RepairFinishedEvent : SimpleDoAfterEvent;
+public sealed partial class RepairDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Resources/Locale/en-US/repairable/repairable-component.ftl b/Resources/Locale/en-US/repairable/repairable-component.ftl
index 039e4a1016..8e2e0e2ee1 100644
--- a/Resources/Locale/en-US/repairable/repairable-component.ftl
+++ b/Resources/Locale/en-US/repairable/repairable-component.ftl
@@ -1,7 +1,7 @@
 ### Interaction Messages
 
 # Shown when repairing something
-comp-repairable-repair = You repair {PROPER($target) ->
+comp-repairable-repair = You finish repairing {PROPER($target) ->
   [true] {""}
   *[false] the{" "}
 }{$target} with {PROPER($tool) ->
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index d491d45637..9980abc282 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -105,13 +105,11 @@
     - Common
     - Science
   - type: ZombieImmune
-  # Begin DeltaV Changes - use IPC healing instead of 1 weld to heal everything
-  #- type: Repairable
-  #  doAfterDelay: 10
-  #  allowSelfRepair: false
-  - type: WeldingHealable
-    allowSelfHeal: true # DeltaV - was false
-  # End DeltaV Changes
+  - type: Repairable
+    damageValue: -10 # 10 seconds to repair from crit
+    doAfterDelay: 1
+    fuelCost: 0.5
+    allowSelfRepair: true # DeltaV - was false
   - type: BorgChassis
   - type: SurgerySelfDirty # DeltaV: borgs get dirty from doing surgery
   - type: Fiber # DeltaV - borgs leave metal fibers
@@ -498,8 +496,6 @@
     - Mothership
     - Xenoborg
     - Binary
-  - type: Repairable
-    doAfterDelay: 13 # 25% more HP, so 30% more time to heal
   - type: BorgChassis
     maxModules: 0
     hasMindState: robot_e
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
index f33108a88d..6ca733249e 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -132,8 +132,6 @@
         - cell_slot
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Repairable
-    doAfterDelay: 25 # more HP, more time to heal
   - type: ContainerFill
     containers:
       borg_brain:

From 961ab1129372bf8c2a5dc9c22669cbac4c0ce373 Mon Sep 17 00:00:00 2001
From: psykana <36602558+psykana@users.noreply.github.com>
Date: Mon, 15 Dec 2025 23:18:10 +0000
Subject: [PATCH 110/360] Add tile atmosphere tests (#41228)

* Tile atmosphere tests

* master markers

* TryLoadMap

* whoopsie

* Dirty

* Add new abstract class, room spacing tests

* review
---
 .../Tests/Atmos/AtmosTest.cs                  | 102 ++++++
 .../Tests/Atmos/RoomSpacingTest.cs            | 127 ++++++++
 .../Tests/Atmos/TileAtmosphereTest.cs         | 159 ++++++++++
 .../tile_atmosphere_test_room.yml             | 231 ++++++++++++++
 .../tile_atmosphere_test_snake.yml            | 299 ++++++++++++++++++
 .../Atmospherics/tile_atmosphere_test_x.yml   | 219 +++++++++++++
 6 files changed, 1137 insertions(+)
 create mode 100644 Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
 create mode 100644 Content.IntegrationTests/Tests/Atmos/RoomSpacingTest.cs
 create mode 100644 Content.IntegrationTests/Tests/Atmos/TileAtmosphereTest.cs
 create mode 100644 Resources/Maps/Test/Atmospherics/tile_atmosphere_test_room.yml
 create mode 100644 Resources/Maps/Test/Atmospherics/tile_atmosphere_test_snake.yml
 create mode 100644 Resources/Maps/Test/Atmospherics/tile_atmosphere_test_x.yml

diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
new file mode 100644
index 0000000000..d50c4a200b
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
@@ -0,0 +1,102 @@
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Tests;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Maths;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+/// <summary>
+/// Helper class for atmospherics tests.
+/// See <see cref="TileAtmosphereTest"/> on how to add new tests with custom maps.
+/// </summary>
+[TestFixture]
+public abstract class AtmosTest : InteractionTest
+{
+    protected AtmosphereSystem SAtmos = default!;
+    protected EntityLookupSystem LookupSystem = default!;
+
+    protected Entity<GridAtmosphereComponent> RelevantAtmos = default!;
+
+    /// <summary>
+    /// Used in <see cref="AtmosphereSystem.RunProcessingFull"/>. Resolved during test setup.
+    /// </summary>
+    protected Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ProcessEnt = default;
+
+    protected virtual float Moles => 1000.0f;
+
+    // 5% is a lot, but it can get this bad ATM...
+    protected virtual float Tolerance => 0.05f;
+
+    [SetUp]
+    public override async Task Setup()
+    {
+        await base.Setup();
+
+        SAtmos = SEntMan.System<AtmosphereSystem>();
+        LookupSystem = SEntMan.System<EntityLookupSystem>();
+
+        RelevantAtmos = (MapData.Grid, SEntMan.GetComponent<GridAtmosphereComponent>(MapData.Grid));
+
+        ProcessEnt = new Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent>(
+            MapData.Grid.Owner,
+            SEntMan.GetComponent<GridAtmosphereComponent>(MapData.Grid.Owner),
+            SEntMan.GetComponent<GasTileOverlayComponent>(MapData.Grid.Owner),
+            SEntMan.GetComponent<MapGridComponent>(MapData.Grid.Owner),
+            SEntMan.GetComponent<TransformComponent>(MapData.Grid.Owner));
+    }
+
+    /// <summary>
+    /// Tries to get a mapped <see cref="TestMarkerComponent"/> marker with a given name.
+    /// </summary>
+    /// <param name="markers">Marker entities to look through</param>
+    /// <param name="id">Marker name to look up (set during mapping)</param>
+    /// <param name="marker">Found marker EntityUid or Invalid</param>
+    /// <returns>True if found</returns>
+    protected static bool GetMarker(Entity<TestMarkerComponent>[] markers, string id, out EntityUid marker)
+    {
+        foreach (var ent in markers)
+        {
+            if (ent.Comp.Id == id)
+            {
+                marker = ent;
+                return true;
+            }
+        }
+        marker = EntityUid.Invalid;
+        return false;
+    }
+
+    protected static float GetGridMoles(Entity<GridAtmosphereComponent> grid)
+    {
+        var moles = 0.0f;
+        foreach (var tile in grid.Comp.Tiles.Values)
+        {
+            moles += tile.Air?.TotalMoles ?? 0.0f;
+        }
+
+        return moles;
+    }
+
+    /// <summary>
+    /// Asserts that test grid has this many moles, within tolerance percentage.
+    /// </summary>
+    protected void AssertGridMoles(float moles, float tolerance)
+    {
+        var gridMoles = GetGridMoles(RelevantAtmos);
+        Assert.That(MathHelper.CloseToPercent(moles, gridMoles, tolerance), $"Grid has {gridMoles} moles, but {moles} was expected");
+    }
+
+    /// <summary>
+    /// Asserts that provided GasMixtures have same total moles, within tolerance percentage.
+    /// </summary>
+    protected void AssertMixMoles(GasMixture mix1, GasMixture mix2, float tolerance)
+    {
+        Assert.That(MathHelper.CloseToPercent(mix1.TotalMoles, mix2.TotalMoles, tolerance),
+            $"GasMixtures do not match. Got {mix1.TotalMoles} and {mix2.TotalMoles} moles");
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Atmos/RoomSpacingTest.cs b/Content.IntegrationTests/Tests/Atmos/RoomSpacingTest.cs
new file mode 100644
index 0000000000..4cdc0894ca
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/RoomSpacingTest.cs
@@ -0,0 +1,127 @@
+using Content.Shared.Atmos;
+using Content.Shared.Coordinates;
+using Content.Shared.Tests;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+public sealed class RoomSpacingTest : AtmosTest
+{
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/tile_atmosphere_test_room.yml");
+
+    /// <summary>
+    /// Checks that deleting an outer wall spaces the room.
+    /// </summary>
+    [Test]
+    public async Task DeleteWall()
+    {
+        var markers = SEntMan.AllEntities<TestMarkerComponent>();
+
+        EntityUid source, floor, wallPos;
+        source = floor = wallPos = EntityUid.Invalid;
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(GetMarker(markers, "source", out source));
+            Assert.That(GetMarker(markers, "floor", out floor));
+            Assert.That(GetMarker(markers, "wall", out wallPos));
+        });
+
+        var lookup = LookupSystem.GetEntitiesIntersecting(wallPos);
+        var wall = lookup.FirstOrNull();
+        Assert.That(wall, Is.Not.Null);
+
+        Assert.That(GetGridMoles(RelevantAtmos), Is.EqualTo(0));
+
+        var sourceMix = SAtmos.GetTileMixture(source, true);
+        Assert.That(sourceMix, Is.Not.EqualTo(null));
+        sourceMix.AdjustMoles(Gas.Frezon, Moles);
+
+        await Server.WaitRunTicks(500);
+
+        var mix1 = SAtmos.GetTileMixture(floor);
+        Assert.That(mix1, Is.Not.EqualTo(null));
+
+        AssertMixMoles(sourceMix, mix1, Tolerance);
+        AssertGridMoles(Moles, Tolerance);
+
+        // Space the room
+        await Server.WaitAssertion(() =>
+        {
+            SEntMan.DeleteEntity(wall);
+        });
+
+        await Server.WaitRunTicks(10);
+
+        await Server.WaitPost(() =>
+        {
+            for (var i = 0; i < 50; i++)
+            {
+                SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+            }
+        });
+
+        AssertMixMoles(sourceMix, mix1, Tolerance);
+        AssertGridMoles(0, Tolerance);
+    }
+
+    /// <summary>
+    /// Checks that exposing tile lattice spaces the room.
+    /// </summary>
+    [Test]
+    public async Task PryLattice()
+    {
+        var markers = SEntMan.AllEntities<TestMarkerComponent>();
+
+        EntityUid source, floor, wallPos;
+        source = floor = wallPos = EntityUid.Invalid;
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(GetMarker(markers, "source", out source));
+            Assert.That(GetMarker(markers, "floor", out floor));
+            Assert.That(GetMarker(markers, "wall", out wallPos));
+        });
+
+        var lookup = LookupSystem.GetEntitiesIntersecting(wallPos);
+        var wall = lookup.FirstOrNull();
+        Assert.That(wall, Is.Not.Null);
+
+        Assert.That(GetGridMoles(RelevantAtmos), Is.EqualTo(0));
+
+        var sourceMix = SAtmos.GetTileMixture(source, true);
+        Assert.That(sourceMix, Is.Not.EqualTo(null));
+        sourceMix.AdjustMoles(Gas.Frezon, Moles);
+
+        await Server.WaitPost(() =>
+        {
+            SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+        });
+
+        var mix1 = SAtmos.GetTileMixture(floor);
+        Assert.That(mix1, Is.Not.EqualTo(null));
+
+        AssertMixMoles(sourceMix, mix1, Tolerance);
+        AssertGridMoles(Moles, Tolerance);
+
+        // Space the room
+        await SetTile(Lattice, SEntMan.GetNetCoordinates(floor.ToCoordinates()), MapData.Grid);
+
+        await Server.WaitRunTicks(10);
+
+        await Server.WaitPost(() =>
+        {
+            for (var i = 0; i < 50; i++)
+            {
+                SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+            }
+        });
+
+        mix1 = SAtmos.GetTileMixture(floor);
+        Assert.That(mix1, Is.Not.EqualTo(null));
+
+        AssertMixMoles(sourceMix, mix1, Tolerance);
+        AssertGridMoles(0, Tolerance);
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Atmos/TileAtmosphereTest.cs b/Content.IntegrationTests/Tests/Atmos/TileAtmosphereTest.cs
new file mode 100644
index 0000000000..368bb63c1d
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/TileAtmosphereTest.cs
@@ -0,0 +1,159 @@
+using Content.Shared.Atmos;
+using Content.Shared.CCVar;
+using Content.Shared.Coordinates;
+using Content.Shared.Tests;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+[TestOf(typeof(Atmospherics))]
+public abstract class TileAtmosphereTest : AtmosTest
+{
+    /// <summary>
+    /// Spawns gas in an enclosed space and checks that pressure equalizes within reasonable time.
+    /// Checks that mole count stays the same.
+    /// </summary>
+    [Test]
+    public async Task GasSpreading()
+    {
+        var markers = SEntMan.AllEntities<TestMarkerComponent>();
+
+        EntityUid source, point1, point2;
+        source = point1 = point2 = EntityUid.Invalid;
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(GetMarker(markers, "source", out source));
+            Assert.That(GetMarker(markers, "point1", out point1));
+            Assert.That(GetMarker(markers, "point2", out point2));
+        });
+
+        Assert.That(GetGridMoles(RelevantAtmos), Is.EqualTo(0.0f));
+
+        var sourceMix = SAtmos.GetTileMixture(source, true);
+        Assert.That(sourceMix, Is.Not.EqualTo(null));
+        sourceMix.AdjustMoles(Gas.Frezon, Moles);
+
+        await Pair.Server.WaitPost(() =>
+        {
+            SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+        });
+
+        var mix1 = SAtmos.GetTileMixture(point1);
+        var mix2 = SAtmos.GetTileMixture(point2);
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(mix1, Is.Not.EqualTo(null));
+            Assert.That(mix2, Is.Not.EqualTo(null));
+        });
+
+        AssertMixMoles(mix1, mix2, Tolerance);
+        AssertGridMoles(Moles, Tolerance);
+    }
+
+    /// <summary>
+    /// Spawns a combustible mixture and sets it ablaze.
+    /// Checks that fire propages through the entire grid.
+    /// </summary>
+    [Test]
+    public async Task FireSpreading()
+    {
+        var markers = SEntMan.AllEntities<TestMarkerComponent>();
+
+        EntityUid source, point1, point2;
+        source = point1 = point2 = EntityUid.Invalid;
+
+        Vector2i sourceXY, point1XY, point2XY;
+        sourceXY = point1XY = point2XY = Vector2i.Zero;
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(GetMarker(markers, "source", out source));
+            Assert.That(GetMarker(markers, "point1", out point1));
+            Assert.That(GetMarker(markers, "point2", out point2));
+
+            Assert.That(Transform.TryGetGridTilePosition(source, out sourceXY, MapData.Grid));
+            Assert.That(Transform.TryGetGridTilePosition(source, out point1XY, MapData.Grid));
+            Assert.That(Transform.TryGetGridTilePosition(source, out point2XY, MapData.Grid));
+        });
+
+        Assert.That(GetGridMoles(RelevantAtmos), Is.EqualTo(0));
+
+        var sourceMix = SAtmos.GetTileMixture(source, true);
+        Assert.That(sourceMix, Is.Not.EqualTo(null));
+
+        sourceMix.AdjustMoles(Gas.Plasma, Moles / 10);
+        sourceMix.AdjustMoles(Gas.Oxygen, Moles - Moles / 10);
+        sourceMix.Temperature = Atmospherics.FireMinimumTemperatureToExist - 10;
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(SAtmos.IsHotspotActive(MapData.Grid, sourceXY), Is.False);
+            Assert.That(SAtmos.IsHotspotActive(MapData.Grid, point1XY), Is.False);
+            Assert.That(SAtmos.IsHotspotActive(MapData.Grid, point2XY), Is.False);
+        });
+
+        await Server.WaitAssertion(() =>
+        {
+            var welder = SEntMan.SpawnEntity("Welder", source.ToCoordinates());
+            Assert.That(ItemToggleSys.TryActivate(welder));
+        });
+
+        await Server.WaitRunTicks(500);
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(SAtmos.IsHotspotActive(MapData.Grid, sourceXY), Is.True);
+            Assert.That(SAtmos.IsHotspotActive(MapData.Grid, point1XY), Is.True);
+            Assert.That(SAtmos.IsHotspotActive(MapData.Grid, point2XY), Is.True);
+        });
+
+        var mix1 = SAtmos.GetTileMixture(point1);
+        var mix2 = SAtmos.GetTileMixture(point2);
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(mix1, Is.Not.EqualTo(null));
+            Assert.That(mix2, Is.Not.EqualTo(null));
+        });
+
+        AssertMixMoles(mix1, mix2, Tolerance);
+        AssertGridMoles(Moles, Tolerance);
+    }
+}
+
+// Declare separate fixtures to override the TestMap and configure CVars
+public sealed class TileAtmosphereTest_X : TileAtmosphereTest
+{
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/tile_atmosphere_test_x.yml");
+}
+
+public sealed class TileAtmosphereTest_Snake : TileAtmosphereTest
+{
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/tile_atmosphere_test_snake.yml");
+}
+
+public sealed class TileAtmosphereTest_LINDA_X : TileAtmosphereTest
+{
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/tile_atmosphere_test_x.yml");
+    public override async Task Setup()
+    {
+        await base.Setup();
+        Assert.That(Server.CfgMan.GetCVar(CCVars.MonstermosEqualization));
+        Server.CfgMan.SetCVar(CCVars.MonstermosEqualization, false);
+    }
+}
+
+public sealed class TileAtmosphereTest_LINDA_Snake : TileAtmosphereTest
+{
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/tile_atmosphere_test_snake.yml");
+    public override async Task Setup()
+    {
+        await base.Setup();
+        Assert.That(Server.CfgMan.GetCVar(CCVars.MonstermosEqualization));
+        Server.CfgMan.SetCVar(CCVars.MonstermosEqualization, false);
+    }
+}
diff --git a/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_room.yml b/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_room.yml
new file mode 100644
index 0000000000..63033a1953
--- /dev/null
+++ b/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_room.yml
@@ -0,0 +1,231 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 267.3.0
+  forkId: ""
+  forkVersion: ""
+  time: 11/02/2025 16:46:21
+  entityCount: 31
+maps:
+- 1
+grids:
+- 2
+orphans: []
+nullspace: []
+tilemap:
+  1: Space
+  0: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+  - uid: 2
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.47916666,-0.49478912
+      parent: 1
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: IntegrationTestMarker
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+    - type: TestMarker
+      id: wall
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 2
+    - type: TestMarker
+      id: source
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+    - type: TestMarker
+      id: floor
+- proto: WallClown
+  entities:
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+- proto: WallSolid
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 2
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 2
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 2
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 2
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 2
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 2
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 2
+...
diff --git a/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_snake.yml b/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_snake.yml
new file mode 100644
index 0000000000..c55426d070
--- /dev/null
+++ b/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_snake.yml
@@ -0,0 +1,299 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 267.3.0
+  forkId: ""
+  forkVersion: ""
+  time: 11/01/2025 12:21:19
+  entityCount: 45
+maps:
+- 1
+grids:
+- 2
+orphans: []
+nullspace: []
+tilemap:
+  1: Space
+  0: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+  - uid: 2
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.48958334,-0.51563644
+      parent: 1
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: IntegrationTestMarker
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+    - type: TestMarker
+      id: point1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 2
+    - type: TestMarker
+      id: source
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 2
+    - type: TestMarker
+      id: point2
+- proto: WallSolid
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 2
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 2
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 2
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 2
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 2
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 2
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 2
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 2
+  - uid: 34
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 2
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 2
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 2
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 2
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 2
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 2
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 2
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 2
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 2
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 2
+...
diff --git a/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_x.yml b/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_x.yml
new file mode 100644
index 0000000000..9e48c9e5d7
--- /dev/null
+++ b/Resources/Maps/Test/Atmospherics/tile_atmosphere_test_x.yml
@@ -0,0 +1,219 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 267.3.0
+  forkId: ""
+  forkVersion: ""
+  time: 11/01/2025 12:20:35
+  entityCount: 29
+maps:
+- 1
+grids:
+- 2
+orphans: []
+nullspace: []
+tilemap:
+  1: Space
+  0: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+  - uid: 2
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.5520833,-0.44266954
+      parent: 1
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: IntegrationTestMarker
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+    - type: TestMarker
+      id: source
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 2
+    - type: TestMarker
+      id: point1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+    - type: TestMarker
+      id: point2
+- proto: WallSolid
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 2
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 2
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 2
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 2
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 2
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 2
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 2
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+...

From 3e4a46892147948404304ba6dc9d1515f493639e Mon Sep 17 00:00:00 2001
From: JesterX666 <32009105+JesterX666@users.noreply.github.com>
Date: Mon, 15 Dec 2025 18:27:40 -0500
Subject: [PATCH 111/360] Ignite atmosphere on explosions (#41262)

* Ignite atmosphere on explosions

* Fixed to add a temperature property

* Code review corrections

* Removed unused usings

* Correction to use TryComp instead of EntityManager to make it prettier

* Code review corrections

* Code review corrections

* Corrections

* misc fixes

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../EntitySystems/ExplosionSystem.Processing.cs    | 14 ++++++++++++--
 .../Explosion/EntitySystems/ExplosionSystem.cs     |  1 +
 Content.Shared/Explosion/ExplosionPrototype.cs     |  6 ++++++
 Resources/Prototypes/explosion.yml                 |  7 +++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index c6528b0142..2cec8d707a 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
@@ -17,6 +16,7 @@ using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using System.Numerics;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
 
 namespace Content.Server.Explosion.EntitySystems;
@@ -202,6 +202,8 @@ public sealed partial class ExplosionSystem
         HashSet<EntityUid> processed,
         string id,
         float? fireStacks,
+        float? temperature,
+        float currentIntensity,
         EntityUid? cause)
     {
         var size = grid.Comp.TileSize;
@@ -234,6 +236,12 @@ public sealed partial class ExplosionSystem
             ProcessEntity(entity, epicenter, damage, throwForce, id, null, fireStacks, cause);
         }
 
+        // heat the atmosphere
+        if (temperature != null)
+        {
+            _atmosphere.HotspotExpose(grid.Owner, tile, temperature.Value, currentIntensity, cause, true);
+        }
+
         // Walls and reinforced walls will break into girders. These girders will also be considered turf-blocking for
         // the purposes of destroying floors. Again, ideally the process of damaging an entity should somehow return
         // information about the entities that were spawned as a result, but without that information we just have to
@@ -457,7 +465,7 @@ public sealed partial class ExplosionSystem
             }
         }
 
-        // ignite
+        // ignite entities with the flammable component
         if (fireStacksOnIgnite != null)
         {
             if (_flammableQuery.TryGetComponent(uid, out var flammable))
@@ -855,6 +863,8 @@ sealed class Explosion
                     ProcessedEntities,
                     ExplosionType.ID,
                     ExplosionType.FireStacks,
+                    ExplosionType.Temperature,
+                    _currentIntensity,
                     Cause);
 
                 // If the floor is not blocked by some dense object, damage the floor tiles.
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 223d1dbd01..b209cd4b09 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -55,6 +55,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly FlammableSystem _flammableSystem = default!;
     [Dependency] private readonly DestructibleSystem _destructibleSystem = default!;
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!; // DeltaV
 
     private EntityQuery<FlammableComponent> _flammableQuery;
diff --git a/Content.Shared/Explosion/ExplosionPrototype.cs b/Content.Shared/Explosion/ExplosionPrototype.cs
index b20c6891a8..2ab9508ded 100644
--- a/Content.Shared/Explosion/ExplosionPrototype.cs
+++ b/Content.Shared/Explosion/ExplosionPrototype.cs
@@ -31,6 +31,12 @@ public sealed partial class ExplosionPrototype : IPrototype
     [DataField]
     public float? FireStacks;
 
+    /// <summary>
+    ///     Temperature of the explosion
+    /// </summary>
+    [DataField]
+    public float? Temperature;
+
     /// <summary>
     ///     This set of points, together with <see cref="_tileBreakIntensity"/> define a function that maps the
     ///     explosion intensity to a tile break chance via linear interpolation.
diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index 4d3febeda7..2c97f5b755 100644
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -11,6 +11,7 @@
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
+  temperature: 800
 
 - type: explosion
   id: DemolitionCharge
@@ -26,6 +27,7 @@
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
+  temperature: 800
 
 - type: explosion
   id: MicroBomb
@@ -42,6 +44,7 @@
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
+  temperature: 800
 
 - type: explosion
   id: Radioactive
@@ -83,6 +86,7 @@
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
+  temperature: 800
 
 - type: explosion
   id: PowerSink
@@ -99,6 +103,7 @@
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
+  temperature: 800
 
 - type: explosion
   id: HardBomb
@@ -115,6 +120,7 @@
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
+  temperature: 800
 
 - type: explosion
   id: FireBomb
@@ -127,3 +133,4 @@
   texturePath: /Textures/Effects/fire.rsi
   fireStates: 3
   fireStacks: 2
+  temperature: 1500

From 42fcf00920a58db1c8fba619648f98bfce97d4d4 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:24:54 -0300
Subject: [PATCH 112/360] Xenoborg door control module (#41546)

* add door control module

* some commentary

* can't eject stuff anymore

* make xenoborg door remote eletrify doors

* clean yml

* anchors and aliases

* not show stuff about id in xenoborg access config

* engi xenoborg can see eletrified doors
---
 .../Access/UI/AccessOverriderWindow.xaml      |   2 +-
 .../Access/UI/AccessOverriderWindow.xaml.cs   |   6 ++-
 .../Remotes/UI/DoorRemoteStatusControl.cs     |   1 +
 .../Access/Systems/AccessOverriderSystem.cs   |   3 +-
 .../Components/AccessOverriderComponent.cs    |  11 +++++-
 .../Containers/ItemSlot/ItemSlotsSystem.cs    |   2 +-
 .../Remotes/Components/DoorRemoteComponent.cs |   3 +-
 .../EntitySystems/SharedDoorRemoteSystem.cs   |  18 +++++++++
 .../systems/access-overrider-system.ftl       |   1 +
 .../Locale/en-US/door-remote/door-remote.ftl  |   1 +
 .../Entities/Mobs/Cyborgs/xenoborgs.yml       |   1 +
 .../Entities/Objects/Devices/door_remote.yml  |  36 ++++++++++++++----
 .../Objects/Misc/identification_cards.yml     |  12 ++++++
 .../Specific/Robotics/borg_modules.yml        |  18 +++++++++
 .../Objects/Tools/access_configurator.yml     |  29 ++++++++++++++
 .../Recipes/Lathes/Packs/xenoborgs.yml        |   5 +++
 .../Prototypes/Recipes/Lathes/xenoborgs.yml   |  16 ++++++++
 .../Actions/actions_borg.rsi/meta.json        |   3 ++
 .../xenoborg-door-remote-module.png           | Bin 0 -> 256 bytes
 19 files changed, 155 insertions(+), 13 deletions(-)
 create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-door-remote-module.png

diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml b/Content.Client/Access/UI/AccessOverriderWindow.xaml
index ae482140bc..545ebec494 100644
--- a/Content.Client/Access/UI/AccessOverriderWindow.xaml
+++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml
@@ -2,7 +2,7 @@
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
-            <GridContainer Columns="3" HorizontalExpand="True">
+            <GridContainer Name="PrivilegedIdGrid" Columns="3" HorizontalExpand="True">
                 <Label Text="{Loc 'access-overrider-window-privileged-id'}" />
                 <Button Name="PrivilegedIdButton" Access="Public"/>
                 <Label Name="PrivilegedIdLabel" />
diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
index a783dd368f..d0d15d2bd5 100644
--- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
+++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
@@ -53,6 +53,8 @@ namespace Content.Client.Access.UI
 
         public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUserInterfaceState state)
         {
+            PrivilegedIdGrid.Visible = state.ShowPrivilegedIdGrid;
+
             PrivilegedIdLabel.Text = state.PrivilegedIdName;
             PrivilegedIdButton.Text = state.IsPrivilegedIdPresent
                 ? Loc.GetString("access-overrider-window-eject-button")
@@ -77,7 +79,9 @@ namespace Content.Client.Access.UI
                     missingPrivileges.Add(privilege);
                 }
 
-                MissingPrivilegesLabel.Text = Loc.GetString("access-overrider-window-missing-privileges");
+                MissingPrivilegesLabel.Text = state.ShowPrivilegedIdGrid ?
+                    Loc.GetString("access-overrider-window-missing-privileges") :
+                    Loc.GetString("access-overrider-window-missing-privileges-no-id");
                 MissingPrivilegesText.Text = string.Join(", ", missingPrivileges);
             }
 
diff --git a/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs b/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
index e96cce5b25..9db604ff80 100644
--- a/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
+++ b/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
@@ -35,6 +35,7 @@ public sealed class DoorRemoteStatusControl(Entity<DoorRemoteComponent> ent) : C
             OperatingMode.OpenClose => "door-remote-open-close-text",
             OperatingMode.ToggleBolts => "door-remote-toggle-bolt-text",
             OperatingMode.ToggleEmergencyAccess => "door-remote-emergency-access-text",
+            OperatingMode.ToggleOvercharge => "door-remote-toggle-eletrify-text",
             _ => "door-remote-invalid-text"
         });
 
diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 4eaf3c0419..aa34dc2729 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -148,7 +148,8 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
             missingAccess,
             privilegedIdName,
             targetLabel,
-            targetLabelColor);
+            targetLabelColor,
+            component.ShowPrivilegedId);
 
         _userInterface.SetUiState(uid, AccessOverriderUiKey.Key, newState);
     }
diff --git a/Content.Shared/Access/Components/AccessOverriderComponent.cs b/Content.Shared/Access/Components/AccessOverriderComponent.cs
index 6a1bf2c831..27a6f7d599 100644
--- a/Content.Shared/Access/Components/AccessOverriderComponent.cs
+++ b/Content.Shared/Access/Components/AccessOverriderComponent.cs
@@ -13,6 +13,12 @@ public sealed partial class AccessOverriderComponent : Component
 {
     public static string PrivilegedIdCardSlotId = "AccessOverrider-privilegedId";
 
+    /// <summary>
+    /// If the Access Overrider UI will show info about the privileged ID
+    /// </summary>
+    [DataField]
+    public bool ShowPrivilegedId = true;
+
     [DataField]
     public ItemSlot PrivilegedIdSlot = new();
 
@@ -48,6 +54,7 @@ public sealed partial class AccessOverriderComponent : Component
         public readonly string PrivilegedIdName;
         public readonly bool IsPrivilegedIdPresent;
         public readonly bool IsPrivilegedIdAuthorized;
+        public readonly bool ShowPrivilegedIdGrid;
         public readonly ProtoId<AccessLevelPrototype>[]? TargetAccessReaderIdAccessList;
         public readonly ProtoId<AccessLevelPrototype>[]? AllowedModifyAccessList;
         public readonly ProtoId<AccessLevelPrototype>[]? MissingPrivilegesList;
@@ -59,7 +66,8 @@ public sealed partial class AccessOverriderComponent : Component
             ProtoId<AccessLevelPrototype>[]? missingPrivilegesList,
             string privilegedIdName,
             string targetLabel,
-            Color targetLabelColor)
+            Color targetLabelColor,
+            bool showPrivilegedIdGrid)
         {
             IsPrivilegedIdPresent = isPrivilegedIdPresent;
             IsPrivilegedIdAuthorized = isPrivilegedIdAuthorized;
@@ -69,6 +77,7 @@ public sealed partial class AccessOverriderComponent : Component
             PrivilegedIdName = privilegedIdName;
             TargetLabel = targetLabel;
             TargetLabelColor = targetLabelColor;
+            ShowPrivilegedIdGrid = showPrivilegedIdGrid;
         }
     }
 
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index 16b338ab3e..2b79e1ef41 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -824,7 +824,7 @@ namespace Content.Shared.Containers.ItemSlots
             if (!component.Slots.TryGetValue(args.SlotId, out var slot))
                 return;
 
-            if (args.TryEject && slot.HasItem)
+            if (args.TryEject && slot.HasItem && !slot.DisableEject)
                 TryEjectToHands(uid, slot, args.Actor, true);
             else if (args.TryInsert && !slot.HasItem)
                 TryInsertFromHand(uid, slot, args.Actor);
diff --git a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
index 7bce64262d..ed6cd71051 100644
--- a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
+++ b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
@@ -70,5 +70,6 @@ public enum OperatingMode : byte
 {
     OpenClose,
     ToggleBolts,
-    ToggleEmergencyAccess
+    ToggleEmergencyAccess,
+    ToggleOvercharge
 }
diff --git a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
index 67c2214ca2..7af311cc1e 100644
--- a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
+++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
@@ -3,11 +3,13 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.Electrocution;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.Remotes.Components;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
@@ -16,7 +18,9 @@ namespace Content.Shared.Remotes.EntitySystems;
 public abstract class SharedDoorRemoteSystem : EntitySystem
 {
     [Dependency] private readonly SharedAirlockSystem _airlock = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoorSystem _doorSystem = default!;
+    [Dependency] private readonly SharedElectrocutionSystem _electrify = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -113,6 +117,20 @@ public abstract class SharedDoorRemoteSystem : EntitySystem
                         $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
                 }
 
+                break;
+            case OperatingMode.ToggleOvercharge:
+                if (TryComp<ElectrifiedComponent>(args.Target, out var eletrifiedComp))
+                {
+                    _electrify.SetElectrified((args.Target.Value, eletrifiedComp), !eletrifiedComp.Enabled);
+                    var soundToPlay = eletrifiedComp.Enabled
+                        ? eletrifiedComp.AirlockElectrifyDisabled
+                        : eletrifiedComp.AirlockElectrifyEnabled;
+                    _audio.PlayLocal(soundToPlay, args.Target.Value, args.User);
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(eletrifiedComp.Enabled ? "" : "un")}electrify it");
+                }
+
                 break;
             default:
                 throw new InvalidOperationException(
diff --git a/Resources/Locale/en-US/access/systems/access-overrider-system.ftl b/Resources/Locale/en-US/access/systems/access-overrider-system.ftl
index 6901d41246..932a3a49cf 100644
--- a/Resources/Locale/en-US/access/systems/access-overrider-system.ftl
+++ b/Resources/Locale/en-US/access/systems/access-overrider-system.ftl
@@ -4,6 +4,7 @@ access-overrider-window-insert-button = Insert
 access-overrider-window-target-label = Connected device:
 access-overrider-window-no-target = No connected device
 access-overrider-window-missing-privileges = Access to this device cannot be modified. The inserted ID is missing the following privileges:
+access-overrider-window-missing-privileges-no-id = Access to this device cannot be modified. Missing the following privileges:
 access-overrider-cannot-modify-access = You do not have sufficient privileges to modify this device!
 access-overrider-out-of-range = The connected device is too far away
 
diff --git a/Resources/Locale/en-US/door-remote/door-remote.ftl b/Resources/Locale/en-US/door-remote/door-remote.ftl
index 2c4ccd0805..5ff83732ee 100644
--- a/Resources/Locale/en-US/door-remote/door-remote.ftl
+++ b/Resources/Locale/en-US/door-remote/door-remote.ftl
@@ -1,4 +1,5 @@
 ## UI
+door-remote-toggle-eletrify-text = Toggle overcharge
 door-remote-open-close-text = Opens and Closes Doors
 door-remote-toggle-bolt-text = Toggles Bolts
 door-remote-emergency-access-text = Toggles Emergency Access
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
index 6ca733249e..ecd44279fd 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -45,6 +45,7 @@
       - BorgModuleCable
       - XenoborgModuleAccessBreaker
       - XenoborgModuleFireExtinguisher
+  - type: ShowElectrocutionHUD
   - type: ShowHealthBars
     damageContainers:
     - Inorganic
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index f0ce152da8..c6e2ed020b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -13,18 +13,18 @@
   - type: DoorRemote
     options:
     - mode: OpenClose
-      tooltip: door-remote-open-close-text
-      icon:
+      tooltip: &TextOpenClose door-remote-open-close-text
+      icon: &IconOpenClose
         sprite: /Textures/Structures/Doors/Airlocks/Standard/basic.rsi
         state: assembly
     - mode: ToggleBolts
-      tooltip: door-remote-toggle-bolt-text
-      icon:
+      tooltip: &TextToggleBolt door-remote-toggle-bolt-text
+      icon: &IconToggleBolt
         sprite: /Textures/Interface/Actions/actions_ai.rsi
         state: bolt_door
     - mode: ToggleEmergencyAccess
-      tooltip: door-remote-emergency-access-text
-      icon:
+      tooltip: &TextEmergencyAccess door-remote-emergency-access-text
+      icon: &IconEmergencyAccess
         sprite: /Textures/Interface/Actions/actions_ai.rsi
         state: emergency_on
   - type: StealTarget
@@ -37,6 +37,28 @@
       enum.DoorRemoteUiKey.Key:
         type: DoorRemoteBoundUserInterface
 
+- type: entity
+  parent: DoorRemoteDefault
+  id: DoorRemoteCanEletrifyDoors
+  abstract: true
+  components:
+  - type: DoorRemote
+    options:
+    - mode: ToggleOvercharge
+      tooltip: door-remote-toggle-eletrify-text
+      icon:
+        sprite: /Textures/Interface/Actions/actions_ai.rsi
+        state: door_overcharge_on
+    - mode: OpenClose
+      tooltip: *TextOpenClose
+      icon: *IconOpenClose
+    - mode: ToggleBolts
+      tooltip: *TextToggleBolt
+      icon: *IconToggleBolt
+    - mode: ToggleEmergencyAccess
+      tooltip: *TextEmergencyAccess
+      icon: *IconEmergencyAccess
+
 - type: entity
   parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteCommand
@@ -210,7 +232,7 @@
     - Xenoborg
 
 - type: entity
-  parent: [ DoorRemoteDefault, BaseXenoborgContraband ]
+  parent: [ DoorRemoteCanEletrifyDoors, BaseXenoborgContraband ]
   id: DoorRemoteXenoborg
   name: xenoborg door remote
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 23f33c081e..5f53afd6a7 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -1068,6 +1068,18 @@
   - type: NanoChatCard # DeltaV
     listNumber: false
 
+- type: entity
+  parent: IDCardStandard
+  id: XenoborgIDCard
+  name: xenoborg ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+  - type: Access
+    tags:
+    - Xenoborg
+
 - type: entity
   parent: IDCardStandard
   id: WizardIDCard
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 271a459c40..a3a7ea960f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1565,6 +1565,24 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-extinguisher-module }
 
+- type: entity
+  parent: [ BaseXenoborgModuleEngi, BaseProviderBorgModule, BaseXenoborgContraband ]
+  id: XenoborgModuleDoorControl
+  name: door control xenoborg module
+  description: Module that allows Xenoborgs to control airlocks.
+  components:
+  - type: Sprite
+    layers:
+    - state: xenoborg_engi
+    - state: icon-xenoborg-access-breaker
+  - type: ItemBorgModule
+    hands:
+    - item: DoorRemoteXenoborg
+    - item: AccessBreaker
+    - item: AccessConfiguratorXenoborg
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-door-remote-module }
+
 - type: entity
   parent: [ BaseXenoborgModuleHeavy, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleJammer
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 252758cbec..d82f5dd511 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -191,3 +191,32 @@
     denialSound:
       path: /Audio/Machines/custom_deny.ogg
     doAfter: 0.5
+
+- type: entity
+  parent: AccessConfigurator
+  id: AccessConfiguratorXenoborg
+  name: xenoborg access configurator
+  description: A modified access configurator used by the xenoborgs.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/access_configurator.rsi
+  - type: Clothing
+    sprite: Objects/Tools/access_configurator.rsi
+  - type: AccessOverrider
+    showPrivilegedId: false
+    accessLevels:
+    - Xenoborg
+    privilegedIdSlot:
+      name: id-card-console-privileged-id
+      startingItem: XenoborgIDCard
+      ejectSound: /Audio/Machines/id_swipe.ogg
+      insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+      ejectOnBreak: true
+      disableEject: true
+      swap: false
+      whitelist:
+        components:
+        - IdCard
+    denialSound:
+      path: /Audio/Machines/custom_deny.ogg
+    doAfter: 0.5
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
index 31efc63265..1ae6a3cf07 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
@@ -11,6 +11,11 @@
 - type: latheRecipePack
   id: XenoborgUpgradeModules
   recipes:
+  # engi xenoborg
+  - XenoborgModuleDoorControlRecipe
+  # heavy xenoborg
   - XenoborgModuleHeavyLaserRecipe
+  # scout xenoborg
   - XenoborgModuleEnergySwordRecipe
+  # stealth xenoborg
   - XenoborgModuleSuperCloakDeviceRecipe
diff --git a/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
index 89fec6a03c..38e97b4005 100644
--- a/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
+++ b/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
@@ -49,6 +49,18 @@
 
 # modules
 
+## engi xenoborg modules
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleDoorControlRecipe
+  result: XenoborgModuleDoorControl
+  materials:
+    Steel: 1500
+    Glass: 1500
+
+## heavy xenoborg modules
+
 - type: latheRecipe
   parent: BaseXenoborgModulesRecipe
   id: XenoborgModuleHeavyLaserRecipe
@@ -57,6 +69,8 @@
     Steel: 1500
     Glass: 1500
 
+## scout xenoborg modules
+
 - type: latheRecipe
   parent: BaseXenoborgModulesRecipe
   id: XenoborgModuleEnergySwordRecipe
@@ -65,6 +79,8 @@
     Steel: 1500
     Glass: 1500
 
+## stealth xenoborg modules
+
 - type: latheRecipe
   parent: BaseXenoborgModulesRecipe
   id: XenoborgModuleSuperCloakDeviceRecipe
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index 6072a9a2f9..c4de609965 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -139,6 +139,9 @@
         {
             "name":"xenoborg-control-computer"
         },
+        {
+            "name":"xenoborg-door-remote-module"
+        },
         {
             "name":"xenoborg-extinguisher-module"
         },
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-door-remote-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-door-remote-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5ca9cfa97d4e0ffae3d99d3362ef352db22b498
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HT!Azg
zh%+!~3knv*#r@aR{I9HhMqIpMlVIl#pd4pOkY6yve<(0#ntcT*Sm){D7-G@8b@D~7
z0}33jn@zs|kGDB3#ba{wmfr;aI6l#7m&6yGe$#x|Lm`EIM&l!f^Slxg5|z0p8XJ!u
z;AZ}Aydhs={d1`eT2jV5E7q=ZG~sD+S+YCi@B!Nkc}fv&+7nW5wjDdQ;76PD#Vm<a
pxi{{eJN(b(Z(4_)-;b|mmW*5hoMAlg71BXY_jL7hS?83{1OQK$UAh1O

literal 0
HcmV?d00001


From 3d66275984a80f2552f287807f7899497a934fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Mon, 15 Dec 2025 19:30:20 -0600
Subject: [PATCH 113/360] Remove unused tags tied to unused entities (#41366)

* commit

* fix for haunted

* not a magazine

* unused sprites

* the lost tags

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Resources/Migrations/migration.yml            |  30 +++--
 .../Entities/Objects/Consumable/Food/meat.yml |  10 --
 .../Ammunition/Magazines/caseless_rifle.yml   | 107 +-----------------
 .../Guns/Ammunition/Magazines/heavy_rifle.yml |  28 -----
 .../Guns/Ammunition/SpeedLoaders/pistol.yml   |  59 ----------
 .../Ammunition/SpeedLoaders/rifle_light.yml   |   5 +-
 .../Entities/Structures/Power/debug_power.yml |  20 ----
 .../Entities/Structures/base_structure.yml    |   3 -
 .../Prototypes/Procedural/dungeon_configs.yml |   3 +
 .../Ammunition/Magazines/caseless_rifle.yml   |  56 ++++++++-
 .../Guns/Ammunition/SpeedLoaders/pistol.yml   |  61 ++++++++++
 Resources/Prototypes/_DV/tags.yml             |   3 +
 Resources/Prototypes/tags.yml                 |  26 ++---
 .../caseless_rifle_mag.rsi/meta.json          |  39 -------
 .../caseless_rifle_mag.rsi/rubber.png         | Bin 2155 -> 0 bytes
 .../caseless_rifle_mag_short.rsi/meta.json    |  39 -------
 .../caseless_rifle_mag_short.rsi/rubber.png   | Bin 358 -> 0 bytes
 .../Pistol/pistol_speed_loader.rsi/meta.json  |  76 -------------
 .../pistol_speed_loader.rsi/rubber-1.png      | Bin 2252 -> 0 bytes
 .../pistol_speed_loader.rsi/rubber-2.png      | Bin 2376 -> 0 bytes
 .../pistol_speed_loader.rsi/rubber-3.png      | Bin 2569 -> 0 bytes
 .../pistol_speed_loader.rsi/rubber-4.png      | Bin 2621 -> 0 bytes
 .../pistol_speed_loader.rsi/rubber-5.png      | Bin 2574 -> 0 bytes
 .../pistol_speed_loader.rsi/rubber-6.png      | Bin 2573 -> 0 bytes
 .../caseless_pistol_mag.rsi/red-icon.png      | Bin 0 -> 241 bytes
 .../caseless_pistol_mag.rsi/stripe.png        | Bin 0 -> 446 bytes
 .../caseless_rifle_mag.rsi/base.png           | Bin
 .../inhand-left-mag.png                       | Bin
 .../inhand-left-stripe.png                    | Bin
 .../inhand-right-mag.png                      | Bin
 .../inhand-right-stripe.png                   | Bin
 .../caseless_rifle_mag.rsi/mag-1.png          | Bin
 .../caseless_rifle_mag.rsi/meta.json          |  25 ++++
 .../caseless_rifle_mag.rsi/stripe.png         | Bin
 .../caseless_rifle_mag_short.rsi/base.png     | Bin
 .../inhand-left-mag.png                       | Bin
 .../inhand-left-stripe.png                    | Bin
 .../inhand-right-mag.png                      | Bin
 .../inhand-right-stripe.png                   | Bin
 .../caseless_rifle_mag_short.rsi/mag-1.png    | Bin
 .../caseless_rifle_mag_short.rsi/meta.json    |  27 ++++-
 .../caseless_rifle_mag_short.rsi/stripe.png   | Bin
 .../Pistol/pistol_speed_loader.rsi/base-1.png | Bin
 .../Pistol/pistol_speed_loader.rsi/base-2.png | Bin
 .../Pistol/pistol_speed_loader.rsi/base-3.png | Bin
 .../Pistol/pistol_speed_loader.rsi/base-4.png | Bin
 .../Pistol/pistol_speed_loader.rsi/base-5.png | Bin
 .../Pistol/pistol_speed_loader.rsi/base-6.png | Bin
 .../Pistol/pistol_speed_loader.rsi/base.png   | Bin
 .../pistol_speed_loader.rsi/inhand-left.png   | Bin
 .../pistol_speed_loader.rsi/inhand-right.png  | Bin
 .../Pistol/pistol_speed_loader.rsi/meta.json  |  51 ++++++++-
 .../pistol_speed_loader.rsi/practice-1.png    | Bin
 .../pistol_speed_loader.rsi/practice-2.png    | Bin
 .../pistol_speed_loader.rsi/practice-3.png    | Bin
 .../pistol_speed_loader.rsi/practice-4.png    | Bin
 .../pistol_speed_loader.rsi/practice-5.png    | Bin
 .../pistol_speed_loader.rsi/practice-6.png    | Bin
 58 files changed, 260 insertions(+), 408 deletions(-)
 delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png
 create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png
 create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png (100%)
 rename Resources/Textures/{ => _DV}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png (100%)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index f3d87c4d72..203f26be32 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -55,8 +55,8 @@ MagazineBoxLightRifleHighVelocity: MagazineBoxLightRifle
 MagazineBoxMagnumHighVelocity: MagazineBoxMagnum
 MagazineBoxPistolHighVelocity: MagazineBoxPistol
 MagazineBoxRifleHighVelocity: MagazineBoxRifle
-MagazineCaselessRifleHighVelocity: MagazineCaselessRifle
-MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort
+MagazineCaselessRifleHighVelocity: MagazineCaselessRifle # DeltaV - Kept item
+MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort # DeltaV - Kept item
 MagazineLightRifleHighVelocity: MagazineLightRifle
 MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun
 MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle
@@ -65,8 +65,8 @@ MagazinePistolHighVelocity: MagazinePistol
 MagazinePistolSubMachineGunHighVelocity: MagazinePistolSubMachineGun
 MagazineRifleHighVelocity: MagazineRifle
 SpeedLoaderMagnumHighVelocity: SpeedLoaderMagnum
-SpeedLoaderPistolHighVelocity: SpeedLoaderPistol
-#
+SpeedLoaderPistolHighVelocity: null
+
 # 2023-08-07
 #If the name is anything to go off of, these are presumably just CEV-Eris versions of the snow rock (which we already have.)
 #They are practically never used in this way however, so they're migrated to the basic rock type.
@@ -289,12 +289,12 @@ BodyBag_Folded: BodyBagFolded
 #MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
 #MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
 #MagazineMagnumRubber: MagazineMagnum
-#MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
+#MagazineMagnumSubMachineGunRubber: null
 #MagazineLightRifleRubber: MagazineLightRifle
 #MagazineRifleRubber: MagazineRifle
-#MagazineCaselessRifleRubber: MagazineCaselessRifle
-#MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
-#SpeedLoaderPistolRubber: SpeedLoaderPistol
+#MagazineCaselessRifleRubber: MagazinePistolCaselessRifle
+#MagazineCaselessRifleShortRubber: null
+#SpeedLoaderPistolRubber: null
 #SpeedLoaderMagnumRubber: SpeedLoaderMagnum
 #MagazineBoxPistolRubber: MagazineBoxPistol
 ## RIP box of magnum rubbers 202X to 2024
@@ -303,17 +303,15 @@ BodyBag_Folded: BodyBagFolded
 #MagazineBoxRifleRubber: MagazineBoxRifle
 #MagazineBoxRifleBigRubber: MagazineBoxRifleBig
 #MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle
-#MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24
 #BoxMagazinePistolRubber: BoxMagazinePistol
 #BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity
 #BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
 #BoxMagazineLightRifleRubber: BoxMagazineLightRifle
 #BoxMagazineRifleRubber: BoxMagazineRifle
 #BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
-#BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
+#BoxMagazineMagnumSubMachineGunRubber: null
 #WeaponPistolMk58Nonlethal: WeaponPistolMk58
 #WeaponPistolN1984Nonlethal: WeaponPistolN1984
-#WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector
 #WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
 #WeaponRifleLecterRubber: WeaponRifleLecter
 
@@ -693,6 +691,16 @@ ToySkeleton: ToyFigurineSkeleton
 # 2025-10-28
 DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
 
+# 2025-11-08
+DebugSMES: SMESBasicEmpty
+DebugSubstation: SubstationBasicEmpty
+DebugSubstationWall: BaseSubstationWall
+DebugAPC: BaseAPC
+MagazineCaselessRifle: MagazinePistolCaselessRifle
+MagazineCaselessRiflePractice: MagazinePistolCaselessRiflePractice
+SpeedLoaderPistol: null
+SpeedLoaderPistolPractice: null
+
 # 2025-12-05
 GlowstickBase: GlowstickGreen
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 0d23a41122..d7ba5e1518 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -70,16 +70,6 @@
     # once it would say bloated, turn into the rotten prototype
     stage: 1
 
-# bruh
-- type: Tag
-  id: Raw
-
-- type: Tag
-  id: Cooked
-
-- type: Tag
-  id: Cutlet
-
 # Raw
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index ff26c3c15a..02468697db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -1,54 +1,23 @@
 - type: entity
   abstract: true
   parent: [ BaseItem, BaseSecurityContraband ]
-  id: BaseMagazineCaselessRifle
-  name: "magazine (.25 caseless)"
-  components:
-  - type: Tag
-    tags:
-      - MagazineCaselessRifle
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    whitelist:
-      tags:
-        - CartridgeCaselessRifle
-    proto: CartridgeCaselessRifle
-    capacity: 30
-  - type: Item
-    size: Small
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  abstract: true
-  parent: BaseMagazineCaselessRifle
   id: BaseMagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
   components:
   - type: Tag
     tags:
-      - MagazinePistolCaselessRifle
+    - MagazinePistolCaselessRifle
   - type: BallisticAmmoProvider
     whitelist:
       tags:
-        - CartridgeCaselessRifle
+      - CartridgeCaselessRifle
     proto: CartridgeCaselessRifle
     capacity: 10
   - type: Item
     size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi
     layers:
@@ -68,20 +37,6 @@
   name: "pistol magazine (.25 caseless)"
   description: 10-round magazine for the Cobra pistol. Intended to hold general-purpose kinetic ammunition.
   components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 10
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 6
-    zeroVisible: false
-  - type: Appearance
   - type: Item
     inhandVisuals:
       left:
@@ -96,58 +51,6 @@
   name: "pistol magazine (.25 caseless practice)"
   description: 10-round magazine for the Cobra pistol. Intended to hold harmless practice ammunition.
   components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRiflePractice
-    capacity: 10
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: MagazineVisuals
-    magState: mag
-    steps: 6
-    zeroVisible: false
-  - type: Appearance
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
-
-- type: entity
-  parent: BaseMagazineCaselessRifle
-  id: MagazineCaselessRifle
-  name: "magazine (.25 caseless)"
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  parent: BaseMagazineCaselessRifle
-  id: MagazineCaselessRiflePractice
-  name: "magazine (.25 caseless practice)"
-  components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
deleted file mode 100644
index c3c8e01504..0000000000
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: entity
-  abstract: true
-  parent: [ BaseItem, BaseSecurityContraband ]
-  id: BaseMagazineHeavyRifle
-  name: "magazine (.20 rifle)"
-  components:
-  - type: Tag
-    tags:
-      - MagazineHeavyRifle
-  - type: Item
-    size: Small
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    capacity: 100
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
deleted file mode 100644
index 5174b6a3b1..0000000000
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-- type: entity
-  abstract: true
-  parent: [ BaseItem, BaseSecurityContraband ]
-  id: BaseSpeedLoaderPistol
-  name: "speed loader (.35 auto)"
-  components:
-  - type: Tag
-    tags:
-      - SpeedLoaderPistol
-  - type: SpeedLoader
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-        - CartridgePistol
-    capacity: 6
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-
-- type: entity
-  parent: BaseSpeedLoaderPistol
-  id: SpeedLoaderPistol
-  name: "speed loader (.35 auto)"
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistol
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: base-6
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: base
-    steps: 7
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseSpeedLoaderPistol
-  id: SpeedLoaderPistolPractice
-  name: "speed loader (.35 auto practice)"
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolPractice
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: practice-6
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: practice
-    steps: 7
-    zeroVisible: false
-  - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
index 67f05106d1..925970d163 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -4,9 +4,6 @@
   name: "speed loader (.30 rifle)"
   description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Intended to hold general-purpose kinetic ammunition.
   components:
-  - type: Tag
-    tags:
-      - SpeedLoaderRifle
   - type: SpeedLoader
   - type: Tag # DeltaV - Keep Tag
     tags:
@@ -15,7 +12,7 @@
     mayTransfer: true
     whitelist:
       tags:
-        - CartridgeLightRifle
+      - CartridgeLightRifle
     capacity: 5
     proto: CartridgeLightRifle
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index 639e36cb38..e4268a25c5 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -122,11 +122,6 @@
   - type: BatteryDischarger
   - type: Anchorable
 
-- type: entity
-  parent: BaseSMES
-  id: DebugSMES
-  suffix: DEBUG, Empty
-
 - type: entity
   parent: BaseSMES
   id: DebugSMESRecharging
@@ -135,11 +130,6 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
 
-- type: entity
-  parent: BaseSubstation
-  id: DebugSubstation
-  suffix: DEBUG, Empty
-
 - type: entity
   parent: BaseSubstation
   id: DebugSubstationRecharging
@@ -148,11 +138,6 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
 
-- type: entity
-  parent: BaseSubstationWall
-  id: DebugSubstationWall
-  suffix: DEBUG, Empty
-
 - type: entity
   parent: BaseSubstationWall
   id: DebugSubstationWallRecharging
@@ -161,11 +146,6 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
 
-- type: entity
-  parent: BaseAPC
-  id: DebugAPC
-  suffix: DEBUG, Empty
-
 - type: entity
   parent: BaseAPC
   id: DebugAPCRecharging
diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
index d4936c859c..99c5c62b4e 100644
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -64,6 +64,3 @@
   components:
     - type: TileFrictionModifier
       modifier: 0.4
-
-- type: Tag
-  id: Structure
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 5da9592995..18d50ec6cd 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -79,6 +79,9 @@
   id: Haunted
   layers:
   - !type:PrefabDunGen
+    roomWhitelist:
+      tags:
+      - Haunted
     presets:
     - Bucket
     - Wow
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index eff4e110a7..fa5f9f52ab 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -1,5 +1,59 @@
 # .25 caseless
 
+- type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
+  id: BaseMagazineCaselessRifle
+  name: "magazine (.25 caseless)"
+  components:
+  - type: Tag
+    tags:
+      - MagazineCaselessRifle
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeCaselessRifle
+    proto: CartridgeCaselessRifle
+    capacity: 30
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseMagazineCaselessRifle
+  id: MagazineCaselessRifle
+  name: "magazine (.25 caseless)"
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
 - type: entity
   id: BaseMagazineCaselessRifleShort
   name: "caseless rifle short magazine (.25 caseless)"
@@ -12,7 +66,7 @@
   - type: Item
     size: Tiny
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
index 5204728894..9ad977fffe 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -1,3 +1,64 @@
+- type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
+  id: BaseSpeedLoaderPistol
+  name: "speed loader (.35 auto)"
+  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderPistol
+  - type: SpeedLoader
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgePistol
+    capacity: 6
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  parent: BaseSpeedLoaderPistol
+  id: SpeedLoaderPistol
+  name: "speed loader (.35 auto)"
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistol
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: base-6
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: base
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseSpeedLoaderPistol
+  id: SpeedLoaderPistolPractice
+  name: "speed loader (.35 auto practice)"
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolPractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: practice-6
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: practice
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+
 - type: entity
   parent: BaseSpeedLoaderPistol
   id: SpeedLoaderPistolRubber
diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml
index 751bc915df..aba7e4bd9a 100644
--- a/Resources/Prototypes/_DV/tags.yml
+++ b/Resources/Prototypes/_DV/tags.yml
@@ -129,6 +129,9 @@
 - type: Tag
   id: LightFixture
 
+- type: Tag
+  id: MagazineCaselessRifle
+
 - type: Tag
   id: MagazineLaser
 
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 921164a863..a7294fd8b2 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -358,6 +358,9 @@
 - type: Tag
   id: ConveyorAssembly # ConstructionGraph: ConveyorGraph
 
+- type: Tag
+  id: Cooked # MetamorphRecipe: FoodBurgerCheese, FoodBurgerChicken, FoodBurgerCrab, FoodBurgerDuck
+
 - type: Tag
   id: CoordinatesDisk # Storage whitelist: DiskCase
 
@@ -442,6 +445,9 @@
 - type: Tag
   id: CubanCarp # CargoBounty: BountyCubanCarp
 
+- type: Tag
+  id: Cutlet # MetamorphRecipe: FoodBurgerCheese, FoodBurgerChicken, FoodBurgerDuck
+
 ## D ##
 
 - type: Tag # Exists on diagonal walls and windows
@@ -713,7 +719,7 @@
   id: HardsuitSpatio # ConstructionGraph: HardsuitGoliath
 
 - type: Tag # Used on DungeonRoom prototypes.
-  id: Haunted # Unused. Exists on various DungeonRoomPrototypes in haunted.yml, presumably for an unimplemented PrefabDunGen whitelist.
+  id: Haunted # PrefabDunGen whitelist on Haunted DungeonConfig.
 
 - type: Tag
   id: Head # ConstructionGraph: RitualSeat
@@ -865,18 +871,12 @@
 # Entities tagged with the following are some sort of gun magazine. Guns whitelist their storage using these tags.
 # Tagged entities always have BallisticAmmoProviderComponent.
 
-- type: Tag
-  id: MagazineCaselessRifle # Unused (Exists on BaseMagazineCaselessRifle)
-
 - type: Tag
   id: MagazineDebug # WeaponPistolDebug
 
 - type: Tag
   id: MagazineGrenade # ShuttleGunDuster
 
-- type: Tag
-  id: MagazineHeavyRifle # Unused (Exists on BaseMagazineHeavyRifle)
-
 - type: Tag
   id: MagazineLightRifle # WeaponRifleAk
 
@@ -1176,6 +1176,9 @@
   id: Radio # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltMedical, ClothingBeltSecurity.
             # CargoBounty: BountyRadio. ConstructionGraph: HudMedSec
 
+- type: Tag
+  id: Raw # MaterialStorage whitelist: Sheetifier
+
 - type: Tag
   id: RawMaterial # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag
 
@@ -1323,12 +1326,6 @@
 - type: Tag
   id: SpeedLoaderMagnum # Ammo: BaseWeaponRevolver, XenoArtifactGun
 
-- type: Tag
-  id: SpeedLoaderPistol # Unused (Exists on BaseSpeedLoaderPistol)
-
-- type: Tag
-  id: SpeedLoaderRifle # Unused (Exists on SpeedLoaderLightRifle)
-
 - type: Tag
   id: SpiderCraft # Used on various ConstructionPrototypes to create exclusive recipes for tagged entity.
 
@@ -1360,6 +1357,9 @@
 - type: Tag
   id: StringInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard
 
+- type: Tag
+  id: Structure # # Targeting whitelist: HandLabeler
+
 - type: Tag
   id: StunImmune # Tagged mob entity cannot gain the stunned status effect. Blacklist on StatusEffectStunned.
 
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
deleted file mode 100644
index 82820ea569..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "stripe"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "mag-1"
-        },
-        {
-            "name": "inhand-left-mag",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left-stripe",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right-mag",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right-stripe",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png
deleted file mode 100644
index f7aadbfcb8c7790ea5d0044a2846a934d9e488db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2155
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
deleted file mode 100644
index afe0e115ae..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "stripe"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "mag-1"
-        },
-        {
-            "name": "inhand-left-mag",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left-stripe",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right-mag",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right-stripe",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png
deleted file mode 100644
index bbc6047d61b9c265d84348e376546362a57cf551..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003kNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z^DTTg9BJdQCwLw^FJ=R_Lg);avVT%2*@f(pkQJghYyex
z0^i;~XSn(HIaWC?VM%iAC(Qv|!jdSyW?*1oc>Lf6LrA0t!<ywg$a27dCqjxH01J_4
zVVMjSOHPxV4oHduWbpXG3%JE6|1vNn8;CJ%yF|J<B!xhGOFAR6#m~YrQRL-*JR><b
zkQ@d7HH;WengybWnV(wEaAnp^26IaT23Z9Ok{m&@13F?%86_{Bgj;NWYCT-;<narn
z8b@9lV7zgT!TiTF3~^ZWe8W*zU;||30_3!S&GL!U8;CBJ87XO&=VvzjM=k+LwVZ*0
z!g65Z^ajRnZ=W;3FsYU^Fi;o*)Br=jC?0jdr~@bk0QIqLaT-t%Pyhe`07*qoM6N<$
Eg6zSGi~s-t

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
deleted file mode 100644
index 4f8aae7dd0..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi, inhands by TiniestShark",
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "base-1"
-        },
-        {
-            "name": "base-2"
-        },
-        {
-            "name": "base-3"
-        },
-        {
-            "name": "base-4"
-        },
-        {
-            "name": "base-5"
-        },
-        {
-            "name": "base-6"
-        },
-        {
-            "name": "practice-1"
-        },
-        {
-            "name": "practice-2"
-        },
-        {
-            "name": "practice-3"
-        },
-        {
-            "name": "practice-4"
-        },
-        {
-            "name": "practice-5"
-        },
-        {
-            "name": "practice-6"
-        },
-        {
-            "name": "rubber-1"
-        },
-        {
-            "name": "rubber-2"
-        },
-        {
-            "name": "rubber-3"
-        },
-        {
-            "name": "rubber-4"
-        },
-        {
-            "name": "rubber-5"
-        },
-        {
-            "name": "rubber-6"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png
deleted file mode 100644
index 31620f5e13a56b9c5d8d9afb9a8026fee2a4bb7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2252
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
aRlWcV?VZ}&ticQb0000<MNUMnLSTYh%q6V=

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png
deleted file mode 100644
index dca283caf992d5f460ff6de8f190677c9363a2aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2376
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png
deleted file mode 100644
index 5c5a4333173e142915a3b51782cf108d7aade7bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2569
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png
deleted file mode 100644
index 9bb14be66175df59b7fcf69db0285a133107bfdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2621
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png
deleted file mode 100644
index a52d8764c1802cfa11458770d3351500854d60be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png
deleted file mode 100644
index 714473f24c716afa13116112ffab77c138854225..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2573
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

diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..203c265c37547d6ddc01cc5ef5ed71fe81e70ce3
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5x0V6XFV_|L<`4|Il}5n!LTeeQ0Q?s;Vjn2Zt#GLmUIcYzBtOY8}x)
zMcgGpe!&d?;h?sx_9{>~$kW9!q+(8Tf<#C|pyy2n*8{8^0W2}0&Q1X=K{0pk1h9r&
zVC7huP+aKg=`5B|UgYWNAn4&J?r|t2uu18FVRmRZb63}vEt{A`8jBPXB<?UU^t}<$
T*88yp<Oc>%S3j3^P6<r_+QCS^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3c57a440a4aa879d31a5435e0fd8e449be2ce7a
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0KHA|Nb*)&OCee?BU99
zY(PF^NswPKgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*<Z4X
zF|zO-l79LYs7Kq=#W6%el2L*2{y(6Kp$HiFm(a)AwPzVk!#qA#gKYD3^>bP0l+XkK
DDM~1~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
index 81349659ef..8b28ae6b9f 100644
--- a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json
@@ -7,8 +7,33 @@
         "y": 32
     },
     "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "stripe"
+        },
         {
             "name": "rubber"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "inhand-left-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-stripe",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
index a1aecb4feb..afe0e115ae 100644
--- a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json
@@ -5,10 +5,35 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
     "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "stripe"
+        },
         {
             "name": "rubber"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "inhand-left-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-stripe",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
index a6691569c7..4f8aae7dd0 100644
--- a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json
@@ -1,12 +1,51 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi, inhands by TiniestShark",
     "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-1"
+        },
+        {
+            "name": "base-2"
+        },
+        {
+            "name": "base-3"
+        },
+        {
+            "name": "base-4"
+        },
+        {
+            "name": "base-5"
+        },
+        {
+            "name": "base-6"
+        },
+        {
+            "name": "practice-1"
+        },
+        {
+            "name": "practice-2"
+        },
+        {
+            "name": "practice-3"
+        },
+        {
+            "name": "practice-4"
+        },
+        {
+            "name": "practice-5"
+        },
+        {
+            "name": "practice-6"
+        },
         {
             "name": "rubber-1"
         },
@@ -24,6 +63,14 @@
         },
         {
             "name": "rubber-6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png
rename to Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png

From 740cc10e8369b60c4630d1a02da301d138b7a6a2 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:56:34 -0300
Subject: [PATCH 114/360] Fix mothership core fixture (#41745)

fix mothership core fixture
---
 Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
index b66ffb7753..9e681dca87 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -22,8 +22,7 @@
         mask:
         - MachineMask
         layer:
-        - MidImpassable
-        - LowImpassable
+        - MachineLayer
   - type: Sprite
     sprite: Mobs/Silicon/mothership_core.rsi
     layers:

From 5054caa29faaf8ffdd5dcb930317a7e42297ff68 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Mon, 15 Dec 2025 21:00:17 -0500
Subject: [PATCH 115/360] Station AI now rolls before most standard crew
 (#41663)

* Station AI now rolls before standard crew

* github tests are high

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Resources/Prototypes/Roles/Jobs/Science/borg.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
index 4dcff6aef6..faabf6aa14 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
@@ -9,6 +9,7 @@
   - !type:RoleTimeRequirement
     role: JobBorg
     time: 5h
+  weight: 10
   canBeAntag: false
   whitelisted: true # DeltaV - ai must be whitelisted
   icon: JobIconStationAi

From a126886756e8d1fb403aed97456e231999954d89 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Mon, 15 Dec 2025 19:19:56 -0800
Subject: [PATCH 116/360] Add foolbox (#41473)

* Add foolbox to clown lockers

* this is beter

* updated table w/ new items

* more clown like

* Tweaks

* thank you iaada

* cleanup

* review

* fun!

* fixes and microbalance

* clowns start with it inhand now
---
 .../Catalog/Fills/Items/toolboxes.yml         | 104 ++++++++++++++++++
 .../Markers/Spawners/Random/clothing.yml      |  16 +++
 .../Entities/Markers/Spawners/Random/toy.yml  |   2 +-
 .../Entities/Objects/Fun/crayons.yml          |   2 +
 .../Entities/Objects/Tools/toolbox.yml        |  34 ++++++
 .../Objects/Weapons/Guns/Basic/watergun.yml   |   2 +-
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |   1 +
 .../Prototypes/Roles/Jobs/Civilian/clown.yml  |   2 +
 .../Tools/Toolboxes/foolbox.rsi/icon-open.png | Bin 0 -> 466 bytes
 .../Tools/Toolboxes/foolbox.rsi/icon.png      | Bin 0 -> 560 bytes
 .../Toolboxes/foolbox.rsi/inhand-left.png     | Bin 0 -> 572 bytes
 .../Toolboxes/foolbox.rsi/inhand-right.png    | Bin 0 -> 564 bytes
 .../Tools/Toolboxes/foolbox.rsi/meta.json     |  25 +++++
 13 files changed, 186 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml
 create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon-open.png
 create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index 577941de0d..e6a8f9b182 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -159,3 +159,107 @@
         - id: IngotGold
         - id: DrinkGoldenCup
           prob: 0.05
+
+- type: entity
+  parent: Foolbox
+  id: FoolboxFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: FoolboxTable
+
+- type: entityTable
+  id: FoolboxTable
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector # Offensive clown items
+      children:
+      - !type:NestedSelector
+        tableId: AllToyWeaponsTable
+      - id: EnergySword # ~1/1001
+        weight: 0.001
+    - !type:GroupSelector # Rarer clown tools
+      rolls: 2
+      children:
+      - !type:NestedSelector
+        tableId: AllMiscToysTable
+        weight: 10
+      - !type:NestedSelector
+        tableId: AllCrayonsTable
+        rolls: 1, 3
+        weight: 5
+      - id: BarberScissors
+        weight: 0.75
+      - id: DrinkSpaceLube
+      - id: DrinkSpaceGlue
+      - !type:NestedSelector
+        tableId: RandomBikeHornTable
+        weight: 0.75
+      - !type:NestedSelector
+        tableId: AllFigurinesTable
+        weight: 1.25
+      - id: RubberStampCaptain # ~1/100
+        weight: 0.2
+    - !type:GroupSelector # Common clown consumables
+      rolls: 2
+      children:
+      - !type:NestedSelector
+        tableId: SlipTable
+      - id: TrashBananaPeel
+      - id: FoodBanana
+      - id: FoodPieBananaCream
+        weight: 0.75
+    - !type:GroupSelector # Fun clothing
+      prob: 0.75
+      children:
+      - !type:NestedSelector
+        tableId: ClownOtherJobTable
+        weight: 6
+      - id: SprayFlowerPin
+      - id: ClothingHeadHatMagician
+      - id: ClothingHeadSafari
+      - id: ClothingHeadHatPirate
+      - id: ClothingHeadHatWizardFake
+      - id: ClothingHeadHatCowboyRed
+      - id: ClothingHeadHatBowlerHat
+      - id: ClothingHeadHatWitch
+      - id: ClothingOuterCoatExpensive
+      - id: ClothingOuterGhostSheet
+      - id: ClothingOuterHospitalGown
+      - id: ClothingShoesBling
+        weight: 0.5
+      - id: ClothingOuterCoatSpaceAsshole
+        weight: 0.5
+      - !type:NestedSelector
+        tableId: AllPartyHatsTable
+      - !type:NestedSelector
+        tableId: InsulsTable
+      - !type:GroupSelector # ~1/115
+        weight: 0.175
+        children:
+        - id: ClothingHeadHatCatEars
+        - id: ClothingHeadHatFancyCrown
+        - id: ClothingHeadHatChameleon
+
+- type: entityTable
+  id: ClownOtherJobTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatBeretCommand # Command
+    - id: ClothingOuterVestHazard # Engineering
+    - id: ClothingOuterCoatLab # Science
+    - id: ClothingMaskClownSecurity # Security
+    - id: ClothingHeadHatCargosoft # Cargo
+    - id: ClothingNeckStethoscope # Medical
+      weight: 0.5
+    - !type:NestedSelector
+      tableId: AllSergicalHatsTable
+      weight: 0.5
+    - id: ClothingUniformJumpsuitBartender # Bartender
+    - id: ClothingHeadHatChef # Chef
+    - id: ClothingHeadBandBotany # Botany
+    - id: ClothingHandsGlovesJanitor # Janitor
+    - id: ClothingUniformJumpsuitReporter # Reporter
+    - id: ClothingOuterWinterMime # Mime
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml
new file mode 100644
index 0000000000..5ac9666ce8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml
@@ -0,0 +1,16 @@
+- type: entityTable
+  id: AllPartyHatsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatPartyRed
+    - id: ClothingHeadHatPartyYellow
+    - id: ClothingHeadHatPartyGreen
+    - id: ClothingHeadHatPartyBlue
+
+- type: entityTable
+  id: AllSergicalHatsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatSurgcapBlue
+    - id: ClothingHeadHatSurgcapPurple
+    - id: ClothingHeadHatSurgcapGreen
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index a3dbaeaf3c..f83c1a33a1 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -316,7 +316,7 @@
       - id: BoxCartridgeCap
 
 # A group of items with fun or unique properties. Highly varied (some are more fun than others)
-- type: entityTable # size 3x3  # price 100
+- type: entityTable # size 2x2  # price 100
   id: AllMiscToysTable
   table: !type:GroupSelector
     children:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 6c2b291cd1..574d6953f2 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -298,6 +298,8 @@
   - type: Item
     sprite: Objects/Fun/crayons.rsi
     size: Small
+    shape:
+    - 0,0,1,1
     heldPrefix: box
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 37a691d0c0..80139dffc9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -150,3 +150,37 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
+
+- type: entity
+  name: foolbox
+  parent: ToolboxBase
+  id: Foolbox
+  description: A toolbox for fools, stocked with clowning equipment.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Toolboxes/foolbox.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/Toolboxes/foolbox.rsi
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 2
+    soundHit: &SoundRubberHammer
+      collection: RubberHammer
+      params:
+        variation: 0.03
+        volume: 3
+  - type: EmitSoundOnLand
+    sound: *SoundRubberHammer
+  - type: Storage
+    storageOpenSound: &SoundHorn
+      collection: BikeHorn
+      params:
+        variation: 0.125
+    storageCloseSound: *SoundHorn
+    storageInsertSound: &SoundSqueak
+      collection: FootstepClown
+      params:
+        variation: 0.125
+    storageRemoveSound: *SoundSqueak
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
index 8222481e92..2d4d00ac76 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
@@ -100,7 +100,7 @@
       map: [ "enum.DamageStateVisualLayers.Base" ]
   - type: Item
     sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
-    size: Large
+    size: Normal
     shape:
     - 0,0,2,1
   - type: RandomSprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index c3827d4bf9..ff19b903fd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -295,6 +295,7 @@
     sprite: Objects/Fun/Foam/foam_rifle.rsi
   - type: Item
     sprite: Objects/Fun/Foam/foam_rifle_inhand_64x.rsi
+    size: Normal
     shape:
     - 0,0,3,0
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index f150d78e0f..6556d9abdf 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -38,6 +38,8 @@
     pocket2: ClownRecorder
     #id: ClownPDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetService
+  inhand:
+  - FoolboxFilled
   storage:
     back:
     - RubberStampClown
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b86f036ff9cf85cd0476240eb77bd362e8dbf6e
GIT binary patch
literal 466
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~4ZfZ(jv*25$r2wM1idD+o|7>C({3c`b8b?)
z*iAl%Z8B^p3R&uSGiOXYaA4-<05%~5!#1N0jgdFr9(v2L;HgfTP5__UkKz~nQ(75V
zt|k|<II<V`AKKCp^1-y9bvg5l1tv@?KL7cTZDEKw<5tQLFzMrObq#jLh@~fwzhKC*
zo1|>u%)pyq+#=%OVSk9xV_i~BjpV6CdJcx-S@LNddn!3n9S*SPiW&U-JEd`<{Y#4(
zZJmjSZ(Lc(VDedzFJi*Uj(5cYr=H$pJ*ZId^P8{%ukhhEM}}D0s%fmZnYZwtVe4MN
z==OZg|Nm2$JAV4gyFx+Lf%%c-vE7k8|G)b=Z=9T9sjy+%r=kbW2AWS9q!^B>sy0lh
zYvN;IoS^t5=@X*{*R&0P*u&gKoHtlnXqoNFWH_}*PGPyxA~6MP!Anv+JDAyQczc=x
z4Y=G6GBC5TF=U8e4SsEw$qx)|zSIcMG+$o^Eg+i%h(X{|@MI9>>FVdQ&MBb@09f*)
AzW@LL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5fc593743a3c1f737007e68579794fe0fa6054c
GIT binary patch
literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W0jo(wK~z{r?UTJq
z13?gg=Oj(gm`1SjCrHYGkbsILjZYy$NTnD=5PS?l5Q%6N()biM34%fbLMjOo)Jm|4
zKiC|cJA1QtyUAWo&xjWL!Q9U5-p<U<?1I5y_<xj694^0s#`hSFE^N{Ic=2>s84=`<
z`<HyH2}mSv<B(XXjwA{6gZ^|_G^!as-vdm|!NkKfyk<&#Sx54Q6h?266b*@X72al_
zJiktS(p{)-TZ0Kawz-Ko3l)G<GGz7vvg=tgd|Kx%fCDmQwwT|$G8xS8OvY7|1Q^y@
z*(*5)j}>CjS?$n_OX@hqgCv(|LZWxgJ}kNJPS>3v(wAwl>$aN2MTN(Xaf=X>aw15v
zSma})-r%F)eb?VUeq@uzlAKRLzL4j7tybfsK*SJeFJb>r3RGe|t-WD;!cULrT0rRh
z2EKx?(9HP~mEe<Zf+Ow#_OPF;L%-yL<vpdN9I+qo0GtiR3$1`I_;(1~KePg*X=$<-
z*H3QnWvXZ@5ZZzuu%vPl7(DF%NG%8ggJDo1!-5avN3Q^b3W-YOI}iy?3k(K>;g13M
y1dZ&G*B2zs`Tzg`4rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTZM!s$~0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..30c15488cdadea4488593797bd45c8f8a03b30b8
GIT binary patch
literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBuf-vKbiP>*~8n%17IEGZjy}h;3@34UYTLQaM*t~^KcW-n_
zOgMDNdBY*5riIr24H3ox7X>$dF`XbW;S@_!uYfkUj?UDk_eFlpF1dH+tmgYK9_csd
z$)h=I%L;gaHbH<x^z7Yg(_=+%eLQ3(^<;63Rn4VMkBjV&Z!X-Kd)2i){7$5t=`Ar|
zrn~9peaVjt?=W0ja_#fSV^^Omhp(MlsIt!NFUy2p<7B^F-=)0b&5u|Y&1?Ajcwy)F
z$D5YiUODHZ^Y_rl0e1urooVR$=N<p;k51M6^&VNarS?^aS?4VlWrsO~fg#~!SVf}o
zk3$^#Id%0fRSufFHNQTr(jaEK#O3|@OE)IvD@n(#pT!V$YMIfljqE|6)@EOw8ta##
zdT{&t>dWG5wyajY=l#*uVdv5E!izJTi}$aLZg-pV=tf24w8Dk_>M@rrKYqJ0S9|{L
zl4D!cW|ph^UVgc8QWn!Bm5C;^Ywi?Rx81H+P2k&l)J^WK)a2it?-r@4K2S2Adzw$a
zZ~l%X>%EKg&YM@{{ittb*u{VM({9G^mqK=%S>2!V>cokA^{0#*;)>=iGxlGfeA-C+
zV*SHvCWaX&XUIo%-PSkqJJJgDC0}ZUXPU1sgBFm@0rmBz;K?ACr>mdKI;Vst05vP|
A$p8QV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e962fb69ec6fb099ffdabbdb403afa9ea2152b7
GIT binary patch
literal 564
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1en!+K8_$B>G+x3?7i4?Bpkf6z9GusiJZtU!53
z;tv4{7731yN;}4bVGc8ny~&=S;L*l(U+0FT!3?#>d#{)K9={gn-j^o+Z~wER>sz<{
z-)Cyf&kVE(0zO>+wr}Q3BaVNc<~<dcI-6m)lY248l;BTBXa8IOIljfy^yQ+97kvd-
zC(M}=UiA5y#-X-zQ|;!J8qR%@bT;#x(st)s#&e}Pu_y8jEY_cW7ZBNyVs7}+F{bD2
z<%M#Q`ExeUnLU58Un(P8K67mA*{?Da&vj4xTfvikE?#`$Gf<E~Ktui7rD<z6o9`$R
zkUzLn^7q%9UV^W<H)IK%Ke+h&^*t98kINVAXI!Gy@#UfS{L_{DeALsn6=$EZU7OjH
zQE+<q-TG?}^1pltlGF1Imi%+UjD!E)_Tx)9YWB68AGl{;*YVk|zA`&_C&S;m{Tznx
zZcd$e{yEnJ?%00!Nh(I?dHrXZ^1f_)8JcBvUG}Ez{u3(Ss(!}Ee81VT<abeb^~^UG
zpNr<Z?Ppx``-*PWyKf6Cx6S|fQNXm0dDXtoO>Yc8|6_ZRHF5cG6TOCYcP@0ZHzY`W
r=4JA}rOKyZ?E~~3UuuMBny)W|7Ld&W_3owM$sm@etDnm{r-UW|gh=n7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json
new file mode 100644
index 0000000000..bccb56d8b4
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , modified by captainkawaii666 (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-open"
+        }
+    ]
+}

From b8b75c456b0348837ed89a04506d2371c760d220 Mon Sep 17 00:00:00 2001
From: Pancake <Pangogie@users.noreply.github.com>
Date: Mon, 15 Dec 2025 23:10:45 -0800
Subject: [PATCH 117/360] Tweak Killer Tomato Size (#35866)

* Update miscellaneous.yml

y tho

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index 1a2111c9da..d4ba48d221 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -134,6 +134,9 @@
   - type: ReplacementAccent
     accent: tomatoKiller
   - type: Item
+    size: Large
+    shape:
+    - 0,0,2,2
   - type: MultiHandedItem
   - type: NpcFactionMember
     factions:

From b4903348df8996d77720be22e0bb86db5b5831bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Tue, 16 Dec 2025 05:17:53 -0600
Subject: [PATCH 118/360] Small improvement to suit sensor update loop (#41872)

commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Content.Server/Medical/SuitSensors/SuitSensorSystem.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 72c3f5ecd9..5674b149e3 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -27,12 +27,11 @@ public sealed class SuitSensorSystem : SharedSuitSensorSystem
             // check if sensor is ready to update
             if (curTime < sensor.NextUpdate)
                 continue;
+            sensor.NextUpdate += sensor.UpdateRate;
 
             if (!CheckSensorAssignedStation((uid, sensor)))
                 continue;
 
-            sensor.NextUpdate += sensor.UpdateRate;
-
             // get sensor status
             var status = GetSensorState((uid, sensor));
             if (status == null)

From 9991a5aefc31221ddb06624822898c5a48d27b40 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Tue, 16 Dec 2025 10:32:56 -0800
Subject: [PATCH 119/360] Decouple standing state and drop item behavior
 (#41566)

* removed DropHandsItemEvent from standing state system, added DropHandsItemEvent calls in slippery system and shared stun system

* added DropHandItemsEvent calls in mobstate system subscribers

* Added DropHandItemsEvent call in SharedBodySystem.Parts

* Add a standingState check in RemoveLeg so removing the legs of a downed person won't cause them to drop items

* new method for downing + dropping held items in mobstatesystem

* mild cleanup

* Bugfix

* update BuckleTest to reflect new item dropping behavior when removing legs

* light cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Tests/Buckle/BuckleTest.cs                |  4 +--
 .../Body/Systems/SharedBodySystem.Parts.cs    | 27 +++++++++++++-----
 .../Systems/MobStateSystem.Subscribers.cs     | 21 ++++++++++++--
 Content.Shared/Slippery/SlipperySystem.cs     |  4 +++
 .../Standing/StandingStateSystem.cs           | 28 +++++++------------
 Content.Shared/Stunnable/SharedStunSystem.cs  |  3 ++
 6 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index a14aa2e495..4e7dc02dac 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -317,10 +317,10 @@ namespace Content.IntegrationTests.Tests.Buckle
                 // he's not supposed to be buckled with the new falling down system
                 // do i just did this :trollface:
 
-                // Now with no item in any hand
+                // Still with items in hand
                 foreach (var hand in hands.Hands.Keys)
                 {
-                    Assert.That(handsSys.GetHeldItem((human, hands), hand), Is.Null);
+                    Assert.That(handsSys.GetHeldItem((human, hands), hand), Is.Not.Null);
                 }
 
                 buckleSystem.Unbuckle(human, human);
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index 0f59d015fb..4486691027 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -7,6 +7,7 @@ using Content.Shared.Body.Part;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Movement.Components;
+using Content.Shared.Standing;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -382,13 +383,25 @@ public partial class SharedBodySystem
         if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
             return;
 
-        if (legEnt.Comp.PartType == BodyPartType.Leg)
-        {
-            bodyEnt.Comp.LegEntities.Remove(legEnt);
-            UpdateMovementSpeed(bodyEnt);
-            Dirty(bodyEnt, bodyEnt.Comp);
-            Standing.Down(bodyEnt); // Shitmed Change
-        }
+        if (legEnt.Comp.PartType != BodyPartType.Leg)
+            return;
+
+        bodyEnt.Comp.LegEntities.Remove(legEnt);
+        UpdateMovementSpeed(bodyEnt);
+        Dirty(bodyEnt, bodyEnt.Comp);
+
+        // Begin DeltaV Additions - Always down on leg removal
+        if (!TryComp<StandingStateComponent>(bodyEnt, out var standingState)
+            || !standingState.Standing
+            || !Standing.Down(bodyEnt, standingState: standingState))
+            return;
+
+        if (bodyEnt.Comp.LegEntities.Count != 0)
+            return;
+        // End DeltaV Additions - Always down on leg removal
+
+        var ev = new DropHandItemsEvent();
+        RaiseLocalEvent(bodyEnt, ref ev);
     }
 
     // Shitmed Change: made virtual, bleeding damage is done on server
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index 0c778ca4e1..36e33ec2c5 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -59,6 +59,13 @@ public partial class MobStateSystem
             args.Cancelled = true;
     }
 
+    private void Down(EntityUid target)
+    {
+        _standing.Down(target);
+        var ev = new DropHandItemsEvent();
+        RaiseLocalEvent(target, ref ev);
+    }
+
     private void CheckConcious(Entity<MobStateComponent> ent, ref ConsciousAttemptEvent args)
     {
         switch (ent.Comp.CurrentState)
@@ -103,25 +110,35 @@ public partial class MobStateSystem
         switch (state)
         {
             case MobState.Alive:
+            {
                 if (!TryComp(target, out BuckleComponent? buckle)
                     || !buckle.Buckled) // DeltaV - Stop buckled mobs from standing up.
                     _standing.Stand(target);
                 _appearance.SetData(target, MobStateVisuals.State, MobState.Alive);
                 break;
+            }
             case MobState.Critical:
-                _standing.Down(target);
+            {
+                Down(target);
                 _appearance.SetData(target, MobStateVisuals.State, MobState.Critical);
                 break;
+            }
             case MobState.Dead:
+            {
                 EnsureComp<CollisionWakeComponent>(target);
-                _standing.Down(target);
+                Down(target);
                 _appearance.SetData(target, MobStateVisuals.State, MobState.Dead);
                 break;
+            }
             case MobState.Invalid:
+            {
                 //unused;
                 break;
+            }
             default:
+            {
                 throw new NotImplementedException();
+            }
         }
     }
 
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index 51bbd2bea0..355d898dbf 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.StepTrigger.Systems;
 using Content.Shared.Stunnable;
@@ -131,6 +132,9 @@ public sealed class SlipperySystem : EntitySystem
         // Preventing from playing the slip sound and stunning when you are already knocked down.
         if (!knockedDown)
         {
+            var evDropHands = new DropHandItemsEvent();
+            RaiseLocalEvent(uid, ref evDropHands);
+
             // Status effects should handle a TimeSpan of 0 properly...
             _stun.TryUpdateStunDuration(other, component.SlipData.StunTime);
 
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index 01c7e0f8cc..2d385b1d62 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -82,7 +82,10 @@ public sealed class StandingStateSystem : EntitySystem
         return !entity.Comp.Standing;
     }
 
-    public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
+    public bool Down(EntityUid uid,
+        bool playSound = true,
+        bool dropHeldItems = true,
+        bool force = false,
         StandingStateComponent? standingState = null,
         AppearanceComponent? appearance = null,
         HandsComponent? hands = null)
@@ -96,26 +99,15 @@ public sealed class StandingStateSystem : EntitySystem
         if (!standingState.Standing)
             return true;
 
-        // This is just to avoid most callers doing this manually saving boilerplate
-        // 99% of the time you'll want to drop items but in some scenarios (e.g. buckling) you don't want to.
-        // We do this BEFORE downing because something like buckle may be blocking downing but we want to drop hand items anyway
-        // and ultimately this is just to avoid boilerplate in Down callers + keep their behavior consistent.
-        if (dropHeldItems && hands != null)
+        if (!force)
         {
-            var ev = new DropHandItemsEvent();
-            RaiseLocalEvent(uid, ref ev, false);
+            var msg = new DownAttemptEvent();
+            RaiseLocalEvent(uid, msg, false);
+
+            if (msg.Cancelled)
+                return false;
         }
 
-        // DeltaV - Unsure if this is needed after ripping out the old laying down system. Left it in in case.
-        //if (TryComp(uid, out BuckleComponent? buckle) && buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckleComp: buckle))
-        //    return false;
-
-        var msg = new DownAttemptEvent();
-        RaiseLocalEvent(uid, msg, false);
-
-        if (msg.Cancelled)
-            return false;
-
         standingState.Standing = false;
         Dirty(uid, standingState);
         RaiseLocalEvent(uid, new DownedEvent(), false);
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index c23b0c24f3..19aa971423 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -151,6 +151,9 @@ public abstract partial class SharedStunSystem : EntitySystem
         var ev = new StunnedEvent(); // todo: rename event or change how it is raised - this event is raised each time duration of stun was externally changed
         RaiseLocalEvent(uid, ref ev);
 
+        var evDropHands = new DropHandItemsEvent();
+        RaiseLocalEvent(uid, ref evDropHands);
+
         var timeForLogs = duration.HasValue
             ? duration.Value.Seconds.ToString()
             : "Infinite";

From 07b74a9e75d00dbd63d539b1871fdc4f5530c8cf Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 16 Dec 2025 10:42:57 -0800
Subject: [PATCH 120/360] Arcryox Metabolism Fix (#41881)

* fix arcryox metabolism

* dont change that shit wrong branch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Resources/Prototypes/Reagents/medicine.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index bda7d27e07..dcbf2c2195 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1344,7 +1344,6 @@
   worksOnTheDead: true
   metabolisms:
     Medicine:
-      metabolismRate: 0.2
       effects:
       - !type:EvenHealthChange
         conditions:

From f19ee48df9273b5eae303113e9376bcdf066c925 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Tue, 16 Dec 2025 20:19:37 +0100
Subject: [PATCH 121/360] wallmount debug overlay (#38495)

* wallmount debug overlay

* make circles a little smoother

* add permissions

* Update Resources/Locale/en-US/commands/show-wallmounts-command.ftl

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* fix

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Commands/ShowWallmountsCommand.cs         | 24 ++++++++
 Content.Client/Wall/WallmountDebugOverlay.cs  | 58 +++++++++++++++++++
 .../commands/show-wallmounts-command.ftl      |  3 +
 Resources/clientCommandPerms.yml              |  2 +
 4 files changed, 87 insertions(+)
 create mode 100644 Content.Client/Commands/ShowWallmountsCommand.cs
 create mode 100644 Content.Client/Wall/WallmountDebugOverlay.cs
 create mode 100644 Resources/Locale/en-US/commands/show-wallmounts-command.ftl

diff --git a/Content.Client/Commands/ShowWallmountsCommand.cs b/Content.Client/Commands/ShowWallmountsCommand.cs
new file mode 100644
index 0000000000..d44c13911b
--- /dev/null
+++ b/Content.Client/Commands/ShowWallmountsCommand.cs
@@ -0,0 +1,24 @@
+using Content.Client.Wall;
+using Robust.Client.Graphics;
+using Robust.Shared.Console;
+
+namespace Content.Client.Commands;
+
+/// <summary>
+/// Shows the area in which entities with <see cref="Content.Shared.Wall.WallMountComponent" /> can be interacted from.
+/// </summary>
+public sealed class ShowWallmountsCommand : LocalizedCommands
+{
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+
+    public override string Command => "showwallmounts";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var existing = _overlay.RemoveOverlay<WallmountDebugOverlay>();
+        if (!existing)
+            _overlay.AddOverlay(new WallmountDebugOverlay());
+
+        shell.WriteLine(Loc.GetString("cmd-showwallmounts-status", ("status", !existing)));
+    }
+}
diff --git a/Content.Client/Wall/WallmountDebugOverlay.cs b/Content.Client/Wall/WallmountDebugOverlay.cs
new file mode 100644
index 0000000000..02fd9ebeec
--- /dev/null
+++ b/Content.Client/Wall/WallmountDebugOverlay.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Interaction;
+using Content.Shared.Wall;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using System.Numerics;
+
+namespace Content.Client.Wall;
+
+/// <summary>
+/// Shows the area in which entities with <see cref="WallMountComponent" /> can be interacted from.
+/// </summary>
+public sealed class WallmountDebugOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    private readonly SharedTransformSystem _transform;
+    private readonly EntityLookupSystem _lookup;
+    private readonly HashSet<Entity<WallMountComponent>> _intersecting = [];
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    public WallmountDebugOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+
+        _transform = _entManager.System<SharedTransformSystem>();
+        _lookup = _entManager.System<EntityLookupSystem>();
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        _intersecting.Clear();
+        _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds, _intersecting);
+        foreach (var ent in _intersecting)
+        {
+            var (worldPos, worldRot) = _transform.GetWorldPositionRotation(ent.Owner);
+            DrawArc(args.WorldHandle, worldPos, SharedInteractionSystem.InteractionRange, worldRot + ent.Comp.Direction, ent.Comp.Arc);
+        }
+    }
+
+    private static void DrawArc(DrawingHandleWorld handle, Vector2 position, float radius, Angle rot, Angle arc)
+    {
+        // 32 segments for a full circle, but 2 at least
+        var segments = Math.Max((int)(arc.Theta / Math.Tau * 32), 2);
+        var step = arc.Theta / (segments - 1);
+        var verts = new Vector2[segments + 1];
+
+        verts[0] = position;
+        for (var i = 0; i < segments; i++)
+        {
+            var angle = (float)(-arc.Theta / 2 + i * step - rot.Theta + Math.PI);
+            var pos = new Vector2(MathF.Sin(angle), MathF.Cos(angle));
+
+            verts[i + 1] = position + pos * radius;
+        }
+
+        handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, Color.Green.WithAlpha(0.5f));
+    }
+}
diff --git a/Resources/Locale/en-US/commands/show-wallmounts-command.ftl b/Resources/Locale/en-US/commands/show-wallmounts-command.ftl
new file mode 100644
index 0000000000..062a51d964
--- /dev/null
+++ b/Resources/Locale/en-US/commands/show-wallmounts-command.ftl
@@ -0,0 +1,3 @@
+cmd-showwallmounts-desc = Toggles showing wallmount interaction areas.
+cmd-showwallmounts-help = Usage: {$command}
+cmd-showwallmounts-status = Set wallmount debug overlay to {$status}.
diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml
index 1b75fa82d9..9c6c098258 100644
--- a/Resources/clientCommandPerms.yml
+++ b/Resources/clientCommandPerms.yml
@@ -73,6 +73,7 @@
     - fullstatereset
     - dumpentities
     - fuckrules # DeltaV: move fuckrules to DEBUG
+    - showwallmounts
     - showaccessreaders
     - quickinspect
 
@@ -88,6 +89,7 @@
     - showsubfloorforever
     - toggleautosave
     - toggledecals
+    - showwallmounts
     - showaccessreaders
 
 - Flags: QUERY

From 73301e68a6f2b1f49d8e3ee35948eb4da32ff73f Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 16 Dec 2025 12:37:27 -0800
Subject: [PATCH 122/360] Fix destructible benchmark OOMing (#41880)

* not working

* fix
---
 Content.Benchmarks/DestructibleBenchmark.cs | 43 ++++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/Content.Benchmarks/DestructibleBenchmark.cs b/Content.Benchmarks/DestructibleBenchmark.cs
index 1b54bacca0..aa759c35fc 100644
--- a/Content.Benchmarks/DestructibleBenchmark.cs
+++ b/Content.Benchmarks/DestructibleBenchmark.cs
@@ -51,6 +51,8 @@ public class DestructibleBenchmark
     private readonly List<Entity<DamageableComponent>> _damageables = new();
     private readonly List<Entity<DamageableComponent, DestructibleComponent>> _destructbiles = new();
 
+    private TestMapData _currentMapData = default!;
+
     private DamageSpecifier _damage;
 
     private TestPair _pair = default!;
@@ -70,8 +72,6 @@ public class DestructibleBenchmark
         _pair = await PoolManager.GetServerClient();
         var server = _pair.Server;
 
-        var mapdata = await _pair.CreateTestMap();
-
         _entMan = server.ResolveDependency<IEntityManager>();
         _protoMan = server.ResolveDependency<IPrototypeManager>();
         _random = server.ResolveDependency<IRobustRandom>();
@@ -86,19 +86,25 @@ public class DestructibleBenchmark
         _damage = new DamageSpecifier(type, DamageAmount);
 
         _random.SetSeed(69420); // Randomness needs to be deterministic for benchmarking.
+    }
 
+    [IterationSetup]
+    public void IterationSetup()
+    {
         var plating = _tileDefMan[TileRef].TileId;
+        var server = _pair.Server;
+        _currentMapData = _pair.CreateTestMap().GetAwaiter().GetResult();
 
         // We make a rectangular grid of destructible entities, and then damage them all simultaneously to stress test the system.
         // Needed for managing the performance of destructive effects and damage application.
-        await server.WaitPost(() =>
+        server.WaitPost(() =>
         {
             // Set up a thin line of tiles to place our objects on. They should be anchored for a "realistic" scenario...
             for (var x = 0; x < EntityCount; x++)
             {
                 for (var y = 0; y < _prototypes.Length; y++)
                 {
-                    _map.SetTile(mapdata.Grid, mapdata.Grid, new Vector2i(x, y), new Tile(plating));
+                    _map.SetTile(_currentMapData.Grid, _currentMapData.Grid, new Vector2i(x, y), new Tile(plating));
                 }
             }
 
@@ -107,7 +113,7 @@ public class DestructibleBenchmark
                 var y = 0;
                 foreach (var protoId in _prototypes)
                 {
-                    var coords = new EntityCoordinates(mapdata.Grid, x + 0.5f, y + 0.5f);
+                    var coords = new EntityCoordinates(_currentMapData.Grid, x + 0.5f, y + 0.5f);
                     _entMan.SpawnEntity(protoId, coords);
                     y++;
                 }
@@ -115,12 +121,17 @@ public class DestructibleBenchmark
 
             var query = _entMan.EntityQueryEnumerator<DamageableComponent, DestructibleComponent>();
 
+            _destructbiles.EnsureCapacity(EntityCount);
+            _damageables.EnsureCapacity(EntityCount);
+
             while (query.MoveNext(out var uid, out var damageable, out var destructible))
             {
                 _damageables.Add((uid, damageable));
                 _destructbiles.Add((uid, damageable, destructible));
             }
-        });
+        })
+        .GetAwaiter()
+        .GetResult();
     }
 
     [Benchmark]
@@ -150,6 +161,26 @@ public class DestructibleBenchmark
         });
     }
 
+    [IterationCleanup]
+    public void IterationCleanupAsync()
+    {
+        // We need to nuke the entire map and respawn everything as some destructible effects
+        // spawn entities and whatnot.
+        _pair.Server.WaitPost(() =>
+            {
+                _map.QueueDeleteMap(_currentMapData.MapId);
+            })
+            .Wait();
+
+        // Deletion of entities is often queued (QueueDel) which must be processed by running ticks
+        // or else it will grow infinitely and leak memory.
+        _pair.Server.WaitRunTicks(2)
+            .GetAwaiter()
+            .GetResult();
+
+        _destructbiles.Clear();
+        _damageables.Clear();
+    }
 
     [GlobalCleanup]
     public async Task CleanupAsync()

From 11c1ebcc8f2858ad7c1d6277f50f4ec32512394a Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 16 Dec 2025 15:30:15 -0800
Subject: [PATCH 123/360] Prevent Vestine and all other Botany chemicals from
 affecting all seeds. (#41883)

* EnsureUniqueSeed

* mfw

* aaaaaaaaaaaaa

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Server/Botany/Systems/PlantHolderSystem.cs   | 12 +++++++++---
 .../PlantAdjustPotencyEntityEffectSystem.cs          |  2 --
 .../PlantDestroySeedsEntityEffectSystem.cs           |  2 --
 .../PlantDiethylamineEntityEffectSystem.cs           |  3 ---
 .../PlantRestoreSeedsEntityEffectSystem.cs           |  2 --
 .../RobustHarvestEntityEffectSystem.cs               |  3 ---
 .../Chemistry/Reaction/ChemicalReactionSystem.cs     |  2 +-
 .../EntityEffects/SharedEntityEffectsSystem.cs       |  7 +++++++
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index d5f331c157..3959ffc47f 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -53,6 +53,7 @@ public sealed class PlantHolderSystem : EntitySystem
 
     public const float HydroponicsSpeedMultiplier = 1f;
     public const float HydroponicsConsumptionMultiplier = 2f;
+    public readonly FixedPoint2 PlantMetabolismRate = FixedPoint2.New(1);
 
     private static readonly ProtoId<TagPrototype> HoeTag = "Hoe";
     private static readonly ProtoId<TagPrototype> PlantSampleTakerTag = "PlantSampleTaker";
@@ -885,13 +886,18 @@ public sealed class PlantHolderSystem : EntitySystem
 
         if (solution.Volume > 0 && component.MutationLevel < 25)
         {
-            foreach (var entry in component.SoilSolution.Value.Comp.Solution.Contents)
+            // Don't apply any effects to a non-unique seed ever! Remove this when botany code is sane...
+            EnsureUniqueSeed(uid, component);
+            foreach (var entry in solution.Contents)
             {
+                if (entry.Quantity < PlantMetabolismRate)
+                    continue;
+
                 var reagentProto = _prototype.Index<ReagentPrototype>(entry.Reagent.Prototype);
-                _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray(), entry.Quantity.Float());
+                _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray(), entry.Quantity);
             }
 
-            _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, FixedPoint2.New(1));
+            _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, PlantMetabolismRate);
         }
 
         CheckLevelSanity(uid, component);
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
index ebe5c83181..f63d49f209 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
@@ -7,13 +7,11 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
 
 public sealed partial class PlantAdjustPotencyEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPotency>
 {
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
     protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPotency> args)
     {
         if (entity.Comp.Seed == null || entity.Comp.Dead)
             return;
 
-        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
         entity.Comp.Seed.Potency = Math.Max(entity.Comp.Seed.Potency + args.Effect.Amount, 1);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
index 1661c501be..5139c43c0f 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
@@ -9,7 +9,6 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
 
 public sealed partial class PlantDestroySeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDestroySeeds>
 {
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
 
     protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDestroySeeds> args)
@@ -20,7 +19,6 @@ public sealed partial class PlantDestroySeedsEntityEffectSystem : EntityEffectSy
         if (entity.Comp.Seed.Seedless)
             return;
 
-        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
         _popup.PopupEntity(
             Loc.GetString("botany-plant-seedsdestroyed"),
             entity,
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
index f6aebde465..4da542df93 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
@@ -9,7 +9,6 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
 public sealed partial class PlantDiethylamineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDiethylamine>
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
 
     protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDiethylamine> args)
     {
@@ -18,13 +17,11 @@ public sealed partial class PlantDiethylamineEntityEffectSystem : EntityEffectSy
 
         if (_random.Prob(0.1f))
         {
-            _plantHolder.EnsureUniqueSeed(entity, entity);
             entity.Comp.Seed!.Lifespan++;
         }
 
         if (_random.Prob(0.1f))
         {
-            _plantHolder.EnsureUniqueSeed(entity, entity);
             entity.Comp.Seed!.Endurance++;
         }
     }
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
index 4d724be244..a120a1eccd 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
@@ -8,7 +8,6 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
 
 public sealed partial class PlantRestoreSeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantRestoreSeeds>
 {
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
 
     protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantRestoreSeeds> args)
@@ -19,7 +18,6 @@ public sealed partial class PlantRestoreSeedsEntityEffectSystem : EntityEffectSy
         if (!entity.Comp.Seed.Seedless)
             return;
 
-        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
         _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), entity);
         entity.Comp.Seed.Seedless = false;
     }
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
index 68ea3319ef..a957de82b4 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
@@ -14,7 +14,6 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
 public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, RobustHarvest>
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
 
     protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<RobustHarvest> args)
     {
@@ -23,7 +22,6 @@ public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem
 
         if (entity.Comp.Seed.Potency < args.Effect.PotencyLimit)
         {
-            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
             entity.Comp.Seed.Potency = Math.Min(entity.Comp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
 
             if (entity.Comp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
@@ -34,7 +32,6 @@ public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem
         else if (entity.Comp.Seed.Yield > 1 && _random.Prob(0.1f))
         {
             // Too much of a good thing reduces yield
-            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
             entity.Comp.Seed.Yield--;
         }
     }
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index a995ef90f4..bc168521f8 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -211,7 +211,7 @@ namespace Content.Shared.Chemistry.Reaction
             _adminLogger.Add(LogType.ChemicalReaction, reaction.Impact,
                 $"Chemical reaction {reaction.ID:reaction} occurred with strength {unitReactions:strength} on entity {ToPrettyString(soln):metabolizer} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found]")}");
 
-            _entityEffects.ApplyEffects(soln, reaction.Effects, unitReactions.Float());
+            _entityEffects.ApplyEffects(soln, reaction.Effects, unitReactions);
 
             // Someday, some brave soul will thread through an optional actor
             // argument in from every call of OnReaction up, all just to pass
diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
index 8270f8bf7c..2da23a2502 100644
--- a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
+++ b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.EntityConditions;
+using Content.Shared.FixedPoint;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -58,6 +59,12 @@ public sealed partial class SharedEntityEffectsSystem : EntitySystem, IEntityEff
         }
     }
 
+    /// <inheritdoc cref="ApplyEffects(EntityUid,EntityEffect[],float,EntityUid?)"/>
+    public void ApplyEffects(EntityUid target, EntityEffect[] effects, FixedPoint2 scale, EntityUid? user = null)
+    {
+        ApplyEffects(target, effects, scale.Float());
+    }
+
     /// <summary>
     /// Applies a list of entity effects to a target entity.
     /// </summary>

From f34424d9cd8f916c9064a4a7fff5bd4ae5299caf Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Wed, 17 Dec 2025 00:45:34 +0100
Subject: [PATCH 124/360] TriggerOnIngested (#41875)

* init

* nobody will ever know i copy paste

* i hate these names

* comment

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Triggers/TriggerOnIngestedComponent.cs    | 17 ++++++++++++++
 .../Systems/TriggerOnIngestedSystem.cs        | 23 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs
 create mode 100644 Content.Shared/Trigger/Systems/TriggerOnIngestedSystem.cs

diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs
new file mode 100644
index 0000000000..e8bd920e64
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the owner of this component is ingested, like a pill or food.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnIngestedComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Whether the fed entity is the user.
+    /// If false, the entity feeding will be the user.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool EatingIsUser = true;
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnIngestedSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnIngestedSystem.cs
new file mode 100644
index 0000000000..1e199e840e
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnIngestedSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Nutrition;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnIngestedSystem : TriggerOnXSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnIngestedComponent, IngestedEvent>(OnIngested);
+    }
+
+    private void OnIngested(Entity<TriggerOnIngestedComponent> ent, ref IngestedEvent args)
+    {
+        // args.Target is the entity being fed, while args.User is the entity doing the feeding.
+        // Since they are not always equal (feeding someone by force, for example) we use a bool to decide which one is the trigger user.
+        var user = ent.Comp.EatingIsUser ? args.Target : args.User;
+
+        Trigger.Trigger(ent.Owner, user, ent.Comp.KeyOut);
+    }
+}

From 88b1f3e05350402adb9944efa52bdf72818f8bd4 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Wed, 17 Dec 2025 03:24:54 -0500
Subject: [PATCH 125/360] Remove flammability mass (#41803)

* Remove flammability mass

* Adjust mass fudge number

* Remove fudge
---
 Content.Server/Atmos/EntitySystems/FlammableSystem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index f630e4e610..bd05a2c9ec 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -145,8 +145,8 @@ namespace Content.Server.Atmos.EntitySystems
             if (!TryComp<PhysicsComponent>(uid, out var body))
                 return;
 
-            _fixture.TryCreateFixture(uid, component.FlammableCollisionShape, component.FlammableFixtureID, hard: false,
-                collisionMask: (int) CollisionGroup.FullTileLayer, body: body);
+            _fixture.TryCreateFixture(uid, component.FlammableCollisionShape, component.FlammableFixtureID, density: 0,
+                hard: false, collisionMask: (int) CollisionGroup.FullTileLayer, body: body);
         }
 
         private void OnInteractUsing(EntityUid uid, FlammableComponent flammable, InteractUsingEvent args)
@@ -228,7 +228,7 @@ namespace Content.Server.Atmos.EntitySystems
             // Get the average of both entity's firestacks * mass
             // Then for each entity, we divide the average by their mass and set their firestacks to that value
             // An entity with a higher mass will lose some fire and transfer it to the one with lower mass.
-            var avg = (flammable.FireStacks * mass1  + otherFlammable.FireStacks * mass2) / 2f;
+            var avg = (flammable.FireStacks * mass1 + otherFlammable.FireStacks * mass2) / 2f;
 
             // bring each entity to the same firestack mass, firestack amount is scaled by the inverse of the entity's mass
             SetFireStacks(uid, avg / mass1, flammable, ignite: true);

From 8bfca87c4d4ea62a7cee383793b417c91b725390 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Wed, 17 Dec 2025 19:15:49 +0100
Subject: [PATCH 126/360] Fix prototypes so they pass analyzer checks (again)
 (AGAIN) (#41882)

fix
---
 Content.Server/Worldgen/Prototypes/BiomePrototype.cs        | 2 +-
 Content.Server/Worldgen/Prototypes/NoiseChannelPrototype.cs | 2 +-
 Content.Shared/Maps/ContentTileDefinition.cs                | 2 +-
 .../Preferences/Loadouts/LoadoutGroupPrototype.cs           | 6 +++---
 .../Silicons/StationAi/StationAiCustomizationPrototype.cs   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
index 1c3633fb5f..75e4670e88 100644
--- a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
+++ b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
@@ -13,7 +13,7 @@ namespace Content.Server.Worldgen.Prototypes;
 public sealed partial class BiomePrototype : IPrototype, IInheritingPrototype
 {
     /// <inheritdoc />
-    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EntityPrototype>))]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<BiomePrototype>))]
     public string[]? Parents { get; private set; }
 
     /// <inheritdoc />
diff --git a/Content.Server/Worldgen/Prototypes/NoiseChannelPrototype.cs b/Content.Server/Worldgen/Prototypes/NoiseChannelPrototype.cs
index 98ba2d5b31..41d89cbaa7 100644
--- a/Content.Server/Worldgen/Prototypes/NoiseChannelPrototype.cs
+++ b/Content.Server/Worldgen/Prototypes/NoiseChannelPrototype.cs
@@ -83,7 +83,7 @@ public class NoiseChannelConfig
 public sealed partial class NoiseChannelPrototype : NoiseChannelConfig, IPrototype, IInheritingPrototype
 {
     /// <inheritdoc />
-    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EntityPrototype>))]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<NoiseChannelPrototype>))]
     public string[]? Parents { get; private set; }
 
     /// <inheritdoc />
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 64975b5616..46ce7a212e 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -19,7 +19,7 @@ namespace Content.Shared.Maps
 
         public const string SpaceID = "Space";
 
-        [ParentDataFieldAttribute(typeof(AbstractPrototypeIdArraySerializer<ContentTileDefinition>))]
+        [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<ContentTileDefinition>))]
         public string[]? Parents { get; private set; }
 
         [NeverPushInheritance]
diff --git a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
index b65f332885..40a168c067 100644
--- a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
@@ -13,8 +13,8 @@ public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingProto
     public string ID { get; private set; } = string.Empty;
 
     /// <inheritdoc />
-    [ParentDataFieldAttribute(typeof(AbstractPrototypeIdArraySerializer<LoadoutGroupPrototype>))]
-    public string[]? Parents { get; }
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<LoadoutGroupPrototype>))]
+    public string[]? Parents { get; private set; }
 
     /// <inheritdoc />
     [NeverPushInheritance]
@@ -32,7 +32,7 @@ public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingProto
     /// </summary>
     [DataField]
     public int MinLimit = 1;
-    
+
     /// <summary>
     /// Number of loadouts that are selected by default.
     /// </summary>
diff --git a/Content.Shared/Silicons/StationAi/StationAiCustomizationPrototype.cs b/Content.Shared/Silicons/StationAi/StationAiCustomizationPrototype.cs
index eae6f51477..a83ac79318 100644
--- a/Content.Shared/Silicons/StationAi/StationAiCustomizationPrototype.cs
+++ b/Content.Shared/Silicons/StationAi/StationAiCustomizationPrototype.cs
@@ -41,7 +41,7 @@ public sealed partial class StationAiCustomizationPrototype : IPrototype, IInher
     /// The prototype we inherit from.
     /// </summary>
     [ViewVariables]
-    [ParentDataFieldAttribute(typeof(AbstractPrototypeIdArraySerializer<StationAiCustomizationPrototype>))]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StationAiCustomizationPrototype>))]
     public string[]? Parents { get; private set; }
 
     /// <summary>

From 7fc0e3cb26155b6777e4e7661038b07bc3a1168a Mon Sep 17 00:00:00 2001
From: Nikovnik <116634167+nkokic@users.noreply.github.com>
Date: Wed, 17 Dec 2025 20:21:16 +0100
Subject: [PATCH 127/360] Metabolizing bloodstream (#35071)

* merged chemical into bloodstream

* changed injectable to bloodstream

* separated bleeding and direct blood removal

* removed blood gain from protein

* reduced blood gain from saline

* rejuvenating fills to reference volume

* fixed blood regulation

* red mead requires stirring to make

* reverted accidental line deletion

* cleared the skeletons from the closet

* additional routing

* field rename for xeno

* removed mention of chemstream and field rename for asteroid mobs

* minor optimizations

* Revert "reduced blood gain from saline"

This reverts commit de26fd1c0d99f3019fe7dd1451a50230cc90f058.

* Revert "removed blood gain from protein"

This reverts commit 7a1648caf39fe26406db73c2a5afa389b82c612f.

* removed unused component fetch

* dead check mini refactor

* eventized blood exclusion

* quick fix

* Pain

* Commit of doom

* COMMIT

* renamed bloodMaxFactor to MaxVolumeFactor

* addressed floating point error

* returned vomiting chemicals

* blood reagent always skips the flush

* no need to mention blood reagent

* fixed passing blood flush

* adadsafasfasfassfasf

* whoops

* merge fixed injectors

* Revert "adadsafasfasfassfasf"

This reverts commit 0a5313a68dd6484d36d28d08930c76851b72ae38.

* simplify reagent removal

* enabled foreign blood transfusion

* Revert "COMMIT"

This reverts commit 19abd679cd7761ebd47bb242bd644176a3006a42.

* simplified reagent removal when modifying blood level

* removed misleading coment since the changes

* documented MetabolismExclusionEvent

* fixed negative negative modification of blood level

* fixed hypervolemia not normalizing

* constrainted blood modification

* returned bloodpack stop on fully healed

* forgot to stage this

* band aid for diona blood

* swapping GetReagent with GetPrototype

* optimize blood filtering

* multiplicative multi reagent blood level calculation

* removed unused stuff

* optimized blood calculation a tiny bit

* added per reagent blood regulation

* optimized (referenceVolume + bloodReagents) into referenceSolution

* polished coded to proper function

* forgot to stage rootable system change

* clean up, unnecessary GetBloodLevel call

* rename method name to TryAddToBloodstream instead of Chemicals

* placed overfill safety

* cleanup and final touches

* final touch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Body/Components/MetabolizerComponent.cs   |   2 +-
 .../Body/Systems/BloodstreamSystem.cs         |  10 +-
 .../Body/Systems/MetabolizerSystem.cs         |  24 +-
 .../SolutionInjectOnEventSystem.cs            |   2 +-
 .../Fluids/EntitySystems/SmokeSystem.cs       |   6 +-
 .../Medical/HealthAnalyzerSystem.cs           |   6 +-
 .../Nutrition/EntitySystems/SmokingSystem.cs  |   2 +-
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 .../Body/Components/BloodstreamComponent.cs   |  28 +--
 .../Body/Components/StomachComponent.cs       |   2 +-
 .../Body/Events/MetabolismExclusionEvent.cs   |   8 +
 .../Body/Systems/SharedBloodstreamSystem.cs   | 192 ++++++++++------
 Content.Shared/Devour/DevourSystem.cs         |   2 +-
 .../CleanBloodstreamEntityEffectSystem.cs     |   2 +-
 .../Medical/Cryogenics/SharedCryoPodSystem.cs |   2 +-
 .../Medical/Healing/HealingSystem.cs          |   2 +-
 Content.Shared/Medical/VomitSystem.cs         |  15 +-
 Content.Shared/Rootable/RootableSystem.cs     |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 214 ++++++++++++++----
 .../Entities/Mobs/NPCs/argocyte.yml           |   5 +-
 .../Entities/Mobs/NPCs/asteroid.yml           |  12 +-
 .../Entities/Mobs/NPCs/behonker.yml           |   5 +-
 .../Entities/Mobs/NPCs/elemental.yml          |  53 +++--
 .../Prototypes/Entities/Mobs/NPCs/flesh.yml   |  10 +-
 .../Entities/Mobs/NPCs/miscellaneous.yml      |   6 +-
 .../Entities/Mobs/NPCs/simplemob.yml          |   5 +-
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  |   4 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |  20 +-
 .../Entities/Mobs/NPCs/spacetick.yml          |   5 +-
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |  10 +-
 .../Entities/Mobs/Player/dragon.yml           |   5 +-
 .../Entities/Mobs/Species/arachnid.yml        |   4 +-
 .../Entities/Mobs/Species/diona.yml           |   4 +-
 .../Entities/Mobs/Species/gingerbread.yml     |   6 +-
 .../Prototypes/Entities/Mobs/Species/moth.yml |   4 +-
 .../Entities/Mobs/Species/slime.yml           |   4 +-
 .../Prototypes/Entities/Mobs/Species/vox.yml  |   4 +-
 Resources/Prototypes/Entities/Mobs/base.yml   |   2 +-
 .../Prototypes/Recipes/Reactions/drinks.yml   |   2 +
 .../Prototypes/Recipes/Reactions/fun.yml      |   2 +
 .../Recipes/Reactions/single_reagent.yml      |   2 +
 41 files changed, 450 insertions(+), 251 deletions(-)
 create mode 100644 Content.Shared/Body/Events/MetabolismExclusionEvent.cs

diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 46d2fdd8e8..2401db5aac 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -42,7 +42,7 @@ namespace Content.Server.Body.Components
         ///     From which solution will this metabolizer attempt to metabolize chemicals
         /// </summary>
         [DataField("solution")]
-        public string SolutionName = BloodstreamComponent.DefaultChemicalsSolutionName;
+        public string SolutionName = BloodstreamComponent.DefaultBloodSolutionName;
 
         /// <summary>
         ///     Does this component use a solution on it's parent entity (the body) or itself
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index a58deec494..08f640711a 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -21,9 +21,6 @@ public sealed class BloodstreamSystem : SharedBloodstreamSystem
     private void OnComponentInit(Entity<BloodstreamComponent> entity, ref ComponentInit args)
     {
         if (!SolutionContainer.EnsureSolution(entity.Owner,
-                entity.Comp.ChemicalSolutionName,
-                out var chemicalSolution) ||
-            !SolutionContainer.EnsureSolution(entity.Owner,
                 entity.Comp.BloodSolutionName,
                 out var bloodSolution) ||
             !SolutionContainer.EnsureSolution(entity.Owner,
@@ -31,14 +28,13 @@ public sealed class BloodstreamSystem : SharedBloodstreamSystem
                 out var tempSolution))
             return;
 
-        chemicalSolution.MaxVolume = entity.Comp.ChemicalMaxVolume;
-        bloodSolution.MaxVolume = entity.Comp.BloodMaxVolume;
+        bloodSolution.MaxVolume = entity.Comp.BloodReferenceSolution.Volume * entity.Comp.MaxVolumeModifier;
         tempSolution.MaxVolume = entity.Comp.BleedPuddleThreshold * 4; // give some leeway, for chemstream as well
 
         // Fill blood solution with BLOOD
         // The DNA string might not be initialized yet, but the reagent data gets updated in the GenerateDnaEvent subscription
-        var solution = entity.Comp.BloodReagents.Clone();
-        solution.ScaleTo(entity.Comp.BloodMaxVolume - bloodSolution.Volume);
+        var solution = entity.Comp.BloodReferenceSolution.Clone();
+        solution.ScaleTo(entity.Comp.BloodReferenceSolution.Volume - bloodSolution.Volume);
         solution.SetReagentData(GetEntityBloodData(entity.Owner));
         bloodSolution.AddSolution(solution, PrototypeManager);
     }
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index b5b30ae74c..35c7b0572a 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
@@ -14,7 +15,6 @@ using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.EntityEffects.Effects.Solution;
 using Content.Shared.FixedPoint;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Collections;
@@ -134,17 +134,30 @@ public sealed class MetabolizerSystem : SharedMetabolizerSystem
             return;
         }
 
+        // Copy the solution do not edit the original solution list
+        var list = solution.Contents.ToList();
+
+        // Collecting blood reagent for filtering
+        var bloodList = new List<string>();
+        var ev = new MetabolismExclusionEvent(bloodList);
+        RaiseLocalEvent(solutionEntityUid.Value, ref ev);
+
         // randomize the reagent list so we don't have any weird quirks
         // like alphabetical order or insertion order mattering for processing
-        var list = solution.Contents.ToArray();
         _random.Shuffle(list);
 
+        bool isDead = _mobStateSystem.IsDead(solutionEntityUid.Value);
+
         int reagents = 0;
         foreach (var (reagent, quantity) in list)
         {
             if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
                 continue;
 
+            // Skip blood reagents
+            if (bloodList.Contains(reagent.Prototype))
+                continue;
+
             var mostToRemove = FixedPoint2.Zero;
             if (proto.Metabolisms is null)
             {
@@ -186,11 +199,8 @@ public sealed class MetabolizerSystem : SharedMetabolizerSystem
                 // if it's possible for them to be dead, and they are,
                 // then we shouldn't process any effects, but should probably
                 // still remove reagents
-                if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
-                {
-                    if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
-                        continue;
-                }
+                if (isDead && !proto.WorksOnTheDead)
+                    continue;
 
                 var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
 
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
index 7b4deea9f4..e6e1642295 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -148,7 +148,7 @@ public sealed class SolutionInjectOnCollideSystem : EntitySystem
             // Take our portion of the adjusted solution for this target
             var individualInjection = solutionToInject.SplitSolution(volumePerBloodstream);
             // Inject our portion into the target's bloodstream
-            if (_bloodstream.TryAddToChemicals(targetBloodstream.AsNullable(), individualInjection))
+            if (_bloodstream.TryAddToBloodstream(targetBloodstream.AsNullable(), individualInjection))
                 anySuccess = true;
         }
 
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 7c9d02c561..c787132504 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -264,14 +264,14 @@ public sealed class SmokeSystem : EntitySystem
         if (!TryComp<BloodstreamComponent>(entity, out var bloodstream))
             return;
 
-        if (!_solutionContainerSystem.ResolveSolution(entity, bloodstream.ChemicalSolutionName, ref bloodstream.ChemicalSolution, out var chemSolution) || chemSolution.AvailableVolume <= 0)
+        if (!_solutionContainerSystem.ResolveSolution(entity, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution) || bloodSolution.AvailableVolume <= 0)
             return;
 
         var blockIngestion = _internals.AreInternalsWorking(entity);
 
         var cloneSolution = solution.Clone();
         var availableTransfer = FixedPoint2.Min(cloneSolution.Volume, component.TransferRate);
-        var transferAmount = FixedPoint2.Min(availableTransfer, chemSolution.AvailableVolume);
+        var transferAmount = FixedPoint2.Min(availableTransfer, bloodSolution.AvailableVolume);
         var transferSolution = cloneSolution.SplitSolution(transferAmount);
 
         foreach (var reagentQuantity in transferSolution.Contents.ToArray())
@@ -287,7 +287,7 @@ public sealed class SmokeSystem : EntitySystem
         if (blockIngestion)
             return;
 
-        if (_blood.TryAddToChemicals((entity, bloodstream), transferSolution))
+        if (_blood.TryAddToBloodstream((entity, bloodstream), transferSolution))
         {
             // Log solution addition by smoke
             _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):target} ingested smoke {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 5bd0000f5d..3d19708139 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -18,6 +18,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
+using Content.Server.Body.Systems;
 
 // Shitmed Change
 using Content.Shared.Body.Part;
@@ -44,7 +45,8 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly MedicalRecordsSystem _medicalRecords = default!;
+    [Dependency] private readonly MedicalRecordsSystem _medicalRecords = default!; // DeltaV - Medical Records
+    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
 
     public override void Initialize()
     {
@@ -297,7 +299,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
             _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName,
                 ref bloodstream.BloodSolution, out var bloodSolution))
         {
-            bloodAmount = bloodSolution.FillFraction;
+            bloodAmount = _bloodstreamSystem.GetBloodLevel(target);
             bleeding = bloodstream.BleedAmount > 0;
         }
 
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index 4960ff1ba8..ae35fa4825 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -157,7 +157,7 @@ namespace Content.Server.Nutrition.EntitySystems
                 }
 
                 _reactiveSystem.DoEntityReaction(containerManager.Owner, inhaledSolution, ReactionMethod.Ingestion);
-                _bloodstreamSystem.TryAddToChemicals((containerManager.Owner, bloodstream), inhaledSolution);
+                _bloodstreamSystem.TryAddToBloodstream((containerManager.Owner, bloodstream), inhaledSolution);
             }
 
             _timer -= UpdateTimer;
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index c47549b8ba..9bd410e2d3 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -208,7 +208,7 @@ public sealed partial class ZombieSystem
             zombiecomp.BeforeZombifiedSkinColor = huApComp.SkinColor;
             zombiecomp.BeforeZombifiedEyeColor = huApComp.EyeColor;
             zombiecomp.BeforeZombifiedCustomBaseLayers = new(huApComp.CustomBaseLayers);
-            if (TryComp<BloodstreamComponent>(target, out var stream) && stream.BloodReagents is { } reagents)
+            if (TryComp<BloodstreamComponent>(target, out var stream) && stream.BloodReferenceSolution is { } reagents)
                 zombiecomp.BeforeZombifiedBloodReagents = reagents.Clone();
 
             _humanoidAppearance.SetSkinColor(target, zombiecomp.SkinColor, verify: false, humanoid: huApComp);
diff --git a/Content.Shared/Body/Components/BloodstreamComponent.cs b/Content.Shared/Body/Components/BloodstreamComponent.cs
index 2ebfae6f33..8309397b62 100644
--- a/Content.Shared/Body/Components/BloodstreamComponent.cs
+++ b/Content.Shared/Body/Components/BloodstreamComponent.cs
@@ -19,7 +19,6 @@ namespace Content.Shared.Body.Components;
 [Access(typeof(SharedBloodstreamSystem))]
 public sealed partial class BloodstreamComponent : Component
 {
-    public const string DefaultChemicalsSolutionName = "chemicals";
     public const string DefaultBloodSolutionName = "bloodstream";
     public const string DefaultBloodTemporarySolutionName = "bloodstreamTemporary";
 
@@ -138,26 +137,19 @@ public sealed partial class BloodstreamComponent : Component
     // TODO probably damage bleed thresholds.
 
     /// <summary>
-    /// Max volume of internal chemical solution storage
+    /// Modifier applied to <see cref="BloodReferenceSolution.Volume"/> to determine maximum volume for bloodstream.
     /// </summary>
     [DataField]
-    public FixedPoint2 ChemicalMaxVolume = FixedPoint2.New(250);
+    public float MaxVolumeModifier = 2f;
 
     /// <summary>
-    /// Max volume of internal blood storage,
-    /// and starting level of blood.
-    /// </summary>
-    [DataField]
-    public FixedPoint2 BloodMaxVolume = FixedPoint2.New(300);
-
-    /// <summary>
-    /// Which reagents are considered this entities 'blood'?
+    /// Defines which reagents are considered as 'blood' and how much of it is normal.
     /// </summary>
     /// <remarks>
     /// Slime-people might use slime as their blood or something like that.
     /// </remarks>
     [DataField, AutoNetworkedField]
-    public Solution BloodReagents = new([new("Blood", 1)]);
+    public Solution BloodReferenceSolution = new([new("Blood", 300)]);
 
     /// <summary>
     /// Name/Key that <see cref="BloodSolution"/> is indexed by.
@@ -165,12 +157,6 @@ public sealed partial class BloodstreamComponent : Component
     [DataField]
     public string BloodSolutionName = DefaultBloodSolutionName;
 
-    /// <summary>
-    /// Name/Key that <see cref="ChemicalSolution"/> is indexed by.
-    /// </summary>
-    [DataField]
-    public string ChemicalSolutionName = DefaultChemicalsSolutionName;
-
     /// <summary>
     /// Name/Key that <see cref="TemporarySolution"/> is indexed by.
     /// </summary>
@@ -183,12 +169,6 @@ public sealed partial class BloodstreamComponent : Component
     [ViewVariables]
     public Entity<SolutionComponent>? BloodSolution;
 
-    /// <summary>
-    /// Internal solution for reagent storage
-    /// </summary>
-    [ViewVariables]
-    public Entity<SolutionComponent>? ChemicalSolution;
-
     /// <summary>
     /// Temporary blood solution.
     /// When blood is lost, it goes to this solution, and when this
diff --git a/Content.Shared/Body/Components/StomachComponent.cs b/Content.Shared/Body/Components/StomachComponent.cs
index ca20cc544a..e1413de9e4 100644
--- a/Content.Shared/Body/Components/StomachComponent.cs
+++ b/Content.Shared/Body/Components/StomachComponent.cs
@@ -45,7 +45,7 @@ namespace Content.Shared.Body.Components
         ///     What solution should this stomach push reagents into, on the body?
         /// </summary>
         [DataField]
-        public string BodySolutionName = "chemicals";
+        public string BodySolutionName = BloodstreamComponent.DefaultBloodSolutionName;
 
         /// <summary>
         ///     Time between reagents being ingested and them being
diff --git a/Content.Shared/Body/Events/MetabolismExclusionEvent.cs b/Content.Shared/Body/Events/MetabolismExclusionEvent.cs
new file mode 100644
index 0000000000..791b8ed959
--- /dev/null
+++ b/Content.Shared/Body/Events/MetabolismExclusionEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Body.Events;
+
+/// <summary>
+/// Event called by <see cref="Content.Server.Body.Systems.MetabolizerSystem"/> to get a list of
+/// blood like reagents for metabolism to skip.
+/// </summary>
+[ByRefEvent]
+public readonly record struct MetabolismExclusionEvent(List<string> ReagentList);
\ No newline at end of file
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index e108cbfb27..7c8fca6deb 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Alert;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
@@ -53,6 +54,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
         SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
         SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<BloodstreamComponent, MetabolismExclusionEvent>(OnMetabolismExclusion);
     }
 
     public override void Update(float frameTime)
@@ -72,11 +74,8 @@ public abstract class SharedBloodstreamSystem : EntitySystem
             if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
                 continue;
 
-            // Adds blood to their blood level if it is below the maximum; Blood regeneration. Must be alive.
-            if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
-            {
-                TryModifyBloodLevel((uid, bloodstream), bloodstream.BloodRefreshAmount);
-            }
+            // Blood level regulation. Must be alive.
+            TryRegulateBloodLevel(uid, bloodstream.BloodRefreshAmount);
 
             // Removes blood from the bloodstream based on bleed amount (bleed rate)
             // as well as stop their bleeding to a certain extent.
@@ -86,14 +85,14 @@ public abstract class SharedBloodstreamSystem : EntitySystem
                 RaiseLocalEvent(uid, ref ev);
 
                 // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
-                TryModifyBloodLevel((uid, bloodstream), -ev.BleedAmount);
+                TryBleedOut((uid, bloodstream), ev.BleedAmount);
 
                 // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
                 TryModifyBleedAmount((uid, bloodstream), -ev.BleedReductionAmount);
             }
 
             // deal bloodloss damage if their blood level is below a threshold.
-            var bloodPercentage = GetBloodLevelPercentage((uid, bloodstream));
+            var bloodPercentage = GetBloodLevel(uid);
             if (bloodPercentage < bloodstream.BloodlossThreshold && !_mobStateSystem.IsDead(uid))
             {
                 // bloodloss damage is based on the base value, and modified by how low your blood level is.
@@ -133,9 +132,6 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         if (args.Entity == entity.Comp.BloodSolution?.Owner)
             entity.Comp.BloodSolution = null;
 
-        if (args.Entity == entity.Comp.ChemicalSolution?.Owner)
-            entity.Comp.ChemicalSolution = null;
-
         if (args.Entity == entity.Comp.TemporarySolution?.Owner)
             entity.Comp.TemporarySolution = null;
     }
@@ -170,7 +166,6 @@ public abstract class SharedBloodstreamSystem : EntitySystem
     private void OnReactionAttempt(Entity<BloodstreamComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
     {
         if (args.Name != ent.Comp.BloodSolutionName
-            && args.Name != ent.Comp.ChemicalSolutionName
             && args.Name != ent.Comp.BloodTemporarySolutionName)
         {
             return;
@@ -221,7 +216,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         var prob = Math.Clamp(totalFloat / 25, 0, 1);
         if (totalFloat > 0 && rand.Prob(prob))
         {
-            TryModifyBloodLevel(ent.AsNullable(), -total / 5);
+            TryBleedOut(ent.AsNullable(), total / 5);
             _audio.PlayPredicted(ent.Comp.InstantBloodSound, ent, args.Origin);
         }
 
@@ -269,7 +264,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         }
 
         // If the mob's blood level is below the damage threshhold, the pale message is added.
-        if (GetBloodLevelPercentage(ent.AsNullable()) < ent.Comp.BloodlossThreshold)
+        if (GetBloodLevel(ent.AsNullable()) < ent.Comp.BloodlossThreshold)
         {
             args.Message.PushNewline();
             args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
@@ -291,25 +286,46 @@ public abstract class SharedBloodstreamSystem : EntitySystem
     {
         TryModifyBleedAmount(ent.AsNullable(), -ent.Comp.BleedAmount);
 
-        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
-            TryModifyBloodLevel(ent.AsNullable(), bloodSolution.AvailableVolume);
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution))
+        {
+            SolutionContainer.RemoveAllSolution(ent.Comp.BloodSolution.Value);
+            TryModifyBloodLevel(ent.AsNullable(), ent.Comp.BloodReferenceSolution.Volume);
+        }
+    }
 
-        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution))
-            SolutionContainer.RemoveAllSolution(ent.Comp.ChemicalSolution.Value);
+    private void OnMetabolismExclusion(Entity<BloodstreamComponent> ent, ref MetabolismExclusionEvent args)
+    {
+        // Adding all blood reagents for filtering blood in metabolizer
+        foreach (var (reagentId, _) in ent.Comp.BloodReferenceSolution)
+        {
+            args.ReagentList.Add(reagentId.Prototype);
+        }
     }
 
     /// <summary>
-    /// Returns the current blood level as a percentage (between 0 and 1).
+    /// This returns the minimum amount of *usable* blood.
+    /// For multi reagent bloodstreams, if you have 100 of Reagent Y need 100, and 50 of Reagent X and need 100,
+    /// this will return 0.5f
     /// </summary>
-    public float GetBloodLevelPercentage(Entity<BloodstreamComponent?> ent)
+    /// <returns>Returns the current blood level as a value from 0 to <see cref="BloodstreamComponent.MaxVolumeModifier"/></returns>
+    public float GetBloodLevel(Entity<BloodstreamComponent?> entity)
     {
-        if (!Resolve(ent, ref ent.Comp)
-            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        if (!Resolve(entity, ref entity.Comp)
+            || !SolutionContainer.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution)
+            || entity.Comp.BloodReferenceSolution.Volume == 0)
         {
             return 0.0f;
         }
 
-        return bloodSolution.FillFraction;
+        var totalBloodLevel = FixedPoint2.New(entity.Comp.MaxVolumeModifier); // Can't go above max volume factor...
+
+        foreach (var (reagentId, quantity) in entity.Comp.BloodReferenceSolution.Contents)
+        {
+            // Ideally we use a different calculation for blood pressure, this just defines how much *usable* blood you have!
+            totalBloodLevel = FixedPoint2.Min(totalBloodLevel, bloodSolution.GetTotalPrototypeQuantity(reagentId.Prototype) / quantity);
+        }
+
+        return (float)totalBloodLevel;
     }
 
     /// <summary>
@@ -327,33 +343,95 @@ public abstract class SharedBloodstreamSystem : EntitySystem
     /// <summary>
     /// Attempt to transfer a provided solution to internal solution.
     /// </summary>
-    public bool TryAddToChemicals(Entity<BloodstreamComponent?> ent, Solution solution)
+    public bool TryAddToBloodstream(Entity<BloodstreamComponent?> ent, Solution solution)
     {
         if (!Resolve(ent, ref ent.Comp, logMissing: false)
-            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution))
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution))
             return false;
 
-        if (SolutionContainer.TryAddSolution(ent.Comp.ChemicalSolution.Value, solution))
+        if (SolutionContainer.TryAddSolution(ent.Comp.BloodSolution.Value, solution))
             return true;
 
         return false;
     }
 
     /// <summary>
-    /// Removes a certain amount of all reagents except of a single excluded one from the bloodstream.
+    /// Removes a certain amount of all reagents except of a single excluded one from the bloodstream and blood itself.
     /// </summary>
-    public bool FlushChemicals(Entity<BloodstreamComponent?> ent, ProtoId<ReagentPrototype>? excludedReagentID, FixedPoint2 quantity)
+    /// <returns>
+    /// Solution of removed chemicals or null if none were removed.
+    /// </returns>
+    public Solution? FlushChemicals(Entity<BloodstreamComponent?> ent, FixedPoint2 quantity, ProtoId<ReagentPrototype>? excludedReagent = null )
     {
         if (!Resolve(ent, ref ent.Comp, logMissing: false)
-            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution, out var chemSolution))
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+            return null;
+
+        var flushedSolution = new Solution();
+
+        for (var i = bloodSolution.Contents.Count - 1; i >= 0; i--)
+        {
+            var (reagentId, _) = bloodSolution.Contents[i];
+            if (ent.Comp.BloodReferenceSolution.ContainsPrototype(reagentId.Prototype) || reagentId.Prototype == excludedReagent)
+                continue;
+
+            var reagentFlushAmount = SolutionContainer.RemoveReagent(ent.Comp.BloodSolution.Value, reagentId, quantity);
+            flushedSolution.AddReagent(reagentId, reagentFlushAmount);
+        }
+
+        return flushedSolution.Volume == 0 ? null : flushedSolution;
+    }
+
+    /// <summary>
+    /// A simple helper that tries to move blood volume up or down by a specified amount.
+    /// Blood will not go over normal volume for this entity's bloodstream.
+    /// </summary>
+    public bool TryModifyBloodLevel(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
+    {
+        var reference = 1f;
+
+        if (amount < 0)
+        {
+            reference = 0f;
+            amount *= -1;
+        }
+
+        return TryRegulateBloodLevel(ent, amount, reference);
+    }
+
+    /// <summary>
+    /// Attempts to bring an entity's blood level to a modified equilibrium volume.
+    /// </summary>
+    /// <param name="ent">Entity whose bloodstream we're modifying.</param>
+    /// <param name="amount">The absolute maximum amount of blood we can add or remove.</param>
+    /// <param name="referenceFactor">The modifier for an entity's blood equilibrium, try to hit an entity's default blood volume multiplied by this value.</param>
+    /// <remarks>This CANNOT go above maximum blood volume!</remarks>
+    /// <returns>False if we were unable to regulate blood level. This may return true even if blood level doesn't change!</returns>
+    public bool TryRegulateBloodLevel(Entity<BloodstreamComponent?> ent, FixedPoint2 amount, float referenceFactor = 1f)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution)
+            || amount == 0)
             return false;
 
-        for (var i = chemSolution.Contents.Count - 1; i >= 0; i--)
+        referenceFactor = Math.Clamp(referenceFactor, 0f, ent.Comp.MaxVolumeModifier);
+
+        foreach (var (referenceReagent, referenceQuantity) in ent.Comp.BloodReferenceSolution)
         {
-            var (reagentId, _) = chemSolution.Contents[i];
-            if (reagentId.Prototype != excludedReagentID)
+            var error = referenceQuantity * referenceFactor - bloodSolution.GetTotalPrototypeQuantity(referenceReagent.Prototype);
+            var adjustedAmount = amount * referenceQuantity / ent.Comp.BloodReferenceSolution.Volume;
+
+            if (error > 0)
             {
-                SolutionContainer.RemoveReagent(ent.Comp.ChemicalSolution.Value, reagentId, quantity);
+                error = FixedPoint2.Min(error, adjustedAmount);
+                var reagentToAdd = new ReagentId(referenceReagent.Prototype, GetEntityBloodData(ent));
+                bloodSolution.AddReagent(reagentToAdd, error);
+            }
+            else if (error < 0)
+            {
+                // invert the error since we're removing reagents...
+                error = FixedPoint2.Min( -error, adjustedAmount);
+                bloodSolution.RemoveReagent(referenceReagent, error);
             }
         }
 
@@ -361,43 +439,26 @@ public abstract class SharedBloodstreamSystem : EntitySystem
     }
 
     /// <summary>
-    ///  Attempts to modify the blood level of this entity directly.
+    /// Removes blood by spilling out the bloodstream.
     /// </summary>
-    public bool TryModifyBloodLevel(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
+    public bool TryBleedOut(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
     {
         if (!Resolve(ent, ref ent.Comp, logMissing: false)
-            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
-            return false;
-
-        if (amount >= 0)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution)
+            || amount <= 0)
         {
-            var min = FixedPoint2.Min(bloodSolution.AvailableVolume, amount);
-            var solution = ent.Comp.BloodReagents.Clone();
-            solution.ScaleTo(min);
-            solution.SetReagentData(GetEntityBloodData(ent));
-            SolutionContainer.AddSolution(ent.Comp.BloodSolution.Value, solution);
-            return min == amount;
+            return false;
         }
 
-        // Removal is more involved,
-        // since we also wanna handle moving it to the temporary solution
-        // and then spilling it if necessary.
-        var newSol = SolutionContainer.SplitSolution(ent.Comp.BloodSolution.Value, -amount);
+        var leakedBlood = SolutionContainer.SplitSolution(ent.Comp.BloodSolution.Value, amount);
 
         if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, ref ent.Comp.TemporarySolution, out var tempSolution))
             return true;
 
-        tempSolution.AddSolution(newSol, PrototypeManager);
+        tempSolution.AddSolution(leakedBlood, PrototypeManager);
 
         if (tempSolution.Volume > ent.Comp.BleedPuddleThreshold)
         {
-            // Pass some of the chemstream into the spilled blood.
-            if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution))
-            {
-                var temp = SolutionContainer.SplitSolution(ent.Comp.ChemicalSolution.Value, tempSolution.Volume / 10);
-                tempSolution.AddSolution(temp, PrototypeManager);
-            }
-
             _puddle.TrySpillAt(ent.Owner, tempSolution, out _, sound: false);
 
             tempSolution.RemoveAllSolution();
@@ -450,13 +511,6 @@ public abstract class SharedBloodstreamSystem : EntitySystem
             SolutionContainer.RemoveAllSolution(ent.Comp.BloodSolution.Value);
         }
 
-        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution, out var chemSolution))
-        {
-            tempSol.MaxVolume += chemSolution.MaxVolume;
-            tempSol.AddSolution(chemSolution, PrototypeManager);
-            SolutionContainer.RemoveAllSolution(ent.Comp.ChemicalSolution.Value);
-        }
-
         if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, ref ent.Comp.TemporarySolution, out var tempSolution))
         {
             tempSol.MaxVolume += tempSolution.MaxVolume;
@@ -488,24 +542,24 @@ public abstract class SharedBloodstreamSystem : EntitySystem
 
         if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
         {
-            ent.Comp.BloodReagents = reagents.Clone();
-            DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReagents));
+            ent.Comp.BloodReferenceSolution = reagents.Clone();
+            DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReferenceSolution));
             return;
         }
 
         var currentVolume = FixedPoint2.Zero;
-        foreach (var reagent in ent.Comp.BloodReagents)
+        foreach (var reagent in ent.Comp.BloodReferenceSolution)
         {
             currentVolume += bloodSolution.RemoveReagent(reagent.Reagent, quantity: bloodSolution.Volume, ignoreReagentData: true);
         }
 
-        ent.Comp.BloodReagents = reagents.Clone();
-        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReagents));
+        ent.Comp.BloodReferenceSolution = reagents.Clone();
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReferenceSolution));
 
         if (currentVolume == FixedPoint2.Zero)
             return;
 
-        var solution = ent.Comp.BloodReagents.Clone();
+        var solution = ent.Comp.BloodReferenceSolution.Clone();
         solution.ScaleSolution(currentVolume / solution.Volume);
         solution.SetReagentData(GetEntityBloodData(ent));
         SolutionContainer.AddSolution(ent.Comp.BloodSolution.Value, solution);
diff --git a/Content.Shared/Devour/DevourSystem.cs b/Content.Shared/Devour/DevourSystem.cs
index 62dfeb6d2e..c63ffb34f1 100644
--- a/Content.Shared/Devour/DevourSystem.cs
+++ b/Content.Shared/Devour/DevourSystem.cs
@@ -109,7 +109,7 @@ public sealed class DevourSystem : EntitySystem
         // Grant ichor if the devoured thing meets the dragon's food preference
         if (args.Args.Target != null && _whitelistSystem.IsWhitelistPassOrNull(ent.Comp.FoodPreferenceWhitelist, (EntityUid)args.Args.Target))
         {
-            _bloodstreamSystem.TryAddToChemicals(ent.Owner, ichorInjection);
+            _bloodstreamSystem.TryAddToBloodstream(ent.Owner, ichorInjection);
         }
 
         // If the devoured thing meets the stomach whitelist criteria, add it to the stomach
diff --git a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
index 402a50538a..a5752b858e 100644
--- a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
@@ -19,7 +19,7 @@ public sealed partial class CleanBloodstreamEntityEffectSystem : EntityEffectSys
     {
         var scale = args.Scale * args.Effect.CleanseRate;
 
-        _bloodstream.FlushChemicals((entity, entity), args.Effect.Excluded, scale);
+        _bloodstream.FlushChemicals((entity, entity), scale, args.Effect.Excluded);
     }
 }
 
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index 58e414e176..cf819bfea4 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -112,7 +112,7 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
                     : _solutionContainer.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
                 // END DeltaV
 
-                _bloodstream.TryAddToChemicals((patient.Value, bloodstream), solutionToInject);
+                _bloodstream.TryAddToBloodstream((patient.Value, bloodstream), solutionToInject);
                 _reactive.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
             }
         }
diff --git a/Content.Shared/Medical/Healing/HealingSystem.cs b/Content.Shared/Medical/Healing/HealingSystem.cs
index 8b822c161c..b33dcf6816 100644
--- a/Content.Shared/Medical/Healing/HealingSystem.cs
+++ b/Content.Shared/Medical/Healing/HealingSystem.cs
@@ -147,7 +147,7 @@ public sealed class HealingSystem : EntitySystem
             // Is ent missing blood that we can restore?
             if (healing.Comp.ModifyBloodLevel > 0
                 && _solutionContainerSystem.ResolveSolution(target.Owner, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
-                && bloodSolution.Volume < bloodSolution.MaxVolume)
+                && _bloodstreamSystem.GetBloodLevel((target, bloodstream)) < 1)
             {
                 return true;
             }
diff --git a/Content.Shared/Medical/VomitSystem.cs b/Content.Shared/Medical/VomitSystem.cs
index d398faef20..cf927754e3 100644
--- a/Content.Shared/Medical/VomitSystem.cs
+++ b/Content.Shared/Medical/VomitSystem.cs
@@ -107,14 +107,17 @@ public sealed class VomitSystem : EntitySystem
         {
             var vomitAmount = solutionSize;
 
-            // Takes 10% of the chemicals removed from the chem stream
-            if (_solutionContainer.ResolveSolution(uid, bloodStream.ChemicalSolutionName, ref bloodStream.ChemicalSolution))
+            // Flushes small portion of the chemicals removed from the bloodstream stream
+            if (_solutionContainer.ResolveSolution(uid, bloodStream.BloodSolutionName, ref bloodStream.BloodSolution))
             {
-                var vomitChemstreamAmount = _solutionContainer.SplitSolution(bloodStream.ChemicalSolution.Value, vomitAmount);
-                vomitChemstreamAmount.ScaleSolution(ChemMultiplier);
-                solution.AddSolution(vomitChemstreamAmount, _proto);
+                var vomitChemstreamAmount = _bloodstream.FlushChemicals((uid, bloodStream), vomitAmount);
 
-                vomitAmount -= (float)vomitChemstreamAmount.Volume;
+                if (vomitChemstreamAmount != null)
+                {
+                    vomitChemstreamAmount.ScaleSolution(ChemMultiplier);
+                    solution.AddSolution(vomitChemstreamAmount, _proto);
+                    vomitAmount -= (float)vomitChemstreamAmount.Volume;
+                }
             }
 
             // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream
diff --git a/Content.Shared/Rootable/RootableSystem.cs b/Content.Shared/Rootable/RootableSystem.cs
index 53053d87d3..8946eab90d 100644
--- a/Content.Shared/Rootable/RootableSystem.cs
+++ b/Content.Shared/Rootable/RootableSystem.cs
@@ -103,17 +103,17 @@ public sealed class RootableSystem : EntitySystem
     /// </summary>
     private void ReactWithEntity(Entity<RootableComponent, BloodstreamComponent> ent, Entity<PuddleComponent> puddleEntity, Solution solution)
     {
-        if (!_solutionContainer.ResolveSolution(ent.Owner, ent.Comp2.ChemicalSolutionName, ref ent.Comp2.ChemicalSolution, out var chemSolution) || chemSolution.AvailableVolume <= 0)
+        if (!_solutionContainer.ResolveSolution(ent.Owner, ent.Comp2.BloodSolutionName, ref ent.Comp2.BloodSolution, out var bloodSolution) || bloodSolution.AvailableVolume <= 0)
             return;
 
         var availableTransfer = FixedPoint2.Min(solution.Volume, ent.Comp1.TransferRate);
-        var transferAmount = FixedPoint2.Min(availableTransfer, chemSolution.AvailableVolume);
+        var transferAmount = FixedPoint2.Min(availableTransfer, bloodSolution.AvailableVolume);
         var transferSolution = _solutionContainer.SplitSolution(puddleEntity.Comp.Solution!.Value, transferAmount);
 
         _reactive.DoEntityReaction(ent, transferSolution, ReactionMethod.Ingestion);
 
         // Log solution addition by puddle.
-        if (_blood.TryAddToChemicals((ent, ent.Comp2), transferSolution))
+        if (_blood.TryAddToBloodstream((ent, ent.Comp2), transferSolution))
             _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(ent):target} absorbed puddle {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
     }
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c54ca66221..6ac9418050 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -51,7 +51,10 @@
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
   - type: ReplacementAccent
     accent: mouse
   - type: MeleeWeapon
@@ -141,11 +144,10 @@
     - Bee
     - Trash
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
-        Quantity: 1
-    bloodMaxVolume: 0.1
+        Quantity: 0.1
   - type: MobPrice
     price: 50
   - type: NPCRetaliation
@@ -191,7 +193,10 @@
     factions:
     - SimpleHostile
   - type: Bloodstream
-    bloodMaxVolume: 0.1
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 0.1
   - type: ZombieImmune
 
 
@@ -267,7 +272,10 @@
     interactSuccessSound:
       path: /Audio/Animals/chicken_cluck_happy.ogg
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
@@ -394,11 +402,10 @@
       Dead:
         Base: cockroach_dead
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
-        Quantity: 1
-    bloodMaxVolume: 20
+        Quantity: 20
   - type: Edible
   - type: FlavorProfile
     flavors:
@@ -562,10 +569,10 @@
     damageContainer: Biological
     damageModifierSet: Moth
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
-        Quantity: 1
+        Quantity: 20
   - type: Respirator
     damage:
       types:
@@ -725,7 +732,10 @@
     interactSuccessSound:
       path: /Audio/Animals/duck_quack_happy.ogg
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
@@ -853,11 +863,10 @@
     tags:
     - Trash
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
-        Quantity: 1
-    bloodMaxVolume: 0.1
+        Quantity: 0.1
   - type: MobPrice
     price: 50
   - type: Destructible
@@ -1020,11 +1029,10 @@
   - type: ReplacementAccent
     accent: crab
   - type: Bloodstream
-    bloodMaxVolume: 50
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: CopperBlood
-        Quantity: 1
+        Quantity: 50
   - type: Tag
     tags:
     - VimPilot
@@ -1193,7 +1201,10 @@
     interactSuccessSound:
       path: /Audio/Animals/goose_honk.ogg
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: NpcFactionMember
     factions:
     - Passive
@@ -1235,7 +1246,10 @@
     - id: FoodMeat
       amount: 4
   - type: Bloodstream
-    bloodMaxVolume: 300
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 300
     # if you fuck with the gorilla he will harambe you
   - type: MeleeWeapon
     soundHit:
@@ -2033,7 +2047,10 @@
       types:
         Piercing: 0
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
   - type: CanEscapeInventory
   - type: MobPrice
     price: 50
@@ -2170,10 +2187,10 @@
   - type: RadiationSource
     intensity: 0.3
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: UnstableMutagen
-        Quantity: 1
+        Quantity: 50
   - type: SolutionContainerManager
     solutions:
       food:
@@ -2251,7 +2268,10 @@
     interactSuccessSound:
       path: /Audio/Animals/lizard_happy.ogg
   - type: Bloodstream
-    bloodMaxVolume: 150
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 150
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
@@ -2307,7 +2327,10 @@
     interactFailureString: petting-failure-generic
     interactSuccessSpawn: EffectHearts
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
 
 - type: entity
   name: frog
@@ -2364,7 +2387,10 @@
     interactSuccessSound:
       path: /Audio/Animals/frog_ribbit.ogg
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
   - type: Tag
     tags:
     - VimPilot
@@ -2456,7 +2482,10 @@
     interactSuccessSound:
       path: /Audio/Animals/parrot_raught.ogg
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
 
 - type: entity
   name: parrot
@@ -2647,7 +2676,10 @@
     interactFailureString: petting-failure-generic
     interactSuccessSpawn: EffectHearts
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
@@ -2716,11 +2748,10 @@
   - type: Spider
   - type: IgnoreSpiderWeb
   - type: Bloodstream
-    bloodMaxVolume: 150
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: CopperBlood
-        Quantity: 1
+        Quantity: 150
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
@@ -2865,11 +2896,10 @@
     - type: Speech
       speechVerb: Cluwne
     - type: Bloodstream
-      bloodMaxVolume: 150
-      bloodReagents:
+      bloodReferenceSolution:
         reagents:
         - ReagentId: Laughter
-          Quantity: 1
+          Quantity: 150
 - type: entity
   name: wizard spider
   parent: MobGiantSpider
@@ -3068,7 +3098,10 @@
     attributes:
       gender: epicene
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: MeleeWeapon
     angle: 0
     animation: WeaponArcBite
@@ -3203,10 +3236,10 @@
     attributes:
       gender: epicene
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: DemonsBlood
-        Quantity: 1
+        Quantity: 150
   - type: Damageable
     damageContainer: BiologicalMetaphysical
     damageModifierSet: Infernal
@@ -3747,7 +3780,10 @@
     interactSuccessSound:
       path: /Audio/Animals/fox_squeak.ogg
   - type: Bloodstream
-    bloodMaxVolume: 60
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 60
   - type: CanEscapeInventory
     baseResistTime: 3
   - type: MobPrice
@@ -3867,11 +3903,10 @@
     speciesId: cat
     templateId: pet
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Sap
-        Quantity: 1
-    bloodMaxVolume: 60
+        Quantity: 60
   - type: DamageStateVisuals
     states:
       Alive:
@@ -3946,6 +3981,103 @@
   - type: ReplacementAccent
     accent: nymph
 
+- type: entity
+  name: reindeer buck
+  parent: [ SimpleMobBase, MobCombat ]
+  id: MobReindeerBuck
+  description: You think it can pull a sleigh?
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: reindeer_buck
+      sprite: Mobs/Animals/reindeer_buck.rsi
+#  - type: SpriteMovement  # One day when this shit isnt broken as hell. For now they hoppity hop.
+#    movementLayers:
+#      movement:
+#        state: reindeer_buck
+#    noMovementLayers:
+#      movement:
+#        state: reindeer_buck_still
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.48
+        density: 200
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: reindeer_buck
+      Critical:
+        Base: reindeer_buck_dead
+      Dead:
+        Base: reindeer_buck_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 4
+  - type: Bloodstream
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 300
+    # Horns though
+  - type: MeleeWeapon
+    damage:
+      types:
+        Piercing: 22
+    animation: WeaponArcFist
+  - type: NPCRetaliation
+  - type: FactionException
+  - type: NpcFactionMember
+    factions:
+    - Passive
+  - type: HTN
+    rootTask:
+      task: SimpleHostileCompound
+  - type: Puller
+    needsHands: false
+
+- type: entity
+  name: reindeer doe
+  parent: MobReindeerBuck
+  id: MobReindeerDoe
+  components:
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 15
+    animation: WeaponArcFist
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: reindeer_doe
+      sprite: Mobs/Animals/reindeer_doe.rsi
+#  - type: SpriteMovement  # One day when this shit isnt broken as hell. For now they hoppity hop.
+#    movementLayers:
+#      movement:
+#        state: reindeer_doe
+#    noMovementLayers:
+#      movement:
+#        state: reindeer_doe_still
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: reindeer_doe
+      Critical:
+        Base: reindeer_doe_dead
+      Dead:
+        Base: reindeer_doe_dead
+
 - type: entity
   parent: MobCorgiBase
   id: MobCorgiSmart
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 4c9f851ba0..ddb7b5f68c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -18,11 +18,10 @@
   - type: ReplacementAccent
     accent: xeno
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: FerrochromicAcid
-        Quantity: 1
-    bloodMaxVolume: 75 #we don't want the map to become pools of blood
+        Quantity: 75 #we don't want the map to become pools of blood
     bloodlossDamage:
       types:
         Bloodloss:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index c8887b8ce8..3bcb592345 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -51,8 +51,10 @@
     baseWalkSpeed : 2.00
     baseSprintSpeed : 2.00
   - type: Bloodstream
-    bloodMaxVolume: 350
-    chemicalMaxVolume: 0
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 350
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -413,8 +415,10 @@
     capacity: 1
     count: 1
   - type: Bloodstream
-    bloodMaxVolume: 200
-    chemicalMaxVolume: 0
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 200
   - type: NpcFactionMember
     factions:
     - SalvageMob # DeltaV - Changed to SalvageMob
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index b5cd568088..c0220cee13 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -114,11 +114,10 @@
     - type: Input
       context: "human"
     - type: Bloodstream
-      bloodMaxVolume: 300
-      bloodReagents:
+      bloodReferenceSolution:
         reagents:
         - ReagentId: Laughter
-          Quantity: 1
+          Quantity: 300
 - type: entity
   name: behonker
   parent: BaseMobBehonker
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index a434f1e4fe..45e2440ab7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -349,11 +349,10 @@
     speedModifierThresholds:
       50: 0.4
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Water
-        Quantity: 1
-    chemicalMaxVolume: 100
+        Quantity: 100
   - type: StatusEffects
     allowed:
     - Electrocution
@@ -421,10 +420,10 @@
   suffix: Beer
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Beer
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#cfa85f"
   - type: Sprite
@@ -441,10 +440,10 @@
   suffix: Pax
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Pax
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#AAAAAA"
   - type: Sprite
@@ -464,10 +463,10 @@
   suffix: Nocturine
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Nocturine
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#128e80"
   - type: Sprite
@@ -487,10 +486,10 @@
   suffix: THC
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: THC
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#808080"
   - type: Sprite
@@ -507,10 +506,10 @@
   suffix: Bicaridine
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Bicaridine
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#ffaa00"
   - type: Sprite
@@ -527,10 +526,10 @@
   suffix: Toxin
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Toxin
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#cf3600"
   - type: Sprite
@@ -547,10 +546,10 @@
   suffix: Napalm
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Napalm
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#FA00AF"
   - type: Sprite
@@ -567,10 +566,10 @@
   suffix: Omnizine
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Omnizine
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#fcf7f9"
   - type: Sprite
@@ -587,10 +586,10 @@
   suffix: Mute Toxin
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: MuteToxin
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#0f0f0f"
   - type: Sprite
@@ -607,10 +606,10 @@
   suffix: Norepinephric Acid
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: NorepinephricAcid
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#96a8b5"
   - type: Sprite
@@ -627,10 +626,10 @@
   suffix: Ephedrine
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Ephedrine
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#D2FFFA"
   - type: Sprite
@@ -647,10 +646,10 @@
   suffix: Robust Harvest
   components:
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: RobustHarvest
-        Quantity: 1
+        Quantity: 100
   - type: PointLight
     color: "#3e901c"
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index f3ec5ff80b..75f0aa83b8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -48,7 +48,10 @@
     - id: FoodMeat
       amount: 1
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: CombatMode
   - type: MeleeWeapon
     soundHit:
@@ -247,7 +250,10 @@
     - id: FoodMeat
       amount: 1
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: CombatMode
   - type: MeleeWeapon
     soundHit:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index d4ba48d221..77d13c376a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -155,12 +155,10 @@
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: JuiceTomato
-        Quantity: 1
-    bloodMaxVolume: 50
-    chemicalMaxVolume: 30
+        Quantity: 50
   - type: DamageStateVisuals
     states:
       Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index bb37b656fa..8b1da7cefc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -103,7 +103,10 @@
     - Adrenaline
     - Anesthesia # DeltaV - Anesthesia
   - type: Bloodstream
-    bloodMaxVolume: 150
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 150
   - type: MobPrice
     price: 150
   - type: FloatingVisuals
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 86e0450b96..5dc526f662 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -54,10 +54,10 @@
     damageContainer: Biological
     damageModifierSet: Slime
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Slime
-        Quantity: 1
+        Quantity: 150
     bloodlossDamage:
       types:
         Bloodloss:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 5aa4be9b47..0c77cc73bf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -39,11 +39,10 @@
     critThreshold: 150
   - type: MovementAlwaysTouching
   - type: Bloodstream
-    bloodMaxVolume: 300
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Cryoxadone
-        Quantity: 1
+        Quantity: 300
   - type: CombatMode
   - type: Temperature
     heatDamageThreshold: 500
@@ -215,11 +214,10 @@
       amount: 1
       prob: 0.5
   - type: Bloodstream
-    bloodMaxVolume: 250
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Cryoxadone
-        Quantity: 1
+        Quantity: 250
   - type: Fixtures
     fixtures:
       fix1:
@@ -323,11 +321,10 @@
           amount: 1
           prob: 0.3
     - type: Bloodstream
-      bloodMaxVolume: 200
-      bloodReagents:
+      bloodReferenceSolution:
         reagents:
         - ReagentId: Cryoxadone
-          Quantity: 1
+          Quantity: 200
     - type: Fixtures
       fixtures:
         fix1:
@@ -494,11 +491,10 @@
   - type: CombatMode
     combatToggleAction: ActionCombatModeToggleOff
   - type: Bloodstream
-    bloodMaxVolume: 30
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Cryoxadone
-        Quantity: 1
+        Quantity: 30
   - type: CanEscapeInventory
   - type: MobPrice
     price: 50
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 5b5fb81628..1b379a4f3c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -66,7 +66,10 @@
     - id: FoodMeatXeno
       amount: 1
   - type: Bloodstream
-    bloodMaxVolume: 50
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 50
   - type: CombatMode
   - type: MeleeWeapon
     soundHit:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index a9a46cf387..326883fcaf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -67,11 +67,10 @@
   - type: Stamina
     critThreshold: 200
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: FluorosulfuricAcid
-        Quantity: 1
-    bloodMaxVolume: 650
+        Quantity: 650
   - type: MeleeWeapon
     altDisarm: false
     angle: 0
@@ -525,11 +524,10 @@
   - type: Stamina
     critThreshold: 200
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: FluorosulfuricAcid
-        Quantity: 1
-    bloodMaxVolume: 300
+        Quantity: 300
   - type: MeleeWeapon
     altDisarm: false
     angle: 0
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 368712594e..871c1d03a1 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -9,7 +9,10 @@
   - type: Body # Shitmed
     prototype: SpaceDragon
   - type: Bloodstream
-    bloodMaxVolume: 650
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 650
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 3a2279a2c8..f43eaaa82e 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -43,10 +43,10 @@
       - !type:WashCreamPie
   # Damage (Self)
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: CopperBlood
-        Quantity: 1
+        Quantity: 300
   # Damage (Others)
   - type: MeleeWeapon
     animation: WeaponArcBite
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index aa44ccbf1b..79da2d2c58 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -33,10 +33,10 @@
       - id: FoodMeatPlant
         amount: 5
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Sap
-        Quantity: 1
+        Quantity: 300
   - type: Reactive
     groups:
       Flammable: [ Touch ]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
index 7844c80082..794317464d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
@@ -29,12 +29,12 @@
       - id: FoodBakedCookie #should be replaced with gingerbread sheets or something... provided you're willing to make a full spriteset of those.
         amount: 5
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Sugar
-        Quantity: 1
+        Quantity: 100
       - ReagentId: Butter
-        Quantity: 2
+        Quantity: 200
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index d5ff093b09..8f7d2d2f94 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -33,10 +33,10 @@
     - id: FoodMeat
       amount: 5
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
-        Quantity: 1
+        Quantity: 300
   - type: DamageVisuals
     damageOverlayGroups:
       Brute:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index c3bc7e5d5e..c8e3c1aee1 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -74,10 +74,10 @@
       Burn:
         sprite: Mobs/Effects/burn_damage.rsi
   - type: Bloodstream
-    bloodReagents: # TODO Color slime blood based on their slime color or smth
+    bloodReferenceSolution: # TODO Color slime blood based on their slime color or smth
       reagents:
       - ReagentId: Slime
-        Quantity: 1
+        Quantity: 300
   - type: Barotrauma
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 1c0d902424..3adc024b56 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -89,10 +89,10 @@
       Burn:
         sprite: Mobs/Effects/burn_damage.rsi
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: AmmoniaBlood
-        Quantity: 1
+        Quantity: 300
   - type: MeleeWeapon
     soundHit:
       collection: AlienClaw
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 5188394987..924f1837d4 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -261,7 +261,7 @@
   components:
   - type: SolutionContainerManager
   - type: InjectableSolution
-    solution: chemicals
+    solution: bloodstream
   - type: Bloodstream
     bloodlossDamage:
       types:
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 224db693fc..ab63eeb3d8 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -984,6 +984,8 @@
 
 - type: reaction
   id: RedMead
+  requiredMixerCategories:
+  - Stir
   reactants:
     Mead:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 4ac24061f6..4e250c43dc 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -43,6 +43,8 @@
 
 - type: reaction
   id: SpaceGlue
+  requiredMixerCategories:
+  - Stir # prevents turning slimes to glue, TODO: make it react only X units per second; make bloodstream an open thermal system
   minTemp: 370
   reactants:
     SpaceLube:
diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
index b5c4653df3..8cb81307e3 100644
--- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
+++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -24,6 +24,8 @@
 
 - type: reaction
   id: SapBoiling
+  requiredMixerCategories:
+  - Stir # prevents cooking diona from inside out, TODO: make it react only X units per second; make bloodstream an open thermal system
   impact: Low
   minTemp: 377
   reactants:

From 25b293b76166e9346983a284f896a875bfe8f811 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 2 Feb 2026 20:09:57 +0100
Subject: [PATCH 128/360] Downstream fixes for #35071 (bloodstream changes)

---
 .../Abilities/PsionicRegenerationPowerSystem.cs   |  2 +-
 .../_DV/Abilities/Felinid/FelinidSystem.cs        |  2 +-
 .../_Mono/CorticalBorer/CorticalBorerSystem.cs    |  2 +-
 .../Prototypes/_DV/CosmicCult/Mobs/colossus.yml   |  5 ++---
 .../Prototypes/_DV/CosmicCult/Mobs/hostiles.yml   |  5 ++---
 .../Prototypes/_DV/Entities/Mobs/NPCs/animals.yml | 12 +++++++++---
 .../_DV/Entities/Mobs/NPCs/christmas_kobold.yml   |  5 ++---
 .../_DV/Entities/Mobs/NPCs/familiars.yml          |  3 +--
 .../Prototypes/_DV/Entities/Mobs/NPCs/fun.yml     |  5 ++---
 .../_DV/Entities/Mobs/NPCs/nukiemouse.yml         |  5 ++++-
 .../Prototypes/_DV/Entities/Mobs/NPCs/pets.yml    |  5 ++---
 .../_DV/Entities/Mobs/Player/kitsunefox.yml       |  5 ++++-
 .../_DV/Entities/Mobs/Species/chitinid.yml        |  2 +-
 .../Entities/Objects/Specific/Fishing/fish.yml    | 15 ++++++---------
 .../Entities/Mobs/Anomalites/anomalites.yml       |  5 ++---
 .../_RMC14/Entities/Mobs/Species/avali.yml        |  2 +-
 16 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index b3e177b3af..ab6595e605 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -122,7 +122,7 @@ namespace Content.Server.Abilities.Psionics
 
             var solution = new Solution();
             solution.AddReagent("Prometheum", FixedPoint2.New(component.EssenceAmount * percentageComplete));
-            _bloodstreamSystem.TryAddToChemicals((uid, stream), solution);
+            _bloodstreamSystem.TryAddToBloodstream((uid, stream), solution);
         }
     }
 }
diff --git a/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs b/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs
index c50538dca7..bcfaf1e20c 100644
--- a/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs
+++ b/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs
@@ -38,7 +38,7 @@ public sealed class FelinidSystem : SharedFelinidSystem
 
     private void OnItemCoughedUp(Entity<FelinidComponent> ent, ref ItemCoughedUpEvent args)
     {
-        if (!TryComp<BloodstreamComponent>(ent, out var blood) || blood.ChemicalSolution is not {} solution)
+        if (!TryComp<BloodstreamComponent>(ent, out var blood) || blood.BloodSolution is not {} solution)
             return;
 
         var item = args.Item;
diff --git a/Content.Server/_Mono/CorticalBorer/CorticalBorerSystem.cs b/Content.Server/_Mono/CorticalBorer/CorticalBorerSystem.cs
index a68bfa1dcb..b2f0f0e6f6 100644
--- a/Content.Server/_Mono/CorticalBorer/CorticalBorerSystem.cs
+++ b/Content.Server/_Mono/CorticalBorer/CorticalBorerSystem.cs
@@ -183,7 +183,7 @@ public sealed partial class CorticalBorerSystem : SharedCorticalBorerSystem
         solution.AddReagent(chemicalPrototype.Reagent, chemAmount);
 
         // add the chemicals to the bloodstream of the host
-        if (!_blood.TryAddToChemicals((comp.Host.Value, bloodstream), solution))
+        if (!_blood.TryAddToBloodstream((comp.Host.Value, bloodstream), solution))
             return false;
 
         UpdateChems(ent, -((int)chemAmount * chemicalPrototype.Cost));
diff --git a/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml b/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml
index 998ae42e9d..b72af00aa4 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml
@@ -129,13 +129,12 @@
     damageContainer: InorganicMetaphysical
     damageModifierSet: EntropicColossus
   - type: Bloodstream
-    bloodMaxVolume: 650
     maxBleedAmount: 0.1
     bleedReductionAmount: 0.1
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Entropy
-        Quantity: 1
+        Quantity: 650
     bloodlossDamage:
       types:
         Bloodloss:
diff --git a/Resources/Prototypes/_DV/CosmicCult/Mobs/hostiles.yml b/Resources/Prototypes/_DV/CosmicCult/Mobs/hostiles.yml
index 50e66d8e38..4c6332bb73 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Mobs/hostiles.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Mobs/hostiles.yml
@@ -51,13 +51,12 @@
             sound:
               path: /Audio/_DV/CosmicCult/ability_lapse.ogg
   - type: Bloodstream
-    bloodMaxVolume: 100
     maxBleedAmount: 10.75
     bleedReductionAmount: 0.1
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Entropy
-        Quantity: 1
+        Quantity: 100
     bloodlossDamage:
       types:
         Bloodloss:
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml
index e9e7f03c78..56ab9379bd 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml
@@ -59,7 +59,10 @@
     attributes:
       gender: epicene
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: MobPrice
     price: 400
   - type: Tag
@@ -172,7 +175,10 @@
     attributes:
       gender: epicene
   - type: Bloodstream
-    bloodMaxVolume: 300 # BIG DOG. MUCH BLOOD :3
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 300 # BIG DOG. MUCH BLOOD :3
   - type: Puller
     needsHands: false
   - type: MobPrice
@@ -377,7 +383,7 @@
     damageContainer: Biological
     damageModifierSet: Moth
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
         Quantity: 1
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml
index 193110864f..724a29df73 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml
@@ -16,11 +16,10 @@
     factions:
     - SimpleHostile
   - type: Bloodstream
-    bloodMaxVolume: 150
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Eggnog
-        Quantity: 1
+        Quantity: 150
   - type: Loadout
     prototypes: [ ElfGearMonkey ]
   - type: GhostRole
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
index b05bc8a62d..0e6e9d5ef4 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
@@ -30,11 +30,10 @@
           layer:
             - FlyingMobLayer
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Phlogiston
         Quantity: 1
-    bloodMaxVolume: 0
   - type: TemperatureImmunity
   - type: MeleeWeapon
     altDisarm: false # No shoving
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml
index deecc86d0c..7fdaabf577 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml
@@ -39,11 +39,10 @@
     - id: FoodMeatCrab
       amount: 3
   - type: Bloodstream
-    bloodMaxVolume: 100
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: BbqSauce #australia reference
-        Quantity: 1
+        Quantity: 100
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-possum
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml
index ecbb457ef8..6eba61ab48 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -141,7 +141,10 @@
     prototype: Rat
     requiredLegs: 1 # TODO: More than 1 leg
   - type: Bloodstream
-    bloodMaxVolume: 60
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 60
   - type: CanEscapeInventory
     baseResistTime: 3
   - type: MobPrice
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
index 6f1ae0688f..386ae70206 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
@@ -199,11 +199,10 @@
           amount: 1
           prob: 0.2
     - type: Bloodstream
-      bloodMaxVolume: 200
-      bloodReagents:
+      bloodReferenceSolution:
         reagents:
         - ReagentId: Cryoxadone
-          Quantity: 1
+          Quantity: 200
     - type: Fixtures
       fixtures:
         fix1:
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml
index 376637afb8..5976a5f0cb 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml
@@ -38,7 +38,10 @@
     - id: FoodMeat
       amount: 3
   - type: Bloodstream
-    bloodMaxVolume: 100
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 100
   - type: MeleeWeapon
     angle: 0
     animation: WeaponArcBite
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
index c1f942ab93..42bcefc034 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
@@ -52,7 +52,7 @@
       amount: 5
 
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: InsectBlood
         Quantity: 1
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml
index 7d69f4140c..07a6b96810 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml
@@ -43,11 +43,10 @@
     - id: FoodMeatFish
       amount: 2
   - type: Bloodstream
-    bloodMaxVolume: 20
-    bloodReagents:
+    bloodReferenceSolution: # DeltaV - Upstream changes for blood solution
       reagents:
       - ReagentId: Blood
-        Quantity: 1
+        Quantity: 20 # DeltaV - Upstream changes for blood solution
   - type: ZombieImmune
 
 - type: entity
@@ -170,11 +169,10 @@
   - type: Item
     sprite: _Goobstation/Objects/Specific/Fishing/fish.rsi
   - type: Bloodstream
-    bloodMaxVolume: 20
-    bloodReagents:
+    bloodReferenceSolution: # DeltaV - Upstream changes for blood solution
       reagents:
       - ReagentId: Laughter
-        Quantity: 1
+        Quantity: 20 # DeltaV - Upstream changes for blood solution
 
 - type: entity
   id: FishNukeDisk
@@ -284,11 +282,10 @@
   - type: Item
     sprite: _Goobstation/Objects/Specific/Fishing/fish.rsi
   - type: Bloodstream
-    bloodMaxVolume: 10
-    bloodReagents:
+    bloodReferenceSolution: # DeltaV - Upstream changes for blood solution
       reagents:
       - ReagentId: Laughter
-        Quantity: 1
+        Quantity: 10 # DeltaV - Upstream changes for blood solution
 
 - type: entity
   id: FishIan
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
index 4f43d0c830..1902e67c30 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
@@ -57,11 +57,10 @@
         layer:
         - MobLayer
   - type: Bloodstream
-    bloodMaxVolume: 75
-    bloodReagents:
+    bloodReferenceSolution: # DeltaV - Upstream changes for blood solution
       reagents:
       - ReagentId: Entropy # DeltaV - Was Anomalium, not part of the initial Anomalite PR. Might port it eventually, but until then Entropy is our closest analogue.
-        Quantity: 1
+        Quantity: 75 # DeltaV - Was 1, changed due to upstream blood solutions
   - type: InteractionPopup
     successChance: 0.1
     interactSuccessString: petting-success-anomalite
diff --git a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
index 4f4b225ea9..9cdc5cf28c 100644
--- a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
+++ b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
@@ -76,7 +76,7 @@
         layer:
         - MobLayer
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution: # DeltaV - Upstream changes for blood solution
       reagents:
       - ReagentId: AmmoniaBlood
         Quantity: 1

From bb4f91d408dc45f467097cf0eae13b7f0685ffd2 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Wed, 4 Feb 2026 20:20:42 +0100
Subject: [PATCH 129/360] Add missing reindeer sprites

---
 .../Mobs/Animals/reindeer_buck.rsi/meta.json  |  52 ++++++++++++++++++
 .../reindeer_buck.rsi/reindeer_buck.png       | Bin 0 -> 3495 bytes
 .../reindeer_buck.rsi/reindeer_buck_dead.png  | Bin 0 -> 3328 bytes
 .../reindeer_buck.rsi/reindeer_buck_still.png | Bin 0 -> 1180 bytes
 .../Mobs/Animals/reindeer_doe.rsi/meta.json   |  52 ++++++++++++++++++
 .../Animals/reindeer_doe.rsi/reindeer_doe.png | Bin 0 -> 3139 bytes
 .../reindeer_doe.rsi/reindeer_doe_dead.png    | Bin 0 -> 3081 bytes
 .../reindeer_doe.rsi/reindeer_doe_still.png   | Bin 0 -> 1035 bytes
 8 files changed, 104 insertions(+)
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_buck.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck.png
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck_dead.png
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck_still.png
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_doe.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe.png
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe_dead.png
 create mode 100644 Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe_still.png

diff --git a/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/meta.json b/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/meta.json
new file mode 100644
index 0000000000..43c40fc549
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Deer by Calciumtrice, usable under Creative Commons Attribution 3.0 license, from https://opengameart.org/content/deer, edited by IProduceWidgets (github)",
+  "states": [
+    {
+      "name": "reindeer_buck",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+		  1
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          1
+        ]
+      ]
+    },
+	{
+	  "name": "reindeer_buck_still",
+	  "directions": 4
+	},
+    {
+      "name": "reindeer_buck_dead"
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck.png b/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cf35f382c240f7b658c3dd7050e279bcbee9cfc
GIT binary patch
literal 3495
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
VqqjdY6)pe(002ovPDHLkV1g55s<!|D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck_dead.png b/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a1ed6eb09ac00fa088a088e6da97883c7bcf5c4
GIT binary patch
literal 3328
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
KMNUMnLSTYx;Y}p~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck_still.png b/Resources/Textures/Mobs/Animals/reindeer_buck.rsi/reindeer_buck_still.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b1cb1cf04bdaff00c4a23346fd7cee9c8dfba3f
GIT binary patch
literal 1180
zcmV;N1Y`S&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000DINkl<Zc-rk-
zKS*0a82>IjP;lvDMTZV;iA$_FI5k3$igf5Am_JCNAY=(jRv}}ct0-9np&$~q;L;(K
zfH=HPP9`osiep4wx&+ecy7UX@%X=?(_wMc`t=}Yh_vicl?ss?JcXt9jnY<m8HmHey
zs(ag1SDjcG$Hqp9RucMwn4B1=lM~}KOdD3%k!MNxSl%T%$;jo4-S$t*n>3zG0sw$x
z+jOP0Lu3?Vg&BSJ?{<f3S3z}en>Ok-n4g^n1P=fZPbT5C4D{mi8s03u7n%k{Rsk#l
z008X{)vf@M@~m2vt^ut47qb~7>j8q#<%=YjFOre_o1QWw_cz_|B7|9C<bQT_Y-G1_
zk7m0=Va!DWI|X@1KlCo(r34dOuY3B1QJ@k6OesN!#o#|TVFKpfEqHEu?GA;xcMHY=
zgq?mvuYj=APndwi%DylA>^EJeT7g^yuzTv~uiuFu`|LNF1ZLpY051@t+mLD^f>b7>
zK<+6Z0z~KNvnmt$CLIa7lMw&_@CZc#0IV0Uyvq-;5nZDy5{}A7f{WSAqjg9oAro2z
zbNM1^)NA0Ej5O*s5KTs+jzBGu(cD^H?t+?$PdzH*{3T^;b(!iKeZN2`3=x*-0(5nL
zLLJ-o{JvILheRq(OwM8Bfe-*dVYdn_365<;VYg}wv|k`(jDY%ah3hw6k)S&o#3)cE
z5|lm@j3<+@lqnbmKTzp#B9$h$cMs(D?tz$|_oxIFS!hfaJkM`BEs;tS-1o!uJ=E#2
zic{#JBOqwBWt0%=JU~S@HnfXil;%bBFp@8AY)BsT+mk(+LE}w-gUYFB!}ua7>x_z%
zBNar%Osas#VHItN7|{XR>p&!^oQgIgBf#xoqh9O2(qIAN@BJM1DvQ8*+lYh!baEy>
z1&5V=n4g`7-_KtHI=)s|ho;jC95r_vNaV=<4P0DabF~qv0?<y&n-tFs&>Y(a_90Wh
z`tG^_z+FG`P#7J>0~0qHJcli4*oF@9+7!U501eL!Z|@!g`^0yDm5rPysjAHaLxzA>
zN;_QT{>f~RXB2gfw9zTRUSHvS7Co%EIzOT80;ua9A{j*RCP}dRfe~%c>+OIllYI&o
zM4ANv@ayLf`t8e6w;*<+6HFKqWK_u#aZuWzA3kN_+3UBY+ZvLf3OKu$hn)iKG(eNN
z6vf*l1mCj@jE#~W@I24Z7PA@Oa$(Nw{p#|9cl+gquS)<jA_E@4>}yfpzRr%0J<GCK
ziI?pBuD?a)-*j4`la}h<HpRCHD*SS*$`YN=eumDe1dmxCk`PZOd-~z=NoX5Pq|(GI
zo9hRNU9d1^RcTG91xP}_wS^^&CBmyt%x}a+z^hvHRJEPU7YREEZahM{fUJ~Np4!Ov
z&!faxkd##eF>P+&-Pi&ZkVvJ8=v+4OMnJTWrqc?n6N?InY4gMM^dBQZ9~<?WRHL%>
uqVT1M0NHzXllSvleU!atH+es=(#Jn)WSSD8a{6BY0000<MNUMnLSTZMha=Je

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/meta.json b/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/meta.json
new file mode 100644
index 0000000000..f3283c3a20
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Deer by Calciumtrice, usable under Creative Commons Attribution 3.0 license, from https://opengameart.org/content/deer, edited by IProduceWidgets (github)",
+  "states": [
+    {
+      "name": "reindeer_doe",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          1,
+          0.2,
+          0.2,
+          0.2,
+		  0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+		  1
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          1
+        ]
+      ]
+    },
+	{
+	  "name": "reindeer_doe_still",
+	  "directions": 4
+	},
+    {
+      "name": "reindeer_doe_dead"
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe.png b/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe.png
new file mode 100644
index 0000000000000000000000000000000000000000..b462562527ac974a2cc17ad27c484445fdd2aaa8
GIT binary patch
literal 3139
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe_dead.png b/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..a189b38786342909711ffe33e48cbe1ea1ffdc20
GIT binary patch
literal 3081
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
X7fde2k~$YQ00000NkvXXu0mjfAwbP2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe_still.png b/Resources/Textures/Mobs/Animals/reindeer_doe.rsi/reindeer_doe_still.png
new file mode 100644
index 0000000000000000000000000000000000000000..300c6e08323e70ee966fe99f7d53912ce97fe7bd
GIT binary patch
literal 1035
zcmV+m1oZofP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000BhNkl<Zc-rk-
zJxE(o6h1d(2xM^)v9qL0N^$7q6M|Trx(G%?5efyDptuSd16_;3rBEnH@u!fbLn#&!
znob=`s|Y?iE8@~6knMJm6Hae#lKakm@4meBeIV#d&VBd$?)kZY0;J$$zqTop&LLxC
zoX?3^MVOwNl+#m_R__-!BcIRRo3}gneORwIge&sR`j#ws9smINtrjfTc3JPv+KfK^
z9Yu%|J1a{P0N}~vhk)b(01BQ5%{s{MKd%4);MIrE!bu3Yh6%AC<XHmj*EVH7CtzW1
zHI{sU1b=+_+I@z<2PJP60&$|<k&w@cE^(U>WQV}%;Zba*7d<ea6Wv_I^}q}y6sLzr
zJz?m49smHLbRteK3@pIx;`~4HhMj14B+M?(|6en~aX?@J-tWC-eHIo}52TfW<AH$%
zP-`vC0h~IVI1j)wq-JAR6QQs@Fq9nNa!x?KOszmpXM$=RQm+{6GDs5+{c*7x)P*2=
zg0q?6<(01;?R-wa<&{6)Wf0fnw%-}0P{;;NKo@7n(r>l2pFgj@gkq^I#?}K6)y4r(
z5&TvQs*MAu%VCpekqK~ev}g1zs+pjgbZJs{Rt5{62Txb4PRWndVyIXui<{d!adUeo
z;)r`3ZQE67hD+Y$S(GT2%A(zouwHLi4M3uo!(p65Bu;=qqs{Sz#O()+OcIO}I-!#&
zJ{!8}b{tdi6e&`qNRh&@OqrG{8{3h=#o4jkSy__J`j(^wF3ygnsV)B9tZzwETMi;y
z!6A8im&fEX6TSR|HUPlB1Qpv<7(0xcCaM_yK)-{wQIU_-1E?1uaNqFe_D=g=yz{rW
zS<#9a1)SayLSoCc-GQHv^=fd?Xhu2G&O?A6VPRaGZdhQ(#{`I5Ux^XGhP-PLvL<AL
zHX6lAG57Fum}p%A{`~$XKfXKc8mJedDezq0^<6=Zu*ie*diG)sCT8YDPY9q0x|c1i
ztp+AcYdSXsXc*WCk0(i#ytWF^+n4HybHUlI)!86%PJeW~dUC+T%$!gsFLAi~AlUYW
zj=t6dmTSAhWXfvl{^$NRyA8Art3SGVMwS!L{eZDb$yYYE*(IT}u`LeXyq1p&51`<A
zJ?)$Hg;fTNrLxei=7tfXiOXi>b)JAC49h80Fe*epo6MjQ4?^BH>4nv1Wn)`V@l_tI
zwE)+ZZQS3c4ON7|iy?LQB@802q4v4oj#6fr+Xao~DDMdbZTsB69%_?`gNSPk;*$Qq
zz_2g;I{CzEm}}>{4_X1ZXYDS|=$-V9dkEp;@FMKK{RJ?G`yA2AV#fdg002ovPDHLk
FV1gDS>`VXv

literal 0
HcmV?d00001


From d50706dd5efbec2d6747fe2ff1404f3d6dc61d9d Mon Sep 17 00:00:00 2001
From: Centronias <me@centronias.com>
Date: Wed, 17 Dec 2025 14:52:32 -0800
Subject: [PATCH 130/360] Adds BallisticAmmoSelfRefillerComponent (#38537)

* Adds BallisticAmmoSelfRefillerComponent

And uses it to replace battery-based refilling of the Syndicate L6 and Viper modules.
- Add `BallisticAmmoSelfRefillerComponent`
- Handle `EmpPulseEvent` to pause refilling behavior for EMP's duration
- Change `Content.Server.Weapons.Ranged.Systems.Update` override in `GunSystem.AutoFire.cs` to `UpdateAutoFire`
- Add `Content.Server.Weapons.Ranged.Systems.Update` to `GunSystem.cs` so that it can call `UpdateAutoFire` and `UpdateBallistic`
- Add public methods to GunSystem for use by refilling implementation
  - PauseSelfRefill
  - IsFullBallistic (same as #299)
  - CanInsertBallistic (same as #299)
  - TryBallisticInsert (same as #299)

* _timing -> Timing

* unspawned count stuff

* imagine building the code before pushing

* - apply to c20r ROW
- make predicted/shared

* revert server system import only changes

* oop

* o great and wise Slarti

* Scar comments

* field deltas + correct serializer

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 .../BallisticAmmoSelfRefillerComponent.cs     |  61 ++++++
 .../Systems/SharedGunSystem.Ballistic.cs      | 180 +++++++++++++++---
 .../Weapons/Ranged/Systems/SharedGunSystem.cs |   1 +
 .../Objects/Weapons/Guns/LMGs/lmgs.yml        |  16 +-
 .../Objects/Weapons/Guns/Pistols/pistols.yml  |  18 +-
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |  16 +-
 6 files changed, 247 insertions(+), 45 deletions(-)
 create mode 100644 Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs

diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs
new file mode 100644
index 0000000000..acaeca89dc
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Power.Components;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+/// <summary>
+/// This component, analogous to <see cref="BatterySelfRechargerComponent"/>, will attempt insert ballistic ammunition
+/// into its owner's <see cref="BallisticAmmoProviderComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause,
+ Access(typeof(SharedGunSystem))]
+public sealed partial class BallisticAmmoSelfRefillerComponent : Component
+{
+    /// <summary>
+    /// True if the refilling behavior is active, false otherwise.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AutoRefill = true;
+
+    /// <summary>
+    /// How often a new piece of ammunition is inserted into the owner's <see cref="BallisticAmmoProviderComponent"/>.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan AutoRefillRate = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// If true, causes the refilling behavior to be delayed by at least <see cref="AutoRefillPauseDuration"/> after
+    /// the owner is fired.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool FiringPausesAutoRefill = false;
+
+    /// <summary>
+    /// How long to pause for if <see cref="FiringPausesAutoRefill"/> is true.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan AutoRefillPauseDuration = TimeSpan.Zero;
+
+    /// <summary>
+    /// What entity to spawn and attempt to insert into the owner. If null, uses
+    /// <see cref="BallisticAmmoProviderComponent.Proto"/>. If that's also null, this component does nothing but log
+    /// errors.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntProtoId? AmmoProto;
+
+    /// <summary>
+    /// If true, EMPs will pause this component's behavior.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AffectedByEmp = false;
+
+    /// <summary>
+    /// When the next auto refill should occur. This is just implementation state.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextAutoRefill = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 3addb3b783..54b07debf9 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -1,4 +1,5 @@
 using Content.Shared.DoAfter;
+using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -16,7 +17,7 @@ public abstract partial class SharedGunSystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
 
-
+    [MustCallBase]
     protected virtual void InitializeBallistic()
     {
         SubscribeLocalEvent<BallisticAmmoProviderComponent, ComponentInit>(OnBallisticInit);
@@ -30,6 +31,14 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<BallisticAmmoProviderComponent, AfterInteractEvent>(OnBallisticAfterInteract);
         SubscribeLocalEvent<BallisticAmmoProviderComponent, AmmoFillDoAfterEvent>(OnBallisticAmmoFillDoAfter);
         SubscribeLocalEvent<BallisticAmmoProviderComponent, UseInHandEvent>(OnBallisticUse);
+
+        SubscribeLocalEvent<BallisticAmmoSelfRefillerComponent, MapInitEvent>(OnBallisticRefillerMapInit);
+        SubscribeLocalEvent<BallisticAmmoSelfRefillerComponent, EmpPulseEvent>(OnRefillerEmpPulsed);
+    }
+
+    private void OnBallisticRefillerMapInit(Entity<BallisticAmmoSelfRefillerComponent> entity, ref MapInitEvent args)
+    {
+        entity.Comp.NextAutoRefill = Timing.CurTime + entity.Comp.AutoRefillRate;
     }
 
     private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent component, UseInHandEvent args)
@@ -46,20 +55,8 @@ public abstract partial class SharedGunSystem
         if (args.Handled)
             return;
 
-        if (_whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Used))
-            return;
-
-        if (GetBallisticShots(component) >= component.Capacity)
-            return;
-
-        component.Entities.Add(args.Used);
-        Containers.Insert(args.Used, component.Container);
-        // Not predicted so
-        Audio.PlayPredicted(component.SoundInsert, uid, args.User);
-        args.Handled = true;
-        UpdateBallisticAppearance(uid, component);
-        UpdateAmmoCount(args.Target);
-        DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities));
+        if (TryBallisticInsert((uid, component), args.Used, args.User))
+            args.Handled = true;
     }
 
     private void OnBallisticAfterInteract(EntityUid uid, BallisticAmmoProviderComponent component, AfterInteractEvent args)
@@ -242,23 +239,29 @@ public abstract partial class SharedGunSystem
     {
         for (var i = 0; i < args.Shots; i++)
         {
-            EntityUid entity;
-
+            EntityUid? ammoEntity = null;
             if (component.Entities.Count > 0)
             {
-                entity = component.Entities[^1];
-
-                args.Ammo.Add((entity, EnsureShootable(entity)));
+                var existingEnt = component.Entities[^1];
                 component.Entities.RemoveAt(component.Entities.Count - 1);
                 DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities));
-                Containers.Remove(entity, component.Container);
+                Containers.Remove(existingEnt, component.Container);
+                ammoEntity = existingEnt;
             }
             else if (component.UnspawnedCount > 0)
             {
                 component.UnspawnedCount--;
                 DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount));
-                entity = Spawn(component.Proto, args.Coordinates);
-                args.Ammo.Add((entity, EnsureShootable(entity)));
+                ammoEntity = Spawn(component.Proto, args.Coordinates);
+            }
+
+            if (ammoEntity is { } ent)
+            {
+                args.Ammo.Add((ent, EnsureShootable(ent)));
+                if (TryComp<BallisticAmmoSelfRefillerComponent>(uid, out var refiller))
+                {
+                    PauseSelfRefill((uid, refiller));
+                }
             }
         }
 
@@ -271,6 +274,73 @@ public abstract partial class SharedGunSystem
         args.Capacity = component.Capacity;
     }
 
+    /// <summary>
+    /// Causes <paramref name="entity"/> to pause its refilling for either at least <paramref name="overridePauseDuration"/>
+    /// (if not null) or the entity's <see cref="BallisticAmmoSelfRefillerComponent.AutoRefillPauseDuration"/>. If the
+    /// entity's next refill would occur after the pause duration, this function has no effect.
+    /// </summary>
+    public void PauseSelfRefill(
+        Entity<BallisticAmmoSelfRefillerComponent> entity,
+        TimeSpan? overridePauseDuration = null
+    )
+    {
+        if (overridePauseDuration == null && !entity.Comp.FiringPausesAutoRefill)
+            return;
+
+        var nextRefillByPause = Timing.CurTime + (overridePauseDuration ?? entity.Comp.AutoRefillPauseDuration);
+        if (nextRefillByPause > entity.Comp.NextAutoRefill)
+        {
+            entity.Comp.NextAutoRefill = nextRefillByPause;
+            DirtyField(entity.AsNullable(), nameof(BallisticAmmoSelfRefillerComponent.NextAutoRefill));
+        }
+    }
+
+    /// <summary>
+    /// Returns true if the given <paramref name="entity"/>'s ballistic ammunition is full, false otherwise.
+    /// </summary>
+    public bool IsFull(Entity<BallisticAmmoProviderComponent> entity)
+    {
+        return GetBallisticShots(entity.Comp) >= entity.Comp.Capacity;
+    }
+
+    /// <summary>
+    /// Returns whether or not <paramref name="inserted"/> can be inserted into <paramref name="entity"/>, based on
+    /// available space and whitelists.
+    /// </summary>
+    public bool CanInsertBallistic(Entity<BallisticAmmoProviderComponent> entity, EntityUid inserted)
+    {
+        return !_whitelistSystem.IsWhitelistFailOrNull(entity.Comp.Whitelist, inserted) &&
+               !IsFull(entity);
+    }
+
+    /// <summary>
+    /// Attempts to insert <paramref name="inserted"/> into <paramref name="entity"/> as ammunition. Returns true on
+    /// success, false otherwise.
+    /// </summary>
+    public bool TryBallisticInsert(
+        Entity<BallisticAmmoProviderComponent> entity,
+        EntityUid inserted,
+        EntityUid? user,
+        bool suppressInsertionSound = false
+    )
+    {
+        if (!CanInsertBallistic(entity, inserted))
+            return false;
+
+        entity.Comp.Entities.Add(inserted);
+        Containers.Insert(inserted, entity.Comp.Container);
+        if (!suppressInsertionSound)
+        {
+            Audio.PlayPredicted(entity.Comp.SoundInsert, entity, user);
+        }
+
+        UpdateBallisticAppearance(entity, entity.Comp);
+        UpdateAmmoCount(entity);
+        DirtyField(entity.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
+
+        return true;
+    }
+
     public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
     {
         if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
@@ -290,6 +360,70 @@ public abstract partial class SharedGunSystem
         UpdateAmmoCount(entity.Owner);
         Dirty(entity);
     }
+
+    private void OnRefillerEmpPulsed(Entity<BallisticAmmoSelfRefillerComponent> entity, ref EmpPulseEvent args)
+    {
+        if (!entity.Comp.AffectedByEmp)
+            return;
+
+        PauseSelfRefill(entity, args.Duration);
+    }
+
+    private void UpdateBallistic(float frameTime)
+    {
+        var query = EntityQueryEnumerator<BallisticAmmoSelfRefillerComponent, BallisticAmmoProviderComponent>();
+        while (query.MoveNext(out var uid, out var refiller, out var ammo))
+        {
+            BallisticSelfRefillerUpdate((uid, ammo, refiller));
+        }
+    }
+
+    private void BallisticSelfRefillerUpdate(
+        Entity<BallisticAmmoProviderComponent, BallisticAmmoSelfRefillerComponent> entity
+    )
+    {
+        var ammo = entity.Comp1;
+        var refiller = entity.Comp2;
+        if (Timing.CurTime < refiller.NextAutoRefill)
+            return;
+
+        refiller.NextAutoRefill += refiller.AutoRefillRate;
+        DirtyField(entity, refiller, nameof(BallisticAmmoSelfRefillerComponent.NextAutoRefill));
+
+        if (!refiller.AutoRefill || IsFull(entity))
+            return;
+
+        if (refiller.AmmoProto is not { } refillerAmmoProto)
+        {
+            // No ammo proto on the refiller, so just increment the unspawned count on the provider
+            // if it has an ammo proto.
+            if (ammo.Proto is null)
+            {
+                Log.Error(
+                    $"Neither of {entity}'s {nameof(BallisticAmmoSelfRefillerComponent)}'s or {nameof(BallisticAmmoProviderComponent)}'s ammunition protos is specified. This is a configuration error as it means {nameof(BallisticAmmoSelfRefillerComponent)} cannot do anything.");
+                return;
+            }
+
+            SetBallisticUnspawned(entity, ammo.UnspawnedCount + 1);
+        }
+        else if (ammo.Proto == refillerAmmoProto)
+        {
+            // The ammo proto on the refiller and the provider match. Add an unspawned ammo.
+            SetBallisticUnspawned(entity, ammo.UnspawnedCount + 1);
+        }
+        else
+        {
+            // Can't use unspawned ammo, so spawn an entity and try to insert it.
+            var ammoEntity = PredictedSpawnAttachedTo(refiller.AmmoProto, Transform(entity).Coordinates);
+            var insertSucceeded = TryBallisticInsert(entity, ammoEntity, null, suppressInsertionSound: true);
+            if (!insertSucceeded)
+            {
+                PredictedQueueDel(ammoEntity);
+                Log.Error(
+                    $"Failed to insert ammo {ammoEntity} into non-full {entity}. This is a configuration error. Is the {nameof(BallisticAmmoSelfRefillerComponent)}'s {nameof(BallisticAmmoSelfRefillerComponent.AmmoProto)} incorrect for the {nameof(BallisticAmmoProviderComponent)}'s {nameof(BallisticAmmoProviderComponent.Whitelist)}?");
+            }
+        }
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index cd2a3edf11..1fd2bc2478 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -682,6 +682,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     public override void Update(float frameTime)
     {
         UpdateBattery(frameTime);
+        UpdateBallistic(frameTime);
     }
 }
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 36a4ee0f49..b499ea46b3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -116,12 +116,14 @@
     - type: ContainerContainer
       containers:
         ballistic-ammo: !type:Container
-    - type: BatteryAmmoProvider
+    - type: BallisticAmmoProvider
+      whitelist:
+        tags:
+        - CartridgeLightRifle
+      capacity: 100
       proto: CartridgeLightRifle
-      fireCost: 100
-    - type: Battery
-      maxCharge: 10000
-      startingCharge: 10000
-    - type: BatterySelfRecharger
-      autoRechargeRate: 25
+      cycleable: false # No synthesizing ammo for your syndicate masters.
+    - type: BallisticAmmoSelfRefiller
+      autoRefillRate: 4s
+      affectedByEmp: true
     - type: AmmoCounter
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 0a2a4d544d..6dd8977341 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -130,14 +130,16 @@
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
-  - type: BatteryAmmoProvider
-    proto: BulletPistol
-    fireCost: 100
-  - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: BatterySelfRecharger
-    autoRechargeRate: 25
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - CartridgePistol
+    capacity: 10
+    proto: CartridgePistol
+    cycleable: false # No synthesizing ammo for your syndicate masters.
+  - type: BallisticAmmoSelfRefiller
+    autoRefillRate: 4s
+    affectedByEmp: true
   - type: AmmoCounter
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 4b6bfe3cf9..d5a094aea6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -152,14 +152,16 @@
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
-  - type: BatteryAmmoProvider
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - CartridgePistol
+    capacity: 30
     proto: CartridgePistol
-    fireCost: 100
-  - type: Battery
-    maxCharge: 3000
-    startingCharge: 3000
-  - type: BatterySelfRecharger
-    autoRechargeRate: 25
+    cycleable: false # No synthesizing ammo for your syndicate masters.
+  - type: BallisticAmmoSelfRefiller
+    autoRefillRate: 4s
+    affectedByEmp: true
   - type: AmmoCounter
 
 - type: entity

From fdda156decebd2f137f17e1f868f917964dbd074 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 18 Dec 2025 00:48:30 -0800
Subject: [PATCH 131/360] [Bugfix/Optimization] Metabolize Foreign Blood
 (#41892)

* Metabolize foreign blood

* fix

* misc

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Body/Systems/BloodstreamSystem.cs         |  7 ++++--
 .../Body/Systems/MetabolizerSystem.cs         |  6 ++---
 .../Body/Components/BloodstreamComponent.cs   | 12 ++++++++--
 .../Body/Events/MetabolismExclusionEvent.cs   |  7 +++++-
 .../Body/Systems/SharedBloodstreamSystem.cs   | 22 +++++++++++++------
 Content.Shared/Medical/VomitSystem.cs         |  2 +-
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index 08f640711a..b142d86fad 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -30,12 +30,12 @@ public sealed class BloodstreamSystem : SharedBloodstreamSystem
 
         bloodSolution.MaxVolume = entity.Comp.BloodReferenceSolution.Volume * entity.Comp.MaxVolumeModifier;
         tempSolution.MaxVolume = entity.Comp.BleedPuddleThreshold * 4; // give some leeway, for chemstream as well
+        entity.Comp.BloodReferenceSolution.SetReagentData(GetEntityBloodData((entity, entity.Comp)));
 
         // Fill blood solution with BLOOD
         // The DNA string might not be initialized yet, but the reagent data gets updated in the GenerateDnaEvent subscription
         var solution = entity.Comp.BloodReferenceSolution.Clone();
         solution.ScaleTo(entity.Comp.BloodReferenceSolution.Volume - bloodSolution.Volume);
-        solution.SetReagentData(GetEntityBloodData(entity.Owner));
         bloodSolution.AddSolution(solution, PrototypeManager);
     }
 
@@ -44,11 +44,14 @@ public sealed class BloodstreamSystem : SharedBloodstreamSystem
     {
         if (SolutionContainer.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
         {
+            var data = NewEntityBloodData(entity);
+            entity.Comp.BloodReferenceSolution.SetReagentData(data);
+
             foreach (var reagent in bloodSolution.Contents)
             {
                 List<ReagentData> reagentData = reagent.Reagent.EnsureReagentData();
                 reagentData.RemoveAll(x => x is DnaData);
-                reagentData.AddRange(GetEntityBloodData(entity.Owner));
+                reagentData.AddRange(data);
             }
         }
         else
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index 35c7b0572a..8e329bc420 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -16,7 +16,6 @@ using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.EntityEffects.Effects.Solution;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Random.Helpers;
 using Robust.Shared.Collections;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -138,8 +137,7 @@ public sealed class MetabolizerSystem : SharedMetabolizerSystem
         var list = solution.Contents.ToList();
 
         // Collecting blood reagent for filtering
-        var bloodList = new List<string>();
-        var ev = new MetabolismExclusionEvent(bloodList);
+        var ev = new MetabolismExclusionEvent();
         RaiseLocalEvent(solutionEntityUid.Value, ref ev);
 
         // randomize the reagent list so we don't have any weird quirks
@@ -155,7 +153,7 @@ public sealed class MetabolizerSystem : SharedMetabolizerSystem
                 continue;
 
             // Skip blood reagents
-            if (bloodList.Contains(reagent.Prototype))
+            if (ev.Reagents.Contains(reagent))
                 continue;
 
             var mostToRemove = FixedPoint2.Zero;
diff --git a/Content.Shared/Body/Components/BloodstreamComponent.cs b/Content.Shared/Body/Components/BloodstreamComponent.cs
index 8309397b62..533b486da5 100644
--- a/Content.Shared/Body/Components/BloodstreamComponent.cs
+++ b/Content.Shared/Body/Components/BloodstreamComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Alert;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -137,9 +138,9 @@ public sealed partial class BloodstreamComponent : Component
     // TODO probably damage bleed thresholds.
 
     /// <summary>
-    /// Modifier applied to <see cref="BloodReferenceSolution.Volume"/> to determine maximum volume for bloodstream.
+    /// Modifier applied to <see cref="BloodstreamComponent.BloodReferenceSolution.Volume"/> to determine maximum volume for bloodstream.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float MaxVolumeModifier = 2f;
 
     /// <summary>
@@ -151,6 +152,13 @@ public sealed partial class BloodstreamComponent : Component
     [DataField, AutoNetworkedField]
     public Solution BloodReferenceSolution = new([new("Blood", 300)]);
 
+    /// <summary>
+    /// Caches the blood data of an entity.
+    /// This is modified by DNA on init so it's not savable.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public List<ReagentData>? BloodData;
+
     /// <summary>
     /// Name/Key that <see cref="BloodSolution"/> is indexed by.
     /// </summary>
diff --git a/Content.Shared/Body/Events/MetabolismExclusionEvent.cs b/Content.Shared/Body/Events/MetabolismExclusionEvent.cs
index 791b8ed959..3626e5af77 100644
--- a/Content.Shared/Body/Events/MetabolismExclusionEvent.cs
+++ b/Content.Shared/Body/Events/MetabolismExclusionEvent.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Chemistry.Reagent;
+
 namespace Content.Shared.Body.Events;
 
 /// <summary>
@@ -5,4 +7,7 @@ namespace Content.Shared.Body.Events;
 /// blood like reagents for metabolism to skip.
 /// </summary>
 [ByRefEvent]
-public readonly record struct MetabolismExclusionEvent(List<string> ReagentList);
\ No newline at end of file
+public readonly record struct MetabolismExclusionEvent()
+{
+    public readonly List<ReagentId> Reagents = [];
+}
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index 7c8fca6deb..5f3794acd2 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -296,9 +296,9 @@ public abstract class SharedBloodstreamSystem : EntitySystem
     private void OnMetabolismExclusion(Entity<BloodstreamComponent> ent, ref MetabolismExclusionEvent args)
     {
         // Adding all blood reagents for filtering blood in metabolizer
-        foreach (var (reagentId, _) in ent.Comp.BloodReferenceSolution)
+        foreach (var (reagent, _) in ent.Comp.BloodReferenceSolution)
         {
-            args.ReagentList.Add(reagentId.Prototype);
+            args.Reagents.Add(reagent);
         }
     }
 
@@ -424,8 +424,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
             if (error > 0)
             {
                 error = FixedPoint2.Min(error, adjustedAmount);
-                var reagentToAdd = new ReagentId(referenceReagent.Prototype, GetEntityBloodData(ent));
-                bloodSolution.AddReagent(reagentToAdd, error);
+                bloodSolution.AddReagent(referenceReagent, error);
             }
             else if (error < 0)
             {
@@ -561,14 +560,24 @@ public abstract class SharedBloodstreamSystem : EntitySystem
 
         var solution = ent.Comp.BloodReferenceSolution.Clone();
         solution.ScaleSolution(currentVolume / solution.Volume);
-        solution.SetReagentData(GetEntityBloodData(ent));
         SolutionContainer.AddSolution(ent.Comp.BloodSolution.Value, solution);
     }
 
     /// <summary>
     /// Get the reagent data for blood that a specific entity should have.
     /// </summary>
-    public List<ReagentData> GetEntityBloodData(EntityUid uid)
+    public List<ReagentData> GetEntityBloodData(Entity<BloodstreamComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return NewEntityBloodData(entity);
+
+        return entity.Comp.BloodData ?? NewEntityBloodData(entity);
+    }
+
+    /// <summary>
+    /// Gets new blood data for this entity and caches it in <see cref="BloodstreamComponent.BloodData"/>
+    /// </summary>
+    protected List<ReagentData> NewEntityBloodData(EntityUid uid)
     {
         var bloodData = new List<ReagentData>();
         var dnaData = new DnaData();
@@ -579,7 +588,6 @@ public abstract class SharedBloodstreamSystem : EntitySystem
             dnaData.DNA = Loc.GetString("forensics-dna-unknown");
 
         bloodData.Add(dnaData);
-
         return bloodData;
     }
 }
diff --git a/Content.Shared/Medical/VomitSystem.cs b/Content.Shared/Medical/VomitSystem.cs
index cf927754e3..bdde1f0c98 100644
--- a/Content.Shared/Medical/VomitSystem.cs
+++ b/Content.Shared/Medical/VomitSystem.cs
@@ -121,7 +121,7 @@ public sealed class VomitSystem : EntitySystem
             }
 
             // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream
-            solution.AddReagent(new ReagentId(VomitPrototype, _bloodstream.GetEntityBloodData(uid)), vomitAmount);
+            solution.AddReagent(new ReagentId(VomitPrototype, _bloodstream.GetEntityBloodData((uid, bloodStream))), vomitAmount);
         }
 
         if (_puddle.TrySpillAt(uid, solution, out var puddle, false))

From ef3800cd0b994f248d71d68067cce25793e65ead Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 18 Dec 2025 10:13:35 +0100
Subject: [PATCH 132/360] Fix loadout entity names not being exported/imported
 (#41891)

Fix entity names not being saved in loadouts.

Just missing a [DataField]
---
 Content.Shared/Preferences/Loadouts/RoleLoadout.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index d9f79f543a..6f77725f22 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -27,6 +27,7 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
     /// <summary>
     /// Loadout specific name.
     /// </summary>
+    [DataField]
     public string? EntityName;
 
     /*

From 713159fa1aa9c15ab5d21ef12f2228ea26a3386e Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Thu, 18 Dec 2025 14:20:38 -0500
Subject: [PATCH 133/360] Adds debug wizard's grimoire (#41900)

---
 .../Entities/Objects/Magic/books.yml          | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index db0d3c8d51..55bb7e5582 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseMagicalContraband ]
   id: BaseSpellbook
   name: spellbook
-  parent: [ BaseItem, BaseMagicalContraband ]
-  abstract: true
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -19,13 +19,14 @@
       tags:
       - Spellbook
 
-# For the Wizard Antag
+# For the Wizard antagonist
 # Do not add discounts or price inflation
 - type: entity
-  id: WizardsGrimoire
-  name: wizards grimoire
-  suffix: Wizard
   parent: [ BaseItem, StorePresetSpellbook, BaseMagicalContraband ]
+  id: WizardsGrimoire
+  name: wizard's grimoire
+  suffix: Wizard
+  description: A heavy tome containing complicated arcane formulae for preparing magic spells and conjuring supernatural equipment. Decades of study went into researching this collection of mystical secrets; now go use them to ruin someone's day.
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -45,36 +46,44 @@
       key: enum.StoreUiKey.Key
     - type: Store
       refundAllowed: true
-      ownerOnly: true # get your own tome!
+      ownerOnly: true # Lesser minds cannot comprehend the arcane secrets within
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
-# Not meant for wizard antag but meant for spawning, so people can't abuse refund if they were given a tome
+# No-refund version meant for manual spawning, so people can't abuse refund if they were given a tome. Not meant for wizard antag proper!
 - type: entity
+  parent: WizardsGrimoire
   id: WizardsGrimoireNoRefund
-  name: wizards grimoire
-  suffix: Wizard, No Refund
-  parent: [ WizardsGrimoire, StorePresetSpellbook ]
+  suffix: Wizard, no refunding
   components:
     - type: Store
       refundAllowed: false
-      ownerOnly: true # get your own tome!
+
+# For debugging purposes only! Or spawn this for an admeme so a wizard can have every spell at once, I can't stop you.
+- type: entity
+  parent: WizardsGrimoire
+  id: WizardsGrimoireDebug
+  suffix: Wizard, DEBUG
+  description: A heavy tome containing complicated arcane formulae for preparing magic spells and conjuring supernatural equipment. Someone wrote "FOR EXPERIMENTAL USE ONLY" on the inside cover.
+  components:
+    - type: Store
+      ownerOnly: false # For ease of debugging.
       balance:
-        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
+        WizCoin: 99999
 
 - type: entity
+  parent: BaseSpellbook
   id: SpawnSpellbook
   name: spawn spellbook
-  parent: BaseSpellbook
   components:
     - type: Spellbook
       spellActions:
         ActionSpawnMagicarpSpell: null
 
 - type: entity
+  parent: BaseSpellbook
   id: ForceWallSpellbook
   name: force wall spellbook
-  parent: BaseSpellbook
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -95,9 +104,9 @@
         ActionForceWall: null
 
 - type: entity
+  parent: BaseSpellbook
   id: BlinkBook
   name: blink spellbook
-  parent: BaseSpellbook
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -116,9 +125,9 @@
         ActionBlink: null
 
 - type: entity
+  parent: BaseSpellbook
   id: SmiteBook
   name: smite spellbook
-  parent: BaseSpellbook
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -139,9 +148,9 @@
         ActionSmiteNoReq: null
 
 - type: entity
+  parent: BaseSpellbook
   id: KnockSpellbook
   name: knock spellbook
-  parent: BaseSpellbook
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -161,9 +170,9 @@
         ActionKnock: null
 
 - type: entity
+  parent: BaseSpellbook
   id: FireballSpellbook
   name: fireball spellbook
-  parent: BaseSpellbook
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -185,9 +194,9 @@
         ActionFireball: null
 
 - type: entity
+  parent: BaseSpellbook
   id: ScrollRunes
   name: scroll of runes
-  parent: BaseSpellbook
   components:
   - type: Item
     size: Normal

From d514f400a434af0195d9ced01423ac814eed68e7 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Thu, 18 Dec 2025 20:41:08 +0100
Subject: [PATCH 134/360] Make StaminaModifier into a status effect, apply to
 Hyperzine (#41902)

* Initial commit

* Probably better this way.

* Review fixes

* cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Damage/Components/StaminaComponent.cs     | 10 +++-
 ...> StaminaModifierStatusEffectComponent.cs} |  2 +-
 .../RefreshStaminaCritThresholdEvent.cs       | 18 +++++++
 .../Systems/SharedStaminaSystem.Modifier.cs   | 51 ++++++++-----------
 .../Damage/Systems/SharedStaminaSystem.cs     |  3 ++
 .../StatusEffectSystem.Relay.cs               |  1 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  2 +-
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    |  4 +-
 .../Entities/Mobs/NPCs/elemental.yml          |  2 +-
 .../Prototypes/Entities/Mobs/NPCs/flesh.yml   |  4 +-
 .../Entities/Mobs/NPCs/living_light.yml       |  1 -
 .../Entities/Mobs/NPCs/regalrat.yml           |  2 +-
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |  2 +-
 .../Entities/Mobs/NPCs/simplemob.yml          |  1 -
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |  8 +--
 .../Entities/Mobs/NPCs/spacetick.yml          |  2 +-
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |  6 +--
 .../Prototypes/Entities/Mobs/Species/base.yml |  1 -
 .../Entities/StatusEffects/body.yml           | 23 +++++++++
 Resources/Prototypes/Reagents/narcotics.yml   |  8 +--
 Resources/Prototypes/status_effects.yml       |  3 --
 21 files changed, 96 insertions(+), 58 deletions(-)
 rename Content.Shared/Damage/Components/{StaminaModifierComponent.cs => StaminaModifierStatusEffectComponent.cs} (90%)
 create mode 100644 Content.Shared/Damage/Events/RefreshStaminaCritThresholdEvent.cs

diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index 9875d31349..07429cbab7 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -39,9 +39,15 @@ public sealed partial class StaminaComponent : Component
     public float StaminaDamage;
 
     /// <summary>
-    /// How much stamina damage is required to enter stam crit.
+    /// The base stamina the entity requires to enter stam crit. Should rarely if ever be modified outside of yaml.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
+    public float BaseCritThreshold = 100f;
+
+    /// <summary>
+    /// Modified crit threshold for when an entity should enter stamcrit.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
     public float CritThreshold = 100f;
 
     /// <summary>
diff --git a/Content.Shared/Damage/Components/StaminaModifierComponent.cs b/Content.Shared/Damage/Components/StaminaModifierStatusEffectComponent.cs
similarity index 90%
rename from Content.Shared/Damage/Components/StaminaModifierComponent.cs
rename to Content.Shared/Damage/Components/StaminaModifierStatusEffectComponent.cs
index e492ea04ff..4ca888ffbe 100644
--- a/Content.Shared/Damage/Components/StaminaModifierComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaModifierStatusEffectComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Damage.Components;
 /// Multiplies the entity's <see cref="StaminaComponent.StaminaDamage"/> by the <see cref="Modifier"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStaminaSystem))]
-public sealed partial class StaminaModifierComponent : Component
+public sealed partial class StaminaModifierStatusEffectComponent : Component
 {
     /// <summary>
     /// What to multiply max stamina by.
diff --git a/Content.Shared/Damage/Events/RefreshStaminaCritThresholdEvent.cs b/Content.Shared/Damage/Events/RefreshStaminaCritThresholdEvent.cs
new file mode 100644
index 0000000000..4ed86445e1
--- /dev/null
+++ b/Content.Shared/Damage/Events/RefreshStaminaCritThresholdEvent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.Shared.Damage.Events;
+
+/// <summary>
+/// Raised whenever the <see cref="StaminaComponent.CritThreshold"/> needs to be refreshed.
+/// </summary>
+[ByRefEvent]
+public record struct RefreshStaminaCritThresholdEvent
+{
+    public float ThresholdValue = 100f;
+    public float Modifier = 1f;
+
+    public RefreshStaminaCritThresholdEvent(float thresholdValue)
+    {
+        ThresholdValue = thresholdValue;
+    }
+}
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.Modifier.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.Modifier.cs
index c723d8cb94..8fcb4b8d1d 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.Modifier.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.Modifier.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Events;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared.Damage.Systems;
 
@@ -6,47 +8,36 @@ public partial class SharedStaminaSystem
 {
     private void InitializeModifier()
     {
-        SubscribeLocalEvent<StaminaModifierComponent, ComponentStartup>(OnModifierStartup);
-        SubscribeLocalEvent<StaminaModifierComponent, ComponentShutdown>(OnModifierShutdown);
+        SubscribeLocalEvent<StaminaModifierStatusEffectComponent, StatusEffectAppliedEvent>(OnEffectApplied);
+        SubscribeLocalEvent<StaminaModifierStatusEffectComponent, StatusEffectRemovedEvent>(OnEffectRemoved);
+        SubscribeLocalEvent<StaminaModifierStatusEffectComponent, StatusEffectRelayedEvent<RefreshStaminaCritThresholdEvent>>(OnRefreshCritThreshold);
     }
 
-    private void OnModifierStartup(EntityUid uid, StaminaModifierComponent comp, ComponentStartup args)
+    private void OnEffectApplied(Entity<StaminaModifierStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        if (!TryComp<StaminaComponent>(uid, out var stamina))
-            return;
-
-        stamina.CritThreshold *= comp.Modifier;
+        RefreshStaminaCritThreshold(args.Target);
     }
 
-    private void OnModifierShutdown(EntityUid uid, StaminaModifierComponent comp, ComponentShutdown args)
+    private void OnEffectRemoved(Entity<StaminaModifierStatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
     {
-        if (!TryComp<StaminaComponent>(uid, out var stamina))
-            return;
-
-        stamina.CritThreshold /= comp.Modifier;
+        RefreshStaminaCritThreshold(args.Target);
     }
 
-    /// <summary>
-    /// Change the stamina modifier for an entity.
-    /// If it has <see cref="StaminaComponent"/> it will also be updated.
-    /// </summary>
-    public void SetModifier(EntityUid uid, float modifier, StaminaComponent? stamina = null, StaminaModifierComponent? comp = null)
+    private void OnRefreshCritThreshold(Entity<StaminaModifierStatusEffectComponent> ent, ref StatusEffectRelayedEvent<RefreshStaminaCritThresholdEvent> args)
     {
-        if (!Resolve(uid, ref comp))
+        var evArgs = args.Args;
+        evArgs.Modifier = Math.Max(ent.Comp.Modifier, evArgs.Modifier); // We only pick the highest value, to avoid stacking different status effects.
+        args.Args = evArgs;
+    }
+
+    public void RefreshStaminaCritThreshold(Entity<StaminaComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
             return;
 
-        var old = comp.Modifier;
+        var ev = new RefreshStaminaCritThresholdEvent(entity.Comp.BaseCritThreshold);
+        RaiseLocalEvent(entity, ref ev);
 
-        if (old.Equals(modifier))
-            return;
-
-        comp.Modifier = modifier;
-        Dirty(uid, comp);
-
-        if (Resolve(uid, ref stamina, false))
-        {
-            // scale to the new threshold, act as if it was removed then added
-            stamina.CritThreshold *= modifier / old;
-        }
+        entity.Comp.CritThreshold = ev.ThresholdValue * ev.Modifier;
     }
 }
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index 79028962ed..0e4fbce219 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -101,6 +101,9 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
     private void OnStartup(Entity<StaminaComponent> entity, ref ComponentStartup args)
     {
+        // Set the base threshold here since ModifiedCritThreshold can't be modified via yaml.
+        entity.Comp.CritThreshold = entity.Comp.BaseCritThreshold;
+
         UpdateStaminaVisuals(entity);
     }
 
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
index 30c5d9f67e..cafe5075c9 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -27,6 +27,7 @@ public sealed partial class StatusEffectsSystem
 
         SubscribeLocalEvent<StatusEffectContainerComponent, StandUpAttemptEvent>(RefRelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, StunEndAttemptEvent>(RefRelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, RefreshStaminaCritThresholdEvent>(RefRelayStatusEffectEvent);
 
         SubscribeLocalEvent<StatusEffectContainerComponent, BeforeForceSayEvent>(RelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, BeforeAlertSeverityCheckEvent>(RelayStatusEffectEvent);
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6ac9418050..ae4c2fc2c5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -116,7 +116,7 @@
       0: Alive
       10: Dead
   - type: Stamina
-    critThreshold: 10
+    baseCritThreshold: 10
     animationThreshold: 1
   - type: DamageStateVisuals
     states:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 419e609abb..3624d538eb 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -46,7 +46,7 @@
       baseWalkSpeed: 2.5
       baseSprintSpeed: 3.5
     - type: Stamina
-      critThreshold: 100
+      baseCritThreshold: 100
     - type: DamageStateVisuals
       states:
         Alive:
@@ -252,7 +252,7 @@
         0: Alive
         150: Dead
     - type: Stamina
-      critThreshold: 150
+      baseCritThreshold: 150
     - type: DamageStateVisuals
       states:
         Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 45e2440ab7..2f2a7f6458 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -28,7 +28,7 @@
       0: Alive
       120: Dead
   - type: Stamina
-    critThreshold: 120
+    baseCritThreshold: 120
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index 75f0aa83b8..c32a9d3d0b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -41,7 +41,7 @@
       0: Alive
       75: Dead
   - type: Stamina
-    critThreshold: 50
+    baseCritThreshold: 50
     animationThreshold: 25
   - type: Butcherable
     spawned:
@@ -243,7 +243,7 @@
       0: Alive
       75: Dead
   - type: Stamina
-    critThreshold: 50
+    baseCritThreshold: 50
     animationThreshold: 25
   - type: Butcherable
     spawned:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
index b668736cbc..fc7058b68e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
@@ -50,7 +50,6 @@
     allowed:
     - Corporeal
     - Electrocution
-    - StaminaModifier
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 14f9906ab6..ded670f3b4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -248,7 +248,7 @@
       - !type:GibBehavior
         recursive: false
   - type: Stamina
-    critThreshold: 60
+    baseCritThreshold: 60
   - type: MeleeWeapon
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 4ac26a56ef..592fedba48 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -84,7 +84,7 @@
     baseWalkSpeed : 3
     baseSprintSpeed : 4
   - type: Stamina
-    critThreshold: 120
+    baseCritThreshold: 120
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 8b1da7cefc..865887795d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -97,7 +97,6 @@
     - Electrocution
     - TemporaryBlindness
     - Pacified
-    - StaminaModifier
     - Flashed
     - RadiationProtection
     - Adrenaline
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 0c77cc73bf..7c59b91fed 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -36,7 +36,7 @@
       0: Alive
       100: Dead
   - type: Stamina
-    critThreshold: 150
+    baseCritThreshold: 150
   - type: MovementAlwaysTouching
   - type: Bloodstream
     bloodReferenceSolution:
@@ -157,7 +157,7 @@
       Dead:
         Base: kangaroo-space-dead
   - type: Stamina
-    critThreshold: 180
+    baseCritThreshold: 180
   - type: Inventory
     speciesId: kangaroo
     templateId: spacekangaroo
@@ -198,7 +198,7 @@
       0: Alive
       90: Dead
   - type: Stamina
-    critThreshold: 150
+    baseCritThreshold: 150
   - type: DamageStateVisuals
     states:
       Alive:
@@ -303,7 +303,7 @@
         0: Alive
         100: Dead
     - type: Stamina
-      critThreshold: 150
+      baseCritThreshold: 150
     - type: DamageStateVisuals
       states:
         Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 1b379a4f3c..0529f57875 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -52,7 +52,7 @@
       - !type:GibBehavior
         recursive: false
   - type: Stamina
-    critThreshold: 15
+    baseCritThreshold: 15
     animationThreshold: 5
   - type: MovementAlwaysTouching
   - type: DamageStateVisuals
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 326883fcaf..75b226e95f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -65,7 +65,7 @@
     speedModifierThresholds:
       25: 0.5
   - type: Stamina
-    critThreshold: 200
+    baseCritThreshold: 200
   - type: Bloodstream
     bloodReferenceSolution:
       reagents:
@@ -148,7 +148,7 @@
       0: Alive
       250: Dead  # DeltaV - Was 100
   - type: Stamina
-    critThreshold: 300
+    baseCritThreshold: 300
   - type: SlowOnDamage
     speedModifierThresholds:
       50: 0.7
@@ -522,7 +522,7 @@
   - type: ComplexInteraction
   - type: MobState
   - type: Stamina
-    critThreshold: 200
+    baseCritThreshold: 200
   - type: Bloodstream
     bloodReferenceSolution:
       reagents:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 4a56e6da24..02785c7abe 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -127,7 +127,6 @@
     - Muted
     - TemporaryBlindness
     - Pacified
-    - StaminaModifier
     - Flashed
     - RadiationProtection
     - Adrenaline
diff --git a/Resources/Prototypes/Entities/StatusEffects/body.yml b/Resources/Prototypes/Entities/StatusEffects/body.yml
index 739c9c3b22..7c7d5fc68c 100644
--- a/Resources/Prototypes/Entities/StatusEffects/body.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/body.yml
@@ -62,3 +62,26 @@
   parent: [ PainNumbnessTraitStatusEffect, MobStatusEffectDebuff ]
   id: StatusEffectPainNumbness
   name: pain numbness
+
+- type: entity
+  parent: MobStatusEffectBase
+  id: StaminaModifierStatusEffect
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - Stamina
+  - type: StaminaModifierStatusEffect
+
+- type: entity
+  parent: StaminaModifierStatusEffect
+  name: 2x max stamina
+  id: StatusEffectDesoxyStamina
+
+- type: entity
+  parent: StaminaModifierStatusEffect
+  id: StatusEffectStimulantsStamina
+  name: 1.5x max stamina
+  components:
+  - type: StaminaModifierStatusEffect
+    modifier: 1.5
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index bb025f4c24..106a3025fe 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -35,9 +35,8 @@
       - !type:MovementSpeedModifier
         walkSpeedModifier: 1.20
         sprintSpeedModifier: 1.20
-      - !type:GenericStatusEffect
-        key: StaminaModifier # You are on meth. You keep going.
-        component: StaminaModifier
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDesoxyStamina # You are on meth. You keep going.
         time: 3
       - !type:GenericStatusEffect
         key: Adrenaline
@@ -153,6 +152,9 @@
       - !type:MovementSpeedModifier
         walkSpeedModifier: 1.25
         sprintSpeedModifier: 1.25
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectStimulantsStamina # You are on meth. You keep going.
+        time: 3
       - !type:ModifyStatusEffect
         effectProto: StatusEffectStunned
         time: 3.5
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index a7c6eb0a52..ad34a61ac7 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -51,9 +51,6 @@
 - type: statusEffect
   id: RatvarianLanguage #Praise him
 
-- type: statusEffect
-  id: StaminaModifier
-
 - type: statusEffect
   id: Flashed
 

From a5453cdcd4ada0e3e79003a794064bbbc36b9544 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 2 Feb 2026 20:16:27 +0100
Subject: [PATCH 135/360] Downstream fixes for #41901 (Stamina status effect)

---
 Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml  | 2 +-
 .../Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index f76bda97c9..462ebb64fb 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -43,7 +43,7 @@
         layer:
         - MobLayer
   - type: Stamina
-    critThreshold: 115
+    baseCritThreshold: 115
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 06d77242e6..f85cd8f535 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -46,7 +46,7 @@
       types:
         Blunt: 1
   - type: Stamina
-    critThreshold: 85
+    baseCritThreshold: 85
   - type: TypingIndicator
     proto: felinid
   - type: PseudoItem

From 27da7f4991c7d1b69988801d26a368f6931a3592 Mon Sep 17 00:00:00 2001
From: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Date: Thu, 18 Dec 2025 14:37:31 -0600
Subject: [PATCH 136/360] Syndicate Wall Lockers and Secure Storage (#33251)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Prototypes/Catalog/Fills/Lockers/misc.yml |  25 +++++++++-
 .../Storage/Closets/Lockers/lockers.yml       |   7 ++-
 .../Structures/Storage/Closets/closets.yml    |   6 +--
 .../Storage/Closets/wall_lockers.yml          |  15 ++++++
 .../Structures/Storage/Crates/crates.yml      |  15 +++++-
 .../Crates/syndicate_secure.rsi/base.png      | Bin 0 -> 403 bytes
 .../Crates/syndicate_secure.rsi/closed.png    | Bin 0 -> 599 bytes
 .../Crates/syndicate_secure.rsi/icon.png      | Bin 0 -> 457 bytes
 .../Crates/syndicate_secure.rsi/locked.png    | Bin 0 -> 147 bytes
 .../Crates/syndicate_secure.rsi/meta.json     |  45 ++++++++++++++++++
 .../Crates/syndicate_secure.rsi/open.png      | Bin 0 -> 630 bytes
 .../Crates/syndicate_secure.rsi/sparking.png  | Bin 0 -> 206 bytes
 .../Crates/syndicate_secure.rsi/unlocked.png  | Bin 0 -> 142 bytes
 .../Crates/syndicate_secure.rsi/welded.png    | Bin 0 -> 294 bytes
 .../Storage/closet.rsi/syndicate_door.png     | Bin 210 -> 425 bytes
 .../Storage/closet.rsi/syndicate_open.png     | Bin 207 -> 333 bytes
 .../Storage/wall_locker.rsi/meta.json         |   8 +++-
 .../wall_locker.rsi/syndicate_closed.png      | Bin 0 -> 417 bytes
 .../wall_locker.rsi/syndicate_open.png        | Bin 0 -> 375 bytes
 19 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png
 create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_closed.png
 create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_open.png

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index e5e6fab1a4..efb3af856a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -1,8 +1,31 @@
 - type: entity
   id: LockerSyndicatePersonalFilled
-  suffix: Filled
+  suffix: Nukie, Filled
   parent: LockerSyndicatePersonal
+  description: It's a personal storage unit for operative gear.
   components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: ClothingBeltMilitaryWebbing
+        - id: ClothingHandsGlovesCombat
+        - id: JetpackBlackFilled
+        - id: ClothingUniformJumpsuitOperative
+        - id: ClothingUniformJumpskirtOperative
+        - id: ClothingHeadsetAltSyndicate
+        - id: ClothingEyesHudSyndicate
+
+- type: entity
+  id: LockerSyndicateWallFilled
+  suffix: Nukie, Filled
+  parent: LockerWallSyndicate
+  description: It's a personal storage unit for operative gear.
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 9eadb1c357..497535f848 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -553,15 +553,18 @@
 # Syndicate
 - type: entity
   id: LockerSyndicatePersonal
-  name: armory closet
+  name: blood-red locker
   parent: LockerBaseSecure
-  description: It's a personal storage unit for operative gear.
+  description: It's a personal storage unit with a blood-red design.
+  suffix: "Locked"
   components:
   - type: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: syndicate
     stateDoorOpen: syndicate_open
     stateDoorClosed: syndicate_door
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
 
 # Bluespace
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index e00a8627e1..052ff93e53 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -1,4 +1,4 @@
-# Tool closet
+# Tool closet
 - type: entity
   id: ClosetTool
   name: tool closet
@@ -164,9 +164,9 @@
 # Syndicate
 - type: entity
   id: LockerSyndicate
-  name: armory closet
+  name: blood-red closet
   parent: ClosetSteelBase
-  description: It's a storage unit.
+  description: It's a storage unit with a blood-red design.
   components:
   - type: Appearance
   - type: EntityStorageVisuals
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
index 7943e74e94..1e90d332d1 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -237,3 +237,18 @@
   components:
   - type: EntityStorageVisuals
     stateDoorClosed: genpop_door_8
+
+- type: entity
+  id: LockerWallSyndicate
+  parent: BaseWallLocker
+  name: blood-red wall locker
+  description: It's a wall storage unit with a blood-red design.
+  suffix: "Locked"
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: generic
+    stateDoorOpen: syndicate_open
+    stateDoorClosed: syndicate_closed
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index eb3eb8a61d..3191d8154c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -336,6 +336,19 @@
   - type: AccessReader
     access: [["Command"]]
 
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateSyndicateSecure
+  name: secure syndicate crate
+  description: A dark steel crate with red bands and a letter S embossed on the front.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+  - type: AccessReader
+    access: [["SyndicateAgent", "NuclearOperative"]]
+
 - type: entity
   parent: CrateGeneric
   id: CrateLivestock
@@ -826,7 +839,7 @@
 - type: entity
   parent: CrateGenericSteel
   id: CrateSyndicate
-  name: Syndicate crate
+  name: syndicate crate
   description: A dark steel crate with red bands and a letter S embossed on the front.
   components:
   - type: Icon
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..393e370d51e9996088798c3570b930ebfaaf84c0
GIT binary patch
literal 403
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<zMd|QArbD$
zDG~_>EDn4#?y*WRVR3VY5Fc6?#Ko`IS6$=2zps|LT278hfjuKD>(Wu)>+9pw54>zp
z_n&v+ilC8^5l@9|!TWo*v#cCEJu|N`{%~dxv48XCjY((QeEWK%1|h3^CJd97s2+ID
zpsA_JR##WI;jiX;`Ncbu`&Q`8;4fOx(7?bfE-v2nXM6sA3A>sf4Br&({>t0erBr--
zBl#_-Bd6fb?sN??9id50pB>p6t|&22c&fmEfI;uCL3@%edq*k5iAj&*=Lg7KIDL%$
zd2vxuQt#3C_xCr~@bPJO$u_)kesY2FCQnhr(xs}0KR!M#na5t-EW3EuH*MxnSq3AK
zXB>fYa%^7&7(^`=IO%@=>AZn?nfIyS>x@4xakvIDbldztpC9n3P<cIv=T71Ib#pQs
vRHQXRdM0vcn)K(qZC>u`vQ1p$3I~I;(j!Iw4PI)%P-gIS^>bP0l+XkK8JnBP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..625914054bea61f33e94308f248f198fc76ce005
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmhjtJZ$xxlFh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MF2wxVGIKjGxbDzAp_6xbq^n3@1i`*``n+SN6DKE@QK8;OgAjzb>itw
zOXs{#9A+g+AwDM_HRyuGk6f2se&bwpSm2pqBa@mV4ik&THkR9%l?;`5ia4UE8s!UF
zmle)ioYiubHSft^7|d(SX|B^8L>!AqAPEsNs@Omo7NWFjq?kz2e$2z)@A#AClF79J
zMvi$@ph9x|;D7MDTeC1Z;U)!RK<A5Xe+&bGU7%63?eAmTZkz!AXW&X}`73o`=9BbV
zON$%<z1zUWbxV`?fXf}A?@5;o$&vgtg+c*%KcjET0ij!<d)4i&xsTHaAVXa(-2exN
zz(|p@*F4_c)!y5`XPW)}0Mu4;&IkMX_W%F@jY&j7R9J=WlrahfAq++T3|pnjUA+Gh
zJcn&6+nFk&&dNey$L7CE@`8NO1R#Wv%^ZFZk?UJSt@T*>sO$X@Af+@k<(#3a001*X
z@1xGW2lz~>9!W){T{Qcs>p7R^B^ZDK+7zg2`?-B><)hAPJ{c{5nW2<2G@2P!KI&$_
l{Rw`q;(y_rkPt%1c5byvXPkc43IG5A002ovPDHLkV1mkf5k&w1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c6bffa7ebd4b05d5495fc81212ae578130d012
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$gGod|R9Hvtmc2^EKoH008X@sCLA=5R5fUs?r^-`U*jw3H`yAFbR`wP?MXIY)
zNCG0Pg(8XK25e4dWsY6l9Ng|<QY2mWpPBh(zSs%${7ia|4<o>sfiVNa$$;<s3)4;z
zLP$uHZmXd`vR!5X1EguHG0f+42*XgG)pZT3ZmXd$v^4@GNumK1MFEU4dB!;hRkzj9
z7ut>hV+Mwo0mj%Oj$>^K%Cf}ymuEr<P<2}keW5MqT&@6Z575XF1&*G&2UOiwqmee2
zpm%`(yq<MtAP54<asKk8@!ZS~<vVUMEDQApeS|%N>zcM@mwnSTa;q8vRL5s;Tm!h>
z`&r3UL+TAW!{BNOyX*<n2>^p$e!XjeS6jQwchB>T)oj~VP7}g91E_zfW(Ol9K$c~Y
z=Q%u_ZcCWsyHD6C06Haz*>noOGY~})R8<8R&yNz|`rv4@0IPb$sRUHKlaE)ej`utJ
zYfb4Y`_3L%D}v+4f11$IpSAgLZpGHW;Ar>_jZ&sCNT*#U00000NkvXXu0mjfl4Hiy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..aceacfce597de2a7dd34974d00c7324fdb3a34f5
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zMd|QArY-_
zFD~S5a1d#J*mS&nYVt3wh^K#|8Jd+i&O8<RRKL#Cb+Q*wEyF*Z&Qp1*+f~-jO?}d^
sY4(!GeZQ~${`qE&GP}?Br%VaExV7ztORjCbvI3;o)78&qol`;+09;Nt6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
new file mode 100644
index 0000000000..4ea4f66637
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by Hyenh#6078 (313846233099927552), edited by Unkn0wnGh0st333 on github",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "closed"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "welded"
+        },
+        {
+            "name": "sparking",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..faef025ed9fc7ac53168e763ee54e04b2b9f4337
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmhjtJZ$xxlFh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MF2wxVGIKjGxbDzAp_6xbq^n3@1i`*``n+SN6DKE@QK8;OgAjzb>itw
zOXs{#9A+g+AwDM_HRyuGk6f2se&bwpSm2pqBa@mV4ik&THkR9%l?;`5ia4UE8s!UF
zmle)ioYiubHSft^7|d(SX|B^8L>!AqAPEsNs@Omo7NWFjq?kz2e$2z)@A#AClF79J
zMvi$@ph9x|;D7MDTeC1Z;U)!RK<A5Xe+&bGU7%63?eAmTZkz!AXW&X}`73o`=9BbV
zON$%<z1zUWbxV`?fXf}A?@5;o$&vgtg+c*%KcjET0ij!<d)4i&xsTHaAVXa(-2exN
zz(|p@*F4_c)!y5`XPW)}0Mu4;&IkMX_W%F@tVu*cR9J=Wlrav&APhyFszSmN11mS+
z{)gcPtPDu@NS7uGfmSUE%HlTx-@;Eq7~p1>bz!Y7y@Hg|@+lw9_W34&h{bzf6@?J0
z{XQSf)|`l10q0y#_Hts3o51rJ5)m--l*U?XK*Z{-5nyIeN=*@9=0@N#rPCjXfC$_!
zP<=xp0;LofW2Q9AIRg>>R{Wlf1rfWm{Hi;?KEZKl3`(57Ll6W(5CmZ=FZ}OAIQ&tI
QVE_OC07*qoM6N<$g6k<6H2?qr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?$P6U!|9apHq&N#aB8wRqxP?HN@zUM8KR`jY
z0G|+7ApQUUOh%6A4L}xSNswPKgTu2MX+Tb*r;B5V#`)v~iN*%b)hn0<iW?-j0@yqn
z4l<t-bPUtt2wuhz${5C!WO85%2SXwECOO7A=K>QXSZ^$5X5FCBs<N0_$7N#k)QyZ%
w!U;<~FT4n7bY0A#vqqd@>LJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_
zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a
n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P6<r_f5$LJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..311739a2701db289577b99dbe6910bad2a1f9010
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8<QBd}hwL44
zfj|PqF-gJW>rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99
zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAt<G2m_I2-_|>l)`=
zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708
sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png
index 3011253d03629719007205a1c697d1e4662f766b..0136eefe65acdf554dc259544c74f1b6b0c01ffb 100644
GIT binary patch
delta 411
zcmV;M0c8Ht0jUF!7=H)`0001UdV2H#0004VQb$4nuFf3k0004FNkl<ZSVv=I7+}CS
z!1gnYI$$&eMniz;5STo9@_$mYY;JBYQDzgR2xKwH0k`JQC&~?KiHQs}b$~oKH-i8>
zJA)7h2iQUHe*9qg@bf3b!>?b#e40Dp#FsA&FP}eW5SNsM(|;g~EqHin=YYPhuK)K}
ztN>d;C<GKEA{dIw%7}_yq7;EF&Ck#O|L^c&umeCL00N*;fB{fwz(Rn@)|O%7#EC?i
zO_U;Z2M`JYnmYiN20#u2`5YD+{;H~AHq9MCC@<2)0U7D(|5;C;#%uS9r%&PXr(eD#
zDtd`h1TxiAL4V=DijWXN2fY0DjX_&jm|^>a2Sk}ol%i1wfI=W3AmG33qeldz0H%QI
zX#m*)gvx=(a&inCHf$g&dWlkm9s=lf0jxZLm4q~Rz<`Iq#@n~SQ4K2v(M!VN9|GvL
zAuJ^5mIesb1vHBSLKY*-Q#~7!VmT>li7p37F_aXw02EhR1TeLD4;laf002ovPDHLk
FV1n%$sRaN4

delta 194
zcmZ3<e2H;_L_G^L0|P^2NcwRgr5NB7;tHhYczI35#XS`i0s;au($jN|jPmpI`?|U&
zPoBKa$7iAJ<j+7wj3q&S!3+-1ZlnP@@t!V@AsXkC6C`{R)Fc!*eY}~Qd{P?Mgsz^p
zkVA!wt4oo4OJhii0_T**kR{684IxV&hca#wi&U`YIpH7VBxJzM$uU{wL0ev%^a)wb
r6HE%_O9G-<Pw1au(o1ki>0w}~S#8*vaQ}T3&@Ki~S3j3^P6<r_0Bb!U

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png
index a879eb63c1b684b93f2b5a6898fcc19e216cdc14..d44f89f7eeca482b563a30a1c377a0f08b2d9856 100644
GIT binary patch
delta 318
zcmV-E0m1&y0nGxC7=H)`0001UdV2H#0004VQb$4nuFf3k00038Nkl<ZSVv=I7+}CS
z!1gnYI$$&e24@INo;>+Ka_-2@&83+`8PP2RS^Rg+8kF2waPS~)9e{4(r4JwA4$u=2
zV4#ZwkS%@x=@Zxif_!`obaepC;wPU!gB_qNElpnsTz>i#Y=5x~FYgEnf&BdZ{{p8@
zF+BeEjR9K-$Z~NpG#)=ryIg?m0BmW1t`2~O04VXn09_q`t!*$e9Pnt<CUBvH3(UKC
zk+z9&WIG@rAmG2y{rkAvroVnM%)5S_c2NL!z|ETs3~X$0M<7>54D@sWwt|SR4!~9v
z)71f^Auwn{KsQ%Z6eU~ICmSMJdG^g46bD><{hGGr0D393VZ#QRS%_{I08ys~FnsA-
QT>t<807*qoM6N<$g7fo&O#lD@

delta 191
zcmX@hbe?g7L_G^L0|P^2NcwRgB@y5g;tHhoMMX_TL;@8RlQcDx^!4j4EhpI9cU_rK
z3zTCl3GxeOaCmkj4aiCLba4#PIG>y#p>aS%qv4FGh={(vgP4H6KCi1N2d^2BFbe__
zL23(}cvdJex-zU_3RUnh6$w=^nbOc;5TIbuV8R%<pn-W)1ILBp6-*B83%MBP`t9Tr
l6%Sz)cmI;%@X&~XLDpV|bNwgzy+9ioJYD@<);T3K0RUF|Gjsp|

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
index f5b67de849..bab87904fb 100644
--- a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)",
+    "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, syndicate lockers by Unkn0wnGh0st333 (GitHub) based on N2 lockers, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -135,6 +135,12 @@
         },
         {
             "name": "genpop_door_8"
+        },
+        {
+            "name": "syndicate_closed"
+        },
+        {
+            "name": "syndicate_open"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_closed.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..adeccb400fe009b7e38ca82339ece489cc171179
GIT binary patch
literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<(Vi}jArbD$
zDG~_>EDn4#?y*WRVQF*Yc=G)De{mrZ70ttYs{hYRd~~Ff#nvN$@x--bZEgSa&2p7a
zGAh;8@qFdwWjU+9f+0m)gXN#B9Zz|Kjk$R<gSB<D06Tlco4ft;Jo0t_QYwCY)sEqv
zyjJ(C6T@9b^?fyo6+i!2Ht$%XGJ}m#;C54cyB(i|iDJVXjTcf(N0zwFTE@7``arPb
z!~I<o1mddeXG$zSaer5Bd*c6pe_4tp9a$BEI|~n(Iy$zU_up^)!K>IPW=BQm!JhWn
ziNBlKK`v?#VejbdG~845wd)rj2M5Ow{ogMH?`bf!GVnAwIrxXSR|N{l34MxxbI*1U
z-;F=-WV`n4?BqOr$~2p!%>ZQnMdyYYO)oaikvZJPE6p*>KY-DUT_9NG@)gErHI@&e
zM@@Jclf0Z(SvN>{U%VQiD>y0Ha${A;Db^!WZhgA~*?Za;7?dI}DeiRjGXaJ<gQu&X
J%Q~loCIHqLpqT&w

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b6c8883f6855b7bdf8d82d326b3fb82d3861dd4
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$F-b&0R9Hvtmah)NFc8KMBoY!FIG_%JK+OSDfZfxOg*RAuk%5{=&5+=lObsM|
z^c0XQlr&p|yBlIPT_*PZ?z`)^)}Z87D_I{ZfXacN4hSKhIHXcaGN%e3)}kovd7e5X
zzVFikn1ZG#KHqjbXe}1>0J>5wYGwl)09K1@*leo(c)zQi6#&K8ajb-wy&gZnHc4PL
z9`ifkx-LBSdu4y#fx6>B5CpWRKm(uy+Il^RtN^w@BMZRgdV|??0%@AUD9Z{Qo5O*&
z1%ClB=)aF$DGp?Y?ek9%nSCH{!L-r%>gAL0-0eabhO{#vgn-WJWX%Cq09z8W0@#v}
z6~LB+NxKbE6!FXeP9j#U7tRHn16ou{Sx7?CJ7NAxMtup*S4Y-c+mFrmt^z3Cffv=~
V!XaT->K*_9002ovPDHLkV1jlXn?V2o

literal 0
HcmV?d00001


From c4e3ce0214fb5bb68b95c04334eed16e7ac90660 Mon Sep 17 00:00:00 2001
From: BruhIsaac <dodgerike@yahoo.com>
Date: Thu, 18 Dec 2025 13:39:41 -0700
Subject: [PATCH 137/360] Rebalance the Ghost Role Raffles (#33157)

* Up raffle time/no-add time

* upd

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Resources/Prototypes/GhostRoleRaffles/settings.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/GhostRoleRaffles/settings.yml b/Resources/Prototypes/GhostRoleRaffles/settings.yml
index 73700404f2..2e8a060bde 100644
--- a/Resources/Prototypes/GhostRoleRaffles/settings.yml
+++ b/Resources/Prototypes/GhostRoleRaffles/settings.yml
@@ -2,14 +2,14 @@
 - type: ghostRoleRaffleSettings
   id: default
   settings:
-    initialDuration: 30
-    joinExtendsDurationBy: 10
-    maxDuration: 90
+    initialDuration: 45
+    joinExtendsDurationBy: 2
+    maxDuration: 45
 
 # for roles that don't matter too much or are available plentifully (e.g. space carp)
 - type: ghostRoleRaffleSettings
   id: short
   settings:
-    initialDuration: 10
-    joinExtendsDurationBy: 2
+    initialDuration: 15
+    joinExtendsDurationBy: 0
     maxDuration: 15

From 73ba5d452d7ff11b0a2574569c4cc86822216261 Mon Sep 17 00:00:00 2001
From: Fildrance <fildrance@gmail.com>
Date: Fri, 19 Dec 2025 00:06:24 +0300
Subject: [PATCH 138/360] feat: RnD tech research console now have reroll
 feature (#32931)

* feat: RnD tech research console now have reroll feature

* fix: disable Rediscover button when there is not enough currency or user have no access

* refactor: xml-doc, extract method, minor simplify xaml

* minor cleanup after review

* refactor: change sending research server points amount into BUI from state to  ResearchServerComponent (using AfterAutoHandleStateEvent)

* feat: now tech rerolls will have cooldown to ensure no one can spam-spend all dept budget instantly

* refactor: revert unneeded code

* refactor: whitespaces

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 Content.Client/Research/ResearchSystem.cs     |  7 +--
 .../UI/ResearchConsoleBoundUserInterface.cs   | 16 ++---
 .../Research/UI/ResearchConsoleMenu.xaml      |  3 +-
 .../Research/UI/ResearchConsoleMenu.xaml.cs   | 63 ++++++++++++++++++-
 .../Systems/ResearchSystem.Console.cs         | 61 +++++++++++++++---
 .../Systems/ResearchSystem.Technology.cs      |  8 +--
 .../Components/ResearchServerComponent.cs     | 35 +++++++----
 .../SharedResearchConsoleComponent.cs         | 24 ++++---
 .../Components/TechnologyDatabaseComponent.cs |  9 ++-
 .../components/research-console-component.ftl |  2 +
 10 files changed, 168 insertions(+), 60 deletions(-)

diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs
index 55d9535272..7086fc928b 100644
--- a/Content.Client/Research/ResearchSystem.cs
+++ b/Content.Client/Research/ResearchSystem.cs
@@ -1,8 +1,5 @@
-using Content.Shared.Research.Systems;
+using Content.Shared.Research.Systems;
 
 namespace Content.Client.Research;
 
-public sealed class ResearchSystem : SharedResearchSystem
-{
-
-}
+public sealed class ResearchSystem : SharedResearchSystem;
diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index 2895ada61f..d5202eea5d 100644
--- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -7,23 +7,22 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Research.UI;
 
 [UsedImplicitly]
-public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface
+public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     [ViewVariables]
     private ResearchConsoleMenu? _consoleMenu;
 
-    public ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
     protected override void Open()
     {
         base.Open();
 
-        var owner = Owner;
-
         _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
-        _consoleMenu.SetEntity(owner);
+        _consoleMenu.SetEntity(Owner);
+
+        _consoleMenu.OnTechnologyRediscoverPressed += () =>
+        {
+            SendMessage(new ConsoleRediscoverTechnologyMessage());
+        };
 
         _consoleMenu.OnTechnologyCardPressed += id =>
         {
@@ -56,6 +55,7 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface
 
         if (state is not ResearchConsoleBoundInterfaceState castState)
             return;
+
         _consoleMenu?.UpdatePanels(castState);
         _consoleMenu?.UpdateInformationPanel(castState);
     }
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 8de9827c0c..8e3a74f933 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
@@ -22,6 +22,7 @@
             </BoxContainer>
             <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalAlignment="Right">
                 <Button Name="ServerButton" Text="{Loc 'research-console-menu-server-selection-button'}" MinHeight="40"/>
+                <Button Name="RediscoverButton" Margin="0 5 0 0" ToolTip="{Loc 'research-console-menu-server-rediscover-tooltip'}" MinHeight="40"/>
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal"
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index eafbe75fbb..e0e6029667 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -12,6 +12,7 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Research.UI;
@@ -20,15 +21,26 @@ namespace Content.Client.Research.UI;
 public sealed partial class ResearchConsoleMenu : FancyWindow
 {
     public Action<string>? OnTechnologyCardPressed;
+    public Action? OnTechnologyRediscoverPressed;
     public Action? OnServerButtonPressed;
 
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
     private readonly AccessReaderSystem _accessReader;
 
+    // if set to null  - we are waiting for server info and should not let rerolls
+    private TimeSpan? _nextRediscover;
+    private int _rediscoverCost;
+    private int _serverPoints;
+
+    private TimeSpan _nextUpdate;
+    private readonly TimeSpan _updateInterval = TimeSpan.FromMilliseconds(500);
+
     public EntityUid Entity;
 
     public ResearchConsoleMenu()
@@ -41,6 +53,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         _accessReader = _entity.System<AccessReaderSystem>();
 
         ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
+        RediscoverButton.OnPressed += OnRediscoverPressed;
     }
 
     public void SetEntity(EntityUid entity)
@@ -64,9 +77,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             MinHeight = 10
         });
 
-        var hasAccess = _player.LocalEntity is not { } local ||
-                        !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
-                        _accessReader.IsAllowed(local, Entity, access);
+        var hasAccess = HasAccess();
         foreach (var techId in database.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
@@ -79,6 +90,12 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         SyncTechnologyList(UnlockedCardsContainer, unlockedTech);
     }
 
+    private void UpdateRediscoverButton()
+    {
+        RediscoverButton.Disabled = !HasAccess() || _serverPoints < _rediscoverCost || _timing.CurTime < _nextRediscover;
+        RediscoverButton.Text = Loc.GetString("research-console-menu-server-rediscover-button", ("cost", _rediscoverCost));
+    }
+
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();
@@ -137,6 +154,27 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             };
             TierDisplayContainer.AddChild(control);
         }
+
+        _serverPoints = state.Points;
+        _rediscoverCost = state.RediscoverCost;
+        _nextRediscover = state.NextRediscover;
+
+        UpdateRediscoverButton();
+    }
+
+    private void OnRediscoverPressed(BaseButton.ButtonEventArgs args)
+    {
+        RediscoverButton.Disabled = true;
+        _nextRediscover = null;
+
+        OnTechnologyRediscoverPressed?.Invoke();
+    }
+
+    private bool HasAccess()
+    {
+        return _player.LocalEntity is not { } local
+               || !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access)
+               || _accessReader.IsAllowed(local, Entity, access);
     }
 
     /// <summary>
@@ -179,5 +217,24 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             container.Children.Remove(techControl);
         }
     }
+
+    /// <inheritdoc />
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if(_nextUpdate > _timing.CurTime)
+            return;
+
+        _nextUpdate = _timing.CurTime + _updateInterval;
+
+        if (!RediscoverButton.Disabled)
+            return;
+
+        if (_nextRediscover == null || _nextRediscover > _timing.CurTime)
+            return;
+
+        UpdateRediscoverButton();
+    }
 }
 
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
index baaf06ea71..0458408143 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -17,6 +17,7 @@ public sealed partial class ResearchSystem
     private void InitializeConsole()
     {
         SubscribeLocalEvent<ResearchConsoleComponent, ConsoleUnlockTechnologyMessage>(OnConsoleUnlock);
+        SubscribeLocalEvent<ResearchConsoleComponent, ConsoleRediscoverTechnologyMessage>(OnRediscoverTechnology);
         SubscribeLocalEvent<ResearchConsoleComponent, BeforeActivatableUIOpenEvent>(OnConsoleBeforeUiOpened);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchServerPointsChangedEvent>(OnPointsChanged);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchRegistrationChangedEvent>(OnConsoleRegistrationChanged);
@@ -25,6 +26,41 @@ public sealed partial class ResearchSystem
         SubscribeLocalEvent<ResearchConsoleComponent, GotEmaggedEvent>(OnEmagged);
     }
 
+    private void OnRediscoverTechnology(
+        EntityUid uid,
+        ResearchConsoleComponent console,
+        ConsoleRediscoverTechnologyMessage args
+    )
+    {
+        var act = args.Actor;
+
+        if (!this.IsPowered(uid, EntityManager))
+            return;
+
+        if (!HasAccess(uid, act))
+        {
+            _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
+            return;
+        }
+
+        if (!TryGetClientServer(uid, out var serverEnt, out var serverComponent))
+            return;
+
+        if(serverComponent.NextRediscover > _timing.CurTime)
+            return;
+
+        var rediscoverCost = serverComponent.RediscoverCost;
+        if (rediscoverCost > serverComponent.Points)
+            return;
+
+        serverComponent.NextRediscover = _timing.CurTime + serverComponent.RediscoverInterval;
+
+        ModifyServerPoints(serverEnt.Value, -rediscoverCost);
+        UpdateTechnologyCards(serverEnt.Value);
+        SyncClientWithServer(uid);
+        UpdateConsoleInterface(uid);
+    }
+
     private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component, ConsoleUnlockTechnologyMessage args)
     {
         var act = args.Actor;
@@ -35,7 +71,7 @@ public sealed partial class ResearchSystem
         if (!PrototypeManager.TryIndex<TechnologyPrototype>(args.Id, out var technologyPrototype))
             return;
 
-        if (TryComp<AccessReaderComponent>(uid, out var access) && !_accessReader.IsAllowed(act, uid, access))
+        if (!HasAccess(uid, act))
         {
             _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
             return;
@@ -72,17 +108,17 @@ public sealed partial class ResearchSystem
         if (!Resolve(uid, ref component, ref clientComponent, false))
             return;
 
-        ResearchConsoleBoundInterfaceState state;
-
-        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent))
+        
+        var points = 0;
+        var nextRediscover = TimeSpan.MaxValue;
+        var rediscoverCost = 0;
+        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent) && clientComponent.ConnectedToServer)
         {
-            var points = clientComponent.ConnectedToServer ? serverComponent.Points : 0;
-            state = new ResearchConsoleBoundInterfaceState(points);
-        }
-        else
-        {
-            state = new ResearchConsoleBoundInterfaceState(default);
+            points = serverComponent.Points;
+            nextRediscover = serverComponent.NextRediscover;
+            rediscoverCost = serverComponent.RediscoverCost;
         }
+        var state = new ResearchConsoleBoundInterfaceState(points, nextRediscover, rediscoverCost);
 
         _uiSystem.SetUiState(uid, ResearchConsoleUiKey.Key, state);
     }
@@ -121,4 +157,9 @@ public sealed partial class ResearchSystem
 
         args.Handled = true;
     }
+
+    private bool HasAccess(EntityUid uid, EntityUid act)
+    {
+        return TryComp<AccessReaderComponent>(uid, out var access) && _accessReader.IsAllowed(act, uid, access);
+    }
 }
diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 3e8888276f..0c871c8071 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -165,10 +165,10 @@ public sealed partial class ResearchSystem
         if (args.Server != null)
             return;
         component.MainDiscipline = null;
-        component.CurrentTechnologyCards = new List<string>();
-        component.SupportedDisciplines = new List<ProtoId<TechDisciplinePrototype>>();
-        component.UnlockedTechnologies = new List<ProtoId<TechnologyPrototype>>();
-        component.UnlockedRecipes = new List<ProtoId<LatheRecipePrototype>>();
+        component.CurrentTechnologyCards = new();
+        component.SupportedDisciplines = new();
+        component.UnlockedTechnologies = new();
+        component.UnlockedRecipes = new();
         Dirty(uid, component);
     }
 }
diff --git a/Content.Shared/Research/Components/ResearchServerComponent.cs b/Content.Shared/Research/Components/ResearchServerComponent.cs
index 3663e760f1..dab33f062d 100644
--- a/Content.Shared/Research/Components/ResearchServerComponent.cs
+++ b/Content.Shared/Research/Components/ResearchServerComponent.cs
@@ -1,26 +1,32 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Research.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class ResearchServerComponent : Component
 {
     /// <summary>
     /// The name of the server
     /// </summary>
     [AutoNetworkedField]
-    [DataField("serverName"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string ServerName = "RDSERVER";
 
     /// <summary>
     /// The amount of points on the server.
     /// </summary>
     [AutoNetworkedField]
-    [DataField("points"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int Points;
 
+    /// <summary>
+    /// Cost of technology research options reroll.
+    /// </summary>
+    [AutoNetworkedField]
+    [DataField]
+    public int RediscoverCost = 2000;
+
     /// <summary>
     /// A unique numeric id representing the server
     /// </summary>
@@ -37,27 +43,34 @@ public sealed partial class ResearchServerComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public List<EntityUid> Clients = new();
 
-    [DataField("nextUpdateTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextUpdateTime = TimeSpan.Zero;
 
-    [DataField("researchConsoleUpdateTime"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan ResearchConsoleUpdateTime = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Time when next reroll for tech to research will be available.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextRediscover;
+
+    /// <summary>
+    /// Minimal interval between rediscover actions.
+    /// </summary>
+    [DataField]
+    public TimeSpan RediscoverInterval = TimeSpan.FromSeconds(1);
 }
 
 /// <summary>
 /// Event raised on a server's clients when the point value of the server is changed.
 /// </summary>
-/// <param name="Server"></param>
-/// <param name="Total"></param>
-/// <param name="Delta"></param>
 [ByRefEvent]
 public readonly record struct ResearchServerPointsChangedEvent(EntityUid Server, int Total, int Delta);
 
 /// <summary>
 /// Event raised every second to calculate the amount of points added to the server.
 /// </summary>
-/// <param name="Server"></param>
-/// <param name="Points"></param>
 [ByRefEvent]
 public record struct ResearchServerGetPointsPerSecondEvent(EntityUid Server, int Points);
 
diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
index 6b7a210ecb..bf1269ad01 100644
--- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
@@ -9,16 +9,14 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ConsoleUnlockTechnologyMessage : BoundUserInterfaceMessage
+    public sealed class ConsoleUnlockTechnologyMessage(string id) : BoundUserInterfaceMessage
     {
-        public string Id;
-
-        public ConsoleUnlockTechnologyMessage(string id)
-        {
-            Id = id;
-        }
+        public string Id = id;
     }
 
+    [Serializable, NetSerializable]
+    public sealed class ConsoleRediscoverTechnologyMessage : BoundUserInterfaceMessage;
+
     [Serializable, NetSerializable]
     public sealed class ConsoleServerSelectionMessage : BoundUserInterfaceMessage
     {
@@ -26,12 +24,12 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ResearchConsoleBoundInterfaceState : BoundUserInterfaceState
+    public sealed class ResearchConsoleBoundInterfaceState(int points, TimeSpan nextRediscover, int rediscoverCost) : BoundUserInterfaceState
     {
-        public int Points;
-        public ResearchConsoleBoundInterfaceState(int points)
-        {
-            Points = points;
-        }
+        public int Points = points;
+
+        public TimeSpan NextRediscover = nextRediscover;
+
+        public int RediscoverCost = rediscoverCost;
     }
 }
diff --git a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
index f00338aac7..89411a05c0 100644
--- a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
@@ -3,7 +3,6 @@ using Content.Shared.Research.Prototypes;
 using Content.Shared.Research.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Research.Components;
 
@@ -14,12 +13,12 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// A main discipline that locks out other discipline technology past a certain tier.
     /// </summary>
     [AutoNetworkedField]
-    [DataField("mainDiscipline", customTypeSerializer: typeof(PrototypeIdSerializer<TechDisciplinePrototype>))]
-    public string? MainDiscipline;
+    [DataField]
+    public ProtoId<TechDisciplinePrototype>? MainDiscipline;
 
     [AutoNetworkedField]
-    [DataField("currentTechnologyCards")]
-    public List<string> CurrentTechnologyCards = new();
+    [DataField]
+    public List<ProtoId<TechnologyPrototype>> CurrentTechnologyCards = new();
 
     /// <summary>
     /// Which research disciplines are able to be unlocked
diff --git a/Resources/Locale/en-US/research/components/research-console-component.ftl b/Resources/Locale/en-US/research/components/research-console-component.ftl
index 5a1e074f4d..3094b4e773 100644
--- a/Resources/Locale/en-US/research/components/research-console-component.ftl
+++ b/Resources/Locale/en-US/research/components/research-console-component.ftl
@@ -6,6 +6,8 @@ research-console-menu-main-discipline = Main Discipline: [color={$color}]{$name}
 research-console-menu-server-selection-button = Server list
 research-console-menu-server-sync-button = Sync
 research-console-menu-server-research-button = Research
+research-console-menu-server-rediscover-button = Rediscover ({$cost})
+research-console-menu-server-rediscover-tooltip = Reroll list of technologies to research
 research-console-available-text = Researchable Technologies
 research-console-unlocked-text = Unlocked Technologies
 research-console-tier-discipline-info = Tier {$tier}, [color={$color}]{$discipline}[/color]

From a2fbf2336679915ef43ce1db3adbdcee3c007c3a Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Fri, 19 Dec 2025 01:51:27 -0500
Subject: [PATCH 139/360] Cleanup of circuit tote / stamp box prototypes +
 added small cardboard boxes as a general item (#41335)

* Cleanup of circuit tote / stamp box prototypes

* New BoxCardboardSmall abstract prototype, stamp box uses this as a parent now

* Removed stamp box whitelist

* Whitelist fix

* We love scope creep! Small cardboard boxes are a general thing now.

* Box description updates

* Box description updates 2!

* Prototype order cleanup

* Comment updates

* Desc touchup

* Review updates

* StorageFill -> ContainerFill

* code  comment update

* decapitalized labels

* Code comment update

* Whoops! Forgot to update one ContainerFill to EntityTableContainerFill when fixing merge conflict

* Whoops! EntityTableContainerFill items were all formatted wrong

* Departmental box names

* Misc fixes

* Whoops, forgot to remove some labels
---
 .../en-US/construction/recipes/crates.ftl     |   3 +-
 .../Catalog/Fills/Boxes/general.yml           |  49 +++-
 .../Prototypes/Catalog/Fills/Boxes/heads.yml  | 215 +++++++-----------
 .../Prototypes/Entities/Objects/Misc/box.yml  |  31 ++-
 .../Crafting/Graphs/storage/cardboardbox.yml  |  16 +-
 .../Prototypes/Recipes/Crafting/crates.yml    |   9 +
 6 files changed, 173 insertions(+), 150 deletions(-)

diff --git a/Resources/Locale/en-US/construction/recipes/crates.ftl b/Resources/Locale/en-US/construction/recipes/crates.ftl
index c5b2b47c32..ea4ce93609 100644
--- a/Resources/Locale/en-US/construction/recipes/crates.ftl
+++ b/Resources/Locale/en-US/construction/recipes/crates.ftl
@@ -1,4 +1,5 @@
 construction-recipe-crate-freezer = crate freezer
 construction-recipe-big-box = large cardboard box
-construction-recipe-box-cardboard = small cardboard box
+construction-recipe-box-cardboard = cardboard box
+construction-recipe-box-cardboard-small = small cardboard box
 construction-recipe-box-tote = circuit tote
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 81b094b9b0..2a24b89896 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -1,17 +1,37 @@
 - type: entity
-  name: cardboard box
   parent: BoxBase
   id: BoxCardboard
+  name: cardboard box
   description: A cardboard box for storing things.
   components:
-  - type: Item
-    size: Large
-    shape:
-    - 0,0,2,2
-  - type: Storage
-    maxItemSize: Small
-    grid:
-    - 0,0,2,2
+  - type: Construction
+    graph: BoxCardboard
+    node: boxcardboard
+    containers:
+      - storagebase
+  - type: PhysicalComposition
+    materialComposition:
+      Cardboard: 100
+  - type: Sprite
+    state: box
+  - type: Tag
+    tags:
+    - BoxCardboard
+
+- type: entity
+  parent: BoxBaseSmall
+  id: BoxCardboardSmall
+  name: small cardboard box
+  description: A small cardboard box for storing things.
+  components:
+  - type: Construction
+    graph: BoxCardboardSmall # Half the material cost of the "regular" cardboardbox
+    node: boxcardboardsmall
+    containers:
+      - storagebase
+  - type: PhysicalComposition # Half of the "regular" cardboard box
+    materialComposition:
+      Cardboard: 50
   - type: Sprite
     state: box
   - type: Tag
@@ -161,6 +181,17 @@
       - state: box
       - state: headset
 
+- type: entity
+  parent: BoxCardboardSmall
+  id: BoxStamps
+  name: stamp box
+  description: A small box containing stamps.
+  components: # Baking a "default" EntityTableContainerFill into this prototype seems like bad practice, so this is currently an empty box. If you need a new type of prefilled stamp box, create a new child prototype with the appropriate stamps!
+  - type: Sprite
+    layers:
+      - state: box
+      - state: stamp
+
 - type: entity
   name: meson box
   parent: BoxCardboard
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml
index 0b5ef60aae..c9d84ae8b2 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml
@@ -1,8 +1,91 @@
 - type: entity
-  name: circuit tote [LO] # DeltaV - Renamed QM to LO
+  parent: ToteBase
+  id: BoxCaptainCircuitboards
+  name: bridge circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: CommsComputerCircuitboard
+        - id: StationRecordsComputerCircuitboard
+        - id: IDComputerCircuitboard # DeltaV
+
+- type: entity
+  parent: ToteBase
+  id: BoxCECircuitboards
+  name: engineering circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: CargoRequestEngineeringComputerCircuitboard
+        - id: AlertsComputerCircuitboard
+        - id: AtmosMonitoringComputerCircuitboard
+        - id: PowerComputerCircuitboard
+        - id: SolarControlComputerCircuitboard
+        - id: IDComputerCircuitboard # DeltaV
+        - id: EngineeringTechFabCircuitboard # DeltaV
+        - id: CircuitImprinterMachineCircuitboard # DeltaV
+
+- type: entity
+  parent: ToteBase
+  id: BoxCMOCircuitboards
+  name: medical circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: MedicalTechFabCircuitboard
+        - id: CargoRequestMedicalComputerCircuitboard
+        - id: IDComputerCircuitboard # DeltaV
+        - id: MedicalBiofabMachineBoard # DeltaV
+        - id: AutoclaveMachineCircuitboard # DeltaV
+
+- type: entity
+  parent: ToteBase
+  id: BoxHoPCircuitboards
+  name: head of personnel circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: IDComputerCircuitboard
+        - id: FundingAllocationComputerCircuitboard
+        - id: CargoRequestServiceComputerCircuitboard
+
+- type: entity
+  parent: BoxStamps
+  id: BoxHoPStamps
+  name: head of personnel's stamp box
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: RubberStampApproved
+        - id: RubberStampDenied
+        - id: RubberStampHop
+
+- type: entity
+  parent: ToteBase
+  id: BoxHoSCircuitboards
+  name: security circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: SecurityTechFabCircuitboard
+        - id: CargoRequestSecurityComputerCircuitboard
+
+- type: entity
   parent: ToteBase
   id: BoxQMCircuitboards
-  description: A Tote filled with LO's Circuit boards. # DeltaV - Renamed QM to LO
+  name: cargo circuit tote
   components:
   - type: EntityTableContainerFill
     containers:
@@ -24,15 +107,10 @@
         # END DeltaV Additions
 
 - type: entity
-  name: stamp box [LO] # DeltaV - Renamed QM to LO
-  parent: BoxCardboard
+  parent: BoxStamps
   id: BoxQMStamps
-  description: A box filled with LO's Stamps. Stamped of course. # DeltaV - Renamed QM to LO
+  name: quartermaster's stamp box
   components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,1
   - type: EntityTableContainerFill
     containers:
       storagebase: !type:AllSelector
@@ -40,114 +118,11 @@
         - id: RubberStampApproved
         - id: RubberStampDenied
         - id: RubberStampQm
-  - type: Storage
-    grid:
-    - 0,0,1,1
-    whitelist:
-      components:
-      - Stamp
-  - type: Sprite
-    layers:
-      - state: box
-      - state: stamp
 
 - type: entity
-  name: circuit tote [HoP]
-  parent: ToteBase
-  id: BoxHoPCircuitboards
-  description: A Tote filled with HoP's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: IDComputerCircuitboard
-        #- id: FundingAllocationComputerCircuitboard # DeltaV - HoP doesn't have funding access
-        - id: FundingAllocationComputerCircuitboard
-        - id: ServiceTechFabCircuitboard # DeltaV
-
-- type: entity
-  name: stamp box [HoP]
-  parent: BoxCardboard
-  id: BoxHoPStamps
-  description: A box filled with HoP's Stamps. Stamped of course.
-  components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,1
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: RubberStampApproved
-        - id: RubberStampDenied
-        - id: RubberStampHop
-  - type: Storage
-    grid:
-    - 0,0,1,1
-    whitelist:
-      components:
-      - Stamp
-  - type: Sprite
-    layers:
-      - state: box
-      - state: stamp
-
-- type: entity
-  name: circuit tote [CE]
-  parent: ToteBase
-  id: BoxCECircuitboards
-  description: A Tote filled with CE's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: CargoRequestEngineeringComputerCircuitboard
-        - id: AlertsComputerCircuitboard
-        - id: AtmosMonitoringComputerCircuitboard
-        - id: PowerComputerCircuitboard
-        - id: SolarControlComputerCircuitboard
-        - id: IDComputerCircuitboard # DeltaV
-        - id: EngineeringTechFabCircuitboard # DeltaV
-        - id: CircuitImprinterMachineCircuitboard # DeltaV
-
-- type: entity
-  name: circuit tote [Captain]
-  parent: ToteBase
-  id: BoxCaptainCircuitboards
-  description: A Tote filled with Captain's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: CommsComputerCircuitboard
-        - id: StationRecordsComputerCircuitboard
-        - id: IDComputerCircuitboard # DeltaV
-
-- type: entity
-  name: circuit tote [CMO]
-  parent: ToteBase
-  id: BoxCMOCircuitboards
-  description: A Tote filled with CMO's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: MedicalTechFabCircuitboard
-        - id: CargoRequestMedicalComputerCircuitboard
-        - id: IDComputerCircuitboard # DeltaV
-        - id: MedicalBiofabMachineBoard # DeltaV
-        - id: AutoclaveMachineCircuitboard # DeltaV
-
-- type: entity
-  name: circuit tote [MG] # DeltaV - Changed to MG
   parent: ToteBase
   id: BoxRDCircuitboards
-  description: A Tote filled with MG's Circuit boards. # DeltaV - Changed to MG
+  name: science circuit tote
   components:
   - type: EntityTableContainerFill
     containers:
@@ -163,17 +138,3 @@
         - id: StationAiFixerCircuitboard
         - id: IDComputerCircuitboard # DeltaV
         - id: EpistemicsTechFabCircuitboard # DeltaV
-
-- type: entity
-  name: circuit tote [HoS]
-  parent: ToteBase
-  id: BoxHoSCircuitboards
-  description: A Tote filled with HoS's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: SecurityTechFabCircuitboard
-        - id: CargoRequestSecurityComputerCircuitboard
-        - id: IDComputerCircuitboard # DeltaV
diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
index c6518c991f..e45a32d616 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BoxBase
-  parent: BaseStorageItem
   abstract: true
+  parent: BaseStorageItem
+  id: BoxBase
   components:
   - type: Sprite
     sprite: Objects/Storage/boxes.rsi
@@ -17,21 +17,28 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
-  - type: Construction
-    graph: BoxCardboard
-    node: boxcardboard
-    containers:
-      - storagebase
-  - type: PhysicalComposition
-    materialComposition:
-      Cardboard: 100
   - type: StaticPrice
     price: 10
 
 - type: entity
-  name: circuit tote
-  id: ToteBase
+  abstract: true
   parent: BoxBase
+  id: BoxBaseSmall
+  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,1
+  - type: Storage
+    grid:
+    - 0,0,1,1
+  - type: StaticPrice # Half of the "regular" box
+    price: 5
+
+- type: entity
+  parent: BoxBase
+  id: ToteBase
+  name: circuit tote
   description: A large tote for carrying circuit boards.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
index 9cabb7e441..edfd66353a 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
@@ -7,11 +7,25 @@
     - to: boxcardboard
       steps:
       - material: Cardboard
-        amount: 1
+        amount: 2
         doAfter: 4
   - node: boxcardboard
     entity: BoxCardboard
 
+- type: constructionGraph
+  id: BoxCardboardSmall
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: boxcardboardsmall
+      steps:
+      - material: Cardboard
+        amount: 1
+        doAfter: 4
+  - node: boxcardboardsmall
+    entity: BoxCardboardSmall
+
 - type: constructionGraph
   id: ToteBase
   start: start
diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml
index 0ba076b36b..eb18c4a354 100644
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -57,6 +57,15 @@
   category: construction-category-storage
   objectType: Item
 
+- type: construction
+  id: BoxCardboardSmall
+  name: construction-recipe-box-cardboard-small
+  graph: BoxCardboardSmall
+  startNode: start
+  targetNode: boxcardboardsmall
+  category: construction-category-storage
+  objectType: Item
+
 - type: construction
   id: ToteBase
   name: construction-recipe-box-tote

From 023abacc129e9a86f6d991e71feb2c5337211927 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 2 Feb 2026 19:56:11 +0100
Subject: [PATCH 140/360] Add extra FTL for converting name to LO for
 BoxQMStamps

---
 Resources/Locale/en-US/_DV/boxes/totes.ftl | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Resources/Locale/en-US/_DV/boxes/totes.ftl

diff --git a/Resources/Locale/en-US/_DV/boxes/totes.ftl b/Resources/Locale/en-US/_DV/boxes/totes.ftl
new file mode 100644
index 0000000000..fae8ef9108
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/boxes/totes.ftl
@@ -0,0 +1 @@
+ent-BoxQMStamps = LO's stamp box

From 66abd3299a0a083160a360c956a460d87ded46cc Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Fri, 19 Dec 2025 20:28:06 +0100
Subject: [PATCH 141/360] [Staging] Fix certain projectiles moving faster than
 intended (#41905)

Return to original value (25)
---
 .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index ef592feb3e..cbecf75738 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -1048,7 +1048,7 @@
   components:
   - type: BatterySelfRecharger
     autoRechargeRate: 30
-  # "remove" wield bonus and penalty so borgs can use it 
+  # "remove" wield bonus and penalty so borgs can use it
   - type: GunWieldBonus
     minAngle: 0
     maxAngle: 0

From d55bd19318d41fb23488303ffe06f365b4b2163c Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Sat, 20 Dec 2025 02:37:11 +0100
Subject: [PATCH 142/360] Shield QoL + buff (#41326)

* Add Damage Examine to Shields

* Make Repairs repeat when not fully repaired

* Make some Shields repairable

* Please the Grammar Gods
---
 .../en-US/blocking/blocking-examine.ftl       | 14 ++++++++
 .../Prototypes/Damage/examine_messages.yml    | 12 +++++++
 .../Entities/Objects/Shields/shields.yml      | 33 +++++++++++++++----
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/Resources/Locale/en-US/blocking/blocking-examine.ftl b/Resources/Locale/en-US/blocking/blocking-examine.ftl
index 8afc0ef08f..19cf58d4c3 100644
--- a/Resources/Locale/en-US/blocking/blocking-examine.ftl
+++ b/Resources/Locale/en-US/blocking/blocking-examine.ftl
@@ -4,3 +4,17 @@ blocking-examinable-verb-message = Examine the protection values.
 blocking-fraction = It blocks [color=lightblue]{$value}%[/color] of incoming damage and:
 blocking-coefficient-value = - It takes [color=lightblue]{$value}%[/color] of [color=yellow]{$type}[/color] damage.
 blocking-reduction-value = - It takes [color=lightblue]{$value}[/color] less [color=yellow]{$type}[/color] damage.
+
+# Shown when examining the shield. Each entry represents the shield's health condition
+comp-shield-damaged-1 = It looks fully intact.
+comp-shield-damaged-2 = It has a few scratches.
+comp-shield-damaged-3 = It has a few small holes and divots.
+comp-shield-damaged-4 = [color=yellow]It has several holes and bent parts.[/color]
+comp-shield-damaged-5 = [color=orange]It has deep cracks, several holes and parts of it have broken off.[/color]
+comp-shield-damaged-6 = [color=red]It's been extremely brutalized and is nearly falling apart.[/color]
+
+# Shown when examining the e-shield. Each entry represents the e-shield's health condition
+comp-eshield-damaged-1 = It looks fully intact.
+comp-eshield-damaged-2 = [color=yellow]The battery light is yellow.[/color]
+comp-eshield-damaged-3 = [color=orange]The battery light is orange, the hardlight flickers.[/color]
+comp-eshield-damaged-4 = [color=red]The battery light is red, the hardlight can barely stay alight.[/color]
diff --git a/Resources/Prototypes/Damage/examine_messages.yml b/Resources/Prototypes/Damage/examine_messages.yml
index 91f838a436..fe551902b0 100644
--- a/Resources/Prototypes/Damage/examine_messages.yml
+++ b/Resources/Prototypes/Damage/examine_messages.yml
@@ -3,3 +3,15 @@
   values:
     prefix: comp-window-damaged-
     count: 6
+
+- type: localizedDataset
+  id: ShieldMessages
+  values:
+    prefix: comp-shield-damaged-
+    count: 6
+
+- type: localizedDataset
+  id: EnergyShieldMessages
+  values:
+    prefix: comp-eshield-damaged-
+    count: 4
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 97149b8da9..c99f3ef463 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -33,6 +33,8 @@
           Heat: 1
     - type: Damageable
       damageContainer: Shield
+    - type: ExaminableDamage
+      messages: ShieldMessages
     - type: Destructible
       thresholds:
         - trigger:
@@ -71,11 +73,28 @@
       bluntStaminaDamageFactor: 1.5
     # End DeltaV additions
 
+- type: entity
+  name: base repairable shield
+  parent: BaseShield
+  id: BaseRepairableShield
+  description: A repairable shield!
+  abstract: true
+  components:
+  - type: Repairable # Negative values represent healing
+    damage:
+      groups:
+        Brute: -60 # 20 of each Brute Type - 20% of a basic shield HP
+      types:
+        Heat: -20
+    fuelCost: 10 # 1/2 of a Welder for a full repair
+    doAfterDelay: 5
+    allowSelfRepair: false
+
 #Security Shields
 
 - type: entity
   name: riot shield
-  parent: [ BaseShield, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseSecurityContraband ]
   id: RiotShield
   description: A large tower shield. Good for controlling crowds.
   components:
@@ -109,7 +128,7 @@
 
 - type: entity
   name: laser shield
-  parent: [ BaseShield, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseSecurityContraband ]
   id: RiotLaserShield
   description: A shield built for withstanding lasers, but not much else.
   components:
@@ -140,7 +159,7 @@
 
 - type: entity
   name: ballistic shield
-  parent: [ BaseShield, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseSecurityContraband ]
   id: RiotBulletShield
   description: A shield built for protecting against ballistics, but not much else.
   components:
@@ -291,7 +310,7 @@
 
 - type: entity
   name: makeshift shield
-  parent: BaseShield
+  parent: BaseRepairableShield
   id: MakeshiftShield
   description: A rundown looking shield, not good for much.
   components:
@@ -413,7 +432,7 @@
 
 - type: entity
   name: clockwork shield
-  parent: BaseShield
+  parent: BaseRepairableShield
   id: ClockworkShield
   description: Ratvar oyrffrf lbh jvgu uvf cebgrpgvba.
   components:
@@ -562,6 +581,8 @@
     - type: Appearance
     - type: Damageable
       damageContainer: Shield
+    - type: ExaminableDamage
+      messages: EnergyShieldMessages
     - type: Destructible
       thresholds:
         - trigger:
@@ -603,7 +624,7 @@
 
 - type: entity
   name: telescopic shield
-  parent: BaseShield
+  parent: BaseRepairableShield
   id: TelescopicShield
   description: An advanced riot shield made of lightweight materials that collapses for easy storage.
   components:

From debd3b93f997c1f37d6be00c6e3e7cb255e02229 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sat, 20 Dec 2025 19:11:07 +0100
Subject: [PATCH 143/360] Log Station AI radial actions (#41911)

* fuck you and your anonymous zombie shocking

* ToUglyString

* because
---
 .../SharedStationAiSystem.Airlock.cs          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
index 2bf1ddc3bf..f11cba419e 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
 using Content.Shared.Doors.Components;
 using Robust.Shared.Serialization;
 using Content.Shared.Electrocution;
@@ -7,6 +9,8 @@ namespace Content.Shared.Silicons.StationAi;
 // Handles airlock radial
 public abstract partial class SharedStationAiSystem
 {
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
     private void InitializeAirlock()
     {
         SubscribeLocalEvent<DoorBoltComponent, StationAiBoltEvent>(OnAirlockBolt);
@@ -22,20 +26,30 @@ public abstract partial class SharedStationAiSystem
         if (component.BoltWireCut || !PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change bolt status on {ent} to [{args.Bolted}] using the Station AI radial because it was unpowered.");
             return;
         }
 
         if (!_access.IsAllowed(args.User, ent))
         {
             ShowDeviceNoAccessPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change bolt status on {ent} to [{args.Bolted}] using the Station AI radial because they had no access.");
             return;
         }
 
         var setResult = _doors.TrySetBoltDown((ent, component), args.Bolted, args.User, predicted: true);
         if (!setResult)
         {
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change bolt status on {ent} to [{args.Bolted}] using the Station AI radial.");
             ShowDeviceNotRespondingPopup(args.User);
         }
+        else
+        {
+            _adminLogger.Add(LogType.Action, $"{args.User} set bolt status on {ent} to [{args.Bolted}] using the Station AI radial.");
+        }
     }
 
     /// <summary>
@@ -46,16 +60,21 @@ public abstract partial class SharedStationAiSystem
         if (!PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change emergency access status on {ent} to [{args.EmergencyAccess}] using the Station AI radial because it was unpowered.");
             return;
         }
 
         if (!_access.IsAllowed(args.User, ent))
         {
             ShowDeviceNoAccessPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change emergency access status on {ent} to [{args.EmergencyAccess}] using the Station AI radial because they had no access.");
             return;
         }
 
         _airlocks.SetEmergencyAccess((ent, component), args.EmergencyAccess, args.User, predicted: true);
+        _adminLogger.Add(LogType.Action, $"{args.User} set emergency access status on {ent} to [{args.EmergencyAccess}] using the Station AI radial.");
     }
 
     /// <summary>
@@ -66,15 +85,20 @@ public abstract partial class SharedStationAiSystem
         if (component.IsWireCut || !PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change electrified status on {ent} to [{args.Electrified}] using the Station AI radial because it was unpowered.");
             return;
         }
 
         if (!_access.IsAllowed(args.User, ent))
         {
             ShowDeviceNoAccessPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change electrified status on {ent} to [{args.Electrified}] using the Station AI radial because they had no access.");
             return;
         }
 
+        _adminLogger.Add(LogType.Action, $"{args.User} set electrified status on {ent} to [{args.Electrified}] using the Station AI radial.");
         _electrify.SetElectrified((ent, component), args.Electrified);
         var soundToPlay = component.Enabled
             ? component.AirlockElectrifyDisabled

From 1df0507cec080293920e19fb4238ddc9687157a4 Mon Sep 17 00:00:00 2001
From: korczoczek <danielkorczok@gmail.com>
Date: Sat, 20 Dec 2025 19:21:49 +0100
Subject: [PATCH 144/360] Added sprites for openable ingredients (#41923)

* dont you hate it when you open your bag, but it stays closed?

* linting my yml
---
 .../Objects/Consumable/Food/ingredients.yml   |  66 ++++++++++++++++--
 .../ingredients.rsi/cornmeal-big_open.png     | Bin 0 -> 346 bytes
 .../Food/ingredients.rsi/flour-big_open.png   | Bin 0 -> 550 bytes
 .../Food/ingredients.rsi/mayo_open.png        | Bin 0 -> 369 bytes
 .../Consumable/Food/ingredients.rsi/meta.json |  20 +++++-
 .../Food/ingredients.rsi/oliveoil_open.png    | Bin 0 -> 415 bytes
 .../Food/ingredients.rsi/rice-big.png         | Bin 272 -> 476 bytes
 .../Food/ingredients.rsi/rice-big_open.png    | Bin 0 -> 479 bytes
 .../Food/ingredients.rsi/sugar-big.png        | Bin 298 -> 499 bytes
 .../Food/ingredients.rsi/sugar-big_open.png   | Bin 0 -> 496 bytes
 10 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 5d570821ca..98689e6117 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -84,8 +84,17 @@
   name: flour bag
   description: A big bag of flour. Good for baking!
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "flour-big_open"} # open
+          False: {state: "flour-big"} # closed
   - type: Sprite
-    state: flour-big
+    layers:
+    - state: flour-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -116,8 +125,17 @@
   name: cornmeal bag
   description: A big bag of cornmeal. Good for cooking!
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "cornmeal-big_open"} # open
+          False: {state: "cornmeal-big"} # closed
   - type: Sprite
-    state: cornmeal-big
+    layers:
+    - state: cornmeal-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -147,8 +165,17 @@
   name: rice bag
   description: A big bag of rice. Good for cooking!
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "rice-big_open"} # open
+          False: {state: "rice-big"} # closed
   - type: Sprite
-    state: rice-big
+    layers:
+    - state: rice-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -178,8 +205,17 @@
   name: sugar bag
   description: A big bag of tasty spacey sugar.
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "sugar-big_open"} # open
+          False: {state: "sugar-big"} # closed
   - type: Sprite
-    state: sugar-big
+    layers:
+    - state: sugar-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -211,8 +247,17 @@
   name: olive oil
   description: Olive oil. From space olives presumably.
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "oliveoil_open"} # open
+          False: {state: "oliveoil"} # closed
   - type: Sprite
-    state: oliveoil
+    layers:
+    - state: oliveoil
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -229,8 +274,17 @@
   name: mayonnaise
   description: Bottle of mayonnaise.
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "mayo_open"} # open
+          False: {state: "mayo"} # closed
   - type: Sprite
-    state: mayo
+    layers:
+    - state: mayo
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..411d9e9ede04f0b0c218a611b237bf604f3a5e0d
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvVv45dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{0gj|46
zh%1n;4>mg87JO~n+-p<Q=4Cp?*r+lrdh!4Nf1niiqzlPFim@cfFPOpM*^M+HhqJ&V
zvY3H^?=T269?xHq0u*E~@$_|Nf5{`lt;w@&<3}c-P^G7fV~EA+w-dbiju>z_H|J)&
zuYc6IN<LHM(pQh<O^;7n$USC%y6>LV1KVVVDa@}K1VuDo^BkFVkD-ROL_uGC#W5w`
z4NO{&`;^2QDo-vuQh0Ei?Q+Ids;mFrW036Ia>?fC&Eoj97dQRwr5dL3DGTis`Ml}z
dwI8pe<rhXW?XWm}SPbY022WQ%mvv4FO#oqsbj$z%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..93ad77d556d263a700a34445cb714ed4743b60bb
GIT binary patch
literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk3=|6}I|mnKOaK4@
zd`Uz>R9M69l|4(tP#A@ul)IV>1ye!jAh@-Ii=z;5bn6gG=`WBDrA|d0($Y;Fq`yF<
zWN>pYIJ$^mg9r`<!4Ig!xe%A;5+Y)fCW4T&yty~zzUQ8EUIICC{AY}YrZ*az-Xdpc
zNt*i4n;R<tTwcAX_x0VemKg!NQ}G(Ls#@#P;M09m72x#jmV?8)$mbT~Dxgb)V%Y*f
zNE2Ne2x(F*Tj<h=ZGl+i_CZW1PVCz!Qb0&E)gTv=d^B^%--slUKQaMd{&15pkw&eG
z-Klt)DIlcDbmIK21^(^*<Og#gq{+-3FO&_D<fG%Geb(2O13NbWJU+cMpA;|ZG{hn>
zoj587^`#MBvxIi?s;bR)HX#g#&zCyf+-sJyvmod-K&#!Sw^zjmde^AhYWL^UKx7+4
zthsj`wQjZhYCl|4wc!5YL-}7UTR%1p*3>iL|LLMMkE=kWQL%PbJ%B-XE7GCe!3ECw
ovz8ixFp=L7wRw&lIdTAe0j&zCNAT`;I{*Lx07*qoM6N<$f)r8U5&!@I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe6bb408e1f5f47e39e71e846a6687794209b74
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&;bSQ1l{^U)I_~M>7!q;#?NmcPCPe{Pd+GiS
z8@~z^u>GDY_IRgG@0OO{rRfdb5?S6ioqWyMxEoV9w@vq9Y&kPu@)M)hR4=x^1$N)^
zHorK<yTY9FDl>zpr(K+JM3B#c?W>YqbUyQHEd8VIr5SIqlhduIgGYJ6dW~1ik6X+<
z>y|Lg&Rw!PUjL51)b+Tw^HPR;85nN7GfRl&UMw4N-EOa=^@+M=`wwJ<pX)l${_uML
z2aden1OHS!73C|8SM%RUkyqFl%kj4O-16M|r9nTv+3NbMA|Ggfc>wehgQu&X%Q~lo
FCIAr4ec=EA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index e076f72f17..9d16a6bcd6 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill <uhhadd@gmail.com> 2024. Cheese wedge inhand by Orsoniks.",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill <uhhadd@gmail.com> 2024. Cheese wedge inhand by Orsoniks. Opened variants of olive oil, mayo and cornmeal, flour, rice and sugar bags by korczoczek, based on the unopened sprites",
   "size": {
     "x": 32,
     "y": 32
@@ -42,6 +42,9 @@
     {
       "name": "cornmeal-big"
     },
+    {
+      "name": "cornmeal-big_open"
+    },
     {
       "name": "cornmealdough"
     },
@@ -84,21 +87,33 @@
     {
       "name": "flour-big"
     },
+    {
+      "name": "flour-big_open"
+    },
     {
       "name": "flour-small"
     },
     {
       "name": "mayo"
     },
+    {
+      "name": "mayo_open"
+    },
     {
       "name": "oliveoil"
     },
+    {
+      "name": "oliveoil_open"
+    },
     {
       "name": "pizzabread"
     },
     {
       "name": "rice-big"
     },
+    {
+      "name": "rice-big_open"
+    },
     {
       "name": "rice-small"
     },
@@ -114,6 +129,9 @@
     {
       "name": "sugar-big"
     },
+    {
+      "name": "sugar-big_open"
+    },
     {
       "name": "sugar-small"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..d833c0bc85a1c359b3da8162e8a9bf39c0af05c5
GIT binary patch
literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&;gQ;Zv&j%B^wrbFF(l$}a)Jcw;slN61qDz4
zJ3c)1U(>L;Rp{)VL*<&^SS~xXD=F`kdc0ZUU-oO~8{zs!20C-x=0!5gG5I|Cb?@+D
z=5yDtwRc=R%Q*kOmawYZW|Ir1lOO)S+Pxy_)-N8O)R#+UyN8+WshZfxXvrl31Z8h-
zIPNbx5MVT~vGJkm;m6Od1CEFp=`4wNTyi4k>;jEs-skfxO569b2KxMS5~(^dttG`;
zLH*t=MYVcGXTLqBu6zpGymRXJO;EhNd*;DI9;~iCd3-<qgw1^T@BU(qoeV(&cV%@u
zUWl{u@bD}SG$;sUU_KFOpx|qiVz<+GQ=kDCL(`R*xmPbYZvqAYgQu&X%Q~loCIH$*
BmDvCQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png
index 7a89c3361bd5aff85cd3183dcc76852aa2747466..7b6e1b942bc54575f24d43d2f63d0b8039ec5fdc 100644
GIT binary patch
delta 450
zcmV;z0X_bZ0^9?TB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00009a7bBm000XU000XU0RWnu
z7ytkO2XskIMF;5&6bm0SnafQ|0003pNkl<ZSi|j=y>Wyv5PwD=9>*qhLZAz%Koz(G
zy1-SC*i{@|P>3o}0D%)iXh06c|M`a1jU8DpSw;wbpH`~{B9X{{Ckg(dYTfCa&x?57
zr%-X7DRiNrpCX`({j<nquz^V&4W{YPC79X^nx<RCP1B(>xryhX3{2uX%pnFMJFCO)
z>6Q1R!Q2zB6Mxa#VHp5)rm$}V`AfQ(0I=ggZc}eaC=QYu*zA607T@yI*q>woeDU$x
z-M;9RKbER>(yJJD4Gq|Q0N~nRa35+HA3<bb7KJs{<<(KYC%gCv=V_{1rwg?d*<1^z
zzMZPeHB;uR6LmyU4cKwm6`36ebeS&W#~8x-5lnX;13PH$if-fY8UUYqWa6P2kTs0b
sIar&{86nLm>~}mFIVGSIMk0~OH(+O&WbXsd-T(jq07*qoM6N<$g0$zhW&i*H

delta 244
zcmV<Q01N-z1CRocB!AaQL_t(oh3%D17K0!RgonP~h&$n#;7&OcT{JvF{FzX@l5Ybj
znlY0gCX>nIan=O*nDf;hSseY|*HCa@E&w9BuI7wLvw%9dBn>Kn54y%?PKtQ50-E48
zqH{TZ><r4Q?(5I?sy%ES*fLN8_=B6Gb&zf>!mjXc=2B@VKyAI29nXCwlC{9phLBZA
zghP()I07eNC;cI2q{TJk2%H6V`ZreW3N1DfHkiAh3-%+I7D#>2{Gk)L8W=p~7`W06
u-&XWw1}uk>t#<<XmouD%lgZ@a0Qdl>HBqc)I`$+00000<MNUMnLSTZzn{cfF

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb3994f98108789f26aee21f73c35e3b7b056276
GIT binary patch
literal 479
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&*3fA=@}L`NpQ)#dV@Sl|x1rW~M-)V4)~xlN
znZ~{C0n2-Zovp=Ovz~~&KK+DcPD7LKr5#ZZxhEW|j}BzGJyFT<tn;yow#0diMn?Zk
zr+f{#_Wmb}x6)h3a7Km;@%@?q9v?d=ykL#I2jc+`_RJp<?uLR&T@lPZB@Cs>k>8%E
zvagum?XofbJ9ox{zcp_1j$4>FJ!yZo!y_^!YP;a1r1~8V_x_oljN*u8O}f3QV_W>=
z{{93G`P^a!Z@$aBVsGwPqI1c#VfyhkjPvd;5L6JlaO&5EybkV#^A45e=Y4pe6zI?W
z(59yO>eai8>yo>x&c!ZRvpoEw>b(z!+`I1W^Sb&Z<c0pvNteDaD_zjlfByQ{8_F3+
zc4!OKsm#58*x2AsiQ<!ud@ZpuQ@=Afh}_VTayWaVkSWZm&Q+n(&CQLCp@vyt`@)Ka
T8!eiEVanj?>gTe~DWM4fDnYzL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png
index fc467656befb08f17c769fd5cad380c737952492..fe544e3a1f7aa359bfe68a9a9589e9c58dd9a894 100644
GIT binary patch
delta 473
zcmV;~0Ve*c0`miqB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00009a7bBm000XU000XU0RWnu
z7ytkO2XskIMF;5&6bm2%kjrOG0003=Nkl<ZSi|j<F>b{m41b3IS9Q)k7?CPv<rbVH
z6FCBza*gH|89{my8!SCVF5pf?N#0XqS8r<bEhY$JWBWI7adGkAxk)d0@9FGJ-}mhQ
zzDb=MW8j=aN(sgo0Dv)Ox8?*X#(Pg81R^5x-V+g#wRZPi*C7Pr2JtQlqHS9Y!?4?n
zG48AsR;_C4YkvSKB>+Izbr{F->78ks#QpVS05$y~1j;$nk(@Jy5Xf39s{d&dZeL$f
zN<Ex=w#Px#1C?zVwrH)<bse<U#Fe5bfEXj1rU3waeoergfREd12d%}AVa<W+6xgKt
z;2ihgN&hrW-g|P+p_GDUS=L@S$`JsZb8DvNd1g&SR#FK{DNstSS}&!b2BnmGurI}0
zyGpFe?aWH#$m)S*S$3H?vl3WRsjtz@E>9`3C!uIua?|?KF??}x@#pylui^`>CuOB7
P00000NkvXXu0mjfvI4<|

delta 271
zcmV+q0r39w1F8a$B!BTqL_t(oh3%E$34|~Vg`dYQB-}2#iH=}5x$bh%1>B`a#2mF$
zlBoB~eo!J>n%9@KqEe~cp2ljxG)+;OGmfKqU3GFA1jnxHBE!!bk*AWUiAo}Pu4dh*
zMZ_=+==*;2&N;V<R#XB?yUB%w5SG}s?Gm+pU~+&HkP{`y1%DFay;nEkLz=+5-%ENH
zvja$WnnUiaBmSiXl$e~L_?|uRiNLG*MYq=9f>;9V*`Fm};sHdPs0Ua8I{=iAUH(l|
zhC@Ao3!73b0XJK^dkv)~JtP1-c3*|+sL=h6<d&1LTt=qfCJT|U+=P`%<>mnR0ziGF
V>EL(Kg#Z8m00>D%PDHLkV1hO<g604K

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..a05391340c012eccb613f1df554d7853fd1a5af3
GIT binary patch
literal 496
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&){ye9D-{CT=jQ3+7!q;#ZJ2Lfn}R@XUEx{V
zw9HE_y4xSftoy=IG`Wg<`h*%z>l<H0;u_W|xZM`{u-P;Ce%gc&#-E?{G8a5P7T-3-
z$V2n+OygU#ydUp)|J%Z+__K|<>T^-udCN386fc=4^Ss`r#?5egQ-aL#H^uTxc?^yn
zuw-Wt5R^z(P%1cgP-3?pYrO0JR>Nf$zqHsoUMzL0yOQ(ip1jP;h4!}_J^ufjv{%`Q
z!{@SyUUEZ6LeI~;B1c{<{<PgnL8;=sf9B$~H<wIl+WO7lerc?ibDpV)WkQdqRmJ}q
zjp+>cW~GE)k5xXj_J`2b-KRgU$>#L!V{1!n_$~)@k*>y4zU=lyjenY3RZHcy4^;QR
z2oZU7ZQq`!R?nNRS+xi>6~A*|z4ct)<w&WHx$ky&oHw}eWRt*Y9rkOt-jq8A&+3~~
jy0m|iw0Yj2{2C@Fztd(OAHH1y1~P-EtDnm{r-UW|hSJ0K

literal 0
HcmV?d00001


From cb853d3a1c961c0e74d0aaa4b7f59ab24ee28aba Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Sat, 20 Dec 2025 14:24:04 -0500
Subject: [PATCH 145/360] Don't process paused MoverControllers (#39444)

* refactor: make MoverController use more queries

* perf: don't process paused MoverControllers

* perf: track active input movers via events

* Revert "place stored changeling identities next to each other (#39452)"

This reverts commit 9b5d2ff11b8f19fafbf97d6ceab238028ca6dfeb.

* perf: keep around the seen movers hashset

* fix: don't reintroduce wild wild west ordering

* style: use virtual method

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

* docs: better ActiveInputMoverComponent motiviation

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

* fix: pass through known comp

* fix: properly order relay movers for real

* perf: use proxy Transform() and inline it

Actually this might be a slight performance improvement since it avoids

the dictionary lookup until the case that its body status is on ground.

* style: switch an event handler to Entity<T>

* fix: just-in-case track for relay loops

* merg conflix

* borger

* whitespace moment

* whoops

* empty

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Physics/Controllers/MoverController.cs    | 212 +++++++++++++-----
 .../ActionBlocker/ActionBlockerSystem.cs      |  10 +-
 .../Systems/SharedChangelingIdentitySystem.cs |   7 +-
 .../Components/ActiveInputMoverComponent.cs   |  27 +++
 .../Systems/SharedMoverController.Relay.cs    |   6 +-
 .../Movement/Systems/SharedMoverController.cs |  21 +-
 6 files changed, 212 insertions(+), 71 deletions(-)
 create mode 100644 Content.Shared/Movement/Components/ActiveInputMoverComponent.cs

diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 5c87de1863..f933c72103 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -1,18 +1,16 @@
+using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
-using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
 using Prometheus;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
-using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
 using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
-using Robust.Shared.Map.Components;
+using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
 
 namespace Content.Server.Physics.Controllers;
 
@@ -20,20 +18,111 @@ public sealed class MoverController : SharedMoverController
 {
     private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge(
         "physics_active_mover_count",
-        "Active amount of InputMovers being processed by MoverController");
+        "Amount of ActiveInputMovers being processed by MoverController");
 
     [Dependency] private readonly ThrusterSystem _thruster = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
     private Dictionary<EntityUid, (ShuttleComponent, List<(EntityUid, PilotComponent, InputMoverComponent, TransformComponent)>)> _shuttlePilots = new();
 
+    private EntityQuery<ActiveInputMoverComponent> _activeQuery;
+    private EntityQuery<DroneConsoleComponent> _droneQuery;
+    private EntityQuery<ShuttleComponent> _shuttleQuery;
+
+    // Not needed for persistence; just used to save an alloc
+    private readonly HashSet<EntityUid> _seenMovers = [];
+    private readonly HashSet<EntityUid> _seenRelayMovers = [];
+    private readonly List<Entity<InputMoverComponent>> _moversToUpdate = [];
+
     public override void Initialize()
     {
         base.Initialize();
+
+        SubscribeLocalEvent<ActiveInputMoverComponent, EntityPausedEvent>(OnEntityPaused);
+        SubscribeLocalEvent<InputMoverComponent, EntityUnpausedEvent>(OnEntityUnpaused);
+
         SubscribeLocalEvent<RelayInputMoverComponent, PlayerAttachedEvent>(OnRelayPlayerAttached);
         SubscribeLocalEvent<RelayInputMoverComponent, PlayerDetachedEvent>(OnRelayPlayerDetached);
         SubscribeLocalEvent<InputMoverComponent, PlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<InputMoverComponent, PlayerDetachedEvent>(OnPlayerDetached);
+
+        _activeQuery = GetEntityQuery<ActiveInputMoverComponent>();
+        _droneQuery = GetEntityQuery<DroneConsoleComponent>();
+        _shuttleQuery = GetEntityQuery<ShuttleComponent>();
+    }
+
+    private void OnEntityPaused(Entity<ActiveInputMoverComponent> ent, ref EntityPausedEvent args)
+    {
+        // Become unactive [sic] if we don't have PhysicsComp.IgnorePaused
+        if (PhysicsQuery.TryComp(ent, out var phys) && phys.IgnorePaused)
+            return;
+        RemCompDeferred<ActiveInputMoverComponent>(ent);
+    }
+
+    private void OnEntityUnpaused(Entity<InputMoverComponent> ent, ref EntityUnpausedEvent args)
+    {
+        UpdateMoverStatus((ent, ent.Comp));
+    }
+
+    protected override void OnMoverStartup(Entity<InputMoverComponent> ent, ref ComponentStartup args)
+    {
+        base.OnMoverStartup(ent, ref args);
+        UpdateMoverStatus((ent, ent.Comp));
+    }
+
+    protected override void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> ent, ref ComponentShutdown args)
+    {
+        base.OnTargetRelayShutdown(ent, ref args);
+        UpdateMoverStatus((ent, null, ent.Comp));
+    }
+
+    protected override void UpdateMoverStatus(Entity<InputMoverComponent?, MovementRelayTargetComponent?> ent)
+    {
+        // Track that we aren't in a loop of movement relayers
+        _seenMovers.Clear();
+        while (true)
+        {
+            if (!MoverQuery.Resolve(ent, ref ent.Comp1, logMissing: false))
+            {
+                RemCompDeferred<ActiveInputMoverComponent>(ent);
+                break;
+            }
+
+            var meta = MetaData(ent);
+            if (Terminating(ent, meta))
+                break;
+
+            ActiveInputMoverComponent? activeMover = null;
+            if (!meta.EntityPaused
+                || PhysicsQuery.TryComp(ent, out var phys) && phys.IgnorePaused)
+                activeMover = EnsureComp<ActiveInputMoverComponent>(ent);
+
+            // If we're a relay target, make sure our drivers are InputMovers
+            if (RelayTargetQuery.Resolve(ent, ref ent.Comp2, logMissing: false)
+                // In case we're called from ComponentShutdown:
+                && ent.Comp2.LifeStage <= ComponentLifeStage.Running
+                && Exists(ent.Comp2.Source)
+                && !_seenMovers.Contains(ent.Comp2.Source))
+            {
+                if (ent.Comp2.Source == ent.Owner)
+                {
+                    Log.Error($"Entity {ToPrettyString(ent)} is attempting to relay movement to itself!");
+                    break;
+                }
+
+                if (activeMover is not null)
+                    activeMover.RelayedFrom = ent.Comp2.Source;
+
+                ent = ent.Comp2.Source;
+                _seenMovers.Add(ent);
+                continue;
+            }
+
+            // No longer a well-defined relay target
+            if (activeMover is not null)
+                activeMover.RelayedFrom = null;
+
+            break;
+        }
     }
 
     private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
@@ -63,48 +152,70 @@ public sealed class MoverController : SharedMoverController
         return true;
     }
 
-    private HashSet<EntityUid> _moverAdded = new();
-    private List<Entity<InputMoverComponent>> _movers = new();
-
-    private void InsertMover(Entity<InputMoverComponent> source)
-    {
-        if (TryComp(source, out MovementRelayTargetComponent? relay))
-        {
-            if (TryComp(relay.Source, out InputMoverComponent? relayMover))
-            {
-                InsertMover((relay.Source, relayMover));
-            }
-        }
-
-        // Already added
-        if (!_moverAdded.Add(source.Owner))
-            return;
-
-        _movers.Add(source);
-    }
-
     public override void UpdateBeforeSolve(bool prediction, float frameTime)
     {
         base.UpdateBeforeSolve(prediction, frameTime);
 
-        _moverAdded.Clear();
-        _movers.Clear();
-        var inputQueryEnumerator = AllEntityQuery<InputMoverComponent>();
+        // We use _seenMovers here as well as in UpdateMoverStatus—this means we
+        // cannot have any events get fired while we use it in this while loop.
+        _seenMovers.Clear();
+        _moversToUpdate.Clear();
 
-        // Need to order mob movement so that movers don't run before their relays.
-        while (inputQueryEnumerator.MoveNext(out var uid, out var mover))
+        // Don't use EntityQueryEnumerator because admin ghosts have to move on
+        // paused maps. Pausing movers is handled via ActiveInputMoverComponent.
+        var inputQueryEnumerator = AllEntityQuery<ActiveInputMoverComponent, InputMoverComponent>();
+        while (inputQueryEnumerator.MoveNext(out var uid, out var activeComp, out var moverComp))
         {
-            InsertMover((uid, mover));
+            _seenRelayMovers.Clear(); // O(1) if already empty
+            QueueRelaySources(activeComp.RelayedFrom);
+
+            // If it's already inserted, that's fine—that means it'll still be
+            // handled before its child movers
+            AddMover((uid, moverComp));
         }
 
-        foreach (var mover in _movers)
-        {
-            HandleMobMovement(mover, frameTime);
-        }
+        ActiveMoverGauge.Set(_moversToUpdate.Count);
 
-        ActiveMoverGauge.Set(_movers.Count);
+        foreach (var ent in _moversToUpdate)
+        {
+            HandleMobMovement(ent, frameTime);
+        }
 
         HandleShuttleMovement(frameTime);
+        return;
+
+        // When we insert a chain of relay sources we have to flip its ordering
+        // It's going to be extremely uncommon for a relay chain to be more than
+        // one entity so we just recurse as needed.
+        void QueueRelaySources(EntityUid? next)
+        {
+            // We only care if it's still a mover
+            if (!_activeQuery.TryComp(next, out var nextActive)
+                || !MoverQuery.TryComp(next, out var nextMover)
+                || !_seenRelayMovers.Add(next.Value))
+                return;
+
+            Debug.Assert(next.Value != nextActive.RelayedFrom);
+
+            // While it is (as of writing) currently true that this recursion
+            // should always terminate due to RelayedFrom always being written
+            // in a way that tracks if it's made a loop, we still take the extra
+            // memory (and small time cost) of making sure via _seenRelayMovers.
+            QueueRelaySources(nextActive.RelayedFrom);
+            AddMover((next.Value, nextMover));
+        }
+
+        // Track inserts so we have ~ O(1) inserts without duplicates. Hopefully
+        // it doesn't matter that both _seenMovers and _moversToUpdate are never
+        // trimmed? They should be pretty memory light anyway, and in general
+        // it'll be rare for there to be a decrease in movers.
+        void AddMover(Entity<InputMoverComponent> entity)
+        {
+            if (!_seenMovers.Add(entity))
+                return;
+
+            _moversToUpdate.Add(entity);
+        }
     }
 
     public (Vector2 Strafe, float Rotation, float Brakes) GetPilotVelocityInput(PilotComponent component)
@@ -152,7 +263,7 @@ public sealed class MoverController : SharedMoverController
 
     protected override void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state)
     {
-        if (!TryComp<PilotComponent>(uid, out var pilot) || pilot.Console == null)
+        if (!PilotQuery.TryComp(uid, out var pilot) || pilot.Console == null)
             return;
 
         ResetSubtick(pilot);
@@ -263,27 +374,25 @@ public sealed class MoverController : SharedMoverController
 
         // We just mark off their movement and the shuttle itself does its own movement
         var activePilotQuery = EntityQueryEnumerator<PilotComponent, InputMoverComponent>();
-        var shuttleQuery = GetEntityQuery<ShuttleComponent>();
         while (activePilotQuery.MoveNext(out var uid, out var pilot, out var mover))
         {
             var consoleEnt = pilot.Console;
 
             // TODO: This is terrible. Just make a new mover and also make it remote piloting + device networks
-            if (TryComp<DroneConsoleComponent>(consoleEnt, out var cargoConsole))
-            {
+            if (_droneQuery.TryComp(consoleEnt, out var cargoConsole))
                 consoleEnt = cargoConsole.Entity;
-            }
 
-            if (!TryComp(consoleEnt, out TransformComponent? xform)) continue;
+            if (!XformQuery.TryComp(consoleEnt, out var xform))
+                continue;
 
             var gridId = xform.GridUid;
             // This tries to see if the grid is a shuttle and if the console should work.
-            if (!TryComp<MapGridComponent>(gridId, out var _) ||
-                !shuttleQuery.TryGetComponent(gridId, out var shuttleComponent) ||
+            if (!MapGridQuery.HasComp(gridId) ||
+                !_shuttleQuery.TryGetComponent(gridId, out var shuttleComponent) ||
                 !shuttleComponent.Enabled)
                 continue;
 
-            if (!newPilots.TryGetValue(gridId!.Value, out var pilots))
+            if (!newPilots.TryGetValue(gridId.Value, out var pilots))
             {
                 pilots = (shuttleComponent, new List<(EntityUid, PilotComponent, InputMoverComponent, TransformComponent)>());
                 newPilots[gridId.Value] = pilots;
@@ -305,13 +414,12 @@ public sealed class MoverController : SharedMoverController
 
         // Collate all of the linear / angular velocites for a shuttle
         // then do the movement input once for it.
-        var xformQuery = GetEntityQuery<TransformComponent>();
         foreach (var (shuttleUid, (shuttle, pilots)) in _shuttlePilots)
         {
-            if (Paused(shuttleUid) || CanPilot(shuttleUid) || !TryComp<PhysicsComponent>(shuttleUid, out var body))
+            if (Paused(shuttleUid) || CanPilot(shuttleUid) || !PhysicsQuery.TryComp(shuttleUid, out var body))
                 continue;
 
-            var shuttleNorthAngle = _xformSystem.GetWorldRotation(shuttleUid, xformQuery);
+            var shuttleNorthAngle = TransformSystem.GetWorldRotation(shuttleUid, XformQuery);
 
             // Collate movement linear and angular inputs together
             var linearInput = Vector2.Zero;
@@ -321,7 +429,7 @@ public sealed class MoverController : SharedMoverController
             var brakeCount = 0;
             var angularCount = 0;
 
-            foreach (var (pilotUid, pilot, _, consoleXform) in pilots)
+            foreach (var (_, pilot, _, consoleXform) in pilots)
             {
                 var (strafe, rotation, brakes) = GetPilotVelocityInput(pilot);
 
@@ -571,9 +679,9 @@ public sealed class MoverController : SharedMoverController
 
     private bool CanPilot(EntityUid shuttleUid)
     {
-        return TryComp<FTLComponent>(shuttleUid, out var ftl)
+        return FTLQuery.TryComp(shuttleUid, out var ftl)
         && (ftl.State & (FTLState.Starting | FTLState.Travelling | FTLState.Arriving)) != 0x0
-            || HasComp<PreventPilotComponent>(shuttleUid);
+            || PreventPilotQuery.HasComp(shuttleUid);
     }
 
 }
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index c256872cc7..485dc89580 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -30,15 +30,11 @@ namespace Content.Shared.ActionBlocker
             base.Initialize();
 
             _complexInteractionQuery = GetEntityQuery<ComplexInteractionComponent>();
-
-            SubscribeLocalEvent<InputMoverComponent, ComponentStartup>(OnMoverStartup);
-        }
-
-        private void OnMoverStartup(EntityUid uid, InputMoverComponent component, ComponentStartup args)
-        {
-            UpdateCanMove(uid, component);
         }
 
+        // These two methods should probably both live in SharedMoverController
+        // but they're called in a million places and I'm not doing that
+        // refactor right now.
         public bool CanMove(EntityUid uid, InputMoverComponent? component = null)
         {
             return Resolve(uid, ref component, false) && component.CanMove;
diff --git a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
index 830aed6ab6..57439d0a0b 100644
--- a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
+++ b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
@@ -23,7 +23,6 @@ public abstract class SharedChangelingIdentitySystem : EntitySystem
     [Dependency] private readonly SharedPvsOverrideSystem _pvsOverrideSystem = default!;
 
     public MapId? PausedMapId;
-    private int _numberOfStoredIdentities = 0; // TODO: remove this
 
     public override void Initialize()
     {
@@ -99,11 +98,7 @@ public abstract class SharedChangelingIdentitySystem : EntitySystem
             return null;
 
         EnsurePausedMap();
-        // TODO: Setting the spawn location is a shitty bandaid to prevent admins from crashing our servers.
-        // Movercontrollers and mob collisions are currently being calculated even for paused entities.
-        // Spawning all of them in the same spot causes severe performance problems.
-        // Cryopods and Polymorph have the same problem.
-        var clone = Spawn(speciesPrototype.Prototype, new MapCoordinates(new Vector2(2 * _numberOfStoredIdentities++, 0), PausedMapId!.Value));
+        var clone = Spawn(speciesPrototype.Prototype, new MapCoordinates(Vector2.Zero, PausedMapId!.Value));
 
         var storedIdentity = EnsureComp<ChangelingStoredIdentityComponent>(clone);
         storedIdentity.OriginalEntity = target; // TODO: network this once we have WeakEntityReference or the autonetworking source gen is fixed
diff --git a/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs b/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
new file mode 100644
index 0000000000..24a0d9eacd
--- /dev/null
+++ b/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Movement.Systems;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Marker component for entities that are being processed by MoverController.
+/// </summary>
+/// <remarks>
+/// The idea here is to keep track via event subscriptions which mover
+/// controllers actually need to be processed. Instead of having this be a
+/// boolean field on the <see cref="InputMoverComponent"/>, we instead track it
+/// as a separate component which is much faster to query all at once.
+/// </remarks>
+/// <seealso cref="InputMoverComponent"/>
+/// <seealso cref="SharedMoverController.UpdateMoverStatus"/>
+[RegisterComponent, Access(typeof(SharedMoverController))]
+public sealed partial class ActiveInputMoverComponent : Component
+{
+    /// <summary>
+    /// Cached version of <see cref="MovementRelayTargetComponent.Source"/>.
+    /// </summary>
+    /// <remarks>
+    /// This <i>must not</i> form a loop of EntityUids.
+    /// </remarks>
+    [DataField, ViewVariables]
+    public EntityUid? RelayedFrom;
+};
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 79c593cbe7..09cf8eb706 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -1,4 +1,3 @@
-using Content.Shared.ActionBlocker;
 using Content.Shared.Movement.Components;
 
 namespace Content.Shared.Movement.Systems;
@@ -61,6 +60,7 @@ public abstract partial class SharedMoverController
         Dirty(uid, component);
         Dirty(relayEntity, targetComp);
         _blocker.UpdateCanMove(uid);
+        UpdateMoverStatus((relayEntity, null, targetComp));
     }
 
     private void OnRelayShutdown(Entity<RelayInputMoverComponent> entity, ref ComponentShutdown args)
@@ -80,7 +80,7 @@ public abstract partial class SharedMoverController
         _blocker.UpdateCanMove(entity.Owner);
     }
 
-    private void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> entity, ref ComponentShutdown args)
+    protected virtual void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> entity, ref ComponentShutdown args)
     {
         PhysicsSystem.UpdateIsPredicted(entity.Owner);
         PhysicsSystem.UpdateIsPredicted(entity.Comp.Source);
@@ -91,4 +91,6 @@ public abstract partial class SharedMoverController
         if (TryComp(entity.Comp.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running)
             RemComp(entity.Comp.Source, relay);
     }
+
+    protected virtual void UpdateMoverStatus(Entity<InputMoverComponent?, MovementRelayTargetComponent?> ent) { }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index bded4f651e..5507152858 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -11,6 +11,7 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.StepTrigger.Components; // DeltaV - NoShoesSilentFootstepsComponent
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -51,6 +52,7 @@ public abstract partial class SharedMoverController : VirtualController
 
     protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
     protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery;
+    protected EntityQuery<FTLComponent> FTLQuery;
     protected EntityQuery<InputMoverComponent> MoverQuery;
     protected EntityQuery<MapComponent> MapQuery;
     protected EntityQuery<MapGridComponent> MapGridQuery;
@@ -59,6 +61,8 @@ public abstract partial class SharedMoverController : VirtualController
     protected EntityQuery<MovementSpeedModifierComponent> ModifierQuery;
     protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
     protected EntityQuery<PhysicsComponent> PhysicsQuery;
+    protected EntityQuery<PilotComponent> PilotQuery;
+    protected EntityQuery<PreventPilotComponent> PreventPilotQuery;
     protected EntityQuery<RelayInputMoverComponent> RelayQuery;
     protected EntityQuery<PullableComponent> PullableQuery;
     protected EntityQuery<TransformComponent> XformQuery;
@@ -97,8 +101,12 @@ public abstract partial class SharedMoverController : VirtualController
         MapGridQuery = GetEntityQuery<MapGridComponent>();
         NoShoesSilentQuery = GetEntityQuery<NoShoesSilentFootstepsComponent>(); // DeltaV - NoShoesSilentFootstepsComponent
         MapQuery = GetEntityQuery<MapComponent>();
+        FTLQuery = GetEntityQuery<FTLComponent>();
+        PilotQuery = GetEntityQuery<PilotComponent>();
+        PreventPilotQuery = GetEntityQuery<PreventPilotComponent>();
 
         SubscribeLocalEvent<MovementSpeedModifierComponent, TileFrictionEvent>(OnTileFriction);
+        SubscribeLocalEvent<InputMoverComponent, ComponentStartup>(OnMoverStartup);
 
         InitializeInput();
         InitializeRelay();
@@ -108,6 +116,11 @@ public abstract partial class SharedMoverController : VirtualController
         Subs.CVar(_configManager, CCVars.OffgridFriction, value => _offGridDamping = value, true);
     }
 
+    protected virtual void OnMoverStartup(Entity<InputMoverComponent> ent, ref ComponentStartup args)
+    {
+       _blocker.UpdateCanMove(ent, ent.Comp);
+    }
+
     public override void Shutdown()
     {
         base.Shutdown();
@@ -480,9 +493,9 @@ public abstract partial class SharedMoverController : VirtualController
             // Only allow pushing off of anchored things that have collision.
             if (otherCollider.BodyType != BodyType.Static ||
                 !otherCollider.CanCollide ||
-                ((collider.CollisionMask & otherCollider.CollisionLayer) == 0 &&
-                (otherCollider.CollisionMask & collider.CollisionLayer) == 0) ||
-                (TryComp(otherEntity, out PullableComponent? pullable) && pullable.BeingPulled))
+                (collider.CollisionMask & otherCollider.CollisionLayer) == 0 &&
+                (otherCollider.CollisionMask & collider.CollisionLayer) == 0 ||
+                PullableQuery.TryComp(otherEntity, out var pullable) && pullable.BeingPulled)
             {
                 continue;
             }
@@ -640,7 +653,7 @@ public abstract partial class SharedMoverController : VirtualController
 
     private void OnTileFriction(Entity<MovementSpeedModifierComponent> ent, ref TileFrictionEvent args)
     {
-        if (!TryComp<PhysicsComponent>(ent, out var physicsComponent) || !XformQuery.TryComp(ent, out var xform))
+        if (!PhysicsQuery.TryComp(ent, out var physicsComponent))
             return;
 
         if (physicsComponent.BodyStatus != BodyStatus.OnGround || _gravity.IsWeightless(ent.Owner))

From f18384b89b5d172c66639f2b84c13c5871b70713 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 20 Dec 2025 12:54:14 -0800
Subject: [PATCH 146/360] [Staging/Hotfix] A couple bloodstream fixes. (#41906)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Body/Systems/SharedBloodstreamSystem.cs   | 80 ++++++++++---------
 .../Prototypes/Recipes/Reactions/cleaning.yml |  2 +
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index 5f3794acd2..e86fd0c06b 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Shared.Alert;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
@@ -71,49 +70,41 @@ public abstract class SharedBloodstreamSystem : EntitySystem
             bloodstream.NextUpdate += bloodstream.AdjustedUpdateInterval;
             DirtyField(uid, bloodstream, nameof(BloodstreamComponent.NextUpdate)); // needs to be dirtied on the client so it can be rerolled during prediction
 
-            if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
+            if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution))
                 continue;
 
             // Blood level regulation. Must be alive.
-            TryRegulateBloodLevel(uid, bloodstream.BloodRefreshAmount);
-
-            // Removes blood from the bloodstream based on bleed amount (bleed rate)
-            // as well as stop their bleeding to a certain extent.
-            if (bloodstream.BleedAmount > 0)
+            if (!_mobStateSystem.IsDead(uid))
             {
-                var ev = new BleedModifierEvent(bloodstream.BleedAmount, bloodstream.BleedReductionAmount);
-                RaiseLocalEvent(uid, ref ev);
+                TryRegulateBloodLevel(uid, bloodstream.BloodRefreshAmount);
 
-                // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
-                TryBleedOut((uid, bloodstream), ev.BleedAmount);
+                TickBleed((uid, bloodstream));
 
-                // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
-                TryModifyBleedAmount((uid, bloodstream), -ev.BleedReductionAmount);
+                // deal bloodloss damage if their blood level is below a threshold.
+                var bloodPercentage = GetBloodLevel(uid);
+                if (bloodPercentage < bloodstream.BloodlossThreshold)
+                {
+                    // bloodloss damage is based on the base value, and modified by how low your blood level is.
+                    var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
+
+                    _damageableSystem.TryChangeDamage(uid, amt, ignoreResistances: false, interruptsDoAfters: false);
+
+                    // Apply dizziness as a symptom of bloodloss.
+                    // The effect is applied in a way that it will never be cleared without being healthy.
+                    // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
+                    _status.TrySetStatusEffectDuration(uid, Bloodloss);
+                }
+                else
+                {
+                    // If they're healthy, we'll try and heal some bloodloss instead.
+                    _damageableSystem.TryChangeDamage(uid, bloodstream.BloodlossHealDamage * bloodPercentage, ignoreResistances: true, interruptsDoAfters: false);
+
+                    _status.TryRemoveStatusEffect(uid, Bloodloss);
+                }
             }
-
-            // deal bloodloss damage if their blood level is below a threshold.
-            var bloodPercentage = GetBloodLevel(uid);
-            if (bloodPercentage < bloodstream.BloodlossThreshold && !_mobStateSystem.IsDead(uid))
+            else
             {
-                // bloodloss damage is based on the base value, and modified by how low your blood level is.
-                var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
-
-                _damageableSystem.TryChangeDamage(uid, amt, ignoreResistances: false, interruptsDoAfters: false);
-
-                // Apply dizziness as a symptom of bloodloss.
-                // The effect is applied in a way that it will never be cleared without being healthy.
-                // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
-                _status.TrySetStatusEffectDuration(uid, Bloodloss);
-            }
-            else if (!_mobStateSystem.IsDead(uid))
-            {
-                // If they're healthy, we'll try and heal some bloodloss instead.
-                _damageableSystem.TryChangeDamage(
-                    uid,
-                    bloodstream.BloodlossHealDamage * bloodPercentage,
-                    ignoreResistances: true, interruptsDoAfters: false);
-
-                _status.TryRemoveStatusEffect(uid, Bloodloss);
+                TickBleed((uid, bloodstream));
             }
         }
     }
@@ -437,6 +428,23 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         return true;
     }
 
+    public void TickBleed(Entity<BloodstreamComponent> entity)
+    {
+        // Removes blood from the bloodstream based on bleed amount (bleed rate)
+        // as well as stop their bleeding to a certain extent.
+        if (entity.Comp.BleedAmount <= 0)
+            return;
+
+        var ev = new BleedModifierEvent(entity.Comp.BleedAmount, entity.Comp.BleedReductionAmount);
+        RaiseLocalEvent(entity, ref ev);
+
+        // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
+        TryBleedOut(entity.AsNullable(), ev.BleedAmount);
+
+        // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
+        TryModifyBleedAmount(entity.AsNullable(), -ev.BleedReductionAmount);
+    }
+
     /// <summary>
     /// Removes blood by spilling out the bloodstream.
     /// </summary>
diff --git a/Resources/Prototypes/Recipes/Reactions/cleaning.yml b/Resources/Prototypes/Recipes/Reactions/cleaning.yml
index 079e1bf747..f3440b6efd 100644
--- a/Resources/Prototypes/Recipes/Reactions/cleaning.yml
+++ b/Resources/Prototypes/Recipes/Reactions/cleaning.yml
@@ -12,6 +12,8 @@
 
 - type: reaction
   id: AmmoniaFromBlood
+  requiredMixerCategories:
+  - Stir # prevents evaporating vox blood, TODO: make it react only X units per second; make bloodstream an open thermal system
   minTemp: 370
   reactants:
     AmmoniaBlood:

From f5801718a3c065b207a1e5eccea825559140b375 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Sun, 21 Dec 2025 05:11:11 -0300
Subject: [PATCH 147/360] Fix the mothership again (again) (#41924)

* fix the mothership again

* renamed that lever
---
 Resources/Maps/Shuttles/mothership.yml | 197 +++++++++----------------
 1 file changed, 72 insertions(+), 125 deletions(-)

diff --git a/Resources/Maps/Shuttles/mothership.yml b/Resources/Maps/Shuttles/mothership.yml
index d2414a0340..9803b1fbfe 100644
--- a/Resources/Maps/Shuttles/mothership.yml
+++ b/Resources/Maps/Shuttles/mothership.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 268.0.0
   forkId: ""
   forkVersion: ""
-  time: 11/22/2025 23:34:12
-  entityCount: 585
+  time: 12/20/2025 12:50:17
+  entityCount: 581
 maps: []
 grids:
 - 1
@@ -159,6 +159,7 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
+    - type: ExplosionAirtightGrid
 - proto: AirlockGlassShuttleXenoborgLocked
   entities:
   - uid: 107
@@ -194,7 +195,7 @@ entities:
     - type: Transform
       pos: -5.5,0.5
       parent: 1
-  - uid: 338
+  - uid: 248
     components:
     - type: Transform
       pos: 0.5,-2.5
@@ -1007,15 +1008,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-0.5
       parent: 1
-- proto: BlastDoorXenoborg
+- proto: BlastDoorXenoborgOpen
   entities:
-  - uid: 370
+  - uid: 5
     components:
     - type: Transform
       pos: 0.5,-5.5
       parent: 1
-- proto: BlastDoorXenoborgOpen
-  entities:
   - uid: 94
     components:
     - type: Transform
@@ -2002,61 +2001,31 @@ entities:
   - uid: 243
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-8.5
       parent: 1
   - uid: 244
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-7.5
       parent: 1
   - uid: 245
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-6.5
       parent: 1
   - uid: 247
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-4.5
       parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-2.5
-      parent: 1
   - uid: 250
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
+      pos: 0.5,-9.5
       parent: 1
   - uid: 251
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
-      parent: 1
-  - uid: 455
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-9.5
-      parent: 1
-  - uid: 456
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-10.5
       parent: 1
 - proto: CrateGenericSteel
@@ -2886,41 +2855,15 @@ entities:
       parent: 1
 - proto: TwoWayLever
   entities:
-  - uid: 5
+  - uid: 249
     components:
+    - type: MetaData
+      name: conveyor
     - type: Transform
-      pos: 0.5,1.5
+      pos: -0.5,-4.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        251:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
-        250:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
-        249:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
-        248:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
         247:
         - - Left
           - Reverse
@@ -2956,14 +2899,14 @@ entities:
           - Forward
         - - Middle
           - Off
-        455:
+        251:
         - - Left
           - Reverse
         - - Right
           - Forward
         - - Middle
           - Off
-        456:
+        250:
         - - Left
           - Reverse
         - - Right
@@ -2972,20 +2915,24 @@ entities:
           - Off
   - uid: 328
     components:
+    - type: MetaData
+      name: blast door
     - type: Transform
       pos: 1.5,-4.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        370:
+        5:
         - - Left
           - Open
         - - Right
           - Open
         - - Middle
           - Close
-  - uid: 453
+  - uid: 338
     components:
+    - type: MetaData
+      name: blast doors
     - type: Transform
       pos: -8.5,1.5
       parent: 1
@@ -2993,81 +2940,81 @@ entities:
       linkedPorts:
         445:
         - - Left
-          - Toggle
+          - Open
         - - Right
-          - Toggle
+          - Open
         - - Middle
-          - Toggle
+          - Close
         444:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         443:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         442:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         452:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         451:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         450:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         449:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         448:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         447:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         446:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
 - proto: WallXenoborg
   entities:
   - uid: 2

From b4d182348c5efd5a3188b1379fde1b362cfabf75 Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:20:43 +0100
Subject: [PATCH 148/360] Miscellaneous Injector fixes + BorgHypo fill sprites.
 (#41932)

* Various fixes

* Fix Gorlex Hypo not showing visuals

* Give Borg Hypo Fill sprites

* Bluespace Syringe speed increase

* fix

* one whitespace change

* Undo debug change

* Replaced String Message with better

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Chemistry/EntitySystems/InjectorSystem.cs |  11 +-
 .../components/injector-component.ftl         |  10 +-
 .../Objects/Specific/Medical/hypospray.yml    |  15 ++-
 .../Medical/hypospray.rsi/borghypo_fill1.png  | Bin 0 -> 111 bytes
 .../Medical/hypospray.rsi/borghypo_fill2.png  | Bin 0 -> 113 bytes
 .../Medical/hypospray.rsi/borghypo_s.png      | Bin 517 -> 532 bytes
 .../Specific/Medical/hypospray.rsi/meta.json  | 106 +++++++++---------
 7 files changed, 81 insertions(+), 61 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill1.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill2.png

diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
index 45105028fc..001a2b82dc 100644
--- a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
@@ -284,6 +284,13 @@ public sealed partial class InjectorSystem : EntitySystem
         }
         else
         {
+            // Check if we have anything to inject.
+            if (injectorSolution.Volume == 0)
+            {
+                _popup.PopupClient(Loc.GetString("injector-component-empty-message", ("injector", injector)), target, user);
+                return false;
+            }
+
             // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
             // If CurrentTransferAmount is null, it'll want to inject its entire contents, e.g., epipens.
             amount = injector.Comp.CurrentTransferAmount ?? injectorSolution.Volume;
@@ -349,7 +356,7 @@ public sealed partial class InjectorSystem : EntitySystem
 
         if (!_solutionContainer.TryGetDrawableSolution(target, out _, out var drawableSol))
         {
-            _popup.PopupClient(Loc.GetString("injector-component-cannot-transfer-message", ("target", Identity.Entity(target, EntityManager))), injector, user);
+            _popup.PopupClient(Loc.GetString("injector-component-cannot-draw-message", ("target", Identity.Entity(target, EntityManager))), injector, user);
             return false;
         }
 
@@ -511,7 +518,7 @@ public sealed partial class InjectorSystem : EntitySystem
         else
             _solutionContainer.Refill(target, targetSolution, removedSolution);
 
-        LocId msgSuccess = target == user ? "injector-component-transfer-success-message-self" : "injector-component-transfer-success-message";
+        LocId msgSuccess = target == user ? "injector-component-inject-success-message-self" : "injector-component-inject-success-message";
 
         if (selfEv.OverrideMessage != null)
             msgSuccess = selfEv.OverrideMessage;
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 58fb3df315..c64476f63a 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -12,12 +12,12 @@ injector-component-inject-mode-name = Inject
 injector-component-draw-mode-name = Draw
 injector-component-dynamic-mode-name = Dynamic
 injector-component-mode-changed-text = Now {$mode}
-injector-component-inject-success-message = You inject {$amount}u into {THE($target)}!
-injector-component-inject-success-message-self = You inject {$amount}u into yourself!
 injector-component-transfer-success-message = You transfer {$amount}u into {THE($target)}.
 injector-component-transfer-success-message-self = You transfer {$amount}u into yourself.
+injector-component-inject-success-message = You inject {$amount}u into {THE($target)}!
+injector-component-inject-success-message-self = You inject {$amount}u into yourself!
 injector-component-draw-success-message = You draw {$amount}u from {THE($target)}.
-injector-component-draw-success-message-self = You draw {$amount}u from youself.
+injector-component-draw-success-message-self = You draw {$amount}u from yourself.
 
 ## Fail Messages
 
@@ -33,10 +33,10 @@ injector-component-blocked-user = Protective gear blocked your injection!
 injector-component-blocked-other = {CAPITALIZE(THE(POSS-ADJ($target)))} armor blocked {THE($user)}'s injection!
 injector-component-cannot-transfer-message = You aren't able to transfer into {THE($target)}!
 injector-component-cannot-transfer-message-self = You aren't able to transfer into yourself!
-injector-component-cannot-draw-message = You aren't able to draw from {THE($target)}!
-injector-component-cannot-draw-message-self = You aren't able to draw from yourself!
 injector-component-cannot-inject-message = You aren't able to inject into {THE($target)}!
 injector-component-cannot-inject-message-self = You aren't able to inject into yourself!
+injector-component-cannot-draw-message = You aren't able to draw from {THE($target)}!
+injector-component-cannot-draw-message-self = You aren't able to draw from yourself!
 injector-component-ignore-mobs = This injector can only interact with containers!
 
 ## mob-inject doafter messages
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index ba30d5966e..3a34779c0d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -14,6 +14,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    exactVolume: true
   - type: Appearance
 
 - type: entity
@@ -50,7 +51,6 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: Hypospray
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     fillBaseName: hypo_fill
@@ -89,7 +89,12 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
-    state: borghypo
+    layers:
+    - state: borghypo
+      map: [ "enum.SolutionContainerLayers.Base" ]
+    - state: borghypo_fill1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
   - type: Item
     sprite: Objects/Specific/Medical/hypospray.rsi
   - type: SolutionContainerManager
@@ -100,6 +105,10 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: borghypo_fill
+    solutionName: hypospray
   - type: UseDelay
     delay: 0.5
 
@@ -220,7 +229,6 @@
     activeModeProtoId: HyposprayInjectMode
     allowedModes:
     - HyposprayInjectMode
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     changeColor: false
@@ -548,7 +556,6 @@
     layers:
     - state: hypovolemic
       map: [ "enum.SolutionContainerLayers.Fill" ]
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     changeColor: false
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill1.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill1.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fed4db91ad4e00b37ea16ea0abea6ce066942b
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nw~C>ArY-_
z&n#qQFyJ}7;o1Mi#@pDr*whNE*%*Grnibx@7r3d4k>R{d{6!X~MSXhLfSMRQUHx3v
IIVCg!01Rs&qW}N^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill2.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc96a693eeb6bcda597b879a164d2ea2d3c57b8
GIT binary patch
literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+MX_sArY-_
z&urvnFyJ}7;m7~Qce$-nv;&I7Oqdz|=*`}dyMA%XS0;veg$(m2vM?!1R+j>`F?hQA
KxvX<aXaWFVlOXv3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_s.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_s.png
index 4adc13c448a40cf02e1cbe10c87b518aee3c501b..3d53f56f711cacc86e8178cdb4d8771a27e599bc 100644
GIT binary patch
delta 507
zcmV<X0R;Yq1e64jBYyw^b5ch_0Itp)=>Px$&PhZ;R9J=WmCJ6MKoo{Qd{I!1WNM{x
z@uITm2DcKO2be`(!OxNx?9xj%k#|<uSj~nI70_5|N;hFdTnugttMYBm+?fBLGY5d4
zo}QkbGjLru?`rQs(*oc3^DIrf(r-5K<LRk0aR8%k^8I|C4}XS3?CBJBIOuVu6sBqF
zSjBF)tKGX`RPNN>wRv%&+gX}oS(c6k<!qJrsxzY}a>xNbuU4qT;gujj6h$O8wO~yq
zT+Qdd83DN6ZZS?|Ti3ux*X4`vGa8Qp7>&oe4UnWM-;;!!B&m#Pmg%+SXK%M#-d$ee
zI8J4DTg||1Hh-&}tINQv!E@jDEKPYcndn%BQcAb?`+ai_RIykrasYceC4PL=<3FFD
z84QOyR#7K<wgG@ot5qIF5#R3b4FDlTZpX2nk8PVE2+k6#Vj!j5{K*4B5E!v-^Y!k|
zDEfaZt`S1inmDcvDP<0@_Plof5o^!eNGUhh%VlFWgme&E^m@7ccLRlJk%cA`t)IS3
zVPfrhl_pw0{qf(>vMdMSK`Ezdaq-<>dtP1?Ve1GX!WWV7XuS2)pF~O-z6gbs?wt<q
x{$v`35TRvRBuRoD#~<FBCJ#!{S?d2=egW&(%+bIWzF+_V002ovPDHLkV1gL*^w9tS

delta 492
zcmV<I0Tcd|1cd~UBYy$RNkl<Zc%1E(%Wj)M6ox;1QBaL!YNd7YqO#})w-TKPm_=T}
z&(as{(n~gxcUIU~&4v&atg+H`vN0p#VsKl$<J+9M|Nk5g039729UUEK;QPM5)Y-kJ
z1z{NKU7lY`zuCaAr>BdF16XyFAEr~?>-TZTW7K|c#+6dowtsD66`Reb_UwW|xl{M7
z?W-%(-sL%t<Cs`b&Q|%XIx}WMg9iArSfKX%SAqaZl91KZf-@TNemecb2*B-njddd1
zrUpLwK3~I-!Egw`U^p~wfGp4XnPq&-vdWn6c4lpP@9lccyX$K_&#TOCs~MO~CY5t_
z8F)2#?)$#WbAR59MkZFFlrrt@cH3M7Rm^5H4d9N)q>qng{P*)Sy?)=sD(XbfHURK>
zvCv79@Z<j80uVxIH%-la>bgWxbe32ZJt^htZ#G0xWTmdl_q#i*=>My@K?qT6;<z@X
zlp0_e1nvAImO-$RQm$_1^TuolA&ltFeE$Ci3eh49O=TupzkQj)#4-pfO|*V{j{b&@
z<9GlMN_ka_i|_t22y{_|ts{hp4<hl=c<Z-6iIg%v2*roK5p4U}pG>0=B6b{yEX#1y
i^y6FG=0PdiPW=mZCCt%#;`1c{0000<MNUMnLSTa4Wc+;q

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
index 904543f6e5..8ad20c2eff 100644
--- a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
@@ -1,53 +1,59 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, modified with fill sprites by SlamBamActionman (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "borghypo"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, modified with fill sprites by SlamBamActionman (github), borghypo  fill sprites by SirWarock (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "borghypo_s"
-    },
-    {
-      "name": "combat_hypo"
-    },
-    {
-      "name": "hypo"
-    },
-    {
-      "name": "hypo_fill1"
-    },
-    {
-      "name": "hypo_fill2"
-    },
-    {
-      "name": "hypo_fill3"
-    },
-    {
-      "name": "hypo_fill4"
-    },
-    {
-      "name": "hypo_fill5"
-    },
-    {
-      "name": "hypo_fill6"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "borghypo"
+        },
+        {
+            "name": "borghypo_s"
+        },
+        {
+            "name": "borghypo_fill1"
+        },
+        {
+            "name": "borghypo_fill2"
+        },
+        {
+            "name": "combat_hypo"
+        },
+        {
+            "name": "hypo"
+        },
+        {
+            "name": "hypo_fill1"
+        },
+        {
+            "name": "hypo_fill2"
+        },
+        {
+            "name": "hypo_fill3"
+        },
+        {
+            "name": "hypo_fill4"
+        },
+        {
+            "name": "hypo_fill5"
+        },
+        {
+            "name": "hypo_fill6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }

From eb33b880674148b278c4c9c0a37ada1c98458753 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 22 Dec 2025 02:24:24 +0100
Subject: [PATCH 149/360] v269.0.0 RT update - .NET 10 (#41855)

* Make ServerPackaging automatically get extra server assemblies

* Make the switch

* Use Content.Server.deps.json instead

* Remove debug

* Rewrite

Now recursively fetches dependencies from Content.Server

Only copies dependencies not covered by Robust

This removes the need to manually specify most of the dependencies, even the content ones!

Also look at runtime key properly to figure out the proper dll name.

This actually removes some assemblies that were duplicated between the main directory and assemblies (various Microsoft.Extensions stuff)

* Fix test compile errors when updating dependencies

Ran across this while updating dependencies on the RT .NET 10 update. Should be fine to merge immediately.

* More .NET 10 prep

* Convert to SLNX

Hell yeah

* slnx now has size-2 indents

* Update SLNX with new RT system

* Remove reference to RT test in toolshed test

* Remove accidental usage of transitive RT dependencies

* Move Robust project references to RobustApi

* Update solution file

* Fix warnings in pow3r

* Fix nullable warnings in integration tests

idk where these came from

* gitignore binlog files

* Fix transitive dependency warnings in Content.Benchmarks

* Update slnx

* Okay, the Robust API thing didn't pan out. New plan.

It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible.

Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray!

This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard.

* Update RT to 269.0.0

* One last solution update

* Fix more data definition issues

* Update RT to 269.0.1

* Fix it again

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
---
 .editorconfig                                 |   2 +-
 .github/workflows/build-docfx.yml             |   2 +-
 .github/workflows/build-map-renderer.yml      |   2 +-
 .github/workflows/build-test-debug.yml        |   2 +-
 .github/workflows/publish.yml                 |   2 +-
 .github/workflows/test-packaging.yml          |   2 +-
 .github/workflows/yaml-linter.yml             |   2 +-
 .gitignore                                    |   3 +
 BuildChecker/git_helper.py                    |   2 +-
 Content.Benchmarks/Content.Benchmarks.csproj  |  23 +-
 Content.Client/Cargo/UI/BountyEntry.xaml.cs   |   1 -
 Content.Client/Content.Client.csproj          |  20 +-
 .../UI/LobbyCharacterPreviewPanel.xaml.cs     |   1 -
 .../Content.IntegrationTests.csproj           |  16 +-
 .../Tests/Commands/ObjectiveCommandsTest.cs   |   2 +-
 .../Tests/Minds/MindTests.EntityDeletion.cs   |   6 +-
 .../Tests/Toolshed/AdminTest.cs               |   2 +-
 .../Tests/Toolshed/LocTest.cs                 |   2 +-
 .../Content.MapRenderer.csproj                |  12 +-
 Content.Packaging/Content.Packaging.csproj    |   8 +-
 Content.Packaging/DepsHandler.cs              |  80 +++
 Content.Packaging/ServerPackaging.cs          |  48 +-
 .../Content.PatreonParser.csproj              |   2 +-
 Content.Replay/Content.Replay.csproj          |  13 +-
 .../Content.Server.Database.csproj            |   7 +-
 .../Codewords/CodewordFactionPrototype.cs     |   4 +-
 .../Codewords/CodewordGeneratorPrototype.cs   |   4 +-
 Content.Server/Content.Server.csproj          |  17 +-
 .../Commands/SetGamePresetCommand.cs          |   3 +-
 .../JobWhitelist/JobWhitelistManager.cs       |   6 +-
 .../Content.Shared.Database.csproj            |   3 +-
 .../Actions/Components/ActionComponent.cs     |   2 +-
 .../Chat/Prototypes/EmoteSoundsPrototype.cs   |   2 +-
 .../Prototypes/InjectorModePrototype.cs       |   4 +-
 Content.Shared/Content.Shared.csproj          |  21 +-
 .../CrewManifest/SharedCrewManifestSystem.cs  |   1 -
 Content.Shared/Lathe/LatheMessages.cs         |   1 -
 .../Nutrition/Prototypes/EdiblePrototype.cs   |   2 +-
 .../Loadouts/LoadoutGroupPrototype.cs         |   2 +-
 .../_DV/SmartFridge/SmartFridgeComponent.cs   |   2 +-
 Content.Tests/Content.Tests.csproj            |  17 +-
 Content.Tools/Content.Tools.csproj            |   9 +-
 Content.YAMLLinter/Content.YAMLLinter.csproj  |  15 +-
 Directory.Packages.props                      |  10 +-
 MSBuild/Content.props                         |  12 +
 Pow3r/Pow3r.csproj                            |   9 +-
 RobustToolbox                                 |   2 +-
 SpaceStation14.sln                            | 494 ------------------
 SpaceStation14.slnx                           | 168 ++++++
 ...ettings => SpaceStation14.slnx.DotSettings |   0
 global.json                                   |   2 +-
 51 files changed, 416 insertions(+), 658 deletions(-)
 create mode 100644 Content.Packaging/DepsHandler.cs
 create mode 100644 MSBuild/Content.props
 delete mode 100644 SpaceStation14.sln
 create mode 100644 SpaceStation14.slnx
 rename SpaceStation14.sln.DotSettings => SpaceStation14.slnx.DotSettings (100%)

diff --git a/.editorconfig b/.editorconfig
index a87e5e0651..fa740a7511 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -351,7 +351,7 @@ resharper_csharp_qualified_using_at_nested_scope = false
 resharper_csharp_prefer_qualified_reference = false
 resharper_csharp_allow_alias = false
 
-[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,slnx}]
 indent_size = 2
 
 [nuget.config]
diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
index 1f010b7291..dee31e9b31 100644
--- a/.github/workflows/build-docfx.yml
+++ b/.github/workflows/build-docfx.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index e3971024d6..04891d378f 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index decc74d255..961145ecb8 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5dfa0358f7..3418834a81 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Get Engine Tag
       run: |
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index 38a6dcd6ed..490e31f735 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index d7ad9b073d..ca925f4791 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/.gitignore b/.gitignore
index 0cd376f5dc..b033e538d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# MSbuild binlog files
+*.binlog
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
index 53526ee442..733b8b1c21 100644
--- a/BuildChecker/git_helper.py
+++ b/BuildChecker/git_helper.py
@@ -11,7 +11,7 @@ import time
 from pathlib import Path
 from typing import List
 
-SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
+SOLUTION_PATH = Path("..") / "SpaceStation14.slnx"
 # If this doesn't match the saved version we overwrite them all.
 CURRENT_HOOKS_VERSION = "4"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
index c3b60a1c69..8d4dfa31bd 100644
--- a/Content.Benchmarks/Content.Benchmarks.csproj
+++ b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <OutputPath>..\bin\Content.Benchmarks\</OutputPath>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>12</LangVersion>
+    <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
+
+    <!-- pin transitive deps -->
+    <PackageReference Include="System.Management" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
@@ -19,10 +22,12 @@
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
     <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Benchmarks.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index d813f70ff4..bac7d84bf7 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -7,7 +7,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Serilog;
 
 namespace Content.Client.Cargo.UI;
 
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index d8855ce508..e849d9313b 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -1,26 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
-    <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
-    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="Nett" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="Pidgin" />
+    <PackageReference Include="Robust.Shared.AuthLib" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+
   <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
index 9b1e7d50f8..988ece124f 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
-using Prometheus;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
index 2e922d2509..8c62806f74 100644
--- a/Content.IntegrationTests/Content.IntegrationTests.csproj
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <LangVersion>12</LangVersion>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
@@ -17,12 +15,12 @@
     <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>
diff --git a/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs b/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
index a77761a7d1..d430325e31 100644
--- a/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
@@ -54,7 +54,7 @@ public sealed class ObjectiveCommandsTest
         });
 
         Assert.That(mindEnt, Is.Not.Null);
-        var mindComp = mindEnt.Value.Comp;
+        var mindComp = mindEnt!.Value.Comp;
         Assert.That(mindComp.Objectives, Is.Empty, "Dummy player started with objectives.");
 
         await pair.WaitCommand($"addobjective {playerSession.Name} {ObjectiveProtoId}");
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
index 6f33188813..513049bcad 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
@@ -112,7 +112,7 @@ public sealed partial class MindTests
             Assert.That(entMan.EntityExists(attachedEntity), Is.True);
             Assert.That(attachedEntity, Is.Not.EqualTo(playerEnt));
             Assert.That(entMan.HasComponent<GhostComponent>(attachedEntity));
-            var transform = entMan.GetComponent<TransformComponent>(attachedEntity.Value);
+            var transform = entMan.GetComponent<TransformComponent>(attachedEntity!.Value);
             Assert.That(transform.MapID, Is.Not.EqualTo(MapId.Nullspace));
             Assert.That(transform.MapID, Is.Not.EqualTo(testMap.MapId));
 #pragma warning restore NUnit2045
@@ -175,7 +175,7 @@ public sealed partial class MindTests
         Assert.That(player.AttachedEntity, Is.Not.Null);
         Assert.That(entMan.EntityExists(player.AttachedEntity));
 #pragma warning restore NUnit2045
-        var originalEntity = player.AttachedEntity.Value;
+        var originalEntity = player.AttachedEntity!.Value;
 
         EntityUid ghost = default!;
         await server.WaitAssertion(() =>
@@ -248,7 +248,7 @@ public sealed partial class MindTests
         var mindId = player.ContentData()?.Mind;
         Assert.That(mindId, Is.Not.Null);
 
-        var mind = entMan.GetComponent<MindComponent>(mindId.Value);
+        var mind = entMan.GetComponent<MindComponent>(mindId!.Value);
         Assert.That(mind.VisitingEntity, Is.Null);
 
         await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
index ca70120ee9..cc440d0ccb 100644
--- a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
@@ -14,7 +14,7 @@ public sealed class AdminTest : ToolshedTest
         var toolMan = Server.ResolveDependency<ToolshedManager>();
         var admin = Server.ResolveDependency<IAdminManager>();
         var ignored = new HashSet<Assembly>()
-            {typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
+            {typeof(LocTest).Assembly};
 
         await Server.WaitAssertion(() =>
         {
diff --git a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
index fb210eba50..849f9e55d3 100644
--- a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
@@ -19,7 +19,7 @@ public sealed class LocTest : ToolshedTest
         var locStrings = new HashSet<string>();
 
         var ignored = new HashSet<Assembly>()
-            {typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
+            {typeof(LocTest).Assembly};
 
         await Server.WaitAssertion(() =>
         {
diff --git a/Content.MapRenderer/Content.MapRenderer.csproj b/Content.MapRenderer/Content.MapRenderer.csproj
index 4320717732..98fb446bd5 100644
--- a/Content.MapRenderer/Content.MapRenderer.csproj
+++ b/Content.MapRenderer/Content.MapRenderer.csproj
@@ -3,19 +3,27 @@
     <OutputType>Exe</OutputType>
     <OutputPath>..\bin\Content.MapRenderer\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
+    <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
   </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="NUnit" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="SixLabors.ImageSharp" />
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
+
 </Project>
diff --git a/Content.Packaging/Content.Packaging.csproj b/Content.Packaging/Content.Packaging.csproj
index 9823e40b8e..d278b48734 100644
--- a/Content.Packaging/Content.Packaging.csproj
+++ b/Content.Packaging/Content.Packaging.csproj
@@ -2,13 +2,13 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <ServerGarbageCollection>True</ServerGarbageCollection>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj" />
-  </ItemGroup>
+  <Import Project="../MSBuild/Content.props" />
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Packaging.props" />
 </Project>
diff --git a/Content.Packaging/DepsHandler.cs b/Content.Packaging/DepsHandler.cs
new file mode 100644
index 0000000000..9907b97ba9
--- /dev/null
+++ b/Content.Packaging/DepsHandler.cs
@@ -0,0 +1,80 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Content.Packaging;
+
+/// <summary>
+/// Helper class for working with <c>.deps.json</c> files.
+/// </summary>
+public sealed class DepsHandler
+{
+    public readonly Dictionary<string, LibraryInfo> Libraries = new();
+
+    public DepsHandler(DepsData data)
+    {
+        if (data.Targets.Count != 1)
+            throw new Exception("Expected exactly one target");
+
+        var target = data.Targets.Single().Value;
+
+        foreach (var (libNameAndVersion, libInfo) in target)
+        {
+            var split = libNameAndVersion.Split('/', 2);
+
+            Libraries.Add(split[0], libInfo);
+        }
+    }
+
+    public static DepsHandler Load(string depsFile)
+    {
+        using var f = File.OpenRead(depsFile);
+        var depsData = JsonSerializer.Deserialize<DepsData>(f) ?? throw new InvalidOperationException("Deps are null!");
+
+        return new DepsHandler(depsData);
+    }
+
+    public HashSet<string> RecursiveGetLibrariesFrom(string start)
+    {
+        var found = new HashSet<string>();
+
+        RecursiveAddLibraries(start, found);
+
+        return found;
+    }
+
+    private void RecursiveAddLibraries(string start, HashSet<string> set)
+    {
+        if (!set.Add(start))
+            return;
+
+        var lib = Libraries[start];
+        if (lib.Dependencies == null)
+            return;
+
+        foreach (var dep in lib.Dependencies.Keys)
+        {
+            RecursiveAddLibraries(dep, set);
+        }
+    }
+
+    public sealed class DepsData
+    {
+        [JsonInclude, JsonPropertyName("targets")]
+        public required Dictionary<string, Dictionary<string, LibraryInfo>> Targets;
+    }
+
+    public sealed class LibraryInfo
+    {
+        [JsonInclude, JsonPropertyName("dependencies")]
+        public Dictionary<string, string>? Dependencies;
+
+        [JsonInclude, JsonPropertyName("runtime")]
+        public Dictionary<string, object>? Runtime;
+
+        // Paths are like lib/netstandard2.0/JetBrains.Annotations.dll
+        public IEnumerable<string> GetDllNames()
+        {
+            return Runtime == null ? [] : Runtime.Keys.Select(p => p.Split('/')[^1]);
+        }
+    }
+}
diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index 2715e7a900..8e559d5a65 100644
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -37,25 +37,9 @@ public static class ServerPackaging
         .Select(o => o.Rid)
         .ToList();
 
-    private static readonly List<string> ServerContentAssemblies = new()
-    {
-        "Content.Server.Database",
-        "Content.Server",
-        "Content.Shared",
-        "Content.Shared.Database",
-    };
-
-    private static readonly List<string> ServerExtraAssemblies = new()
-    {
-        // Python script had Npgsql. though we want Npgsql.dll as well soooo
-        "Npgsql",
-        "Microsoft",
-        "NetCord",
-    };
-
     private static readonly List<string> ServerNotExtraAssemblies = new()
     {
-        "Microsoft.CodeAnalysis",
+        "JetBrains.Annotations",
     };
 
     private static readonly HashSet<string> BinSkipFolders = new()
@@ -181,23 +165,13 @@ public static class ServerPackaging
 
         var inputPassCore = graph.InputCore;
         var inputPassResources = graph.InputResources;
-        var contentAssemblies = new List<string>(ServerContentAssemblies);
 
         // Additional assemblies that need to be copied such as EFCore.
         var sourcePath = Path.Combine(contentDir, "bin", "Content.Server");
 
-        // Should this be an asset pass?
-        // For future archaeologists I just want audio rework to work and need the audio pass so
-        // just porting this as is from python.
-        foreach (var fullPath in Directory.EnumerateFiles(sourcePath, "*.*", SearchOption.AllDirectories))
-        {
-            var fileName = Path.GetFileNameWithoutExtension(fullPath);
+        var deps = DepsHandler.Load(Path.Combine(sourcePath, "Content.Server.deps.json"));
 
-            if (!ServerNotExtraAssemblies.Any(o => fileName.StartsWith(o)) && ServerExtraAssemblies.Any(o => fileName.StartsWith(o)))
-            {
-                contentAssemblies.Add(fileName);
-            }
-        }
+        var contentAssemblies = GetContentAssemblyNamesToCopy(deps);
 
         await RobustSharedPackaging.DoResourceCopy(
             Path.Combine("RobustToolbox", "bin", "Server",
@@ -229,5 +203,21 @@ public static class ServerPackaging
         inputPassResources.InjectFinished();
     }
 
+    // This returns both content assemblies (e.g. Content.Server.dll) and dependencies (e.g. Npgsql)
+    private static IEnumerable<string> GetContentAssemblyNamesToCopy(DepsHandler deps)
+    {
+        var depsContent = deps.RecursiveGetLibrariesFrom("Content.Server").SelectMany(GetLibraryNames);
+        var depsRobust = deps.RecursiveGetLibrariesFrom("Robust.Server").SelectMany(GetLibraryNames);
+
+        var depsContentExclusive = depsContent.Except(depsRobust).ToHashSet();
+
+        // Remove .dll suffix and apply filtering.
+        var names = depsContentExclusive.Select(p => p[..^4]).Where(p => !ServerNotExtraAssemblies.Any(p.StartsWith));
+
+        return names;
+
+        IEnumerable<string> GetLibraryNames(string library) => deps.Libraries[library].GetDllNames();
+    }
+
     private readonly record struct PlatformReg(string Rid, string TargetOs, bool BuildByDefault);
 }
diff --git a/Content.PatreonParser/Content.PatreonParser.csproj b/Content.PatreonParser/Content.PatreonParser.csproj
index 1724ec0cea..bba47a062d 100644
--- a/Content.PatreonParser/Content.PatreonParser.csproj
+++ b/Content.PatreonParser/Content.PatreonParser.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
       <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
diff --git a/Content.Replay/Content.Replay.csproj b/Content.Replay/Content.Replay.csproj
index 28cfc7f666..5008214522 100644
--- a/Content.Replay/Content.Replay.csproj
+++ b/Content.Replay/Content.Replay.csproj
@@ -1,26 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Replay\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
     <PackageReference Include="Nett" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
 </Project>
diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj
index d98d0642db..22b718b363 100644
--- a/Content.Server.Database/Content.Server.Database.csproj
+++ b/Content.Server.Database/Content.Server.Database.csproj
@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server.Database\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <Nullable>enable</Nullable>
     <NoWarn>RA0003</NoWarn>
   </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Content.Server/Codewords/CodewordFactionPrototype.cs b/Content.Server/Codewords/CodewordFactionPrototype.cs
index 72d24b1dcd..62552c1966 100644
--- a/Content.Server/Codewords/CodewordFactionPrototype.cs
+++ b/Content.Server/Codewords/CodewordFactionPrototype.cs
@@ -10,11 +10,11 @@ public sealed partial class CodewordFactionPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// The generator to use for this faction.
     /// </summary>
     [DataField(required:true)]
-    public ProtoId<CodewordGeneratorPrototype> Generator { get; } = default!;
+    public ProtoId<CodewordGeneratorPrototype> Generator { get; private set; } = default!;
 }
diff --git a/Content.Server/Codewords/CodewordGeneratorPrototype.cs b/Content.Server/Codewords/CodewordGeneratorPrototype.cs
index 15e50ebf73..b17a40fc6a 100644
--- a/Content.Server/Codewords/CodewordGeneratorPrototype.cs
+++ b/Content.Server/Codewords/CodewordGeneratorPrototype.cs
@@ -11,13 +11,13 @@ public sealed partial class CodewordGeneratorPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// List of datasets to use for word generation. All values will be concatenated into one list and then randomly chosen from
     /// </summary>
     [DataField]
-    public List<ProtoId<LocalizedDatasetPrototype>> Words { get; } =
+    public List<ProtoId<LocalizedDatasetPrototype>> Words { get; private set; } =
     [
         "Adjectives",
         "Verbs",
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index e2b65b873c..10d4bd56ab 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -1,31 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <NoWarn>1998</NoWarn>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
     <PackageReference Include="NetCord" />
+    <PackageReference Include="prometheus-net" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />
     <ProjectReference Include="..\Content.Server.Database\Content.Server.Database.csproj" />
     <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Packaging.props" />
 </Project>
diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index 10ec2a5e9b..894460fe3f 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -2,7 +2,6 @@
 using Content.Server.Administration;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
-using Linguini.Shared.Util;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands
@@ -18,7 +17,7 @@ namespace Content.Server.GameTicking.Commands
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (!args.Length.InRange(1, 3))
+            if (args.Length is <= 1 or >= 3)
             {
                 shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 3), ("currentAmount", args.Length)));
                 return;
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
index aa7a35cfa6..0b006676f0 100644
--- a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
@@ -11,7 +11,6 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Serilog;
 
 namespace Content.Server.Players.JobWhitelist;
 
@@ -23,8 +22,10 @@ public sealed class JobWhitelistManager : IPostInjectInit
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly UserDbDataManager _userDb = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
 
     private readonly Dictionary<NetUserId, HashSet<string>> _whitelists = new();
+    private ISawmill _sawmill = default!;
 
     public void Initialize()
     {
@@ -84,7 +85,7 @@ public sealed class JobWhitelistManager : IPostInjectInit
     {
         if (!_whitelists.TryGetValue(player, out var whitelists))
         {
-            Log.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
+            _sawmill.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
                 player,
                 job,
                 Environment.StackTrace);
@@ -118,5 +119,6 @@ public sealed class JobWhitelistManager : IPostInjectInit
         _userDb.AddOnLoadPlayer(LoadData);
         _userDb.AddOnFinishLoad(FinishLoad);
         _userDb.AddOnPlayerDisconnect(ClientDisconnected);
+        _sawmill = _logManager.GetSawmill("job_whitelist");
     }
 }
diff --git a/Content.Shared.Database/Content.Shared.Database.csproj b/Content.Shared.Database/Content.Shared.Database.csproj
index bc2cc300bf..5b14175f4f 100644
--- a/Content.Shared.Database/Content.Shared.Database.csproj
+++ b/Content.Shared.Database/Content.Shared.Database.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Shared/Actions/Components/ActionComponent.cs b/Content.Shared/Actions/Components/ActionComponent.cs
index 2833aa1798..8f9b7fa925 100644
--- a/Content.Shared/Actions/Components/ActionComponent.cs
+++ b/Content.Shared/Actions/Components/ActionComponent.cs
@@ -197,7 +197,7 @@ public sealed partial class ActionComponent : Component
 }
 
 [DataRecord, Serializable, NetSerializable]
-public record struct ActionCooldown
+public partial record struct ActionCooldown
 {
     [DataField(required: true, customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan Start;
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
index 0138009ef9..b75ed796e2 100644
--- a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
@@ -21,7 +21,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingProtot
     /// <inheritdoc/>
     [AbstractDataField]
     [NeverPushInheritance]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     ///     Optional fallback sound that will play if collection
diff --git a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
index 8434309b26..0255d8798f 100644
--- a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
+++ b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
@@ -20,11 +20,11 @@ public sealed partial class InjectorModePrototype : IPrototype, IInheritingProto
 
     /// <inheritdoc/>
     [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<InjectorModePrototype>))]
-    public string[]? Parents { get; }
+    public string[]? Parents { get; private set; }
 
     /// <inheritdoc/>
     [AbstractDataField, NeverPushInheritance]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     /// The name of the mode that will be shown on the label UI.
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index 52ed717e96..da32cdf817 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -1,28 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj">
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj">
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj">
-      <Private>false</Private>
-    </ProjectReference>
   </ItemGroup>
+
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
 </Project>
diff --git a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
index 8784f5a63e..6d3ec9f376 100644
--- a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
+++ b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Eui;
-using NetSerializer;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.CrewManifest;
diff --git a/Content.Shared/Lathe/LatheMessages.cs b/Content.Shared/Lathe/LatheMessages.cs
index fe72eed367..d37aa96a61 100644
--- a/Content.Shared/Lathe/LatheMessages.cs
+++ b/Content.Shared/Lathe/LatheMessages.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Research.Prototypes;
-using NetSerializer;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
index 2cfe900167..864383610c 100644
--- a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
+++ b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
@@ -12,7 +12,7 @@ public sealed partial class EdiblePrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// The sound we make when eaten.
diff --git a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
index 40a168c067..9cecd9df51 100644
--- a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
@@ -19,7 +19,7 @@ public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingProto
     /// <inheritdoc />
     [NeverPushInheritance]
     [AbstractDataField]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     /// User-friendly name for the group.
diff --git a/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs
index 50ab2b9c0b..f85ca5708f 100644
--- a/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs
+++ b/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs
@@ -60,7 +60,7 @@ public sealed partial class SmartFridgeComponent : Component
 }
 
 [Serializable, NetSerializable, DataRecord]
-public record struct SmartFridgeEntry
+public partial record struct SmartFridgeEntry
 {
     public string Name;
 
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
index ff295728fc..75a077839a 100644
--- a/Content.Tests/Content.Tests.csproj
+++ b/Content.Tests/Content.Tests.csproj
@@ -1,26 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Tests\</OutputPath>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
   <ItemGroup>
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
     <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
diff --git a/Content.Tools/Content.Tools.csproj b/Content.Tools/Content.Tools.csproj
index f611924c58..06a9b790db 100644
--- a/Content.Tools/Content.Tools.csproj
+++ b/Content.Tools/Content.Tools.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
     </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
     <ItemGroup>
       <PackageReference Include="YamlDotNet" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    </ItemGroup>
-
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
 </Project>
diff --git a/Content.YAMLLinter/Content.YAMLLinter.csproj b/Content.YAMLLinter/Content.YAMLLinter.csproj
index 4e7344beaa..bc2b7d1cb6 100644
--- a/Content.YAMLLinter/Content.YAMLLinter.csproj
+++ b/Content.YAMLLinter/Content.YAMLLinter.csproj
@@ -1,21 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
         <OutputPath>..\bin\Content.YAMLLinter\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ServerGarbageCollection>true</ServerGarbageCollection>
+        <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
+      <Nullable>disable</Nullable>
     </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
       <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
       <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
       <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
       <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     </ItemGroup>
 
   <ItemGroup>
@@ -23,4 +22,10 @@
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 643b105b76..3604412933 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,17 +6,17 @@
     -->
     <PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
-    <PackageVersion Include="CsvHelper" Version="33.0.1" />
+    <PackageVersion Include="CsvHelper" Version="33.1.0" />
     <PackageVersion Include="ImGui.NET" Version="1.87.3" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.0" />
     <PackageVersion Include="NetCord" Version="1.0.0-alpha.388" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
     <PackageVersion Include="OpenTK" Version="4.9.4" />
     <PackageVersion Include="Veldrid" Version="4.8.0" />
     <PackageVersion Include="Veldrid.SPIRV" Version="1.0.15" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MSBuild/Content.props b/MSBuild/Content.props
new file mode 100644
index 0000000000..7216961fa0
--- /dev/null
+++ b/MSBuild/Content.props
@@ -0,0 +1,12 @@
+<Project>
+  <!--
+  Content specific properties
+  Import *before* Robust.Properties.targets
+  -->
+
+  <PropertyGroup>
+    <LangVersion Condition="'$(LangVersion)' == ''">14</LangVersion>
+    <IsPackable Condition="'$(IsPackable)' == ''">false</IsPackable>
+    <Nullable Condition="'$(Nullable)' == ''">enable</Nullable>
+  </PropertyGroup>
+</Project>
diff --git a/Pow3r/Pow3r.csproj b/Pow3r/Pow3r.csproj
index 4f2d20087a..20181910b4 100644
--- a/Pow3r/Pow3r.csproj
+++ b/Pow3r/Pow3r.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <Nullable>disable</Nullable>
     </PropertyGroup>
 
+    <Import Project="../MSBuild/Content.props" />
+
     <ItemGroup>
       <PackageReference Include="ImGui.NET" />
       <PackageReference Include="OpenTK" />
@@ -14,9 +16,10 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
     </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>
diff --git a/RobustToolbox b/RobustToolbox
index dbde8023ed..c7ba63ed8e 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit dbde8023ed256ac69ae4b419422c936f78361653
+Subproject commit c7ba63ed8e9c8087b7a78bada55057ac7aa0812d
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
deleted file mode 100644
index 0e00fe5b12..0000000000
--- a/SpaceStation14.sln
+++ /dev/null
@@ -1,494 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34330.188
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Shared", "Content.Shared\Content.Shared.csproj", "{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Server", "Content.Server\Content.Server.csproj", "{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000}
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} = {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Client", "Content.Client\Content.Client.csproj", "{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Checker", "Build Checker", "{3202E94D-E985-4181-9F69-F458A7F6574F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildChecker", "BuildChecker\BuildChecker.csproj", "{C899FCA4-7037-4E49-ABC2-44DE72487110}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Tests", "Content.Tests\Content.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RobustToolbox", "RobustToolbox", "{83B4CBBA-547A-42F0-A7CD-8A67D93196CE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lidgren.Network", "RobustToolbox\Lidgren.Network\Lidgren.Network.csproj", "{59250BAF-0000-0000-0000-000000000000}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client", "RobustToolbox\Robust.Client\Robust.Client.csproj", "{83429BD6-6358-4B18-BE51-401DF8EA2673}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Server", "RobustToolbox\Robust.Server\Robust.Server.csproj", "{B04AAE71-0000-0000-0000-000000000000}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Maths", "RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj", "{93F23A82-00C5-4572-964E-E7C9457726D4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.UnitTesting", "RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj", "{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared", "RobustToolbox\Robust.Shared\Robust.Shared.csproj", "{0529F740-0000-0000-0000-000000000000}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.IntegrationTests", "Content.IntegrationTests\Content.IntegrationTests.csproj", "{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Benchmarks", "Content.Benchmarks\Content.Benchmarks.csproj", "{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenToolkit.GraphicsLibraryFramework", "RobustToolbox\OpenToolkit.GraphicsLibraryFramework\OpenToolkit.GraphicsLibraryFramework.csproj", "{4809F412-3132-419E-BF9D-CCF7593C3533}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Server.Database", "Content.Server.Database\Content.Server.Database.csproj", "{45C9B43F-305D-4651-9863-F6384CBC847F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSBuild", "MSBuild", "{50404922-9637-4394-BF59-165D0850ADC8}"
-	ProjectSection(SolutionItems) = preProject
-		RobustToolbox\MSBuild\Robust.Analyzers.targets = RobustToolbox\MSBuild\Robust.Analyzers.targets
-		RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets = RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets
-		RobustToolbox\MSBuild\Robust.Configurations.props = RobustToolbox\MSBuild\Robust.Configurations.props
-		RobustToolbox\MSBuild\Robust.DefineConstants.targets = RobustToolbox\MSBuild\Robust.DefineConstants.targets
-		RobustToolbox\MSBuild\Robust.Engine.props = RobustToolbox\MSBuild\Robust.Engine.props
-		RobustToolbox\MSBuild\Robust.Engine.targets = RobustToolbox\MSBuild\Robust.Engine.targets
-		RobustToolbox\MSBuild\Robust.Engine.Version.props = RobustToolbox\MSBuild\Robust.Engine.Version.props
-		RobustToolbox\MSBuild\Robust.Platform.props = RobustToolbox\MSBuild\Robust.Platform.props
-		RobustToolbox\MSBuild\Robust.Properties.targets = RobustToolbox\MSBuild\Robust.Properties.targets
-		RobustToolbox\MSBuild\Robust.Trimming.targets = RobustToolbox\MSBuild\Robust.Trimming.targets
-		RobustToolbox\MSBuild\XamlIL.targets = RobustToolbox\MSBuild\XamlIL.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A-411B-4B3B-BEB6-DEC6DCA4C205}"
-	ProjectSection(SolutionItems) = preProject
-		Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlX", "XamlX", "{AFF53804-115F-4E67-B81F-26265EA27880}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{EC27A16C-9412-4AA6-AE68-CAAB28882802}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		Directory.Packages.props = Directory.Packages.props
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{A965CB3B-FD31-44AF-8872-85ABA436098D}"
-	ProjectSection(SolutionItems) = preProject
-		RobustToolbox\Directory.Packages.props = RobustToolbox\Directory.Packages.props
-		RobustToolbox\README.md = RobustToolbox\README.md
-		RobustToolbox\RELEASE-NOTES.md = RobustToolbox\RELEASE-NOTES.md
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Replay", "Content.Replay\Content.Replay.csproj", "{A493616C-338D-47B7-8072-A7F14D034D0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA69-B0F0-49FB-A05E-ECA37372277A}"
-	ProjectSection(SolutionItems) = preProject
-		RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugOpt|Any CPU = DebugOpt|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Tools|Any CPU = Tools|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C899FCA4-7037-4E49-ABC2-44DE72487110} = {3202E94D-E985-4181-9F69-F458A7F6574F}
-		{59250BAF-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{83429BD6-6358-4B18-BE51-401DF8EA2673} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{B04AAE71-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{93F23A82-00C5-4572-964E-E7C9457726D4} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{0529F740-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{4809F412-3132-419E-BF9D-CCF7593C3533} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{50404922-9637-4394-BF59-165D0850ADC8} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}
-	EndGlobalSection
-EndGlobal
diff --git a/SpaceStation14.slnx b/SpaceStation14.slnx
new file mode 100644
index 0000000000..5fdcaafd73
--- /dev/null
+++ b/SpaceStation14.slnx
@@ -0,0 +1,168 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="DebugOpt" />
+    <BuildType Name="Release" />
+    <BuildType Name="Tools" />
+  </Configurations>
+  <Folder Name="/Build Checker/">
+    <Project Path="BuildChecker/BuildChecker.csproj">
+      <Build Solution="Release|*" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/Build/">
+    <File Path="Tools/generate_hashes.ps1" />
+  </Folder>
+  <Folder Name="/MSBuild/">
+    <File Path="MSBuild/Content.props" />
+  </Folder>
+  <Folder Name="/Project Files/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="Directory.Packages.props" />
+    <File Path="README.md" />
+  </Folder>
+  <Project Path="Content.Benchmarks/Content.Benchmarks.csproj" />
+  <Project Path="Content.Client/Content.Client.csproj" />
+  <Project Path="Content.IntegrationTests/Content.IntegrationTests.csproj" />
+  <Project Path="Content.MapRenderer/Content.MapRenderer.csproj" />
+  <Project Path="Content.Packaging/Content.Packaging.csproj" />
+  <Project Path="Content.PatreonParser/Content.PatreonParser.csproj">
+    <BuildType Solution="DebugOpt|*" Project="Debug" />
+    <BuildType Solution="Tools|*" Project="Debug" />
+  </Project>
+  <Project Path="Content.Replay/Content.Replay.csproj" />
+  <Project Path="Content.Server.Database/Content.Server.Database.csproj" />
+  <Project Path="Content.Server/Content.Server.csproj" />
+  <Project Path="Content.Shared.Database/Content.Shared.Database.csproj" />
+  <Project Path="Content.Shared/Content.Shared.csproj" />
+  <Project Path="Content.Tests/Content.Tests.csproj" />
+  <Project Path="Content.Tools/Content.Tools.csproj" />
+  <Project Path="Content.YAMLLinter/Content.YAMLLinter.csproj" />
+  <Project Path="Pow3r/Pow3r.csproj" />
+  <Folder Name="/RobustToolbox/.github/workflows/">
+    <File Path="RobustToolbox/.github/workflows/benchmarks.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-all-configurations.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-docfx.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-test.yml" />
+    <File Path="RobustToolbox/.github/workflows/codeql-analysis.yml" />
+    <File Path="RobustToolbox/.github/workflows/publish-client.yml" />
+    <File Path="RobustToolbox/.github/workflows/test-content.yml" />
+  </Folder>
+  <Folder Name="/RobustToolbox/Imports/">
+    <File Path="RobustToolbox/Imports/Benchmarks.props" />
+    <File Path="RobustToolbox/Imports/Client.props" />
+    <File Path="RobustToolbox/Imports/Lidgren.props" />
+    <File Path="RobustToolbox/Imports/Packaging.props" />
+    <File Path="RobustToolbox/Imports/Server.props" />
+    <File Path="RobustToolbox/Imports/Shared.props" />
+    <File Path="RobustToolbox/Imports/Testing.props" />
+    <File Path="RobustToolbox/Imports/WebView.props" />
+  </Folder>
+  <Folder Name="/RobustToolbox/MSBuild/">
+    <File Path="RobustToolbox/MSBuild/Robust.Analyzers.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.CompNetworkGenerator.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Configurations.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.DefineConstants.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.Version.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.Platform.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.ProjectReferences.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Properties.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Trimming.targets" />
+    <File Path="RobustToolbox/MSBuild/XamlIL.targets" />
+  </Folder>
+  <Folder Name="/RobustToolbox/NetSerializer/">
+    <Project Path="RobustToolbox/NetSerializer/NetSerializer/NetSerializer.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Project Files/">
+    <File Path="RobustToolbox/Directory.Build.props" />
+    <File Path="RobustToolbox/Directory.Packages.props" />
+    <File Path="RobustToolbox/README.md" />
+    <File Path="RobustToolbox/RELEASE-NOTES.md" />
+  </Folder>
+  <Folder Name="/RobustToolbox/Robust.LoaderApi/">
+    <Project Path="RobustToolbox/Robust.LoaderApi/Robust.LoaderApi/Robust.LoaderApi.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Roslyn/">
+    <Project Path="RobustToolbox/Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Analyzers/Robust.Analyzers.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Tools/">
+    <Project Path="RobustToolbox/Tools/Robust.SolutionGen/Robust.SolutionGen.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/XamlX/">
+    <Project Path="RobustToolbox/XamlX/src/XamlX.IL.Cecil/XamlX.IL.Cecil.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/XamlX/src/XamlX.Runtime/XamlX.Runtime.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/XamlX/src/XamlX/XamlX.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/">
+    <Project Path="RobustToolbox/Avalonia.Base/Avalonia.Base.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Lidgren.Network/Lidgren.Network.csproj" />
+    <Project Path="RobustToolbox/Robust.Benchmarks/Robust.Benchmarks.csproj" />
+    <Project Path="RobustToolbox/Robust.Client.Injectors/Robust.Client.Injectors.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.IntegrationTests/Robust.Client.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Client.Tests/Robust.Client.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Client/Robust.Client.csproj" />
+    <Project Path="RobustToolbox/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Packaging/Robust.Packaging.csproj" />
+    <Project Path="RobustToolbox/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Server.Testing/Robust.Server.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Server/Robust.Server.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths.Testing/Robust.Shared.Maths.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths.Tests/Robust.Shared.Maths.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths/Robust.Shared.Maths.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Testing/Robust.Shared.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Tests/Robust.Shared.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared/Robust.Shared.csproj" />
+    <Project Path="RobustToolbox/Robust.UnitTesting/Robust.UnitTesting.csproj" />
+    <Project Path="RobustToolbox/Robust.Xaml/Robust.Xaml.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <File Path="RobustToolbox/RobustToolbox.slnx" />
+  </Folder>
+</Solution>
\ No newline at end of file
diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.slnx.DotSettings
similarity index 100%
rename from SpaceStation14.sln.DotSettings
rename to SpaceStation14.slnx.DotSettings
diff --git a/global.json b/global.json
index cdbb589eda..512142d2be 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
 }

From 987361b5ced51fda6e131fd17e3c17ade54ab663 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 3 Feb 2026 06:29:50 +0100
Subject: [PATCH 150/360] Downstream fixes for .net10

---
 .../_DV/Cargo/Components/StationStockMarketComponent.cs     | 2 +-
 Content.Shared/Roles/JobPrototype.cs                        | 2 +-
 Content.Shared/_DV/Antag/NukieOperationPrototype.cs         | 2 +-
 .../CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs    | 6 +++---
 .../_DV/FeedbackOverwatch/FeedbackPopupPrototype.cs         | 2 +-
 Content.Shared/_DV/Kitchen/DeepFryerRecipePrototype.cs      | 2 +-
 Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs        | 4 ++--
 Content.Shared/_DV/QuickPhrase/QuickPhrasePrototype.cs      | 4 ++--
 .../_DV/Shipyard/Prototypes/VesselCategoryPrototype.cs      | 4 ++--
 Content.Shared/_DV/Shipyard/Prototypes/VesselPrototype.cs   | 4 ++--
 .../Speech/Prototypes/SyllableObfuscationAccentPrototype.cs | 2 +-
 .../_DV/VendingMachines/ShopInventoryPrototype.cs           | 4 ++--
 Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs      | 4 ++--
 .../_Goobstation/Devil/Contract/DevilClausePrototype.cs     | 4 ++--
 Content.Shared/_Goobstation/Devil/DevilBranchPrototype.cs   | 2 +-
 .../_Mono/CorticalBorer/CorticalBorerChemicalPrototype.cs   | 2 +-
 .../_RMC14/Clothing/RMCClothingFoldableComponent.cs         | 2 +-
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Content.Server/_DV/Cargo/Components/StationStockMarketComponent.cs b/Content.Server/_DV/Cargo/Components/StationStockMarketComponent.cs
index b3fd07585c..918ffcb1b8 100644
--- a/Content.Server/_DV/Cargo/Components/StationStockMarketComponent.cs
+++ b/Content.Server/_DV/Cargo/Components/StationStockMarketComponent.cs
@@ -61,4 +61,4 @@ public sealed partial class StationStockMarketComponent : Component
 }
 
 [DataRecord]
-public record struct MarketChange(float Chance, Vector2 Range);
+public partial record struct MarketChange(float Chance, Vector2 Range);
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 80e481016c..d23d1f5469 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -88,7 +88,7 @@ namespace Content.Shared.Roles
         /// Nyano/DV: For e.g. prisoners, they'll never use their latejoin spawner.
         /// </summary>
         [DataField("alwaysUseSpawner")]
-        public bool AlwaysUseSpawner { get; } = false;
+        public bool AlwaysUseSpawner { get; private set; } = false; // DeltaV - Added private set
 
         /// <summary>
         ///     The "weight" or importance of this job. If this number is large, the job system will assign this job
diff --git a/Content.Shared/_DV/Antag/NukieOperationPrototype.cs b/Content.Shared/_DV/Antag/NukieOperationPrototype.cs
index b800cdc479..dc946c80da 100644
--- a/Content.Shared/_DV/Antag/NukieOperationPrototype.cs
+++ b/Content.Shared/_DV/Antag/NukieOperationPrototype.cs
@@ -10,7 +10,7 @@ public sealed partial class NukieOperationPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     [DataField(required: true)]
     public List<EntProtoId> OperationObjectives = new();
diff --git a/Content.Shared/_DV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs b/Content.Shared/_DV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
index b0fb8971c8..61dc6eda53 100644
--- a/Content.Shared/_DV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
+++ b/Content.Shared/_DV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
@@ -61,7 +61,7 @@ public enum NanoChatUiMessageType : byte
 
 // putting this here because i can
 [Serializable, NetSerializable, DataRecord]
-public struct NanoChatRecipient
+public partial struct NanoChatRecipient
 {
     /// <summary>
     ///     The recipient's unique NanoChat number.
@@ -100,7 +100,7 @@ public struct NanoChatRecipient
 }
 
 [Serializable, NetSerializable, DataRecord]
-public struct NanoChatMessage
+public partial struct NanoChatMessage
 {
     public const int MaxContentLength = 256;
 
@@ -146,7 +146,7 @@ public struct NanoChatMessage
 /// </summary>
 /// <remarks>Used by the LogProbe</remarks>
 [Serializable, NetSerializable, DataRecord]
-public readonly struct NanoChatData(
+public readonly partial struct NanoChatData(
     Dictionary<uint, NanoChatRecipient> recipients,
     Dictionary<uint, List<NanoChatMessage>> messages,
     uint? cardNumber,
diff --git a/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupPrototype.cs b/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupPrototype.cs
index 475718802c..cd9d4768aa 100644
--- a/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupPrototype.cs
+++ b/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupPrototype.cs
@@ -10,7 +10,7 @@ public sealed partial class FeedbackPopupPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     ///     Name of the popup. This is relayed in the discord webhook.
diff --git a/Content.Shared/_DV/Kitchen/DeepFryerRecipePrototype.cs b/Content.Shared/_DV/Kitchen/DeepFryerRecipePrototype.cs
index 7c257230b2..4047f19057 100644
--- a/Content.Shared/_DV/Kitchen/DeepFryerRecipePrototype.cs
+++ b/Content.Shared/_DV/Kitchen/DeepFryerRecipePrototype.cs
@@ -14,7 +14,7 @@ namespace Content.Shared._DV.Kitchen;
 /// we can still reuse it for guidebook generation without duping the code.
 /// </remarks>
 [Prototype]
-public sealed class DeepFryerRecipePrototype : IPrototype
+public sealed partial class DeepFryerRecipePrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
diff --git a/Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs b/Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs
index 740015c590..e4a1edc407 100644
--- a/Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs
+++ b/Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs
@@ -7,9 +7,9 @@ namespace Content.Shared._DV.Mail;
 /// Generic random weighting dataset to use.
 /// </summary>
 [Prototype]
-public sealed class MailDeliveryPoolPrototype : IPrototype
+public sealed partial class MailDeliveryPoolPrototype : IPrototype
 {
-    [IdDataField] public string ID { get; } = default!;
+    [IdDataField] public string ID { get; private set; } = default!;
 
     /// <summary>
     /// Mail that can be sent to everyone.
diff --git a/Content.Shared/_DV/QuickPhrase/QuickPhrasePrototype.cs b/Content.Shared/_DV/QuickPhrase/QuickPhrasePrototype.cs
index 44ebc20881..3f4fd443bc 100644
--- a/Content.Shared/_DV/QuickPhrase/QuickPhrasePrototype.cs
+++ b/Content.Shared/_DV/QuickPhrase/QuickPhrasePrototype.cs
@@ -18,12 +18,12 @@ public sealed partial class QuickPhrasePrototype : IPrototype, IInheritingProtot
     /// </summary>
     [ViewVariables]
     [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<QuickPhrasePrototype>))]
-    public string[]? Parents { get; }
+    public string[]? Parents { get; private set; }
 
     [ViewVariables]
     [NeverPushInheritance]
     [AbstractDataField]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     /// The phrase that this prototype represents.
diff --git a/Content.Shared/_DV/Shipyard/Prototypes/VesselCategoryPrototype.cs b/Content.Shared/_DV/Shipyard/Prototypes/VesselCategoryPrototype.cs
index a00d881706..63ee425a8e 100644
--- a/Content.Shared/_DV/Shipyard/Prototypes/VesselCategoryPrototype.cs
+++ b/Content.Shared/_DV/Shipyard/Prototypes/VesselCategoryPrototype.cs
@@ -7,13 +7,13 @@ namespace Content.Shared.Shipyard.Prototypes;
 /// Prevents making typos being silently ignored by the linter.
 /// </summary>
 [Prototype("vesselCategory")]
-public sealed class VesselCategoryPrototype : IPrototype
+public sealed partial class VesselCategoryPrototype : IPrototype
 {
     /// <summary>
     /// The unique ID for the vessel category.
     /// </summary>
     [ViewVariables, IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// The LocId containing the localization ID of the category name.
diff --git a/Content.Shared/_DV/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/_DV/Shipyard/Prototypes/VesselPrototype.cs
index 5bfe8cbdeb..f696e9de3f 100644
--- a/Content.Shared/_DV/Shipyard/Prototypes/VesselPrototype.cs
+++ b/Content.Shared/_DV/Shipyard/Prototypes/VesselPrototype.cs
@@ -5,10 +5,10 @@ using Robust.Shared.Utility;
 namespace Content.Shared.Shipyard.Prototypes;
 
 [Prototype("vessel")]
-public sealed class VesselPrototype : IPrototype
+public sealed partial class VesselPrototype : IPrototype
 {
     [ViewVariables, IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// Already localized name of the vessel.
diff --git a/Content.Shared/_DV/Speech/Prototypes/SyllableObfuscationAccentPrototype.cs b/Content.Shared/_DV/Speech/Prototypes/SyllableObfuscationAccentPrototype.cs
index f9e96260aa..9e5c3f7f17 100644
--- a/Content.Shared/_DV/Speech/Prototypes/SyllableObfuscationAccentPrototype.cs
+++ b/Content.Shared/_DV/Speech/Prototypes/SyllableObfuscationAccentPrototype.cs
@@ -6,7 +6,7 @@ namespace Content.Shared._DV.Speech.Prototypes;
 public sealed partial class SyllableObfuscationAccentPrototype : IPrototype
 {
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     [DataField]
     public int MinSyllables = 1;
diff --git a/Content.Shared/_DV/VendingMachines/ShopInventoryPrototype.cs b/Content.Shared/_DV/VendingMachines/ShopInventoryPrototype.cs
index f7198642ae..51931bea29 100644
--- a/Content.Shared/_DV/VendingMachines/ShopInventoryPrototype.cs
+++ b/Content.Shared/_DV/VendingMachines/ShopInventoryPrototype.cs
@@ -7,7 +7,7 @@ namespace Content.Shared._DV.VendingMachines;
 /// Similar to <c>VendingMachineInventoryPrototype</c> but for <see cref="ShopVendorComponent"/>.
 /// </summary>
 [Prototype]
-public sealed class ShopInventoryPrototype : IPrototype
+public sealed partial class ShopInventoryPrototype : IPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
@@ -20,4 +20,4 @@ public sealed class ShopInventoryPrototype : IPrototype
 }
 
 [DataRecord, Serializable]
-public record struct ShopListing(EntProtoId Id, uint Cost);
+public partial record struct ShopListing(EntProtoId Id, uint Cost);
diff --git a/Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs b/Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs
index bab750529a..2dd8162a73 100644
--- a/Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs
+++ b/Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs
@@ -4,10 +4,10 @@ using Robust.Shared.Prototypes;
 namespace Content.Shared._DV.Whitelist;
 
 [Prototype("whitelistTier")]
-public sealed class WhitelistTierPrototype : IPrototype
+public sealed partial class WhitelistTierPrototype : IPrototype
 {
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     [DataField]
     public string Name = string.Empty;
diff --git a/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs b/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs
index 5b0d28cc15..e9acad735e 100644
--- a/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs
+++ b/Content.Shared/_Goobstation/Devil/Contract/DevilClausePrototype.cs
@@ -10,10 +10,10 @@ using Robust.Shared.Prototypes;
 namespace Content.Shared._Goobstation.Devil.Contract;
 
 [Prototype("clause")]
-public sealed class DevilClausePrototype : IPrototype
+public sealed partial class DevilClausePrototype : IPrototype // DeltaV - Added partial
 {
     [IdDataField]
-    public string ID { get; private init; } = default!;
+    public string ID { get; private set; } = default!; // DeltaV - Added private set
 
     [DataField(required: true)]
     public int ClauseWeight;
diff --git a/Content.Shared/_Goobstation/Devil/DevilBranchPrototype.cs b/Content.Shared/_Goobstation/Devil/DevilBranchPrototype.cs
index a092b2535a..deaad6b573 100644
--- a/Content.Shared/_Goobstation/Devil/DevilBranchPrototype.cs
+++ b/Content.Shared/_Goobstation/Devil/DevilBranchPrototype.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Shared._Goobstation.Devil;
 
 [Prototype("devilBranchPrototype")]
-public sealed class DevilBranchPrototype : IPrototype
+public sealed partial class DevilBranchPrototype : IPrototype // DeltaV - Added partial
 {
     [IdDataField]
     public string ID { get; set; } = default!;
diff --git a/Content.Shared/_Mono/CorticalBorer/CorticalBorerChemicalPrototype.cs b/Content.Shared/_Mono/CorticalBorer/CorticalBorerChemicalPrototype.cs
index a455be1572..4e8bad8fbf 100644
--- a/Content.Shared/_Mono/CorticalBorer/CorticalBorerChemicalPrototype.cs
+++ b/Content.Shared/_Mono/CorticalBorer/CorticalBorerChemicalPrototype.cs
@@ -11,7 +11,7 @@ namespace Content.Shared._Mono.CorticalBorer;
 public sealed partial class CorticalBorerChemicalPrototype : IPrototype
 {
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!; // DeltaV - Added private set
 
     /// <summary>
     /// Chemical cost per u of reagent
diff --git a/Content.Shared/_RMC14/Clothing/RMCClothingFoldableComponent.cs b/Content.Shared/_RMC14/Clothing/RMCClothingFoldableComponent.cs
index 0d91597c81..001bb0f3e2 100644
--- a/Content.Shared/_RMC14/Clothing/RMCClothingFoldableComponent.cs
+++ b/Content.Shared/_RMC14/Clothing/RMCClothingFoldableComponent.cs
@@ -20,4 +20,4 @@ public sealed partial class RMCClothingFoldableComponent : Component
 /// </summary>
 [DataRecord]
 [Serializable, NetSerializable]
-public readonly record struct FoldableType(string Prefix, LocId Name, int Priority, string? BlacklistedPrefix, LocId? BlacklistPopup);
+public readonly partial record struct FoldableType(string Prefix, LocId Name, int Priority, string? BlacklistedPrefix, LocId? BlacklistPopup); // DeltaV - Added partial

From 460f1e65f48c51f746ce3d253dba59037fa5ddcb Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 21 Dec 2025 18:42:39 -0800
Subject: [PATCH 151/360] Physics Assert in SharedMoverController (#37970)

* Physics asserts and Xenoarch fixes

* Fix blocking asserts

* Alright ready for the test fails

* Fix whitespace issues

* Fix whitespace

* Okay fix whitespace issues for real

* Fix test fails

* Temp fix

* Fix

* Whitespace

* Added a big ass comment

* Right

* A

* Should work

* Debug performance

* Mothership

* fix test fails real

* push

* fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Tests/Buckle/BuckleTest.cs                |  2 ++
 Content.Shared/Blocking/BlockingSystem.cs     |  2 +-
 .../Friction/TileFrictionController.cs        | 20 +++++++++--
 .../Components/BlockMovementComponent.cs      |  9 +++++
 .../SharedInteractionSystem.Blocking.cs       | 18 ++++++++--
 .../Movement/Systems/SharedMoverController.cs | 33 +++++++++++++++++--
 .../Entities/Mobs/Player/admin_ghost.yml      |  1 -
 .../Entities/Mobs/Player/mothershipcore.yml   |  6 ++--
 .../Entities/Mobs/Player/narsie.yml           |  1 -
 .../Entities/Mobs/Player/ratvar.yml           |  1 -
 .../Entities/Objects/Fun/immovable_rod.yml    |  2 ++
 .../Xenoarchaeology/item_xenoartifacts.yml    |  2 +-
 .../structure_xenoartifacts.yml               |  2 ++
 .../Xenoarchaeology/xenoartifacts.yml         |  2 +-
 14 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 4e7dc02dac..14ec07b48e 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -31,6 +31,8 @@ namespace Content.IntegrationTests.Tests.Buckle
   - type: Hands
   - type: ComplexInteraction
   - type: InputMover
+  - type: Physics
+    bodyType: KinematicController
   - type: Body
     prototype: Human
   - type: StandingState
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 6223f8e840..2e17485bde 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -245,7 +245,7 @@ public sealed partial class BlockingSystem : EntitySystem
         if (TryComp<BlockingUserComponent>(user, out var blockingUserComponent) && TryComp<PhysicsComponent>(user, out var physicsComponent))
         {
             if (xform.Anchored)
-                _transformSystem.Unanchor(user, xform);
+                _transformSystem.Unanchor(user, xform, false);
 
             _actionsSystem.SetToggled(component.BlockingToggleActionEntity, false);
             _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent);
diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index 4b29b9a9de..71c51c55f1 100644
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -1,7 +1,9 @@
 using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Gravity;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
@@ -14,6 +16,7 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Controllers;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Friction
 {
@@ -26,11 +29,14 @@ namespace Content.Shared.Friction
         [Dependency] private readonly SharedMapSystem _map = default!;
 
         private EntityQuery<TileFrictionModifierComponent> _frictionQuery;
-        private EntityQuery<TransformComponent> _xformQuery;
         private EntityQuery<PullerComponent> _pullerQuery;
         private EntityQuery<PullableComponent> _pullableQuery;
         private EntityQuery<MapGridComponent> _gridQuery;
 
+        // For debug purposes only
+        private EntityQuery<InputMoverComponent> _moverQuery;
+        private EntityQuery<BlockMovementComponent> _blockMoverQuery;
+
         private float _frictionModifier;
         private float _minDamping;
         private float _airDamping;
@@ -45,10 +51,11 @@ namespace Content.Shared.Friction
             Subs.CVar(_configManager, CCVars.AirFriction, value => _airDamping = value, true);
             Subs.CVar(_configManager, CCVars.OffgridFriction, value => _offGridDamping = value, true);
             _frictionQuery = GetEntityQuery<TileFrictionModifierComponent>();
-            _xformQuery = GetEntityQuery<TransformComponent>();
             _pullerQuery = GetEntityQuery<PullerComponent>();
             _pullableQuery = GetEntityQuery<PullableComponent>();
             _gridQuery = GetEntityQuery<MapGridComponent>();
+            _moverQuery = GetEntityQuery<InputMoverComponent>();
+            _blockMoverQuery = GetEntityQuery<BlockMovementComponent>();
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)
@@ -107,7 +114,16 @@ namespace Content.Shared.Friction
                 PhysicsSystem.SetAngularDamping(uid, body, friction);
 
                 if (body.BodyType != BodyType.KinematicController)
+                {
+                    /*
+                     * Extra catch for input movers that may be temporarily unable to move for whatever reason.
+                     * Block movement shouldn't be added and removed frivolously so it should be reliable to use this
+                     * as a check for brains and such which have input mover purely for ghosting behavior.
+                     */
+                    DebugTools.Assert(!_moverQuery.HasComp(uid) || _blockMoverQuery.HasComp(uid),
+                        $"Input mover: {ToPrettyString(uid)} in TileFrictionController is not the correct BodyType, BodyType found: {body.BodyType}, expected: KinematicController.");
                     continue;
+                }
 
                 // Physics engine doesn't apply damping to Kinematic Controllers so we have to do it here.
                 // BEWARE YE TRAVELLER:
diff --git a/Content.Shared/Interaction/Components/BlockMovementComponent.cs b/Content.Shared/Interaction/Components/BlockMovementComponent.cs
index 2125f16efe..a40e2b9e3c 100644
--- a/Content.Shared/Interaction/Components/BlockMovementComponent.cs
+++ b/Content.Shared/Interaction/Components/BlockMovementComponent.cs
@@ -8,6 +8,15 @@ namespace Content.Shared.Interaction.Components;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class BlockMovementComponent : Component
 {
+    /// <summary>
+    /// Blocks generic interactions such as container insertion, pick up, drop and such.
+    /// </summary>
     [DataField]
     public bool BlockInteraction = true;
+
+    /// <summary>
+    /// Blocks being able to use entities.
+    /// </summary>
+    [DataField]
+    public bool BlockUse = true;
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
index f6f4d8605d..5d566b850e 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
@@ -17,10 +17,10 @@ public partial class SharedInteractionSystem
     private void InitializeBlocking()
     {
         SubscribeLocalEvent<BlockMovementComponent, UpdateCanMoveEvent>(OnMoveAttempt);
-        SubscribeLocalEvent<BlockMovementComponent, UseAttemptEvent>(CancelEvent);
+        SubscribeLocalEvent<BlockMovementComponent, UseAttemptEvent>(CancelUseEvent);
         SubscribeLocalEvent<BlockMovementComponent, InteractionAttemptEvent>(CancelInteractEvent);
-        SubscribeLocalEvent<BlockMovementComponent, DropAttemptEvent>(CancelEvent);
-        SubscribeLocalEvent<BlockMovementComponent, PickupAttemptEvent>(CancelEvent);
+        SubscribeLocalEvent<BlockMovementComponent, DropAttemptEvent>(CancellableInteractEvent);
+        SubscribeLocalEvent<BlockMovementComponent, PickupAttemptEvent>(CancellableInteractEvent);
         SubscribeLocalEvent<BlockMovementComponent, ChangeDirectionAttemptEvent>(CancelEvent);
 
         SubscribeLocalEvent<BlockMovementComponent, ComponentStartup>(OnBlockingStartup);
@@ -33,6 +33,12 @@ public partial class SharedInteractionSystem
             args.Cancelled = true;
     }
 
+    private void CancelUseEvent(Entity<BlockMovementComponent> ent, ref UseAttemptEvent args)
+    {
+        if (ent.Comp.BlockUse)
+            args.Cancel();
+    }
+
     private void OnMoveAttempt(EntityUid uid, BlockMovementComponent component, UpdateCanMoveEvent args)
     {
         // If we're relaying then don't cancel.
@@ -42,6 +48,12 @@ public partial class SharedInteractionSystem
         args.Cancel(); // no more scurrying around
     }
 
+    private void CancellableInteractEvent(EntityUid uid, BlockMovementComponent component, CancellableEntityEventArgs args)
+    {
+        if (component.BlockInteraction)
+            args.Cancel();
+    }
+
     private void CancelEvent(EntityUid uid, BlockMovementComponent component, CancellableEntityEventArgs args)
     {
         args.Cancel();
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 5507152858..f2926562f3 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -22,6 +22,7 @@ using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Controllers;
+using Robust.Shared.Physics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -107,6 +108,8 @@ public abstract partial class SharedMoverController : VirtualController
 
         SubscribeLocalEvent<MovementSpeedModifierComponent, TileFrictionEvent>(OnTileFriction);
         SubscribeLocalEvent<InputMoverComponent, ComponentStartup>(OnMoverStartup);
+        SubscribeLocalEvent<InputMoverComponent, PhysicsBodyTypeChangedEvent>(OnPhysicsBodyChanged);
+        SubscribeLocalEvent<InputMoverComponent, UpdateCanMoveEvent>(OnCanMove);
 
         InitializeInput();
         InitializeRelay();
@@ -213,6 +216,21 @@ public abstract partial class SharedMoverController : VirtualController
             return;
         }
 
+        /*
+         * This assert is here because any entity using inputs to move should be a Kinematic Controller.
+         * Kinematic Controllers are not built to use the entirety of the Physics engine by intention and
+         * setting an input mover to Dynamic will cause the Physics engine to occasionally throw asserts.
+         * In addition, SharedMoverController applies its own forms of fake impulses and friction outside
+         * Physics simulation, which will cause issues for Dynamic bodies (Such as Friction being applied twice).
+         * Kinematic bodies have even less Physics options and as such aren't suitable for a player, especially
+         * when we move to Box2D v3 where there will be more support for players updating outside of simulation.
+         * Lastly, static bodies can't move so they shouldn't be updated. If a static body makes it here we're
+         * doing unnecessary calculations.
+         * Only a Kinematic Controller should be making it to this point.
+         */
+        DebugTools.Assert(physicsComponent.BodyType == BodyType.KinematicController,
+            $"Input mover: {ToPrettyString(uid)} in HandleMobMovement is not the correct BodyType, BodyType found: {physicsComponent.BodyType}, expected: KinematicController.");
+
         // If the body is in air but isn't weightless then it can't move
         var weightless = _gravity.IsWeightless(uid);
         var inAirHelpless = false;
@@ -355,8 +373,7 @@ public abstract partial class SharedMoverController : VirtualController
             if (!weightless && MobMoverQuery.TryGetComponent(uid, out var mobMover) &&
                 TryGetSound(weightless, uid, mover, mobMover, xform, out var sound, tileDef: tileDef))
             {
-                var soundModifier = mover.Sprinting ? InputMoverComponent.SprintingSoundModifier
-                    : InputMoverComponent.WalkingSoundModifier;
+                var soundModifier = mover.Sprinting ? InputMoverComponent.SprintingSoundModifier : InputMoverComponent.WalkingSoundModifier;
 
                 var audioParams = sound.Params
                     .WithVolume(sound.Params.Volume + soundModifier)
@@ -661,4 +678,16 @@ public abstract partial class SharedMoverController : VirtualController
         else
             args.Modifier *= ent.Comp.BaseFriction;
     }
+
+    private void OnPhysicsBodyChanged(Entity<InputMoverComponent> entity, ref PhysicsBodyTypeChangedEvent args)
+    {
+        _blocker.UpdateCanMove(entity);
+    }
+
+    private void OnCanMove(Entity<InputMoverComponent> entity, ref UpdateCanMoveEvent args)
+    {
+        // If we don't have a physics component, or have a static body type then we can't move.
+        if (!PhysicsQuery.TryComp(entity, out var body) || body.BodyType == BodyType.Static)
+            args.Cancel();
+    }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 6416dac41c..97d9bee2e9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -44,7 +44,6 @@
   - type: CombatMode
   - type: Physics
     ignorePaused: true
-    bodyType: Kinematic
   - type: Access
     groups:
     - AllAccess
diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
index 9e681dca87..f5897fd2c9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -5,9 +5,9 @@
   description: A sentient machine that can produce Xenoborgs. Without this the Xenoborgs are doomed.
   components:
   - type: InputMover # needs this to pilot the mothership
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 0 # shouldn't move
-    baseSprintSpeed : 0 # shouldn't move
+  - type: BlockMovement # They should never be moving!
+    blockInteraction: false
+    blockUse: false
   - type: Appearance
   - type: WiresVisuals
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
index acf48e067d..b54b414656 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
@@ -86,7 +86,6 @@
     - Syndicate
     globalReceive: true
   - type: Physics
-    bodyType: Dynamic
     bodyStatus: InAir
   - type: CanMoveInAir
   # singulose components
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
index 0d37dea38d..e37b774e72 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
@@ -82,7 +82,6 @@
     - Syndicate
     globalReceive: true
   - type: Physics
-    bodyType: Dynamic
     bodyStatus: InAir
   - type: CanMoveInAir
   - type: EventHorizon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
index 68ba55ec7e..151f88f985 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
@@ -83,6 +83,8 @@
     damage:
       types:
         Blunt: 190
+  - type: Physics
+    bodyType: KinematicController
   - type: InputMover
   - type: MovementSpeedModifier
     baseWeightlessAcceleration: 5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
index 4f3b387ae4..cf8a7d76f8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
@@ -20,7 +20,7 @@
       map: [ "enum.ArtifactsVisualLayers.ActivationEffect" ]
       visible: false
   - type: Physics
-    bodyType: Dynamic
+    bodyType: KinematicController
   - type: CollisionWake
     enabled: false
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
index 6f53905a69..699c436801 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
@@ -19,6 +19,8 @@
     - state: artifact-activation
       map: [ "enum.ArtifactsVisualLayers.ActivationEffect" ]
       visible: false
+  - type: Physics
+    bodyType: KinematicController
   - type: RandomArtifactSprite
     maxSprite: 36
   - type: RandomSprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
index 0dd47560bf..23277c3ce9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
@@ -29,7 +29,7 @@
   - type: Damageable
   - type: Actions
   - type: Physics
-    bodyType: Dynamic
+    bodyType: KinematicController
   - type: MovementSpeedModifier
     baseWalkSpeed: 0.25
     baseSprintSpeed: 0.5

From 6c555f10fc724dea905b0425ad2984df29257db2 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 9 Feb 2026 18:42:05 +0100
Subject: [PATCH 152/360] Downstream fixes for #37970 (Physics assert)

---
 Resources/Prototypes/_DV/CosmicCult/Mobs/cosmicgod.yml       | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/Player/honkmother.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_DV/CosmicCult/Mobs/cosmicgod.yml b/Resources/Prototypes/_DV/CosmicCult/Mobs/cosmicgod.yml
index 0de6e87215..05acae7d58 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Mobs/cosmicgod.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Mobs/cosmicgod.yml
@@ -87,7 +87,7 @@
   - type: MovementIgnoreGravity
   - type: GhostHearing
   - type: Physics
-    bodyType: Dynamic
+    bodyType: KinematicController
     bodyStatus: InAir
   - type: CanMoveInAir
   - type: WarpPoint
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/honkmother.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/honkmother.yml
index e460d01008..6ade9311d7 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/honkmother.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/honkmother.yml
@@ -88,7 +88,7 @@
     - Syndicate
     globalReceive: true
   - type: Physics
-    bodyType: Dynamic
+    bodyType: KinematicController
     bodyStatus: InAir
   - type: CanMoveInAir
   #Delta-V - Discount singularity because Honki needs to annihilate the sinners.

From 56ef6a86e680a07087ac24f0e0718cd49855ea21 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Mon, 22 Dec 2025 08:43:02 -0800
Subject: [PATCH 153/360] Basic Dynamic Power Consumption Systems (#41885)

* init commit

* Addr reviews
---
 .../Tests/Power/PowerStateTest.cs             | 186 ++++++++++++++++++
 .../Power/Components/PowerStateComponent.cs   |  32 +++
 .../Power/Components/UIPowerStateComponent.cs |  16 ++
 .../Power/EntitySystems/PowerStateSystem.cs   |  44 +++++
 .../Power/EntitySystems/UIPowerStateSystem.cs |  46 +++++
 5 files changed, 324 insertions(+)
 create mode 100644 Content.IntegrationTests/Tests/Power/PowerStateTest.cs
 create mode 100644 Content.Shared/Power/Components/PowerStateComponent.cs
 create mode 100644 Content.Shared/Power/Components/UIPowerStateComponent.cs
 create mode 100644 Content.Shared/Power/EntitySystems/PowerStateSystem.cs
 create mode 100644 Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs

diff --git a/Content.IntegrationTests/Tests/Power/PowerStateTest.cs b/Content.IntegrationTests/Tests/Power/PowerStateTest.cs
new file mode 100644
index 0000000000..dec398212d
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Power/PowerStateTest.cs
@@ -0,0 +1,186 @@
+using Content.Shared.Coordinates;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+
+namespace Content.IntegrationTests.Tests.Power;
+
+[TestFixture]
+public sealed class PowerStateTest
+{
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: PowerStateApcReceiverDummy
+  components:
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: Transform
+    anchored: true
+  - type: PowerState
+    isWorking: false
+    idlePowerDraw: 10
+    workingPowerDraw: 50
+";
+
+    /// <summary>
+    /// Asserts that switching from idle to working updates the power receiver load to the working draw.
+    /// </summary>
+    [Test]
+    public async Task SetWorkingState_IdleToWorking_UpdatesLoad()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapSys = entManager.System<SharedMapSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            mapSys.CreateMap(out var mapId);
+            var grid = mapManager.CreateGridEntity(mapId);
+
+            mapSys.SetTile(grid, Vector2i.Zero, new Tile(1));
+
+            var ent = entManager.SpawnEntity("PowerStateApcReceiverDummy", grid.Owner.ToCoordinates());
+
+            var receiver = entManager.GetComponent<Server.Power.Components.ApcPowerReceiverComponent>(ent);
+            var powerState = entManager.GetComponent<PowerStateComponent>(ent);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            var system = entManager.System<PowerStateSystem>();
+            system.SetWorkingState((ent, powerState), true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Asserts that switching from working to idle updates the power receiver load to the idle draw.
+    /// </summary>
+    [Test]
+    public async Task SetWorkingState_WorkingToIdle_UpdatesLoad()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapSys = entManager.System<SharedMapSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            mapSys.CreateMap(out var mapId);
+            var grid = mapManager.CreateGridEntity(mapId);
+
+            mapSys.SetTile(grid, Vector2i.Zero, new Tile(1));
+
+            var ent = entManager.SpawnEntity("PowerStateApcReceiverDummy", grid.Owner.ToCoordinates());
+
+            var receiver = entManager.GetComponent<Server.Power.Components.ApcPowerReceiverComponent>(ent);
+            var powerState = entManager.GetComponent<PowerStateComponent>(ent);
+            var system = entManager.System<PowerStateSystem>();
+            Entity<PowerStateComponent> newEnt = (ent, powerState);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(newEnt, true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(newEnt, false);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Asserts that setting the working state to the current state does not change the power receiver load.
+    /// </summary>
+    [Test]
+    public async Task SetWorkingState_AlreadyInState_NoChange()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapSys = entManager.System<SharedMapSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            mapSys.CreateMap(out var mapId);
+            var grid = mapManager.CreateGridEntity(mapId);
+
+            mapSys.SetTile(grid, Vector2i.Zero, new Tile(1));
+
+            var ent = entManager.SpawnEntity("PowerStateApcReceiverDummy", grid.Owner.ToCoordinates());
+
+            var receiver = entManager.GetComponent<Server.Power.Components.ApcPowerReceiverComponent>(ent);
+            var powerState = entManager.GetComponent<PowerStateComponent>(ent);
+            var system = entManager.System<PowerStateSystem>();
+            Entity<PowerStateComponent> valueTuple = (ent, powerState);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(valueTuple, false);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(valueTuple, true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(valueTuple, true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
+
diff --git a/Content.Shared/Power/Components/PowerStateComponent.cs b/Content.Shared/Power/Components/PowerStateComponent.cs
new file mode 100644
index 0000000000..d1fc0d2aeb
--- /dev/null
+++ b/Content.Shared/Power/Components/PowerStateComponent.cs
@@ -0,0 +1,32 @@
+namespace Content.Shared.Power.Components;
+
+/// <summary>
+/// Generic component for giving entities "idle" and "working" power states.
+/// </summary>
+/// <remarks><para>Entities that have more complex power draw
+/// (ex. a thermomachine whose heating power is directly tied to its power consumption)
+/// should just directly set their load on the <see cref="SharedApcPowerReceiverComponent"/>.</para>
+///
+/// <para>This is also applicable if you would like to add
+/// more complex power behavior that is tied to a generic component.</para></remarks>
+[RegisterComponent]
+public sealed partial class PowerStateComponent : Component
+{
+    /// <summary>
+    /// Whether the entity is currently in the working state.
+    /// </summary>
+    [DataField]
+    public bool IsWorking;
+
+    /// <summary>
+    /// The idle power draw of this entity when not working, in watts.
+    /// </summary>
+    [DataField]
+    public float IdlePowerDraw = 20f;
+
+    /// <summary>
+    /// The working power draw of this entity when working, in watts.
+    /// </summary>
+    [DataField]
+    public float WorkingPowerDraw = 350f;
+}
diff --git a/Content.Shared/Power/Components/UIPowerStateComponent.cs b/Content.Shared/Power/Components/UIPowerStateComponent.cs
new file mode 100644
index 0000000000..9210f63c55
--- /dev/null
+++ b/Content.Shared/Power/Components/UIPowerStateComponent.cs
@@ -0,0 +1,16 @@
+namespace Content.Shared.Power.Components;
+
+/// <summary>
+/// Component for entities that want to increase their power usage to a working state when
+/// a UI on the machine is open. Requires <see cref="PowerStateComponent"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UIPowerStateComponent : Component
+{
+    /// <summary>
+    /// List of UI keys that will trigger the working state.
+    /// If null, any UI open will trigger the working state.
+    /// </summary>
+    [DataField]
+    public List<Enum>? Keys;
+}
diff --git a/Content.Shared/Power/EntitySystems/PowerStateSystem.cs b/Content.Shared/Power/EntitySystems/PowerStateSystem.cs
new file mode 100644
index 0000000000..dd47708d2d
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/PowerStateSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Power.Components;
+using JetBrains.Annotations;
+
+namespace Content.Shared.Power.EntitySystems;
+
+/// <summary>
+/// Generic system that handles entities with <see cref="PowerStateComponent"/>.
+/// Used for simple machines that only need to switch between "idle" and "working" power states.
+/// </summary>
+public sealed class PowerStateSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiverSystem = default!;
+
+    private EntityQuery<PowerStateComponent> _powerStateQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PowerStateComponent, ComponentStartup>(OnComponentStartup);
+
+        _powerStateQuery = GetEntityQuery<PowerStateComponent>();
+    }
+
+    private void OnComponentStartup(Entity<PowerStateComponent> ent, ref ComponentStartup args)
+    {
+        SetWorkingState(ent.Owner, ent.Comp.IsWorking);
+    }
+
+    /// <summary>
+    /// Sets the working state of the entity, adjusting its power draw accordingly.
+    /// </summary>
+    /// <param name="ent">The entity to set the working state for.</param>
+    /// <param name="working">Whether the entity should be in the working state.</param>
+    [PublicAPI]
+    public void SetWorkingState(Entity<PowerStateComponent?> ent, bool working)
+    {
+        if (!_powerStateQuery.Resolve(ent, ref ent.Comp))
+            return;
+
+        _powerReceiverSystem.SetLoad(ent.Owner, working ? ent.Comp.WorkingPowerDraw : ent.Comp.IdlePowerDraw);
+        ent.Comp.IsWorking = working;
+    }
+}
diff --git a/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs b/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs
new file mode 100644
index 0000000000..bf2d08adbf
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs
@@ -0,0 +1,46 @@
+using Content.Shared.Power.Components;
+
+namespace Content.Shared.Power.EntitySystems;
+
+/// <summary>
+/// System for entities with <see cref="UIPowerStateComponent"/>.
+/// Entities with this component will increase their power usage to a working state
+/// when a UI on the entity is open.
+/// </summary>
+public sealed class UIPowerStateSystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly PowerStateSystem _powerState = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<UIPowerStateComponent, BoundUIOpenedEvent>(OnUiOpened);
+        SubscribeLocalEvent<UIPowerStateComponent, BoundUIClosedEvent>(OnUiClosed);
+    }
+
+    private void OnUiClosed(Entity<UIPowerStateComponent> ent, ref BoundUIClosedEvent args)
+    {
+        if (ent.Comp.Keys is null)
+        {
+            if (_ui.IsAnyUiOpen(ent.Owner))
+                return;
+        }
+        else
+        {
+            if (_ui.IsUiOpen(ent.Owner, ent.Comp.Keys))
+                return;
+        }
+
+        _powerState.SetWorkingState(ent.Owner, false);
+    }
+
+    private void OnUiOpened(Entity<UIPowerStateComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        if (ent.Comp.Keys is not null && !ent.Comp.Keys.Contains(args.UiKey))
+            return;
+
+        _powerState.SetWorkingState(ent.Owner, true);
+    }
+}

From 8a39cff174ee7eb6fe47f37cdaaf1c0fa7648890 Mon Sep 17 00:00:00 2001
From: JohnJohn <189290423+JohnJJohn@users.noreply.github.com>
Date: Mon, 22 Dec 2025 16:57:51 +0000
Subject: [PATCH 154/360] Allow cable coils to be destroyed (#41279)

Add damageable and destructible types to cable coils
---
 .../Prototypes/Entities/Objects/Tools/cable_coils.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index ddc240a14c..818874e35c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -58,6 +58,17 @@
   #    path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
   #  endSound:
   #    path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
 
 - type: entity
   id: CableHVStack

From 72ed42722456633706cc9f796959529f35789deb Mon Sep 17 00:00:00 2001
From: Crude Oil <124208219+CroilBird@users.noreply.github.com>
Date: Mon, 22 Dec 2025 22:01:56 +0100
Subject: [PATCH 155/360] Port FTL arrival effect fix from
 https://github.com/new-frontiers-14/frontier-station-14/pull/3495 (#41951)

Port FTL arrival fix from https://github.com/new-frontiers-14/frontier-station-14/pull/3495
---
 Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs | 3 ++-
 Resources/Prototypes/Entities/Effects/shuttle.yml        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
index 5e3029333e..57ebf13e73 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -203,7 +203,8 @@ public sealed partial class DockingSystem
                     var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, _transform.ToMapCoordinates(gridPosition).Position);
 
                     // TODO: use tight bounds
-                    var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position);
+                    var targetWorldAngle = (targetGridAngle + targetAngle).Reduced();
+                    var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetWorldAngle, spawnPosition.Position);
 
                     // Check if there's no intersecting grids (AKA oh god it's docking at cargo).
                     grids.Clear();
diff --git a/Resources/Prototypes/Entities/Effects/shuttle.yml b/Resources/Prototypes/Entities/Effects/shuttle.yml
index 4dae76a48a..9b1fc1e4c3 100644
--- a/Resources/Prototypes/Entities/Effects/shuttle.yml
+++ b/Resources/Prototypes/Entities/Effects/shuttle.yml
@@ -4,7 +4,7 @@
   description: Visualizer for shuttles arriving. You shouldn't see this!
   components:
   - type: Transform
-    noRot: true
+    noRot: false
     gridTraversal: false
   - type: FtlVisualizer
     sprite:

From b25020bcf174fd8a369d963011ea9f31c172d3aa Mon Sep 17 00:00:00 2001
From: imatsoup <93290208+imatsoup@users.noreply.github.com>
Date: Tue, 23 Dec 2025 04:30:22 +0000
Subject: [PATCH 156/360] Update debug backpacks to use the proper suffix
 (#41959)

Update backpacks.yml
---
 Resources/Prototypes/Entities/Clothing/Back/backpacks.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index cb487735a2..89cffbafb4 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -372,7 +372,7 @@
   id: ClothingBackpackDebug
   name: wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:
@@ -388,7 +388,7 @@
   id: ClothingBackpackDebug2
   name: big wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:
@@ -399,7 +399,7 @@
   id: ClothingBackpackDebug3
   name: gay wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:
@@ -420,7 +420,7 @@
   id: ClothingBackpackDebug4
   name: offset wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:

From 777cb4544b652b85c7014ed262993ab38b4b5621 Mon Sep 17 00:00:00 2001
From: Kowlin <10947836+Kowlin@users.noreply.github.com>
Date: Tue, 23 Dec 2025 06:59:36 +0100
Subject: [PATCH 157/360] Fix Setgamepreset (#41963)

---
 Content.Server/GameTicking/Commands/SetGamePresetCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index 894460fe3f..5c02dea513 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -17,7 +17,7 @@ namespace Content.Server.GameTicking.Commands
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (args.Length is <= 1 or >= 3)
+            if (args.Length is < 1 or > 3)
             {
                 shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 3), ("currentAmount", args.Length)));
                 return;

From 114a3ba7c4d188e35c4b012a12a7875a12d280bb Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 23 Dec 2025 00:12:52 -0800
Subject: [PATCH 158/360] Fix atmos devices not correctly reffing the changed
 atmos (#41585)

---
 .../Tests/Atmos/AtmosMonitoringTest.cs        | 130 +++++++++++++++++
 .../AtmosphereSystem.Commands.cs              | 138 ++++++++++--------
 .../AtmosphereSystem.Processing.cs            |   5 +
 .../EntitySystems/AtmosphereSystem.Utils.cs   |  21 ++-
 .../Atmos/EntitySystems/AtmosphereSystem.cs   |   2 +-
 .../Monitor/Systems/AtmosMonitoringSystem.cs  |   7 +
 .../Components/AtmosDeviceTileChangedEvent.cs |   9 ++
 7 files changed, 246 insertions(+), 66 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs
 create mode 100644 Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs

diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs
new file mode 100644
index 0000000000..83d7b9be53
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs
@@ -0,0 +1,130 @@
+using System.Numerics;
+using Content.Server.Atmos.Monitor.Components;
+using Content.Shared.Atmos;
+using Robust.Shared.Console;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+/// <summary>
+/// Test for determining that an AtmosMonitoringComponent/System correctly references
+/// the GasMixture of the tile it is on if the tile's GasMixture ever changes.
+/// </summary>
+[TestOf(typeof(Atmospherics))]
+public sealed class AtmosMonitoringTest : AtmosTest
+{
+    // We can just reuse the dP test, I just want a grid.
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
+
+    private readonly EntProtoId _airSensorProto = new("AirSensor");
+    private readonly EntProtoId _wallProto = new("WallSolid");
+
+    /// <summary>
+    /// Tests if the monitor properly nulls out its reference to the tile mixture
+    /// when a wall is placed on top of it, and restores the reference when the wall is removed.
+    /// </summary>
+    [Test]
+    public async Task NullOutTileAtmosphereGasMixture()
+    {
+        // run an atmos update to initialize everything For Real surely
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        var gridNetEnt = SEntMan.GetNetEntity(RelevantAtmos.Owner);
+        TargetCoords = new NetCoordinates(gridNetEnt, Vector2.Zero);
+        var netEnt = await Spawn(_airSensorProto);
+        var airSensorUid = SEntMan.GetEntity(netEnt);
+        Transform.TryGetGridTilePosition(airSensorUid, out var vec);
+
+        // run another one to ensure that the ref to the GasMixture was picked up
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // should be in the middle
+        Assert.That(vec,
+            Is.EqualTo(Vector2i.Zero),
+            "Air sensor not in expected position on grid (0, 0)");
+
+        var atmosMonitor = SEntMan.GetComponent<AtmosMonitorComponent>(airSensorUid);
+        var tileMixture = SAtmos.GetTileMixture(airSensorUid);
+
+        Assert.That(tileMixture,
+            Is.SameAs(atmosMonitor.TileGas),
+            "Atmos monitor's TileGas does not match actual tile mixture after spawn.");
+
+        // ok now spawn a wall or something on top of it
+        var wall = await Spawn(_wallProto);
+        var wallUid = SEntMan.GetEntity(wall);
+
+        // ensure that atmospherics registers the change - the gas mixture should no longer exist
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // the monitor's ref to the gas should be null now
+        Assert.That(atmosMonitor.TileGas,
+            Is.Null,
+            "Atmos monitor's TileGas is not null after wall placed on top. Possible dead reference.");
+        // the actual mixture on the tile should be null now too
+        var nullTileMixture = SAtmos.GetTileMixture(airSensorUid);
+        Assert.That(nullTileMixture, Is.Null, "Tile mixture is not null after wall placed on top.");
+
+        // ok now delete the wall
+        await Delete(wallUid);
+
+        // ensure that atmospherics registers the change - the gas mixture should be back
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // gas mixture should now exist again
+        var newTileMixture = SAtmos.GetTileMixture(airSensorUid);
+        Assert.That(newTileMixture, Is.Not.Null, "Tile mixture is null after wall removed.");
+        // monitor's ref to the gas should be back too
+        Assert.That(atmosMonitor.TileGas,
+            Is.SameAs(newTileMixture),
+            "Atmos monitor's TileGas does not match actual tile mixture after wall removed.");
+    }
+
+    /// <summary>
+    /// Tests if the monitor properly updates its reference to the tile mixture
+    /// when the FixGridAtmos command is called.
+    /// </summary>
+    [Test]
+    public async Task FixGridAtmosReplaceMixtureOnTileChange()
+    {
+        // run an atmos update to initialize everything For Real surely
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        var gridNetEnt = SEntMan.GetNetEntity(RelevantAtmos.Owner);
+        TargetCoords = new NetCoordinates(gridNetEnt, Vector2.Zero);
+        var netEnt = await Spawn(_airSensorProto);
+        var airSensorUid = SEntMan.GetEntity(netEnt);
+        Transform.TryGetGridTilePosition(airSensorUid, out var vec);
+
+        // run another one to ensure that the ref to the GasMixture was picked up
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // should be in the middle
+        Assert.That(vec,
+            Is.EqualTo(Vector2i.Zero),
+            "Air sensor not in expected position on grid (0, 0)");
+
+        var atmosMonitor = SEntMan.GetComponent<AtmosMonitorComponent>(airSensorUid);
+        var tileMixture = SAtmos.GetTileMixture(airSensorUid);
+
+        Assert.That(tileMixture,
+            Is.SameAs(atmosMonitor.TileGas),
+            "Atmos monitor's TileGas does not match actual tile mixture after spawn.");
+
+        SAtmos.RebuildGridAtmosphere((ProcessEnt.Owner, ProcessEnt.Comp1, ProcessEnt.Comp3));
+
+        // EXTREMELY IMPORTANT: The reference to the tile mixture on the tile should be completely different.
+        var newTileMixture = SAtmos.GetTileMixture(airSensorUid);
+        Assert.That(newTileMixture,
+            Is.Not.SameAs(tileMixture),
+            "Tile mixture is the same instance after fixgridatmos was ran. It should be a new instance.");
+
+        // The monitor's ref to the tile mixture should have updated too.
+        Assert.That(atmosMonitor.TileGas,
+            Is.SameAs(newTileMixture),
+            "Atmos monitor's TileGas does not match actual tile mixture after fixgridatmos was ran.");
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index 246c3a571f..11ebfe2066 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -19,7 +19,9 @@ public sealed partial class AtmosphereSystem
         // Fix Grid Atmos command.
         _consoleHost.RegisterCommand("fixgridatmos",
             "Makes every tile on a grid have a roundstart gas mix.",
-            "fixgridatmos <grid Ids>", FixGridAtmosCommand, FixGridAtmosCommandCompletions);
+            "fixgridatmos <grid Ids>",
+            FixGridAtmosCommand,
+            FixGridAtmosCommandCompletions);
     }
 
     private void ShutdownCommands()
@@ -36,42 +38,6 @@ public sealed partial class AtmosphereSystem
            return;
        }
 
-       var mixtures = new GasMixture[9];
-       for (var i = 0; i < mixtures.Length; i++)
-           mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
-
-       // 0: Air
-       mixtures[0].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
-       mixtures[0].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
-
-       // 1: Vaccum
-
-       // 2: Oxygen (GM)
-       mixtures[2].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
-
-       // 3: Nitrogen (GM)
-       mixtures[3].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
-
-       // 4: Plasma (GM)
-       mixtures[4].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
-
-       // 5: Instant Plasmafire (r)
-       mixtures[5].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
-       mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
-       mixtures[5].Temperature = 5000f;
-
-       // 6: (Walk-In) Freezer
-       mixtures[6].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesFreezer);
-       mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesFreezer);
-       mixtures[6].Temperature = Atmospherics.FreezerTemp; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
-
-       // 7: Nitrogen (101kpa) for vox rooms
-       mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
-
-       // 8: Air (GM)
-       mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesGasMiner);
-       mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesGasMiner);
-
        foreach (var arg in args)
        {
            if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid))
@@ -92,34 +58,82 @@ public sealed partial class AtmosphereSystem
                continue;
            }
 
-           // Force Invalidate & update air on all tiles
-           Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> grid =
-               new(euid.Value, gridAtmosphere, Comp<GasTileOverlayComponent>(euid.Value), gridComp, Transform(euid.Value));
-
-           RebuildGridTiles(grid);
-
-           var query = GetEntityQuery<AtmosFixMarkerComponent>();
-           foreach (var (indices, tile) in gridAtmosphere.Tiles.ToArray())
-           {
-               if (tile.Air is not {Immutable: false} air)
-                   continue;
-
-               air.Clear();
-               var mixtureId = 0;
-               var enumerator = _mapSystem.GetAnchoredEntitiesEnumerator(grid, grid, indices);
-               while (enumerator.MoveNext(out var entUid))
-               {
-                   if (query.TryComp(entUid, out var marker))
-                       mixtureId = marker.Mode;
-               }
-
-               var mixture = mixtures[mixtureId];
-               Merge(air, mixture);
-               air.Temperature = mixture.Temperature;
-           }
+           RebuildGridAtmosphere((euid.Value, gridAtmosphere, gridComp));
        }
     }
 
+    /// <summary>
+    /// Rebuilds all <see cref="TileAtmosphere"/>s on a grid to have roundstart gas mixes.
+    /// </summary>
+    /// <remarks>Please be responsible with this method. Used only by tests and fixgridatmos.</remarks>
+    public void RebuildGridAtmosphere(Entity<GridAtmosphereComponent, MapGridComponent> ent)
+    {
+        var mixtures = new GasMixture[9];
+        for (var i = 0; i < mixtures.Length; i++)
+        {
+            mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
+        }
+
+        // 0: Air
+        mixtures[0].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
+        mixtures[0].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
+
+        // 1: Vaccum
+
+        // 2: Oxygen (GM)
+        mixtures[2].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
+
+        // 3: Nitrogen (GM)
+        mixtures[3].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
+
+        // 4: Plasma (GM)
+        mixtures[4].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
+
+        // 5: Instant Plasmafire (r)
+        mixtures[5].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
+        mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
+        mixtures[5].Temperature = 5000f;
+
+        // 6: (Walk-In) Freezer
+        mixtures[6].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesFreezer);
+        mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesFreezer);
+        mixtures[6].Temperature = Atmospherics.FreezerTemp; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
+
+        // 7: Nitrogen (101kpa) for vox rooms
+        mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
+
+        // 8: Air (GM)
+        mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesGasMiner);
+        mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesGasMiner);
+
+
+        // Force Invalidate & update air on all tiles
+        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> grid =
+            new(ent.Owner, ent.Comp1, Comp<GasTileOverlayComponent>(ent), ent.Comp2, Transform(ent));
+
+        RebuildGridTiles(grid);
+
+        var query = GetEntityQuery<AtmosFixMarkerComponent>();
+        foreach (var (indices, tile) in ent.Comp1.Tiles.ToArray())
+        {
+            if (tile.Air is not {Immutable: false} air)
+                continue;
+
+            air.Clear();
+            var mixtureId = 0;
+            var enumerator = _mapSystem.GetAnchoredEntitiesEnumerator(grid, grid, indices);
+            while (enumerator.MoveNext(out var entUid))
+            {
+                if (query.TryComp(entUid, out var marker))
+                    mixtureId = marker.Mode;
+            }
+
+            var mixture = mixtures[mixtureId];
+            Merge(air, mixture);
+            air.Temperature = mixture.Temperature;
+        }
+    }
+
     /// <summary>
     /// Clears & re-creates all references to <see cref="TileAtmosphere"/>s stored on a grid.
     /// </summary>
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index c0f081f9ba..d562fe5111 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -265,6 +265,7 @@ namespace Content.Server.Atmos.EntitySystems
                 tile.ArchivedCycle = 0;
                 tile.LastShare = 0f;
                 tile.Hotspot = new Hotspot();
+                NotifyDeviceTileChanged((ent.Owner, ent.Comp1, ent.Comp3), tile.GridIndices);
                 return;
             }
 
@@ -275,6 +276,10 @@ namespace Content.Server.Atmos.EntitySystems
 
             if (data.FixVacuum)
                 GridFixTileVacuum(tile);
+
+            // Since we assigned the tile a new GasMixture we need to tell any devices
+            // on this tile that the reference has changed.
+            NotifyDeviceTileChanged((ent.Owner, ent.Comp1, ent.Comp3), tile.GridIndices);
         }
 
         private void QueueRunTiles(
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
index a402cf20f3..9b53d0d16c 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
@@ -1,10 +1,8 @@
 using System.Runtime.CompilerServices;
 using Content.Server.Atmos.Components;
-using Content.Server.Maps;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
-using Content.Shared.Maps;
-using Robust.Shared.Map;
+using Content.Shared.Atmos.Piping.Components;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.EntitySystems;
@@ -176,4 +174,21 @@ public partial class AtmosphereSystem
 
         _tile.PryTile(tileRef);
     }
+
+    /// <summary>
+    /// Notifies all subscribing entities on a particular tile that the tile has changed.
+    /// Atmos devices may store references to tiles, so this is used to properly resync devices
+    /// after a significant atmos change on that tile, for example a tile getting a new <see cref="GasMixture"/>.
+    /// </summary>
+    /// <param name="ent">The grid atmosphere entity.</param>
+    /// <param name="tile">The tile to check for devices on.</param>
+    private void NotifyDeviceTileChanged(Entity<GridAtmosphereComponent, MapGridComponent> ent, Vector2i tile)
+    {
+        var inTile = _mapSystem.GetAnchoredEntities(ent.Owner, ent.Comp2, tile);
+        var ev = new AtmosDeviceTileChangedEvent();
+        foreach (var uid in inTile)
+        {
+            RaiseLocalEvent(uid, ref ev);
+        }
+    }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index 8120caca4e..df380912b6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -64,8 +64,8 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
         InitializeGridAtmosphere();
         InitializeMap();
 
-        _mapAtmosQuery = GetEntityQuery<MapAtmosphereComponent>();
         _atmosQuery = GetEntityQuery<GridAtmosphereComponent>();
+        _mapAtmosQuery = GetEntityQuery<MapAtmosphereComponent>();
         _airtightQuery = GetEntityQuery<AirtightComponent>();
         _firelockQuery = GetEntityQuery<FirelockComponent>();
 
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 452b300331..7333b7b814 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -57,6 +57,13 @@ public sealed class AtmosMonitorSystem : EntitySystem
         SubscribeLocalEvent<AtmosMonitorComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceDisabledEvent>(OnAtmosDeviceLeaveAtmosphere);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceEnabledEvent>(OnAtmosDeviceEnterAtmosphere);
+        SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceTileChangedEvent>(OnAtmosDeviceTileChangedEvent);
+    }
+
+    private void OnAtmosDeviceTileChangedEvent(Entity<AtmosMonitorComponent> ent, ref AtmosDeviceTileChangedEvent args)
+    {
+        if (!ent.Comp.MonitorsPipeNet)
+            ent.Comp.TileGas = _atmosphereSystem.GetContainingMixture(ent.Owner, true);
     }
 
     private void OnAtmosDeviceLeaveAtmosphere(EntityUid uid, AtmosMonitorComponent atmosMonitor, ref AtmosDeviceDisabledEvent args)
diff --git a/Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs b/Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs
new file mode 100644
index 0000000000..daedcfdaa5
--- /dev/null
+++ b/Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Atmos.Piping.Components;
+
+/// <summary>
+/// Raised directed on entities when the tile that they reside in has had their
+/// associated TileAtmosphere changed significantly, i.e. a tile/<see cref="GasMixture"/> being added, removed,
+/// or replaced. Important when atmos devices need to update any stored references to their tile's atmosphere.
+/// </summary>
+[ByRefEvent]
+public readonly record struct AtmosDeviceTileChangedEvent;

From 626cf7ec294c28359c63e3b35c96e536a6172f55 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 23 Dec 2025 01:10:36 -0800
Subject: [PATCH 159/360] Fix DeltaPressureTest race condition when using LINDA
 (#41388)

---
 .../Tests/Atmos/DeltaPressureTest.cs          | 245 ++++++------------
 1 file changed, 81 insertions(+), 164 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
index c3b3877c98..d4283568e8 100644
--- a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
@@ -1,15 +1,11 @@
-using System.Linq;
 using System.Numerics;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
 namespace Content.IntegrationTests.Tests.Atmos;
@@ -20,7 +16,7 @@ namespace Content.IntegrationTests.Tests.Atmos;
 /// </summary>
 [TestFixture]
 [TestOf(typeof(DeltaPressureSystem))]
-public sealed class DeltaPressureTest
+public sealed class DeltaPressureTest : AtmosTest
 {
     #region Prototypes
 
@@ -92,7 +88,7 @@ public sealed class DeltaPressureTest
 
     #endregion
 
-    private readonly ResPath _testMap = new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
 
     // TODO ATMOS TESTS
     // - Check for directional windows (partial airtight ents) properly computing pressure differences
@@ -111,40 +107,15 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingListAutoJoinTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
-        Entity<DeltaPressureComponent> dpEnt;
-
-        // Load our test map in and assert that it exists.
-        await server.WaitPost(() =>
+        await Server.WaitAssertion(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
+            var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(ProcessEnt, Vector2.Zero));
+            var dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
 
-            grid = gridSet.First();
+            Assert.That(SAtmos.IsDeltaPressureEntityInList(RelevantAtmos, dpEnt), "Entity was not in processing list when it should have automatically joined!");
+            SEntMan.DeleteEntity(uid);
+            Assert.That(!SAtmos.IsDeltaPressureEntityInList(RelevantAtmos, dpEnt), "Entity was still in processing list after deletion!");
         });
-
-        await server.WaitAssertion(() =>
-        {
-            var uid = entMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(grid.Owner, Vector2.Zero));
-            dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-
-            Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have automatically joined!");
-            entMan.DeleteEntity(uid);
-            Assert.That(!atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was still in processing list after deletion!");
-        });
-
-        await pair.CleanReturnAsync();
     }
 
     /// <summary>
@@ -154,45 +125,27 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingDeltaStandbyTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
         TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
         // Load our test map in and assert that it exists.
-        await server.WaitPost(() =>
+        await Server.WaitPost(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-
-            grid = gridSet.First();
-            var uid = entMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(grid.Owner, Vector2.Zero));
-            dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-            Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+            var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(ProcessEnt, Vector2.Zero));
+            dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+            Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt, dpEnt), "Entity was not in processing list when it should have been added!");
         });
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            await Server.WaitPost(() =>
             {
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
-                tile = gridAtmosComp.Tiles[offsetIndices];
+                tile = RelevantAtmos.Comp.Tiles[offsetIndices];
 
                 Assert.That(tile.Air, Is.Not.Null, $"Tile at {offsetIndices} should have air!");
 
@@ -202,19 +155,17 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
 
             // Entity should exist, if it took one tick of damage then it should be instantly destroyed.
-            await server.WaitAssertion(() =>
+            await Server.WaitAssertion(() =>
             {
-                Assert.That(!entMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold pressure from {direction} side!");
+                Assert.That(!SEntMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold pressure from {direction} side!");
                 tile.Air!.Clear();
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
         }
-
-        await pair.CleanReturnAsync();
     }
 
     /// <summary>
@@ -224,47 +175,43 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingDeltaDamageTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
-        TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
         // Load our test map in and assert that it exists.
-        await server.WaitPost(() =>
+        await Server.WaitPost(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-
-            grid = gridSet.First();
+            SAtmos.SetAtmosphereSimulation(ProcessEnt, false);
         });
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            /*
+             RUNNING REGULAR TICKS USING WaitRunTicks AND GUESSING AS TO HOW MANY ATMOS SIMULATION TICKS ARE HAPPENING
+             WILL CAUSE A RACE CONDITION THAT IS A PAIN IN THE ASS TO DEBUG
+
+             AN ENTITY MAY BE REMOVED AND ADDED BETWEEN A SUBTICK. IF LINDA PROCESSING IS ENABLED IT MIGHT CAUSE
+             AN EQUALIZATION TO PUT AIR IN OTHER TILES IN THE SMALL WINDOW WHERE THE TILE IS NOT AIRTIGHT
+             WHICH WILL THROW OFF DELTAS
+             */
+
+            await Server.WaitPost(() =>
+            {
+                SAtmos.RunProcessingFull(ProcessEnt,ProcessEnt.Owner, SAtmos.AtmosTickRate);
+            });
+
+            await Server.WaitPost(() =>
             {
                 // Need to spawn an entity each run to ensure it works for all directions.
-                var uid = entMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(grid.Owner, Vector2.Zero));
-                dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-                Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+                var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(ProcessEnt.Owner, Vector2.Zero));
+                dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+                Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
 
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
-                tile = gridAtmosComp.Tiles[offsetIndices];
+                var tile = ProcessEnt.Comp1.Tiles[offsetIndices];
 
                 Assert.That(tile.Air, Is.Not.Null, $"Tile at {offsetIndices} should have air!");
 
@@ -274,19 +221,29 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
-
-            // Entity should exist, if it took one tick of damage then it should be instantly destroyed.
-            await server.WaitAssertion(() =>
+            // get jiggy with it! hit that dance white boy!
+            await Server.WaitPost(() =>
             {
-                Assert.That(entMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold pressure from {direction} side!");
-                tile.Air!.Clear();
+                SAtmos.RunProcessingFull(ProcessEnt,ProcessEnt.Owner, SAtmos.AtmosTickRate);
             });
 
-            await server.WaitRunTicks(30);
-        }
+            // need to run some ticks as deleted entities are queued for removal
+            // and not removed instantly
+            await Server.WaitRunTicks(30);
 
-        await pair.CleanReturnAsync();
+            // Entity shouldn't exist, if it took one tick of damage then it should be instantly destroyed.
+            await Server.WaitAssertion(() =>
+            {
+                Assert.That(SEntMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold pressure from {direction} side!");
+
+                // Double whammy: in case any unintended gas leak occured due to a race condition,
+                // clear out all the tiles.
+                foreach (var mix in SAtmos.GetAllMixtures(ProcessEnt))
+                {
+                    mix.Clear();
+                }
+            });
+        }
     }
 
     /// <summary>
@@ -296,39 +253,23 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingAbsoluteStandbyTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
         TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
-        await server.WaitPost(() =>
+        await Server.WaitPost(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-            grid = gridSet.First();
-            var uid = entMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(grid.Owner, Vector2.Zero));
-            dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-            Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+            var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(ProcessEnt.Owner, Vector2.Zero));
+            dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+            Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
         });
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            await Server.WaitPost(() =>
             {
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
+                var gridAtmosComp = SEntMan.GetComponent<GridAtmosphereComponent>(ProcessEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
@@ -340,18 +281,16 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
 
-            await server.WaitAssertion(() =>
+            await Server.WaitAssertion(() =>
             {
-                Assert.That(!entMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold absolute pressure from {direction} side!");
+                Assert.That(!SEntMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold absolute pressure from {direction} side!");
                 tile.Air!.Clear();
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
         }
-
-        await pair.CleanReturnAsync();
     }
 
     /// <summary>
@@ -361,41 +300,21 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingAbsoluteDamageTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
         TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
-        await server.WaitPost(() =>
-        {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-            grid = gridSet.First();
-        });
-
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            await Server.WaitPost(() =>
             {
                 // Spawn fresh entity each iteration to verify all directions work
-                var uid = entMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(grid.Owner, Vector2.Zero));
-                dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-                Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+                var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(ProcessEnt.Owner, Vector2.Zero));
+                dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+                Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
 
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
+                var gridAtmosComp = SEntMan.GetComponent<GridAtmosphereComponent>(ProcessEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
@@ -408,17 +327,15 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
 
-            await server.WaitAssertion(() =>
+            await Server.WaitAssertion(() =>
             {
-                Assert.That(entMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold absolute pressure from {direction} side!");
+                Assert.That(SEntMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold absolute pressure from {direction} side!");
                 tile.Air!.Clear();
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
         }
-
-        await pair.CleanReturnAsync();
     }
 }

From 45d9f35962590c92c4717fec3719c47e1482f35c Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 23 Dec 2025 01:44:31 -0800
Subject: [PATCH 160/360] Use cached Atmospherics AirtightData when applicable
 (#41390)

---
 .../Anomaly/AnomalySystem.Generator.cs        |  2 +-
 .../EntitySystems/AtmosphereSystem.API.cs     | 28 ++++++++++++++++++-
 .../EntitySystems/HeatExchangerSystem.cs      |  2 +-
 .../Rules/GameRuleSystem.Utility.cs           |  2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs
index 46ad9278f8..09af0419bb 100644
--- a/Content.Server/Anomaly/AnomalySystem.Generator.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs
@@ -100,7 +100,7 @@ public sealed partial class AnomalySystem
 
             // no air-blocked areas.
             if (_atmosphere.IsTileSpace(grid, xform.MapUid, tile) ||
-                _atmosphere.IsTileAirBlocked(grid, tile, mapGridComp: gridComp))
+                _atmosphere.IsTileAirBlockedCached(grid, tile))
             {
                 continue;
             }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index 96a5c69457..5cce6075b7 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -306,6 +306,8 @@ public partial class AtmosphereSystem
     /// <param name="directions">The directions to check for air-blockage.</param>
     /// <param name="mapGridComp">Optional map grid component associated with the grid.</param>
     /// <returns>True if the tile is air-blocked in the specified directions, false otherwise.</returns>
+    /// <remarks>This rebuilds airtight data on-the-fly. You should only use this if you've just
+    /// invalidated airtight data, and you cannot wait one atmostick to revalidate it.</remarks>
     [PublicAPI]
     public bool IsTileAirBlocked(EntityUid gridUid,
         Vector2i tile,
@@ -315,11 +317,35 @@ public partial class AtmosphereSystem
         if (!Resolve(gridUid, ref mapGridComp, false))
             return false;
 
-        // TODO ATMOS: This reconstructs the data instead of getting the cached version. Might want to include a method to get the cached version later.
         var data = GetAirtightData(gridUid, mapGridComp, tile);
         return data.BlockedDirections.IsFlagSet(directions);
     }
 
+    /// <summary>
+    /// Checks if a tile on a grid is air-blocked in the specified directions, using cached data.
+    /// </summary>
+    /// <param name="grid">The grid to check.</param>
+    /// <param name="tile">The tile on the grid to check.</param>
+    /// <param name="directions">The directions to check for air-blockage.</param>
+    /// <returns>True if the tile is air-blocked in the specified directions, false otherwise.</returns>
+    /// <remarks>Returns data that is currently cached by Atmospherics.
+    /// You should always use this method over <see cref="IsTileAirBlocked"/> as it's more performant.
+    /// If you need to get up-to-date data because you've just invalidated airtight data,
+    /// use <see cref="IsTileAirBlocked"/>.</remarks>
+    [PublicAPI]
+    public bool IsTileAirBlockedCached(Entity<GridAtmosphereComponent?> grid,
+        Vector2i tile,
+        AtmosDirection directions = AtmosDirection.All)
+    {
+        if (!_atmosQuery.Resolve(grid, ref grid.Comp, false))
+            return false;
+
+        if (!grid.Comp.Tiles.TryGetValue(tile, out var atmosTile))
+            return false;
+
+        return atmosTile.AirtightData.BlockedDirections.IsFlagSet(directions);
+    }
+
     /// <summary>
     /// Checks if a tile on a grid or map is space as defined by a tile's definition of space.
     /// Some tiles can hold back space and others cannot - for example, plating can hold
diff --git a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
index b3644e88b7..8183bb99e4 100644
--- a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
@@ -43,7 +43,7 @@ public sealed class HeatExchangerSystem : EntitySystem
         // make sure that the tile the device is on isn't blocked by a wall or something similar.
         if (args.Grid is {} grid
             && _transform.TryGetGridTilePosition(uid, out var tile)
-            && _atmosphereSystem.IsTileAirBlocked(grid, tile))
+            && _atmosphereSystem.IsTileAirBlockedCached(grid, tile))
         {
             return;
         }
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index cd93eae502..8f1f08269b 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -116,7 +116,7 @@ public abstract partial class GameRuleSystem<T> where T: IComponent
 
             tile = new Vector2i(randomX, randomY);
             if (_atmosphere.IsTileSpace(targetGrid, Transform(targetGrid).MapUid, tile)
-                || _atmosphere.IsTileAirBlocked(targetGrid, tile, mapGridComp: gridComp))
+                || _atmosphere.IsTileAirBlockedCached(targetGrid, tile))
             {
                 continue;
             }

From f799c013675dea80d0a314d685d76a7b0bf1feee Mon Sep 17 00:00:00 2001
From: imatsoup <93290208+imatsoup@users.noreply.github.com>
Date: Tue, 23 Dec 2025 09:47:46 +0000
Subject: [PATCH 161/360] Make donk co. microwave syndicate contraband (#41960)

add BaseSyndicateContraband parentages to donk co microwave and donk co microwave machineboard
---
 .../Objects/Devices/Circuitboards/Machine/production.yml        | 2 +-
 Resources/Prototypes/Entities/Structures/Machines/microwave.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index deed97f863..d89cec1c88 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1090,7 +1090,7 @@
 
 - type: entity
   id: SyndicateMicrowaveMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseSyndicateContraband ]
   name: donk co. microwave machine board
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index b54d1c8e34..26701156a0 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -155,7 +155,7 @@
 
 - type: entity
   id: SyndicateMicrowave
-  parent: KitchenMicrowave
+  parent: [ KitchenMicrowave, BaseSyndicateContraband ]
   name: donk co. microwave
   description: So advanced, it can cook donk-pockets in a mere 2.5 seconds!
   components:

From 0002d1ec8d00264b12bb99f832efc0069a7365f8 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Tue, 23 Dec 2025 23:13:39 +1000
Subject: [PATCH 162/360] Fix incorrect table breakage sound (#41968)

* Fix incorrect table breakage sound

* review

* retry

* are you kidding me
---
 .../Entities/Structures/Furniture/Tables/tables.yml       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 80fa4fee05..fa18141304 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -544,7 +544,7 @@
         acts: [ "Destruction" ]
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WoodDestroy
     - trigger:
         !type:DamageTrigger
         damage: 15
@@ -730,6 +730,12 @@
     damageModifierSet: Wood
   - type: Destructible
     thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
         damage: 25

From a7852e3d777382957a51f8326aaba93a2d678505 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 23 Dec 2025 11:47:46 -0800
Subject: [PATCH 163/360] Fix the Infinite Spill (#42022)

i hate solutions i hate solutions

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Fluids/EntitySystems/PuddleSystem.cs      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index c756a8e696..aca8c5383d 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -387,21 +387,34 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
         spilled = solution.Value.Comp.Solution;
 
-        return TrySplashSpillAt(entity, coordinates, spilled, out puddleUid, sound, user);
+        return TrySplashSpillAt(entity, coordinates, solution.Value, out puddleUid, sound, user);
+    }
+
+    private bool TrySplashSpillAt(EntityUid entity,
+        EntityCoordinates coordinates,
+        Entity<SolutionComponent> solution,
+        out EntityUid puddleUid,
+        bool sound = true,
+        EntityUid? user = null)
+    {
+        var result = TrySplashSpillAt(entity, coordinates, solution.Comp.Solution, out puddleUid, sound, user);
+        _solutionContainerSystem.UpdateChemicals(solution);
+        return result;
     }
 
     public override bool TrySplashSpillAt(EntityUid entity,
         EntityCoordinates coordinates,
-        Solution spilled,
+        Solution solution,
         out EntityUid puddleUid,
         bool sound = true,
         EntityUid? user = null)
     {
         puddleUid = EntityUid.Invalid;
 
-        if (spilled.Volume == 0)
+        if (solution.Volume == 0)
             return false;
 
+        var spilled = solution.SplitSolution(solution.Volume);
         var targets = new List<EntityUid>();
         var reactive = new HashSet<Entity<ReactiveComponent>>();
         _lookup.GetEntitiesInRange(coordinates, 1.0f, reactive);

From 9165fd59e2fccc3b68a01d3a052a5ff39e2eb72f Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Tue, 23 Dec 2025 21:42:32 +0100
Subject: [PATCH 164/360] Change "mafioso" (singular) to "mafiosi" (plural) in
 the Italian accent. (#42026)

Change "mafioso" (singular) to "mafiosi" (plural)
---
 Resources/Locale/en-US/accent/italian.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index cc8641417f..7b7ff4c94b 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -112,7 +112,7 @@ accent-italian-words-35 = traitor
 accent-italian-words-replace-35 = mafioso
 
 accent-italian-words-36 = traitors
-accent-italian-words-replace-36 = mafioso
+accent-italian-words-replace-36 = mafiosi
 
 accent-italian-words-37 = use
 accent-italian-words-replace-37 = use-a

From 163b104b61840a936a3e1492474a81af1df440f7 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Tue, 23 Dec 2025 16:52:42 -0500
Subject: [PATCH 165/360] Fix spreaders not re-spreading on deletion (#42016)

* Fix spreaders not re-spreading on deletion

* Rename another variable for clarity
---
 Content.Server/Spreader/SpreaderSystem.cs | 33 +++++++++++++----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 2bc067542d..7ea41431da 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -295,35 +295,38 @@ public sealed class SpreaderSystem : EntitySystem
     /// This function activates all spreaders that are adjacent to a given entity. This also activates other spreaders
     /// on the same tile as the current entity (for thin airtight entities like windoors).
     /// </summary>
-    public void ActivateSpreadableNeighbors(EntityUid uid, (EntityUid Grid, Vector2i Tile)? position = null)
+    public void ActivateSpreadableNeighbors(EntityUid origin, (EntityUid Grid, Vector2i Tile)? position = null)
     {
         Vector2i tile;
-        EntityUid ent;
-        MapGridComponent? grid;
+        EntityUid gridUid;
+        MapGridComponent? gridComp;
 
         if (position == null)
         {
-            var transform = Transform(uid);
-            if (!TryComp(transform.GridUid, out grid) || TerminatingOrDeleted(transform.GridUid.Value))
+            var transform = Transform(origin);
+            if (!TryComp(transform.GridUid, out gridComp) || TerminatingOrDeleted(transform.GridUid.Value))
                 return;
 
-            tile = _map.TileIndicesFor(transform.GridUid.Value, grid, transform.Coordinates);
-            ent = transform.GridUid.Value;
+            tile = _map.TileIndicesFor(transform.GridUid.Value, gridComp, transform.Coordinates);
+            gridUid = transform.GridUid.Value;
         }
         else
         {
-            if (!TryComp(position.Value.Grid, out grid))
+            if (!TryComp(position.Value.Grid, out gridComp))
                 return;
-            (ent, tile) = position.Value;
+            (gridUid, tile) = position.Value;
         }
 
-        var anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, tile);
+        var anchored = _map.GetAnchoredEntitiesEnumerator(gridUid, gridComp, tile);
         while (anchored.MoveNext(out var entity))
         {
-            if (entity == ent)
+            // Don't re-activate the terminating entity
+            if (entity == origin)
                 continue;
             DebugTools.Assert(Transform(entity.Value).Anchored);
-            if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+
+            // Activate any edge spreaders that are non-terminating
+            if (_query.HasComponent(entity) && !TerminatingOrDeleted(entity))
                 EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
         }
 
@@ -331,12 +334,14 @@ public sealed class SpreaderSystem : EntitySystem
         {
             var direction = (AtmosDirection) (1 << i);
             var adjacentTile = SharedMapSystem.GetDirection(tile, direction.ToDirection());
-            anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, adjacentTile);
+            anchored = _map.GetAnchoredEntitiesEnumerator(gridUid, gridComp, adjacentTile);
 
             while (anchored.MoveNext(out var entity))
             {
                 DebugTools.Assert(Transform(entity.Value).Anchored);
-                if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+
+                // Activate any edge spreaders that are non-terminating
+                if (_query.HasComponent(entity) && !TerminatingOrDeleted(entity))
                     EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
             }
         }

From 29c3e03bfc8e4dac405e830296cf43f0e07d6987 Mon Sep 17 00:00:00 2001
From: ahandleman <ahandleman@wustl.edu>
Date: Tue, 23 Dec 2025 16:15:51 -0600
Subject: [PATCH 166/360] Change Botany Minimum Quantity For Random Chems
 (#41955)

* Initial change to fix minimums

* Switch to clamp for setting min
---
 .../Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
index d5589966b1..1f8f3fc946 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -33,8 +33,9 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
         }
         else
         {
-            seedChemQuantity.Min = FixedPoint2.Epsilon;
-            seedChemQuantity.Max = FixedPoint2.Zero + amount;
+            //Set the minimum to a fifth of the quantity to give some level of bad luck protection
+            seedChemQuantity.Min = FixedPoint2.Clamp(pick.Quantity / 5f, FixedPoint2.Epsilon, 1f);
+            seedChemQuantity.Max = seedChemQuantity.Min + amount;
             seedChemQuantity.Inherent = false;
         }
         var potencyDivisor = 100f / seedChemQuantity.Max;

From 84df6eb9cc6e87fdb896879abd33c10a4fde41ef Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 24 Dec 2025 02:16:20 +0100
Subject: [PATCH 167/360] Update RT to v270.0.0 (#42029)

Fix audio loading issues
---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index c7ba63ed8e..6d31d5ba24 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit c7ba63ed8e9c8087b7a78bada55057ac7aa0812d
+Subproject commit 6d31d5ba2404c9f069c456f10bd717929b00a9d8

From b95e8ff6c4d3845cc24641c000ddd64073799cc0 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 24 Dec 2025 02:56:31 +0100
Subject: [PATCH 168/360] Fix NanoTask and bounty print formatting (#42030)

Markup text was erroneously being appended via AddText().
---
 Content.Server/Cargo/Systems/CargoSystem.Bounty.cs          | 4 ++--
 .../CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index c2c2a8365c..72941a1665 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -119,9 +119,9 @@ public sealed partial class CargoSystem
         label.Id = bounty.Id;
         label.AssociatedStationId = stationId;
         var msg = new FormattedMessage();
-        msg.AddText(Loc.GetString("bounty-manifest-header", ("id", bounty.Id)));
+        msg.AddMarkupOrThrow(Loc.GetString("bounty-manifest-header", ("id", bounty.Id)));
         msg.PushNewline();
-        msg.AddText(Loc.GetString("bounty-manifest-list-start"));
+        msg.AddMarkupOrThrow(Loc.GetString("bounty-manifest-list-start"));
         msg.PushNewline();
         foreach (var entry in prototype.Entries)
         {
diff --git a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
index 66934c8a87..a544ba66e0 100644
--- a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
@@ -77,11 +77,11 @@ public sealed class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem
 
         printed.Task = item;
         var msg = new FormattedMessage();
-        msg.AddText(Loc.GetString("nano-task-printed-description", ("description", item.Description)));
+        msg.AddMarkupOrThrow(Loc.GetString("nano-task-printed-description", ("description", FormattedMessage.EscapeText(item.Description))));
         msg.PushNewline();
-        msg.AddText(Loc.GetString("nano-task-printed-requester", ("requester", item.TaskIsFor)));
+        msg.AddMarkupOrThrow(Loc.GetString("nano-task-printed-requester", ("requester", FormattedMessage.EscapeText(item.TaskIsFor))));
         msg.PushNewline();
-        msg.AddText(item.Priority switch {
+        msg.AddMarkupOrThrow(item.Priority switch {
             NanoTaskPriority.High => Loc.GetString("nano-task-printed-high-priority"),
             NanoTaskPriority.Medium => Loc.GetString("nano-task-printed-medium-priority"),
             NanoTaskPriority.Low => Loc.GetString("nano-task-printed-low-priority"),

From cebaf6668754662bd26fc226bdc6a818d5d54df0 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Wed, 24 Dec 2025 04:10:25 +0100
Subject: [PATCH 169/360] =?UTF-8?q?Change=20"pappa"=20(food)=20to=20"pap?=
 =?UTF-8?q?=C3=A0"=20(dad)=20in=20Italian=20accent=20(#42018)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Locale/en-US/accent/italian.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index 7b7ff4c94b..4976b3338e 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -34,7 +34,7 @@ accent-italian-words-9 = could
 accent-italian-words-replace-9 = could-a
 
 accent-italian-words-10 = dad
-accent-italian-words-replace-10 = pappa
+accent-italian-words-replace-10 = papà
 
 accent-italian-words-11 = good
 accent-italian-words-replace-11 = molto bene

From d019820a2bb185241e934b8b7ddecc74f221d1ee Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Wed, 24 Dec 2025 06:15:12 +0100
Subject: [PATCH 170/360] Fix greytide terms in Italian accent (#42020)

* Use singular form for greytider in Italian accent

* Use "curva" for "greytide" instead of "curvisti" in Italian accent
---
 Resources/Locale/en-US/accent/italian.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index 4976b3338e..4b8d9814b3 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -40,10 +40,10 @@ accent-italian-words-11 = good
 accent-italian-words-replace-11 = molto bene
 
 accent-italian-words-12 = greytide
-accent-italian-words-replace-12 = curvisti
+accent-italian-words-replace-12 = curva
 
 accent-italian-words-13 = greytider
-accent-italian-words-replace-13 = curvisti
+accent-italian-words-replace-13 = curvista
 
 accent-italian-words-14 = greytiders
 accent-italian-words-replace-14 = curvisti

From c39531d79b8acc066c9ea1520b94941a0b42da2f Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Wed, 24 Dec 2025 07:34:10 +0100
Subject: [PATCH 171/360] [HOTFIX] Fix MMI mind transfer (#41941)

---
 .../Borgs/Components/MMILinkedComponent.cs    | 18 -----------
 .../Silicons/Borgs/SharedBorgSystem.MMI.cs    | 31 +++++--------------
 2 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs

diff --git a/Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs b/Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs
deleted file mode 100644
index cebbc9b746..0000000000
--- a/Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Silicons.Borgs.Components;
-
-/// <summary>
-/// This is used for an entity that is linked to an MMI, usually a brain.
-/// Mostly for receiving events.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem))]
-[AutoGenerateComponentState]
-public sealed partial class MMILinkedComponent : Component
-{
-    /// <summary>
-    /// The MMI this entity is linked to.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? LinkedMMI;
-}
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs
index efcd5a378c..3d33c6af4e 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs
@@ -17,8 +17,7 @@ public abstract partial class SharedBorgSystem
         SubscribeLocalEvent<MMIComponent, MindAddedMessage>(OnMMIMindAdded);
         SubscribeLocalEvent<MMIComponent, MindRemovedMessage>(OnMMIMindRemoved);
 
-        SubscribeLocalEvent<MMILinkedComponent, MindAddedMessage>(OnMMILinkedMindAdded);
-        SubscribeLocalEvent<MMILinkedComponent, EntGotRemovedFromContainerMessage>(OnMMILinkedRemoved);
+        SubscribeLocalEvent<MMIComponent, EntRemovedFromContainerMessage>(OnMMILinkedRemoved);
     }
 
     private void OnMMIInit(Entity<MMIComponent> ent, ref ComponentInit args)
@@ -35,9 +34,6 @@ public abstract partial class SharedBorgSystem
             return;
 
         var brain = args.Entity;
-        var linked = EnsureComp<MMILinkedComponent>(brain);
-        linked.LinkedMMI = ent.Owner;
-        Dirty(brain, linked);
 
         if (_mind.TryGetMind(brain, out var mindId, out var mindComp))
         {
@@ -60,35 +56,22 @@ public abstract partial class SharedBorgSystem
         _appearance.SetData(ent.Owner, MMIVisuals.HasMind, false);
     }
 
-    private void OnMMILinkedMindAdded(Entity<MMILinkedComponent> ent, ref MindAddedMessage args)
-    {
-        if (ent.Comp.LinkedMMI == null || !_mind.TryGetMind(ent.Owner, out var mindId, out var mindComp))
-            return;
-
-        _mind.TransferTo(mindId, ent.Comp.LinkedMMI, true, mind: mindComp);
-    }
-
-    private void OnMMILinkedRemoved(Entity<MMILinkedComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    private void OnMMILinkedRemoved(Entity<MMIComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         if (_timing.ApplyingState)
             return; // The changes are already networked with the same game state
 
-        if (Terminating(ent.Owner))
+        if (args.Container.ID != ent.Comp.BrainSlotId)
             return;
 
-        if (ent.Comp.LinkedMMI is not { } linked)
-            return;
-
-        RemCompDeferred<MMILinkedComponent>(ent.Owner);
-
-        if (_mind.TryGetMind(linked, out var mindId, out var mindComp))
+        if (_mind.TryGetMind(ent, out var mindId, out var mindComp))
         {
+            _mind.TransferTo(mindId, args.Entity, true, mind: mindComp);
+
             if (_roles.MindHasRole<SiliconBrainRoleComponent>(mindId))
                 _roles.MindRemoveRole<SiliconBrainRoleComponent>(mindId);
-
-            _mind.TransferTo(mindId, ent.Owner, true, mind: mindComp);
         }
 
-        _appearance.SetData(linked, MMIVisuals.BrainPresent, false);
+        _appearance.SetData(ent, MMIVisuals.BrainPresent, false);
     }
 }

From 3fe2f0bd7db4762b6563a6af295a5c96ca022fb4 Mon Sep 17 00:00:00 2001
From: TemporalOroboros <TemporalOroboros@gmail.com>
Date: Tue, 23 Dec 2025 22:37:11 -0800
Subject: [PATCH 172/360] Splits temperature damage processing into its own
 component (#30515)

* Creates TemperatureDamageThresholdsComponent

* Obsolete TemperatureComponent fields

* Use TemperatureDamageThresholdsComponent
Moves all the uses of the relocated TemperatureComponent fields to use the TDTC versions

* Removes the obsolete TemperatureComponent fields

* Update YAML definitions

* Update doc comments

* Split TemperatureSystem
Creates TemperatureDamageSystem and moves the damage handling from TemperatureSystem

* Cull unused using statements

* Use component-based damage tick scheduling

* Fix temperature damage processing
Check was inverted resulting in things never starting to take temperature damage

* Poke tests

* Add TemperatureDamageThresholds to new prototypes

* Move TemperatureDamageThresholdsComponent to Shared
Parity with TemperatureComponent

* While I'm here
Fixes warning regarding obsolete ProtoId validator attribute

* Fix YAML errors

* Fix merge errors

* Rename TemperatureDamageThresholdsComponent -> TemperatureDamageComponent

* Use ContentHelpers.RoundToLevels for temperature alerts

* Fix YML

* A fuckton of cleanup

* working cleanup

* fix

* misc additions

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../ContainerTemperatureComponent.cs          |  11 +
 ...nerTemperatureDamageThresholdsComponent.cs |  11 -
 .../Systems/TemperatureSystem.Damage.cs       | 287 ++++++++++++++++
 .../Temperature/Systems/TemperatureSystem.cs  | 319 +-----------------
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 .../Components/TemperatureComponent.cs        |  52 +--
 .../Components/TemperatureDamageComponent.cs  |  94 ++++++
 .../Systems/SharedTemperatureSystem.cs        |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  16 +-
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    |   1 +
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |   1 +
 .../Prototypes/Entities/Mobs/NPCs/scurret.yml |   5 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |   2 +
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |   6 +-
 .../Entities/Mobs/Player/dragon.yml           |   1 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   5 +-
 .../Prototypes/Entities/Mobs/Species/moth.yml |   7 +-
 .../Entities/Mobs/Species/reptilian.yml       |   5 +-
 Resources/Prototypes/Entities/Mobs/base.yml   |  10 +-
 .../Entities/Objects/Consumable/Food/egg.yml  |   8 +
 .../Entities/Objects/Consumable/Food/meat.yml |   1 +
 .../Entities/Objects/Misc/ice_crust.yml       |   1 +
 .../Entities/Objects/Misc/kudzu.yml           |   2 +
 .../Entities/Objects/Misc/spaceshroom.yml     |   1 +
 .../Structures/Machines/Medical/cryo_pod.yml  |   2 +-
 .../Entities/Structures/spider_web.yml        |   1 +
 26 files changed, 469 insertions(+), 388 deletions(-)
 create mode 100644 Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
 delete mode 100644 Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs
 create mode 100644 Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
 create mode 100644 Content.Shared/Temperature/Components/TemperatureDamageComponent.cs

diff --git a/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
new file mode 100644
index 0000000000..7c7b1e81e8
--- /dev/null
+++ b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.Temperature.Components;
+
+[RegisterComponent]
+public sealed partial class ContainerTemperatureComponent : Component
+{
+    [DataField]
+    public float? HeatDamageThreshold;
+
+    [DataField]
+    public float? ColdDamageThreshold;
+}
diff --git a/Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs b/Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs
deleted file mode 100644
index 024b8a013b..0000000000
--- a/Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.Temperature.Components;
-
-[RegisterComponent]
-public sealed partial class ContainerTemperatureDamageThresholdsComponent: Component
-{
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? HeatDamageThreshold;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? ColdDamageThreshold;
-}
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
new file mode 100644
index 0000000000..87091c5f9c
--- /dev/null
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
@@ -0,0 +1,287 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Body.Components;
+using Content.Server.Temperature.Components;
+using Content.Shared._DV.CosmicCult.Components; // DeltaV
+using Content.Shared.Alert;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Database;
+using Content.Shared.Rounding;
+using Content.Shared.Temperature;
+using Content.Shared.Temperature.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Temperature.Systems;
+
+/// <summary>
+/// Handles entities taking damage from being too hot or too cold.
+/// Also handles alerts relevant to the same.
+/// </summary>
+public sealed partial class TemperatureSystem
+{
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    private EntityQuery<TemperatureDamageComponent> _tempDamageQuery;
+    private EntityQuery<ContainerTemperatureComponent> _containerTemperatureQuery;
+    private EntityQuery<ThermalRegulatorComponent> _thermalRegulatorQuery;
+    private EntityQuery<TemperatureImmunityComponent> _immuneQuery; // DeltaV
+
+    /// <summary>
+    ///     All the components that will have their damage updated at the end of the tick.
+    ///     This is done because both AtmosExposed and Flammable call ChangeHeat in the same tick, meaning
+    ///     that we need some mechanism to ensure it doesn't double-dip on damage for both calls.
+    /// </summary>
+    public HashSet<Entity<TemperatureDamageComponent>> ShouldUpdateDamage = new();
+
+    /// <summary>
+    /// Alert prototype for Temperature.
+    /// </summary>
+    public static readonly ProtoId<AlertCategoryPrototype> TemperatureAlertCategory = "Temperature";
+
+    /// <summary>
+    /// The maximum severity applicable to temperature alerts.
+    /// </summary>
+    public static readonly short MaxTemperatureAlertSeverity = 3;
+
+    /// <summary>
+    /// On a scale of 0. to 1. where 0. is the ideal temperature and 1. is a temperature damage threshold this is the point where the component starts raising temperature alerts.
+    /// </summary>
+    public static readonly float MinAlertTemperatureScale = 0.33f;
+
+    private void InitializeDamage()
+    {
+        SubscribeLocalEvent<AlertsComponent, OnTemperatureChangeEvent>(ServerAlert);
+
+        SubscribeLocalEvent<TemperatureDamageComponent, OnTemperatureChangeEvent>(EnqueueDamage);
+        SubscribeLocalEvent<TemperatureDamageComponent, EntityUnpausedEvent>(OnUnpaused);
+
+        // Allows overriding thresholds based on the parent's thresholds.
+        SubscribeLocalEvent<TemperatureDamageComponent, EntParentChangedMessage>(OnParentChange);
+        SubscribeLocalEvent<ContainerTemperatureComponent, ComponentStartup>(OnParentThresholdStartup);
+        SubscribeLocalEvent<ContainerTemperatureComponent, ComponentShutdown>(OnParentThresholdShutdown);
+
+        _tempDamageQuery = GetEntityQuery<TemperatureDamageComponent>();
+        _containerTemperatureQuery = GetEntityQuery<ContainerTemperatureComponent>();
+        _thermalRegulatorQuery = GetEntityQuery<ThermalRegulatorComponent>();
+        _immuneQuery = GetEntityQuery<TemperatureImmunityComponent>(); // DeltaV
+    }
+
+    private void UpdateDamage()
+    {
+        foreach (var entity in ShouldUpdateDamage)
+        {
+            if (Deleted(entity) || Paused(entity))
+                continue;
+
+            var deltaTime = _gameTiming.CurTime - entity.Comp.LastUpdate;
+            if (entity.Comp.TakingDamage && deltaTime < entity.Comp.UpdateInterval)
+                continue;
+
+            ChangeDamage(entity, deltaTime);
+        }
+
+        ShouldUpdateDamage.Clear();
+    }
+
+    private void ChangeDamage(Entity<TemperatureDamageComponent> entity, TimeSpan deltaTime)
+    {
+        entity.Comp.LastUpdate = _gameTiming.CurTime;
+
+        if (!HasComp<DamageableComponent>(entity) || !TemperatureQuery.TryComp(entity, out var temperature))
+            return;
+
+        // See this link for where the scaling func comes from:
+        // https://www.desmos.com/calculator/0vknqtdvq9
+        // Based on a logistic curve, which caps out at MaxDamage
+        var heatK = 0.005;
+        var a = 1;
+        var y = entity.Comp.DamageCap;
+        var c = y * 2;
+
+        var heatDamageThreshold = entity.Comp.ParentHeatDamageThreshold ?? entity.Comp.HeatDamageThreshold;
+        var coldDamageThreshold = entity.Comp.ParentColdDamageThreshold ?? entity.Comp.ColdDamageThreshold;
+
+        if (temperature.CurrentTemperature >= heatDamageThreshold)
+        {
+            if (!entity.Comp.TakingDamage)
+            {
+                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(entity):entity} started taking high temperature damage");
+                entity.Comp.TakingDamage = true;
+            }
+
+            var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold);
+            var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y;
+            _damageable.TryChangeDamage(entity.Owner, entity.Comp.HeatDamage * tempDamage * deltaTime.TotalSeconds, ignoreResistances: true, interruptsDoAfters: false);
+        }
+        else if (temperature.CurrentTemperature <= coldDamageThreshold)
+        {
+            if (!entity.Comp.TakingDamage)
+            {
+                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(entity):entity} started taking low temperature damage");
+                entity.Comp.TakingDamage = true;
+            }
+
+            var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold);
+            var tempDamage =
+                Math.Sqrt(diff * (Math.Pow(entity.Comp.DamageCap.Double(), 2) / coldDamageThreshold));
+            _damageable.TryChangeDamage(entity.Owner, entity.Comp.ColdDamage * tempDamage * deltaTime.TotalSeconds, ignoreResistances: true, interruptsDoAfters: false);
+        }
+        else if (entity.Comp.TakingDamage)
+        {
+            _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(entity):entity} stopped taking temperature damage");
+            entity.Comp.TakingDamage = false;
+        }
+    }
+
+    private void ServerAlert(Entity<AlertsComponent> entity, ref OnTemperatureChangeEvent args)
+    {
+        ProtoId<AlertPrototype> type;
+        float threshold;
+        float idealTemp;
+
+        if (!_tempDamageQuery.TryComp(entity, out var thresholds) || _immuneQuery.HasComp(entity)) // DeltaV - hide alerts if immune)
+        {
+            _alerts.ClearAlertCategory(entity.Owner, TemperatureAlertCategory);
+            return;
+        }
+
+        if (_thermalRegulatorQuery.TryComp(entity, out var regulator) &&
+            regulator.NormalBodyTemperature > thresholds.ColdDamageThreshold &&
+            regulator.NormalBodyTemperature < thresholds.HeatDamageThreshold)
+        {
+            idealTemp = regulator.NormalBodyTemperature;
+        }
+        else
+        {
+            idealTemp = (thresholds.ColdDamageThreshold + thresholds.HeatDamageThreshold) / 2;
+        }
+
+        if (args.CurrentTemperature <= idealTemp)
+        {
+            type = thresholds.ColdAlert;
+            threshold = thresholds.ColdDamageThreshold;
+        }
+        else
+        {
+            type = thresholds.HotAlert;
+            threshold = thresholds.HeatDamageThreshold;
+        }
+
+        // Calculates a scale where 0.0 is the ideal temperature and 1.0 is where temperature damage begins
+        // The cold and hot scales will differ in their range if the ideal temperature is not exactly halfway between the thresholds
+        var tempScale = (args.CurrentTemperature - idealTemp) / (threshold - idealTemp);
+        var alertLevel = (short)ContentHelpers.RoundToLevels(tempScale - MinAlertTemperatureScale, 1.00f - MinAlertTemperatureScale, MaxTemperatureAlertSeverity + 1);
+
+        if (alertLevel > 0)
+            _alerts.ShowAlert(entity.AsNullable(), type, alertLevel);
+        else
+            _alerts.ClearAlertCategory(entity.AsNullable(), TemperatureAlertCategory);
+    }
+
+    private void EnqueueDamage(Entity<TemperatureDamageComponent> ent, ref OnTemperatureChangeEvent args)
+    {
+        // Begin DeltaV Additions - cosmic cult temperature immunity
+        if (_immuneQuery.HasComp(ent))
+            return;
+        // End DeltaV Additions
+
+        if (ShouldUpdateDamage.Add(ent) && !ent.Comp.TakingDamage)
+            ent.Comp.LastUpdate = _gameTiming.CurTime;
+    }
+
+    private void OnUnpaused(Entity<TemperatureDamageComponent> ent, ref EntityUnpausedEvent args)
+    {
+        ent.Comp.LastUpdate += args.PausedTime;
+    }
+
+    private void OnParentChange(Entity<TemperatureDamageComponent> entity, ref EntParentChangedMessage args)
+    {
+        // We only need to update thresholds if the thresholds changed for the entity's ancestors.
+        var oldThresholds = args.OldParent != null
+            ? RecalculateParentThresholds(args.OldParent.Value)
+            : (null, null);
+        var xform = Transform(entity.Owner);
+        var newThresholds = RecalculateParentThresholds(xform.ParentUid);
+
+        if (oldThresholds != newThresholds)
+            RecursiveThresholdUpdate((entity, entity.Comp, xform));
+    }
+
+    private void OnParentThresholdStartup(Entity<ContainerTemperatureComponent> entity, ref ComponentStartup args)
+    {
+        RecursiveThresholdUpdate(entity.Owner);
+    }
+
+    private void OnParentThresholdShutdown(Entity<ContainerTemperatureComponent> entity, ref ComponentShutdown args)
+    {
+        RecursiveThresholdUpdate(entity.Owner);
+    }
+
+    /// <summary>
+    /// Recalculate and apply parent thresholds for the root entity and all its children.
+    /// </summary>
+    /// <param name="root">The root entity we're currently updating</param>
+    private void RecursiveThresholdUpdate(Entity<TemperatureDamageComponent?, TransformComponent?> root)
+    {
+        RecalculateAndApplyParentThresholds(root);
+
+        var xform = root.Comp2 ?? Transform(root);
+        var enumerator = xform.ChildEnumerator;
+        while (enumerator.MoveNext(out var child))
+        {
+            RecursiveThresholdUpdate(child);
+        }
+    }
+
+    /// <summary>
+    /// Recalculate parent thresholds and apply them on the uid temperature component.
+    /// </summary>
+    /// <param name="entity">The entity whose temperature damage thresholds we're updating</param>
+    private void RecalculateAndApplyParentThresholds(Entity<TemperatureDamageComponent?> entity)
+    {
+        if (!_tempDamageQuery.Resolve(entity, ref entity.Comp, logMissing: false))
+            return;
+
+        var newThresholds = RecalculateParentThresholds(Transform(entity).ParentUid);
+        entity.Comp.ParentHeatDamageThreshold = newThresholds.Item1;
+        entity.Comp.ParentColdDamageThreshold = newThresholds.Item2;
+    }
+
+    /// <summary>
+    /// Recalculate Parent Heat/Cold DamageThreshold by recursively checking each ancestor and fetching the
+    /// maximum HeatDamageThreshold and the minimum ColdDamageThreshold if any exists (aka the best value for each).
+    /// </summary>
+    /// <param name="initialParentUid">parent we start with</param>
+    private (float?, float?) RecalculateParentThresholds(EntityUid initialParentUid)
+    {
+        // Recursively check parents for the best threshold available
+        var parentUid = initialParentUid;
+        float? newHeatThreshold = null;
+        float? newColdThreshold = null;
+        while (parentUid.IsValid())
+        {
+            if (_containerTemperatureQuery.TryComp(parentUid, out var newThresholds))
+            {
+                if (newThresholds.HeatDamageThreshold != null)
+                {
+                    newHeatThreshold = Math.Max(newThresholds.HeatDamageThreshold.Value,
+                        newHeatThreshold ?? 0);
+                }
+
+                if (newThresholds.ColdDamageThreshold != null)
+                {
+                    newColdThreshold = Math.Min(newThresholds.ColdDamageThreshold.Value,
+                        newColdThreshold ?? float.MaxValue);
+                }
+            }
+
+            parentUid = Transform(parentUid).ParentUid;
+        }
+
+        return (newHeatThreshold, newColdThreshold);
+    }
+}
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 431baeb825..d906e8fd8e 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -1,18 +1,9 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.Temperature.Components;
-using Content.Shared._DV.CosmicCult.Components; // DeltaV
-using Content.Shared.Alert;
 using Content.Shared.Atmos;
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
-using Robust.Shared.Prototypes;
 using Content.Shared.Projectiles;
 using Content.Shared._Goobstation.Temperature.Components;
 using Content.Shared._Goobstation.Temperature;
@@ -21,36 +12,16 @@ using Content.Shared.Temperature.Systems;
 
 namespace Content.Server.Temperature.Systems;
 
-public sealed class TemperatureSystem : SharedTemperatureSystem
+public sealed partial class TemperatureSystem : SharedTemperatureSystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly TemperatureSystem _temperature = default!;
-    private EntityQuery<TemperatureImmunityComponent> _immuneQuery; // DeltaV
-
-    /// <summary>
-    ///     All the components that will have their damage updated at the end of the tick.
-    ///     This is done because both AtmosExposed and Flammable call ChangeHeat in the same tick, meaning
-    ///     that we need some mechanism to ensure it doesn't double dip on damage for both calls.
-    /// </summary>
-    public HashSet<Entity<TemperatureComponent>> ShouldUpdateDamage = new();
-
-    public float UpdateInterval = 1.0f;
-
-    private float _accumulatedFrametime;
-
-    public static readonly ProtoId<AlertCategoryPrototype> TemperatureAlertCategory = "Temperature";
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<TemperatureComponent, OnTemperatureChangeEvent>(EnqueueDamage);
         SubscribeLocalEvent<TemperatureComponent, AtmosExposedUpdateEvent>(OnAtmosExposedUpdate);
         SubscribeLocalEvent<TemperatureComponent, RejuvenateEvent>(OnRejuvenate);
-        SubscribeLocalEvent<AlertsComponent, OnTemperatureChangeEvent>(ServerAlert);
         Subs.SubscribeWithRelay<TemperatureProtectionComponent, ModifyChangedTemperatureEvent>(OnTemperatureChangeAttempt, held: false);
 
         SubscribeLocalEvent<InternalTemperatureComponent, MapInitEvent>(OnInit);
@@ -60,13 +31,7 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         SubscribeLocalEvent<SpecialLowTempImmunityComponent, TemperatureImmunityEvent>(OnCheckLowTemperatureImmunity); // Goob edit
         SubscribeLocalEvent<SpecialHighTempImmunityComponent, TemperatureImmunityEvent>(OnCheckHighTemperatureImmunity); // Goob edit
 
-        // Allows overriding thresholds based on the parent's thresholds.
-        SubscribeLocalEvent<TemperatureComponent, EntParentChangedMessage>(OnParentChange);
-        SubscribeLocalEvent<ContainerTemperatureDamageThresholdsComponent, ComponentStartup>(
-            OnParentThresholdStartup);
-        SubscribeLocalEvent<ContainerTemperatureDamageThresholdsComponent, ComponentShutdown>(
-            OnParentThresholdShutdown);
-        _immuneQuery = GetEntityQuery<TemperatureImmunityComponent>(); // DeltaV
+        InitializeDamage();
     }
 
     public override void Update(float frameTime)
@@ -96,32 +61,7 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
             ForceChangeTemperature(uid, temp.CurrentTemperature - degrees, temp);
         }
 
-        UpdateDamage(frameTime);
-    }
-
-    private void UpdateDamage(float frameTime)
-    {
-        _accumulatedFrametime += frameTime;
-
-        if (_accumulatedFrametime < UpdateInterval)
-            return;
-        _accumulatedFrametime -= UpdateInterval;
-
-        if (!ShouldUpdateDamage.Any())
-            return;
-
-        foreach (var comp in ShouldUpdateDamage)
-        {
-            MetaDataComponent? metaData = null;
-
-            var uid = comp.Owner;
-            if (Deleted(uid, metaData) || Paused(uid, metaData))
-                continue;
-
-            ChangeDamage(uid, comp);
-        }
-
-        ShouldUpdateDamage.Clear();
+        UpdateDamage();
     }
 
     // Goob start
@@ -140,13 +80,14 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
 
     public void ForceChangeTemperature(EntityUid uid, float temp, TemperatureComponent? temperature = null)
     {
-        if (!Resolve(uid, ref temperature))
+        if (!TemperatureQuery.Resolve(uid, ref temperature))
             return;
 
-        float lastTemp = temperature.CurrentTemperature;
-        temperature.CurrentTemperature = temp;
+        var lastTemp = temperature.CurrentTemperature;
 
         // Goob start
+        temperature.CurrentTemperature = temp;
+
         var tempEv = new TemperatureImmunityEvent(temperature.CurrentTemperature);
         RaiseLocalEvent(uid, tempEv);
         temperature.CurrentTemperature = tempEv.CurrentTemperature;
@@ -154,13 +95,13 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         float delta = temperature.CurrentTemperature - temp;
         // Goob end
 
-        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta),
-            true);
+        temperature.CurrentTemperature = temp;
+        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), broadcast: true);
     }
 
     public override void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
     {
-        if (!Resolve(uid, ref temperature, false))
+        if (!TemperatureQuery.Resolve(uid, ref temperature, false))
             return;
 
         if (!ignoreHeatResistance)
@@ -174,11 +115,10 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         temperature.CurrentTemperature += heatAmount / GetHeatCapacity(uid, temperature);
         float delta = temperature.CurrentTemperature - lastTemp;
 
-        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), true);
+        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), broadcast: true);
     }
 
-    private void OnAtmosExposedUpdate(EntityUid uid, TemperatureComponent temperature,
-        ref AtmosExposedUpdateEvent args)
+    private void OnAtmosExposedUpdate(EntityUid uid, TemperatureComponent temperature, ref AtmosExposedUpdateEvent args)
     {
         var transform = args.Transform;
 
@@ -188,17 +128,18 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         var temperatureDelta = args.GasMixture.Temperature - temperature.CurrentTemperature;
         var airHeatCapacity = _atmosphere.GetHeatCapacity(args.GasMixture, false);
         var heatCapacity = GetHeatCapacity(uid, temperature);
+        // TODO ATMOS: This heat transfer formula is really really wrong, it needs to be pulled out. Pending on HeatContainers.
         var heat = temperatureDelta * (airHeatCapacity * heatCapacity /
                                        (airHeatCapacity + heatCapacity));
         ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
     }
 
-    private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
+    private void OnInit(Entity<InternalTemperatureComponent> entity, ref MapInitEvent args)
     {
-        if (!TryComp<TemperatureComponent>(uid, out var temp))
+        if (!TemperatureQuery.TryComp(entity, out var temp))
             return;
 
-        comp.Temperature = temp.CurrentTemperature;
+        entity.Comp.Temperature = temp.CurrentTemperature;
     }
 
     private void OnRejuvenate(EntityUid uid, TemperatureComponent comp, RejuvenateEvent args)
@@ -206,120 +147,6 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         ForceChangeTemperature(uid, Atmospherics.T20C, comp);
     }
 
-    private void ServerAlert(EntityUid uid, AlertsComponent status, OnTemperatureChangeEvent args)
-    {
-        ProtoId<AlertPrototype> type;
-        float threshold;
-        float idealTemp;
-
-        if (!TryComp<TemperatureComponent>(uid, out var temperature) || _immuneQuery.HasComp(uid)) // DeltaV - hide alerts if immune
-        {
-            _alerts.ClearAlertCategory(uid, TemperatureAlertCategory);
-            return;
-        }
-
-        if (TryComp<ThermalRegulatorComponent>(uid, out var regulator) &&
-            regulator.NormalBodyTemperature > temperature.ColdDamageThreshold &&
-            regulator.NormalBodyTemperature < temperature.HeatDamageThreshold)
-        {
-            idealTemp = regulator.NormalBodyTemperature;
-        }
-        else
-        {
-            idealTemp = (temperature.ColdDamageThreshold + temperature.HeatDamageThreshold) / 2;
-        }
-
-        if (args.CurrentTemperature <= idealTemp)
-        {
-            type = temperature.ColdAlert;
-            threshold = temperature.ColdDamageThreshold;
-        }
-        else
-        {
-            type = temperature.HotAlert;
-            threshold = temperature.HeatDamageThreshold;
-        }
-
-        // Calculates a scale where 1.0 is the ideal temperature and 0.0 is where temperature damage begins
-        // The cold and hot scales will differ in their range if the ideal temperature is not exactly halfway between the thresholds
-        var tempScale = (args.CurrentTemperature - threshold) / (idealTemp - threshold);
-        switch (tempScale)
-        {
-            case <= 0f:
-                _alerts.ShowAlert(uid, type, 3);
-                break;
-
-            case <= 0.4f:
-                _alerts.ShowAlert(uid, type, 2);
-                break;
-
-            case <= 0.66f:
-                _alerts.ShowAlert(uid, type, 1);
-                break;
-
-            case > 0.66f:
-                _alerts.ClearAlertCategory(uid, TemperatureAlertCategory);
-                break;
-        }
-    }
-
-    private void EnqueueDamage(Entity<TemperatureComponent> temperature, ref OnTemperatureChangeEvent args)
-    {
-        // Begin DeltaV Additions - cosmic cult temperature immunity
-        if (_immuneQuery.HasComp(temperature))
-            return;
-        // End DeltaV Additions
-        ShouldUpdateDamage.Add(temperature);
-    }
-
-    private void ChangeDamage(EntityUid uid, TemperatureComponent temperature)
-    {
-        if (!HasComp<DamageableComponent>(uid))
-            return;
-
-        // See this link for where the scaling func comes from:
-        // https://www.desmos.com/calculator/0vknqtdvq9
-        // Based on a logistic curve, which caps out at MaxDamage
-        var heatK = 0.005;
-        var a = 1;
-        var y = temperature.DamageCap;
-        var c = y * 2;
-
-        var heatDamageThreshold = temperature.ParentHeatDamageThreshold ?? temperature.HeatDamageThreshold;
-        var coldDamageThreshold = temperature.ParentColdDamageThreshold ?? temperature.ColdDamageThreshold;
-
-        if (temperature.CurrentTemperature >= heatDamageThreshold)
-        {
-            if (!temperature.TakingDamage)
-            {
-                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(uid):entity} started taking high temperature damage");
-                temperature.TakingDamage = true;
-            }
-
-            var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold);
-            var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y;
-            _damageable.TryChangeDamage(uid, temperature.HeatDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false);
-        }
-        else if (temperature.CurrentTemperature <= coldDamageThreshold)
-        {
-            if (!temperature.TakingDamage)
-            {
-                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(uid):entity} started taking low temperature damage");
-                temperature.TakingDamage = true;
-            }
-
-            var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold);
-            var tempDamage =
-                Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / coldDamageThreshold));
-            _damageable.TryChangeDamage(uid, temperature.ColdDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false);
-        }
-        else if (temperature.TakingDamage)
-        {
-            _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(uid):entity} stopped taking temperature damage");
-            temperature.TakingDamage = false;
-        }
-    }
-
     private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component, ModifyChangedTemperatureEvent args)
     {
         var coefficient = args.TemperatureDelta < 0
@@ -334,118 +161,6 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
 
     private void ChangeTemperatureOnCollide(Entity<ChangeTemperatureOnCollideComponent> ent, ref ProjectileHitEvent args)
     {
-        _temperature.ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
-    }
-
-    private void OnParentChange(EntityUid uid, TemperatureComponent component,
-        ref EntParentChangedMessage args)
-    {
-        var temperatureQuery = GetEntityQuery<TemperatureComponent>();
-        var transformQuery = GetEntityQuery<TransformComponent>();
-        var thresholdsQuery = GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>();
-        // We only need to update thresholds if the thresholds changed for the entity's ancestors.
-        var oldThresholds = args.OldParent != null
-            ? RecalculateParentThresholds(args.OldParent.Value, transformQuery, thresholdsQuery)
-            : (null, null);
-        var newThresholds = RecalculateParentThresholds(transformQuery.GetComponent(uid).ParentUid, transformQuery, thresholdsQuery);
-
-        if (oldThresholds != newThresholds)
-        {
-            RecursiveThresholdUpdate(uid, temperatureQuery, transformQuery, thresholdsQuery);
-        }
-    }
-
-    private void OnParentThresholdStartup(EntityUid uid, ContainerTemperatureDamageThresholdsComponent component,
-        ComponentStartup args)
-    {
-        RecursiveThresholdUpdate(uid, GetEntityQuery<TemperatureComponent>(), GetEntityQuery<TransformComponent>(),
-            GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>());
-    }
-
-    private void OnParentThresholdShutdown(EntityUid uid, ContainerTemperatureDamageThresholdsComponent component,
-        ComponentShutdown args)
-    {
-        RecursiveThresholdUpdate(uid, GetEntityQuery<TemperatureComponent>(), GetEntityQuery<TransformComponent>(),
-            GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>());
-    }
-
-    /// <summary>
-    /// Recalculate and apply parent thresholds for the root entity and all its descendant.
-    /// </summary>
-    /// <param name="root"></param>
-    /// <param name="temperatureQuery"></param>
-    /// <param name="transformQuery"></param>
-    /// <param name="tempThresholdsQuery"></param>
-    private void RecursiveThresholdUpdate(EntityUid root, EntityQuery<TemperatureComponent> temperatureQuery,
-        EntityQuery<TransformComponent> transformQuery,
-        EntityQuery<ContainerTemperatureDamageThresholdsComponent> tempThresholdsQuery)
-    {
-        RecalculateAndApplyParentThresholds(root, temperatureQuery, transformQuery, tempThresholdsQuery);
-
-        var enumerator = Transform(root).ChildEnumerator;
-        while (enumerator.MoveNext(out var child))
-        {
-            RecursiveThresholdUpdate(child, temperatureQuery, transformQuery, tempThresholdsQuery);
-        }
-    }
-
-    /// <summary>
-    /// Recalculate parent thresholds and apply them on the uid temperature component.
-    /// </summary>
-    /// <param name="uid"></param>
-    /// <param name="temperatureQuery"></param>
-    /// <param name="transformQuery"></param>
-    /// <param name="tempThresholdsQuery"></param>
-    private void RecalculateAndApplyParentThresholds(EntityUid uid,
-        EntityQuery<TemperatureComponent> temperatureQuery, EntityQuery<TransformComponent> transformQuery,
-        EntityQuery<ContainerTemperatureDamageThresholdsComponent> tempThresholdsQuery)
-    {
-        if (!temperatureQuery.TryGetComponent(uid, out var temperature))
-        {
-            return;
-        }
-
-        var newThresholds = RecalculateParentThresholds(transformQuery.GetComponent(uid).ParentUid, transformQuery, tempThresholdsQuery);
-        temperature.ParentHeatDamageThreshold = newThresholds.Item1;
-        temperature.ParentColdDamageThreshold = newThresholds.Item2;
-    }
-
-    /// <summary>
-    /// Recalculate Parent Heat/Cold DamageThreshold by recursively checking each ancestor and fetching the
-    /// maximum HeatDamageThreshold and the minimum ColdDamageThreshold if any exists (aka the best value for each).
-    /// </summary>
-    /// <param name="initialParentUid"></param>
-    /// <param name="transformQuery"></param>
-    /// <param name="tempThresholdsQuery"></param>
-    private (float?, float?) RecalculateParentThresholds(
-        EntityUid initialParentUid,
-        EntityQuery<TransformComponent> transformQuery,
-        EntityQuery<ContainerTemperatureDamageThresholdsComponent> tempThresholdsQuery)
-    {
-        // Recursively check parents for the best threshold available
-        var parentUid = initialParentUid;
-        float? newHeatThreshold = null;
-        float? newColdThreshold = null;
-        while (parentUid.IsValid())
-        {
-            if (tempThresholdsQuery.TryGetComponent(parentUid, out var newThresholds))
-            {
-                if (newThresholds.HeatDamageThreshold != null)
-                {
-                    newHeatThreshold = Math.Max(newThresholds.HeatDamageThreshold.Value,
-                        newHeatThreshold ?? 0);
-                }
-
-                if (newThresholds.ColdDamageThreshold != null)
-                {
-                    newColdThreshold = Math.Min(newThresholds.ColdDamageThreshold.Value,
-                        newColdThreshold ?? float.MaxValue);
-                }
-            }
-
-            parentUid = transformQuery.GetComponent(parentUid).ParentUid;
-        }
-
-        return (newHeatThreshold, newColdThreshold);
+        ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
     }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 9bd410e2d3..c8149ef2b5 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -257,7 +257,7 @@ public sealed partial class ZombieSystem
         _mind.MakeSentient(target);
 
         //Make the zombie not die in the cold. Good for space zombies
-        if (TryComp<TemperatureComponent>(target, out var tempComp))
+        if (TryComp<TemperatureDamageComponent>(target, out var tempComp))
             tempComp.ColdDamage.ClampMax(0);
 
         //Heals the zombie from all the damage it took while human
diff --git a/Content.Shared/Temperature/Components/TemperatureComponent.cs b/Content.Shared/Temperature/Components/TemperatureComponent.cs
index b73d1f77d1..fd79c4b4b2 100644
--- a/Content.Shared/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Shared/Temperature/Components/TemperatureComponent.cs
@@ -1,15 +1,10 @@
-using Content.Shared.Alert;
 using Content.Shared.Atmos;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Temperature.Components;
 
 /// <summary>
 /// Handles changing temperature,
-/// informing others of the current temperature,
-/// and taking fire damage from high temperature.
+/// informing others of the current temperature.
 /// </summary>
 [RegisterComponent]
 public sealed partial class TemperatureComponent : Component
@@ -20,24 +15,6 @@ public sealed partial class TemperatureComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float CurrentTemperature = Atmospherics.T20C;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float HeatDamageThreshold = 360f;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float ColdDamageThreshold = 260f;
-
-    /// <summary>
-    /// Overrides HeatDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? ParentHeatDamageThreshold;
-
-    /// <summary>
-    /// Overrides ColdDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? ParentColdDamageThreshold;
-
     /// <summary>
     /// Heat capacity per kg of mass.
     /// </summary>
@@ -49,31 +26,4 @@ public sealed partial class TemperatureComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float AtmosTemperatureTransferEfficiency = 0.1f;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier ColdDamage = new();
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier HeatDamage = new();
-
-    /// <summary>
-    /// Temperature won't do more than this amount of damage per second.
-    /// </summary>
-    /// <remarks>
-    /// Okay it genuinely reaches this basically immediately for a plasma fire.
-    /// </remarks>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 DamageCap = FixedPoint2.New(8);
-
-    /// <summary>
-    /// Used to keep track of when damage starts/stops. Useful for logs.
-    /// </summary>
-    [DataField]
-    public bool TakingDamage;
-
-    [DataField]
-    public ProtoId<AlertPrototype> HotAlert = "Hot";
-
-    [DataField]
-    public ProtoId<AlertPrototype> ColdAlert = "Cold";
 }
diff --git a/Content.Shared/Temperature/Components/TemperatureDamageComponent.cs b/Content.Shared/Temperature/Components/TemperatureDamageComponent.cs
new file mode 100644
index 0000000000..a9543e3046
--- /dev/null
+++ b/Content.Shared/Temperature/Components/TemperatureDamageComponent.cs
@@ -0,0 +1,94 @@
+using Content.Shared.Alert;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Temperature.Components;
+
+/// <summary>
+/// Handles taking damage from being excessively hot/cold.
+/// Also handles alerts about being too hot or too cold.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TemperatureDamageComponent : Component
+{
+    /// <summary>
+    /// The temperature above which the entity will start taking damage from being too hot.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float HeatDamageThreshold = 360f;
+
+    /// <summary>
+    /// The temperature below which the entity will start taking damage from being too cold.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float ColdDamageThreshold = 260f;
+
+    /// <summary>
+    /// Overrides HeatDamageThreshold if the entity's within a parent with the ContainerTemperatureDamageThresholdsComponent component.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float? ParentHeatDamageThreshold;
+
+    /// <summary>
+    /// Overrides ColdDamageThreshold if the entity's within a parent with the ContainerTemperatureDamageThresholdsComponent component.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float? ParentColdDamageThreshold;
+
+    /// <summary>
+    /// The base damage that this entity will take if it's too cold.
+    /// Will be scaled according to how cold it is.
+    /// The scaling maxes out at <see cref="DamageCap"/> times this damage per second.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier ColdDamage = new();
+
+    /// <summary>
+    /// The base damage that this entity will take per second if it's too hot.
+    /// Will be scaled according to how hot it is.
+    /// The scaling maxes out at <see cref="DamageCap"/> times this damage per second.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier HeatDamage = new();
+
+    /// <summary>
+    /// Temperature won't do more than this multiple of the base overheating/overcooling damage per seond.
+    /// </summary>
+    /// <remarks>
+    /// Okay it genuinely reaches this basically immediately for a plasma fire.
+    /// </remarks>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 DamageCap = FixedPoint2.New(8);
+
+    /// <summary>
+    /// Used to keep track of when damage starts/stops. Useful for logs.
+    /// </summary>
+    [DataField]
+    public bool TakingDamage;
+
+    /// <summary>
+    /// The id of the alert thrown when the entity is too hot.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> HotAlert = "Hot";
+
+    /// <summary>
+    /// The id of the alert thrown when the entity is too cold.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> ColdAlert = "Cold";
+
+    /// <summary>
+    /// The last time this entity processed temperature damage.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan LastUpdate;
+
+    /// <summary>
+    /// The time interval between temperature damage ticks for this entity.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1.0);
+}
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
index 09893a37b6..a373ff5201 100644
--- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -17,6 +17,8 @@ public abstract class SharedTemperatureSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
+    protected EntityQuery<TemperatureComponent> TemperatureQuery;
+
     /// <summary>
     /// Band-aid for unpredicted atmos. Delays the application for a short period so that laggy clients can get the replicated temperature.
     /// </summary>
@@ -30,6 +32,8 @@ public abstract class SharedTemperatureSystem : EntitySystem
 
         SubscribeLocalEvent<TemperatureSpeedComponent, OnTemperatureChangeEvent>(OnTemperatureChanged);
         SubscribeLocalEvent<TemperatureSpeedComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+
+        TemperatureQuery = GetEntityQuery<TemperatureComponent>();
     }
 
     private void OnTemperatureChanged(Entity<TemperatureSpeedComponent> ent, ref OnTemperatureChangeEvent args)
@@ -101,7 +105,7 @@ public abstract class SharedTemperatureSystem : EntitySystem
 
     public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
     {
-        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
+        if (!TemperatureQuery.Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
         {
             return Atmospherics.MinimumHeatCapacity;
         }
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index ae4c2fc2c5..d0ddde80d8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1804,10 +1804,11 @@
         Slash: 5
         Piercing: 4
   - type: Temperature
-    heatDamageThreshold: 360
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 360
+    coldDamageThreshold: 285
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -2545,10 +2546,11 @@
     factions:
     - Passive
   - type: Temperature
-    heatDamageThreshold: 335
-    coldDamageThreshold: 230
     currentTemperature: 310.15
     specificHeat: 46
+  - type: TemperatureDamage
+    heatDamageThreshold: 335
+    coldDamageThreshold: 230
     coldDamage:
       types:
         Cold : 0.05 #per second, scales with temperature & other constants
@@ -3244,13 +3246,14 @@
     damageContainer: BiologicalMetaphysical
     damageModifierSet: Infernal
   - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 42
+  - type: TemperatureDamage
     heatDamageThreshold: 4000 #They come from hell, so..
     coldDamageThreshold: 260
-    currentTemperature: 310.15
     coldDamage:
       types:
         Cold : 1 #per second, scales with temperature & other constants
-    specificHeat: 42
     heatDamage:
       types:
         Heat : 1 #per second, scales with temperature & other constants
@@ -3460,6 +3463,7 @@
       Dead:
         Base: spacecat_dead
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 423
     coldDamageThreshold: 0
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 3624d538eb..d65d6aac10 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -204,6 +204,7 @@
       damage:
        types: {}
     - type: Temperature
+    - type: TemperatureDamage
       heatDamageThreshold: 1200
 - type: entity
   id: MobCarpDungeon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 23427e65f7..365191006b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -859,6 +859,7 @@
         Bloodloss:
           -0.8
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 800
     coldDamageThreshold: 0
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
index 4e9305c878..d874420cb3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -36,10 +36,11 @@
       60: Critical
       125: Dead
   - type: Temperature
-    heatDamageThreshold: 360
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 360
+    coldDamageThreshold: 285
   # Good eatin', you monster.
   - type: Butcherable
     butcheringType: Spike
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 7c59b91fed..c84e3ea814 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -45,6 +45,7 @@
         Quantity: 300
   - type: CombatMode
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 500
     coldDamageThreshold: 0
   - type: MeleeWeapon
@@ -504,6 +505,7 @@
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 500
     coldDamageThreshold: 0
   - type: Reactive
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 75b226e95f..9d0adc3a4f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -110,9 +110,10 @@
   - type: TypingIndicator
     proto: alien
   - type: Temperature
+    currentTemperature: 310.15
+  - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: -150
-    currentTemperature: 310.15
   - type: Tag
     tags:
       - CannotSuicide
@@ -554,9 +555,10 @@
   - type: TypingIndicator
     proto: alien
   - type: Temperature
+    currentTemperature: 310.15
+  - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: -150
-    currentTemperature: 310.15
   - type: NoSlip
   - type: Perishable #Ummmm the acid kills a lot of the bacteria or something
     molsPerSecondPerUnitMass: 0.0005
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 871c1d03a1..cfc98a686e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -111,6 +111,7 @@
     - RadiationProtection
     - Adrenaline
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 2400
   - type: Metabolizer
     solutionOnBody: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 02785c7abe..03c4998942 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -261,10 +261,11 @@
   - type: Blindable
   # Other
   - type: Temperature
-    heatDamageThreshold: 325
-    coldDamageThreshold: 260
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 325
+    coldDamageThreshold: 260
     coldDamage:
       types:
         Cold: 0.1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 8f7d2d2f94..c110c8ac7a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -58,11 +58,12 @@
     damage:
       types:
         Heat: 2.5 # moths burn more easily
-  - type: Temperature # Moths hate the heat and thrive in the cold.
-    heatDamageThreshold: 320
-    coldDamageThreshold: 230
+  - type: Temperature
     currentTemperature: 310.15
     specificHeat: 46
+  - type: TemperatureDamage # Moths hate the heat and thrive in the cold.
+    heatDamageThreshold: 320
+    coldDamageThreshold: 230
     coldDamage:
       types:
         Cold : 0.05 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 913a69ddbc..af586a13b0 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -55,10 +55,11 @@
       types:
         Slash: 5
   - type: Temperature
-    heatDamageThreshold: 400
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 400
+    coldDamageThreshold: 285
     coldDamage:
       types:
         Cold : 0.1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 924f1837d4..e34de219a9 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -172,13 +172,14 @@
   components:
   - type: AtmosExposed
   - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 42
+  - type: TemperatureDamage
     heatDamageThreshold: 325
     coldDamageThreshold: 0
-    currentTemperature: 310.15
     coldDamage: #per second, scales with temperature & other constants
       types:
         Cold : 0.1
-    specificHeat: 42
     heatDamage: #per second, scales with temperature & other constants
       types:
         Heat : 1.5
@@ -207,10 +208,11 @@
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 2
   - type: Temperature
-    heatDamageThreshold: 325
-    coldDamageThreshold: 260
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 325
+    coldDamageThreshold: 260
     coldDamage:
       types:
         Cold: 1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 25e40d12dc..e19859f16e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -61,6 +61,13 @@
   # all below are for egg cooking/exploding
   - type: AtmosExposed
   - type: Temperature
+  - type: TemperatureDamage
+  - type: InternalTemperature
+    # ~1mm shell and ~1cm of albumen
+    thickness: 0.011
+    area: 0.04
+    # conductivity of egg shell based on a paper from Romanoff and Romanoff (1949)
+    conductivity: 0.456
 
 # Splat
 - type: entity
@@ -128,3 +135,4 @@
   - type: Temperature
     # preserve temperature from the boiling step
     currentTemperature: 344
+  - type: TemperatureDamage
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index d7ba5e1518..ff5da42cdd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -42,6 +42,7 @@
   - type: AtmosExposed
   - type: Temperature
     currentTemperature: 290
+  - type: TemperatureDamage
   # required for cooking to work
   - type: InternalTemperature
     thickness: 0.02
diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
index ccca7d1af1..514443f9a1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
@@ -45,6 +45,7 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Temperature
+    - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 157a9616ab..1f1b9a9c6a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -56,6 +56,7 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Temperature
+    - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 5
@@ -226,6 +227,7 @@
           Cold: -1.0
           Blunt: -0.5 # Needs to be balanced (approx 3x) with vacuum damage to stall but not kill Kudzu
     - type: Temperature
+    - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 10
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
index e73d13e2cb..6e96dbbadc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
@@ -89,6 +89,7 @@
   - type: AtmosExposed
   - type: Temperature
     currentTemperature: 290
+  - type: TemperatureDamage
   - type: InternalTemperature
     thickness: 0.02
     area: 0.02
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index 4d68d49faa..b863ade2b2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -113,7 +113,7 @@
   - type: CryoPodAir
   - type: Climbable # so that ejected bodies don't get stuck
     vaultable: false
-  - type: ContainerTemperatureDamageThresholds
+  - type: ContainerTemperature
     coldDamageThreshold: 10
   - type: GuideHelp
     guides:
diff --git a/Resources/Prototypes/Entities/Structures/spider_web.yml b/Resources/Prototypes/Entities/Structures/spider_web.yml
index 73e5f5f032..b09e022a3b 100644
--- a/Resources/Prototypes/Entities/Structures/spider_web.yml
+++ b/Resources/Prototypes/Entities/Structures/spider_web.yml
@@ -24,6 +24,7 @@
   - type: Damageable
     damageModifierSet: Wood
   - type: Temperature
+  - type: TemperatureDamage
     heatDamage:
       types:
         Heat: 5

From a1ba045f5936884f93e433efa534335fa5693bbe Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Wed, 4 Feb 2026 18:38:37 +0100
Subject: [PATCH 173/360] Downstream fix for #30515 - Temperature damage

---
 .../Prototypes/_DV/Entities/Mobs/NPCs/animals.yml      |  2 +-
 Resources/Prototypes/_DV/Entities/Mobs/NPCs/carp.yml   |  2 +-
 .../Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml   |  2 +-
 Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml   |  2 +-
 .../Prototypes/_DV/Entities/Mobs/Species/chitinid.yml  |  7 ++++---
 .../Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml |  2 +-
 .../_EE/Entities/Mobs/Player/silicon_base.yml          |  7 ++++---
 .../Entities/Mobs/Anomalites/anomalites.yml            | 10 ++++++----
 .../Prototypes/_Mono/Entities/Mobs/Species/asakim.yml  |  5 +++--
 .../Prototypes/_RMC14/Entities/Mobs/Species/avali.yml  |  5 +++--
 10 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml
index 56ab9379bd..dc77c59ef6 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/animals.yml
@@ -50,7 +50,7 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/fox_squeak.ogg
-  - type: Temperature
+  - type: TemperatureDamage
     coldDamageThreshold: 210
     coldDamage:
       types:
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/carp.yml
index 5646dd22d8..87d2180a84 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/carp.yml
@@ -38,7 +38,7 @@
   - type: Flammable
     damage:
       types: {}
-  - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 1200
   - type: MeleeWeapon
     damage:
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml
index 6eba61ab48..f2bc750483 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -112,7 +112,7 @@
   - type: NoSlip
   - type: Respirator #It just works?
     minSaturation: 5.0
-  - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 423
     coldDamageThreshold: 0
   - type: PressureImmunity
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
index 386ae70206..6f8a9fe211 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
@@ -53,7 +53,7 @@
     - K9
   - type: StealTarget
     stealGroup: AnimalSecurity # DeltaV - Adjusts because we have multiple possible sec animals
-  - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 315 # 10 lower than base
     coldDamageThreshold: 240 # 20 lower than base
   - type: Grappler
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
index 42bcefc034..46f4498dc7 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
@@ -84,11 +84,12 @@
         layer:
         - MobLayer
 
-  - type: Temperature # Ants hate the cold
-    heatDamageThreshold: 320
-    coldDamageThreshold: 230
+  - type: Temperature
     currentTemperature: 310.15
     specificHeat: 46
+  - type: TemperatureDamage # Ants hate the cold
+    heatDamageThreshold: 320
+    coldDamageThreshold: 230
     coldDamage:
       types:
         Cold : 1.25 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml
index 1455fde1bf..7566e38d34 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml
@@ -97,7 +97,7 @@
       Female: FemaleVulpkanin
       Unsexed: MaleVulpkanin
   - type: DogVision
-  - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 315 # 10 lower than base
     coldDamageThreshold: 220 # 40 lower than base, very insulating fur
 
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
index d3a19b7011..115ad2628f 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
@@ -64,17 +64,18 @@
         1: 0.45
         0: 0.00
     - type: Temperature
-      heatDamageThreshold: 1800 # GoobStation: Roughly the melting point of mild steels
-      coldDamageThreshold: 100 # DeltaV - has to be very cold
       currentTemperature: 310.15
       specificHeat: 42
+      atmosTemperatureTransferEfficiency: 0.05
+    - type: TemperatureDamage # DeltaV - Update for TemperatureDamage
+      heatDamageThreshold: 1800 # GoobStation: Roughly the melting point of mild steels
+      coldDamageThreshold: 100 # DeltaV - has to be very cold
       coldDamage:
         types:
           Cold: 0.1 #per second, scales with temperature & other constants
       heatDamage:
         types:
           Heat: 2 # DeltaV - was 3
-      atmosTemperatureTransferEfficiency: 0.05
     - type: KillOnOverheat # GoobStation
     - type: Deathgasp
       prototype: SiliconDeathgasp
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
index 1902e67c30..7c7a6ab754 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
@@ -208,13 +208,14 @@
   - type: Damageable
     damageModifierSet: AnomalitePyroclastic
   - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 42
+  - type: TemperatureDamage # DeltaV - Update for TemperatureDamage
     heatDamageThreshold: 325
     coldDamageThreshold: 0
-    currentTemperature: 310.15
     coldDamage:
       types:
         Cold: 0.1
-    specificHeat: 42
     heatDamage:
       types:
         Heat: 0.0
@@ -305,13 +306,14 @@
   - type: Damageable
     damageModifierSet: AnomaliteIce
   - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 42
+  - type: TemperatureDamage # DeltaV - Update for TemperatureDamage
     heatDamageThreshold: 325
     coldDamageThreshold: 0
-    currentTemperature: 310.15
     coldDamage:
       types:
         Cold: 0.0
-    specificHeat: 42
     heatDamage:
       types:
         Heat: 1.5
diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Species/asakim.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Species/asakim.yml
index 9c77f0ee20..d3cb481f0d 100644
--- a/Resources/Prototypes/_Mono/Entities/Mobs/Species/asakim.yml
+++ b/Resources/Prototypes/_Mono/Entities/Mobs/Species/asakim.yml
@@ -157,10 +157,11 @@
     solution: melee
     transferAmount: 1
   - type: Temperature
-    heatDamageThreshold: 400
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage # DeltaV - Update for TemperatureDamage
+    heatDamageThreshold: 400
+    coldDamageThreshold: 285
     coldDamage:
       types:
         Cold : 0.05 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
index 9cdc5cf28c..12ccca6c63 100644
--- a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
+++ b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
@@ -90,10 +90,11 @@
   - type: Damageable
     damageModifierSet: Avali
   - type: Temperature # thrives in the cold, similar to moths
-    heatDamageThreshold: 310
-    coldDamageThreshold: 223
     currentTemperature: 296.15 # lower natural body temp
     specificHeat: 25 # makes temp more lethal
+  - type: TemperatureDamage # DeltaV - Update for TemperatureDamage
+    heatDamageThreshold: 310
+    coldDamageThreshold: 223
     coldDamage:
       types:
         Cold : 0.05

From 9307e48366f0bbb5cba6dea5e47bd8fcdb4594a5 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Wed, 4 Feb 2026 20:25:50 +0100
Subject: [PATCH 174/360] Remove IPC InputMover for HeadIPC

---
 Resources/Prototypes/_EE/Body/Parts/ipc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_EE/Body/Parts/ipc.yml b/Resources/Prototypes/_EE/Body/Parts/ipc.yml
index 67c29962fd..99b4ec9bca 100644
--- a/Resources/Prototypes/_EE/Body/Parts/ipc.yml
+++ b/Resources/Prototypes/_EE/Body/Parts/ipc.yml
@@ -110,7 +110,7 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 0
     baseSprintSpeed: 0
-  - type: InputMover
+  #- type: InputMover # DeltaV - Disable InputMover on here else we get an assert
   - type: GhostOnMove
   - type: Tag
     tags:

From 573ca35bb947d5cc0daac089d7bd8901a0adc628 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Wed, 24 Dec 2025 00:15:10 -0800
Subject: [PATCH 175/360] AddMolsToMixture atmos helper (#42033)

---
 .../EntitySystems/AtmosphereSystem.Gases.cs   | 21 ++++++
 .../Server/Atmos/AddMolsToMixtureTest.cs      | 75 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index 0c6a3a7daa..95d56c9ca6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -3,6 +3,7 @@ using System.Runtime.CompilerServices;
 using Content.Server.Atmos.Reactions;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Reactions;
+using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
 
@@ -477,6 +478,26 @@ namespace Content.Server.Atmos.EntitySystems
             return reaction;
         }
 
+        /// <summary>
+        /// Adds an array of moles to a <see cref="GasMixture"/>.
+        /// Guards against negative moles by clamping to zero.
+        /// </summary>
+        /// <param name="mixture">The <see cref="GasMixture"/> to add moles to.</param>
+        /// <param name="molsToAdd">The <see cref="ReadOnlySpan{T}"/> of moles to add.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when the length of the <see cref="ReadOnlySpan{T}"/>
+        /// is not the same as the length of the <see cref="GasMixture"/> gas array.</exception>
+        [PublicAPI]
+        public static void AddMolsToMixture(GasMixture mixture, ReadOnlySpan<float> molsToAdd)
+        {
+            // Span length should be as long as the length of the gas array.
+            // Technically this is a redundant check because NumericsHelpers will do the same thing,
+            // but eh.
+            ArgumentOutOfRangeException.ThrowIfNotEqual(mixture.Moles.Length, molsToAdd.Length, nameof(mixture.Moles.Length));
+
+            NumericsHelpers.Add(mixture.Moles, molsToAdd);
+            NumericsHelpers.Max(mixture.Moles, 0f);
+        }
+
         public enum GasCompareResult
         {
             NoExchange = -2,
diff --git a/Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs b/Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs
new file mode 100644
index 0000000000..07b45bfe11
--- /dev/null
+++ b/Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs
@@ -0,0 +1,75 @@
+using System;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using NUnit.Framework;
+
+namespace Content.Tests.Server.Atmos;
+
+[TestFixture, TestOf(typeof(AtmosphereSystem))]
+[Parallelizable(ParallelScope.All)]
+public sealed class AddMolsToMixtureTest
+{
+    /// <summary>
+    /// Assert that an exception is thrown if the length of the array passed in
+    /// does not match the number of gases.
+    /// </summary>
+    [Test]
+    [TestCase(-1)]
+    [TestCase(1)]
+    public void AddMolsToMixture_Throws_OnLengthMismatch(int num)
+    {
+        var mixture = new GasMixture();
+        var wrongLength = new float[Atmospherics.AdjustedNumberOfGases + num];
+
+        var ex = Assert.Throws<ArgumentOutOfRangeException>(() =>
+            AtmosphereSystem.AddMolsToMixture(mixture, wrongLength));
+
+        Assert.That(ex!.ParamName, Is.EqualTo("Length"));
+    }
+
+    /// <summary>
+    /// Assert that the added mols are correctly added.
+    /// </summary>
+    [Test]
+    public void AddMolsToMixture_Adds_CheckElementwise()
+    {
+        var mixture = new GasMixture();
+        mixture.SetMoles(Gas.Oxygen, 1f);
+        mixture.SetMoles(Gas.Nitrogen, 2f);
+
+        var add = new float[Atmospherics.AdjustedNumberOfGases];
+        add[(int)Gas.Oxygen] = 3f;
+        add[(int)Gas.Nitrogen] = 4f;
+
+        AtmosphereSystem.AddMolsToMixture(mixture, add);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(mixture.GetMoles(Gas.Oxygen), Is.EqualTo(4f));
+            Assert.That(mixture.GetMoles(Gas.Nitrogen), Is.EqualTo(6f));
+        }
+    }
+
+    /// <summary>
+    /// Assert that the added mols are correctly clamped at zero.
+    /// </summary>
+    [Test]
+    public void AddMolsToMixture_EnsureClamp()
+    {
+        var mixture = new GasMixture();
+        mixture.SetMoles(Gas.Oxygen, 1f);
+        mixture.SetMoles(Gas.Nitrogen, 2f);
+
+        var add = new float[Atmospherics.AdjustedNumberOfGases];
+        add[(int)Gas.Oxygen] = -2f; // would go to -1 without clamping
+        add[(int)Gas.Nitrogen] = -1f; // should become 1
+
+        AtmosphereSystem.AddMolsToMixture(mixture, add);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(mixture.GetMoles(Gas.Oxygen), Is.Zero);
+            Assert.That(mixture.GetMoles(Gas.Nitrogen), Is.EqualTo(1f));
+        }
+    }
+}

From 189cda7ab3c51318413e6e465692728f62c8e084 Mon Sep 17 00:00:00 2001
From: TVK-04 <114073746+TVK-04@users.noreply.github.com>
Date: Wed, 24 Dec 2025 18:19:08 +0100
Subject: [PATCH 176/360] Fixed Voice Mask and Ripley APU interaction (#42023)

Would show player's real identity instead of assumed identity

Co-authored-by: TVK-04 <>
---
 Content.Server/Mech/Systems/MechSystem.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 61aa1aa1cc..f4b7ee48a8 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
 using Content.Server.Mech.Components;
@@ -6,6 +5,7 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Damage.Systems;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Mech;
 using Content.Shared.Mech.Components;
@@ -25,6 +25,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using System.Linq;
 
 namespace Content.Server.Mech.Systems;
 
@@ -219,7 +220,7 @@ public sealed partial class MechSystem : SharedMechSystem
                     {
                         BreakOnMove = true,
                     };
-                    _popup.PopupEntity(Loc.GetString("mech-eject-pilot-alert", ("item", uid), ("user", args.User)), uid, PopupType.Large);
+                    _popup.PopupEntity(Loc.GetString("mech-eject-pilot-alert", ("item", uid), ("user", Identity.Entity(args.User, EntityManager))), uid, PopupType.Large);
 
                     _doAfter.TryStartDoAfter(doAfterEventArgs);
                 }
@@ -235,7 +236,7 @@ public sealed partial class MechSystem : SharedMechSystem
 
         if (_whitelistSystem.IsWhitelistFail(component.PilotWhitelist, args.User))
         {
-            _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), args.User);
+            _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), Identity.Entity(args.User, EntityManager));
             return;
         }
 

From 42ce333e5a973b603ec9fdbe2e07a3d243d7aef9 Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Wed, 24 Dec 2025 22:17:51 +0200
Subject: [PATCH 177/360] Update dotnet sdk from 9 to 10 for nix devl shell.
 (#42041)

Update dotnet sdk from 9 to 10 in shell.nix
---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index dde341c88a..69ac881704 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,7 +12,7 @@
 
 let
   dependencies = with pkgs; [
-    dotnetCorePackages.sdk_9_0
+    dotnet-sdk_10
     icu
     glfw
     libGL

From 4a35a28e1b0e2da82782447eaa6908ae02a9d0cb Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Thu, 25 Dec 2025 21:53:14 +0100
Subject: [PATCH 178/360] make comp-repairable-repair sane (#42048)

---
 .../Locale/en-US/repairable/repairable-component.ftl      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Resources/Locale/en-US/repairable/repairable-component.ftl b/Resources/Locale/en-US/repairable/repairable-component.ftl
index 8e2e0e2ee1..3167b415cd 100644
--- a/Resources/Locale/en-US/repairable/repairable-component.ftl
+++ b/Resources/Locale/en-US/repairable/repairable-component.ftl
@@ -1,10 +1,4 @@
 ### Interaction Messages
 
 # Shown when repairing something
-comp-repairable-repair = You finish repairing {PROPER($target) ->
-  [true] {""}
-  *[false] the{" "}
-}{$target} with {PROPER($tool) ->
-  [true] {""}
-  *[false] the{" "}
-}{$tool}
+comp-repairable-repair = You finish repairing {THE($target)} with {THE($tool)}

From be00ff32c8ea84f8bb2b00daf72aeb7cf9335c8e Mon Sep 17 00:00:00 2001
From: TheFlyingSentry <170261226+TheFlyingSentry@users.noreply.github.com>
Date: Thu, 25 Dec 2025 18:21:40 -0500
Subject: [PATCH 179/360] Fixed Xeno air alarms warning/danger sprites not
 showing (#41590)

Fixed Xeno air alarms (someone didn't copy paste correctly :3)
---
 .../WallmountMachines/air_alarm.yml           |   4 +++-
 .../air_monitors_xeno.rsi/alarm1.png          | Bin 17694 -> 17732 bytes
 .../air_monitors_xeno.rsi/alarm2.png          | Bin 17732 -> 17694 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index a61b35c0de..533d592641 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
@@ -162,8 +162,10 @@
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
     layers:
+    - state: alarmp
+      map: ["airAlarmBase"]  # TODO: fire alarm enum
     - state: alarm0
-      map: ["airAlarmBase"] # TODO: fire alarm enum
+      map: ["airAlarmState"]
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Construction
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm1.png
index 3284ec9f01a71008a5487f20af1ee4fe7f659e05..33852a99f025c472a59be95f6c831f35d51677fa 100644
GIT binary patch
delta 3102
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
ZCHJf73*ZJNL4qI<$jaQ-tj@$M{y(8)-Npa_

delta 3062
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

diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm2.png
index 33852a99f025c472a59be95f6c831f35d51677fa..3284ec9f01a71008a5487f20af1ee4fe7f659e05 100644
GIT binary patch
delta 3062
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

delta 3102
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
ZCHJf73*ZJNL4qI<$jaQ-tj@$M{y(8)-Npa_


From d8ce0d767b5ec78be423d89aa15449d164744791 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Thu, 25 Dec 2025 18:47:05 -0800
Subject: [PATCH 180/360] Voice mask effects are toggleable and hide your
 accent (#41965)

* apply negate accents system

* add toggle to voice mask ui

* roll negateaccents into voice mask system, delete negate accents comp&system, update yml entries

* convert button to ToggleButton and some cleanup

* retry for heisenfail

* accent toggle

* update names and add mask active check for accent hiding
---
 .../VoiceMask/VoiceMaskBoundUserInterface.cs  | 14 ++++-
 .../VoiceMask/VoiceMaskNameChangeWindow.xaml  |  2 +
 .../VoiceMaskNameChangeWindow.xaml.cs         |  9 ++-
 Content.Server/Chat/Systems/ChatSystem.cs     |  2 +-
 Content.Server/Speech/AccentSystem.cs         |  3 +
 .../VoiceMask/VoiceMaskComponent.cs           | 12 ++++
 Content.Server/VoiceMask/VoiceMaskSystem.cs   | 57 +++++++++++++++++--
 Content.Shared/Chat/SharedChatEvents.cs       |  3 +-
 .../SharedSubdermalImplantSystem.Relays.cs    |  1 +
 .../Inventory/InventorySystem.Relay.cs        |  1 +
 .../VoiceMask/SharedVoiceMaskSystem.cs        | 18 +++++-
 Resources/Locale/en-US/voice-mask.ftl         |  5 ++
 12 files changed, 118 insertions(+), 9 deletions(-)

diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
index e76ca1cf8f..b2b374cac5 100644
--- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
+++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
@@ -26,6 +26,8 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
 
         _window.OnNameChange += OnNameSelected;
         _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
+        _window.OnToggle += OnToggle;
+        _window.OnAccentToggle += OnAccentToggle;
     }
 
     private void OnNameSelected(string name)
@@ -33,6 +35,16 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
         SendMessage(new VoiceMaskChangeNameMessage(name));
     }
 
+    private void OnToggle()
+    {
+        SendMessage(new VoiceMaskToggleMessage());
+    }
+
+    private void OnAccentToggle()
+    {
+        SendMessage(new VoiceMaskAccentToggleMessage());
+    }
+
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         if (state is not VoiceMaskBuiState cast || _window == null)
@@ -40,7 +52,7 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
             return;
         }
 
-        _window.UpdateState(cast.Name, cast.Verb);
+        _window.UpdateState(cast.Name, cast.Verb, cast.Active, cast.AccentHide);
     }
 
     protected override void Dispose(bool disposing)
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
index e23aca1239..18416757b9 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
@@ -12,5 +12,7 @@
             <Label Text="{Loc 'voice-mask-name-change-speech-style'}" />
             <OptionButton Name="SpeechVerbSelector" /> <!-- Populated in LoadVerbs -->
         </BoxContainer>
+        <Button Name="ToggleAccentButton" Text="{Loc 'voice-mask-name-change-accent-toggle'}" HorizontalExpand="True" ToggleMode="True" Margin="5"/>
+        <Button Name="ToggleButton" Text="{Loc 'voice-mask-name-change-toggle'}" HorizontalExpand="True" ToggleMode="True" Margin="5"/>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index 7ca4dd4b95..a5e7036283 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -12,6 +12,8 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
 {
     public Action<string>? OnNameChange;
     public Action<string?>? OnVerbChange;
+    public Action? OnToggle;
+    public Action? OnAccentToggle;
 
     private List<(string, string)> _verbs = new();
 
@@ -31,6 +33,9 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
             OnVerbChange?.Invoke((string?) args.Button.GetItemMetadata(args.Id));
             SpeechVerbSelector.SelectId(args.Id);
         };
+
+        ToggleButton.OnPressed += args => OnToggle?.Invoke();
+        ToggleAccentButton.OnPressed += args => OnAccentToggle?.Invoke();
     }
 
     public void ReloadVerbs(IPrototypeManager proto)
@@ -64,10 +69,12 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
             SpeechVerbSelector.SelectId(id);
     }
 
-    public void UpdateState(string name, string? verb)
+    public void UpdateState(string name, string? verb, bool active, bool accentHide)
     {
         NameSelector.Text = name;
         _verb = verb;
+        ToggleButton.Pressed = active;
+        ToggleAccentButton.Pressed = accentHide;
 
         for (int id = 0; id < SpeechVerbSelector.ItemCount; id++)
         {
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 6dcf92c902..6dedddffbd 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -831,7 +831,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     public string TransformSpeech(EntityUid sender, string message)
     {
         var ev = new TransformSpeechEvent(sender, message);
-        RaiseLocalEvent(ev);
+        RaiseLocalEvent(sender, ev, true);
 
         return ev.Message;
     }
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs
index 275a4175c8..6f89a7d14d 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Server/Speech/AccentSystem.cs
@@ -15,6 +15,9 @@ public sealed class AccentSystem : EntitySystem
 
     private void AccentHandler(TransformSpeechEvent args)
     {
+        if (args.Cancelled)
+            return;
+
         var accentEvent = new AccentGetEvent(args.Sender, args.Message);
 
         RaiseLocalEvent(args.Sender, accentEvent, true);
diff --git a/Content.Server/VoiceMask/VoiceMaskComponent.cs b/Content.Server/VoiceMask/VoiceMaskComponent.cs
index f7e07f2bd1..042b78a859 100644
--- a/Content.Server/VoiceMask/VoiceMaskComponent.cs
+++ b/Content.Server/VoiceMask/VoiceMaskComponent.cs
@@ -43,5 +43,17 @@ public sealed partial class VoiceMaskComponent : Component
     /// </summary>
     [DataField]
     public EntityUid? ActionEntity;
+
+    /// <summary>
+    ///     If user's voice is getting changed when they speak.
+    /// </summary>
+    [DataField]
+    public bool Active = true;
+
+    /// <summary>
+    ///     If user's accent is getting hidden when they speak.
+    /// </summary>
+    [DataField]
+    public bool AccentHide = true;
 }
 
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 170bddf082..a67bfb8b66 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Speech;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
@@ -10,7 +11,6 @@ using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
-using Content.Shared.Preferences;
 using Content.Shared.Speech;
 using Content.Shared.VoiceMask;
 using Robust.Shared.Configuration;
@@ -45,12 +45,41 @@ public sealed partial class VoiceMaskSystem : EntitySystem
         SubscribeLocalEvent<VoiceMaskComponent, LockToggledEvent>(OnLockToggled);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
+        SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskToggleMessage>(OnToggle);
+        SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskAccentToggleMessage>(OnAccentToggle);
         SubscribeLocalEvent<VoiceMaskComponent, ClothingGotEquippedEvent>(OnEquip);
         SubscribeLocalEvent<VoiceMaskSetNameEvent>(OpenUI);
+        SubscribeLocalEvent<VoiceMaskComponent, TransformSpeechEvent>(OnTransformSpeech, before: [typeof(AccentSystem)]);
+        SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeechEvent>>(OnTransformSpeechInventory, before: [typeof(AccentSystem)]);
+        SubscribeLocalEvent<VoiceMaskComponent, ImplantRelayEvent<TransformSpeechEvent>>(OnTransformSpeechImplant, before: [typeof(AccentSystem)]);
 
         Subs.CVar(_cfgManager, CCVars.MaxNameLength, value => _maxNameLength = value, true);
     }
 
+    /// <summary>
+    ///     Hides accent if the voice mask is on and the option to block accents is on
+    /// </summary>
+    private void TransformSpeech(Entity<VoiceMaskComponent> entity, TransformSpeechEvent args)
+    {
+        if (entity.Comp.AccentHide && entity.Comp.Active)
+            args.Cancel();
+    }
+
+    private void OnTransformSpeech(Entity<VoiceMaskComponent> entity, ref TransformSpeechEvent args)
+    {
+        TransformSpeech(entity, args);
+    }
+
+    private void OnTransformSpeechInventory(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeechEvent> args)
+    {
+        TransformSpeech(entity, args.Args);
+    }
+
+    private void OnTransformSpeechImplant(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<TransformSpeechEvent> args)
+    {
+        TransformSpeech(entity, args.Event);
+    }
+
     private void OnTransformSpeakerNameInventory(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
     {
         TransformVoice(entity, args.Args);
@@ -63,8 +92,10 @@ public sealed partial class VoiceMaskSystem : EntitySystem
 
     private void OnSeeIdentityAttemptEvent(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<SeeIdentityAttemptEvent> args)
     {
-        if (entity.Comp.OverrideIdentity)
-            args.Event.NameOverride = GetCurrentVoiceName(entity);
+        if (!entity.Comp.OverrideIdentity || !entity.Comp.Active)
+            return;
+
+        args.Event.NameOverride = GetCurrentVoiceName(entity);
     }
 
     private void OnImplantImplantedEvent(Entity<VoiceMaskComponent> entity, ref ImplantImplantedEvent ev)
@@ -117,6 +148,21 @@ public sealed partial class VoiceMaskSystem : EntitySystem
 
         UpdateUI(entity);
     }
+
+    private void OnToggle(Entity<VoiceMaskComponent> entity, ref VoiceMaskToggleMessage args)
+    {
+        _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-toggle"), entity, args.Actor);
+        entity.Comp.Active = !entity.Comp.Active;
+
+        // Update identity because of possible name override
+        _identity.QueueIdentityUpdate(args.Actor);
+    }
+
+    private void OnAccentToggle(Entity<VoiceMaskComponent> entity, ref VoiceMaskAccentToggleMessage args)
+    {
+        _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-accent-toggle"), entity, args.Actor);
+        entity.Comp.AccentHide = !entity.Comp.AccentHide;
+    }
     #endregion
 
     #region UI
@@ -145,7 +191,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     private void UpdateUI(Entity<VoiceMaskComponent> entity)
     {
         if (_uiSystem.HasUi(entity, VoiceMaskUIKey.Key))
-            _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb));
+            _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb, entity.Comp.Active, entity.Comp.AccentHide));
     }
     #endregion
 
@@ -157,6 +203,9 @@ public sealed partial class VoiceMaskSystem : EntitySystem
 
     private void TransformVoice(Entity<VoiceMaskComponent> entity, TransformSpeakerNameEvent args)
     {
+        if (!entity.Comp.Active)
+            return;
+
         args.VoiceName = GetCurrentVoiceName(entity);
         args.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.SpeechVerb;
     }
diff --git a/Content.Shared/Chat/SharedChatEvents.cs b/Content.Shared/Chat/SharedChatEvents.cs
index f9b706e57d..5701081b56 100644
--- a/Content.Shared/Chat/SharedChatEvents.cs
+++ b/Content.Shared/Chat/SharedChatEvents.cs
@@ -27,8 +27,9 @@ public sealed class TransformSpeakerNameEvent : EntityEventArgs, IInventoryRelay
 /// <summary>
 /// Raised broadcast in order to transform speech.transmit
 /// </summary>
-public sealed class TransformSpeechEvent : EntityEventArgs
+public sealed class TransformSpeechEvent : CancellableEntityEventArgs, IInventoryRelayEvent
 {
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
     public EntityUid Sender;
     public string Message;
 
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
index 774be5d9b2..24b76e15c5 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
@@ -15,6 +15,7 @@ public abstract partial class SharedSubdermalImplantSystem
         SubscribeLocalEvent<ImplantedComponent, AfterInteractUsingEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, SuicideEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, TransformSpeakerNameEvent>(RelayToImplantEvent);
+        SubscribeLocalEvent<ImplantedComponent, TransformSpeechEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, SeeIdentityAttemptEvent>(RelayToImplantEvent);
     }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index b2841321c5..431b79865f 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -50,6 +50,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, GetDefaultRadioChannelEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshNameModifiersEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, TransformSpeakerNameEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, TransformSpeechEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SelfBeforeInjectEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, BeforeInjectTargetEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SelfBeforeGunShotEvent>(RelayInventoryEvent);
diff --git a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
index 2855891946..9d586a5af8 100644
--- a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
+++ b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
@@ -13,11 +13,15 @@ public sealed class VoiceMaskBuiState : BoundUserInterfaceState
 {
     public readonly string Name;
     public readonly string? Verb;
+    public readonly bool Active;
+    public readonly bool AccentHide;
 
-    public VoiceMaskBuiState(string name, string? verb)
+    public VoiceMaskBuiState(string name, string? verb, bool active, bool accentHide)
     {
         Name = name;
         Verb = verb;
+        Active = active;
+        AccentHide = accentHide;
     }
 }
 
@@ -45,3 +49,15 @@ public sealed class VoiceMaskChangeVerbMessage : BoundUserInterfaceMessage
         Verb = verb;
     }
 }
+
+/// <summary>
+///     Toggle the effects of the voice mask.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class VoiceMaskToggleMessage : BoundUserInterfaceMessage;
+
+/// <summary>
+///     Toggle the effects of accent negation.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class VoiceMaskAccentToggleMessage : BoundUserInterfaceMessage;
diff --git a/Resources/Locale/en-US/voice-mask.ftl b/Resources/Locale/en-US/voice-mask.ftl
index f3740cdafb..cd06e61eb2 100644
--- a/Resources/Locale/en-US/voice-mask.ftl
+++ b/Resources/Locale/en-US/voice-mask.ftl
@@ -5,6 +5,11 @@ voice-mask-name-change-info = Type in the name you want to mimic.
 voice-mask-name-change-speech-style = Speech style
 voice-mask-name-change-set = Set name
 voice-mask-name-change-set-description = Change the name others hear to something else.
+voice-mask-name-change-toggle = Toggle voice mask
+voice-mask-name-change-accent-toggle = Block accent
+
+voice-mask-popup-toggle = Toggled voice mask.
+voice-mask-popup-accent-toggle = Toggled accent.
 
 voice-mask-popup-success = Name set successfully.
 voice-mask-popup-failure = Name could not be set.

From 861ed0ea9d12a217de722443e65e0c0628e05e75 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 25 Dec 2025 23:41:27 -0800
Subject: [PATCH 181/360] Fix Kitchen Spike Paralysis by removing an unused
 subscription.  (#42078)

* remove

* ACK ACK ACK ACK

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs   |  1 -
 Content.Shared/Movement/Events/UpdateCanMoveEvent.cs | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
index 928ea6f163..59535eee50 100644
--- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
+++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
@@ -73,7 +73,6 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
 
         // Prevent the victim from doing anything while on the spike.
         SubscribeLocalEvent<KitchenSpikeHookedComponent, ChangeDirectionAttemptEvent>(OnAttempt);
-        SubscribeLocalEvent<KitchenSpikeHookedComponent, UpdateCanMoveEvent>(OnAttempt);
         SubscribeLocalEvent<KitchenSpikeHookedComponent, UseAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<KitchenSpikeHookedComponent, ThrowAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<KitchenSpikeHookedComponent, DropAttemptEvent>(OnAttempt);
diff --git a/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs b/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs
index d9772c1cf4..3efeaeaf4c 100644
--- a/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs
+++ b/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs
@@ -1,11 +1,17 @@
+using Content.Shared.ActionBlocker;
 using Content.Shared.Movement.Components;
 
 namespace Content.Shared.Movement.Events;
 
 /// <summary>
-///     Raised whenever <see cref="IMoverComponent.CanMove"/> needs to be updated. Cancel this event to prevent a
-///     mover from moving.
+///     Raised whenever <see cref="InputMoverComponent.CanMove"/> needs to be updated.
+///     Cancel this event to prevent a mover from moving.
 /// </summary>
+/// <remarks>
+///     This is not an attempt event and the result is cached.
+///     If you subscribe to this you must also call <see cref="ActionBlockerSystem.UpdateCanMove(EntityUid,InputMoverComponent?)"/>
+///     both when you want to prevent a mob from moving, and when you want to allow them to move again!
+/// </remarks>
 public sealed class UpdateCanMoveEvent : CancellableEntityEventArgs
 {
     public UpdateCanMoveEvent(EntityUid uid)

From ef1d5f1bd6a19ea3dc29103055ed43868c8198c4 Mon Sep 17 00:00:00 2001
From: GeneralGaws <122978178+GeneralGaws@users.noreply.github.com>
Date: Fri, 26 Dec 2025 19:28:02 +0300
Subject: [PATCH 182/360] Energy guns' fire mode text formating fix (#42103)

issue
---
 .../Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs    | 4 ++--
 Resources/Locale/en-US/weapons/ranged/gun.ftl                 | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 81f4ad3213..59b4345f97 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -38,7 +38,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
         if (!_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var proto))
             return;
 
-        args.PushMarkup(Loc.GetString("gun-set-fire-mode", ("mode", proto.Name)));
+        args.PushMarkup(Loc.GetString("gun-set-fire-mode-examine", ("mode", proto.Name)));
     }
 
     private BatteryWeaponFireMode GetMode(BatteryWeaponFireModesComponent component)
@@ -124,7 +124,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
                 _appearanceSystem.SetData(uid, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance);
 
             if (user != null)
-                _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode", ("mode", prototype.Name)), uid, user.Value);
+                _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), uid, user.Value);
         }
 
         if (TryComp(uid, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent))
diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl
index 08f1f6cb22..bc54aeb3f4 100644
--- a/Resources/Locale/en-US/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -4,7 +4,8 @@ gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per sec
 gun-selector-verb = Change to {$mode}
 gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
-gun-set-fire-mode = Set to [color=yellow]{$mode}[/color].
+gun-set-fire-mode-examine = Set to [color=yellow]{$mode}[/color].
+gun-set-fire-mode-popup = Changed to {$mode}
 gun-magazine-whitelist-fail = That won't fit into the gun!
 gun-magazine-fired-empty = No ammo left!
 

From 90580db6669da8701483954dd6b25feff798f72b Mon Sep 17 00:00:00 2001
From: Nox <nebulousnox38@gmail.com>
Date: Fri, 26 Dec 2025 16:33:43 -0500
Subject: [PATCH 183/360] ERT Overhaul 3/3: Loadouts (#38481)

* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* First implementation of humanoid.yml

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added leader, chaplain, and half implemented paladin

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Bit more work on chaplain

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Started adding engineer

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished ERT security, Leader, and Chaplain. Issue remaining with the fills and shotgun ammo, rifleman half done.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added all loadouts

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added names, finished loadouts.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Tested loadouts, added chaplain job icon (finally), ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* ERT now use double tanks by default

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Misc fixes

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Minor spelling mistake:

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed all known issues with the PR, ready for review!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed random metadata

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fail

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fail I hope?

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* defintely fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Slight loadout fixes to bring everything up to date.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished reverting contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Replaced the melee ert security with a marksman

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag, made engi loadouts work without a duffel (still finishing medic loadouts)

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished updating loadouts to account for removed duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Replaced armed engineer's C4 with explosive cord

* Replaced leader's XL8 with a standard Lecter

* Updated leader loadout

* Minor fix to ERT leader

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix formatting

* Fixed rifleman, armed engineer, and test fail

* Finished vanguard, chaplain.

* Fixed minor spelling mistake

* Gave ERT medics back their omnizine

* Added ERT security breacher, made ERT survival boxes 2x2.

* Finished implementing security shotgunner

* one small thing

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../random-metadata-formats.ftl               |  11 +-
 .../Catalog/Fills/Boxes/emergency.yml         |   8 +-
 .../Entities/Mobs/Player/humanoid.yml         | 279 +++++-----
 .../Objects/Specific/chemical-containers.yml  |   1 -
 .../Jobs/CentComm/emergencyresponseteam.yml   | 526 +++++++++++-------
 .../Textures/Markers/jobs.rsi/ertchaplain.png | Bin 0 -> 1077 bytes
 .../Markers/jobs.rsi/ertchaplaineva.png       | Bin 0 -> 1005 bytes
 Resources/Textures/Markers/jobs.rsi/meta.json | 408 +++++++-------
 8 files changed, 683 insertions(+), 550 deletions(-)
 create mode 100644 Resources/Textures/Markers/jobs.rsi/ertchaplain.png
 create mode 100644 Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png

diff --git a/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl b/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
index fb572b6c7a..0139bd1980 100644
--- a/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
+++ b/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
@@ -15,8 +15,17 @@ name-format-nukie-generic = {$part0} {$part1}
 name-format-nukie-agent = Agent {$part0}
 name-format-nukie-commander = Commander {$part0}
 name-format-nukie-operator = Operator {$part0}
-# "<title> <name>"
+
 name-format-ert = {$part0} {$part1}
+name-format-ert-leader = Sergeant {$part0}
+name-format-ert-specialist = Specialist {$part0}
+name-format-ert-pointman = Pointman {$part0}
+name-format-ert-officer = Officer {$part0}
+name-format-ert-rifle = Rifleman {$part0}
+name-format-ert-grenade = Grenadier {$part0}
+name-format-ert-vanguard = Vanguard {$part0}
+name-format-ert-doctor = Doctor {$part0}
+name-format-ert-corpsman = Corpsman {$part0}
 
 # "<appearance> <type>"
 name-format-book = {$part0} {$part1}
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 555d4100df..4d451d55d4 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -330,19 +330,16 @@
 
 
 - type: entity
-  parent: BoxCardboard
+  parent: BoxCardboardSmall # Cannot fit 3x3 boxes into already-filled ERT backpacks.
   id: BoxSurvivalMilitaryDouble
   suffix: Military O2
   description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
   components:
   - type: StorageFill
     contents:
-    - id: ClothingMaskBreath
     - id: DoubleEmergencyOxygenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
-    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
     - state: internals
@@ -355,12 +352,9 @@
   components:
   - type: StorageFill
     contents:
-    - id: ClothingMaskBreath
     - id: DoubleEmergencyNitrogenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
-    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
     - state: internals
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 43fe8a9132..cd924c1e85 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -84,11 +84,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertleader
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirstLeader
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTLeader
 
@@ -105,19 +100,18 @@
       job: ERTLeader
     - type: Loadout
       prototypes: [ ERTLeaderGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirstLeader
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-leader
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVA
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTLeader
   name: ERT leader
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -129,40 +123,26 @@
   id: ERTLeaderEVA
   parent: ERTLeader
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-leader-name
-      description: ghost-role-information-ert-leader-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTLeader
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTLeaderEVALecter
+  id: RandomHumanoidSpawnerERTLeaderArmed
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTLeaderEVA
-  suffix: ERTRole, Lecter, EVA
+  suffix: ERTRole, Armed, EVA
   components:
     - type: RandomHumanoidSpawner
-      settings: ERTLeaderEVALecter
+      settings: ERTLeaderArmed
 
 - type: randomHumanoidSettings
-  id: ERTLeaderEVALecter
+  id: ERTLeaderArmed
   parent: ERTLeaderEVA
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-leader-name
-      description: ghost-role-information-ert-leader-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTLeader
     - type: Loadout
-      prototypes: [ ERTLeaderGearEVALecter ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      prototypes: [ ERTLeaderGearArmed ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Chaplain
 
@@ -175,12 +155,7 @@
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
-      state: chaplain #needs an ERT variant once a good suit it made.
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
+      state: ertchaplain
     - type: RandomHumanoidSpawner
       settings: ERTChaplain
 
@@ -198,23 +173,22 @@
       job: ERTChaplain
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-specialist
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTChaplain
   name: ERT chaplain
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
-      state: chaplain #needs an ERT variant once a good suit it made.
+      state: ertchaplaineva
     - type: RandomHumanoidSpawner
       settings: ERTChaplainEVA
 
@@ -222,17 +196,9 @@
   id: ERTChaplainEVA
   parent: ERTChaplain
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-chaplain-name
-      description: ghost-role-information-ert-chaplain-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTChaplain
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
-    - type: BibleUser
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Janitor
 
@@ -246,11 +212,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertjanitor
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTJanitor
 
@@ -267,19 +228,17 @@
       job: ERTJanitor
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-specialist
     - type: Loadout
       prototypes: [ ERTJanitorGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTJanitor
-  name: ERT janitor
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -291,16 +250,9 @@
   id: ERTJanitorEVA
   parent: ERTJanitor
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-janitor-name
-      description: ghost-role-information-ert-janitor-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTJanitor
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Engineer
 
@@ -314,11 +266,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertengineer
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTEngineer
 
@@ -335,19 +282,17 @@
       job: ERTEngineer
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-specialist
     - type: Loadout
       prototypes: [ ERTEngineerGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTEngineer
-  name: ERT engineer
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -359,16 +304,29 @@
   id: ERTEngineerEVA
   parent: ERTEngineer
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-engineer-name
-      description: ghost-role-information-ert-engineer-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTEngineer
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTEngineerEVA
+  id: RandomHumanoidSpawnerERTEngineerArmed
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTEngineerArmed
+
+- type: randomHumanoidSettings
+  id: ERTEngineerArmed
+  parent: ERTEngineer
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-pointman
+  - type: Loadout
+    prototypes: [ ERTEngineerGearArmed ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Security
 
@@ -382,11 +340,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertsecurity
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTSecurity
 
@@ -403,19 +356,18 @@
       job: ERTSecurity
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-officer
     - type: Loadout
       prototypes: [ ERTSecurityGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTSecurity
   name: ERT security
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -436,31 +388,92 @@
       job: ERTSecurity
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTSecurityEVALecter
-  categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
+  id: RandomHumanoidSpawnerERTSecurityArmedRifle
   parent: RandomHumanoidSpawnerERTSecurityEVA
-  suffix: ERTRole, Lecter, EVA
+  categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
+  name: ERT security rifleman
+  suffix: ERTRole, Armed, EVA
   components:
-    - type: RandomHumanoidSpawner
-      settings: ERTSecurityEVALecter
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedRifle
 
 - type: randomHumanoidSettings
-  id: ERTSecurityEVALecter
+  id: ERTSecurityArmedRifle
   parent: ERTSecurityEVA
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-security-name
-      description: ghost-role-information-ert-security-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTSecurity
-    - type: Loadout
-      prototypes: [ ERTSecurityGearEVALecter ]
-      roleLoadout: [ RoleSurvivalEVA ]
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-rifle
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedRifle ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  id: RandomHumanoidSpawnerERTSecurityArmedGrenade
+  name: ERT security grenadier
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedGrenade
+
+- type: randomHumanoidSettings
+  parent: ERTSecurityEVA
+  id: ERTSecurityArmedGrenade
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-grenade
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedGrenade ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  id: RandomHumanoidSpawnerERTSecurityArmedVanguard
+  name: ERT security vanguard
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedVanguard
+
+- type: randomHumanoidSettings
+  parent: ERTSecurityEVA
+  id: ERTSecurityArmedVanguard
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-vanguard
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedVanguard ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  id: RandomHumanoidSpawnerERTSecurityArmedShotgun
+  name: ERT security breacher
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedShotgun
+
+- type: randomHumanoidSettings
+  parent: ERTSecurityEVA
+  id: ERTSecurityArmedShotgun
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-pointman
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedShotgun ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Medic
 
@@ -474,11 +487,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertmedical
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTMedical
 
@@ -495,19 +503,17 @@
       job: ERTMedical
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-doctor
     - type: Loadout
       prototypes: [ ERTMedicalGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTMedicalEVA
   categories: [ HideSpawnMenu ] # Delta V - We have our own spawners
   parent: RandomHumanoidSpawnerERTMedical
-  name: ERT medic
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -519,16 +525,29 @@
   id: ERTMedicalEVA
   parent: ERTMedical
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-medical-name
-      description: ghost-role-information-ert-medical-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTMedical
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTMedicalEVA
+  id: RandomHumanoidSpawnerERTMedicalArmed
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTMedicalArmed
+
+- type: randomHumanoidSettings
+  parent: ERTMedicalEVA
+  id: ERTMedicalArmed
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-corpsman
+  - type: Loadout
+    prototypes: [ ERTMedicalGearArmed ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## CBURN
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index ab79e465b3..5ba021573e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -91,7 +91,6 @@
 - type: entity
   parent: Jug
   id: JugPunctTranex
-  categories: [ HideSpawnMenu ]
   suffix: punct & tranex
   components:
   - type: Label
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
index 2c65f8b8bb..2baf53c243 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -25,78 +25,76 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
+  parent: ERTLeaderGearEVA
   id: ERTLeaderGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeader
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTLeader
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984
+    outerClothing: ClothingOuterArmorBasic
     pocket2: FlashlightSeclite
-  storage:
-    back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
-    - CrowbarRed
-    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
     back: ClothingBackpackERTLeader
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesHudMedSec
+    neck: Whistle
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTLeader
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984
-    pocket2: FlashlightSeclite
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponDisablerSMG
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
+    - Binoculars
+    - HoloprojectorField
+    - PhoneInstrument
+    - PinpointerNuclear
+    - PowerCellHigh
+    - PowerCellHigh
+    - MedkitCombatFilled # End of first line
+    - MedkitCombatFilled
+    - TelescopicShield
+    belt:
+    - Stunbaton
+    - Handcuffs
+    - Handcuffs
     - CrowbarRed
+    - WeaponPistolN1984
     - MagazineMagnum
+    - EmergencyMedipen
 
 - type: startingGear
-  id: ERTLeaderGearEVALecter
+  parent: ERTLeaderGearEVA
+  id: ERTLeaderGearArmed
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeader
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTLeader
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: MagazineRifle
-    pocket2: MagazineRifle
-  inhand:
-  - WeaponRifleLecterXL8
+    pocket2: WeaponDisabler
+    suitstorage: WeaponRifleLecterXL8
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
+    - HoloprojectorField
+    - PhoneInstrument
+    - PinpointerNuclear
+    - MagazineRifle
+    - MagazineRifle
+    - MagazineRifleIncendiary
+    - MagazineRifleUranium
+    - MedkitCombatFilled # End of first line
+    - GrenadeShrapnel
+    - EmpGrenade
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
     - CrowbarRed
+    - WeaponPistolN1984
     - MagazineMagnum
+    - EmergencyMedipen
 
 - type: chameleonOutfit
   id: ERTLeaderChameleonOutfit
@@ -136,66 +134,49 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
+  parent: ERTChaplainGearEVA
   id: ERTChaplainGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplain
-    shoes: ClothingShoesLeather
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHatFez
-    eyes: ClothingEyesGlasses
     neck: ClothingNeckStoleChaplain
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTChaplainPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltStorageWaistbag
-    pocket1: Flare
-    pocket2: DrinkWaterBottleFull
-  storage:
-    back:
-    - BoxCandle
-    - BoxBodyBag
-    - DrinkWaterMelonJuiceJug
-    - Lantern
-    - Lantern
-    - Bible
-    - CrowbarRed
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - Lighter
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTChaplainGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
     back: ClothingBackpackERTChaplain
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlasses
-    neck: ClothingNeckStoleChaplain
+    eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTChaplain
     id: ERTChaplainPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltStorageWaistbag
-    pocket1: Flare
-    pocket2: DrinkWaterBottleFull
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
   storage:
     back:
     - BoxCandle
-    - BoxBodyBag
-    - DrinkWaterMelonJuiceJug
-    - Lantern
-    - Lantern
+    - BodyBagFolded
+    - BodyBagFolded
+    - JugWater
+    - JugBlood # End of first row
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    belt:
     - Bible
+    - Lantern
+    - Lantern
+    - Lantern
     - CrowbarRed
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - Lighter
+    - WeaponPistolMk58
+    - MagazinePistol
+    - FlippoEngravedLighter
 
 - type: chameleonOutfit
   id: ERTChaplainChameleonOutfit
@@ -234,60 +215,71 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
+  parent: ERTEngineerGearEVA
   id: ERTEngineerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineer
-    shoes: ClothingShoesBootsWork
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTEngineer
-    eyes: ClothingEyesGlassesMeson
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTEngineerPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltChiefEngineerFilled
-    pocket1: Flare
-    pocket2: GasAnalyzer
-  storage:
-    back:
-    - trayScanner
-    - RCD
-    - RCDAmmo
-    - RCDAmmo
-    - CableMVStack
-    - CableHVStack
-    - CableApcStack
-    - SheetPlasteel
-    - SheetSteel
-    - SheetGlass
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTEngineerGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
     back: ClothingBackpackERTEngineer
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesMeson
+    eyes: ClothingEyesHudDiagnostic
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTEngineer
     id: ERTEngineerPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltChiefEngineerFilled
-    pocket1: Flare
-    pocket2: GasAnalyzer
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
   storage:
     back:
-    - trayScanner
     - RCD
+    - GasAnalyzer
+    - trayScanner
+    - HolofanProjector
+    - PartRodMetal
+    - SheetPlasteel # End of first line
+    - MiningDrillDiamond
     - RCDAmmo
     - RCDAmmo
-    - CableMVStack
-    - CableHVStack
-    - CableApcStack
-    - SheetPlasteel
-    - SheetSteel
-    - SheetGlass
+    - RCDAmmo
+    - RCDAmmo
+    - MetalFoamGrenade
+    - AirGrenade
+    belt:
+    - JawsOfLife
+    - PowerDrill
+    - WelderIndustrialAdvanced
+    - Multitool
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTEngineerGearEVA
+  id: ERTEngineerGearArmed
+  equipment:
+    suitstorage: WeaponShotgunEnforcer
+  storage:
+    back:
+    - RCD
+    - GasAnalyzer
+    - HolofanProjector
+    - MiningDrillDiamond
+    - BoxLethalshot
+    - BoxShotgunSlug # End of first line
+    - RCDAmmo
+    - RCDAmmo
+    - RCDAmmo
+    - RCDAmmo
+    - CableDetStack
+    - BoxDetonator
 
 - type: chameleonOutfit
   id: ERTEngineerChameleonOutfit
@@ -321,78 +313,164 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
+  parent: ERTSecurityGearEVA
   id: ERTSecurityGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurity
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTSecurity
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTSecurityPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    outerClothing: ClothingOuterArmorBasic
     pocket2: FlashlightSeclite
-  storage:
-    back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
-    - CrowbarRed
-    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
     back: ClothingBackpackERTSecurity
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesHudSecurity
     gloves: ClothingHandsGlovesCombat
+    neck: SecurityWhistle
     outerClothing: ClothingOuterHardsuitERTSecurity
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
-    pocket2: FlashlightSeclite
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponDisablerSMG
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
     - BoxZiptie
+    - Flash
+    - GrenadeFlashBang
+    - TearGasGrenade
+    - GrenadeStinger
+    - MedkitCombatFilled # End of first line
+    - TelescopicShield
+    - HoloprojectorSecurity
+    - PowerCellHigh
+    belt:
+    - Stunbaton
+    - Handcuffs
+    - Handcuffs
     - CrowbarRed
+    - WeaponPistolMk58
     - MagazinePistol
+    - EmergencyMedipen
 
 - type: startingGear
-  id: ERTSecurityGearEVALecter
+  id: ERTSecurityGearArmedRifle
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurity
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesHudSecurity
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTSecurity
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: MagazineRifle
-    pocket2: MagazineRifle
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponRifleLecter
   inhand:
-    - WeaponRifleLecter
+    - WeaponLaserCannon
+    - PortableRecharger
+  storage:
+    belt:
+    - CrowbarRed
+    - Zipties
+    - MedkitCombatFilled
+    - MagazineRifle
+    - MagazineRifle
+    - MagazineRifleIncendiary
+    - MagazineRifleUranium
+    - Zipties
+
+- type: startingGear
+  parent: ERTSecurityGearEVA
+  id: ERTSecurityGearArmedGrenade
+  equipment:
+    pocket2: WeaponDisabler
+    suitstorage: WeaponLauncherHydraLethal
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
-    - CrowbarRed
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
     - MagazinePistol
+    - MedkitCombatFilled # End of first line
+    - GrenadeEMP
+    - GrenadeEMP
+    - GrenadeEMP
+    - GrenadeFlash
+    - GrenadeFlash
+    - GrenadeFlash
+    - MagazinePistol
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
+    - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTSecurityGearEVA
+  id: ERTSecurityGearArmedVanguard
+  equipment:
+    pocket2: WeaponDisabler
+    suitstorage: WeaponSubMachineGunWt550
+  storage:
+    back:
+    - ExGrenade
+    - SmokeGrenade
+    - EmpGrenade
+    - HoloprojectorSecurity
+    - TelescopicShield
+    - TelescopicShield
+    - TelescopicShield
+    - MedkitCombatFilled # End of first line
+    - MagazinePistolSubMachineGunTopMounted
+    - MagazinePistolSubMachineGunTopMounted
+    - MagazinePistolSubMachineGunTopMounted
+    - MagazinePistolSubMachineGunTopMounted
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
+    - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTSecurityGearEVA
+  id: ERTSecurityGearArmedShotgun
+  equipment:
+    pocket2: WeaponDisabler
+    suitstorage: WeaponShotgunEnforcer
+  storage:
+    back:
+    - SmokeGrenade
+    - BoxLethalshot
+    - BoxShotgunSlug
+    - BoxShotgunIncendiary
+    - MedkitCombatFilled # End of first line
+    - SmokeGrenade
+    - ExGrenade
+    - CableDetStack
+    - BoxDetonator
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
+    - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
 
 - type: chameleonOutfit
   id: ERTSecurityChameleonOutfit
@@ -429,52 +507,77 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
+  parent: ERTMedicalGearEVA
   id: ERTMedicalGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedical
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTMedic
-    eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTMedicPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltMedicalFilled
-    pocket1: Flare
-  storage:
-    back:
-    - Hypospray
-    - MedkitCombatFilled
-    - MedkitCombatFilled
-    - CrowbarRed
-    - ChemistryBottleOmnizine
-    - ChemistryBottleEpinephrine
-    - ChemistryBottleEpinephrine
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTMedicalGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackERTMedical
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTMedical
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltMedicalFilled
-    pocket1: Flare
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
   storage:
     back:
     - Hypospray
-    - MedkitCombatFilled
+    - BeakerSmallBruiz
+    - BeakerSmallLace
+    - JugPunctTranex
+    - JugPyraDerma
+    - JugDexPlusSaline # End of first line
+    - JugTrico
+    - BeakerSmallArith
+    - BeakerSmallDiph
+    - BeakerSmallSigy
+    - ClothingEyesGlassesChemical
+    - ChemistryBottleOmnizine
+    belt:
+    - DefibrillatorCompact
     - MedkitCombatFilled
     - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTMedicalGearEVA
+  id: ERTMedicalGearArmed
+  equipment:
+    suitstorage: WeaponRifleLecter
+    pocket2: WeaponDisabler
+  storage:
+    back:
+    - Hypospray
+    - JugPunctTranex
+    - JugPyraDerma
+    - JugDexPlusSaline
+    - JugTrico # End of first line
+    - BeakerSmallArith
+    - DefibrillatorCompact
+    - MedkitCombatFilled
+    - ClothingEyesGlassesChemical
     - ChemistryBottleOmnizine
-    - ChemistryBottleEpinephrine
-    - ChemistryBottleEpinephrine
+    belt:
+    - Truncheon
+    - Zipties
+    - CrowbarRed
+    - MagazineRifle
+    - MagazineRifle
+    - MagazineRifleIncendiary
+    - MagazineRifleUranium # End of first line
+    - Zipties
 
 - type: chameleonOutfit
   id: ERTMedicalChameleonOutfit
@@ -511,48 +614,51 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
+  parent: ERTJanitorGearEVA
   id: ERTJanitorGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHelmetERTJanitor
-    gloves: ClothingHandsGlovesColorPurple
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTJanitorPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorFilled
-    pocket1: Flare
-  storage:
-    back:
-    - LightReplacer
-    - BoxLightMixed
-    - BoxLightMixed
-    - Soap
-    - CrowbarRed
-    - AdvMopItem
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
     back: ClothingBackpackERTJanitor
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    gloves: ClothingHandsGlovesColorPurple
+    eyes: ClothingEyesGlassesChemical
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTJanitor
     id: ERTJanitorPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorFilled
-    pocket1: Flare
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponLauncherHydra
   storage:
     back:
+    - TrashBag
+    - SoapNT
+    - Plunger
+    - Screwdriver
+    - AdvMopItem # End of first line
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    belt:
+    - MegaSprayBottleSpaceCleaner
+    - Holoprojector
     - LightReplacer
-    - BoxLightMixed
-    - BoxLightMixed
-    - Soap
+    - WireBrush
     - CrowbarRed
-    - AdvMopItem
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
 
 - type: chameleonOutfit
   id: ERTJanitorChameleonOutfit
diff --git a/Resources/Textures/Markers/jobs.rsi/ertchaplain.png b/Resources/Textures/Markers/jobs.rsi/ertchaplain.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f47a35a216fff00a55b74d628b2a113d18363e
GIT binary patch
literal 1077
zcmV-51j_q~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<U=Sf6CRCt`dS6@t9RT%%>0k^c!HI$V$3S3rNq9KF0RpZNmhuM)V
z(dZKY#Kb5r#Asyk!MGPdW^`;X%eI&8VGOrq@d0O=Wz#UtX!oYXgi3>AHwP`<0LQ;l
zpas32@4!V$7QFYC`b(N~&Ue0Zzu)=Y?>px<SC(byg~#KO`}_L^WPn^fi`u0pIO{_j
z`W+)NT|{&dAXJ--C^v{0O{Nf9Sk(I%?F4AYN^pYGl0EsxTj=cU)TD%N1-1*i2$1BD
zlRb3#GMEI}Bk+6oX}ROhb>0^w56(xzc<*i$@^jDN!tL)7>beT8(5ygeHUZI6fMn1Q
z@$VU|Oh3ehN0ay?@FVVfzlH~_G@-sUH4$*X{gFT_Nc;BTuel|}?v9|zW=GES80!6g
zRD=(sr@1G)N!aTD77x39=skBFyLL*bZ~g=Zg8|Z0W_)$2NAp>ri9k#1OZ?Dr>=xnu
zu#MX&IE|J0v!D60qd-+vmE8E+(<n3>`FLn(V12G~&+`z3fBlAshqpHeN=iy(x7*G8
zbax0W8ja)eILv1AdT@fxX5;=76BDXP{3ih=_~PPf-8&=`#z$BC^YinZ0Kr~vM0|FU
z`;os|5~>uKnVCUOP7d!kRSGyWn?7%{tl57CSWs9j7O2IR1ZWoyhXYenQ*gOlIJ(z_
zqGB6sC-LgdDEFZqbGvob9=zj1I2;D8Q=`I`1YSs`aQu`9?{?lpEEdCw+ZLRBMP@r)
zfYE5=%1}$=PY;02FK|C1d-0ePZLeR;Oo3aX2>+2@Sglrgy<YqoAI1k?{>Cdo$q8x`
z?3KLV{VN}nUmy@b{gE(IqL>+hJc9|2G70wLBL2{CI;y$-3${}wC#WTjKYy{9k6&&N
zpiFW?EG)u<$Vg@c2o&6EDMW<zKfaR0z`y{0>N<q|KZKE=pN~W$fm4SiJlk{wwY9Z;
z4fzwcg#ck{b{>zW=fJXy*Z$QvuVIqq$Gz{~fwS=vYNi{3<(oYD$dCNhVoL&Jk^91v
zWflDRbyrp(7z}dBPqLGTj^Nz~yI?S~l51(<{?TZZDrS8Rt<Q*n@{opx2ALAEw6qj;
zb#)jV9AroF5R%CxcI=2l+>~r;0;?vl89tv6DJH+eZbyXeczJo5+eH-_ubV($U!PD@
zQzMha1qB7%7Fm;<DWm_71vDtY-halyG9s`Ud3kyNKY^8%6_m3?{3R4hv(eAxbf(#}
zLV!R)_EcA=1=~E%3W1I9KQcC!Hn(w1ew3WsN`M}!d=b&rJU%|2Hcz*ros}h>6<SHC
vB0!}_*Q^5i;GjET<9KOlY28ODRW<krSa+Z$B4_%100000NkvXXu0mjfb4>wK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png b/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png
new file mode 100644
index 0000000000000000000000000000000000000000..3195d44dd2de26107421f498698b6d65be354036
GIT binary patch
literal 1005
zcmV<J0}}j+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<UpGibPRCt`VS6@g|Q5gRQ%P6JDa0@NS)M0@`K`U#C)o?w=40=dG
z!WalrZcti12!;CKCL$8PNMH>lX0Itx!zM+Dio%KuwqQ;|(J&S<S>EpN*tuOb^xn<=
ze7N^~=ey_kJKvvkoL&?~(u&zvH^scl4vGfdlyS;Mv;JnvyV9?t1fWlpTnUVsJpmD#
z1SogT!Qb;Nj}sE1IRX@qQ-<mGx}d;AMw|>Z3y2Ec^1IQHwPBoc0oQK5B>hs1OlfIb
z=7iN%iXYxfli~i<3HZ4$iw@EpBZG+Yj0}1ojk0l~(42zjQ&V)KxR{XxcnZtQ%zpjy
z87iexah%3g7osKs>Aw~!7!0y^?3_mc;C3zKngvXTzw3H?d&LJ{FTJR%lkFHsA`zNj
zO(U()B*0`ci7P8B)YsRyo_9t5o4ieQNcu~e0FbArr?Yp5!$E!0t~oFUd3JU-^AiMN
zcWc1s^I=gcDJh}h;bE$+t);TF=jHi=f&v;C7$CddPVj?&b#=8W5jzUNjtm9^wY0R5
zUazOw@S;4Ib0mu*-`2;l$6_(~(_ep8kx&(ZKp?;t1{&&Xw#+XqEHFC+ZuU<~0N*`F
zT)GF|j*hXN1I<Tssben0!j4E>toWA}e5a-!wiVFc-cC|3H`tWq(`#$82yW*<6r@_9
zouDcOp-_mbs;X#YWJJz6NI5yT0q}!=Zf>rcrFRwp634qYj2!qRgy^Jc>*BBj@N>Cb
z?7On=&g2CEXuG1KBAS_*q1O9OYHjndkXyZjGCAx3{NQgPb=Xz_S}$M9v(ac|hYSQL
zVXZj5<s0|`(_g|gBz?cRhBOI41xpKvoSa7iEyue7`RA>P`JSF0U1MXTIA2~$g3p)y
zIUrTCuClUH%*@PW<NRohew;Wa=NwP8+yQCF91uY&q3JS0B%EV@R^b+lh1CLbkCsE_
zdpsV}3RMF9e!tFaHj8ezn~{SI<WddjsLdntwsSh2sSyCIn(gxY#KZ(EP@I6sKMpM3
z_k}gB;^$|ryPE<mYC2a%Hk*wV-~WJO#C+kMr<z2lj=<7@i#<P#jZ#-v*M>Qao0NWe
zHnq#D7x3G9k7)2N3;kx`Hsp5Z7n<5#0SM>o(T}3_k-(1F!0{YL%7Hete2uVsLGqJ|
z^Xl%_0IpRWGEbx*L7mdQKo>62(EdI0Jjiih@Kdj$en$1bWvWxak6{!VDaZkc8M3L*
byApo@{_?-91kgry00000NkvXXu0mjf8>ib>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json
index bca3be1df8..ce53eab3eb 100644
--- a/Resources/Textures/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/Markers/jobs.rsi/meta.json
@@ -1,206 +1,212 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)",
-  "size": {
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)",
+    "size": {
     "x": 32,
     "y": 32
-  },
-  "states": [
-    {
-      "name": "green"
     },
-    {
-      "name": "ai"
-    },
-    {
-      "name": "atmospherics"
-    },
-    {
-      "name": "bartender"
-    },
-    {
-      "name": "botanist"
-    },
-    {
-      "name": "boxer"
-    },
-    {
-      "name": "brigmedic"
-    },
-    {
-      "name": "captain"
-    },
-    {
-      "name": "cargo_tech"
-    },
-    {
-      "name": "cburn"
-    },
-    {
-      "name": "centcom"
-    },
-    {
-      "name": "chaplain"
-    },
-    {
-      "name": "chemist"
-    },
-    {
-      "name": "ce"
-    },
-    {
-      "name": "cmo"
-    },
-    {
-      "name": "clown"
-    },
-    {
-      "name": "cluwne"
-    },
-    {
-      "name": "chef"
-    },
-    {
-      "name": "curator"
-    },
-    {
-      "name": "cyborg"
-    },
-    {
-      "name": "detective"
-    },
-    {
-      "name": "doctor"
-    },
-    {
-      "name": "ertengineer"
-    },
-    {
-      "name": "ertengineereva"
-    },
-    {
-      "name": "ertjanitor"
-    },
-    {
-      "name": "ertjanitoreva"
-    },
-    {
-      "name": "ertleader"
-    },
-    {
-      "name": "ertleadereva"
-    },
-    {
-      "name": "ertmedical"
-    },
-    {
-      "name": "ertmedicaleva"
-    },
-    {
-      "name": "ertsecurity"
-    },
-    {
-      "name": "ertsecurityeva"
-    },
-    {
-      "name": "engineer"
-    },
-    {
-      "name": "geneticist"
-    },
-    {
-      "name": "hop"
-    },
-    {
-      "name": "hos"
-    },
-    {
-      "name": "janitor"
-    },
-    {
-      "name": "lawyer"
-    },
-    {
-      "name": "librarian"
-    },
-    {
-      "name": "medicalintern"
-    },
-    {
-      "name": "mime"
-    },
-    {
-      "name": "miner"
-    },
-    {
-      "name": "musician"
-    },
-    {
-      "name": "reporter"
-    },
-    {
-      "name": "paramedic"
-    },
-    {
-      "name": "passenger"
-    },
-    {
-      "name": "prisoner"
-    },
-    {
-      "name": "psychologist"
-    },
-    {
-      "name": "qm"
-    },
-    {
-      "name": "rd"
-    },
-    {
-      "name": "researchassistant"
-    },
-    {
-      "name": "roboticist"
-    },
-    {
-      "name": "salvagespecialist"
-    },
-    {
-      "name": "scientist"
-    },
-    {
-      "name": "security_cadet" 
-    },
-    {
-      "name": "security_officer"
-    },
-    {
-      "name": "serviceworker"
-    },
-    {
-      "name": "seniorengineer"
-    },
-    {
-      "name": "seniorresearcher"
-    },
-    {
-      "name": "seniorphysician"
-    },
-    {
-      "name": "seniorofficer"
-    },
-    {
-      "name": "technicalassistant"
-    },
-    {
-      "name": "virologist"
-    },
-    {
-      "name": "warden"
-    },
-    {
-      "name": "zookeeper"
-    }
-  ]
+        "states": [
+        {
+            "name": "green"
+        },
+        {
+            "name": "ai"
+        },
+        {
+            "name": "atmospherics"
+        },
+        {
+            "name": "bartender"
+        },
+        {
+            "name": "botanist"
+        },
+        {
+            "name": "boxer"
+        },
+        {
+            "name": "brigmedic"
+        },
+        {
+            "name": "captain"
+        },
+        {
+            "name": "cargo_tech"
+        },
+        {
+            "name": "cburn"
+        },
+        {
+            "name": "centcom"
+        },
+        {
+            "name": "chaplain"
+        },
+        {
+            "name": "chemist"
+        },
+        {
+            "name": "ce"
+        },
+        {
+            "name": "cmo"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "cluwne"
+        },
+        {
+            "name": "chef"
+        },
+        {
+            "name": "curator"
+        },
+        {
+            "name": "cyborg"
+        },
+        {
+            "name": "detective"
+        },
+        {
+            "name": "doctor"
+        },
+        {
+            "name": "ertchaplain"
+        },
+        {
+            "name": "ertchaplaineva"
+        },
+        {
+            "name": "ertengineer"
+        },
+        {
+            "name": "ertengineereva"
+        },
+        {
+            "name": "ertjanitor"
+        },
+        {
+            "name": "ertjanitoreva"
+        },
+        {
+            "name": "ertleader"
+        },
+        {
+            "name": "ertleadereva"
+        },
+        {
+            "name": "ertmedical"
+        },
+        {
+            "name": "ertmedicaleva"
+        },
+        {
+            "name": "ertsecurity"
+        },
+        {
+            "name": "ertsecurityeva"
+        },
+        {
+            "name": "engineer"
+        },
+        {
+            "name": "geneticist"
+        },
+        {
+            "name": "hop"
+        },
+        {
+            "name": "hos"
+        },
+        {
+            "name": "janitor"
+        },
+        {
+            "name": "lawyer"
+        },
+        {
+            "name": "librarian"
+        },
+        {
+            "name": "medicalintern"
+        },
+        {
+            "name": "mime"
+        },
+        {
+            "name": "miner"
+        },
+        {
+            "name": "musician"
+        },
+        {
+            "name": "reporter"
+        },
+        {
+            "name": "paramedic"
+        },
+        {
+            "name": "passenger"
+        },
+        {
+            "name": "prisoner"
+        },
+        {
+            "name": "psychologist"
+        },
+        {
+            "name": "qm"
+        },
+        {
+            "name": "rd"
+        },
+        {
+            "name": "researchassistant"
+        },
+        {
+            "name": "roboticist"
+        },
+        {
+            "name": "salvagespecialist"
+        },
+        {
+            "name": "scientist"
+        },
+        {
+            "name": "security_cadet"
+        },
+        {
+            "name": "security_officer"
+        },
+        {
+            "name": "serviceworker"
+        },
+        {
+            "name": "seniorengineer"
+        },
+        {
+            "name": "seniorresearcher"
+        },
+        {
+            "name": "seniorphysician"
+        },
+        {
+            "name": "seniorofficer"
+        },
+        {
+            "name": "technicalassistant"
+        },
+        {
+            "name": "virologist"
+        },
+        {
+            "name": "warden"
+        },
+        {
+            "name": "zookeeper"
+        }
+    ]
 }

From e64533778c5010a591389783e88229817a5b47a3 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Fri, 26 Dec 2025 18:05:10 -0800
Subject: [PATCH 184/360] Atmospherics/Temperature HeatContainers (#39997)

* Initial HeatContainer logic

* comment fixes

* Comment changes + ChangeHeatCapacity

* highly intelligent specimen

* n-body full heat exchange methods

* extract to partials

* highly intelligent specimen

* fixes + ChangeHeatCapacityKeepTemperature

* Divide and merge methods

* even divide

* different merge signature

* forgot one little thing

* address review

* missing docs

* addr review

* oops

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../HeatContainer/HeatContainer.cs            |  66 ++++++
 .../HeatContainerHelpers.Conduct.cs           | 155 +++++++++++++
 .../HeatContainerHelpers.Divide.cs            |  55 +++++
 .../HeatContainerHelpers.Exchange.cs          | 214 ++++++++++++++++++
 .../HeatContainerHelpers.Merge.cs             |  66 ++++++
 .../HeatContainer/HeatContainerHelpers.cs     |  52 +++++
 6 files changed, 608 insertions(+)
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainer.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs

diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainer.cs b/Content.Shared/Temperature/HeatContainer/HeatContainer.cs
new file mode 100644
index 0000000000..c88d11b15a
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainer.cs
@@ -0,0 +1,66 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+/// <summary>
+/// A general-purpose container for heat energy.
+/// Any object that contains, stores, or transfers heat should use a <see cref="HeatContainer"/>
+/// instead of implementing its own system.
+/// This allows for consistent heat transfer mechanics across different objects and systems.
+/// </summary>
+[Serializable, NetSerializable, DataDefinition]
+[Access(typeof(HeatContainerHelpers), typeof(SharedAtmosphereSystem))]
+public partial struct HeatContainer : IRobustCloneable<HeatContainer>
+{
+    /// <summary>
+    /// The heat capacity of this container in Joules per Kelvin.
+    /// This determines how much energy is required to change the temperature of the container.
+    /// Higher values mean the container can absorb or release more heat energy
+    /// without a significant change in temperature.
+    /// </summary>
+    [DataField]
+    public float HeatCapacity = 4000f; // about 1kg of water
+
+    /// <summary>
+    /// The current temperature of the container in Kelvin.
+    /// </summary>
+    [DataField]
+    public float Temperature = Atmospherics.T20C; // room temperature
+
+    /// <summary>
+    /// The current temperature of the container in Celsius.
+    /// Ideal if you just need to read the temperature for UI.
+    /// Do not perform computations in Celsius/set this value, use Kelvin instead.
+    /// </summary>
+    [ViewVariables]
+    public float TemperatureC => TemperatureHelpers.KelvinToCelsius(Temperature);
+
+    /// <summary>
+    /// The current thermal energy of the container in Joules.
+    /// </summary>
+    [ViewVariables]
+    public float InternalEnergy => Temperature * HeatCapacity;
+
+    public HeatContainer(float heatCapacity, float temperature)
+    {
+        HeatCapacity = heatCapacity;
+        Temperature = temperature;
+    }
+
+    /// <summary>
+    /// Copy constructor for implementing ICloneable.
+    /// </summary>
+    /// <param name="c">The HeatContainer to copy.</param>
+    private HeatContainer(HeatContainer c)
+    {
+        HeatCapacity = c.HeatCapacity;
+        Temperature = c.Temperature;
+    }
+
+    public HeatContainer Clone()
+    {
+        return new HeatContainer(this);
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
new file mode 100644
index 0000000000..deb705b8e2
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
@@ -0,0 +1,155 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Conducts heat between a <see cref="HeatContainer"/> and some body with a different temperature,
+    /// given some constant thermal conductance g and a small time delta.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="temp">The temperature of the second object that we are conducting heat with, in kelvin.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the container.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that was added to the heat container.</returns>
+    /// <example>A positive value indicates heat transfer from a hot body to a cold heat container c.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeat(this HeatContainer c, float temp, float deltaTime, float g)
+    {
+        var dQ = c.ConductHeatQuery(temp, deltaTime, g);
+        c.AddHeat(dQ);
+        return dQ;
+    }
+
+    /// <summary>
+    /// Conducts heat between two <see cref="HeatContainer"/>s,
+    /// given some constant thermal conductance g and a small time delta.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the containers.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that is exchanged between the bodies.</returns>
+    /// <example>A positive value indicates heat transfer from a hot cB to a cold cA.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeat(this HeatContainer cA, HeatContainer cB, float deltaTime, float g)
+    {
+        var dQ = ConductHeatQuery(cA, cB.Temperature, deltaTime, g);
+        cA.AddHeat(dQ);
+        cB.AddHeat(-dQ);
+        return dQ;
+    }
+
+    /// <summary>
+    /// Calculates the amount of heat that would be conducted between a <see cref="HeatContainer"/> and some body with a different temperature,
+    /// given some constant thermal conductance g and a small time delta.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="temp">The temperature of the second object that we are conducting heat with, in kelvin.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the container.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that would be exchanged between the bodies.</returns>
+    /// <example>A positive value indicates heat transfer from a hot body to a cold heat container c.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeatQuery(this HeatContainer c, float temp, float deltaTime, float g)
+    {
+        var dQ = g * (temp - c.Temperature) * deltaTime;
+        var dQMax = Math.Abs(ConductHeatToTempQuery(c, temp));
+
+        // Clamp the transferred heat amount in case we are overshooting the equilibrium temperature because our time step was too large.
+        return Math.Clamp(dQ, -dQMax, dQMax);
+    }
+
+    /// <summary>
+    /// Calculates the amount of heat that would be conducted between two <see cref="HeatContainer"/>s,
+    /// given some conductivity constant k and a time delta. Does not modify the containers.
+    /// </summary>
+    /// <param name="c1">The first <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="c2">The second <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the container.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that would be exchanged between the bodies.</returns>
+    /// <example>A positive value indicates heat transfer from a hot c2 to a cold c1.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeatQuery(this HeatContainer c1, HeatContainer c2, float deltaTime, float g)
+    {
+        return ConductHeatQuery(c1, c2.Temperature, deltaTime, g);
+    }
+
+    /// <summary>
+    /// Changes the temperature of a <see cref="HeatContainer"/> to a target temperature by
+    /// adding or removing the necessary amount of heat.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to change the temperature of.</param>
+    /// <param name="targetTemp">The desired temperature to reach.</param>
+    /// <returns>The amount of heat in joules that was transferred to or from the <see cref="HeatContainer"/>
+    /// to reach the target temperature.</returns>
+    /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
+    [PublicAPI]
+    public static float ConductHeatToTemp(this HeatContainer c, float targetTemp)
+    {
+        var dQ = ConductHeatToTempQuery(c, targetTemp);
+        c.Temperature = targetTemp;
+        return dQ;
+    }
+
+    /// <summary>
+    /// Determines the amount of heat that must be transferred to or from a <see cref="HeatContainer"/>
+    /// to reach a target temperature. Does not modify the heat container.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to query.</param>
+    /// <param name="targetTemp">The desired temperature to reach.</param>
+    /// <returns>The amount of heat in joules that must be transferred to or from the <see cref="HeatContainer"/>
+    /// to reach the target temperature.</returns>
+    /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
+    [PublicAPI]
+    public static float ConductHeatToTempQuery(this HeatContainer c, float targetTemp)
+    {
+        return (targetTemp - c.Temperature) * c.HeatCapacity;
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
new file mode 100644
index 0000000000..f1e7206683
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
@@ -0,0 +1,55 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Splits a <see cref="HeatContainer"/> into two.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to split. This will be modified to contain the remaining heat capacity.</param>
+    /// <param name="fraction">The fraction of the heat capacity to move to the new container. Clamped between 0 and 1.</param>
+    /// <returns>A new <see cref="HeatContainer"/> containing the specified fraction of the original container's heat capacity and the same temperature.</returns>
+    [PublicAPI]
+    public static HeatContainer Split(this ref HeatContainer c, float fraction = 0.5f)
+    {
+        fraction = Math.Clamp(fraction, 0f, 1f);
+        var newHeatCapacity = c.HeatCapacity * fraction;
+
+        var newContainer = new HeatContainer
+        {
+            HeatCapacity = newHeatCapacity,
+            Temperature = c.Temperature,
+        };
+
+        c.HeatCapacity -= newHeatCapacity;
+
+        return newContainer;
+    }
+
+    /// <summary>
+    /// Divides a source <see cref="HeatContainer"/> into a specified number of equal parts.
+    /// </summary>
+    /// <param name="c">The input <see cref="HeatContainer"/> to split.</param>
+    /// <param name="num">The number of <see cref="HeatContainer"/>s
+    /// to split the source <see cref="HeatContainer"/> into.</param>
+    /// <exception cref="ArgumentException">Thrown when attempting to divide the source container by zero.</exception>
+    /// <returns>An array of <see cref="HeatContainer"/>s equally split from the source <see cref="HeatContainer"/>.</returns>
+    [PublicAPI]
+    public static HeatContainer[] Divide(this HeatContainer c, uint num)
+    {
+        if (num == 0)
+            throw new ArgumentException("Cannot divide by zero.", nameof(num));
+
+        var fraction = 1f / num;
+        var cFrac = c.Split(fraction);
+        var containers = new HeatContainer[num];
+
+        for (var i = 0; i < num; i++)
+        {
+            containers[i] = cFrac;
+        }
+
+        return containers;
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
new file mode 100644
index 0000000000..6b7eb125dc
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
@@ -0,0 +1,214 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    #region 2-Body Exchange
+
+    /// <summary>
+    /// Determines the amount of heat energy that must be transferred between two heat containers
+    /// to bring them into thermal equilibrium.
+    /// Does not modify the containers.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    /// <returns>The amount of heat in joules that is needed
+    /// to bring the containers to thermal equilibrium.</returns>
+    /// <example>A positive value indicates heat transfer from a hot cA to a cold cB.</example>
+    [PublicAPI]
+    public static float EquilibriumHeatQuery(this HeatContainer cA, HeatContainer cB)
+    {
+        /*
+        The solution is derived from the following facts:
+        1. Let Q be the amount of heat energy transferred from cA to cB.
+        2. T_A > T_B, so heat will flow from cA to cB.
+        3. The energy lost by T_A is equal to Q = C_A * (T_A_initial - T_A_final)
+        4. The energy gained by T_B is equal to Q = C_B * (T_B_final - T_B_initial)
+        5. Energy is conserved. So T_A_final and T_B_final can be expressed as:
+        T_A_final = T_A_initial - Q / C_A
+        T_B_final = T_B_initial + Q / C_B
+        6. At thermal equilibrium, T_A_final = T_B_final.
+        7. Solve for Q.
+        */
+        return (cA.Temperature - cB.Temperature) *
+               (cA.HeatCapacity * cB.HeatCapacity / (cA.HeatCapacity + cB.HeatCapacity));
+    }
+
+    /// <summary>
+    /// Determines the resulting temperature if two heat containers are brought into thermal equilibrium.
+    /// Does not modify the containers.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    /// <returns>The resulting equilibrium temperature both containers will be at.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer cB)
+    {
+        // Insert the above solution for Q into T_A_final = T_A_initial - Q / C_A and rearrange the result.
+        return (cA.HeatCapacity * cA.Temperature - cB.HeatCapacity * cB.Temperature) / (cA.HeatCapacity + cB.HeatCapacity);
+    }
+
+    /// <summary>
+    /// Brings two <see cref="HeatContainer"/>s into thermal equilibrium by exchanging heat.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer cA, HeatContainer cB)
+    {
+        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        cA.Temperature = tFinal;
+        cB.Temperature = tFinal;
+    }
+
+    /// <summary>
+    /// Brings two <see cref="HeatContainer"/>s into thermal equilibrium by exchanging heat.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    /// <param name="dQ">The amount of heat in joules that was transferred from container A to B.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer cA, HeatContainer cB, out float dQ)
+    {
+        var tInitialA = cA.Temperature;
+        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        cA.Temperature = tFinal;
+        cB.Temperature = tFinal;
+        dQ = (tInitialA - tFinal) / cA.HeatCapacity;
+    }
+
+    #endregion
+
+    #region N-Body Exchange
+
+    /// <summary>
+    /// Brings an array of <see cref="HeatContainer"/>s into thermal equilibrium by exchanging heat.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer[] cN)
+    {
+        var tF = cN.EquilibriumTemperatureQuery();
+        for (var i = 0; i < cN.Length; i++)
+        {
+            cN[i].Temperature = tF;
+        }
+    }
+
+    /// <summary>
+    /// Brings a <see cref="HeatContainer"/> into thermal equilibrium
+    /// with an array of other <see cref="HeatContainer"/>s by exchanging heat.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to bring into thermal equilibrium.</param>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer cA, HeatContainer[] cN)
+    {
+        var tF = cA.EquilibriumTemperatureQuery(cN);
+
+        cA.Temperature = tF;
+        for (var i = 0; i < cN.Length; i++)
+        {
+            cN[i].Temperature = tF;
+        }
+    }
+
+    /// <summary>
+    /// Determines the final temperature of an array of <see cref="HeatContainer"/>s
+    /// when they are brought into thermal equilibrium. Does not modify the containers.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer[] cN)
+    {
+        /*
+        The solution is derived via the following:
+
+        1. In thermal equilibrium all bodies have the same temperature T_f.
+
+        2. Heat exchange for each body is defined by the equation \Delta Q_n = C_n \Delta T_n = C_n (T_f - T_n)
+        where C_n is the heat capacity and \Delta T_n the change in temperature of the n-th body.
+
+        3. Heat energy must be conserved, so the sum of all heat changes must equal zero.
+        Therefore, \sum_{n=1}^{N} Q_n = 0.
+
+        4. Substitute and expand.
+        \sum_{n=1}^{N} C_n (T_f - T_n) = 0.
+
+        5. Unroll and expand.
+        C_1(T_f - T_1) + C_2(T_f - T_2) + ... + C_n(T_f - T_n) = 0
+        C_1 T_f - C_1 T_1 + C_2 T_f - C_2 T_2 + ... + C_n T_f - C_n T_n = 0
+
+        6. Group like terms.
+        T_f(C_1 + C_2 + ... + C_n) - (C_1 T_1 + C_2 T_2 + ... + C_n T_n) = 0
+
+        7. Solve.
+        T_f(C_1 + C_2 + ... + C_n) = (C_1 T_1 + C_2 T_2 + ... + C_n T_n)
+        T_f = \frac{C_1 T_1 + C_2 T_2 + ... + C_n T_n}{C_1 + C_2 + ... + C_n}
+
+        8. Summation.
+        T_f = \frac{\sum(C_n T_n)}{\sum(C_n)}
+        */
+
+        var numerator = 0f;
+        var denominator = 0f;
+
+        foreach (var c in cN)
+        {
+            numerator += c.HeatCapacity * c.Temperature;
+            denominator += c.HeatCapacity;
+        }
+
+        return numerator / denominator;
+    }
+
+    /// <summary>
+    /// Determines the final temperature of an array of <see cref="HeatContainer"/>s
+    /// when they are brought into thermal equilibrium. Does not modify the containers.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    /// <param name="dQ">The amount of heat in joules that was added to each container
+    /// to reach thermal equilibrium.</param>
+    /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer[] cN, out float[] dQ)
+    {
+        /*
+        For finding the total heat exchanged during the equalization between a group of bodies
+        take the difference of the internal energy before and after the exchange.
+
+        dQ = C * (T_f - T_i) for each container
+        */
+
+        var tF = cN.EquilibriumTemperatureQuery();
+        dQ = new float[cN.Length];
+
+        for (var i = 0; i < cN.Length; i++)
+        {
+            dQ[i] = cN[i].HeatCapacity * (tF - cN[i].Temperature);
+        }
+
+        return tF;
+    }
+
+    /// <summary>
+    /// Determines the final temperature of a <see cref="HeatContainer"/> when it is brought into thermal equilibrium
+    /// with an array of other <see cref="HeatContainer"/>s. Does not modify the containers.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to bring into thermal equilibrium.</param>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer[] cN)
+    {
+        var cAll = new HeatContainer[cN.Length + 1];
+        cAll[0] = cA;
+        cN.CopyTo(cAll, 1);
+
+        return cAll.EquilibriumTemperatureQuery();
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
new file mode 100644
index 0000000000..d9f2cdd3e7
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
@@ -0,0 +1,66 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Merges two heat containers into one, conserving total internal energy.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to merge. This will be modified to contain the merged result.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to merge.</param>
+    [PublicAPI]
+    public static void Merge(this ref HeatContainer cA, HeatContainer cB)
+    {
+        var merged = new HeatContainer
+        {
+            HeatCapacity = cA.HeatCapacity + cB.HeatCapacity,
+            Temperature = (cA.InternalEnergy + cB.InternalEnergy) / (cA.HeatCapacity + cB.HeatCapacity)
+        };
+
+        cA = merged;
+    }
+
+
+    /// <summary>
+    /// Merges an array of <see cref="HeatContainer"/>s into a single heat container, conserving total internal energy.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to merge.
+    /// This will be modified to contain the merged result.</param>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to merge.</param>
+    [PublicAPI]
+    public static void Merge(this ref HeatContainer cA, HeatContainer[] cN)
+    {
+        var cAcN = new HeatContainer[cN.Length + 1];
+        cAcN[0] = cA;
+        cN.CopyTo(cAcN, 1);
+
+        cA = cAcN.Merge();
+    }
+
+    /// <summary>
+    /// Merges an array of <see cref="HeatContainer"/>s into a single heat container, conserving total internal energy.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to merge.</param>
+    /// <returns>A new <see cref="HeatContainer"/> representing the merged result.</returns>
+    [PublicAPI]
+    public static HeatContainer Merge(this HeatContainer[] cN)
+    {
+        var totalHeatCapacity = 0f;
+        var totalEnergy = 0f;
+
+        foreach (var c in cN)
+        {
+            totalHeatCapacity += c.HeatCapacity;
+            totalEnergy += c.InternalEnergy;
+        }
+
+        var result = new HeatContainer
+        {
+            HeatCapacity = totalHeatCapacity,
+            Temperature = totalEnergy / totalHeatCapacity,
+        };
+
+        return result;
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
new file mode 100644
index 0000000000..39078a810e
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
@@ -0,0 +1,52 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+/// <summary>
+/// Class containing helper methods for working with <see cref="HeatContainer"/>s.
+/// Use these classes instead of implementing your own heat transfer logic.
+/// </summary>
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Adds or removes heat energy from the container.
+    /// Positive values add heat, negative values remove heat.
+    /// The temperature can never become lower than 0K even if more heat is removed.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to add or remove energy.</param>
+    /// <param name="dQ">The energy in joules to add or remove.</param>
+    [PublicAPI]
+    public static void AddHeat(this HeatContainer c, float dQ)
+    {
+        c.Temperature = c.AddHeatQuery(dQ);
+    }
+
+    /// <summary>
+    /// Calculates the resulting temperature of the container after adding or removing heat energy.
+    /// Positive values add heat, negative values remove heat. This method doesn't change the container's state.
+    /// The temperature can never become lower than 0K even if more heat is removed.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to query.</param>
+    /// <param name="dQ">The energy in joules to add or remove.</param>
+    /// <returns>The resulting temperature in kelvin after the heat change.</returns>
+    [PublicAPI]
+    public static float AddHeatQuery(this HeatContainer c, float dQ)
+    {
+        // Don't allow the temperature to go below the absolute minimum.
+        return Math.Max(0f, c.Temperature + dQ / c.HeatCapacity);
+    }
+
+    /// <summary>
+    /// Sets the heat capacity of a <see cref="HeatContainer"/> without altering its thermal energy.
+    /// Adjusts the temperature accordingly to maintain the same internal energy.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to modify.</param>
+    /// <param name="newHeatCapacity">The new heat capacity to set.</param>
+    [PublicAPI]
+    public static void SetHeatCapacity(this HeatContainer c, float newHeatCapacity)
+    {
+        var currentEnergy = c.InternalEnergy;
+        c.HeatCapacity = newHeatCapacity;
+        c.Temperature = currentEnergy / c.HeatCapacity;
+    }
+}

From e66a43a2bc7d10ad9bc602381322de10ce7757e7 Mon Sep 17 00:00:00 2001
From: SonarZeBat <sonarzebat153@gmail.com>
Date: Sat, 27 Dec 2025 22:00:29 +0800
Subject: [PATCH 185/360] Lowered Xenoborgs MinPlayers From 40 To 30 (#42111)

Update subgamemodes.yml
---
 Resources/Prototypes/GameRules/subgamemodes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/GameRules/subgamemodes.yml b/Resources/Prototypes/GameRules/subgamemodes.yml
index d05485b86c..9a3fe1bb32 100644
--- a/Resources/Prototypes/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/GameRules/subgamemodes.yml
@@ -80,7 +80,7 @@
   - type: XenoborgsRule
   - type: RuleGrids
   - type: GameRule
-    minPlayers: 40
+    minPlayers: 30
   - type: LoadMapRule
     gridPath: /Maps/Shuttles/mothership.yml
   - type: AntagMultipleRoleSpawner

From 0a6a32e8a1d82d861178562375f8f8b044a910bd Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sun, 28 Dec 2025 00:14:42 +1000
Subject: [PATCH 186/360] Cleanup warnings: CS0414, CS0618 (#42068)

Cleanup
---
 .../Construction/UI/ConstructionMenuPresenter.cs       |  6 +++++-
 Content.Client/Launcher/LauncherConnecting.cs          |  8 ++++++--
 Content.Server/Chat/Managers/ChatManager.cs            |  7 ++++++-
 Content.Server/GameTicking/Commands/JoinGameCommand.cs | 10 ++++++++--
 Content.Server/Traits/TraitSystem.cs                   |  8 +-------
 Content.Shared/Fluids/SpraySafetySystem.cs             |  2 --
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index d5fee2bdda..6041b405c9 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -30,7 +30,10 @@ namespace Content.Client.Construction.UI
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
         private readonly SpriteSystem _spriteSystem;
+        private readonly ISawmill _sawmill;
 
         private readonly IConstructionMenuView _constructionView;
         private readonly EntityWhitelistSystem _whitelistSystem;
@@ -90,6 +93,7 @@ namespace Content.Client.Construction.UI
             _constructionView = new ConstructionMenu();
             _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
             _spriteSystem = _entManager.System<SpriteSystem>();
+            _sawmill = _logManager.GetSawmill("construction.ui");
 
             // This is required so that if we load after the system is initialized, we can bind to it immediately
             if (_systemManager.TryGetEntitySystem<ConstructionSystem>(out var constructionSystem))
@@ -284,7 +288,7 @@ namespace Content.Client.Construction.UI
 
                 if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId))
                 {
-                    Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
+                    _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
                         recipe.ID,
                         nameof(ConstructionPrototype));
                     continue;
diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs
index 33d31cc52d..9b9c472781 100644
--- a/Content.Client/Launcher/LauncherConnecting.cs
+++ b/Content.Client/Launcher/LauncherConnecting.cs
@@ -20,8 +20,10 @@ namespace Content.Client.Launcher
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IClipboardManager _clipboard = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private LauncherConnectingGui? _control;
+        private ISawmill _sawmill = default!;
 
         private Page _currentPage;
         private string? _connectFailReason;
@@ -61,6 +63,8 @@ namespace Content.Client.Launcher
         {
             _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard);
 
+            _sawmill = _logManager.GetSawmill("launcher-ui");
+
             _userInterfaceManager.StateRoot.AddChild(_control);
 
             _clientNetManager.ConnectFailed += OnConnectFailed;
@@ -115,12 +119,12 @@ namespace Content.Client.Launcher
                 }
                 else
                 {
-                    Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address");
+                    _sawmill.Info($"Redial not possible, no Ss14Address");
                 }
             }
             catch (Exception ex)
             {
-                Logger.ErrorS("launcher-ui", $"Redial exception: {ex}");
+                _sawmill.Error($"Redial exception: {ex}");
             }
             return false;
         }
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 5b0d40ddbc..b5267247ae 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -45,6 +45,9 @@ internal sealed partial class ChatManager : IChatManager
     [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly DiscordChatLink _discordLink = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
 
     /// <summary>
     /// The maximum length a player-sent message can be sent
@@ -64,6 +67,8 @@ internal sealed partial class ChatManager : IChatManager
         _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true);
         _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
 
+        _sawmill = _logManager.GetSawmill("SERVER");
+
         RegisterRateLimits();
     }
 
@@ -111,7 +116,7 @@ internal sealed partial class ChatManager : IChatManager
     {
         var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message)));
         ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride);
-        Logger.InfoS("SERVER", message);
+        _sawmill.Info(message);
 
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}");
     }
diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
index a32a2f9495..3f5e294754 100644
--- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -17,6 +17,9 @@ namespace Content.Server.GameTicking.Commands
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private readonly ISawmill _sawmill;
 
         public string Command => "joingame";
         public string Description => "";
@@ -25,7 +28,10 @@ namespace Content.Server.GameTicking.Commands
         public JoinGameCommand()
         {
             IoCManager.InjectDependencies(this);
+
+            _sawmill = _logManager.GetSawmill("security");
         }
+
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 2)
@@ -46,8 +52,8 @@ namespace Content.Server.GameTicking.Commands
 
             if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
             {
-                Logger.InfoS("security", $"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
-                shell.WriteError($"{player.Name} is not in the lobby.   This incident will be reported.");
+                _sawmill.Info($"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
+                shell.WriteError($"{player.Name} is not in the lobby. This incident will be reported.");
                 return;
             }
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 8e062785e2..4acf190563 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -2,7 +2,6 @@
 // using Content.Shared.Hands.Components;
 // using Content.Shared.Hands.EntitySystems;
 // using Content.Shared.Roles;
-// using Content.Shared.StatusEffectNew;
 // using Content.Shared.Traits;
 // using Content.Shared.Whitelist;
 // using Robust.Shared.Prototypes;
@@ -14,7 +13,6 @@
 //     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 //     [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
 //     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-//     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 //
 //     public override void Initialize()
 //     {
@@ -56,11 +54,6 @@
 //                 special.AfterEquip(args.Mob);
 //             }
 //
-//             // Begin DeltaV - Add overridden components
-//             if(traitPrototype.OverriddenComponents != null)
-//                 EntityManager.AddComponents(args.Mob, traitPrototype.OverriddenComponents, true);
-//             // End DeltaV
-//
 //             // Add item required by the trait
 //             if (traitPrototype.TraitGear == null)
 //                 continue;
@@ -77,3 +70,4 @@
 //         }
 //     }
 // }
+//
diff --git a/Content.Shared/Fluids/SpraySafetySystem.cs b/Content.Shared/Fluids/SpraySafetySystem.cs
index c206bbda08..fa5377f046 100644
--- a/Content.Shared/Fluids/SpraySafetySystem.cs
+++ b/Content.Shared/Fluids/SpraySafetySystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Item.ItemToggle;
-using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Fluids;
@@ -10,7 +9,6 @@ public sealed class SpraySafetySystem : EntitySystem
 {
     [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {

From 9e2b871882f5595c44ed4c6a0a2c2001c966f369 Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Sat, 27 Dec 2025 16:18:45 +0200
Subject: [PATCH 187/360] Merge IFF controls into one control. Make syndicate
 IFF turned off by default.  (#42104)

* Merge IFF controls into one control.

* Implement logic to hide IFF of sydicate IFF console on map load. Add hideOnInit property to IFFConsoleComponent

* DataField

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
---
 .../BUI/IFFConsoleBoundUserInterface.cs       |  9 -----
 .../Shuttles/UI/IFFConsoleWindow.xaml         |  6 ----
 .../Shuttles/UI/IFFConsoleWindow.xaml.cs      | 36 ++-----------------
 .../Components/IFFConsoleComponent.cs         |  3 ++
 .../Shuttles/Systems/ShuttleSystem.IFF.cs     | 36 ++++++++++++-------
 .../Shuttles/Events/IFFShowVesselMessage.cs   |  9 -----
 .../Machines/Computers/computers.yml          |  1 +
 7 files changed, 29 insertions(+), 71 deletions(-)
 delete mode 100644 Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs

diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
index 8d84abed8a..704307f06b 100644
--- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
@@ -23,7 +23,6 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
 
         _window = this.CreateWindowCenteredLeft<IFFConsoleWindow>();
         _window.ShowIFF += SendIFFMessage;
-        _window.ShowVessel += SendVesselMessage;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,14 +43,6 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
         });
     }
 
-    private void SendVesselMessage(bool obj)
-    {
-        SendMessage(new IFFShowVesselMessage()
-        {
-            Show = obj,
-        });
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
index dab11a7b62..90684889a6 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
@@ -9,12 +9,6 @@
                 <Button Name="ShowIFFOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
                 <Button Name="ShowIFFOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
             </BoxContainer>
-
-            <Label Name="ShowVesselLabel" Text="{Loc 'iff-console-show-vessel-label'}" HorizontalExpand="True" StyleClasses="highlight" />
-            <BoxContainer Orientation="Horizontal" MinWidth="120">
-                <Button Name="ShowVesselOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
-                <Button Name="ShowVesselOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
-            </BoxContainer>
         </GridContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
index f14ef22c3c..d61486d2d8 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
@@ -13,9 +13,7 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
     IComputerWindow<IFFConsoleBoundUserInterfaceState>
 {
     private readonly ButtonGroup _showIFFButtonGroup = new();
-    private readonly ButtonGroup _showVesselButtonGroup = new();
     public event Action<bool>? ShowIFF;
-    public event Action<bool>? ShowVessel;
 
     public IFFConsoleWindow()
     {
@@ -24,11 +22,6 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
         ShowIFFOnButton.Group = _showIFFButtonGroup;
         ShowIFFOnButton.OnPressed += args => ShowIFFPressed(true);
         ShowIFFOffButton.OnPressed += args => ShowIFFPressed(false);
-
-        ShowVesselOffButton.Group = _showVesselButtonGroup;
-        ShowVesselOnButton.Group = _showVesselButtonGroup;
-        ShowVesselOnButton.OnPressed += args => ShowVesselPressed(true);
-        ShowVesselOffButton.OnPressed += args => ShowVesselPressed(false);
     }
 
     private void ShowIFFPressed(bool pressed)
@@ -36,19 +29,14 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
         ShowIFF?.Invoke(pressed);
     }
 
-    private void ShowVesselPressed(bool pressed)
-    {
-        ShowVessel?.Invoke(pressed);
-    }
-
     public void UpdateState(IFFConsoleBoundUserInterfaceState state)
     {
-        if ((state.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+        if ((state.AllowedFlags & IFFFlags.HideLabel) != 0x0 || (state.AllowedFlags & IFFFlags.Hide) != 0x0)
         {
             ShowIFFOffButton.Disabled = false;
             ShowIFFOnButton.Disabled = false;
 
-            if ((state.Flags & IFFFlags.HideLabel) != 0x0)
+            if ((state.Flags & IFFFlags.HideLabel) != 0x0 || (state.Flags & IFFFlags.Hide) != 0x0)
             {
                 ShowIFFOffButton.Pressed = true;
             }
@@ -62,25 +50,5 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
             ShowIFFOffButton.Disabled = true;
             ShowIFFOnButton.Disabled = true;
         }
-
-        if ((state.AllowedFlags & IFFFlags.Hide) != 0x0)
-        {
-            ShowVesselOffButton.Disabled = false;
-            ShowVesselOnButton.Disabled = false;
-
-            if ((state.Flags & IFFFlags.Hide) != 0x0)
-            {
-                ShowVesselOffButton.Pressed = true;
-            }
-            else
-            {
-                ShowVesselOnButton.Pressed = true;
-            }
-        }
-        else
-        {
-            ShowVesselOffButton.Disabled = true;
-            ShowVesselOnButton.Disabled = true;
-        }
     }
 }
diff --git a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
index 562bec51c2..8db81dc1fd 100644
--- a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
@@ -11,4 +11,7 @@ public sealed partial class IFFConsoleComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("allowedFlags")]
     public IFFFlags AllowedFlags = IFFFlags.HideLabel;
+
+    [DataField]
+    public bool HideOnInit = false;
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
index 5e746fd495..e8d2e13e80 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
@@ -12,7 +12,7 @@ public sealed partial class ShuttleSystem
     {
         SubscribeLocalEvent<IFFConsoleComponent, AnchorStateChangedEvent>(OnIFFConsoleAnchor);
         SubscribeLocalEvent<IFFConsoleComponent, IFFShowIFFMessage>(OnIFFShow);
-        SubscribeLocalEvent<IFFConsoleComponent, IFFShowVesselMessage>(OnIFFShowVessel);
+        SubscribeLocalEvent<IFFConsoleComponent, MapInitEvent>(OnInitIFFConsole);
         SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
     }
 
@@ -37,38 +37,48 @@ public sealed partial class ShuttleSystem
 
     private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFMessage args)
     {
-        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null ||
-            (component.AllowedFlags & IFFFlags.HideLabel) == 0x0)
+        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null)
         {
             return;
         }
 
+        // Merged toggle controls both HideLabel and Hide flags
         if (!args.Show)
         {
-            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+            {
+                AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            }
+            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
+            {
+                AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+            }
         }
         else
         {
-            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+            {
+                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            }
+            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
+            {
+                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+            }
         }
     }
 
-    private void OnIFFShowVessel(EntityUid uid, IFFConsoleComponent component, IFFShowVesselMessage args)
+    private void OnInitIFFConsole(EntityUid uid, IFFConsoleComponent component, MapInitEvent args)
     {
-        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null ||
-            (component.AllowedFlags & IFFFlags.Hide) == 0x0)
+        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null)
         {
             return;
         }
 
-        if (!args.Show)
+        if (component.HideOnInit)
         {
+            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
             AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
         }
-        else
-        {
-            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
-        }
     }
 
     private void OnIFFConsoleAnchor(EntityUid uid, IFFConsoleComponent component, ref AnchorStateChangedEvent args)
diff --git a/Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs b/Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs
deleted file mode 100644
index 77ccaf2a60..0000000000
--- a/Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.Events;
-
-[Serializable, NetSerializable]
-public sealed class IFFShowVesselMessage : BoundUserInterfaceMessage
-{
-    public bool Show;
-}
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 98331593f9..621d171d89 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -283,6 +283,7 @@
     allowedFlags:
       - Hide
       - HideLabel
+    hideOnInit: true
   - type: ActivatableUI
     key: enum.IFFConsoleUiKey.Key
   - type: UserInterface

From e8a442836482237c4a86f3a35f48d9c532671018 Mon Sep 17 00:00:00 2001
From: Leah <leahcatdev@gmail.com>
Date: Sat, 27 Dec 2025 17:05:38 +0100
Subject: [PATCH 188/360] update communicator kit description for voice mask
 implanter (#42115)

update thief backpack description for voice mask implanter
---
 Resources/Locale/en-US/thief/backpack.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl
index e647280453..b54eefeb67 100644
--- a/Resources/Locale/en-US/thief/backpack.ftl
+++ b/Resources/Locale/en-US/thief/backpack.ftl
@@ -55,7 +55,7 @@ thief-backpack-category-communicator-description =
     Money is power, and secrets are money. Use your silver tongue
     and wealth to subvert the station.
     Includes: Master key for all station channels, a CyberSun pen,
-    voice chameleon mask, and 20k spesos inside a briefcase.
+    voice mask implanter, and 20k spesos inside a briefcase.
 
 thief-backpack-category-smuggler-name = smuggler kit
 thief-backpack-category-smuggler-description =

From 306ef174db83229c14bcc4a4c1811cd6978f61ee Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sat, 27 Dec 2025 18:09:33 +0100
Subject: [PATCH 189/360] ReagentGrinder Comp and API to shared (#41956)

* init

* API

* review

* return

* review

* I tend to be stupid
---
 .../EntitySystems/ReagentGrinderSystem.cs     |  8 +++
 .../Components/ReagentGrinderComponent.cs     | 52 --------------
 .../EntitySystems/ReagentGrinderSystem.cs     | 70 +++++++------------
 .../Components/ReagentGrinderComponent.cs     | 54 ++++++++++++++
 .../SharedReagentGrinderSystem.cs             | 68 ++++++++++++++++++
 .../Kitchen/SharedReagentGrinder.cs           |  1 +
 6 files changed, 158 insertions(+), 95 deletions(-)
 create mode 100644 Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
 delete mode 100644 Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
 create mode 100644 Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs

diff --git a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
new file mode 100644
index 0000000000..5eebd4a0fb
--- /dev/null
+++ b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Kitchen.EntitySystems;
+using JetBrains.Annotations;
+
+namespace Content.Client.Kitchen.EntitySystems;
+
+[UsedImplicitly]
+public sealed class ReagentGrinderSystem : SharedReagentGrinderSystem;
+
diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
deleted file mode 100644
index 5bbbe2dc8d..0000000000
--- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Shared.Kitchen;
-using Content.Server.Kitchen.EntitySystems;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Kitchen.Components
-{
-    /// <summary>
-    /// The combo reagent grinder/juicer. The reason why grinding and juicing are seperate is simple,
-    /// think of grinding as a utility to break an object down into its reagents. Think of juicing as
-    /// converting something into its single juice form. E.g, grind an apple and get the nutriment and sugar
-    /// it contained, juice an apple and get "apple juice".
-    /// </summary>
-    [Access(typeof(ReagentGrinderSystem)), RegisterComponent]
-    public sealed partial class ReagentGrinderComponent : Component
-    {
-        [DataField]
-        public int StorageMaxEntities = 6;
-
-        [DataField]
-        public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
-
-        [DataField]
-        public float WorkTimeMultiplier = 1;
-
-        [DataField]
-        public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
-
-        [DataField]
-        public SoundSpecifier GrindSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/blender.ogg");
-
-        [DataField]
-        public SoundSpecifier JuiceSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/juicer.ogg");
-
-        [DataField]
-        public GrinderAutoMode AutoMode = GrinderAutoMode.Off;
-
-        public EntityUid? AudioStream;
-    }
-
-    [Access(typeof(ReagentGrinderSystem)), RegisterComponent]
-    public sealed partial class ActiveReagentGrinderComponent : Component
-    {
-        /// <summary>
-        /// Remaining time until the grinder finishes grinding/juicing.
-        /// </summary>
-        [ViewVariables]
-        public TimeSpan EndTime;
-
-        [ViewVariables]
-        public GrinderProgram Program;
-    }
-}
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index fe87cc6fc3..f002c1ae1c 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -1,5 +1,3 @@
-using Content.Server.Kitchen.Components;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Chemistry.EntitySystems;
@@ -20,15 +18,15 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
 using System.Linq;
-using Content.Server.Construction.Completions;
 using Content.Server.Jittering;
 using Content.Shared.Jittering;
+using Content.Shared.Kitchen.EntitySystems;
 using Content.Shared.Power;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
     [UsedImplicitly]
-    internal sealed class ReagentGrinderSystem : EntitySystem
+    internal sealed class ReagentGrinderSystem : SharedReagentGrinderSystem
     {
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly SharedSolutionContainerSystem _solutionContainersSystem = default!;
@@ -65,7 +63,9 @@ namespace Content.Server.Kitchen.EntitySystems
 
         private void OnToggleAutoModeMessage(Entity<ReagentGrinderComponent> entity, ref ReagentGrinderToggleAutoModeMessage message)
         {
-            entity.Comp.AutoMode = (GrinderAutoMode) (((byte) entity.Comp.AutoMode + 1) % Enum.GetValues(typeof(GrinderAutoMode)).Length);
+            entity.Comp.AutoMode = (GrinderAutoMode)(((byte)entity.Comp.AutoMode + 1) % Enum.GetValues(typeof(GrinderAutoMode)).Length);
+
+            Dirty(entity);
 
             UpdateUiState(entity);
         }
@@ -92,12 +92,13 @@ namespace Content.Server.Kitchen.EntitySystems
 
                 foreach (var item in inputContainer.ContainedEntities.ToList())
                 {
-                    var solution = active.Program switch
+                    var solution = GetGrinderSolution(item, active.Program);
+                    // Begin Imp changes - DeltaV - Updated for reagent grinder moving to shared
+                    if (active.Program == GrinderProgram.Grind)
                     {
-                        GrinderProgram.Grind => TryGrindSolution(item, (uid, reagentGrinder), inputContainer.ContainedEntities), // Imp
-                        GrinderProgram.Juice => CompOrNull<ExtractableComponent>(item)?.JuiceSolution,
-                        _ => null,
-                    };
+                        solution = TryGrindSolution(item, solution, (uid, reagentGrinder), inputContainer.ContainedEntities);
+                    }
+                    // Begin Imp changes - DeltaV - Updated for reagent grinder moving to shared
 
                     if (solution is null)
                         continue;
@@ -110,7 +111,7 @@ namespace Content.Server.Kitchen.EntitySystems
 
                         // Maximum number of items we can process in the stack without going over AvailableVolume
                         // We add a small tolerance, because floats are inaccurate.
-                        var fitsCount = (int) (stack.Count * FixedPoint2.Min(containerSolution.AvailableVolume / totalVolume + 0.01, 1));
+                        var fitsCount = (int)(stack.Count * FixedPoint2.Min(containerSolution.AvailableVolume / totalVolume + 0.01, 1));
                         if (fitsCount <= 0)
                             continue;
 
@@ -228,8 +229,8 @@ namespace Content.Server.Kitchen.EntitySystems
                 && _solutionContainersSystem.TryGetFitsInDispenser(outputContainer.Value, out _, out containerSolution)
                 && inputContainer.ContainedEntities.Count > 0)
             {
-                canGrind = inputContainer.ContainedEntities.All(CanGrind);
-                canJuice = inputContainer.ContainedEntities.All(CanJuice);
+                canGrind = inputContainer.ContainedEntities.All(x => CanGrind(x));
+                canJuice = inputContainer.ContainedEntities.All(x => CanJuice(x));
             }
 
             var state = new ReagentGrinderInterfaceState(
@@ -303,10 +304,10 @@ namespace Content.Server.Kitchen.EntitySystems
             SoundSpecifier? sound;
             switch (program)
             {
-                case GrinderProgram.Grind when inputContainer.ContainedEntities.All(CanGrind):
+                case GrinderProgram.Grind when inputContainer.ContainedEntities.All(x => CanGrind(x)):
                     sound = reagentGrinder.GrindSound;
                     break;
-                case GrinderProgram.Juice when inputContainer.ContainedEntities.All(CanJuice):
+                case GrinderProgram.Juice when inputContainer.ContainedEntities.All(x => CanJuice(x)):
                     sound = reagentGrinder.JuiceSound;
                     break;
                 default:
@@ -328,39 +329,22 @@ namespace Content.Server.Kitchen.EntitySystems
             _audioSystem.PlayPvs(reagentGrinder.Comp.ClickSound, reagentGrinder.Owner, AudioParams.Default.WithVolume(-2f));
         }
 
-        // Begin Imp
-        private Solution? TryGrindSolution(EntityUid uid, Entity<ReagentGrinderComponent> grinder, IReadOnlyList<EntityUid> contents)
+        // Begin Imp Changes - DeltaV - Updated for reagent grinder moving to shared
+        private Solution? TryGrindSolution(
+            EntityUid uid,
+            Solution? solution,
+            Entity<ReagentGrinderComponent> grinder,
+            IReadOnlyList<EntityUid> contents)
         {
-            if (TryComp<ExtractableComponent>(uid, out var extractable)
-                && extractable.GrindableSolution is not null
-                && _solutionContainersSystem.TryGetSolution(uid, extractable.GrindableSolution, out _, out var solution))
-            {
-                var ev = new GrindAttemptEvent(grinder, contents);
-                RaiseLocalEvent(uid, ev);
+            var ev = new GrindAttemptEvent(grinder, contents);
+            RaiseLocalEvent(uid, ev);
 
-                if (ev.Cancelled)
-                    return null;
-
-                return solution;
-            }
-            else
+            if (ev.Cancelled)
                 return null;
-        }
-        // End Imp
 
-        private bool CanGrind(EntityUid uid)
-        {
-            var solutionName = CompOrNull<ExtractableComponent>(uid)?.GrindableSolution;
-
-            return solutionName is not null && _solutionContainersSystem.TryGetSolution(uid, solutionName, out _, out _);
+            return solution;
         }
 
-        private bool CanJuice(EntityUid uid)
-        {
-            return CompOrNull<ExtractableComponent>(uid)?.JuiceSolution is not null;
-        }
-
-        // Begin Imp Changes
         public sealed partial class GrindAttemptEvent : CancellableEntityEventArgs
         {
             public Entity<ReagentGrinderComponent> Grinder;
@@ -372,6 +356,6 @@ namespace Content.Server.Kitchen.EntitySystems
                 Reagents = reagents;
             }
         }
-        // End Imp Changes
+        // End Imp Changes - DeltaV - Updated for reagent grinder moving to shared
     }
 }
diff --git a/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
new file mode 100644
index 0000000000..6b8eb6f4ac
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Kitchen.EntitySystems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Kitchen.Components;
+
+/// <summary>
+/// The combo reagent grinder/juicer. The reason why grinding and juicing are seperate is simple,
+/// think of grinding as a utility to break an object down into its reagents. Think of juicing as
+/// converting something into its single juice form. E.g, grind an apple and get the nutriment and sugar
+/// it contained, juice an apple and get "apple juice".
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedReagentGrinderSystem))]
+public sealed partial class ReagentGrinderComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public int StorageMaxEntities = 6;
+
+    [DataField, AutoNetworkedField]
+    public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
+
+    [DataField, AutoNetworkedField]
+    public float WorkTimeMultiplier = 1;
+
+    [DataField]
+    public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
+
+    [DataField]
+    public SoundSpecifier GrindSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/blender.ogg");
+
+    [DataField]
+    public SoundSpecifier JuiceSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/juicer.ogg");
+
+    [DataField, AutoNetworkedField]
+    public GrinderAutoMode AutoMode = GrinderAutoMode.Off;
+
+    public EntityUid? AudioStream;
+}
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedReagentGrinderSystem))]
+public sealed partial class ActiveReagentGrinderComponent : Component
+{
+    /// <summary>
+    /// Remaining time until the grinder finishes grinding/juicing.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan EndTime;
+
+    [ViewVariables]
+    public GrinderProgram Program;
+}
+
diff --git a/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
new file mode 100644
index 0000000000..b54fd1d49e
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
@@ -0,0 +1,68 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Kitchen.Components;
+using JetBrains.Annotations;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+[UsedImplicitly]
+public abstract class SharedReagentGrinderSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainersSystem = default!;
+
+    /// <summary>
+    /// Gets the solutions from an entity using the specified Grinder program.
+    /// </summary>
+    /// <param name="ent">The entity which we check for solutions.</param>
+    /// <param name="program">The grinder program.</param>
+    /// <returns>The solution received, or null if none.</returns>
+    public Solution? GetGrinderSolution(Entity<ExtractableComponent?> ent, GrinderProgram program)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return null;
+
+        switch (program)
+        {
+            case GrinderProgram.Grind:
+                if (_solutionContainersSystem.TryGetSolution(ent.Owner, ent.Comp.GrindableSolution, out _, out var solution))
+                {
+                    return solution;
+                }
+                break;
+            case GrinderProgram.Juice:
+                return ent.Comp.JuiceSolution;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Checks whether the entity can be ground using a ReagentGrinder.
+    /// </summary>
+    /// <param name="ent">The entity to check.</param>
+    /// <returns>True if it can be ground, otherwise false.</returns>
+    public bool CanGrind(Entity<ExtractableComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        if (ent.Comp.GrindableSolution == null)
+            return false;
+
+        return _solutionContainersSystem.TryGetSolution(ent.Owner, ent.Comp.GrindableSolution, out _, out _);
+    }
+
+    /// <summary>
+    /// Checks whether the entity can be juiced using a ReagentGrinder.
+    /// </summary>
+    /// <param name="ent">The entity to check.</param>
+    /// <returns>True if it can be juiced, otherwise false.</returns>
+    public bool CanJuice(Entity<ExtractableComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        return ent.Comp.JuiceSolution is not null;
+    }
+}
+
diff --git a/Content.Shared/Kitchen/SharedReagentGrinder.cs b/Content.Shared/Kitchen/SharedReagentGrinder.cs
index 579db239c8..83088555da 100644
--- a/Content.Shared/Kitchen/SharedReagentGrinder.cs
+++ b/Content.Shared/Kitchen/SharedReagentGrinder.cs
@@ -81,6 +81,7 @@ namespace Content.Shared.Kitchen
         Key
     }
 
+    [Serializable, NetSerializable]
     public enum GrinderAutoMode : byte
     {
         Off,

From 9096ae21be246ee1ba253dc2ebb31c8907eb401b Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sun, 28 Dec 2025 10:57:02 +1000
Subject: [PATCH 190/360] Fix broken vending machine UI behavior (#42110)

* Fix broken vending machine UI behavior

* begone

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
---
 .../VendingMachines/VendingMachineSystem.cs   | 17 -----------------
 .../SharedVendingMachineSystem.cs             | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 1fb695ae61..1c28378393 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -6,11 +6,9 @@ using Content.Server.Vocalization.Systems;
 using Content.Shared.Cargo;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
-using Content.Shared.Destructible;
 using Content.Shared.Emp;
 using Content.Shared.Power;
 using Content.Shared.Throwing;
-using Content.Shared.UserInterface;
 using Content.Shared.VendingMachines;
 using Content.Shared.Wall;
 using Robust.Shared.Prototypes;
@@ -31,12 +29,10 @@ namespace Content.Server.VendingMachines
             base.Initialize();
 
             SubscribeLocalEvent<VendingMachineComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamageChanged);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
             SubscribeLocalEvent<VendingMachineComponent, TryVocalizeEvent>(OnTryVocalize);
 
-            SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
             SubscribeLocalEvent<VendingMachineComponent, VendingMachineSelfDispenseEvent>(OnSelfDispense);
 
             SubscribeLocalEvent<VendingMachineRestockComponent, PriceCalculationEvent>(OnPriceCalculation);
@@ -70,24 +66,11 @@ namespace Content.Server.VendingMachines
             }
         }
 
-        private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent component, ActivatableUIOpenAttemptEvent args)
-        {
-            if (component.Broken)
-                args.Cancel();
-        }
-
         private void OnPowerChanged(EntityUid uid, VendingMachineComponent component, ref PowerChangedEvent args)
         {
             TryUpdateVisualState((uid, component));
         }
 
-        private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, BreakageEventArgs eventArgs)
-        {
-            vendComponent.Broken = true;
-            Dirty(uid, vendComponent);
-            TryUpdateVisualState((uid, vendComponent));
-        }
-
         private void OnDamageChanged(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args)
         {
             if (!args.DamageIncreased && component.Broken)
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
index 610f4d0efe..9dafb17e3c 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Advertise.Components;
 using Content.Shared.Advertise.Systems;
+using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
@@ -10,6 +11,7 @@ using Content.Shared.Emp;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.UserInterface;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
@@ -43,6 +45,8 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
         SubscribeLocalEvent<VendingMachineComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse);
         SubscribeLocalEvent<VendingMachineComponent, RestockDoAfterEvent>(OnRestockDoAfter);
+        SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
+        SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
 
         SubscribeLocalEvent<VendingMachineRestockComponent, AfterInteractEvent>(OnAfterInteract);
 
@@ -425,4 +429,19 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
             }
         }
     }
+
+    private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (component.Broken)
+            args.Cancel();
+    }
+
+    private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, BreakageEventArgs eventArgs)
+    {
+        vendComponent.Broken = true;
+        Dirty(uid, vendComponent);
+        TryUpdateVisualState((uid, vendComponent));
+
+        UISystem.CloseUi(uid, VendingMachineUiKey.Key);
+    }
 }

From 4ebd2d34cde2ace2cc724327cde7265295e077d5 Mon Sep 17 00:00:00 2001
From: SnappingOpossum <snappingopossum@outlook.com>
Date: Sun, 28 Dec 2025 17:23:46 +1100
Subject: [PATCH 191/360] Add crayon box to Big Bite meals (#42077)

Shuffle things, use table for big bite
---
 .../Consumable/Food/Containers/box.yml        | 36 ++++---------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index c165f7b072..688a715607 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -625,8 +625,6 @@
     containers:
       storagebase: !type:AllSelector
         children:
-        - !type:NestedSelector # First since it can spawn a 3x3
-          tableId: HappyHonkToySafeEntityTable
         - id: FoodBurgerCheese
         - !type:GroupSelector
           children:
@@ -634,6 +632,8 @@
           - id: DrinkLemonLimeCan
           - id: DrinkLemonLimeCranberryCan
           - id: DrinkIcedTeaCan
+        - !type:NestedSelector
+          tableId: HappyHonkToySafeEntityTable
 
 - type: entity
   id: FoodMealHappyHonkBigBite
@@ -646,33 +646,11 @@
       storagebase: !type:AllSelector
         children:
         - id: FoodBurgerBig
-        - id: FoodMealFriesCheesy
         - id: DrinkColaBottleFull
+        - !type:NestedSelector
+          tableId: HappyHonkToySafeEntityTable
+        - id: FoodMealFriesCheesy
         - id: FoodPieAppleSlice
-        - !type:GroupSelector # One item is too big, so the HappyHonkToySafeEntityTable can't  be used like the others.
-          children:
-          - id: ToyMouse
-          - id: ToyAi
-          - id: ToyNuke
-          - id: ToyFigurinePassenger
-          - id: ToyFigurineGriffin
-          - id: ToyIan
-          - id: ToyFigurineOwlman
-          - id: ToyFigurineSkeleton
-          - id: FoamBlade
-          - id: ClothingHeadHatBunny
-          - id: PersonalAI
-          #- id: CrayonBox
-          - id: ToySword
-          - id: RevolverCapGun
-          - id: ToyRubberDuck
-          - id: BikeHorn
-            weight: 0.5
-          - id: GoldenBikeHorn
-            weight: 0.1
-          - !type:NestedSelector
-            tableId: AllFigurineMechsTable
-            weight: 6
 
 - type: entity
   parent: BoxCardboard
@@ -699,7 +677,7 @@
       storagebase:
         id: MaterialCloth10
 
-- type: entityTable
+- type: entityTable # size: 2x2
   id: HappyHonkToySafeEntityTable
   table: !type:GroupSelector
     children:
@@ -728,7 +706,7 @@
       tableId: AllFigurineMechsTable
       weight: 6
 
-- type: entityTable
+- type: entityTable # size: 1x2
   id: HappyHonkToyUnsafeEntityTable
   table: !type:GroupSelector
     children:

From 06e305a984ed242ff5963ae232127cfb21489953 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Sun, 28 Dec 2025 11:16:07 +0400
Subject: [PATCH 192/360] optimise shuttle collision entity throwing (#40984)

* optimise

* reconstruct

* fix

* very mild change

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Shuttles/Systems/ShuttleSystem.Impact.cs  | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index 6126234451..d50eea53ee 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -231,35 +231,58 @@ public sealed partial class ShuttleSystem
         var knockdownTime = TimeSpan.FromSeconds(5);
 
         var minsq = _minThrowVelocity * _minThrowVelocity;
-        // iterate all entities on the grid
-        // TODO: only iterate non-static entities
-        var childEnumerator = xform.ChildEnumerator;
-        while (childEnumerator.MoveNext(out var uid))
-        {
-            // don't throw static bodies
-            if (!_physicsQuery.TryGetComponent(uid, out var physics) || (physics.BodyType & BodyType.Static) != 0)
-                continue;
 
+        // iterate all dynamic entities on the grid
+        if (!TryComp<BroadphaseComponent>(gridUid, out var lookup) || !_gridQuery.TryComp(gridUid, out var gridComp))
+            return;
+
+        var gridBox = gridComp.LocalAABB;
+        List<Entity<PhysicsComponent>> list = new();
+        HashSet<EntityUid> processed = new();
+        var state = (list, processed, _physicsQuery);
+        lookup.DynamicTree.QueryAabb(ref state, GridQueryCallback, gridBox, true);
+        lookup.SundriesTree.QueryAabb(ref state, GridQueryCallback, gridBox, true);
+
+        foreach (var ent in list)
+        {
             // don't throw if buckled
-            if (_buckle.IsBuckled(uid, _buckleQuery.CompOrNull(uid)))
+            if (_buckle.IsBuckled(ent, _buckleQuery.CompOrNull(ent)))
                 continue;
 
             // don't throw them if they have magboots
-            if (movedByPressureQuery.TryComp(uid, out var moved) && !moved.Enabled)
+            if (movedByPressureQuery.TryComp(ent, out var moved) && !moved.Enabled)
                 continue;
 
             if (direction.LengthSquared() > minsq)
             {
-                _stuns.TryCrawling(uid, knockdownTime);
-                _throwing.TryThrow(uid, direction, physics, Transform(uid), _projQuery, direction.Length(), playSound: false);
+                _stuns.TryCrawling(ent.Owner, knockdownTime);
+                _throwing.TryThrow(ent, direction, ent.Comp, Transform(ent), _projQuery, direction.Length(), playSound: false);
             }
             else
             {
-                _physics.ApplyLinearImpulse(uid, direction * physics.Mass, body: physics);
+                _physics.ApplyLinearImpulse(ent, direction * ent.Comp.Mass, body: ent.Comp);
             }
         }
     }
 
+    private static bool GridQueryCallback(
+        ref (List<Entity<PhysicsComponent>> List, HashSet<EntityUid> Processed, EntityQuery<PhysicsComponent> PhysicsQuery) state,
+        in EntityUid uid)
+    {
+        if (state.Processed.Add(uid) && state.PhysicsQuery.TryComp(uid, out var body))
+            state.List.Add((uid, body));
+
+        return true;
+    }
+
+    private static bool GridQueryCallback(
+        ref (List<Entity<PhysicsComponent>> List, HashSet<EntityUid> Processed, EntityQuery<PhysicsComponent> PhysicsQuery) state,
+        in FixtureProxy proxy)
+    {
+        var owner = proxy.Entity;
+        return GridQueryCallback(ref state, in owner);
+    }
+
     /// <summary>
     /// Structure to hold impact tile processing data for batch processing
     /// </summary>

From 94f1f8fa51fc3520344e3af500d534779905887f Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Sun, 28 Dec 2025 05:35:07 -0800
Subject: [PATCH 193/360] Add `AtmosTest` test assertion for a valid grid
 (#42139)

add test assertion for a valid grid
---
 .../Tests/Atmos/AtmosTest.cs                  | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
index d50c4a200b..d3bdc91cda 100644
--- a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
@@ -20,7 +20,7 @@ public abstract class AtmosTest : InteractionTest
     protected AtmosphereSystem SAtmos = default!;
     protected EntityLookupSystem LookupSystem = default!;
 
-    protected Entity<GridAtmosphereComponent> RelevantAtmos = default!;
+    protected Entity<GridAtmosphereComponent> RelevantAtmos;
 
     /// <summary>
     /// Used in <see cref="AtmosphereSystem.RunProcessingFull"/>. Resolved during test setup.
@@ -40,14 +40,35 @@ public abstract class AtmosTest : InteractionTest
         SAtmos = SEntMan.System<AtmosphereSystem>();
         LookupSystem = SEntMan.System<EntityLookupSystem>();
 
-        RelevantAtmos = (MapData.Grid, SEntMan.GetComponent<GridAtmosphereComponent>(MapData.Grid));
+        SEntMan.TryGetComponent<GridAtmosphereComponent>(MapData.Grid, out var gridAtmosComp);
+        SEntMan.TryGetComponent<GasTileOverlayComponent>(MapData.Grid, out var overlayComp);
+        SEntMan.TryGetComponent<MapGridComponent>(MapData.Grid, out var mapGridComp);
+        var xform = SEntMan.GetComponent<TransformComponent>(MapData.Grid);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(gridAtmosComp,
+                    Is.Not.Null,
+                    "Loaded map doesn't have a GridAtmosphereComponent on its grid. " +
+                    "Did you forget to override TestMapPath with a proper atmospherics testing map?");
+            Assert.That(overlayComp,
+                Is.Not.Null,
+                "Loaded map doesn't have a GasTileOverlayComponent on its grid. " +
+                "Did you forget to override TestMapPath with a proper atmospherics testing map?");
+            Assert.That(mapGridComp,
+                Is.Not.Null,
+                "Loaded map doesn't have a MapGridComponent on its grid. " +
+                "Did you forget to override TestMapPath with a proper atmospherics testing map?");
+        }
+
+        RelevantAtmos = (MapData.Grid, gridAtmosComp);
 
         ProcessEnt = new Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent>(
             MapData.Grid.Owner,
-            SEntMan.GetComponent<GridAtmosphereComponent>(MapData.Grid.Owner),
-            SEntMan.GetComponent<GasTileOverlayComponent>(MapData.Grid.Owner),
-            SEntMan.GetComponent<MapGridComponent>(MapData.Grid.Owner),
-            SEntMan.GetComponent<TransformComponent>(MapData.Grid.Owner));
+            gridAtmosComp,
+            overlayComp,
+            mapGridComp,
+            xform);
     }
 
     /// <summary>

From a7dc96390c18179af9a0f19a10c929bef5726165 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 28 Dec 2025 15:22:04 -0800
Subject: [PATCH 194/360] Delete MetabolismMovespeedModifierSystem (#42134)

* delete metabolismmovespeedmodifiersystem

* Revert "delete metabolismmovespeedmodifiersystem"

This reverts commit 19572fa0858bfb9385f4717fc77c8956bdbc56c0.

* delete metabolismmovespeedmodifiersystem and component

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../MovespeedModifierMetabolismComponent.cs   | 22 -------
 .../MetabolismMovespeedModifierSystem.cs      | 61 -------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
 delete mode 100644 Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs

diff --git a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
deleted file mode 100644
index 62127ab533..0000000000
--- a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Chemistry.Components
-{
-    //TODO: refactor movement modifier component because this is a pretty poor solution
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    public sealed partial class MovespeedModifierMetabolismComponent : Component
-    {
-        [AutoNetworkedField, ViewVariables]
-        public float WalkSpeedModifier { get; set; }
-
-        [AutoNetworkedField, ViewVariables]
-        public float SprintSpeedModifier { get; set; }
-
-        /// <summary>
-        /// When the current modifier is expected to end.
-        /// </summary>
-        [AutoNetworkedField, ViewVariables]
-        public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero;
-    }
-}
-
diff --git a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
deleted file mode 100644
index 68a55dd468..0000000000
--- a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Chemistry
-{
-    // TODO CONVERT THIS TO A STATUS EFFECT!!!!!!!!!!!!!!!!!!!!!!!!
-    public sealed class MetabolismMovespeedModifierSystem : EntitySystem
-    {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MovementSpeedModifierSystem _movespeed = default!;
-
-        private readonly List<Entity<MovespeedModifierMetabolismComponent>> _components = new();
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            UpdatesOutsidePrediction = true;
-
-            SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentStartup>(AddComponent);
-            SubscribeLocalEvent<MovespeedModifierMetabolismComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
-        }
-
-        private void OnRefreshMovespeed(EntityUid uid, MovespeedModifierMetabolismComponent component, RefreshMovementSpeedModifiersEvent args)
-        {
-            args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
-        }
-
-        private void AddComponent(Entity<MovespeedModifierMetabolismComponent> metabolism, ref ComponentStartup args)
-        {
-            _components.Add(metabolism);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var currentTime = _gameTiming.CurTime;
-
-            for (var i = _components.Count - 1; i >= 0; i--)
-            {
-                var metabolism = _components[i];
-
-                if (metabolism.Comp.Deleted)
-                {
-                    _components.RemoveAt(i);
-                    continue;
-                }
-
-                if (metabolism.Comp.ModifierTimer > currentTime)
-                    continue;
-
-                _components.RemoveAt(i);
-                RemComp<MovespeedModifierMetabolismComponent>(metabolism);
-
-                _movespeed.RefreshMovementSpeedModifiers(metabolism);
-            }
-        }
-    }
-}

From 4c37364c8d2f60fda614b898afa0f389fe1c6f3b Mon Sep 17 00:00:00 2001
From: YoungThug <ramialanbagy@gmail.com>
Date: Sun, 28 Dec 2025 17:01:35 -0700
Subject: [PATCH 195/360] Add antag control for the space ninja (#42133)

* Add antag control for the space ninja

* Remove whitespace

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
---
 .../Systems/AdminVerbSystem.Antags.cs            | 16 ++++++++++++++++
 Resources/Locale/en-US/administration/antag.ftl  |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 00ca47716b..5b8748ba4f 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -36,6 +36,7 @@ public sealed partial class AdminVerbSystem
     private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
     private static readonly EntProtoId DefaultConspiratorRule = "Conspirators"; // Harmony
     private static readonly EntProtoId DefaultWizardRule = "Wizard";
+    private static readonly EntProtoId DefaultNinjaRule = "NinjaSpawn";
     private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
 
     // All antag verbs have names so invokeverb works.
@@ -212,6 +213,21 @@ public sealed partial class AdminVerbSystem
         };
         args.Verbs.Add(wizard);
 
+        var ninjaName = Loc.GetString("admin-verb-text-make-space-ninja");
+        Verb ninja = new()
+        {
+            Text = ninjaName,
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Melee/energykatana.rsi"), "icon"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<NinjaRoleComponent>(targetPlayer, DefaultNinjaRule);
+            },
+            Impact = LogImpact.High,
+            Message = string.Join(": ", ninjaName, Loc.GetString("admin-verb-make-space-ninja")),
+        };
+        args.Verbs.Add(ninja);
+
         if (HasComp<HumanoidAppearanceComponent>(args.Target)) // only humanoids can be cloned
             args.Verbs.Add(paradox);
 
diff --git a/Resources/Locale/en-US/administration/antag.ftl b/Resources/Locale/en-US/administration/antag.ftl
index 5cb9b30133..a81dd048b8 100644
--- a/Resources/Locale/en-US/administration/antag.ftl
+++ b/Resources/Locale/en-US/administration/antag.ftl
@@ -8,6 +8,7 @@ admin-verb-make-head-rev = Make the target into a Head Revolutionary.
 admin-verb-make-thief = Make the target into a thief.
 admin-verb-make-paradox-clone = Create a Paradox Clone ghost role of the target.
 admin-verb-make-wizard = Make the target into a Wizard.
+admin-verb-make-space-ninja = Make the target into a Space Ninja.
 admin-verb-make-changeling = Make the target into a Changeling.
 
 
@@ -20,6 +21,7 @@ admin-verb-text-make-head-rev = Make Head Rev
 admin-verb-text-make-thief = Make Thief
 admin-verb-text-make-paradox-clone = Create Paradox Clone
 admin-verb-text-make-wizard = Make Wizard
+admin-verb-text-make-space-ninja = Make Ninja
 admin-verb-text-make-changeling = Make Changeling (WIP)
 
 admin-overlay-antag-classic = ANTAG

From 806e5b253aa491a7f9f3d0106b3d4f1481a515ee Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Mon, 29 Dec 2025 10:53:18 +0200
Subject: [PATCH 196/360] Fix possible bug in my fix of IFF console. Add
 documentation to HideOnInit. (#42122)

* Refactor OnIFFShow and OnInitIFFConsole by extracting AddAllSupportedIFFFlags method. Fix possible addition of unallowed flags.

Fix posible addition of unallowed flags in OnInitIFFConsole by performing AllowedFlags check in the extracted function.

* Add documentation to HideOnInit

* Update IFFConsoleComponent.cs

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
---
 .../Components/IFFConsoleComponent.cs         |  3 ++
 .../Shuttles/Systems/ShuttleSystem.IFF.cs     | 44 +++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
index 8db81dc1fd..c2cf913c2c 100644
--- a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
@@ -12,6 +12,9 @@ public sealed partial class IFFConsoleComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("allowedFlags")]
     public IFFFlags AllowedFlags = IFFFlags.HideLabel;
 
+    /// <summary>
+    /// If true, automatically applies all supported IFF flags to the console's grid on MapInitEvent.
+    /// </summary>
     [DataField]
     public bool HideOnInit = false;
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
index e8d2e13e80..738fb765e1 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
@@ -42,28 +42,14 @@ public sealed partial class ShuttleSystem
             return;
         }
 
-        // Merged toggle controls both HideLabel and Hide flags
         if (!args.Show)
         {
-            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
-            {
-                AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
-            }
-            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
-            {
-                AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
-            }
+            AddAllSupportedIFFFlags(xform, component);
         }
         else
         {
-            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
-            {
-                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
-            }
-            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
-            {
-                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
-            }
+            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
         }
     }
 
@@ -76,8 +62,7 @@ public sealed partial class ShuttleSystem
 
         if (component.HideOnInit)
         {
-            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
-            AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+            AddAllSupportedIFFFlags(xform, component);
         }
     }
 
@@ -121,4 +106,25 @@ public sealed partial class ShuttleSystem
             });
         }
     }
+
+    // Made this method to avoid copy and pasting.
+    /// <summary>
+    /// Adds all IFF flags that are allowed by AllowedFlags to the grid.
+    /// </summary>
+    private void AddAllSupportedIFFFlags(TransformComponent xform, IFFConsoleComponent component)
+    {
+        if (xform.GridUid == null)
+        {
+            return;
+        }
+
+        if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+        {
+            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+        }
+        if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
+        {
+            AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+        }
+    }
 }

From 4d817b7e792f064821b22db629f4283354b82e4f Mon Sep 17 00:00:00 2001
From: PAFFhassoocks <asukalangleydanielle@gmail.com>
Date: Mon, 29 Dec 2025 13:29:13 +0300
Subject: [PATCH 197/360] puts Space ninja survival box contents into their bag
 (#42102)

* removes extended survival box, but adds most contents into the ninja's satchel

* major essential bugfix
---
 Resources/Prototypes/GameRules/events.yml       | 2 +-
 Resources/Prototypes/Loadouts/role_loadouts.yml | 5 +++++
 Resources/Prototypes/Roles/Antags/ninja.yml     | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index ca771fc062..1ef299dc0b 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -279,7 +279,7 @@
       pickPlayer: false
       startingGear: SpaceNinjaGear
       roleLoadout:
-      - RoleSurvivalEVA
+      - RoleSurvivalSpaceNinja
       briefing:
         text: ninja-role-greeting
         color: Green
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 8a633e86fb..8101b5696b 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -680,3 +680,8 @@
   groups:
   - GroupEVATank
   - SurvivalExtended
+
+- type: roleLoadout
+  id: RoleSurvivalSpaceNinja
+  groups:
+  - GroupEVATank
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index 63d529f725..d649b916f3 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -36,6 +36,10 @@
     - Wirecutter
     - Welder
     - Multitool
+    - EmergencyMedipen
+    - Flare
+    - FoodSnackNutribrick
+    - DrinkWaterBottleFull
 
 - type: chameleonOutfit
   id: NinjaChameleonOutfit

From a40a2192617b6b68ad8971b7fc53bb38c7968662 Mon Sep 17 00:00:00 2001
From: GeneralGaws <122978178+GeneralGaws@users.noreply.github.com>
Date: Mon, 29 Dec 2025 13:45:56 +0300
Subject: [PATCH 198/360] Remove syndicate bomb restock time (#42114)

* no restock time

* add timer
---
 .../Prototypes/Catalog/uplink_catalog.yml     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 56b4afd959..f3589fc5bc 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -958,6 +958,30 @@
     Telecrystal: 3 # DeltaV - was 4
   categories:
   - UplinkDeception
+  restockTime: 1800
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkSyndicateBombFakeNukie
+  name: uplink-exploding-syndicate-bomb-fake-name
+  description: uplink-exploding-syndicate-bomb-fake-desc
+  productEntity: SyndicateBombFake
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDeception
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
 
 # Disruption
 

From e0a604522bc96d359ae24a2fd3a6664bd11adea3 Mon Sep 17 00:00:00 2001
From: 0-Anon <cec124@case.edu>
Date: Mon, 29 Dec 2025 17:36:01 -0500
Subject: [PATCH 199/360] Ammonia restores Rat King Bloodlevel (#42167)

* Ammonia restores Rat King Bloodlevel

Adds a saline effect to ammonia for creatures with the rat metabolizer type condition (aka, rat kings)

* error fix

code did not like amount under condition so fixing that, and restoring amount to 1 to be identical to how it was working in the video. amount 6 was comical levels of blood restoration
---
 Resources/Prototypes/Reagents/botany.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index 5f420c127d..428c4e50a5 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -266,6 +266,14 @@
             Burn: -2.5
           types:
             Bloodloss: -5
+      - !type:ModifyBloodLevel
+        amount: 1
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [ Rat ]
+        - !type:ReagentCondition
+          reagent: Ammonia
+          min: 1
       - !type:Oxygenate # ammonia displaces nitrogen in vox blood
         conditions:
         - !type:MetabolizerTypeCondition

From 4e75d99f8f9900b773f88a555896a5b2ed0b8a1b Mon Sep 17 00:00:00 2001
From: mikey <23003816+mikeysaurus@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:05:13 -0800
Subject: [PATCH 200/360] Align detective stamp with rest of stamps (lower by 2
 pixels) (#42177)

move detective stamp down 2 pixels
---
 .../Objects/Misc/stamps.rsi/stamp-detective.png | Bin 340 -> 314 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png
index 0ff33f9c69ea81ce7551fa6df6f4c9540e9fac1e..c2c545f6afaffca2f6cbbb81540da343fc26679f 100644
GIT binary patch
delta 191
zcmV;w06_oL0=fc_gMWm-%52ov^S6nfjrzKXPR+FVc+g?m1O^=d?RY`OM5}6&)N0lN
zSnR&8?xh)s4=Kqp10XqO#D}z01KRNdw&@9gZF<7-0sx~~$lEt<+cr@Y(bF;Ac7x4l
z!n)EzDTV90xiyVia3MRNi=+dFzd$L)9>pHu1yq>^eBZ~itT>x^7={IGJjwg(Q1dfv
tchB#8E^;rAM@2rCE2Cv32!imx`39*wO%(<8k{AF0002ovPDHLkV1kg$TQ>jz

delta 217
zcmV;~04D#s0@MPKgMa=ivr%8q-zIuC>gyspHPhnbL5FD*7<2%%;{_EHt*S{<t62wN
zvHQBZmu4V7q$I}-faI7FAJS3{XvYiKrY8Wl=?TXR0E}iKZ{M_S+eA@BPseoI4K|+%
z>q-ly6t3&$)--Cth3tGTk`5UD0;Lpt6nlUdP-PnMeILuRZc^f57#6VcB=4_7&Cjsi
zJ-_d{$h|xs75P}MjFyog2!imx`376{O%;<CxxWAa01jnXNoGw=04e|g00;m800000
T0Mb*F00000NkvXXu0mjf2pn6C


From 6f9c3bedcb4192a9ab2a732ad77a5fb6b03e9b59 Mon Sep 17 00:00:00 2001
From: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Date: Tue, 30 Dec 2025 15:34:54 -0600
Subject: [PATCH 201/360] Chemmaster Pill Source (#40121)

* Buttons and basic internal data

* The buttons DO something

* it works?!!

* I hate predictions

* 5000 monkeys on typewritters

* who let the monkeys code?

* Localizations

* waiter, more commits please

* Not going insane (this is a lie)

* last one I SWEAR

* Some improvements ported from Moff

* clean it up a little

* one more cleanup

* The chemmaster is not a mime

* Fix my mistakes + address the other review

* Point to what chemmaster is broken, and why it's broken

* ChemMasterComponent changes

* Margin for packaging source

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../UI/ChemMasterBoundUserInterface.cs        |   4 +
 .../Chemistry/UI/ChemMasterWindow.xaml        |   9 +-
 .../Chemistry/UI/ChemMasterWindow.xaml.cs     |  49 ++++++--
 .../Components/ChemMasterComponent.cs         |   6 +
 .../EntitySystems/ChemMasterSystem.cs         | 115 ++++++++++++------
 Content.Shared/Chemistry/SharedChemMaster.cs  |  17 ++-
 .../components/chem-master-component.ftl      |   7 ++
 7 files changed, 161 insertions(+), 46 deletions(-)

diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index dcff475c3a..f6b494869a 100644
--- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -44,6 +44,10 @@ namespace Content.Client.Chemistry.UI
                     (uint) _window.BottleDosage.Value, _window.LabelLine));
             _window.BufferSortButton.OnPressed += _ => SendMessage(
                     new ChemMasterSortingTypeCycleMessage());
+            _window.OutputBufferDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.Internal));
+            _window.OutputBeakerDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.External));
 
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index 0fe7daff36..23d730cefa 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -83,10 +83,13 @@
 
             <!-- Packaging -->
             <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'chem-master-window-packaging-text'}" />
+                <Label Text="{Loc 'chem-master-output-source'}" StyleClasses="LabelSecondaryColor" Margin="0 0 5 0"/>
+                <Button MinSize="80 0" Name="OutputBufferDraw" Access="Public" Text="{Loc 'chem-master-output-buffer-draw'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <Button MinSize="80 0" Name="OutputBeakerDraw" Access="Public" Text="{Loc 'chem-master-output-beaker-draw'}" ToggleMode="True" StyleClasses="OpenLeft" />
                 <Control HorizontalExpand="True"/>
-                <Label Text="{Loc 'chem-master-window-container-label'}" /> <!-- DeltaV-->
-                <Label Name="BufferCurrentVolume" StyleClasses="LabelWeak" />
+                <!-- Output Draw Source -->
+                <Label Name="DrawSource"/>
+                <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
             </BoxContainer>
 
             <!-- Wrap the packaging info-->
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index c9353485b8..2152a0be1c 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -150,7 +150,17 @@ namespace Content.Client.Chemistry.UI
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
 
-            BufferCurrentVolume.Text = $" {castState.InputContainerInfo?.CurrentVolume.Int() ?? 0}u"; // DeltaV
+            switch (castState.DrawSource)
+            {
+                case ChemMasterDrawSource.Internal:
+                    SetBufferText(castState.BufferCurrentVolume, "chem-master-output-buffer-draw");
+                    break;
+                case ChemMasterDrawSource.External:
+                    SetBufferText(castState.InputContainerInfo?.CurrentVolume, "chem-master-output-beaker-draw");
+                    break;
+                default:
+                    throw new($"Chemmaster {castState.OutputContainerInfo} draw source is not set");
+            }
 
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
@@ -168,9 +178,14 @@ namespace Content.Client.Chemistry.UI
             var holdsReagents = output?.Reagents != null;
             var pillNumberMax = holdsReagents ? 0 : remainingCapacity;
             var bottleAmountMax = holdsReagents ? remainingCapacity : 0;
-            var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
+            var outputVolume = castState.DrawSource switch
+            {
+                ChemMasterDrawSource.Internal => castState.BufferCurrentVolume?.Int() ?? 0,
+                ChemMasterDrawSource.External => castState.InputContainerInfo?.CurrentVolume.Int() ?? 0,
+                _ => 0,
+            };
 
-            PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
+            PillDosage.Value = (int)Math.Min(outputVolume, castState.PillDosageLimit);
 
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
 
@@ -186,25 +201,35 @@ namespace Content.Client.Chemistry.UI
             // Avoid division by zero
             if (PillDosage.Value > 0)
             {
-                PillNumber.Value = Math.Min(bufferVolume / PillDosage.Value, pillNumberMax);
+                PillNumber.Value = Math.Min(outputVolume / PillDosage.Value, pillNumberMax);
             }
             else
             {
                 PillNumber.Value = 0;
             }
 
-            BottleDosage.Value = Math.Min(bottleAmountMax, bufferVolume);
+            BottleDosage.Value = Math.Min(bottleAmountMax, outputVolume);
         }
         /// <summary>
-        /// Generate a product label based on reagents in the buffer.
+        /// Generate a product label based on reagents in the buffer or beaker.
         /// </summary>
         /// <param name="state">State data sent by the server.</param>
         private string GenerateLabel(ChemMasterBoundUserInterfaceState state)
         {
-            if (state.BufferCurrentVolume == 0)
+            if (
+                state.BufferCurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.Internal ||
+                state.InputContainerInfo?.CurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.External ||
+                state.InputContainerInfo?.Reagents == null
+            )
                 return "";
 
-            var reagent = state.BufferReagents.OrderBy(r => r.Quantity).First().Reagent;
+            var reagent = (state.DrawSource switch
+                {
+                    ChemMasterDrawSource.Internal => state.BufferReagents,
+                    ChemMasterDrawSource.External => state.InputContainerInfo.Reagents ?? [],
+                    _ => throw new($"Chemmaster {state.OutputContainerInfo} draw source is not set"),
+                }).MinBy(r => r.Quantity)
+                .Reagent;
             _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
             return proto?.LocalizedName ?? "";
         }
@@ -230,6 +255,8 @@ namespace Content.Client.Chemistry.UI
                 _ => Loc.GetString("chem-master-window-sort-type-none")
             };
 
+            OutputBufferDraw.Pressed = state.DrawSource == ChemMasterDrawSource.Internal;
+            OutputBeakerDraw.Pressed = state.DrawSource == ChemMasterDrawSource.External;
 
             if (!state.BufferReagents.Any())
             {
@@ -411,6 +438,12 @@ namespace Content.Client.Chemistry.UI
             get => LabelLineEdit.Text;
             set => LabelLineEdit.Text = value;
         }
+
+        private void SetBufferText(FixedPoint2? volume, string text)
+        {
+            BufferCurrentVolume.Text = $" {volume ?? FixedPoint2.Zero}u";
+            DrawSource.Text = Loc.GetString(text);
+        }
     }
 
     public sealed class ReagentButton : Button
diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
index 80e3752a86..fe5b14a8ce 100644
--- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -27,5 +27,11 @@ namespace Content.Server.Chemistry.Components
 
         [DataField("clickSound"), ViewVariables(VVAccess.ReadWrite)]
         public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
+
+        /// <summary>
+        /// Which source the chem master should draw from when making pills/bottles.
+        /// </summary>
+        [DataField]
+        public ChemMasterDrawSource DrawSource = ChemMasterDrawSource.Internal;
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index 35cb6ebe6f..51dc436486 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -57,6 +57,7 @@ namespace Content.Server.Chemistry.EntitySystems
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterReagentAmountButtonMessage>(OnReagentButtonMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterCreatePillsMessage>(OnCreatePillsMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterOutputToBottleMessage>(OnOutputToBottleMessage);
+            SubscribeLocalEvent<ChemMasterComponent, ChemMasterOutputDrawSourceMessage>(OnSetDrawSourceMessage);
         }
 
         private void SubscribeUpdateUiState<T>(Entity<ChemMasterComponent> ent, ref T ev)
@@ -76,8 +77,8 @@ namespace Content.Server.Chemistry.EntitySystems
             var bufferCurrentVolume = bufferSolution.Volume;
 
             var state = new ChemMasterBoundUserInterfaceState(
-                chemMaster.SortingType, BuildInputContainerInfo(inputContainer), BuildOutputContainerInfo(outputContainer), // DeltaV - removed mode
-                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
+                /*chemMaster.Mode,*/ chemMaster.SortingType, BuildInputContainerInfo(inputContainer), BuildOutputContainerInfo(outputContainer), // DeltaV - Removed discarding
+                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel, chemMaster.DrawSource);
 
             _userInterfaceSystem.SetUiState(owner, ChemMasterUiKey.Key, state);
         }
@@ -124,6 +125,17 @@ namespace Content.Server.Chemistry.EntitySystems
             ClickSound(chemMaster);
         }
 
+        private void OnSetDrawSourceMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterOutputDrawSourceMessage message)
+        {
+            //Ensure draw source is valid, either from the internal buffer or the inserted beaker
+            if (!Enum.IsDefined(message.DrawSource))
+                return;
+
+            chemMaster.Comp.DrawSource = message.DrawSource;
+            UpdateUiState(chemMaster);
+            ClickSound(chemMaster);
+        }
+
         private void TransferReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer)
         {
             var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
@@ -173,9 +185,9 @@ namespace Content.Server.Chemistry.EntitySystems
                 return;
 
             var needed = message.Dosage * message.Number;
-            if (!WithdrawFromBuffer(chemMaster, needed, user, out var withdrawal))
-                return;
 
+            if (!WithdrawFromSource(chemMaster, needed, user, out var withdrawal))
+                return;
             _labelSystem.Label(container, message.Label);
 
             for (var i = 0; i < message.Number; i++)
@@ -184,7 +196,10 @@ namespace Content.Server.Chemistry.EntitySystems
                 _storageSystem.Insert(container, item, out _, user: user, storage);
                 _labelSystem.Label(item, message.Label);
 
-                _solutionContainerSystem.EnsureSolutionEntity(item, SharedChemMaster.PillSolutionName,out var itemSolution ,message.Dosage);
+                _solutionContainerSystem.EnsureSolutionEntity(item,
+                    SharedChemMaster.PillSolutionName,
+                    out var itemSolution,
+                    message.Dosage);
                 if (!itemSolution.HasValue)
                     return;
 
@@ -221,7 +236,7 @@ namespace Content.Server.Chemistry.EntitySystems
             if (message.Label.Length > SharedChemMaster.LabelMaxLength)
                 return;
 
-            if (!WithdrawFromBuffer(chemMaster, message.Dosage, user, out var withdrawal))
+            if (!WithdrawFromSource(chemMaster, message.Dosage, user, out var withdrawal))
                 return;
 
             _labelSystem.Label(container, message.Label);
@@ -235,45 +250,77 @@ namespace Content.Server.Chemistry.EntitySystems
             ClickSound(chemMaster);
         }
 
-        private bool WithdrawFromBuffer(
+        private bool WithdrawFromSource(
             Entity<ChemMasterComponent> chemMaster,
-            FixedPoint2 neededVolume, EntityUid? user,
+            FixedPoint2 neededVolume,
+            EntityUid? user,
             [NotNullWhen(returnValue: true)] out Solution? outputSolution)
         {
             outputSolution = null;
 
-            /* DeltaV - use beaker slot instead of buffer
-            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var solution))
-            {
-                return false;
-            }
-            */
-            // Begin DeltaV Additions - Use beaker slot instead of buffer
-            var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
-            if (container is null ||
-                !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var solution))
-            {
-                return false;
-            }
-            // End DeltaV Additions
+            Solution? solution;
+            Entity<SolutionComponent>? soln = null;
 
-            if (solution.Volume == 0)
+            switch (chemMaster.Comp.DrawSource)
             {
-                if (user.HasValue)
-                    _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-empty-text"), user.Value);
-                return false;
-            }
+                case ChemMasterDrawSource.Internal:
+                    if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out solution))
+                        return false;
 
-            // ReSharper disable once InvertIf
-            if (neededVolume > solution.Volume)
-            {
-                if (user.HasValue)
-                    _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-low-text"), user.Value);
-                return false;
+                    if (solution.Volume == 0)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-empty-text"), uid);
+
+                        return false;
+                    }
+                    if (neededVolume > solution.Volume)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-low-text"), uid);
+
+                        return false;
+                    }
+
+                    break;
+
+                case ChemMasterDrawSource.External:
+                    if (_itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName) is not {} container)
+                    {
+                        if (user.HasValue)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-no-beaker-text"), user.Value);
+                        return false;
+                    }
+
+                    if (!_solutionContainerSystem.TryGetFitsInDispenser(container, out soln, out solution))
+                        return false;
+
+                    if (solution.Volume == 0)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-beaker-empty-text"), uid);
+
+                        return false;
+                    }
+                    if (neededVolume > solution.Volume)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-beaker-low-text"), uid);
+
+                        return false;
+                    }
+
+                    break;
+
+                default:
+                    return false;
             }
 
             outputSolution = solution.SplitSolution(neededVolume);
-            _solutionContainerSystem.UpdateChemicals(containerSoln.Value); // DeltaV
+
+            if (soln.HasValue)
+                _solutionContainerSystem.UpdateChemicals(soln.Value);
+
             return true;
         }
 
diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
index 3afeac003d..f95f2a4860 100644
--- a/Content.Shared/Chemistry/SharedChemMaster.cs
+++ b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -72,6 +72,12 @@ namespace Content.Shared.Chemistry
         }
     }
 
+    [Serializable, NetSerializable]
+    public sealed class ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource drawSource) : BoundUserInterfaceMessage
+    {
+        public readonly ChemMasterDrawSource DrawSource = drawSource;
+    }
+
     /* DeltaV - removed discarding
     public enum ChemMasterMode
     {
@@ -105,6 +111,12 @@ namespace Content.Shared.Chemistry
         All,
     }
 
+    public enum ChemMasterDrawSource
+    {
+        Internal,
+        External,
+    }
+
     public static class ChemMasterReagentAmountToFixedPoint
     {
         public static FixedPoint2 GetFixedPoint(this ChemMasterReagentAmount amount)
@@ -174,11 +186,13 @@ namespace Content.Shared.Chemistry
 
         public readonly bool UpdateLabel;
 
+        public readonly ChemMasterDrawSource DrawSource;
+
         public ChemMasterBoundUserInterfaceState(
             // DeltaV - removed discarding
             ChemMasterSortingType sortingType, ContainerInfo? inputContainerInfo, ContainerInfo? outputContainerInfo,
             IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2 bufferCurrentVolume,
-            uint selectedPillType, uint pillDosageLimit, bool updateLabel)
+            uint selectedPillType, uint pillDosageLimit, bool updateLabel, ChemMasterDrawSource drawSource)
         {
             InputContainerInfo = inputContainerInfo;
             OutputContainerInfo = outputContainerInfo;
@@ -189,6 +203,7 @@ namespace Content.Shared.Chemistry
             SelectedPillType = selectedPillType;
             PillDosageLimit = pillDosageLimit;
             UpdateLabel = updateLabel;
+            DrawSource = drawSource;
         }
     }
 
diff --git a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
index 6f2e9b1d38..d01f3f7480 100644
--- a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
@@ -31,3 +31,10 @@ chem-master-window-sort-type-none = Sort by: Oldest First
 chem-master-window-sort-type-alphabetical = Sort by: Alphabetical
 chem-master-window-sort-type-quantity = Sort by: Quantity
 chem-master-window-sort-type-latest = Sort by: Recent First
+chem-master-output-buffer-draw = Buffer
+chem-master-output-beaker-draw = Beaker
+chem-master-window-no-beaker-text = No beaker loaded
+chem-master-window-beaker-empty-text = Beaker Empty
+chem-master-window-beaker-low-text = Not enough solution in beaker
+chem-master-output-source = Packaging source:
+chem-master-no-source = No Source

From eaeeb81f5618c81f9862c90b948f903f6b1a6440 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:41:57 -0800
Subject: [PATCH 202/360] Status Effects Toolshed (#41670)

* toolshed :)

* Yeah they call me the gamer

* Fix test fails

* refactor: extract method ZeroAsNull

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 .../StatusEffects/StatusEffectCommand.cs      | 141 ++++++++++++++++++
 .../StatusEffectCompletionParser.cs           |  16 ++
 .../StatusEffectNew/StatusEffectsSystem.cs    |  26 ++++
 .../en-US/commands/toolshed-commands.ftl      |  12 +-
 4 files changed, 193 insertions(+), 2 deletions(-)
 create mode 100644 Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs
 create mode 100644 Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs

diff --git a/Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs b/Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs
new file mode 100644
index 0000000000..4182bac081
--- /dev/null
+++ b/Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs
@@ -0,0 +1,141 @@
+using Content.Server.Administration;
+using Content.Server.Toolshed.TypeParsers.StatusEffects;
+using Content.Shared.Administration;
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Toolshed.Commands.StatusEffects;
+
+[ToolshedCommand, AdminCommand(AdminFlags.VarEdit)]
+public sealed class StatusEffectCommand : ToolshedCommand
+{
+    private StatusEffectsSystem? _statusEffectsSystem;
+
+    [CommandImplementation("add")]
+    public EntityUid? Add([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TryAddStatusEffectDuration(
+            input,
+            status,
+            TimeSpan.FromSeconds(time),
+            ZeroAsNull(delay));
+
+        return input;
+    }
+
+    [CommandImplementation("add")]
+    public IEnumerable<EntityUid> Add([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TryAddStatusEffectDuration(
+                ent,
+                status,
+                TimeSpan.FromSeconds(time),
+                ZeroAsNull(delay));
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("update")]
+    public EntityUid? Update([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TryUpdateStatusEffectDuration(
+            input,
+            status,
+            ZeroAsNull(time),
+            ZeroAsNull(delay));
+
+        return input;
+    }
+
+    [CommandImplementation("update")]
+    public IEnumerable<EntityUid> Update([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TryUpdateStatusEffectDuration(
+                ent,
+                status,
+                ZeroAsNull(time),
+                ZeroAsNull(delay));
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("set")]
+    public EntityUid? Set([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TrySetStatusEffectDuration(
+            input,
+            status,
+            ZeroAsNull(time),
+            ZeroAsNull(delay));
+
+        return input;
+    }
+
+    [CommandImplementation("set")]
+    public IEnumerable<EntityUid> Set([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TrySetStatusEffectDuration(
+                ent,
+                status,
+                ZeroAsNull(time),
+                ZeroAsNull(delay));
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("remove")]
+    public EntityUid? Remove([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TryRemoveTime(
+            input,
+            status,
+            ZeroAsNull(time));
+
+        return input;
+    }
+
+    [CommandImplementation("remove")]
+    public IEnumerable<EntityUid> Remove([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TryRemoveTime(
+                ent,
+                status,
+                ZeroAsNull(time));
+
+            yield return ent;
+        }
+    }
+
+    private static TimeSpan? ZeroAsNull(float delay)
+    {
+        return delay == 0 ? null : TimeSpan.FromSeconds(delay);
+    }
+}
diff --git a/Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs b/Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs
new file mode 100644
index 0000000000..7faa7825d8
--- /dev/null
+++ b/Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs
@@ -0,0 +1,16 @@
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+using Robust.Shared.Toolshed.Syntax;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Server.Toolshed.TypeParsers.StatusEffects;
+
+public sealed class StatusEffectCompletionParser : CustomCompletionParser<EntProtoId>
+{
+    public override CompletionResult? TryAutocomplete(ParserContext ctx, CommandArgument? arg)
+    {
+        return CompletionResult.FromHintOptions(StatusEffectsSystem.StatusEffectPrototypes, GetArgHint(arg));
+    }
+}
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 8fdce896dd..d9c119ec5e 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -14,6 +14,7 @@ namespace Content.Shared.StatusEffectNew;
 /// </summary>
 public sealed partial class StatusEffectsSystem : EntitySystem
 {
+    [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
@@ -22,6 +23,8 @@ public sealed partial class StatusEffectsSystem : EntitySystem
     private EntityQuery<StatusEffectContainerComponent> _containerQuery;
     private EntityQuery<StatusEffectComponent> _effectQuery;
 
+    public static HashSet<string> StatusEffectPrototypes = [];
+
     public override void Initialize()
     {
         base.Initialize();
@@ -35,8 +38,12 @@ public sealed partial class StatusEffectsSystem : EntitySystem
 
         SubscribeLocalEvent<RejuvenateRemovedStatusEffectComponent, StatusEffectRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
 
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
         _containerQuery = GetEntityQuery<StatusEffectContainerComponent>();
         _effectQuery = GetEntityQuery<StatusEffectComponent>();
+
+        ReloadStatusEffectsCache();
     }
 
     public override void Update(float frameTime)
@@ -61,6 +68,25 @@ public sealed partial class StatusEffectsSystem : EntitySystem
         }
     }
 
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    {
+        if (!args.WasModified<EntityPrototype>())
+            return;
+
+        ReloadStatusEffectsCache();
+    }
+
+    private void ReloadStatusEffectsCache()
+    {
+        StatusEffectPrototypes.Clear();
+
+        foreach (var ent in _proto.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (ent.TryGetComponent<StatusEffectComponent>(out _, _factory))
+                StatusEffectPrototypes.Add(ent.ID);
+        }
+    }
+
     private void OnStatusContainerInit(Entity<StatusEffectContainerComponent> ent, ref ComponentInit args)
     {
         ent.Comp.ActiveStatusEffects =
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl
index 39a18c10dc..cb2159260f 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl
@@ -6,9 +6,9 @@ command-description-acmd-perms =
     Returns the admin permissions of the given command, if any.
 command-description-acmd-caninvoke =
     Check if the given player can invoke the given command.
-command-description-bank-accounts = 
+command-description-bank-accounts =
     Returns all accounts on a station.
-command-description-bank-account = 
+command-description-bank-account =
     Returns a given bank account from a station.
 command-description-bank-adjust =
     Adjusts the money for the given bank account.
@@ -168,3 +168,11 @@ command-description-dynamicrule-executenow =
     Executes the piped dynamic rule as if it had reached its regular update time.
 command-description-dynamicrule-rules =
     Gets a list of all the rules spawned by the piped dynamic rule.
+command-description-statuseffect-add =
+    Adds time in seconds to a given status effect's duration, or creates one with a duration equal to time.
+command-description-statuseffect-update =
+    Sets the duration of a status effect to the higher of the inputted time or existing time. If time is 0, duration will be infinite.
+command-description-statuseffect-set =
+    Sets the duration of a status effect to the inputted time in seconds. If time is 0, duration will be infinite.
+command-description-statuseffect-remove =
+    Removes a time from a given status effect by prototype. If time isn't set, removes the status effect. 

From e3d5d47cfd5149076ce57ef9dcf95a6cfc91dcf0 Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Tue, 30 Dec 2025 15:13:59 -0800
Subject: [PATCH 203/360] Move borg module remove button to the left side
 (#42119)

Move module remove button to the left side

Co-authored-by: Jessica M <jessica@maybe.sh>
---
 Content.Client/Silicons/Borgs/BorgModuleControl.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
index 2f6e25f983..1be7cea8d9 100644
--- a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
+++ b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
@@ -3,10 +3,10 @@
                 StyleClasses="PanelLight"
                 Margin="5 5 5 0">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5 5 0 5">
+        <TextureButton Name="RemoveButton" VerticalAlignment="Top" HorizontalAlignment="Left" Scale="0.5 0.5"/>
         <SpriteView Name="ModuleView" Margin="0 0 5 0"/>
         <BoxContainer RectClipContent="True" HorizontalExpand="True">
             <Label Name="ModuleName" HorizontalExpand="True" HorizontalAlignment="Center"/>
         </BoxContainer>
-        <TextureButton Name="RemoveButton" VerticalAlignment="Top" HorizontalAlignment="Right" Scale="0.5 0.5"/>
     </BoxContainer>
 </PanelContainer>

From a2c58b6c09c432f9870a48702518e0148c95efc0 Mon Sep 17 00:00:00 2001
From: Crotalus <Crotalus@users.noreply.github.com>
Date: Wed, 31 Dec 2025 00:49:32 +0100
Subject: [PATCH 204/360] Fix warnings (#42175)

* Fix warnings

* Update Content.Server/Medical/DefibrillatorSystem.cs

* Update Content.Server/Medical/DefibrillatorSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs b/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
index 58315161a5..43a79e133e 100644
--- a/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Chat.Prototypes;
 /// <summary>
 /// A predefined notification used to warn a player of specific events.
 /// </summary>
-[Prototype("chatNotification")]
+[Prototype]
 public sealed partial class ChatNotificationPrototype : IPrototype
 {
     [ViewVariables]

From 1aaea67fb0f8f3f7a6971d85db05aae313461d68 Mon Sep 17 00:00:00 2001
From: FotY <55259600+TheFotY@users.noreply.github.com>
Date: Wed, 31 Dec 2025 01:10:59 +0100
Subject: [PATCH 205/360] (Fix) Make paper extinguishable with fire
 extinguisher (#42142)

Make paper extinguishable with fire extinguisher
---
 Resources/Prototypes/Entities/Objects/Misc/paper.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 890642ad0d..d435042485 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -8,9 +8,15 @@
     - Document
     - Paper
   - type: Appearance
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+  - type: ExtinguishableSetCollisionWake
   - type: Flammable
     fireSpread: true
     alwaysCombustible: true
+    canExtinguish: true
     damage:
       types:
         Heat: 1

From bf5acf558d926af2d953371998f1ff2947848f87 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 30 Dec 2025 16:42:49 -0800
Subject: [PATCH 206/360] Damageable Cleanup + Bugfix (#42076)

* Does not build do not PR

* using blah blah blah rider hates me

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Tests/Damageable/DamageableTest.cs        | 20 +++++++++----------
 .../Damage/Systems/DamageableSystem.API.cs    |  3 +--
 .../DamageableSystem.BenchmarkHelpers.cs      |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 72e8901631..20b0877548 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -164,7 +164,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 var damageToDeal = FixedPoint2.New(types.Count * 5);
                 DamageSpecifier damage = new(group3, damageToDeal);
 
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -178,7 +178,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Heal
-                sDamageableSystem.TryChangeDamage(uid, -damage);
+                sDamageableSystem.ChangeDamage(uid, -damage);
 
                 Assert.Multiple(() =>
                 {
@@ -197,7 +197,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 Assert.That(types, Has.Count.EqualTo(3));
 
                 damage = new DamageSpecifier(group3, 14);
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -209,7 +209,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Heal
-                sDamageableSystem.TryChangeDamage(uid, -damage);
+                sDamageableSystem.ChangeDamage(uid, -damage);
 
                 Assert.Multiple(() =>
                 {
@@ -225,7 +225,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                     Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
                 });
                 damage = new DamageSpecifier(group1, FixedPoint2.New(10)) + new DamageSpecifier(type2b, FixedPoint2.New(10));
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -245,9 +245,9 @@ namespace Content.IntegrationTests.Tests.Damageable
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
 
                 // Test 'wasted' healing
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(type3a, 5));
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(type3b, 7));
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -11));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3a, 5));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3b, 7));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -11));
 
                 Assert.Multiple(() =>
                 {
@@ -257,11 +257,11 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Test Over-Healing
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100)));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100)));
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
 
                 // Test that if no health change occurred, returns false
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -100));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -100));
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
             });
             await pair.CleanReturnAsync();
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
index 4670886c54..aea150cc49 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.API.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Net.Sockets;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -125,7 +124,7 @@ public sealed partial class DamageableSystem
         // If you deal 0.0 of some damage type, Empty will be false!
         newDamage = ChangeDamage(ent, damage, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers,
             canSever: canSever, canEvade: canEvade, partMultiplier: partMultiplier, targetPart: targetPart, doPartDamage: doPartDamage, onlyDamageParts: onlyDamageParts); // Shitmed
-        return !damage.Empty;
+        return !newDamage.Empty;
     }
 
     /// <summary>
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
index 5ca7fe1992..0175b5fb5e 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
@@ -11,7 +11,7 @@ public sealed partial class DamageableSystem
     {
         foreach (var (uid, damageable) in damageables)
         {
-            TryChangeDamage((uid, damageable), damage);
+            ChangeDamage((uid, damageable), damage);
         }
     }
 }

From d22bdb8537a15c419dca8d18951978a74151d43b Mon Sep 17 00:00:00 2001
From: YoungThug <ramialanbagy@gmail.com>
Date: Tue, 30 Dec 2025 18:23:59 -0700
Subject: [PATCH 207/360] Ninjas now get a custom bag! (#42112)

* Ninjas now recieve a custom satchel

* Original Size

* Requested Changes + Making bag silent

* Add code comment
---
 .../Entities/Clothing/Back/satchel.yml        |  12 ++++++++
 Resources/Prototypes/Roles/Antags/ninja.yml   |   2 +-
 .../Satchels/ninja.rsi/equipped-BACKPACK.png  | Bin 0 -> 711 bytes
 .../Clothing/Back/Satchels/ninja.rsi/icon.png | Bin 0 -> 684 bytes
 .../Back/Satchels/ninja.rsi/inhand-left.png   | Bin 0 -> 735 bytes
 .../Back/Satchels/ninja.rsi/inhand-right.png  | Bin 0 -> 696 bytes
 .../Back/Satchels/ninja.rsi/meta.json         |  26 ++++++++++++++++++
 7 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index 8d7539d076..b1ac046cd8 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -168,6 +168,18 @@
     - type: Sprite
       sprite: Clothing/Back/Satchels/salvage.rsi
 
+- type: entity
+  parent: [ClothingBackpackSatchel, BaseHighlyIllegalContraband]
+  id: ClothingBackpackSatchelNinja
+  name: spider clan satchel
+  description: A robust satchel for stashing your loot.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/ninja.rsi
+  - type: Storage # Backpack sounds are null due to silent ninja tech
+    storageOpenSound: null
+    storageInsertSound: null
+
 - type: entity
   parent: ClothingBackpackSatchel
   id: ClothingBackpackSatchelHolding
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index d649b916f3..619c39e7a1 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -14,7 +14,7 @@
   id: SpaceNinjaGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitNinja
-    back: ClothingBackpackSatchel
+    back: ClothingBackpackSatchelNinja
     mask: ClothingMaskNinja
     head: ClothingHeadHelmetSpaceNinja
     eyes: ClothingEyesVisorNinja
diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcb6f2475e9cf791e32623b0e5c7bff03e454293
GIT binary patch
literal 711
zcmV;&0yzDNP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007vNkl<ZcwX(A
zze)o^5XL8<X;g@RVr@W(U=ZyC5?>*uSXuc_T8U*|K@rkNC4zxKY;26ips_iHl_^dR
zF*>t5d)aVvRUkVv-}l?uyJ9B?8Gmva_YVp{J0Rl(^ay0U0rVxPM?jB&Ac6UXIWu~D
z_tsTD@{5Yy-q|$W?mhT`facfN*WjvkE2>#68Jd?C_giyH*AW3AE$Y8hDOt}MfTWoJ
zj3@t>s_O(mN(9HaGz4n^lQtiNaMfW2z_qCDj*p9T(Zd2ztyay|b<4|V&J_xNCNT&1
z6HEqx=JT_&aDH(?j&U``jo+))O!V;q&1RFVk+iT<shHJb5f+!0pwVcMVz}ZZ*4OKG
z^D-E~W4{mWcAKP=v}opF*KD+&$w?*5*yg~^y4zWX&(lkiH`1cg*_J6CF9+TJF)%!;
z4@a-i+rJ@sBQ2VS^PdEOzp3v55&%qyFPM;DfJp#U^B6-0V0$J*k5d4l?~reO+5x@^
zhn`<MAoLybtxr3^H{sCpYX^kBL%#KC2lyr&dVcMI(09nUKJ5VCghS7-9U!?wE;lr`
zI<RIOYjZs>)&Y|;pEPZwVQK-4Gs}fAl>q)SIS~NdqPFK9<D_eebbz!d7eL%t1;8OD
z_2S{w^u3nV0lxvjd&ANDi}?JWZ{u-(763H+^WM#7C?PF#lsaSpXnr^xLb+W29+E)w
zI5g4ebf8cukZ)uu!qQs90)QhjIDLT+4k6&s1U@)D!W~WVWe^7>sM8^+feiqS=JR>z
z9X>(nWCfxq0tAyLfN>_d=2-x6aXcsixdb<3QZ+B#IphwA3nPS|A~*vH(gs}fu>rUi
t3@u&(gtjAT>(LHKn|NsTGT#ATj2<gc_k2`c00000NkvXXu0mjf0037IJH`M2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e92836863b30e1a52235a0c4675361a57415af
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007VNkl<ZSV!%a
zzfw~{6vj`mM4f~Sc4W|8VnN}*o9F{z;#j71cmReM;2D%A72{K+HriTXh@wRbLlO!*
z;gSq!X#(HM**SOb-akUYjFZ!3bMM(bzy0>x-J79nj?6XJrzyZxf&Wv1hmTe!a(8{*
z>qJg8wE{P9%?1Wd+P-VA*68QqA-RQuPJOer6{?pC0L3fMt27!8!*w&p5R(aIb2)nd
zp-BueIQUNY?%r20CPX3t7w5_W2wD8RFapI946xJssG$Lo&*!OLuj{&(0`Ps`x&n^l
z1OSlq>-2X9o<MO936Tn5V|{~q{l4lC1=0XO?(MhR3IP2W;-3_N{AI69p699JfUx>N
z=z%3*<F(suYPDNh1*BD0Uj}>-sQ|kk02~a$FmfHF+fkUq1i(@>8jW}lKrWC%LbxB%
z@AcGgwOXZSvuX8!eCL%)D(7G@P%60YlKO9+2_Xe!am*gZlF{vUsq-L5i!X-s<K17!
zb9?36kP5C#H)dvZ7xoK7!~(EUu!VT$vN#3?z{#dn0J{B}s8}r0pYb@9fHB#S@?}5)
z6X4Fm0(JNIRla|8r2EAwz)8;hylNJgm(_`w2q5<=k`d+7Q(e@Vn^QA`7vdD)CGd}r
zb>G(RC+qBypcRk+aH&3iN24n#kj-WzXP*iHNuzU!%P4^2h$#7E0q|1Z1H26(G1~9}
zT#w*3zr!=MlZr<I;P&F}VqU}QR=ijiy~r00mRmlzIbXiF?gAu82=0*Pn;@y632i-y
zo;-f0@;-mrG4s`b^EkC8rF<B97u0IC&=-(A!&8o*n3i}QCysE%gekyOfiuMeTrg3U
S3L*di002ovPDHLkV1fW~Nk3}<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..dffd1c35c5512a1f0a6f1d471f91f247d23b6d63
GIT binary patch
literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007}Nkl<ZcwX(A
zu}%U(5QY~N8Z^NmbQW|b5+j`j(Lm)(SXuc9K7lWxrSD(`4TT*RnAo9F8_-Bpnj?BL
zt8=+r&K&H{ZPx725IAo4pKt!zOPI+B$6p!8;};Bo9pE?tE&<04z=t500GEK{1h@no
zHvm5cxCFQa94Ejf;J5+ko&vR6%?FtMe*a&&ibN~~U#V22ncD3($(ra)SR0_?JGEm;
z#D)QcA?S*R`-{b*$meomI2xtmE^Po9{BSrFxAl_PICvEgmuq6P_aeX*@V!b|VDJDG
z07$T%j<(*YgR~b6vXsw@!O^n}9w1cD*M;YKVmuxz0a!lV_jd=MGI(z~mG4#pXti4M
z@PkZO%H;qsSXSp;s9tRQ)w5C%ywwhXKq1>`RS+w)Hgkne2>?*czO?{A7(N2yPUyS)
zf%tfzD3w}tU6r#W>8YV4EN;=2)q)=v=wII_3B&8U_b2T`1^_mS6H5`mPJPS2?%j}T
zMKI)xg4i&1D&c8CAP10SIoqx?0NXNRS`RzGG;!PZV+Yul5z~6u0j7!DwjVpdwv3q8
z!wxV_+_wGL0k&ntv>tYVY2vo+#}2S9Bc}DR156XQZNF3;pxYIm2NKmh0y%(2qaptm
zS8a;U8$7nny4|i;3|cow#bWSj_VZy+*^>Wl#6s^7A*eWy6aWao8G*v-m*hj;&%<^+
zIBar~4chUr9}H70>O3+4nEj{YHz{iGF`LR%M|g1Js=5>mWWX$eO6idUfDC{=VLl)Y
z2eg{apLvAY`jBya;lA*BkwFSF03b{bMMQ=q(kKBu0HbG+%GpB(AZ|v0I(Q72avp&U
zKsXx|E%BtsA=NwrIRF#EBOHo(1Tp|P7eF-+kmLZot~-xF24G&nw*Ag|0N>)xNl?zV
R3z+}_002ovPDHLkV1knvK<@wm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd1da5cef6ea6e410c49cba5bfaaea6a1173e5c9
GIT binary patch
literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007hNkl<ZcwX(A
zF-`(e5Qb+hMU8~86vo0rFp(Isq2T~l7H|YAkKhSBf+w)V#Lh|@8XB>{M6fg#fU-oT
zb!9erWP`%nU3SNbJFg)D_Rask`R8phV?fN85%cqd01yYnoPd--%ncxypp<}=K+Fk9
z3B=q0@)nR1kP?VF0V#o)8^GUNAfM0M?RNWLxyILFs@1C9Y&L;2gi57i*J?FGed-*(
z5P&=5<#O4^&AQ#LvnN*wN@u^{htX)H)u{!L%jMvD^%b^{EqK03!pS)0K;R0XR4Un-
zOvXu4r_<5uoC^T6pUq|gNxq!EJBLRITNfK(nkHKaX#L3o!!V%N>uFuE5J0h51k17<
z2uKw-#KR|(N#J@HC<mZc)U0!Xwgl!~B3w%Vo$J=D)4349+IqtN{22fE&%Ez-H!k(>
zUUX_-gR`4>*_8UAzs2*aQwsn$KP>D|ZFS#z@bt`IK~P$~>STQw3Wx%Lf->hA;sDOs
zq0lA{prFh-hB$z8b||!o11KnSjv)@<oE-{n;s6TDoMVUsIA@1Kn>c`iGUpiL0M6N=
z&?XL8mNM1MKvZ#-b^x}cqwW^t;mvd!ZtL}>_0A^T_lE9F>|7q$*frj3y*c~p`fx$q
zhVdQ?DW@$znlx&|h7bq<&J5g@pQbJIqpMwQ7dFV@@fid#K3jpr`Bx;6eF1RK3}BmF
zEo`4hF*Bg7zd32g<5E5UMx)_N_agYdHgXGc&kSH6-Wm>}KNy5s1{e?Brk3jY;|x$x
zM}=|+%nKgX9WWa&%s9SDQqK%{ZF2{8gl_;Ch<auqN(g}fAOz}}fvDmI1`yP8+@2Ev
e+%iI~=NrHMDo{MkeFp#l002ovPDHLkV1fW}wLAO(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json
new file mode 100644
index 0000000000..845c890b00
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+   "version": 1,
+   "license": "CC-BY-SA-3.0",
+   "copyright": "Sprites by YoungThugSS14 (Github) ",
+   "size": {
+     "x": 32,
+     "y": 32
+   },
+   "states": [
+     {
+       "name": "icon"
+     },
+     {
+       "name": "equipped-BACKPACK",
+       "directions": 4
+     },
+     {
+       "name": "inhand-left",
+       "directions": 4
+     },
+     {
+       "name": "inhand-right",
+       "directions": 4
+     }
+   ]
+}

From 04368b1e3792eb5cc63efa505156b2c4c518b272 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Tue, 30 Dec 2025 20:27:59 -0500
Subject: [PATCH 208/360] Fix broken FTL references (#42181)

Add broken FTL links
---
 Content.Server/Implants/ImplanterSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 48e83e4878..08b744ee09 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -88,7 +88,7 @@ public sealed partial class ImplanterSystem : SharedImplanterSystem
         if (!_doAfter.TryStartDoAfter(args))
             return;
 
-        _popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+        _popup.PopupEntity(Loc.GetString("injector-component-needle-injecting-user"), target, user);
 
         var userName = Identity.Entity(user, EntityManager);
         _popup.PopupEntity(Loc.GetString("implanter-component-implanting-target", ("user", userName)), user, target, PopupType.LargeCaution);
@@ -112,7 +112,7 @@ public sealed partial class ImplanterSystem : SharedImplanterSystem
         };
 
         if (_doAfter.TryStartDoAfter(args))
-            _popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+            _popup.PopupEntity(Loc.GetString("injector-component-needle-injecting-user"), target, user);
 
     }
 

From 8f5ea436037cf10ddb30a701c597cd49fddaa785 Mon Sep 17 00:00:00 2001
From: Ted Lukin <fedorlukin2006@gmail.com>
Date: Wed, 31 Dec 2025 17:59:47 +0700
Subject: [PATCH 209/360] Happy 2026 (#42186)

---
 LICENSE-MIT.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt
index 30d1999e16..8a1fc2f00e 100644
--- a/LICENSE-MIT.txt
+++ b/LICENSE-MIT.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 Space Wizards Federation
+Copyright (c) 2017-2026 Space Wizards Federation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 5d74991dc2f69cea7cf888311128a888b1f4ea61 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Thu, 1 Jan 2026 04:05:09 -0800
Subject: [PATCH 210/360] Make some HeatContainerHelpers methods byref (#42197)

* make some HeatContainerHelpers methods byref

* all of them
---
 .../HeatContainerHelpers.Conduct.cs           | 20 +++++++++----------
 .../HeatContainerHelpers.Divide.cs            |  3 +--
 .../HeatContainerHelpers.Exchange.cs          | 16 +++++++--------
 .../HeatContainer/HeatContainerHelpers.cs     |  6 +++---
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
index deb705b8e2..c0de657fa9 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
@@ -26,7 +26,7 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeat(this HeatContainer c, float temp, float deltaTime, float g)
+    public static float ConductHeat(this ref HeatContainer c, float temp, float deltaTime, float g)
     {
         var dQ = c.ConductHeatQuery(temp, deltaTime, g);
         c.AddHeat(dQ);
@@ -55,9 +55,9 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeat(this HeatContainer cA, HeatContainer cB, float deltaTime, float g)
+    public static float ConductHeat(this ref HeatContainer cA, ref HeatContainer cB, float deltaTime, float g)
     {
-        var dQ = ConductHeatQuery(cA, cB.Temperature, deltaTime, g);
+        var dQ = ConductHeatQuery(ref cA, cB.Temperature, deltaTime, g);
         cA.AddHeat(dQ);
         cB.AddHeat(-dQ);
         return dQ;
@@ -85,10 +85,10 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeatQuery(this HeatContainer c, float temp, float deltaTime, float g)
+    public static float ConductHeatQuery(this ref HeatContainer c, float temp, float deltaTime, float g)
     {
         var dQ = g * (temp - c.Temperature) * deltaTime;
-        var dQMax = Math.Abs(ConductHeatToTempQuery(c, temp));
+        var dQMax = Math.Abs(ConductHeatToTempQuery(ref c, temp));
 
         // Clamp the transferred heat amount in case we are overshooting the equilibrium temperature because our time step was too large.
         return Math.Clamp(dQ, -dQMax, dQMax);
@@ -116,9 +116,9 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeatQuery(this HeatContainer c1, HeatContainer c2, float deltaTime, float g)
+    public static float ConductHeatQuery(this ref HeatContainer c1, ref HeatContainer c2, float deltaTime, float g)
     {
-        return ConductHeatQuery(c1, c2.Temperature, deltaTime, g);
+        return ConductHeatQuery(ref c1, c2.Temperature, deltaTime, g);
     }
 
     /// <summary>
@@ -131,9 +131,9 @@ public static partial class HeatContainerHelpers
     /// to reach the target temperature.</returns>
     /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
     [PublicAPI]
-    public static float ConductHeatToTemp(this HeatContainer c, float targetTemp)
+    public static float ConductHeatToTemp(this ref HeatContainer c, float targetTemp)
     {
-        var dQ = ConductHeatToTempQuery(c, targetTemp);
+        var dQ = ConductHeatToTempQuery(ref c, targetTemp);
         c.Temperature = targetTemp;
         return dQ;
     }
@@ -148,7 +148,7 @@ public static partial class HeatContainerHelpers
     /// to reach the target temperature.</returns>
     /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
     [PublicAPI]
-    public static float ConductHeatToTempQuery(this HeatContainer c, float targetTemp)
+    public static float ConductHeatToTempQuery(this ref HeatContainer c, float targetTemp)
     {
         return (targetTemp - c.Temperature) * c.HeatCapacity;
     }
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
index f1e7206683..e745c59305 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
@@ -38,8 +38,7 @@ public static partial class HeatContainerHelpers
     [PublicAPI]
     public static HeatContainer[] Divide(this HeatContainer c, uint num)
     {
-        if (num == 0)
-            throw new ArgumentException("Cannot divide by zero.", nameof(num));
+        ArgumentOutOfRangeException.ThrowIfZero(num);
 
         var fraction = 1f / num;
         var cFrac = c.Split(fraction);
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
index 6b7eb125dc..a906cfa35e 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
@@ -17,7 +17,7 @@ public static partial class HeatContainerHelpers
     /// to bring the containers to thermal equilibrium.</returns>
     /// <example>A positive value indicates heat transfer from a hot cA to a cold cB.</example>
     [PublicAPI]
-    public static float EquilibriumHeatQuery(this HeatContainer cA, HeatContainer cB)
+    public static float EquilibriumHeatQuery(this ref HeatContainer cA, ref HeatContainer cB)
     {
         /*
         The solution is derived from the following facts:
@@ -43,7 +43,7 @@ public static partial class HeatContainerHelpers
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     /// <returns>The resulting equilibrium temperature both containers will be at.</returns>
     [PublicAPI]
-    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer cB)
+    public static float EquilibriumTemperatureQuery(this ref HeatContainer cA, ref HeatContainer cB)
     {
         // Insert the above solution for Q into T_A_final = T_A_initial - Q / C_A and rearrange the result.
         return (cA.HeatCapacity * cA.Temperature - cB.HeatCapacity * cB.Temperature) / (cA.HeatCapacity + cB.HeatCapacity);
@@ -55,9 +55,9 @@ public static partial class HeatContainerHelpers
     /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     [PublicAPI]
-    public static void Equilibrate(this HeatContainer cA, HeatContainer cB)
+    public static void Equilibrate(this ref HeatContainer cA, ref HeatContainer cB)
     {
-        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        var tFinal = EquilibriumTemperatureQuery(ref cA, ref cB);
         cA.Temperature = tFinal;
         cB.Temperature = tFinal;
     }
@@ -69,10 +69,10 @@ public static partial class HeatContainerHelpers
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     /// <param name="dQ">The amount of heat in joules that was transferred from container A to B.</param>
     [PublicAPI]
-    public static void Equilibrate(this HeatContainer cA, HeatContainer cB, out float dQ)
+    public static void Equilibrate(this ref HeatContainer cA, ref HeatContainer cB, out float dQ)
     {
         var tInitialA = cA.Temperature;
-        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        var tFinal = EquilibriumTemperatureQuery(ref cA, ref cB);
         cA.Temperature = tFinal;
         cB.Temperature = tFinal;
         dQ = (tInitialA - tFinal) / cA.HeatCapacity;
@@ -103,7 +103,7 @@ public static partial class HeatContainerHelpers
     /// <param name="cA">The first <see cref="HeatContainer"/> to bring into thermal equilibrium.</param>
     /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
     [PublicAPI]
-    public static void Equilibrate(this HeatContainer cA, HeatContainer[] cN)
+    public static void Equilibrate(this ref HeatContainer cA, HeatContainer[] cN)
     {
         var tF = cA.EquilibriumTemperatureQuery(cN);
 
@@ -201,7 +201,7 @@ public static partial class HeatContainerHelpers
     /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
     /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
     [PublicAPI]
-    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer[] cN)
+    public static float EquilibriumTemperatureQuery(this ref HeatContainer cA, HeatContainer[] cN)
     {
         var cAll = new HeatContainer[cN.Length + 1];
         cAll[0] = cA;
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
index 39078a810e..6ce01c752e 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
@@ -16,7 +16,7 @@ public static partial class HeatContainerHelpers
     /// <param name="c">The <see cref="HeatContainer"/> to add or remove energy.</param>
     /// <param name="dQ">The energy in joules to add or remove.</param>
     [PublicAPI]
-    public static void AddHeat(this HeatContainer c, float dQ)
+    public static void AddHeat(this ref HeatContainer c, float dQ)
     {
         c.Temperature = c.AddHeatQuery(dQ);
     }
@@ -30,7 +30,7 @@ public static partial class HeatContainerHelpers
     /// <param name="dQ">The energy in joules to add or remove.</param>
     /// <returns>The resulting temperature in kelvin after the heat change.</returns>
     [PublicAPI]
-    public static float AddHeatQuery(this HeatContainer c, float dQ)
+    public static float AddHeatQuery(this ref HeatContainer c, float dQ)
     {
         // Don't allow the temperature to go below the absolute minimum.
         return Math.Max(0f, c.Temperature + dQ / c.HeatCapacity);
@@ -43,7 +43,7 @@ public static partial class HeatContainerHelpers
     /// <param name="c">The <see cref="HeatContainer"/> to modify.</param>
     /// <param name="newHeatCapacity">The new heat capacity to set.</param>
     [PublicAPI]
-    public static void SetHeatCapacity(this HeatContainer c, float newHeatCapacity)
+    public static void SetHeatCapacity(this ref HeatContainer c, float newHeatCapacity)
     {
         var currentEnergy = c.InternalEnergy;
         c.HeatCapacity = newHeatCapacity;

From ac967adc24be33ae6d0b2b538287decb6b919ac3 Mon Sep 17 00:00:00 2001
From: CrazyPhantom779 <118181077+CrazyPhantom779@users.noreply.github.com>
Date: Fri, 2 Jan 2026 04:31:44 +1100
Subject: [PATCH 211/360] Fix RCDDeconstructableComponent filename (#42180)

---
 ...DeconstructibleComponent.cs => RCDDeconstructableComponent.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Content.Shared/RCD/Components/{RCDDeconstructibleComponent.cs => RCDDeconstructableComponent.cs} (100%)

diff --git a/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs b/Content.Shared/RCD/Components/RCDDeconstructableComponent.cs
similarity index 100%
rename from Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs
rename to Content.Shared/RCD/Components/RCDDeconstructableComponent.cs

From a4e9f24572d7099aea3780aba02801d1cacda5f9 Mon Sep 17 00:00:00 2001
From: mq <113324899+mqole@users.noreply.github.com>
Date: Fri, 2 Jan 2026 06:00:49 +1100
Subject: [PATCH 212/360] Update (MOST) instances of `EntityUid, Component` in
 GunSystem to `Entity<T>` (#41966)

* Entity<T>, skipping Magazine and ChamberMagazine

* missed some

* AUGH!!

* ballistic examine

* dotnet hates me

* WHY ARE YOU CALLED THAT!!!!

* cheers aada
---
 .../CombatMode/CombatModeIndicatorsOverlay.cs |   2 -
 .../Components/MagazineVisualsComponent.cs    |   9 +-
 .../Components/SpentAmmoVisualsComponent.cs   |   5 +-
 .../Weapons/Ranged/GunSpreadOverlay.cs        |  14 +-
 .../Weapons/Ranged/ItemStatus/BulletRender.cs |   4 +-
 .../Ranged/Systems/FlyBySoundSystem.cs        |  10 +-
 .../Ranged/Systems/GunSystem.AmmoCounter.cs   |  33 ++-
 .../Ranged/Systems/GunSystem.Ballistic.cs     |  30 +--
 .../Ranged/Systems/GunSystem.BasicEntity.cs   |   6 +-
 .../Systems/GunSystem.ChamberMagazine.cs      |  18 +-
 .../Ranged/Systems/GunSystem.Magazine.cs      |  16 +-
 .../Systems/GunSystem.MagazineVisuals.cs      |  54 ++--
 .../Ranged/Systems/GunSystem.Revolver.cs      |  10 +-
 .../Ranged/Systems/GunSystem.SpentAmmo.cs     |  12 +-
 .../Weapons/Ranged/Systems/GunSystem.cs       |  46 ++--
 .../Interaction/InteractionTest.Helpers.cs    |  12 +-
 .../Systems/AdminVerbSystem.Tools.cs          |   2 +-
 .../Systems/GunSignalControlSystem.cs         |   8 +-
 .../HTN/Preconditions/GunAmmoPrecondition.cs  |  10 +-
 .../NPC/Systems/NPCCombatSystem.Ranged.cs     |  10 +-
 .../EntitySystems/EmitterSystem.cs            |   2 +-
 .../Turrets/DeployableTurretSystem.cs         |   2 +-
 Content.Server/Weapons/DamageMarkerSystem.cs  |   5 +-
 .../Ranged/Components/AmmoCounterComponent.cs |   2 +-
 .../Components/ChemicalAmmoComponent.cs       |  17 +-
 .../Components/RangedDamageSoundComponent.cs  |   6 +-
 .../Ranged/Systems/ChemicalAmmoSystem.cs      |  67 +++--
 .../Ranged/Systems/FlyBySoundSystem.cs        |   2 +-
 .../Ranged/Systems/GunSystem.AutoFire.cs      |   6 +-
 .../Ranged/Systems/GunSystem.Ballistic.cs     |  30 +--
 .../Ranged/Systems/GunSystem.Revolver.cs      |  12 +-
 .../Ranged/Systems/GunSystem.Solution.cs      |  52 ++--
 .../Weapons/Ranged/Systems/GunSystem.cs       |  46 ++--
 Content.Shared/Magic/SharedMagicSystem.cs     |   2 +-
 .../ChamberMagazineAmmoProviderComponent.cs   |  12 +-
 .../Weapons/Ranged/Components/GunComponent.cs |   2 +-
 .../Components/GunSpreadModifierComponent.cs  |   2 +-
 .../MagazineAmmoProviderComponent.cs          |   4 +-
 .../Ranged/Events/RequestStopShootEvent.cs    |   2 +-
 .../Weapons/Ranged/Systems/ActionGunSystem.cs |   4 +-
 .../Systems/BatteryWeaponFireModesSystem.cs   |  56 ++--
 .../Ranged/Systems/GunSpreadModifierSystem.cs |  11 +-
 .../Systems/RechargeBasicEntityAmmoSystem.cs  |  33 ++-
 .../Ranged/Systems/RechargeCycleAmmoSystem.cs |   8 +-
 .../Ranged/Systems/SharedFlyBySoundSystem.cs  |  16 +-
 .../Systems/SharedGunSystem.AutoFire.cs       |   4 +-
 .../Systems/SharedGunSystem.Ballistic.cs      | 108 ++++----
 .../Systems/SharedGunSystem.BasicEntity.cs    |  68 +++--
 .../Systems/SharedGunSystem.Cartridges.cs     |   4 +-
 .../SharedGunSystem.ChamberMagazine.cs        |   4 +-
 .../Systems/SharedGunSystem.Clothing.cs       |   2 +-
 .../Systems/SharedGunSystem.Container.cs      |  18 +-
 .../Systems/SharedGunSystem.Interactions.cs   |   4 +-
 .../Systems/SharedGunSystem.Magazine.cs       |   2 -
 .../Systems/SharedGunSystem.Revolver.cs       | 250 +++++++++---------
 .../Systems/SharedGunSystem.Solution.cs       |  41 ++-
 .../Weapons/Ranged/Systems/SharedGunSystem.cs | 234 ++++++++--------
 .../Ranged/Systems/UseDelayOnShootSystem.cs   |   6 +-
 58 files changed, 720 insertions(+), 737 deletions(-)

diff --git a/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs b/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
index b2bdf2893d..d852e20c45 100644
--- a/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
+++ b/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
@@ -4,10 +4,8 @@ using Content.Shared.Weapons.Ranged.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
-using Robust.Client.Serialization;
 using Robust.Client.UserInterface;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
 using Robust.Shared.Utility;
 
 namespace Content.Client.CombatMode;
diff --git a/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs
index 373be94a38..025f09b1a4 100644
--- a/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs
+++ b/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs
@@ -11,17 +11,20 @@ public sealed partial class MagazineVisualsComponent : Component
     /// <summary>
     /// What RsiState we use.
     /// </summary>
-    [DataField("magState")] public string? MagState;
+    [DataField]
+    public string? MagState;
 
     /// <summary>
     /// How many steps there are
     /// </summary>
-    [DataField("steps")] public int MagSteps;
+    [DataField("steps")]
+    public int MagSteps;
 
     /// <summary>
     /// Should we hide when the count is 0
     /// </summary>
-    [DataField("zeroVisible")] public bool ZeroVisible;
+    [DataField]
+    public bool ZeroVisible;
 }
 
 public enum GunVisualLayers : byte
diff --git a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
index 622a168fbf..03f7532659 100644
--- a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
+++ b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
@@ -8,9 +8,10 @@ public sealed partial class SpentAmmoVisualsComponent : Component
     /// <summary>
     /// Should we do "{_state}-spent" or just "spent"
     /// </summary>
-    [DataField("suffix")] public bool Suffix = true;
+    [DataField]
+    public bool Suffix = true;
 
-    [DataField("state")]
+    [DataField]
     public string State = "base";
 }
 
diff --git a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
index 63d21c8463..c714ca2eb5 100644
--- a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
+++ b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
@@ -48,7 +48,7 @@ public sealed class GunSpreadOverlay : Overlay
         if (mapPos.MapId == MapId.Nullspace)
             return;
 
-        if (!_guns.TryGetGun(player.Value, out var gunUid, out var gun))
+        if (!_guns.TryGetGun(player.Value, out var gun))
             return;
 
         var mouseScreenPos = _input.MouseScreenPosition;
@@ -58,12 +58,12 @@ public sealed class GunSpreadOverlay : Overlay
             return;
 
         // (☞ﾟヮﾟ)☞
-        var maxSpread = gun.MaxAngleModified;
-        var minSpread = gun.MinAngleModified;
-        var timeSinceLastFire = (_timing.CurTime - gun.NextFire).TotalSeconds;
-        var currentAngle = new Angle(MathHelper.Clamp(gun.CurrentAngle.Theta - gun.AngleDecayModified.Theta * timeSinceLastFire,
-            gun.MinAngleModified.Theta, gun.MaxAngleModified.Theta));
-        var direction = (mousePos.Position - mapPos.Position);
+        var maxSpread = gun.Comp.MaxAngleModified;
+        var minSpread = gun.Comp.MinAngleModified;
+        var timeSinceLastFire = (_timing.CurTime - gun.Comp.NextFire).TotalSeconds;
+        var currentAngle = new Angle(MathHelper.Clamp(gun.Comp.CurrentAngle.Theta - gun.Comp.AngleDecayModified.Theta * timeSinceLastFire,
+            gun.Comp.MinAngleModified.Theta, gun.Comp.MaxAngleModified.Theta));
+        var direction = mousePos.Position - mapPos.Position;
 
         worldHandle.DrawLine(mapPos.Position, mousePos.Position + direction, Color.Orange);
 
diff --git a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
index e11d5e7158..3c57cf73d0 100644
--- a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
+++ b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
@@ -41,7 +41,7 @@ public abstract class BaseBulletRenderer : Control
     {
         var countPerRow = Math.Min(Capacity, CountPerRow(availableSize.X));
 
-        var rows = Math.Min((int) MathF.Ceiling(Capacity / (float) countPerRow), Rows);
+        var rows = Math.Min((int)MathF.Ceiling(Capacity / (float)countPerRow), Rows);
 
         var height = _params.ItemHeight * rows + (_params.VerticalSeparation * rows - 1);
         var width = RowWidth(countPerRow);
@@ -110,7 +110,7 @@ public abstract class BaseBulletRenderer : Control
 
     private int CountPerRow(float width)
     {
-        return (int) ((width - _params.ItemWidth + _params.ItemSeparation) / _params.ItemSeparation);
+        return (int)((width - _params.ItemWidth + _params.ItemSeparation) / _params.ItemSeparation);
     }
 
     private int RowWidth(int count)
diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
index 401b7cdfaf..3a0aa25501 100644
--- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
@@ -2,10 +2,8 @@ using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Client.Player;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics.Events;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Client.Weapons.Ranged.Systems;
@@ -22,26 +20,26 @@ public sealed class FlyBySoundSystem : SharedFlyBySoundSystem
         SubscribeLocalEvent<FlyBySoundComponent, StartCollideEvent>(OnCollide);
     }
 
-    private void OnCollide(EntityUid uid, FlyBySoundComponent component, ref StartCollideEvent args)
+    private void OnCollide(Entity<FlyBySoundComponent> ent, ref StartCollideEvent args)
     {
         var attachedEnt = _player.LocalEntity;
 
         // If it's not our ent or we shot it.
         if (attachedEnt == null ||
             args.OtherEntity != attachedEnt ||
-            TryComp<ProjectileComponent>(uid, out var projectile) &&
+            TryComp<ProjectileComponent>(ent, out var projectile) &&
             projectile.Shooter == attachedEnt)
         {
             return;
         }
 
         if (args.OurFixtureId != FlyByFixture ||
-            !_random.Prob(component.Prob))
+            !_random.Prob(ent.Comp.Prob))
         {
             return;
         }
 
         // Play attached to our entity because the projectile may immediately delete or the likes.
-        _audio.PlayPredicted(component.Sound, attachedEnt.Value, attachedEnt.Value);
+        _audio.PlayPredicted(ent.Comp.Sound, attachedEnt.Value, attachedEnt.Value);
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
index dc27a5db87..49b067e395 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
@@ -14,12 +14,12 @@ namespace Content.Client.Weapons.Ranged.Systems;
 
 public sealed partial class GunSystem
 {
-    private void OnAmmoCounterCollect(EntityUid uid, AmmoCounterComponent component, ItemStatusCollectMessage args)
+    private void OnAmmoCounterCollect(Entity<AmmoCounterComponent> ent, ref ItemStatusCollectMessage args)
     {
-        RefreshControl(uid, component);
+        RefreshControl(ent);
 
-        if (component.Control != null)
-            args.Controls.Add(component.Control);
+        if (ent.Comp.Control != null)
+            args.Controls.Add(ent.Comp.Control);
     }
 
     /// <summary>
@@ -27,35 +27,32 @@ public sealed partial class GunSystem
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="component"></param>
-    private void RefreshControl(EntityUid uid, AmmoCounterComponent? component = null)
+    private void RefreshControl(Entity<AmmoCounterComponent> ent)
     {
-        if (!Resolve(uid, ref component, false))
-            return;
-
-        component.Control?.Dispose();
-        component.Control = null;
+        ent.Comp.Control?.Dispose();
+        ent.Comp.Control = null;
 
         var ev = new AmmoCounterControlEvent();
-        RaiseLocalEvent(uid, ev, false);
+        RaiseLocalEvent(ent, ev, false);
 
         // Fallback to default if none specified
         ev.Control ??= new DefaultStatusControl();
 
-        component.Control = ev.Control;
-        UpdateAmmoCount(uid, component);
+        ent.Comp.Control = ev.Control;
+        UpdateAmmoCount(ent);
     }
 
-    private void UpdateAmmoCount(EntityUid uid, AmmoCounterComponent component)
+    private void UpdateAmmoCount(Entity<AmmoCounterComponent> ent)
     {
-        if (component.Control == null)
+        if (ent.Comp.Control == null)
             return;
 
         var ev = new UpdateAmmoCounterEvent()
         {
-            Control = component.Control
+            Control = ent.Comp.Control
         };
 
-        RaiseLocalEvent(uid, ev, false);
+        RaiseLocalEvent(ent, ev, false);
     }
 
     protected override void UpdateAmmoCount(EntityUid uid, bool prediction = true)
@@ -68,7 +65,7 @@ public sealed partial class GunSystem
             return;
         }
 
-        UpdateAmmoCount(uid, clientComp);
+        UpdateAmmoCount((uid, clientComp));
     }
 
     /// <summary>
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
index d09661b770..44593215aa 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
@@ -12,41 +12,41 @@ public sealed partial class GunSystem
         SubscribeLocalEvent<BallisticAmmoProviderComponent, UpdateAmmoCounterEvent>(OnBallisticAmmoCount);
     }
 
-    private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent component, UpdateAmmoCounterEvent args)
+    private void OnBallisticAmmoCount(Entity<BallisticAmmoProviderComponent> ent, ref UpdateAmmoCounterEvent args)
     {
         if (args.Control is DefaultStatusControl control)
         {
-            control.Update(GetBallisticShots(component), component.Capacity);
+            control.Update(GetBallisticShots(ent.Comp), ent.Comp.Capacity);
         }
     }
 
-    protected override void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates)
+    protected override void Cycle(Entity<BallisticAmmoProviderComponent> ent, MapCoordinates coordinates)
     {
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        EntityUid? ent = null;
+        EntityUid? ammoEnt = null;
 
         // TODO: Combine with TakeAmmo
-        if (component.Entities.Count > 0)
+        if (ent.Comp.Entities.Count > 0)
         {
-            var existing = component.Entities[^1];
-            component.Entities.RemoveAt(component.Entities.Count - 1);
+            var existing = ent.Comp.Entities[^1];
+            ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1);
 
-            Containers.Remove(existing, component.Container);
+            Containers.Remove(existing, ent.Comp.Container);
             EnsureShootable(existing);
         }
-        else if (component.UnspawnedCount > 0)
+        else if (ent.Comp.UnspawnedCount > 0)
         {
-            component.UnspawnedCount--;
-            ent = Spawn(component.Proto, coordinates);
-            EnsureShootable(ent.Value);
+            ent.Comp.UnspawnedCount--;
+            ammoEnt = Spawn(ent.Comp.Proto, coordinates);
+            EnsureShootable(ammoEnt.Value);
         }
 
-        if (ent != null && IsClientSide(ent.Value))
-            Del(ent.Value);
+        if (ammoEnt != null && IsClientSide(ammoEnt.Value))
+            Del(ammoEnt.Value);
 
         var cycledEvent = new GunCycledEvent();
-        RaiseLocalEvent(uid, ref cycledEvent);
+        RaiseLocalEvent(ent, ref cycledEvent);
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs
index 4fa50999bd..669bc3ec40 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs
@@ -10,11 +10,11 @@ public partial class GunSystem
         SubscribeLocalEvent<BasicEntityAmmoProviderComponent, UpdateAmmoCounterEvent>(OnBasicEntityAmmoCount);
     }
 
-    private void OnBasicEntityAmmoCount(EntityUid uid, BasicEntityAmmoProviderComponent component, UpdateAmmoCounterEvent args)
+    private void OnBasicEntityAmmoCount(Entity<BasicEntityAmmoProviderComponent> ent, ref UpdateAmmoCounterEvent args)
     {
-        if (args.Control is DefaultStatusControl control && component.Count != null && component.Capacity != null)
+        if (args.Control is DefaultStatusControl control && ent.Comp.Count != null && ent.Comp.Capacity != null)
         {
-            control.Update(component.Count.Value, component.Capacity.Value);
+            control.Update(ent.Comp.Count.Value, ent.Comp.Capacity.Value);
         }
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs
index d40708de99..e47b0c952d 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs
@@ -18,11 +18,11 @@ public sealed partial class GunSystem
         SubscribeLocalEvent<ChamberMagazineAmmoProviderComponent, AppearanceChangeEvent>(OnChamberMagazineAppearance);
     }
 
-    private void OnChamberMagazineAppearance(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ref AppearanceChangeEvent args)
+    private void OnChamberMagazineAppearance(Entity<ChamberMagazineAmmoProviderComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null ||
-            !_sprite.LayerMapTryGet((uid, args.Sprite), GunVisualLayers.Base, out var boltLayer, false) ||
-            !Appearance.TryGetData(uid, AmmoVisuals.BoltClosed, out bool boltClosed))
+            !_sprite.LayerMapTryGet((ent, args.Sprite), GunVisualLayers.Base, out var boltLayer, false) ||
+            !Appearance.TryGetData(ent, AmmoVisuals.BoltClosed, out bool boltClosed))
         {
             return;
         }
@@ -30,11 +30,11 @@ public sealed partial class GunSystem
         // Maybe re-using base layer for this will bite me someday but screw you future sloth.
         if (boltClosed)
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), boltLayer, "base");
+            _sprite.LayerSetRsiState((ent, args.Sprite), boltLayer, "base");
         }
         else
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), boltLayer, "bolt-open");
+            _sprite.LayerSetRsiState((ent, args.Sprite), boltLayer, "bolt-open");
         }
     }
 
@@ -55,17 +55,17 @@ public sealed partial class GunSystem
         // to avoid 6-7 additional entity spawns.
     }
 
-    private void OnChamberMagazineCounter(EntityUid uid, ChamberMagazineAmmoProviderComponent component, AmmoCounterControlEvent args)
+    private void OnChamberMagazineCounter(Entity<ChamberMagazineAmmoProviderComponent> ent, ref AmmoCounterControlEvent args)
     {
         args.Control = new ChamberMagazineStatusControl();
     }
 
-    private void OnChamberMagazineAmmoUpdate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args)
+    private void OnChamberMagazineAmmoUpdate(Entity<ChamberMagazineAmmoProviderComponent> ent, ref UpdateAmmoCounterEvent args)
     {
         if (args.Control is not ChamberMagazineStatusControl control) return;
 
-        var chambered = GetChamberEntity(uid);
-        var magEntity = GetMagazineEntity(uid);
+        var chambered = GetChamberEntity(ent);
+        var magEntity = GetMagazineEntity(ent);
         var ammoCountEv = new GetAmmoCountEvent();
 
         if (magEntity != null)
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
index 0df95e4c02..e21eef570e 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
@@ -11,11 +11,11 @@ public sealed partial class GunSystem
         SubscribeLocalEvent<MagazineAmmoProviderComponent, AmmoCounterControlEvent>(OnMagazineControl);
     }
 
-    private void OnMagazineAmmoUpdate(EntityUid uid, MagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args)
+    private void OnMagazineAmmoUpdate(Entity<MagazineAmmoProviderComponent> ent, ref UpdateAmmoCounterEvent args)
     {
-        var ent = GetMagazineEntity(uid);
+        var magEnt = GetMagazineEntity(ent);
 
-        if (ent == null)
+        if (magEnt == null)
         {
             if (args.Control is DefaultStatusControl control)
             {
@@ -25,14 +25,14 @@ public sealed partial class GunSystem
             return;
         }
 
-        RaiseLocalEvent(ent.Value, args, false);
+        RaiseLocalEvent(magEnt.Value, args, false);
     }
 
-    private void OnMagazineControl(EntityUid uid, MagazineAmmoProviderComponent component, AmmoCounterControlEvent args)
+    private void OnMagazineControl(Entity<MagazineAmmoProviderComponent> ent, ref AmmoCounterControlEvent args)
     {
-        var ent = GetMagazineEntity(uid);
-        if (ent == null)
+        var magEnt = GetMagazineEntity(ent);
+        if (magEnt == null)
             return;
-        RaiseLocalEvent(ent.Value, args, false);
+        RaiseLocalEvent(magEnt.Value, args, false);
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
index c21b12ceac..8bf37eaca8 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
@@ -13,24 +13,24 @@ public sealed partial class GunSystem
         SubscribeLocalEvent<MagazineVisualsComponent, AppearanceChangeEvent>(OnMagazineVisualsChange);
     }
 
-    private void OnMagazineVisualsInit(EntityUid uid, MagazineVisualsComponent component, ComponentInit args)
+    private void OnMagazineVisualsInit(Entity<MagazineVisualsComponent> ent, ref ComponentInit args)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite)) return;
+        if (!TryComp<SpriteComponent>(ent, out var sprite)) return;
 
-        if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false))
+        if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
         {
-            _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.Mag, $"{component.MagState}-{component.MagSteps - 1}");
-            _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, false);
+            _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.Mag, $"{ent.Comp.MagState}-{ent.Comp.MagSteps - 1}");
+            _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false);
         }
 
-        if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false))
+        if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
         {
-            _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.MagUnshaded, $"{component.MagState}-unshaded-{component.MagSteps - 1}");
-            _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, false);
+            _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.MagUnshaded, $"{ent.Comp.MagState}-unshaded-{ent.Comp.MagSteps - 1}");
+            _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false);
         }
     }
 
-    private void OnMagazineVisualsChange(EntityUid uid, MagazineVisualsComponent component, ref AppearanceChangeEvent args)
+    private void OnMagazineVisualsChange(Entity<MagazineVisualsComponent> ent, ref AppearanceChangeEvent args)
     {
         // tl;dr
         // 1.If no mag then hide it OR
@@ -45,53 +45,53 @@ public sealed partial class GunSystem
         {
             if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoMax, out var capacity))
             {
-                capacity = component.MagSteps;
+                capacity = ent.Comp.MagSteps;
             }
 
             if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoCount, out var current))
             {
-                current = component.MagSteps;
+                current = ent.Comp.MagSteps;
             }
 
-            var step = ContentHelpers.RoundToLevels((int)current, (int)capacity, component.MagSteps);
+            var step = ContentHelpers.RoundToLevels((int)current, (int)capacity, ent.Comp.MagSteps);
 
-            if (step == 0 && !component.ZeroVisible)
+            if (step == 0 && !ent.Comp.ZeroVisible)
             {
-                if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false))
+                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
                 {
-                    _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, false);
+                    _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false);
                 }
 
-                if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false))
+                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
                 {
-                    _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, false);
+                    _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false);
                 }
 
                 return;
             }
 
-            if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false))
+            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
             {
-                _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, true);
-                _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.Mag, $"{component.MagState}-{step}");
+                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, true);
+                _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.Mag, $"{ent.Comp.MagState}-{step}");
             }
 
-            if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false))
+            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
             {
-                _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, true);
-                _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.MagUnshaded, $"{component.MagState}-unshaded-{step}");
+                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, true);
+                _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.MagUnshaded, $"{ent.Comp.MagState}-unshaded-{step}");
             }
         }
         else
         {
-            if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false))
+            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
             {
-                _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, false);
+                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false);
             }
 
-            if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false))
+            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
             {
-                _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, false);
+                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false);
             }
         }
     }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs
index 33a4042daf..0a6101b20a 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs
@@ -14,25 +14,25 @@ public sealed partial class GunSystem
         SubscribeLocalEvent<RevolverAmmoProviderComponent, EntRemovedFromContainerMessage>(OnRevolverEntRemove);
     }
 
-    private void OnRevolverEntRemove(EntityUid uid, RevolverAmmoProviderComponent component, EntRemovedFromContainerMessage args)
+    private void OnRevolverEntRemove(Entity<RevolverAmmoProviderComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         if (args.Container.ID != RevolverContainer)
             return;
 
-        // See ChamberMagazineAmmoProvider
+        // <See ChamberMagazineAmmoProvider>
         if (!IsClientSide(args.Entity))
             return;
 
         QueueDel(args.Entity);
     }
 
-    private void OnRevolverAmmoUpdate(EntityUid uid, RevolverAmmoProviderComponent component, UpdateAmmoCounterEvent args)
+    private void OnRevolverAmmoUpdate(Entity<RevolverAmmoProviderComponent> ent, ref UpdateAmmoCounterEvent args)
     {
         if (args.Control is not RevolverStatusControl control) return;
-        control.Update(component.CurrentIndex, component.Chambers);
+        control.Update(ent.Comp.CurrentIndex, ent.Comp.Chambers);
     }
 
-    private void OnRevolverCounter(EntityUid uid, RevolverAmmoProviderComponent component, AmmoCounterControlEvent args)
+    private void OnRevolverCounter(Entity<RevolverAmmoProviderComponent> ent, ref AmmoCounterControlEvent args)
     {
         args.Control = new RevolverStatusControl();
     }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
index dc5aa4d08c..a4fb34fcb7 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
@@ -11,7 +11,7 @@ public sealed partial class GunSystem
         SubscribeLocalEvent<SpentAmmoVisualsComponent, AppearanceChangeEvent>(OnSpentAmmoAppearance);
     }
 
-    private void OnSpentAmmoAppearance(EntityUid uid, SpentAmmoVisualsComponent component, ref AppearanceChangeEvent args)
+    private void OnSpentAmmoAppearance(Entity<SpentAmmoVisualsComponent> ent, ref AppearanceChangeEvent args)
     {
         var sprite = args.Sprite;
         if (sprite == null) return;
@@ -21,15 +21,15 @@ public sealed partial class GunSystem
             return;
         }
 
-        var spent = (bool) varSpent;
+        var spent = (bool)varSpent;
         string state;
 
         if (spent)
-            state = component.Suffix ? $"{component.State}-spent" : "spent";
+            state = ent.Comp.Suffix ? $"{ent.Comp.State}-spent" : "spent";
         else
-            state = component.State;
+            state = ent.Comp.State;
 
-        _sprite.LayerSetRsiState((uid, sprite), AmmoVisualLayers.Base, state);
-        _sprite.RemoveLayer((uid, sprite), AmmoVisualLayers.Tip, false);
+        _sprite.LayerSetRsiState((ent, sprite), AmmoVisualLayers.Base, state);
+        _sprite.RemoveLayer((ent, sprite), AmmoVisualLayers.Tip, false);
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index d3dfd50cbf..2814cef650 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -31,13 +31,13 @@ namespace Content.Client.Weapons.Ranged.Systems;
 
 public sealed partial class GunSystem : SharedGunSystem
 {
+    [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
+    [Dependency] private readonly InputSystem _inputSystem = default!;
     [Dependency] private readonly IOverlayManager _overlayManager = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IStateManager _state = default!;
-    [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!;
-    [Dependency] private readonly InputSystem _inputSystem = default!;
     [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
@@ -167,29 +167,29 @@ public sealed partial class GunSystem : SharedGunSystem
 
         var entity = entityNull.Value;
 
-        if (!TryGetGun(entity, out var gunUid, out var gun))
+        if (!TryGetGun(entity, out var gun))
         {
             return;
         }
 
-        var useKey = gun.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary;
+        var useKey = gun.Comp.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary;
 
-        if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.BurstActivated)
+        if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.Comp.BurstActivated)
         {
-            if (gun.ShotCounter != 0)
-                RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
+            if (gun.Comp.ShotCounter != 0)
+                RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gun) });
             return;
         }
 
-        if (gun.NextFire > Timing.CurTime)
+        if (gun.Comp.NextFire > Timing.CurTime)
             return;
 
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
         if (mousePos.MapId == MapId.Nullspace)
         {
-            if (gun.ShotCounter != 0)
-                RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
+            if (gun.Comp.ShotCounter != 0)
+                RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gun) });
 
             return;
         }
@@ -207,11 +207,11 @@ public sealed partial class GunSystem : SharedGunSystem
         {
             Target = target,
             Coordinates = GetNetCoordinates(coordinates),
-            Gun = GetNetEntity(gunUid),
+            Gun = GetNetEntity(gun),
         });
     }
 
-    public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
+    public override void Shoot(Entity<GunComponent> gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
         EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false)
     {
         userImpulse = true;
@@ -226,7 +226,7 @@ public sealed partial class GunSystem : SharedGunSystem
         {
             if (throwItems)
             {
-                Recoil(user, direction, gun.CameraRecoilScalarModified);
+                Recoil(user, direction, gun.Comp.CameraRecoilScalarModified);
                 if (IsClientSide(ent!.Value))
                     Del(ent.Value);
                 else
@@ -241,9 +241,9 @@ public sealed partial class GunSystem : SharedGunSystem
                     if (!cartridge.Spent)
                     {
                         SetCartridgeSpent(ent!.Value, cartridge, true);
-                        MuzzleFlash(gunUid, cartridge, worldAngle, user);
-                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                        Recoil(user, direction, gun.CameraRecoilScalarModified);
+                        MuzzleFlash(gun, cartridge, worldAngle, user);
+                        Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user);
+                        Recoil(user, direction, gun.Comp.CameraRecoilScalarModified);
                         // TODO: Can't predict entity deletions.
                         //if (cartridge.DeleteOnSpawn)
                         //    Del(cartridge.Owner);
@@ -251,7 +251,7 @@ public sealed partial class GunSystem : SharedGunSystem
                     else
                     {
                         userImpulse = false;
-                        Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
+                        Audio.PlayPredicted(gun.Comp.SoundEmpty, gun, user);
                     }
 
                     if (IsClientSide(ent!.Value))
@@ -259,17 +259,17 @@ public sealed partial class GunSystem : SharedGunSystem
 
                     break;
                 case AmmoComponent newAmmo:
-                    MuzzleFlash(gunUid, newAmmo, worldAngle, user);
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    Recoil(user, direction, gun.CameraRecoilScalarModified);
+                    MuzzleFlash(gun, newAmmo, worldAngle, user);
+                    Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user);
+                    Recoil(user, direction, gun.Comp.CameraRecoilScalarModified);
                     if (IsClientSide(ent!.Value))
                         Del(ent.Value);
                     else
                         RemoveShootable(ent.Value);
                     break;
                 case HitscanAmmoComponent:
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    Recoil(user, direction, gun.CameraRecoilScalarModified);
+                    Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user);
+                    Recoil(user, direction, gun.Comp.CameraRecoilScalarModified);
                     break;
             }
         }
@@ -407,5 +407,5 @@ public sealed partial class GunSystem : SharedGunSystem
     }
 
     // TODO: Move RangedDamageSoundComponent to shared so this can be predicted.
-    public override void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) {}
+    public override void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) { }
 }
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index d04ed4cb3c..6279449ba7 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -478,11 +478,11 @@ public abstract partial class InteractionTest
         var wasInCombatMode = IsInCombatMode();
         await SetCombatMode(true);
 
-        Assert.That(SGun.TryGetGun(SPlayer, out var gunUid, out var gunComp), "Player was not holding a gun!");
+        Assert.That(SGun.TryGetGun(SPlayer, out var gun), "Player was not holding a gun!");
 
         await Server.WaitAssertion(() =>
         {
-            var success = SGun.AttemptShoot(SPlayer, gunUid, gunComp!, actualTarget);
+            var success = SGun.AttemptShoot(SPlayer, gun, actualTarget);
             if (assert)
                 Assert.That(success, "Gun failed to shoot.");
         });
@@ -517,11 +517,11 @@ public abstract partial class InteractionTest
         var wasInCombatMode = IsInCombatMode();
         await SetCombatMode(true);
 
-        Assert.That(SGun.TryGetGun(SPlayer, out var gunUid, out var gunComp), "Player was not holding a gun!");
+        Assert.That(SGun.TryGetGun(SPlayer, out var gun), "Player was not holding a gun!");
 
         await Server.WaitAssertion(() =>
         {
-            var success = SGun.AttemptShoot(SPlayer, gunUid, gunComp!, Position(actualTarget!.Value), ToServer(actualTarget));
+            var success = SGun.AttemptShoot(SPlayer, gun, Position(actualTarget!.Value), ToServer(actualTarget));
             if (assert)
                 Assert.That(success, "Gun failed to shoot.");
         });
@@ -839,7 +839,7 @@ public abstract partial class InteractionTest
     /// <param name="uid">The entity at which the events were directed</param>
     /// <param name="count">How many new events are expected</param>
     /// <param name="predicate">A predicate that can be used to filter the recorded events</param>
-    protected void AssertEvent<TEvent>(EntityUid? uid = null, int count = 1, Func<TEvent,bool>? predicate = null)
+    protected void AssertEvent<TEvent>(EntityUid? uid = null, int count = 1, Func<TEvent, bool>? predicate = null)
         where TEvent : notnull
     {
         Assert.That(GetEvents(uid, predicate).Count, Is.EqualTo(count));
@@ -872,7 +872,7 @@ public abstract partial class InteractionTest
         where TEvent : notnull
     {
         if (_listenerCache.TryGetValue(typeof(TEvent), out var listener))
-            return (TestListenerSystem<TEvent>) listener;
+            return (TestListenerSystem<TEvent>)listener;
 
         var type = Server.Resolve<IReflectionManager>().GetAllChildren<TestListenerSystem<TEvent>>().Single();
         if (!SEntMan.EntitySysManager.TryGetEntitySystem(type, out var systemObj))
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index f510ed52e9..134002ec3a 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -726,7 +726,7 @@ public sealed partial class AdminVerbSystem
                             return;
 
                         _gun.SetBallisticUnspawned((args.Target, ballisticAmmo), result);
-                        _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo);
+                        _gun.UpdateBallisticAppearance((args.Target, ballisticAmmo));
                     });
                 },
                 Impact = LogImpact.Medium,
diff --git a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs
index 1f9d338c58..cf78f5c114 100644
--- a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs
@@ -27,18 +27,18 @@ public sealed partial class GunSignalControlSystem : EntitySystem
             return;
 
         if (args.Port == gunControl.Comp.TriggerPort)
-            _gun.AttemptShoot(gunControl, gun);
+            _gun.AttemptShoot((gunControl, gun));
 
         if (!TryComp<AutoShootGunComponent>(gunControl, out var autoShoot))
             return;
 
         if (args.Port == gunControl.Comp.TogglePort)
-           _gun.SetEnabled(gunControl, autoShoot, !autoShoot.Enabled);
+            _gun.SetEnabled((gunControl, autoShoot), !autoShoot.Enabled);
 
         if (args.Port == gunControl.Comp.OnPort)
-            _gun.SetEnabled(gunControl, autoShoot, true);
+            _gun.SetEnabled((gunControl, autoShoot), true);
 
         if (args.Port == gunControl.Comp.OffPort)
-            _gun.SetEnabled(gunControl, autoShoot, false);
+            _gun.SetEnabled((gunControl, autoShoot), false);
     }
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
index 58647d8874..961d3c39ab 100644
--- a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
@@ -10,10 +10,10 @@ public sealed partial class GunAmmoPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField("minPercent")]
+    [DataField]
     public float MinPercent = 0f;
 
-    [DataField("maxPercent")]
+    [DataField]
     public float MaxPercent = 1f;
 
     public override bool IsMet(NPCBlackboard blackboard)
@@ -21,19 +21,19 @@ public sealed partial class GunAmmoPrecondition : HTNPrecondition
         var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
         var gunSystem = _entManager.System<GunSystem>();
 
-        if (!gunSystem.TryGetGun(owner, out var gunUid, out _))
+        if (!gunSystem.TryGetGun(owner, out var gun))
         {
             return false;
         }
 
         var ammoEv = new GetAmmoCountEvent();
-        _entManager.EventBus.RaiseLocalEvent(gunUid, ref ammoEv);
+        _entManager.EventBus.RaiseLocalEvent(gun, ref ammoEv);
         float percent;
 
         if (ammoEv.Capacity == 0)
             percent = 0f;
         else
-            percent = ammoEv.Count / (float) ammoEv.Capacity;
+            percent = ammoEv.Count / (float)ammoEv.Capacity;
 
         percent = System.Math.Clamp(percent, 0f, 1f);
 
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index d703610228..167415a333 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -96,7 +96,7 @@ public sealed partial class NPCCombatSystem
                 _combat.SetInCombatMode(uid, true, combatMode);
             }
 
-            if (!_gun.TryGetGun(uid, out var gunUid, out var gun))
+            if (!_gun.TryGetGun(uid, out var gun))
             {
                 comp.Status = CombatStatus.NoWeapon;
                 comp.ShootAccumulator = 0f;
@@ -104,12 +104,12 @@ public sealed partial class NPCCombatSystem
             }
 
             var ammoEv = new GetAmmoCountEvent();
-            RaiseLocalEvent(gunUid, ref ammoEv);
+            RaiseLocalEvent(gun, ref ammoEv);
 
             if (ammoEv.Count == 0)
             {
                 // Recharging then?
-                if (_rechargeQuery.HasComponent(gunUid))
+                if (_rechargeQuery.HasComponent(gun))
                 {
                     continue;
                 }
@@ -200,13 +200,13 @@ public sealed partial class NPCCombatSystem
 
             comp.Status = CombatStatus.Normal;
 
-            if (gun.NextFire > _timing.CurTime)
+            if (gun.Comp.NextFire > _timing.CurTime)
             {
                 return;
             }
 
             _gun.SetTarget(gun, comp.Target); // Imp
-            _gun.AttemptShoot(uid, gunUid, gun, targetCordinates, comp.Target);
+            _gun.AttemptShoot(uid, gun, targetCordinates, comp.Target);
         }
     }
 }
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index 2ccdc10934..f3a9444e80 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -232,7 +232,7 @@ namespace Content.Server.Singularity.EntitySystems
 
             var targetPos = new EntityCoordinates(uid, new Vector2(0, -1));
 
-            _gun.Shoot(uid, gunComponent, ent, xform.Coordinates, targetPos, out _);
+            _gun.Shoot((uid, gunComponent), ent, xform.Coordinates, targetPos, out _);
         }
 
         private void UpdateAppearance(EntityUid uid, EmitterComponent component)
diff --git a/Content.Server/Turrets/DeployableTurretSystem.cs b/Content.Server/Turrets/DeployableTurretSystem.cs
index 2599285bdc..8247dfc491 100644
--- a/Content.Server/Turrets/DeployableTurretSystem.cs
+++ b/Content.Server/Turrets/DeployableTurretSystem.cs
@@ -84,7 +84,7 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
             args.Data.TryGetValue(command, out int? armamentState))
         {
             if (TryComp<BatteryWeaponFireModesComponent>(ent, out var batteryWeaponFireModes))
-                _fireModes.TrySetFireMode(ent, batteryWeaponFireModes, armamentState.Value);
+                _fireModes.TrySetFireMode((ent, batteryWeaponFireModes), armamentState.Value);
 
             TrySetState(ent, armamentState.Value >= 0);
             return;
diff --git a/Content.Server/Weapons/DamageMarkerSystem.cs b/Content.Server/Weapons/DamageMarkerSystem.cs
index be65bca168..4e57b98ae0 100644
--- a/Content.Server/Weapons/DamageMarkerSystem.cs
+++ b/Content.Server/Weapons/DamageMarkerSystem.cs
@@ -2,7 +2,4 @@ using Content.Shared.Weapons.Marker;
 
 namespace Content.Server.Weapons;
 
-public sealed class DamageMarkerSystem : SharedDamageMarkerSystem
-{
-
-}
+public sealed class DamageMarkerSystem : SharedDamageMarkerSystem { }
diff --git a/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs b/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs
index 3815ce15db..5e70b840d2 100644
--- a/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs
+++ b/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs
@@ -3,4 +3,4 @@ using Content.Shared.Weapons.Ranged.Components;
 namespace Content.Server.Weapons.Ranged.Components;
 
 [RegisterComponent]
-public sealed partial class AmmoCounterComponent : SharedAmmoCounterComponent {}
+public sealed partial class AmmoCounterComponent : SharedAmmoCounterComponent { }
diff --git a/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs b/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs
index b9a5eca09b..928ec257bb 100644
--- a/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs
+++ b/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs
@@ -1,11 +1,10 @@
-namespace Content.Server.Weapons.Ranged.Components
-{
-    [RegisterComponent]
-    public sealed partial class ChemicalAmmoComponent : Component
-    {
-        public const string DefaultSolutionName = "ammo";
+namespace Content.Server.Weapons.Ranged.Components;
 
-        [DataField("solution")]
-        public string SolutionName { get; set; } = DefaultSolutionName;
-    }
+[RegisterComponent]
+public sealed partial class ChemicalAmmoComponent : Component
+{
+    public const string DefaultSolutionName = "ammo";
+
+    [DataField("solution")]
+    public string SolutionName { get; set; } = DefaultSolutionName;
 }
diff --git a/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs b/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs
index ccb5119af8..d9b96a1adc 100644
--- a/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs
+++ b/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs
@@ -16,15 +16,13 @@ public sealed partial class RangedDamageSoundComponent : Component
     /// Specified sounds to apply when the entity takes damage with the specified group.
     /// Will fallback to defaults if none specified.
     /// </summary>
-    [DataField("soundGroups",
-        customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, DamageGroupPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, DamageGroupPrototype>))]
     public Dictionary<string, SoundSpecifier>? SoundGroups;
 
     /// <summary>
     /// Specified sounds to apply when the entity takes damage with the specified type.
     /// Will fallback to defaults if none specified.
     /// </summary>
-    [DataField("soundTypes",
-         customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, DamageTypePrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, DamageTypePrototype>))]
     public Dictionary<string, SoundSpecifier>? SoundTypes;
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs
index 089ef23a14..4ee1e9fd92 100644
--- a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs
@@ -1,49 +1,48 @@
 using Content.Server.Weapons.Ranged.Components;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Weapons.Ranged.Events;
 using System.Linq;
 
-namespace Content.Server.Weapons.Ranged.Systems
+namespace Content.Server.Weapons.Ranged.Systems;
+
+public sealed class ChemicalAmmoSystem : EntitySystem
 {
-    public sealed class ChemicalAmmoSystem : EntitySystem
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+        SubscribeLocalEvent<ChemicalAmmoComponent, AmmoShotEvent>(OnFire);
+    }
 
-        public override void Initialize()
+    private void OnFire(Entity<ChemicalAmmoComponent> entity, ref AmmoShotEvent args)
+    {
+        if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var ammoSoln, out var ammoSolution))
+            return;
+
+        var projectiles = args.FiredProjectiles;
+
+        var projectileSolutionContainers = new List<(EntityUid, Entity<SolutionComponent>)>();
+        foreach (var projectile in projectiles)
         {
-            SubscribeLocalEvent<ChemicalAmmoComponent, AmmoShotEvent>(OnFire);
+            if (_solutionContainerSystem
+                .TryGetSolution(projectile, entity.Comp.SolutionName, out var projectileSoln, out _))
+            {
+                projectileSolutionContainers.Add((projectile, projectileSoln.Value));
+            }
         }
 
-        private void OnFire(Entity<ChemicalAmmoComponent> entity, ref AmmoShotEvent args)
+        if (!projectileSolutionContainers.Any())
+            return;
+
+        var solutionPerProjectile = ammoSolution.Volume * (1 / projectileSolutionContainers.Count);
+
+        foreach (var (_, projectileSolution) in projectileSolutionContainers)
         {
-            if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var ammoSoln, out var ammoSolution))
-                return;
-
-            var projectiles = args.FiredProjectiles;
-
-            var projectileSolutionContainers = new List<(EntityUid, Entity<SolutionComponent>)>();
-            foreach (var projectile in projectiles)
-            {
-                if (_solutionContainerSystem
-                    .TryGetSolution(projectile, entity.Comp.SolutionName, out var projectileSoln, out _))
-                {
-                    projectileSolutionContainers.Add((projectile, projectileSoln.Value));
-                }
-            }
-
-            if (!projectileSolutionContainers.Any())
-                return;
-
-            var solutionPerProjectile = ammoSolution.Volume * (1 / projectileSolutionContainers.Count);
-
-            foreach (var (_, projectileSolution) in projectileSolutionContainers)
-            {
-                var solutionToTransfer = _solutionContainerSystem.SplitSolution(ammoSoln.Value, solutionPerProjectile);
-                _solutionContainerSystem.TryAddSolution(projectileSolution, solutionToTransfer);
-            }
-
-            _solutionContainerSystem.RemoveAllSolution(ammoSoln.Value);
+            var solutionToTransfer = _solutionContainerSystem.SplitSolution(ammoSoln.Value, solutionPerProjectile);
+            _solutionContainerSystem.TryAddSolution(projectileSolution, solutionToTransfer);
         }
+
+        _solutionContainerSystem.RemoveAllSolution(ammoSoln.Value);
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs
index f9986767fe..03a46de1c2 100644
--- a/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs
@@ -2,4 +2,4 @@ using Content.Shared.Weapons.Ranged.Systems;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
-public sealed class FlyBySoundSystem : SharedFlyBySoundSystem {}
+public sealed class FlyBySoundSystem : SharedFlyBySoundSystem { }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
index c552cfb202..5a6a9a801c 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
@@ -34,15 +34,15 @@ public sealed partial class GunSystem
                 if (!autoShoot.Enabled)
                     continue;
 
-                AttemptShoot(uid, gun);
+                AttemptShoot((uid, gun));
             }
             else if (gun.BurstActivated)
             {
                 var parent = TransformSystem.GetParentUid(uid);
                 if (HasComp<DamageableComponent>(parent))
-                    AttemptShoot(parent, uid, gun, gun.ShootCoordinates ?? new EntityCoordinates(uid, gun.DefaultDirection));
+                    AttemptShoot(parent, (uid, gun), gun.ShootCoordinates ?? new EntityCoordinates(uid, gun.DefaultDirection));
                 else
-                    AttemptShoot(uid, gun);
+                    AttemptShoot((uid, gun));
             }
         }
     }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
index 60680deaaa..87d958d9d1 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
@@ -6,32 +6,32 @@ namespace Content.Server.Weapons.Ranged.Systems;
 
 public sealed partial class GunSystem
 {
-    protected override void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates)
+    protected override void Cycle(Entity<BallisticAmmoProviderComponent> ent, MapCoordinates coordinates)
     {
-        EntityUid? ent = null;
+        EntityUid? ammoEnt = null;
 
         // TODO: Combine with TakeAmmo
-        if (component.Entities.Count > 0)
+        if (ent.Comp.Entities.Count > 0)
         {
-            var existing = component.Entities[^1];
-            component.Entities.RemoveAt(component.Entities.Count - 1);
-            DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities));
+            var existing = ent.Comp.Entities[^1];
+            ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1);
+            DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
 
-            Containers.Remove(existing, component.Container);
+            Containers.Remove(existing, ent.Comp.Container);
             EnsureShootable(existing);
         }
-        else if (component.UnspawnedCount > 0)
+        else if (ent.Comp.UnspawnedCount > 0)
         {
-            component.UnspawnedCount--;
-            DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount));
-            ent = Spawn(component.Proto, coordinates);
-            EnsureShootable(ent.Value);
+            ent.Comp.UnspawnedCount--;
+            DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.UnspawnedCount));
+            ammoEnt = Spawn(ent.Comp.Proto, coordinates);
+            EnsureShootable(ammoEnt.Value);
         }
 
-        if (ent != null)
-            EjectCartridge(ent.Value);
+        if (ammoEnt != null)
+            EjectCartridge(ammoEnt.Value);
 
         var cycledEvent = new GunCycledEvent();
-        RaiseLocalEvent(uid, ref cycledEvent);
+        RaiseLocalEvent(ent, ref cycledEvent);
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs
index 59e53f1f72..7f2fa28b13 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs
@@ -4,15 +4,15 @@ namespace Content.Server.Weapons.Ranged.Systems;
 
 public sealed partial class GunSystem
 {
-    protected override void SpinRevolver(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid? user = null)
+    protected override void SpinRevolver(Entity<RevolverAmmoProviderComponent> ent, EntityUid? user = null)
     {
-        base.SpinRevolver(revolverUid, component, user);
-        var index = Random.Next(component.Capacity);
+        base.SpinRevolver(ent, user);
+        var index = Random.Next(ent.Comp.Capacity);
 
-        if (component.CurrentIndex == index)
+        if (ent.Comp.CurrentIndex == index)
             return;
 
-        component.CurrentIndex = index;
-        Dirty(revolverUid, component);
+        ent.Comp.CurrentIndex = index;
+        Dirty(ent);
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs
index d0898efaaf..eddc8739bb 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs
@@ -23,63 +23,63 @@ public sealed partial class GunSystem
 
     private void OnSolutionMapInit(Entity<SolutionAmmoProviderComponent> entity, ref MapInitEvent args)
     {
-        UpdateSolutionShots(entity.Owner, entity.Comp);
+        UpdateSolutionShots(entity);
     }
 
     private void OnSolutionChanged(Entity<SolutionAmmoProviderComponent> entity, ref SolutionContainerChangedEvent args)
     {
         if (args.Solution.Name == entity.Comp.SolutionId)
-            UpdateSolutionShots(entity.Owner, entity.Comp, args.Solution);
+            UpdateSolutionShots(entity, args.Solution);
     }
 
-    protected override void UpdateSolutionShots(EntityUid uid, SolutionAmmoProviderComponent component, Solution? solution = null)
+    protected override void UpdateSolutionShots(Entity<SolutionAmmoProviderComponent> ent, Solution? solution = null)
     {
         var shots = 0;
         var maxShots = 0;
-        if (solution == null && !_solutionContainer.TryGetSolution(uid, component.SolutionId, out _, out solution))
+        if (solution == null && !_solutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionId, out _, out solution))
         {
-            component.Shots = shots;
-            DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.Shots));
-            component.MaxShots = maxShots;
-            DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.MaxShots));
+            ent.Comp.Shots = shots;
+            DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.Shots));
+            ent.Comp.MaxShots = maxShots;
+            DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.MaxShots));
             return;
         }
 
-        shots = (int) (solution.Volume / component.FireCost);
-        maxShots = (int) (solution.MaxVolume / component.FireCost);
+        shots = (int)(solution.Volume / ent.Comp.FireCost);
+        maxShots = (int)(solution.MaxVolume / ent.Comp.FireCost);
 
-        component.Shots = shots;
-        DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.Shots));
+        ent.Comp.Shots = shots;
+        DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.Shots));
 
-        component.MaxShots = maxShots;
-        DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.MaxShots));
+        ent.Comp.MaxShots = maxShots;
+        DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.MaxShots));
 
-        UpdateSolutionAppearance(uid, component);
+        UpdateSolutionAppearance(ent);
     }
 
-    protected override (EntityUid Entity, IShootable) GetSolutionShot(EntityUid uid, SolutionAmmoProviderComponent component, EntityCoordinates position)
+    protected override (EntityUid Entity, IShootable) GetSolutionShot(Entity<SolutionAmmoProviderComponent> ent, EntityCoordinates position)
     {
-        var (ent, shootable) = base.GetSolutionShot(uid, component, position);
+        var (shot, shootable) = base.GetSolutionShot(ent, position);
 
-        if (!_solutionContainer.TryGetSolution(uid, component.SolutionId, out var solution, out _))
-            return (ent, shootable);
+        if (!_solutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionId, out var solution, out _))
+            return (shot, shootable);
 
-        var newSolution = _solutionContainer.SplitSolution(solution.Value, component.FireCost);
+        var newSolution = _solutionContainer.SplitSolution(solution.Value, ent.Comp.FireCost);
 
         if (newSolution.Volume <= FixedPoint2.Zero)
-            return (ent, shootable);
+            return (shot, shootable);
 
-        if (TryComp<AppearanceComponent>(ent, out var appearance))
+        if (TryComp<AppearanceComponent>(shot, out var appearance))
         {
-            Appearance.SetData(ent, VaporVisuals.Color, newSolution.GetColor(ProtoManager).WithAlpha(1f), appearance);
-            Appearance.SetData(ent, VaporVisuals.State, true, appearance);
+            Appearance.SetData(shot, VaporVisuals.Color, newSolution.GetColor(ProtoManager).WithAlpha(1f), appearance);
+            Appearance.SetData(shot, VaporVisuals.State, true, appearance);
         }
 
         // Add the solution to the vapor and actually send the thing
-        if (_solutionContainer.TryGetSolution(ent, VaporComponent.SolutionName, out var vaporSolution, out _))
+        if (_solutionContainer.TryGetSolution(shot, VaporComponent.SolutionName, out var vaporSolution, out _))
         {
             _solutionContainer.TryAddSolution(vaporSolution.Value, newSolution);
         }
-        return (ent, shootable);
+        return (shot, shootable);
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index cef59074f9..046b59d5fd 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -44,30 +44,30 @@ public sealed partial class GunSystem : SharedGunSystem
         SubscribeLocalEvent<AutoShootGunComponent, AnchorStateChangedEvent>(OnAnchorChange); // Frontier
     }
 
-    private void OnBallisticPrice(EntityUid uid, BallisticAmmoProviderComponent component, ref PriceCalculationEvent args)
+    private void OnBallisticPrice(Entity<BallisticAmmoProviderComponent> ent, ref PriceCalculationEvent args)
     {
-        if (string.IsNullOrEmpty(component.Proto) || component.UnspawnedCount == 0)
+        if (string.IsNullOrEmpty(ent.Comp.Proto) || ent.Comp.UnspawnedCount == 0)
             return;
 
-        if (!ProtoManager.TryIndex<EntityPrototype>(component.Proto, out var proto))
+        if (!ProtoManager.TryIndex<EntityPrototype>(ent.Comp.Proto, out var proto))
         {
-            Log.Error($"Unable to find fill prototype for price on {component.Proto} on {ToPrettyString(uid)}");
+            Log.Error($"Unable to find fill prototype for price on {ent.Comp.Proto} on {ToPrettyString(ent)}");
             return;
         }
 
         // Probably good enough for most.
         var price = _pricing.GetEstimatedPrice(proto);
-        args.Price += price * component.UnspawnedCount;
+        args.Price += price * ent.Comp.UnspawnedCount;
     }
 
-    public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
+    public override void Shoot(Entity<GunComponent> gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
         EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false)
     {
         userImpulse = true;
 
         if (user != null)
         {
-            var selfEvent = new SelfBeforeGunShotEvent(user.Value, (gunUid, gun), ammo);
+            var selfEvent = new SelfBeforeGunShotEvent(user.Value, gun, ammo);
             RaiseLocalEvent(user.Value, selfEvent);
             if (selfEvent.Cancelled)
             {
@@ -101,7 +101,7 @@ public sealed partial class GunSystem : SharedGunSystem
             // pneumatic cannon doesn't shoot bullets it just throws them, ignore ammo handling
             if (throwItems && ent != null)
             {
-                ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, gunUid, user);
+                ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, user);
                 continue;
             }
 
@@ -128,7 +128,7 @@ public sealed partial class GunSystem : SharedGunSystem
                     else
                     {
                         userImpulse = false;
-                        Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
+                        Audio.PlayPredicted(gun.Comp.SoundEmpty, gun, user);
                     }
 
                     // Something like ballistic might want to leave it in the container still
@@ -152,22 +152,22 @@ public sealed partial class GunSystem : SharedGunSystem
                     {
                         FromCoordinates = fromCoordinates,
                         ShotDirection = mapDirection.Normalized(),
-                        Gun = gunUid,
+                        Gun = gun,
                         Shooter = user,
-                        Target = gun.Target,
+                        Target = gun.Comp.Target,
                     };
                     RaiseLocalEvent(ent.Value, ref hitscanEv);
 
                     Del(ent);
 
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                    Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        RaiseLocalEvent(gunUid, new AmmoShotEvent()
+        RaiseLocalEvent(gun, new AmmoShotEvent()
         {
             FiredProjectiles = shotProjectiles,
             Shooter = user, //starlight
@@ -178,35 +178,35 @@ public sealed partial class GunSystem : SharedGunSystem
             if (TryComp<ProjectileSpreadComponent>(ammoEnt, out var ammoSpreadComp))
             {
                 var spreadEvent = new GunGetAmmoSpreadEvent(ammoSpreadComp.Spread);
-                RaiseLocalEvent(gunUid, ref spreadEvent);
+                RaiseLocalEvent(gun, ref spreadEvent);
 
                 var angles = LinearSpread(mapAngle - spreadEvent.Spread / 2,
                     mapAngle + spreadEvent.Spread / 2, ammoSpreadComp.Count);
 
-                ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, gunUid, user);
+                ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, user);
                 shotProjectiles.Add(ammoEnt);
 
                 for (var i = 1; i < ammoSpreadComp.Count; i++)
                 {
                     var newuid = Spawn(ammoSpreadComp.Proto, fromEnt);
-                    ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
+                    ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, user);
                     shotProjectiles.Add(newuid);
                 }
             }
             else
             {
-                ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, gunUid, user);
+                ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, user);
                 shotProjectiles.Add(ammoEnt);
             }
 
-            MuzzleFlash(gunUid, ammoComp, mapDirection.ToAngle(), user);
-            Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+            MuzzleFlash(gun, ammoComp, mapDirection.ToAngle(), user);
+            Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user);
         }
     }
 
-    private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user)
+    private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, Entity<GunComponent> gun, EntityUid? user)
     {
-        if (gun.Target is { } target && !TerminatingOrDeleted(target))
+        if (gun.Comp.Target is { } target && !TerminatingOrDeleted(target))
         {
             var targeted = EnsureComp<TargetedProjectileComponent>(uid);
             targeted.Target = target;
@@ -218,11 +218,11 @@ public sealed partial class GunSystem : SharedGunSystem
         {
             RemoveShootable(uid);
             // TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack.
-            ThrowingSystem.TryThrow(uid, mapDirection, gun.ProjectileSpeedModified, user);
+            ThrowingSystem.TryThrow(uid, mapDirection, gun.Comp.ProjectileSpeedModified, user);
             return;
         }
 
-        ShootProjectile(uid, mapDirection, gunVelocity, gunUid, user, gun.ProjectileSpeedModified);
+        ShootProjectile(uid, mapDirection, gunVelocity, gun, user, gun.Comp.ProjectileSpeedModified);
     }
 
     /// <summary>
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 7fb13ff866..50ef5f413a 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -461,7 +461,7 @@ public abstract class SharedMagicSystem : EntitySystem
             return;
 
         if (TryComp<BasicEntityAmmoProviderComponent>(wand, out var basicAmmoComp) && basicAmmoComp.Count != null)
-            _gunSystem.UpdateBasicEntityAmmoCount(wand.Value, basicAmmoComp.Count.Value + ev.Charge, basicAmmoComp);
+            _gunSystem.UpdateBasicEntityAmmoCount((wand.Value, basicAmmoComp), basicAmmoComp.Count.Value + ev.Charge);
         else if (TryComp<LimitedChargesComponent>(wand, out var charges))
             _charges.AddCharges((wand.Value, charges), ev.Charge);
     }
diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
index cdcf1a7b31..094d115677 100644
--- a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
@@ -13,27 +13,27 @@ public sealed partial class ChamberMagazineAmmoProviderComponent : MagazineAmmoP
     /// <summary>
     /// If the gun has a bolt and whether that bolt is closed. Firing is impossible
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("boltClosed"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool? BoltClosed = false;
 
     /// <summary>
     /// Does the gun automatically open and close the bolt upon shooting.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("autoCycle"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool AutoCycle = true;
 
     /// <summary>
     /// Can the gun be racked, which opens and then instantly closes the bolt to cycle a round.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("canRack"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool CanRack = true;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundBoltClosed"), AutoNetworkedField]
+    [DataField("soundBoltClosed"), AutoNetworkedField]
     public SoundSpecifier? BoltClosedSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundBoltOpened"), AutoNetworkedField]
+    [DataField("soundBoltOpened"), AutoNetworkedField]
     public SoundSpecifier? BoltOpenedSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundRack"), AutoNetworkedField]
+    [DataField("soundRack"), AutoNetworkedField]
     public SoundSpecifier? RackSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Cock/ltrifle_cock.ogg");
 }
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 0cee13f662..b1515cc769 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -233,7 +233,7 @@ public sealed partial class GunComponent : Component
     /// When the gun is next available to be shot.
     /// Can be set multiple times in a single tick due to guns firing faster than a single tick time.
     /// </summary>
-    [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoNetworkedField]
     [AutoPausedField]
     public TimeSpan NextFire = TimeSpan.Zero;
diff --git a/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs
index 7f889f57f6..e18b3f3bb8 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
 /// This component modifies the spread of the gun it is attached to.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class GunSpreadModifierComponent: Component
+public sealed partial class GunSpreadModifierComponent : Component
 {
     /// <summary>
     /// A scalar value multiplied by the spread built into the ammo itself.
diff --git a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs
index 56d09ceaa5..2bb68ce071 100644
--- a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs
@@ -11,12 +11,12 @@ namespace Content.Shared.Weapons.Ranged;
 [Access(typeof(SharedGunSystem))]
 public partial class MagazineAmmoProviderComponent : AmmoProviderComponent
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundAutoEject")]
+    [DataField]
     public SoundSpecifier? SoundAutoEject = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg");
 
     /// <summary>
     /// Should the magazine automatically eject when empty.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("autoEject")]
+    [DataField]
     public bool AutoEject = false;
 }
diff --git a/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs
index 8cbe6f6487..aadaf1a1f4 100644
--- a/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Weapons.Ranged.Events;
 
 /// <summary>
-/// Raised on the client to request it would like to stop hooting.
+/// Raised on the client to request it would like to stop shooting.
 /// </summary>
 [Serializable, NetSerializable]
 public sealed class RequestStopShootEvent : EntityEventArgs
diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
index f3dfe8a2a0..b68d9d1d5d 100644
--- a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
@@ -28,14 +28,14 @@ public sealed class ActionGunSystem : EntitySystem
 
     private void OnShutdown(Entity<ActionGunComponent> ent, ref ComponentShutdown args)
     {
-        if (ent.Comp.Gun is {} gun)
+        if (ent.Comp.Gun is { } gun)
             QueueDel(gun);
     }
 
     private void OnShoot(Entity<ActionGunComponent> ent, ref ActionGunShootEvent args)
     {
         if (TryComp<GunComponent>(ent.Comp.Gun, out var gun))
-            _gun.AttemptShoot(ent, ent.Comp.Gun.Value, gun, args.Target);
+            _gun.AttemptShoot(ent, (ent.Comp.Gun.Value, gun), args.Target);
     }
 }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 59b4345f97..29ba5c5ee2 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Database;
 using Content.Shared.Examine;
@@ -6,18 +5,17 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
-using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
 public sealed class BatteryWeaponFireModesSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
 
     public override void Initialize()
     {
@@ -28,12 +26,12 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
         SubscribeLocalEvent<BatteryWeaponFireModesComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnExamined(EntityUid uid, BatteryWeaponFireModesComponent component, ExaminedEvent args)
+    private void OnExamined(Entity<BatteryWeaponFireModesComponent> ent, ref ExaminedEvent args)
     {
-        if (component.FireModes.Count < 2)
+        if (ent.Comp.FireModes.Count < 2)
             return;
 
-        var fireMode = GetMode(component);
+        var fireMode = GetMode(ent.Comp);
 
         if (!_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var proto))
             return;
@@ -73,7 +71,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
                 DoContactInteraction = true,
                 Act = () =>
                 {
-                    TrySetFireMode(uid, component, index, args.User);
+                    TrySetFireMode((uid, component), index, args.User);
                 }
             };
 
@@ -81,60 +79,60 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
         }
     }
 
-    private void OnUseInHandEvent(EntityUid uid, BatteryWeaponFireModesComponent component, UseInHandEvent args)
+    private void OnUseInHandEvent(Entity<BatteryWeaponFireModesComponent> ent, ref UseInHandEvent args)
     {
-        if(args.Handled)
+        if (args.Handled)
             return;
 
         args.Handled = true;
-        TryCycleFireMode(uid, component, args.User);
+        TryCycleFireMode(ent, args.User);
     }
 
-    public void TryCycleFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, EntityUid? user = null)
+    public void TryCycleFireMode(Entity<BatteryWeaponFireModesComponent> ent, EntityUid? user = null)
     {
-        if (component.FireModes.Count < 2)
+        if (ent.Comp.FireModes.Count < 2)
             return;
 
-        var index = (component.CurrentFireMode + 1) % component.FireModes.Count;
-        TrySetFireMode(uid, component, index, user);
+        var index = (ent.Comp.CurrentFireMode + 1) % ent.Comp.FireModes.Count;
+        TrySetFireMode(ent, index, user);
     }
 
-    public bool TrySetFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, int index, EntityUid? user = null)
+    public bool TrySetFireMode(Entity<BatteryWeaponFireModesComponent> ent, int index, EntityUid? user = null)
     {
-        if (index < 0 || index >= component.FireModes.Count)
+        if (index < 0 || index >= ent.Comp.FireModes.Count)
             return false;
 
-        if (user != null && !_accessReaderSystem.IsAllowed(user.Value, uid))
+        if (user != null && !_accessReaderSystem.IsAllowed(user.Value, ent))
             return false;
 
-        SetFireMode(uid, component, index, user);
+        SetFireMode(ent, index, user);
 
         return true;
     }
 
-    private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, int index, EntityUid? user = null)
+    private void SetFireMode(Entity<BatteryWeaponFireModesComponent> ent, int index, EntityUid? user = null)
     {
-        var fireMode = component.FireModes[index];
-        component.CurrentFireMode = index;
-        Dirty(uid, component);
+        var fireMode = ent.Comp.FireModes[index];
+        ent.Comp.CurrentFireMode = index;
+        Dirty(ent);
 
         if (_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var prototype))
         {
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-                _appearanceSystem.SetData(uid, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance);
+            if (TryComp<AppearanceComponent>(ent, out var appearance))
+                _appearanceSystem.SetData(ent, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance);
 
             if (user != null)
-                _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), uid, user.Value);
+                _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), ent, user.Value);
         }
 
-        if (TryComp(uid, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent))
+        if (TryComp(ent, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent))
         {
             batteryAmmoProviderComponent.Prototype = fireMode.Prototype;
             batteryAmmoProviderComponent.FireCost = fireMode.FireCost;
 
-            Dirty(uid, batteryAmmoProviderComponent);
+            Dirty(ent, batteryAmmoProviderComponent);
 
-            _gun.UpdateShots((uid, batteryAmmoProviderComponent));
+            _gun.UpdateShots((ent, batteryAmmoProviderComponent));
         }
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs b/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs
index 84d8dd2cf4..ec90384bf3 100644
--- a/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs
@@ -4,8 +4,7 @@ using Content.Shared.Weapons.Ranged.Events;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
-
-public sealed class GunSpreadModifierSystem: EntitySystem
+public sealed class GunSpreadModifierSystem : EntitySystem
 {
     public override void Initialize()
     {
@@ -14,14 +13,14 @@ public sealed class GunSpreadModifierSystem: EntitySystem
         SubscribeLocalEvent<GunSpreadModifierComponent, ExaminedEvent>(OnExamine);
     }
 
-    private void OnGunGetAmmoSpread(EntityUid uid, GunSpreadModifierComponent comp, ref GunGetAmmoSpreadEvent args)
+    private void OnGunGetAmmoSpread(Entity<GunSpreadModifierComponent> ent, ref GunGetAmmoSpreadEvent args)
     {
-        args.Spread *= comp.Spread;
+        args.Spread *= ent.Comp.Spread;
     }
 
-    private void OnExamine(EntityUid uid, GunSpreadModifierComponent comp, ExaminedEvent args)
+    private void OnExamine(Entity<GunSpreadModifierComponent> ent, ref ExaminedEvent args)
     {
-        var percentage = Math.Round(comp.Spread * 100);
+        var percentage = Math.Round(ent.Comp.Spread * 100);
         var loc = percentage < 100 ? "examine-gun-spread-modifier-reduction" : "examine-gun-spread-modifier-increase";
         percentage = percentage < 100 ? 100 - percentage : percentage - 100;
         var msg = Loc.GetString(loc, ("percentage", percentage));
diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
index 3316df0b96..5584c84bae 100644
--- a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
@@ -1,11 +1,8 @@
 using Content.Shared.Examine;
 using Content.Shared.Weapons.Ranged.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
@@ -13,9 +10,9 @@ public sealed class RechargeBasicEntityAmmoSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
-    [Dependency] private readonly MetaDataSystem _metadata = default!;
 
     public override void Initialize()
     {
@@ -38,7 +35,7 @@ public sealed class RechargeBasicEntityAmmoSystem : EntitySystem
             if (recharge.NextCharge > _timing.CurTime)
                 continue;
 
-            if (_gun.UpdateBasicEntityAmmoCount(uid, ammo.Count.Value + 1, ammo))
+            if (_gun.UpdateBasicEntityAmmoCount((uid, ammo), ammo.Count.Value + 1))
             {
                 // We don't predict this because occasionally on client it may not play.
                 // PlayPredicted will still be predicted on the client.
@@ -58,38 +55,38 @@ public sealed class RechargeBasicEntityAmmoSystem : EntitySystem
         }
     }
 
-    private void OnInit(EntityUid uid, RechargeBasicEntityAmmoComponent component, MapInitEvent args)
+    private void OnInit(Entity<RechargeBasicEntityAmmoComponent> ent, ref MapInitEvent args)
     {
-        component.NextCharge = _timing.CurTime;
-        Dirty(uid, component);
+        ent.Comp.NextCharge = _timing.CurTime;
+        Dirty(ent);
     }
 
-    private void OnExamined(EntityUid uid, RechargeBasicEntityAmmoComponent component, ExaminedEvent args)
+    private void OnExamined(Entity<RechargeBasicEntityAmmoComponent> ent, ref ExaminedEvent args)
     {
-        if (!component.ShowExamineText)
+        if (!ent.Comp.ShowExamineText)
             return;
 
-        if (!TryComp<BasicEntityAmmoProviderComponent>(uid, out var ammo)
+        if (!TryComp<BasicEntityAmmoProviderComponent>(ent, out var ammo)
             || ammo.Count == ammo.Capacity ||
-            component.NextCharge == null)
+            ent.Comp.NextCharge == null)
         {
             args.PushMarkup(Loc.GetString("recharge-basic-entity-ammo-full"));
             return;
         }
 
-        var timeLeft = component.NextCharge + _metadata.GetPauseTime(uid) - _timing.CurTime;
+        var timeLeft = ent.Comp.NextCharge + _metadata.GetPauseTime(ent) - _timing.CurTime;
         args.PushMarkup(Loc.GetString("recharge-basic-entity-ammo-can-recharge", ("seconds", Math.Round(timeLeft.Value.TotalSeconds, 1))));
     }
 
-    public void Reset(EntityUid uid, RechargeBasicEntityAmmoComponent? recharge = null)
+    public void Reset(Entity<RechargeBasicEntityAmmoComponent?> ent)
     {
-        if (!Resolve(uid, ref recharge, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        if (recharge.NextCharge == null || recharge.NextCharge < _timing.CurTime)
+        if (ent.Comp.NextCharge == null || ent.Comp.NextCharge < _timing.CurTime)
         {
-            recharge.NextCharge = _timing.CurTime + TimeSpan.FromSeconds(recharge.RechargeCooldown);
-            Dirty(uid, recharge);
+            ent.Comp.NextCharge = _timing.CurTime + TimeSpan.FromSeconds(ent.Comp.RechargeCooldown);
+            Dirty(ent);
         }
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
index ee5ca2174f..092d8e8d0f 100644
--- a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
@@ -16,19 +16,19 @@ public sealed class RechargeCycleAmmoSystem : EntitySystem
         SubscribeLocalEvent<RechargeCycleAmmoComponent, ActivateInWorldEvent>(OnRechargeCycled);
     }
 
-    private void OnRechargeCycled(EntityUid uid, RechargeCycleAmmoComponent component, ActivateInWorldEvent args)
+    private void OnRechargeCycled(Entity<RechargeCycleAmmoComponent> ent, ref ActivateInWorldEvent args)
     {
         if (!args.Complex)
             return;
 
-        if (!TryComp<BasicEntityAmmoProviderComponent>(uid, out var basic) || args.Handled)
+        if (!TryComp<BasicEntityAmmoProviderComponent>(ent, out var basic) || args.Handled)
             return;
 
         if (basic.Count >= basic.Capacity || basic.Count == null)
             return;
 
-        _gun.UpdateBasicEntityAmmoCount(uid, basic.Count.Value + 1, basic);
-        Dirty(uid, basic);
+        _gun.UpdateBasicEntityAmmoCount((ent, basic), basic.Count.Value + 1);
+        Dirty(ent, basic);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs
index 6aec5e9db3..2ca5a7502c 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs
@@ -24,24 +24,24 @@ public abstract class SharedFlyBySoundSystem : EntitySystem
         SubscribeLocalEvent<FlyBySoundComponent, ComponentShutdown>(OnShutdown);
     }
 
-    private void OnStartup(EntityUid uid, FlyBySoundComponent component, ComponentStartup args)
+    private void OnStartup(Entity<FlyBySoundComponent> ent, ref ComponentStartup args)
     {
-        if (!TryComp<PhysicsComponent>(uid, out var body))
+        if (!TryComp<PhysicsComponent>(ent, out var body))
             return;
 
-        var shape = new PhysShapeCircle(component.Range);
+        var shape = new PhysShapeCircle(ent.Comp.Range);
 
-        _fixtures.TryCreateFixture(uid, shape, FlyByFixture, collisionLayer: (int) CollisionGroup.MobMask, hard: false, body: body);
+        _fixtures.TryCreateFixture(ent, shape, FlyByFixture, collisionLayer: (int)CollisionGroup.MobMask, hard: false, body: body);
     }
 
-    private void OnShutdown(EntityUid uid, FlyBySoundComponent component, ComponentShutdown args)
+    private void OnShutdown(Entity<FlyBySoundComponent> ent, ref ComponentShutdown args)
     {
-        if (!TryComp<PhysicsComponent>(uid, out var body) ||
-            MetaData(uid).EntityLifeStage >= EntityLifeStage.Terminating)
+        if (!TryComp<PhysicsComponent>(ent, out var body) ||
+            MetaData(ent).EntityLifeStage >= EntityLifeStage.Terminating)
         {
             return;
         }
 
-        _fixtures.DestroyFixture(uid, FlyByFixture, body: body);
+        _fixtures.DestroyFixture(ent, FlyByFixture, body: body);
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs
index 4c19547a39..86f3e2a49d 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs
@@ -4,8 +4,8 @@ namespace Content.Shared.Weapons.Ranged.Systems;
 
 public partial class SharedGunSystem
 {
-    public void SetEnabled(EntityUid uid, AutoShootGunComponent component, bool status)
+    public void SetEnabled(Entity<AutoShootGunComponent> ent, bool status)
     {
-        component.Enabled = status;
+        ent.Comp.Enabled = status;
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 54b07debf9..954d86e717 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -36,26 +36,26 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<BallisticAmmoSelfRefillerComponent, EmpPulseEvent>(OnRefillerEmpPulsed);
     }
 
-    private void OnBallisticRefillerMapInit(Entity<BallisticAmmoSelfRefillerComponent> entity, ref MapInitEvent args)
+    private void OnBallisticRefillerMapInit(Entity<BallisticAmmoSelfRefillerComponent> entity, ref MapInitEvent _)
     {
         entity.Comp.NextAutoRefill = Timing.CurTime + entity.Comp.AutoRefillRate;
     }
 
-    private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent component, UseInHandEvent args)
+    private void OnBallisticUse(Entity<BallisticAmmoProviderComponent> ent, ref UseInHandEvent args)
     {
         if (args.Handled)
             return;
 
-        ManualCycle(uid, component, TransformSystem.GetMapCoordinates(uid), args.User);
+        ManualCycle(ent, TransformSystem.GetMapCoordinates(ent), args.User);
         args.Handled = true;
     }
 
-    private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderComponent component, InteractUsingEvent args)
+    private void OnBallisticInteractUsing(Entity<BallisticAmmoProviderComponent> ent, ref InteractUsingEvent args)
     {
         if (args.Handled)
             return;
 
-        if (TryBallisticInsert((uid, component), args.Used, args.User))
+        if (TryBallisticInsert(ent, args.Used, args.User))
             args.Handled = true;
     }
 
@@ -168,65 +168,65 @@ public abstract partial class SharedGunSystem
             {
                 Text = Loc.GetString("gun-ballistic-cycle"),
                 Disabled = GetBallisticShots(component) == 0,
-                Act = () => ManualCycle(uid, component, TransformSystem.GetMapCoordinates(uid), args.User),
+                Act = () => ManualCycle((uid, component), TransformSystem.GetMapCoordinates(uid), args.User),
             });
 
         }
     }
 
-    private void OnBallisticExamine(EntityUid uid, BallisticAmmoProviderComponent component, ExaminedEvent args)
+    private void OnBallisticExamine(Entity<BallisticAmmoProviderComponent> ent, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
             return;
 
-        args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", GetBallisticShots(component))));
+        args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", GetBallisticShots(ent.Comp))));
     }
 
-    private void ManualCycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates, EntityUid? user = null, GunComponent? gunComp = null)
+    private void ManualCycle(Entity<BallisticAmmoProviderComponent> ent, MapCoordinates coordinates, EntityUid? user = null, GunComponent? gunComp = null)
     {
-        if (!component.Cycleable)
+        if (!ent.Comp.Cycleable)
             return;
 
         // Reset shotting for cycling
-        if (Resolve(uid, ref gunComp, false) &&
+        if (Resolve(ent, ref gunComp, false) &&
             gunComp is { FireRateModified: > 0f } &&
-            !Paused(uid))
+            !Paused(ent))
         {
             gunComp.NextFire = Timing.CurTime + TimeSpan.FromSeconds(1 / gunComp.FireRateModified);
-            DirtyField(uid, gunComp, nameof(GunComponent.NextFire));
+            DirtyField(ent, gunComp, nameof(GunComponent.NextFire));
         }
 
-        Audio.PlayPredicted(component.SoundRack, uid, user);
+        Audio.PlayPredicted(ent.Comp.SoundRack, ent, user);
 
-        var shots = GetBallisticShots(component);
-        Cycle(uid, component, coordinates);
+        var shots = GetBallisticShots(ent.Comp);
+        Cycle(ent, coordinates);
 
         var text = Loc.GetString(shots == 0 ? "gun-ballistic-cycled-empty" : "gun-ballistic-cycled");
 
-        Popup(text, uid, user);
-        UpdateBallisticAppearance(uid, component);
-        UpdateAmmoCount(uid);
+        Popup(text, ent, user);
+        UpdateBallisticAppearance(ent);
+        UpdateAmmoCount(ent);
     }
 
-    protected abstract void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates);
+    protected abstract void Cycle(Entity<BallisticAmmoProviderComponent> ent, MapCoordinates coordinates);
 
-    private void OnBallisticInit(EntityUid uid, BallisticAmmoProviderComponent component, ComponentInit args)
+    private void OnBallisticInit(Entity<BallisticAmmoProviderComponent> ent, ref ComponentInit args)
     {
-        component.Container = Containers.EnsureContainer<Container>(uid, "ballistic-ammo");
+        ent.Comp.Container = Containers.EnsureContainer<Container>(ent, "ballistic-ammo");
         // TODO: This is called twice though we need to support loading appearance data (and we need to call it on MapInit
         // to ensure it's correct).
-        UpdateBallisticAppearance(uid, component);
+        UpdateBallisticAppearance(ent);
     }
 
-    private void OnBallisticMapInit(EntityUid uid, BallisticAmmoProviderComponent component, MapInitEvent args)
+    private void OnBallisticMapInit(Entity<BallisticAmmoProviderComponent> ent, ref MapInitEvent args)
     {
         // TODO this should be part of the prototype, not set on map init.
         // Alternatively, just track spawned count, instead of unspawned count.
-        if (component.Proto != null)
+        if (ent.Comp.Proto != null)
         {
-            component.UnspawnedCount = Math.Max(0, component.Capacity - component.Container.ContainedEntities.Count);
-            UpdateBallisticAppearance(uid, component);
-            DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount));
+            ent.Comp.UnspawnedCount = Math.Max(0, ent.Comp.Capacity - ent.Comp.Container.ContainedEntities.Count);
+            UpdateBallisticAppearance(ent);
+            DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.UnspawnedCount));
         }
     }
 
@@ -235,43 +235,43 @@ public abstract partial class SharedGunSystem
         return component.Entities.Count + component.UnspawnedCount;
     }
 
-    private void OnBallisticTakeAmmo(EntityUid uid, BallisticAmmoProviderComponent component, TakeAmmoEvent args)
+    private void OnBallisticTakeAmmo(Entity<BallisticAmmoProviderComponent> ent, ref TakeAmmoEvent args)
     {
         for (var i = 0; i < args.Shots; i++)
         {
             EntityUid? ammoEntity = null;
-            if (component.Entities.Count > 0)
+            if (ent.Comp.Entities.Count > 0)
             {
-                var existingEnt = component.Entities[^1];
-                component.Entities.RemoveAt(component.Entities.Count - 1);
-                DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities));
-                Containers.Remove(existingEnt, component.Container);
+                var existingEnt = ent.Comp.Entities[^1];
+                ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1);
+                DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
+                Containers.Remove(existingEnt, ent.Comp.Container);
                 ammoEntity = existingEnt;
             }
-            else if (component.UnspawnedCount > 0)
+            else if (ent.Comp.UnspawnedCount > 0)
             {
-                component.UnspawnedCount--;
-                DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount));
-                ammoEntity = Spawn(component.Proto, args.Coordinates);
+                ent.Comp.UnspawnedCount--;
+                DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.UnspawnedCount));
+                ammoEntity = Spawn(ent.Comp.Proto, args.Coordinates);
             }
 
-            if (ammoEntity is { } ent)
+            if (ammoEntity is not { } ammoEnt)
+                continue;
+
+            args.Ammo.Add((ammoEnt, EnsureShootable(ammoEnt)));
+            if (TryComp<BallisticAmmoSelfRefillerComponent>(ent, out var refiller))
             {
-                args.Ammo.Add((ent, EnsureShootable(ent)));
-                if (TryComp<BallisticAmmoSelfRefillerComponent>(uid, out var refiller))
-                {
-                    PauseSelfRefill((uid, refiller));
-                }
+                PauseSelfRefill((ent, refiller));
             }
         }
 
-        UpdateBallisticAppearance(uid, component);
+        UpdateBallisticAppearance(ent);
     }
 
-    private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent component, ref GetAmmoCountEvent args)
+    private void OnBallisticAmmoCount(Entity<BallisticAmmoProviderComponent> ent, ref GetAmmoCountEvent args)
     {
-        args.Count = GetBallisticShots(component);
-        args.Capacity = component.Capacity;
+        args.Count = GetBallisticShots(ent.Comp);
+        args.Capacity = ent.Comp.Capacity;
     }
 
     /// <summary>
@@ -334,20 +334,20 @@ public abstract partial class SharedGunSystem
             Audio.PlayPredicted(entity.Comp.SoundInsert, entity, user);
         }
 
-        UpdateBallisticAppearance(entity, entity.Comp);
+        UpdateBallisticAppearance(entity);
         UpdateAmmoCount(entity);
         DirtyField(entity.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
 
         return true;
     }
 
-    public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
+    public void UpdateBallisticAppearance(Entity<BallisticAmmoProviderComponent> ent)
     {
-        if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
+        if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(ent, out var appearance))
             return;
 
-        Appearance.SetData(uid, AmmoVisuals.AmmoCount, GetBallisticShots(component), appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoCount, GetBallisticShots(ent.Comp), appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.Capacity, appearance);
     }
 
     public void SetBallisticUnspawned(Entity<BallisticAmmoProviderComponent> entity, int count)
@@ -356,7 +356,7 @@ public abstract partial class SharedGunSystem
             return;
 
         entity.Comp.UnspawnedCount = count;
-        UpdateBallisticAppearance(entity.Owner, entity.Comp);
+        UpdateBallisticAppearance(entity);
         UpdateAmmoCount(entity.Owner);
         Dirty(entity);
     }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
index 04f9b52324..49630dcd82 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
-using Robust.Shared.GameStates;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
@@ -13,75 +12,70 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<BasicEntityAmmoProviderComponent, GetAmmoCountEvent>(OnBasicEntityAmmoCount);
     }
 
-    private void OnBasicEntityMapInit(EntityUid uid, BasicEntityAmmoProviderComponent component, MapInitEvent args)
+    private void OnBasicEntityMapInit(Entity<BasicEntityAmmoProviderComponent> ent, ref MapInitEvent args)
     {
-        if (component.Count is null)
+        if (ent.Comp.Count is null)
         {
-            component.Count = component.Capacity;
-            Dirty(uid, component);
+            ent.Comp.Count = ent.Comp.Capacity;
+            Dirty(ent);
         }
 
-        UpdateBasicEntityAppearance(uid, component);
+        UpdateBasicEntityAppearance(ent);
     }
 
-    private void OnBasicEntityTakeAmmo(EntityUid uid, BasicEntityAmmoProviderComponent component, TakeAmmoEvent args)
+    private void OnBasicEntityTakeAmmo(Entity<BasicEntityAmmoProviderComponent> ent, ref TakeAmmoEvent args)
     {
         for (var i = 0; i < args.Shots; i++)
         {
-            if (component.Count <= 0)
+            if (ent.Comp.Count <= 0)
                 return;
 
-            if (component.Count != null)
-            {
-                component.Count--;
-            }
+            if (ent.Comp.Count != null)
+                ent.Comp.Count--;
 
-            var ent = Spawn(component.Proto, args.Coordinates);
-            args.Ammo.Add((ent, EnsureShootable(ent)));
+            var ammoEnt = Spawn(ent.Comp.Proto, args.Coordinates);
+            args.Ammo.Add((ammoEnt, EnsureShootable(ammoEnt)));
         }
 
-        _recharge.Reset(uid);
-        UpdateBasicEntityAppearance(uid, component);
-        Dirty(uid, component);
+        _recharge.Reset(ent.Owner);
+        UpdateBasicEntityAppearance(ent);
+        Dirty(ent);
     }
 
-    private void OnBasicEntityAmmoCount(EntityUid uid, BasicEntityAmmoProviderComponent component, ref GetAmmoCountEvent args)
+    private void OnBasicEntityAmmoCount(Entity<BasicEntityAmmoProviderComponent> ent, ref GetAmmoCountEvent args)
     {
-        args.Capacity = component.Capacity ?? int.MaxValue;
-        args.Count = component.Count ?? int.MaxValue;
+        args.Capacity = ent.Comp.Capacity ?? int.MaxValue;
+        args.Count = ent.Comp.Count ?? int.MaxValue;
     }
 
-    private void UpdateBasicEntityAppearance(EntityUid uid, BasicEntityAmmoProviderComponent component)
+    private void UpdateBasicEntityAppearance(Entity<BasicEntityAmmoProviderComponent> ent)
     {
-        if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
+        if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(ent, out var appearance))
             return;
 
-        Appearance.SetData(uid, AmmoVisuals.HasAmmo, component.Count != 0, appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoCount, component.Count ?? int.MaxValue, appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity ?? int.MaxValue, appearance);
+        Appearance.SetData(ent, AmmoVisuals.HasAmmo, ent.Comp.Count != 0, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoCount, ent.Comp.Count ?? int.MaxValue, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.Capacity ?? int.MaxValue, appearance);
     }
 
     #region Public API
-    public bool ChangeBasicEntityAmmoCount(EntityUid uid, int delta, BasicEntityAmmoProviderComponent? component = null)
+    public bool ChangeBasicEntityAmmoCount(Entity<BasicEntityAmmoProviderComponent?> ent, int delta)
     {
-        if (!Resolve(uid, ref component, false) || component.Count == null)
+        if (!Resolve(ent, ref ent.Comp, false) || ent.Comp.Count == null)
             return false;
 
-        return UpdateBasicEntityAmmoCount(uid, component.Count.Value + delta, component);
+        return UpdateBasicEntityAmmoCount((ent.Owner, ent.Comp), ent.Comp.Count.Value + delta);
     }
 
-    public bool UpdateBasicEntityAmmoCount(EntityUid uid, int count, BasicEntityAmmoProviderComponent? component = null)
+    public bool UpdateBasicEntityAmmoCount(Entity<BasicEntityAmmoProviderComponent?> ent, int count)
     {
-        if (!Resolve(uid, ref component, false))
+        if (!Resolve(ent, ref ent.Comp, false) || count > ent.Comp.Capacity)
             return false;
 
-        if (count > component.Capacity)
-            return false;
-
-        component.Count = count;
-        UpdateBasicEntityAppearance(uid, component);
-        UpdateAmmoCount(uid);
-        Dirty(uid, component);
+        ent.Comp.Count = count;
+        UpdateBasicEntityAppearance((ent.Owner, ent.Comp));
+        UpdateAmmoCount(ent);
+        Dirty(ent);
 
         return true;
     }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
index dcc9a5689a..77f1e3c103 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
@@ -26,9 +26,9 @@ public abstract partial class SharedGunSystem
             : Loc.GetString("gun-cartridge-unspent"));
     }
 
-    private void OnCartridgeDamageExamine(EntityUid uid, CartridgeAmmoComponent component, ref DamageExamineEvent args)
+    private void OnCartridgeDamageExamine(Entity<CartridgeAmmoComponent> ent, ref DamageExamineEvent args)
     {
-        var damageSpec = GetProjectileDamage(component.Prototype);
+        var damageSpec = GetProjectileDamage(ent.Comp.Prototype);
 
         if (damageSpec == null)
             return;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index 4de9196761..9f4cc9d6aa 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -12,8 +12,6 @@ namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem
 {
-    protected const string ChamberSlot = "gun_chamber";
-
     protected virtual void InitializeChamberMagazine()
     {
         SubscribeLocalEvent<ChamberMagazineAmmoProviderComponent, ComponentStartup>(OnChamberStartup);
@@ -42,7 +40,7 @@ public abstract partial class SharedGunSystem
         // Appearance data doesn't get serialized and want to make sure this is correct on spawn (regardless of MapInit) so.
         if (component.BoltClosed != null)
         {
-           Appearance.SetData(uid, AmmoVisuals.BoltClosed, component.BoltClosed.Value);
+            Appearance.SetData(uid, AmmoVisuals.BoltClosed, component.BoltClosed.Value);
         }
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
index 12bbe0c312..afa905e078 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
@@ -16,7 +16,7 @@ public partial class SharedGunSystem
     {
         var getConnectedContainerEvent = new GetConnectedContainerEvent();
         RaiseLocalEvent(uid, ref getConnectedContainerEvent);
-        if(!getConnectedContainerEvent.ContainerEntity.HasValue)
+        if (!getConnectedContainerEvent.ContainerEntity.HasValue)
             return;
 
         RaiseLocalEvent(getConnectedContainerEvent.ContainerEntity.Value, args);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs
index 27104c9d93..4947909e70 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs
@@ -14,10 +14,10 @@ public partial class SharedGunSystem
         SubscribeLocalEvent<ContainerAmmoProviderComponent, GetAmmoCountEvent>(OnContainerAmmoCount);
     }
 
-    private void OnContainerTakeAmmo(EntityUid uid, ContainerAmmoProviderComponent component, TakeAmmoEvent args)
+    private void OnContainerTakeAmmo(Entity<ContainerAmmoProviderComponent> ent, ref TakeAmmoEvent args)
     {
-        component.ProviderUid ??= uid;
-        if (!Containers.TryGetContainer(component.ProviderUid.Value, component.Container, out var container))
+        ent.Comp.ProviderUid ??= ent;
+        if (!Containers.TryGetContainer(ent.Comp.ProviderUid.Value, ent.Comp.Container, out var container))
             return;
 
         for (var i = 0; i < args.Shots; i++)
@@ -25,19 +25,19 @@ public partial class SharedGunSystem
             if (!container.ContainedEntities.Any())
                 break;
 
-            var ent = container.ContainedEntities[0];
+            var ammoEnt = container.ContainedEntities[0];
 
             if (_netManager.IsServer)
-                Containers.Remove(ent, container);
+                Containers.Remove(ammoEnt, container);
 
-            args.Ammo.Add((ent, EnsureShootable(ent)));
+            args.Ammo.Add((ammoEnt, EnsureShootable(ammoEnt)));
         }
     }
 
-    private void OnContainerAmmoCount(EntityUid uid, ContainerAmmoProviderComponent component, ref GetAmmoCountEvent args)
+    private void OnContainerAmmoCount(Entity<ContainerAmmoProviderComponent> ent, ref GetAmmoCountEvent args)
     {
-        component.ProviderUid ??= uid;
-        if (!Containers.TryGetContainer(component.ProviderUid.Value, component.Container, out var container))
+        ent.Comp.ProviderUid ??= ent;
+        if (!Containers.TryGetContainer(ent.Comp.ProviderUid.Value, ent.Comp.Container, out var container))
         {
             args.Capacity = 0;
             args.Count = 0;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
index 2fece720f9..ff91587775 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
@@ -66,7 +66,7 @@ public abstract partial class SharedGunSystem
         if (component.SelectedMode == fire)
             return;
 
-        DebugTools.Assert((component.AvailableModes  & fire) != 0x0);
+        DebugTools.Assert((component.AvailableModes & fire) != 0x0);
         component.SelectedMode = fire;
 
         if (!Paused(uid))
@@ -113,7 +113,7 @@ public abstract partial class SharedGunSystem
     private void OnGunSelected(EntityUid uid, GunComponent component, HandSelectedEvent args)
     {
         if (Timing.ApplyingState)
-             return;
+            return;
 
         if (component.FireRateModified <= 0)
             return;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
index 2876851d2d..d384b34c5b 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
@@ -8,8 +8,6 @@ namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem
 {
-    protected const string MagazineSlot = "gun_magazine";
-
     protected virtual void InitializeMagazine()
     {
         SubscribeLocalEvent<MagazineAmmoProviderComponent, MapInitEvent>(OnMagazineMapInit);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index 29664c6eea..e684d9aad1 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -31,82 +31,82 @@ public partial class SharedGunSystem
         SubscribeLocalEvent<RevolverAmmoProviderComponent, UseInHandEvent>(OnRevolverUse);
     }
 
-    private void OnRevolverUse(EntityUid uid, RevolverAmmoProviderComponent component, UseInHandEvent args)
+    private void OnRevolverUse(Entity<RevolverAmmoProviderComponent> ent, ref UseInHandEvent args)
     {
         if (args.Handled)
             return;
 
-        if (!_useDelay.TryResetDelay(uid))
+        if (!_useDelay.TryResetDelay(ent))
             return;
 
         args.Handled = true;
 
-        Cycle(component);
-        UpdateAmmoCount(uid, prediction: false);
-        Dirty(uid, component);
+        Cycle(ent.Comp);
+        UpdateAmmoCount(ent, prediction: false);
+        Dirty(ent);
     }
 
-    private void OnRevolverGetAmmoCount(EntityUid uid, RevolverAmmoProviderComponent component, ref GetAmmoCountEvent args)
+    private void OnRevolverGetAmmoCount(Entity<RevolverAmmoProviderComponent> ent, ref GetAmmoCountEvent args)
     {
-        args.Count += GetRevolverCount(component);
-        args.Capacity += component.Capacity;
+        args.Count += GetRevolverCount(ent.Comp);
+        args.Capacity += ent.Comp.Capacity;
     }
 
-    private void OnRevolverInteractUsing(EntityUid uid, RevolverAmmoProviderComponent component, InteractUsingEvent args)
+    private void OnRevolverInteractUsing(Entity<RevolverAmmoProviderComponent> ent, ref InteractUsingEvent args)
     {
         if (args.Handled)
             return;
 
-        if (TryRevolverInsert(uid, component, args.Used, args.User))
+        if (TryRevolverInsert(ent, args.Used, args.User))
             args.Handled = true;
     }
 
-    private void OnRevolverGetState(EntityUid uid, RevolverAmmoProviderComponent component, ref ComponentGetState args)
+    private void OnRevolverGetState(Entity<RevolverAmmoProviderComponent> ent, ref ComponentGetState args)
     {
         args.State = new RevolverAmmoProviderComponentState
         {
-            CurrentIndex = component.CurrentIndex,
-            AmmoSlots = GetNetEntityList(component.AmmoSlots),
-            Chambers = component.Chambers,
+            CurrentIndex = ent.Comp.CurrentIndex,
+            AmmoSlots = GetNetEntityList(ent.Comp.AmmoSlots),
+            Chambers = ent.Comp.Chambers,
         };
     }
 
-    private void OnRevolverHandleState(EntityUid uid, RevolverAmmoProviderComponent component, ref ComponentHandleState args)
+    private void OnRevolverHandleState(Entity<RevolverAmmoProviderComponent> ent, ref ComponentHandleState args)
     {
         if (args.Current is not RevolverAmmoProviderComponentState state)
             return;
 
-        var oldIndex = component.CurrentIndex;
-        component.CurrentIndex = state.CurrentIndex;
-        component.Chambers = new bool?[state.Chambers.Length];
+        var oldIndex = ent.Comp.CurrentIndex;
+        ent.Comp.CurrentIndex = state.CurrentIndex;
+        ent.Comp.Chambers = new bool?[state.Chambers.Length];
 
         // Need to copy across the state rather than the ref.
-        for (var i = 0; i < component.AmmoSlots.Count; i++)
+        for (var i = 0; i < ent.Comp.AmmoSlots.Count; i++)
         {
-            component.AmmoSlots[i] = EnsureEntity<RevolverAmmoProviderComponent>(state.AmmoSlots[i], uid);
-            component.Chambers[i] = state.Chambers[i];
+            ent.Comp.AmmoSlots[i] = EnsureEntity<RevolverAmmoProviderComponent>(state.AmmoSlots[i], ent);
+            ent.Comp.Chambers[i] = state.Chambers[i];
         }
 
         // Handle spins
         if (oldIndex != state.CurrentIndex)
         {
-            UpdateAmmoCount(uid, prediction: false);
+            UpdateAmmoCount(ent, prediction: false);
         }
     }
 
-    public bool TryRevolverInsert(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid uid, EntityUid? user)
+    public bool TryRevolverInsert(Entity<RevolverAmmoProviderComponent> ent, EntityUid insertEnt, EntityUid? user)
     {
-        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, uid))
+        if (_whitelistSystem.IsWhitelistFail(ent.Comp.Whitelist, insertEnt))
             return false;
 
         // If it's a speedloader try to get ammo from it.
-        if (HasComp<SpeedLoaderComponent>(uid))
+        if (HasComp<SpeedLoaderComponent>(insertEnt))
         {
             var freeSlots = 0;
 
-            for (var i = 0; i < component.Capacity; i++)
+            for (var i = 0; i < ent.Comp.Capacity; i++)
             {
-                if (component.AmmoSlots[i] != null || component.Chambers[i] != null)
+                if (ent.Comp.AmmoSlots[i] != null || ent.Comp.Chambers[i] != null)
                     continue;
 
                 freeSlots++;
@@ -114,94 +114,94 @@ public partial class SharedGunSystem
 
             if (freeSlots == 0)
             {
-                Popup(Loc.GetString("gun-revolver-full"), revolverUid, user);
+                Popup(Loc.GetString("gun-revolver-full"), ent, user);
                 return false;
             }
 
             var xformQuery = GetEntityQuery<TransformComponent>();
-            var xform = xformQuery.GetComponent(uid);
+            var xform = xformQuery.GetComponent(insertEnt);
             var ammo = new List<(EntityUid? Entity, IShootable Shootable)>(freeSlots);
             var ev = new TakeAmmoEvent(freeSlots, ammo, xform.Coordinates, user);
-            RaiseLocalEvent(uid, ev);
+            RaiseLocalEvent(insertEnt, ev);
 
             if (ev.Ammo.Count == 0)
             {
-                Popup(Loc.GetString("gun-speedloader-empty"), revolverUid, user);
+                Popup(Loc.GetString("gun-speedloader-empty"), ent, user);
                 return false;
             }
 
-            for (var i = 0; i < component.Capacity; i++)
+            for (var i = 0; i < ent.Comp.Capacity; i++)
             {
-                var index = (component.CurrentIndex + i) % component.Capacity;
+                var index = (ent.Comp.CurrentIndex + i) % ent.Comp.Capacity;
 
-                if (component.AmmoSlots[index] != null ||
-                    component.Chambers[index] != null)
+                if (ent.Comp.AmmoSlots[index] != null ||
+                    ent.Comp.Chambers[index] != null)
                 {
                     continue;
                 }
 
-                var ent = ev.Ammo.Last().Entity;
+                var ammoEnt = ev.Ammo.Last().Entity;
                 ev.Ammo.RemoveAt(ev.Ammo.Count - 1);
 
-                if (ent == null)
+                if (ammoEnt == null)
                 {
                     Log.Error($"Tried to load hitscan into a revolver which is unsupported");
                     continue;
                 }
 
-                component.AmmoSlots[index] = ent.Value;
-                Containers.Insert(ent.Value, component.AmmoContainer);
-                SetChamber(index, component, uid);
+                ent.Comp.AmmoSlots[index] = ammoEnt.Value;
+                Containers.Insert(ammoEnt.Value, ent.Comp.AmmoContainer);
+                SetChamber(ent, insertEnt, index);
 
                 if (ev.Ammo.Count == 0)
                     break;
             }
 
             DebugTools.Assert(ammo.Count == 0);
-            UpdateRevolverAppearance(revolverUid, component);
-            UpdateAmmoCount(revolverUid);
-            Dirty(revolverUid, component);
+            UpdateRevolverAppearance(ent);
+            UpdateAmmoCount(ent);
+            Dirty(ent);
 
-            Audio.PlayPredicted(component.SoundInsert, revolverUid, user);
-            Popup(Loc.GetString("gun-revolver-insert"), revolverUid, user);
+            Audio.PlayPredicted(ent.Comp.SoundInsert, ent, user);
+            Popup(Loc.GetString("gun-revolver-insert"), ent, user);
             return true;
         }
 
         // Try to insert the entity directly.
-        for (var i = 0; i < component.Capacity; i++)
+        for (var i = 0; i < ent.Comp.Capacity; i++)
         {
-            var index = (component.CurrentIndex + i) % component.Capacity;
+            var index = (ent.Comp.CurrentIndex + i) % ent.Comp.Capacity;
 
-            if (component.AmmoSlots[index] != null ||
-                component.Chambers[index] != null)
+            if (ent.Comp.AmmoSlots[index] != null ||
+                ent.Comp.Chambers[index] != null)
             {
                 continue;
             }
 
-            component.AmmoSlots[index] = uid;
-            Containers.Insert(uid, component.AmmoContainer);
-            SetChamber(index, component, uid);
-            Audio.PlayPredicted(component.SoundInsert, revolverUid, user);
-            Popup(Loc.GetString("gun-revolver-insert"), revolverUid, user);
-            UpdateRevolverAppearance(revolverUid, component);
-            UpdateAmmoCount(revolverUid);
-            Dirty(revolverUid, component);
+            ent.Comp.AmmoSlots[index] = insertEnt;
+            Containers.Insert(insertEnt, ent.Comp.AmmoContainer);
+            SetChamber(ent, insertEnt, index);
+            Audio.PlayPredicted(ent.Comp.SoundInsert, ent, user);
+            Popup(Loc.GetString("gun-revolver-insert"), ent, user);
+            UpdateRevolverAppearance(ent);
+            UpdateAmmoCount(ent);
+            Dirty(ent);
             return true;
         }
 
-        Popup(Loc.GetString("gun-revolver-full"), revolverUid, user);
+        Popup(Loc.GetString("gun-revolver-full"), ent, user);
         return false;
     }
 
-    private void SetChamber(int index, RevolverAmmoProviderComponent component, EntityUid uid)
+    private void SetChamber(Entity<RevolverAmmoProviderComponent> ent, Entity<CartridgeAmmoComponent?> ammo, int index)
     {
-        if (TryComp<CartridgeAmmoComponent>(uid, out var cartridge) && cartridge.Spent)
+        if (!Resolve(ammo, ref ammo.Comp, false) || ammo.Comp.Spent)
         {
-            component.Chambers[index] = false;
+            ent.Comp.Chambers[index] = false;
             return;
         }
 
-        component.Chambers[index] = true;
+        ent.Comp.Chambers[index] = true;
     }
 
     private void OnRevolverVerbs(EntityUid uid, RevolverAmmoProviderComponent component, GetVerbsEvent<AlternativeVerb> args)
@@ -213,7 +213,7 @@ public partial class SharedGunSystem
         {
             Text = Loc.GetString("gun-revolver-empty"),
             Disabled = !AnyRevolverCartridges(component),
-            Act = () => EmptyRevolver(uid, component, args.User),
+            Act = () => EmptyRevolver((uid, component), args.User),
             Priority = 1
         });
 
@@ -221,7 +221,7 @@ public partial class SharedGunSystem
         {
             Text = Loc.GetString("gun-revolver-spin"),
             // Category = VerbCategory.G,
-            Act = () => SpinRevolver(uid, component, args.User)
+            Act = () => SpinRevolver((uid, component), args.User)
         });
     }
 
@@ -281,15 +281,15 @@ public partial class SharedGunSystem
         return count;
     }
 
-    public void EmptyRevolver(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid? user = null)
+    public void EmptyRevolver(Entity<RevolverAmmoProviderComponent> ent, EntityUid? user = null)
     {
-        var mapCoordinates = TransformSystem.GetMapCoordinates(revolverUid);
+        var mapCoordinates = TransformSystem.GetMapCoordinates(ent);
         var anyEmpty = false;
 
-        for (var i = 0; i < component.Capacity; i++)
+        for (var i = 0; i < ent.Comp.Capacity; i++)
         {
-            var chamber = component.Chambers[i];
-            var slot = component.AmmoSlots[i];
+            var chamber = ent.Comp.Chambers[i];
+            var slot = ent.Comp.AmmoSlots[i];
 
             if (slot == null)
             {
@@ -299,22 +299,22 @@ public partial class SharedGunSystem
                 // Too lazy to make a new method don't sue me.
                 if (!_netManager.IsClient)
                 {
-                    var uid = Spawn(component.FillPrototype, mapCoordinates);
+                    var uid = Spawn(ent.Comp.FillPrototype, mapCoordinates);
 
                     if (TryComp<CartridgeAmmoComponent>(uid, out var cartridge))
-                        SetCartridgeSpent(uid, cartridge, !(bool) chamber);
+                        SetCartridgeSpent(uid, cartridge, !(bool)chamber);
 
                     EjectCartridge(uid);
                 }
 
-                component.Chambers[i] = null;
+                ent.Comp.Chambers[i] = null;
                 anyEmpty = true;
             }
             else
             {
-                component.AmmoSlots[i] = null;
-                Containers.Remove(slot.Value, component.AmmoContainer);
-                component.Chambers[i] = null;
+                ent.Comp.AmmoSlots[i] = null;
+                Containers.Remove(slot.Value, ent.Comp.AmmoContainer);
+                ent.Comp.Chambers[i] = null;
 
                 if (!_netManager.IsClient)
                     EjectCartridge(slot.Value);
@@ -325,47 +325,47 @@ public partial class SharedGunSystem
 
         if (anyEmpty)
         {
-            Audio.PlayPredicted(component.SoundEject, revolverUid, user);
-            UpdateAmmoCount(revolverUid, prediction: false);
-            UpdateRevolverAppearance(revolverUid, component);
-            Dirty(revolverUid, component);
+            Audio.PlayPredicted(ent.Comp.SoundEject, ent, user);
+            UpdateAmmoCount(ent, prediction: false);
+            UpdateRevolverAppearance(ent);
+            Dirty(ent);
         }
     }
 
-    private void UpdateRevolverAppearance(EntityUid uid, RevolverAmmoProviderComponent component)
+    private void UpdateRevolverAppearance(Entity<RevolverAmmoProviderComponent> ent)
     {
-        if (!TryComp<AppearanceComponent>(uid, out var appearance))
+        if (!TryComp<AppearanceComponent>(ent, out var appearance))
             return;
 
-        var count = GetRevolverCount(component);
-        Appearance.SetData(uid, AmmoVisuals.HasAmmo, count != 0, appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoCount, count, appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance);
+        var count = GetRevolverCount(ent.Comp);
+        Appearance.SetData(ent, AmmoVisuals.HasAmmo, count != 0, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoCount, count, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.Capacity, appearance);
     }
 
-    protected virtual void SpinRevolver(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid? user = null)
+    protected virtual void SpinRevolver(Entity<RevolverAmmoProviderComponent> ent, EntityUid? user = null)
     {
-        Audio.PlayPredicted(component.SoundSpin, revolverUid, user);
-        Popup(Loc.GetString("gun-revolver-spun"), revolverUid, user);
+        Audio.PlayPredicted(ent.Comp.SoundSpin, ent, user);
+        Popup(Loc.GetString("gun-revolver-spun"), ent, user);
     }
 
-    private void OnRevolverTakeAmmo(EntityUid uid, RevolverAmmoProviderComponent component, TakeAmmoEvent args)
+    private void OnRevolverTakeAmmo(Entity<RevolverAmmoProviderComponent> ent, ref TakeAmmoEvent args)
     {
-        var currentIndex = component.CurrentIndex;
-        Cycle(component, args.Shots);
+        var currentIndex = ent.Comp.CurrentIndex;
+        Cycle(ent.Comp, args.Shots);
 
         // Revolvers provide the bullets themselves rather than the cartridges so they stay in the revolver.
         for (var i = 0; i < args.Shots; i++)
         {
-            var index = (currentIndex + i) % component.Capacity;
-            var chamber = component.Chambers[index];
-            EntityUid? ent = null;
+            var index = (currentIndex + i) % ent.Comp.Capacity;
+            var chamber = ent.Comp.Chambers[index];
+            EntityUid? ammoEnt = null;
 
             // Get contained entity if it exists.
-            if (component.AmmoSlots[index] != null)
+            if (ent.Comp.AmmoSlots[index] != null)
             {
-                ent = component.AmmoSlots[index]!;
-                component.Chambers[index] = false;
+                ammoEnt = ent.Comp.AmmoSlots[index]!;
+                ent.Comp.Chambers[index] = false;
             }
             // Try to spawn a round if it's available.
             else if (chamber != null)
@@ -373,55 +373,55 @@ public partial class SharedGunSystem
                 if (chamber == true)
                 {
                     // Pretend it's always been there.
-                    ent = Spawn(component.FillPrototype, args.Coordinates);
+                    ammoEnt = Spawn(ent.Comp.FillPrototype, args.Coordinates);
 
                     if (!_netManager.IsClient)
                     {
-                        component.AmmoSlots[index] = ent;
-                        Containers.Insert(ent.Value, component.AmmoContainer);
+                        ent.Comp.AmmoSlots[index] = ammoEnt;
+                        Containers.Insert(ammoEnt.Value, ent.Comp.AmmoContainer);
                     }
 
-                    component.Chambers[index] = false;
+                    ent.Comp.Chambers[index] = false;
                 }
             }
 
             // Chamber empty or spent
-            if (ent == null)
+            if (ammoEnt == null)
                 continue;
 
-            if (TryComp<CartridgeAmmoComponent>(ent, out var cartridge))
+            if (TryComp<CartridgeAmmoComponent>(ammoEnt, out var cartridge))
             {
                 if (cartridge.Spent)
                     continue;
 
                 // Mark cartridge as spent and if it's caseless delete from the chamber slot.
-                SetCartridgeSpent(ent.Value, cartridge, true);
+                SetCartridgeSpent(ammoEnt.Value, cartridge, true);
                 var spawned = Spawn(cartridge.Prototype, args.Coordinates);
                 args.Ammo.Add((spawned, EnsureComp<AmmoComponent>(spawned)));
 
                 if (cartridge.DeleteOnSpawn)
                 {
-                    component.AmmoSlots[index] = null;
-                    component.Chambers[index] = null;
+                    ent.Comp.AmmoSlots[index] = null;
+                    ent.Comp.Chambers[index] = null;
                 }
             }
             else
             {
-                component.AmmoSlots[index] = null;
-                component.Chambers[index] = null;
-                args.Ammo.Add((ent.Value, EnsureComp<AmmoComponent>(ent.Value)));
+                ent.Comp.AmmoSlots[index] = null;
+                ent.Comp.Chambers[index] = null;
+                args.Ammo.Add((ammoEnt.Value, EnsureComp<AmmoComponent>(ammoEnt.Value)));
             }
 
             // Delete the cartridge entity on client
             if (_netManager.IsClient)
             {
-                QueueDel(ent);
+                QueueDel(ammoEnt);
             }
         }
 
-        UpdateAmmoCount(uid, prediction: false);
-        UpdateRevolverAppearance(uid, component);
-        Dirty(uid, component);
+        UpdateAmmoCount(ent, prediction: false);
+        UpdateRevolverAppearance(ent);
+        Dirty(ent);
     }
 
     private void Cycle(RevolverAmmoProviderComponent component, int count = 1)
@@ -429,34 +429,34 @@ public partial class SharedGunSystem
         component.CurrentIndex = (component.CurrentIndex + count) % component.Capacity;
     }
 
-    private void OnRevolverInit(EntityUid uid, RevolverAmmoProviderComponent component, ComponentInit args)
+    private void OnRevolverInit(Entity<RevolverAmmoProviderComponent> ent, ref ComponentInit args)
     {
-        component.AmmoContainer = Containers.EnsureContainer<Container>(uid, RevolverContainer);
-        component.AmmoSlots.EnsureCapacity(component.Capacity);
-        var remainder = component.Capacity - component.AmmoSlots.Count;
+        ent.Comp.AmmoContainer = Containers.EnsureContainer<Container>(ent, RevolverContainer);
+        ent.Comp.AmmoSlots.EnsureCapacity(ent.Comp.Capacity);
+        var remainder = ent.Comp.Capacity - ent.Comp.AmmoSlots.Count;
 
         for (var i = 0; i < remainder; i++)
         {
-            component.AmmoSlots.Add(null);
+            ent.Comp.AmmoSlots.Add(null);
         }
 
-        component.Chambers = new bool?[component.Capacity];
+        ent.Comp.Chambers = new bool?[ent.Comp.Capacity];
 
-        if (component.FillPrototype != null)
+        if (ent.Comp.FillPrototype != null)
         {
-            for (var i = 0; i < component.Capacity; i++)
+            for (var i = 0; i < ent.Comp.Capacity; i++)
             {
-                if (component.AmmoSlots[i] != null)
+                if (ent.Comp.AmmoSlots[i] != null)
                 {
-                    component.Chambers[i] = null;
+                    ent.Comp.Chambers[i] = null;
                     continue;
                 }
 
-                component.Chambers[i] = true;
+                ent.Comp.Chambers[i] = true;
             }
         }
 
-        DebugTools.Assert(component.AmmoSlots.Count == component.Capacity);
+        DebugTools.Assert(ent.Comp.AmmoSlots.Count == ent.Comp.Capacity);
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs
index 268b2a7473..9ea455a6dc 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs
@@ -13,9 +13,9 @@ public partial class SharedGunSystem
         SubscribeLocalEvent<SolutionAmmoProviderComponent, GetAmmoCountEvent>(OnSolutionAmmoCount);
     }
 
-    private void OnSolutionTakeAmmo(EntityUid uid, SolutionAmmoProviderComponent component, TakeAmmoEvent args)
+    private void OnSolutionTakeAmmo(Entity<SolutionAmmoProviderComponent> ent, ref TakeAmmoEvent args)
     {
-        var shots = Math.Min(args.Shots, component.Shots);
+        var shots = Math.Min(args.Shots, ent.Comp.Shots);
 
         // Don't dirty if it's an empty fire.
         if (shots == 0)
@@ -23,38 +23,35 @@ public partial class SharedGunSystem
 
         for (var i = 0; i < shots; i++)
         {
-            args.Ammo.Add(GetSolutionShot(uid, component, args.Coordinates));
-            component.Shots--;
+            args.Ammo.Add(GetSolutionShot(ent, args.Coordinates));
+            ent.Comp.Shots--;
         }
 
-        UpdateSolutionShots(uid, component);
-        UpdateSolutionAppearance(uid, component);
+        UpdateSolutionShots(ent);
+        UpdateSolutionAppearance(ent);
     }
 
-    private void OnSolutionAmmoCount(EntityUid uid, SolutionAmmoProviderComponent component, ref GetAmmoCountEvent args)
+    private void OnSolutionAmmoCount(Entity<SolutionAmmoProviderComponent> ent, ref GetAmmoCountEvent args)
     {
-        args.Count = component.Shots;
-        args.Capacity = component.MaxShots;
+        args.Count = ent.Comp.Shots;
+        args.Capacity = ent.Comp.MaxShots;
     }
 
-    protected virtual void UpdateSolutionShots(EntityUid uid, SolutionAmmoProviderComponent component, Solution? solution = null)
-    {
+    protected virtual void UpdateSolutionShots(Entity<SolutionAmmoProviderComponent> ent, Solution? solution = null) { }
 
+    protected virtual (EntityUid Entity, IShootable) GetSolutionShot(Entity<SolutionAmmoProviderComponent> ent, EntityCoordinates position)
+    {
+        var shot = Spawn(ent.Comp.Prototype, position);
+        return (shot, EnsureShootable(shot));
     }
 
-    protected virtual (EntityUid Entity, IShootable) GetSolutionShot(EntityUid uid, SolutionAmmoProviderComponent component, EntityCoordinates position)
+    protected void UpdateSolutionAppearance(Entity<SolutionAmmoProviderComponent> ent)
     {
-        var ent = Spawn(component.Prototype, position);
-        return (ent, EnsureShootable(ent));
-    }
-
-    protected void UpdateSolutionAppearance(EntityUid uid, SolutionAmmoProviderComponent component)
-    {
-        if (!TryComp<AppearanceComponent>(uid, out var appearance))
+        if (!TryComp<AppearanceComponent>(ent, out var appearance))
             return;
 
-        Appearance.SetData(uid, AmmoVisuals.HasAmmo, component.Shots != 0, appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoCount, component.Shots, appearance);
-        Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.MaxShots, appearance);
+        Appearance.SetData(ent, AmmoVisuals.HasAmmo, ent.Comp.Shots != 0, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoCount, ent.Comp.Shots, appearance);
+        Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.MaxShots, appearance);
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 1fd2bc2478..6d7974605f 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -41,38 +41,48 @@ namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem : EntitySystem
 {
-    [Dependency] private   readonly ActionBlockerSystem _actionBlockerSystem = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly ItemSlotsSystem _slots = default!;
+    [Dependency] private readonly RechargeBasicEntityAmmoSystem _recharge = default!;
+    [Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] protected readonly DamageableSystem Damageable = default!;
+    [Dependency] protected readonly ExamineSystemShared Examine = default!;
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] protected readonly IMapManager MapManager = default!;
-    [Dependency] private   readonly INetManager _netManager = default!;
     [Dependency] protected readonly IPrototypeManager ProtoManager = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
     [Dependency] protected readonly ISharedAdminLogManager Logs = default!;
-    [Dependency] protected readonly DamageableSystem Damageable = default!;
-    [Dependency] protected readonly ExamineSystemShared Examine = default!;
-    [Dependency] private   readonly SharedHandsSystem _hands = default!;
-    [Dependency] private   readonly ItemSlotsSystem _slots = default!;
-    [Dependency] private   readonly RechargeBasicEntityAmmoSystem _recharge = default!;
     [Dependency] protected readonly SharedActionsSystem Actions = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] private   readonly SharedCombatModeSystem _combatMode = default!;
     [Dependency] protected readonly SharedContainerSystem Containers = default!;
+    [Dependency] protected readonly SharedPhysicsSystem Physics = default!;
     [Dependency] protected readonly SharedPointLightSystem Lights = default!;
     [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
-    [Dependency] protected readonly SharedPhysicsSystem Physics = default!;
     [Dependency] protected readonly SharedProjectileSystem Projectiles = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] protected readonly TagSystem TagSystem = default!;
     [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!;
-    [Dependency] private   readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <summary>
     /// Default projectile speed
     /// </summary>
     public const float ProjectileSpeed = 40f;
 
+    /// <summary>
+    ///     Name of the container slot used as the gun's chamber
+    /// </summary>
+    public const string ChamberSlot = "gun_chamber";
+
+    /// <summary>
+    ///     Name of the container slot used as the gun's magazine
+    /// </summary>
+    public const string MagazineSlot = "gun_magazine";
+
     private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
 
     private const float InteractNextFire = 0.3f;
@@ -123,15 +133,15 @@ public abstract partial class SharedGunSystem : EntitySystem
         RefreshModifiers((gun, gun));
     }
 
-    private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent args)
+    private void OnGunMelee(Entity<GunComponent> ent, ref MeleeHitEvent args)
     {
-        if (!TryComp<MeleeWeaponComponent>(uid, out var melee))
+        if (!TryComp<MeleeWeaponComponent>(ent, out var melee))
             return;
 
-        if (melee.NextAttack > component.NextFire)
+        if (melee.NextAttack > ent.Comp.NextFire)
         {
-            component.NextFire = melee.NextAttack;
-            DirtyField(uid, component, nameof(GunComponent.NextFire));
+            ent.Comp.NextFire = melee.NextAttack;
+            DirtyField(ent.AsNullable(), nameof(GunComponent.NextFire));
         }
     }
 
@@ -141,18 +151,18 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         if (user == null ||
             !_combatMode.IsInCombatMode(user) ||
-            !TryGetGun(user.Value, out var ent, out var gun) ||
+            !TryGetGun(user.Value, out var gun) ||
             HasComp<ItemComponent>(user)) // Delta-V: Felinids in duffelbags can't shoot.
         {
             return;
         }
 
-        if (ent != GetEntity(msg.Gun))
+        if (gun.Owner != GetEntity(msg.Gun))
             return;
 
-        gun.ShootCoordinates = GetCoordinates(msg.Coordinates);
-        gun.Target = GetEntity(msg.Target);
-        AttemptShoot(user.Value, ent, gun);
+        gun.Comp.ShootCoordinates = GetCoordinates(msg.Coordinates);
+        gun.Comp.Target = GetEntity(msg.Target);
+        AttemptShoot(user.Value, gun);
     }
 
     private void OnStopShootRequest(RequestStopShootEvent ev, EntitySessionEventArgs args)
@@ -161,15 +171,15 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         if (args.SenderSession.AttachedEntity == null ||
             !TryComp<GunComponent>(gunUid, out var gun) ||
-            !TryGetGun(args.SenderSession.AttachedEntity.Value, out _, out var userGun))
+            !TryGetGun(args.SenderSession.AttachedEntity.Value, out var userGun))
         {
             return;
         }
 
-        if (userGun != gun)
+        if (userGun != (gunUid, gun))
             return;
 
-        StopShooting(gunUid, gun);
+        StopShooting(userGun);
     }
 
     public bool CanShoot(GunComponent component)
@@ -180,39 +190,42 @@ public abstract partial class SharedGunSystem : EntitySystem
         return true;
     }
 
-    public bool TryGetGun(EntityUid entity, out EntityUid gunEntity, [NotNullWhen(true)] out GunComponent? gunComp)
+    /// <summary>
+    ///     Tries to get an entity with <see cref="GunComponent"/> from the specified entity's hands, or from the entity itself.
+    /// </summary>
+    /// <param name="entity">Entity that is holding the gun, or is the gun</param>
+    /// <param name="gun">Gun entity to return</param>
+    /// <returns>True if gun was found</returns>
+    public bool TryGetGun(EntityUid entity, out Entity<GunComponent> gun)
     {
-        gunEntity = default;
-        gunComp = null;
+        gun = default;
 
         if (_hands.GetActiveItem(entity) is { } held &&
-            TryComp(held, out GunComponent? gun))
+            TryComp(held, out GunComponent? gunComp))
         {
-            gunEntity = held;
-            gunComp = gun;
+            gun = (held, gunComp);
             return true;
         }
 
         // Last resort is check if the entity itself is a gun.
-        if (TryComp(entity, out gun))
+        if (TryComp(entity, out gunComp))
         {
-            gunEntity = entity;
-            gunComp = gun;
+            gun = (entity, gunComp);
             return true;
         }
 
         return false;
     }
 
-    private void StopShooting(EntityUid uid, GunComponent gun)
+    private void StopShooting(Entity<GunComponent> ent)
     {
-        if (gun.ShotCounter == 0)
+        if (ent.Comp.ShotCounter == 0)
             return;
 
-        gun.ShotCounter = 0;
-        gun.ShootCoordinates = null;
-        gun.Target = null;
-        DirtyField(uid, gun, nameof(GunComponent.ShotCounter));
+        ent.Comp.ShotCounter = 0;
+        ent.Comp.ShootCoordinates = null;
+        ent.Comp.Target = null;
+        DirtyField(ent.AsNullable(), nameof(GunComponent.ShotCounter));
     }
 
     /// <summary>
@@ -226,40 +239,40 @@ public abstract partial class SharedGunSystem : EntitySystem
     /// <summary>
     /// Attempts to shoot at the target coordinates. Resets the shot counter after every shot.
     /// </summary>
-    public bool AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates, EntityUid? target = null)
+    public bool AttemptShoot(EntityUid user, Entity<GunComponent> gun, EntityCoordinates toCoordinates, EntityUid? target = null)
     {
-        gun.ShootCoordinates = toCoordinates;
-        gun.Target = target;
-        var result = AttemptShoot(user, gunUid, gun);
-        gun.ShotCounter = 0;
-        DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
+        gun.Comp.ShootCoordinates = toCoordinates;
+        gun.Comp.Target = target;
+        var result = AttemptShoot(user, gun);
+        gun.Comp.ShotCounter = 0;
+        DirtyField(gun.AsNullable(), nameof(GunComponent.ShotCounter));
         return result;
     }
 
     /// <summary>
     /// Shoots by assuming the gun is the user at default coordinates.
     /// </summary>
-    public bool AttemptShoot(EntityUid gunUid, GunComponent gun)
+    public bool AttemptShoot(Entity<GunComponent> gun)
     {
-        var coordinates = new EntityCoordinates(gunUid, gun.DefaultDirection);
-        gun.ShootCoordinates = coordinates;
-        var result = AttemptShoot(gunUid, gunUid, gun);
-        gun.ShotCounter = 0;
+        var coordinates = new EntityCoordinates(gun, gun.Comp.DefaultDirection);
+        gun.Comp.ShootCoordinates = coordinates;
+        var result = AttemptShoot(gun, gun);
+        gun.Comp.ShotCounter = 0;
         return result;
     }
 
-    private bool AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
+    private bool AttemptShoot(EntityUid user, Entity<GunComponent> gun)
     {
-        if (TryComp<AutoShootGunComponent>(gunUid, out var auto) && !auto.CanFire) // Frontier
+        if (TryComp<AutoShootGunComponent>(gun, out var auto) && !auto.CanFire) // Frontier
             return false; // Frontier
 
-        if (gun.FireRateModified <= 0f ||
+        if (gun.Comp.FireRateModified <= 0f ||
             !_actionBlockerSystem.CanAttack(user))
         {
             return false;
         }
 
-        var toCoordinates = gun.ShootCoordinates;
+        var toCoordinates = gun.Comp.ShootCoordinates;
 
         if (toCoordinates == null)
             return false;
@@ -270,9 +283,9 @@ public abstract partial class SharedGunSystem : EntitySystem
         var prevention = new ShotAttemptedEvent
         {
             User = user,
-            Used = (gunUid, gun)
+            Used = gun
         };
-        RaiseLocalEvent(gunUid, ref prevention);
+        RaiseLocalEvent(gun, ref prevention);
         if (prevention.Cancelled)
             return false;
 
@@ -282,95 +295,96 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         // Need to do this to play the clicking sound for empty automatic weapons
         // but not play anything for burst fire.
-        if (gun.NextFire > curTime)
+        if (gun.Comp.NextFire > curTime)
             return false;
 
-        var fireRate = TimeSpan.FromSeconds(1f / gun.FireRateModified);
+        var fireRate = TimeSpan.FromSeconds(1f / gun.Comp.FireRateModified);
 
-        if (gun.SelectedMode == SelectiveFire.Burst || gun.BurstActivated)
-            fireRate = TimeSpan.FromSeconds(1f / gun.BurstFireRate);
+        if (gun.Comp.SelectedMode == SelectiveFire.Burst || gun.Comp.BurstActivated)
+            fireRate = TimeSpan.FromSeconds(1f / gun.Comp.BurstFireRate);
 
         // First shot
         // Previously we checked shotcounter but in some cases all the bullets got dumped at once
         // curTime - fireRate is insufficient because if you time it just right you can get a 3rd shot out slightly quicker.
-        if (gun.NextFire < curTime - fireRate || gun.ShotCounter == 0 && gun.NextFire < curTime)
-            gun.NextFire = curTime;
+        if (gun.Comp.NextFire < curTime - fireRate || gun.Comp.ShotCounter == 0 && gun.Comp.NextFire < curTime)
+            gun.Comp.NextFire = curTime;
 
         var shots = 0;
-        var lastFire = gun.NextFire;
+        var lastFire = gun.Comp.NextFire;
 
-        while (gun.NextFire <= curTime)
+        while (gun.Comp.NextFire <= curTime)
         {
-            gun.NextFire += fireRate;
+            gun.Comp.NextFire += fireRate;
             shots++;
         }
 
         // NextFire has been touched regardless so need to dirty the gun.
-        DirtyField(gunUid, gun, nameof(GunComponent.NextFire));
+        DirtyField(gun.AsNullable(), nameof(GunComponent.NextFire));
 
         // Get how many shots we're actually allowed to make, due to clip size or otherwise.
         // Don't do this in the loop so we still reset NextFire.
-        if (!gun.BurstActivated)
+        if (!gun.Comp.BurstActivated)
         {
-            switch (gun.SelectedMode)
+            switch (gun.Comp.SelectedMode)
             {
                 case SelectiveFire.SemiAuto:
-                    shots = Math.Min(shots, 1 - gun.ShotCounter);
+                    shots = Math.Min(shots, 1 - gun.Comp.ShotCounter);
                     break;
                 case SelectiveFire.Burst:
-                    shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
+                    shots = Math.Min(shots, gun.Comp.ShotsPerBurstModified - gun.Comp.ShotCounter);
                     break;
                 case SelectiveFire.FullAuto:
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
+                    throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.Comp.SelectedMode}!");
             }
-        } else
+        }
+        else
         {
-            shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
+            shots = Math.Min(shots, gun.Comp.ShotsPerBurstModified - gun.Comp.ShotCounter);
         }
 
         var attemptEv = new AttemptShootEvent(user, null);
-        RaiseLocalEvent(gunUid, ref attemptEv);
+        RaiseLocalEvent(gun, ref attemptEv);
 
         if (attemptEv.Cancelled)
         {
             if (attemptEv.Message != null)
             {
-                PopupSystem.PopupClient(attemptEv.Message, gunUid, user);
+                PopupSystem.PopupClient(attemptEv.Message, gun, user);
             }
-            gun.BurstActivated = false;
-            gun.BurstShotsCount = 0;
-            gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
+            gun.Comp.BurstActivated = false;
+            gun.Comp.BurstShotsCount = 0;
+            gun.Comp.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.Comp.NextFire.TotalSeconds));
             return false;
         }
 
         var fromCoordinates = Transform(user).Coordinates;
         // Remove ammo
-        var ev = new TakeAmmoEvent(shots, new List<(EntityUid? Entity, IShootable Shootable)>(), fromCoordinates, user);
+        var ev = new TakeAmmoEvent(shots, [], fromCoordinates, user);
 
         // Listen it just makes the other code around it easier if shots == 0 to do this.
         if (shots > 0)
-            RaiseLocalEvent(gunUid, ev);
+            RaiseLocalEvent(gun, ev);
 
         DebugTools.Assert(ev.Ammo.Count <= shots);
         DebugTools.Assert(shots >= 0);
-        UpdateAmmoCount(gunUid);
+        UpdateAmmoCount(gun);
 
         // Even if we don't actually shoot update the ShotCounter. This is to avoid spamming empty sounds
         // where the gun may be SemiAuto or Burst.
-        gun.ShotCounter += shots;
-        DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
+        gun.Comp.ShotCounter += shots;
+        DirtyField(gun.AsNullable(), nameof(GunComponent.ShotCounter));
 
         if (ev.Ammo.Count <= 0)
         {
             // triggers effects on the gun if it's empty
             var emptyGunShotEvent = new OnEmptyGunShotEvent(user);
-            RaiseLocalEvent(gunUid, ref emptyGunShotEvent);
+            RaiseLocalEvent(gun, ref emptyGunShotEvent);
 
-            gun.BurstActivated = false;
-            gun.BurstShotsCount = 0;
-            gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown);
+            gun.Comp.BurstActivated = false;
+            gun.Comp.BurstShotsCount = 0;
+            gun.Comp.NextFire += TimeSpan.FromSeconds(gun.Comp.BurstCooldown);
 
             // Play empty gun sounds if relevant
             // If they're firing an existing clip then don't play anything.
@@ -380,8 +394,8 @@ public abstract partial class SharedGunSystem : EntitySystem
 
                 // Don't spam safety sounds at gun fire rate, play it at a reduced rate.
                 // May cause prediction issues? Needs more tweaking
-                gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
-                Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
+                gun.Comp.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.Comp.NextFire.TotalSeconds));
+                Audio.PlayPredicted(gun.Comp.SoundEmpty, gun, user);
                 return false;
             }
 
@@ -389,25 +403,25 @@ public abstract partial class SharedGunSystem : EntitySystem
         }
 
         // Handle burstfire
-        if (gun.SelectedMode == SelectiveFire.Burst)
+        if (gun.Comp.SelectedMode == SelectiveFire.Burst)
         {
-            gun.BurstActivated = true;
+            gun.Comp.BurstActivated = true;
         }
-        if (gun.BurstActivated)
+        if (gun.Comp.BurstActivated)
         {
-            gun.BurstShotsCount += shots;
-            if (gun.BurstShotsCount >= gun.ShotsPerBurstModified)
+            gun.Comp.BurstShotsCount += shots;
+            if (gun.Comp.BurstShotsCount >= gun.Comp.ShotsPerBurstModified)
             {
-                gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown);
-                gun.BurstActivated = false;
-                gun.BurstShotsCount = 0;
+                gun.Comp.NextFire += TimeSpan.FromSeconds(gun.Comp.BurstCooldown);
+                gun.Comp.BurstActivated = false;
+                gun.Comp.BurstShotsCount = 0;
             }
         }
 
         // Shoot confirmed - sounds also played here in case it's invalid (e.g. cartridge already spent).
-        Shoot(gunUid, gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems);
+        Shoot(gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems);
         var shotEv = new GunShotEvent(user, ev.Ammo);
-        RaiseLocalEvent(gunUid, ref shotEv);
+        RaiseLocalEvent(gun, ref shotEv);
 
         if (!userImpulse || !TryComp<PhysicsComponent>(user, out var userPhysics))
             return true;
@@ -416,13 +430,12 @@ public abstract partial class SharedGunSystem : EntitySystem
         RaiseLocalEvent(user, ref shooterEv);
 
         if (shooterEv.Push && !shooterEv.CannotBePushed) // DeltaV - Bipods stop you from being moved by recoil.
-            CauseImpulse(fromCoordinates, toCoordinates.Value, user, userPhysics);
+            CauseImpulse(fromCoordinates, toCoordinates.Value, (user, userPhysics));
         return true;
     }
 
     public void Shoot(
-        EntityUid gunUid,
-        GunComponent gun,
+        Entity<GunComponent> gun,
         EntityUid ammo,
         EntityCoordinates fromCoordinates,
         EntityCoordinates toCoordinates,
@@ -431,12 +444,11 @@ public abstract partial class SharedGunSystem : EntitySystem
         bool throwItems = false)
     {
         var shootable = EnsureShootable(ammo);
-        Shoot(gunUid, gun, new List<(EntityUid? Entity, IShootable Shootable)>(1) { (ammo, shootable) }, fromCoordinates, toCoordinates, out userImpulse, user, throwItems);
+        Shoot(gun, new List<(EntityUid? Entity, IShootable Shootable)>(1) { (ammo, shootable) }, fromCoordinates, toCoordinates, out userImpulse, user, throwItems);
     }
 
     public abstract void Shoot(
-        EntityUid gunUid,
-        GunComponent gun,
+        Entity<GunComponent> gun,
         List<(EntityUid? Entity, IShootable Shootable)> ammo,
         EntityCoordinates fromCoordinates,
         EntityCoordinates toCoordinates,
@@ -468,7 +480,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     /// <summary>
     /// Call this whenever the ammo count for a gun changes.
     /// </summary>
-    protected virtual void UpdateAmmoCount(EntityUid uid, bool prediction = true) {}
+    protected virtual void UpdateAmmoCount(EntityUid uid, bool prediction = true) { }
 
     protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge, bool spent)
     {
@@ -508,7 +520,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         // decides direction the casing ejects and only when not cycling
         if (angle != null)
         {
-            Angle ejectAngle = angle.Value;
+            var ejectAngle = angle.Value;
             ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun
             ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
         }
@@ -551,15 +563,15 @@ public abstract partial class SharedGunSystem : EntitySystem
         CreateEffect(gun, ev, user);
     }
 
-    public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics)
+    public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, Entity<PhysicsComponent> user)
     {
         var fromMap = TransformSystem.ToMapCoordinates(fromCoordinates).Position;
         var toMap = TransformSystem.ToMapCoordinates(toCoordinates).Position;
         var shotDirection = (toMap - fromMap).Normalized();
 
         const float impulseStrength = 25.0f;
-        var impulseVector =  shotDirection * impulseStrength;
-        Physics.ApplyLinearImpulse(user, -impulseVector, body: userPhysics);
+        var impulseVector = shotDirection * impulseStrength;
+        Physics.ApplyLinearImpulse(user, -impulseVector, body: user.Comp);
     }
 
     public void RefreshModifiers(Entity<GunComponent?> gun)
@@ -656,7 +668,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Serializable, NetSerializable]
     public sealed class HitscanEvent : EntityEventArgs
     {
-        public List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier Sprite, float Distance)> Sprites = new();
+        public List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier Sprite, float Distance)> Sprites = [];
     }
 
     /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
index 260f08c40a..f5013a3493 100644
--- a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
@@ -13,9 +13,9 @@ public sealed class UseDelayOnShootSystem : EntitySystem
         SubscribeLocalEvent<UseDelayOnShootComponent, GunShotEvent>(OnUseShoot);
     }
 
-    private void OnUseShoot(EntityUid uid, UseDelayOnShootComponent component, ref GunShotEvent args)
+    private void OnUseShoot(Entity<UseDelayOnShootComponent> ent, ref GunShotEvent args)
     {
-        if (TryComp(uid, out UseDelayComponent? useDelay))
-            _delay.TryResetDelay((uid, useDelay));
+        if (TryComp(ent, out UseDelayComponent? useDelay))
+            _delay.TryResetDelay((ent, useDelay));
     }
 }

From 6d1070d87fc427433dd5456be054d2f034cc1704 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 7 Feb 2026 10:56:21 +0100
Subject: [PATCH 213/360] Downstream fixes for #41966

---
 Content.Server/_DV/Weapons/Ranged/Systems/FireOnLandSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/_DV/Weapons/Ranged/Systems/FireOnLandSystem.cs b/Content.Server/_DV/Weapons/Ranged/Systems/FireOnLandSystem.cs
index 7aeaeba74d..869ce93fea 100644
--- a/Content.Server/_DV/Weapons/Ranged/Systems/FireOnLandSystem.cs
+++ b/Content.Server/_DV/Weapons/Ranged/Systems/FireOnLandSystem.cs
@@ -26,6 +26,6 @@ public sealed class FireOnLandSystem : EntitySystem
 
         var dir = gc.DefaultDirection;
         dir = new Vector2(-dir.Y, dir.X); // 90 degrees counter-clockwise, guns shoot down by default
-        _gunSystem.AttemptShoot(ent, ent, gc, new EntityCoordinates(ent, dir));
+        _gunSystem.AttemptShoot(ent, (ent, gc), new EntityCoordinates(ent, dir));
     }
 }

From 3dfd565b022c10e6b15c03731a1206a21e12667a Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:17:43 -0800
Subject: [PATCH 214/360] Fix all currently known markup issues (#42032)

* fix 1

* fafa

* remove

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs | 2 +-
 Content.Client/Guidebook/DocumentParsingManager.static.cs       | 2 +-
 Content.Client/Info/InfoSection.xaml.cs                         | 2 +-
 Content.Client/Info/ServerInfo.cs                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
index b54dd8b701..1e8b524997 100644
--- a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
@@ -42,7 +42,7 @@ public sealed class GuidebookRichPrototypeLink : Control, IPrototypeLinkControl
     public void SetMessage(FormattedMessage message)
     {
         _message = message;
-        _richTextLabel.SetMessage(_message);
+        _richTextLabel.SetMessage(_message, tagsAllowed: null);
     }
 
     public IPrototype? LinkedPrototype { get; set; }
diff --git a/Content.Client/Guidebook/DocumentParsingManager.static.cs b/Content.Client/Guidebook/DocumentParsingManager.static.cs
index 3e37942381..c702ac97ad 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.static.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.static.cs
@@ -82,7 +82,7 @@ public sealed partial class DocumentParsingManager
                     }
 
                     msg.Pop();
-                    rt.SetMessage(msg);
+                    rt.SetMessage(msg, tagsAllowed: null);
                     return rt;
                 },
                 TextParser)
diff --git a/Content.Client/Info/InfoSection.xaml.cs b/Content.Client/Info/InfoSection.xaml.cs
index 9e10a4d7b4..95a74c72c7 100644
--- a/Content.Client/Info/InfoSection.xaml.cs
+++ b/Content.Client/Info/InfoSection.xaml.cs
@@ -18,7 +18,7 @@ public sealed partial class InfoSection : BoxContainer
     {
         TitleLabel.Text = title;
         if (markup)
-            Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()));
+            Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()), tagsAllowed: null);
         else
             Content.SetMessage(text);
     }
diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
index 901fc91337..a28a3d4a6e 100644
--- a/Content.Client/Info/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -24,7 +24,7 @@ namespace Content.Client.Info
         }
         public void SetInfoBlob(string markup)
         {
-            _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup));
+            _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup), tagsAllowed: null);
         }
     }
 }

From 964c972c5b84a411e3f4794dc2c999d70db2bfda Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 1 Jan 2026 21:34:05 +0100
Subject: [PATCH 215/360] Update RT to 270.1.0 (#42198)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 6d31d5ba24..68f8d00931 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 6d31d5ba2404c9f069c456f10bd717929b00a9d8
+Subproject commit 68f8d00931d6b14f3e592d50c47dd44ef09eed1f

From 6f94ca5b0b511f9477d1ca561c2157d9c5787fec Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Thu, 1 Jan 2026 18:23:34 -0300
Subject: [PATCH 216/360] Make xenoborg thrusters anti-easy-sabotagge (#42201)

* code

* cant be toggled

* can't unwrench

* no rotating it

* comments

* change from PreventToggle to CanToggle

* commentary

* Update Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Server/Shuttles/Components/ThrusterComponent.cs   | 6 ++++++
 Content.Server/Shuttles/Systems/ThrusterSystem.cs         | 2 +-
 .../Prototypes/Entities/Structures/Shuttles/thrusters.yml | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs
index 20f020743d..2a68b4f290 100644
--- a/Content.Server/Shuttles/Components/ThrusterComponent.cs
+++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs
@@ -10,6 +10,12 @@ namespace Content.Server.Shuttles.Components
     [Access(typeof(ThrusterSystem))]
     public sealed partial class ThrusterComponent : Component
     {
+        /// <summary>
+        /// If the thruster can be toggled on or off via interaction
+        /// </summary>
+        [DataField]
+        public bool CanToggle = true;
+
         /// <summary>
         /// Whether the thruster has been force to be enabled / disabled (e.g. VV, interaction, etc.)
         /// </summary>
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 20040ab40a..3d3cf1aa28 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -135,7 +135,7 @@ public sealed class ThrusterSystem : EntitySystem
 
     private void OnActivateThruster(EntityUid uid, ThrusterComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled || !args.Complex)
+        if (args.Handled || !args.Complex || !component.CanToggle)
             return;
 
         component.Enabled ^= true;
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
index bb43cb3b2c..e251d1bfff 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -106,6 +106,14 @@
   parent: Thruster
   id: ThrusterXenoborg
   components:
+  # temporary solution until thruster rework
+  - type: Thruster
+    canToggle: false # no turning it off by just clicking it
+  - type: Anchorable
+    flags:
+    - Anchorable # no unwrenching it
+  - type: Rotatable
+    rotateWhileAnchored: false # no rotating it backwards so it doesn't face space
   - type: Sprite
     sprite: Structures/Shuttles/xenoborg_thruster.rsi
 

From b9a6b778b4eb5d2c285aefc822c4ccd8859c4531 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Fri, 2 Jan 2026 04:22:56 -0800
Subject: [PATCH 217/360] Guard against div/0 for HeatContainerHelpers (#42213)

Guard against div/0 for HeatContainers
---
 .../HeatContainerHelpers.Exchange.cs              | 15 +++++++++++++--
 .../HeatContainer/HeatContainerHelpers.Merge.cs   | 10 ++++++++--
 .../HeatContainer/HeatContainerHelpers.cs         |  4 ++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
index a906cfa35e..75611d449a 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
@@ -16,9 +16,13 @@ public static partial class HeatContainerHelpers
     /// <returns>The amount of heat in joules that is needed
     /// to bring the containers to thermal equilibrium.</returns>
     /// <example>A positive value indicates heat transfer from a hot cA to a cold cB.</example>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the combined heat capacity of both containers is zero or negative.</exception>
     [PublicAPI]
     public static float EquilibriumHeatQuery(this ref HeatContainer cA, ref HeatContainer cB)
     {
+        var cTotal = cA.HeatCapacity + cB.HeatCapacity;
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(cTotal);
+
         /*
         The solution is derived from the following facts:
         1. Let Q be the amount of heat energy transferred from cA to cB.
@@ -32,7 +36,7 @@ public static partial class HeatContainerHelpers
         7. Solve for Q.
         */
         return (cA.Temperature - cB.Temperature) *
-               (cA.HeatCapacity * cB.HeatCapacity / (cA.HeatCapacity + cB.HeatCapacity));
+               (cA.HeatCapacity * cB.HeatCapacity / cTotal);
     }
 
     /// <summary>
@@ -42,11 +46,14 @@ public static partial class HeatContainerHelpers
     /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     /// <returns>The resulting equilibrium temperature both containers will be at.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the combined heat capacity of both containers is zero or negative.</exception>
     [PublicAPI]
     public static float EquilibriumTemperatureQuery(this ref HeatContainer cA, ref HeatContainer cB)
     {
+        var cTotal = cA.HeatCapacity + cB.HeatCapacity;
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(cTotal);
         // Insert the above solution for Q into T_A_final = T_A_initial - Q / C_A and rearrange the result.
-        return (cA.HeatCapacity * cA.Temperature - cB.HeatCapacity * cB.Temperature) / (cA.HeatCapacity + cB.HeatCapacity);
+        return (cA.HeatCapacity * cA.Temperature - cB.HeatCapacity * cB.Temperature) / cTotal;
     }
 
     /// <summary>
@@ -75,6 +82,7 @@ public static partial class HeatContainerHelpers
         var tFinal = EquilibriumTemperatureQuery(ref cA, ref cB);
         cA.Temperature = tFinal;
         cB.Temperature = tFinal;
+        // Guarded against div/0 in EquilibriumTemperatureQuery: totalHeatCapacity > 0.
         dQ = (tInitialA - tFinal) / cA.HeatCapacity;
     }
 
@@ -120,6 +128,7 @@ public static partial class HeatContainerHelpers
     /// </summary>
     /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
     /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the combined heat capacity of all containers is zero or negative.</exception>
     [PublicAPI]
     public static float EquilibriumTemperatureQuery(this HeatContainer[] cN)
     {
@@ -161,6 +170,8 @@ public static partial class HeatContainerHelpers
             denominator += c.HeatCapacity;
         }
 
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(denominator);
+
         return numerator / denominator;
     }
 
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
index d9f2cdd3e7..5aa3dcbbde 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
@@ -9,13 +9,16 @@ public static partial class HeatContainerHelpers
     /// </summary>
     /// <param name="cA">The first <see cref="HeatContainer"/> to merge. This will be modified to contain the merged result.</param>
     /// <param name="cB">The second <see cref="HeatContainer"/> to merge.</param>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the combined heat capacity of both containers is zero or negative.</exception>
     [PublicAPI]
     public static void Merge(this ref HeatContainer cA, HeatContainer cB)
     {
+        var combinedHeatCapacity = cA.HeatCapacity + cB.HeatCapacity;
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(combinedHeatCapacity);
         var merged = new HeatContainer
         {
-            HeatCapacity = cA.HeatCapacity + cB.HeatCapacity,
-            Temperature = (cA.InternalEnergy + cB.InternalEnergy) / (cA.HeatCapacity + cB.HeatCapacity)
+            HeatCapacity = combinedHeatCapacity,
+            Temperature = (cA.InternalEnergy + cB.InternalEnergy) / combinedHeatCapacity,
         };
 
         cA = merged;
@@ -43,6 +46,7 @@ public static partial class HeatContainerHelpers
     /// </summary>
     /// <param name="cN">The array of <see cref="HeatContainer"/>s to merge.</param>
     /// <returns>A new <see cref="HeatContainer"/> representing the merged result.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the combined heat capacity of all containers is zero or negative.</exception>
     [PublicAPI]
     public static HeatContainer Merge(this HeatContainer[] cN)
     {
@@ -55,6 +59,8 @@ public static partial class HeatContainerHelpers
             totalEnergy += c.InternalEnergy;
         }
 
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(totalHeatCapacity);
+
         var result = new HeatContainer
         {
             HeatCapacity = totalHeatCapacity,
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
index 6ce01c752e..ed1eadc74a 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
@@ -29,9 +29,11 @@ public static partial class HeatContainerHelpers
     /// <param name="c">The <see cref="HeatContainer"/> to query.</param>
     /// <param name="dQ">The energy in joules to add or remove.</param>
     /// <returns>The resulting temperature in kelvin after the heat change.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the heat capacity of the container is zero or negative.</exception>
     [PublicAPI]
     public static float AddHeatQuery(this ref HeatContainer c, float dQ)
     {
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(c.HeatCapacity);
         // Don't allow the temperature to go below the absolute minimum.
         return Math.Max(0f, c.Temperature + dQ / c.HeatCapacity);
     }
@@ -42,9 +44,11 @@ public static partial class HeatContainerHelpers
     /// </summary>
     /// <param name="c">The <see cref="HeatContainer"/> to modify.</param>
     /// <param name="newHeatCapacity">The new heat capacity to set.</param>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the new heat capacity is zero or negative.</exception>
     [PublicAPI]
     public static void SetHeatCapacity(this ref HeatContainer c, float newHeatCapacity)
     {
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(c.HeatCapacity);
         var currentEnergy = c.InternalEnergy;
         c.HeatCapacity = newHeatCapacity;
         c.Temperature = currentEnergy / c.HeatCapacity;

From bee1b9aa333321988cc40fc3b207fcc35d61a623 Mon Sep 17 00:00:00 2001
From: "Ignaz \"Ian\" Kraft" <ignaz.k@live.de>
Date: Sat, 3 Jan 2026 02:20:41 +0100
Subject: [PATCH 218/360] expanded FillLevelSpriteTest test and fixed found
 issues (#34165)

* fix clustersoap eaten sprite

* also assure that every entity with the SolutionContainerVisualsComponent has a AppearanceComponent

* use the new sprite system + fix the fill for cardboard arrows and the mosin

* fix merge issue
---
 .../Tests/FillLevelSpriteTest.cs              |  82 +++++++++++++-----
 .../Objects/Specific/Janitorial/soap.yml      |  15 ++--
 .../Weapons/Guns/Projectiles/arrows.yml       |   3 +
 .../Weapons/Throwable/scattering_grenades.yml |   1 +
 ...ck-fill-1.png => equipped-back-fill-1.png} | Bin
 .../Guns/Snipers/bolt_gun_wood.rsi/meta.json  |   2 +-
 6 files changed, 74 insertions(+), 29 deletions(-)
 rename Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/{equipped-backpack-fill-1.png => equipped-back-fill-1.png} (100%)

diff --git a/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
index 37e777fa8c..99354e16c1 100644
--- a/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
+++ b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
@@ -1,5 +1,7 @@
 using System.Linq;
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Prototypes;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
@@ -13,14 +15,17 @@ namespace Content.IntegrationTests.Tests;
 public sealed class FillLevelSpriteTest
 {
     private static readonly string[] HandStateNames = ["left", "right"];
+    private static readonly string[] EquipStateNames = ["back", "suitstorage"];
 
     [Test]
     public async Task FillLevelSpritesExist()
     {
-        await using var pair = await PoolManager.GetServerClient();
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
         var client = pair.Client;
         var protoMan = client.ResolveDependency<IPrototypeManager>();
         var componentFactory = client.ResolveDependency<IComponentFactory>();
+        var entMan = client.ResolveDependency<IEntityManager>();
+        var spriteSystem = client.System<SpriteSystem>();
 
         await client.WaitAssertion(() =>
         {
@@ -31,39 +36,70 @@ public sealed class FillLevelSpriteTest
                 .OrderBy(p => p.ID)
                 .ToList();
 
-            foreach (var proto in protos)
+            Assert.Multiple(() =>
             {
-                Assert.That(proto.TryGetComponent<SolutionContainerVisualsComponent>(out var visuals, componentFactory));
-                Assert.That(proto.TryGetComponent<SpriteComponent>(out var sprite, componentFactory));
-
-                var rsi = sprite.BaseRSI;
-
-                // Test base sprite fills
-                if (!string.IsNullOrEmpty(visuals.FillBaseName))
+                foreach (var proto in protos)
                 {
-                    for (var i = 1; i <= visuals.MaxFillLevels; i++)
+                    Assert.That(proto.TryGetComponent<SolutionContainerVisualsComponent>(out var visuals, componentFactory));
+                    Assert.That(proto.TryGetComponent<SpriteComponent>(out var sprite, componentFactory));
+                    if (!proto.HasComponent<AppearanceComponent>(componentFactory))
                     {
-                        var state = $"{visuals.FillBaseName}{i}";
-                        Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
-                            MaxFillLevels = {visuals.MaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                        Assert.Fail(@$"{proto.ID} has SolutionContainerVisualsComponent but no AppearanceComponent.");
                     }
-                }
 
-                // Test inhand sprite fills
-                if (!string.IsNullOrEmpty(visuals.InHandsFillBaseName))
-                {
-                    for (var i = 1; i <= visuals.InHandsMaxFillLevels; i++)
+                    // Test base sprite fills
+                    if (!string.IsNullOrEmpty(visuals.FillBaseName) && visuals.MaxFillLevels > 0)
                     {
-                        foreach (var handname in HandStateNames)
+                        var entity = entMan.Spawn(proto.ID);
+                        if (!spriteSystem.LayerMapTryGet(entity, SolutionContainerLayers.Fill, out var fillLayerId, false))
                         {
-                            var state = $"inhand-{handname}{visuals.InHandsFillBaseName}{i}";
-                            Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
-                                InHandsMaxFillLevels = {visuals.InHandsMaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                            Assert.Fail(@$"{proto.ID} has SolutionContainerVisualsComponent but no fill layer map.");
                         }
+                        if (!spriteSystem.TryGetLayer(entity, fillLayerId, out var fillLayer, false))
+                        {
+                            Assert.Fail(@$"{proto.ID} somehow lost a layer.");
+                        }
+                        var rsi = fillLayer.ActualRsi;
 
+                        for (var i = 1; i <= visuals.MaxFillLevels; i++)
+                        {
+                            var state = $"{visuals.FillBaseName}{i}";
+                            Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                                MaxFillLevels = {visuals.MaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                        }
+                    }
+
+                    // Test inhand sprite fills
+                    if (!string.IsNullOrEmpty(visuals.InHandsFillBaseName) && visuals.InHandsMaxFillLevels > 0)
+                    {
+                        var rsi = sprite.BaseRSI;
+                        for (var i = 1; i <= visuals.InHandsMaxFillLevels; i++)
+                        {
+                            foreach (var handname in HandStateNames)
+                            {
+                                var state = $"inhand-{handname}{visuals.InHandsFillBaseName}{i}";
+                                Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                                    InHandsMaxFillLevels = {visuals.InHandsMaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                            }
+                        }
+                    }
+
+                    // Test equipped sprite fills
+                    if (!string.IsNullOrEmpty(visuals.EquippedFillBaseName) && visuals.EquippedMaxFillLevels > 0)
+                    {
+                        var rsi = sprite.BaseRSI;
+                        for (var i = 1; i <= visuals.EquippedMaxFillLevels; i++)
+                        {
+                            foreach (var equipName in EquipStateNames)
+                            {
+                                var state = $"equipped-{equipName}{visuals.EquippedFillBaseName}{i}";
+                                Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                                    EquippedMaxFillLevels = {visuals.EquippedMaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                            }
+                        }
                     }
                 }
-            }
+            });
         });
 
         await pair.CleanReturnAsync();
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index a6b6dbcbff..1c2114a832 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -161,16 +161,18 @@
   description: A tiny piece of syndicate soap.
   categories: [ HideSpawnMenu ]
   components:
-  - type: Sprite
-    layers:
-    - state: syndie-soaplet
   - type: SolutionContainerManager
     solutions:
       soap:
-        maxVol: 10
+        maxVol: 1.5 # 50 / 30 = 1.666
         reagents:
         - ReagentId: SoapReagent
-          Quantity: 10
+          Quantity: 1.5
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
+  - type: Sprite
+    layers:
+    - state: syndie-soaplet
   - type: Slippery
   - type: StepTrigger
     intersectRatio: 0.04
@@ -201,6 +203,9 @@
       path: "/Audio/Effects/Fluids/splat.ogg"
       params:
         volume: -8
+  - type: Residue
+    residueAdjective: residue-slippery
+    residueColor: residue-red
 
 - type: entity
   parent: BaseSoap
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 0a577b51db..d61b78f1ed 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -201,6 +201,9 @@
       color: brown
     - state: tip
       color: brown
+    - state: solution1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
   - type: Projectile
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index 6bff4fbd44..627835ddd3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -146,6 +146,7 @@
     sprite: Objects/Specific/Janitorial/soap.rsi
     layers:
     - state: syndie-4
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: ScatteringGrenade
     fillPrototype: SoapletSyndie
     capacity: 30
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-back-fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png
rename to Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-back-fill-1.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index 92f4c50938..4c9083b6c7 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -53,7 +53,7 @@
             "directions": 4
         },
         {
-            "name": "equipped-backpack-fill-1",
+            "name": "equipped-back-fill-1",
             "directions": 4
         },
         {

From dfc4c214b56d553ea80fabe4675927baf8fd5d50 Mon Sep 17 00:00:00 2001
From: eoineoineoin <helloworld@eoinrul.es>
Date: Sat, 3 Jan 2026 06:19:35 +0000
Subject: [PATCH 219/360] Fix style classes used on monotone labels (#41969)

* Fix style classes used on monotone labels

* Heading>SubHeading
---
 Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs | 4 ++--
 Content.Client/Stylesheets/StyleClass.cs              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs
index 77c554a9f3..fc23f9c7fb 100644
--- a/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs
@@ -69,10 +69,10 @@ public sealed class LabelSheetlet : Sheetlet<PalettedStylesheet>
                 .Class(StyleClass.LabelMonospaceText)
                 .Prop(Label.StylePropertyFont, robotoMonoBold11),
             E<Label>()
-                .Class(StyleClass.LabelMonospaceHeading)
+                .Class(StyleClass.LabelMonospaceSubHeading)
                 .Prop(Label.StylePropertyFont, robotoMonoBold12),
             E<Label>()
-                .Class(StyleClass.LabelMonospaceSubHeading)
+                .Class(StyleClass.LabelMonospaceHeading)
                 .Prop(Label.StylePropertyFont, robotoMonoBold14),
         ];
     }
diff --git a/Content.Client/Stylesheets/StyleClass.cs b/Content.Client/Stylesheets/StyleClass.cs
index 39e3ff7d94..e5fde69584 100644
--- a/Content.Client/Stylesheets/StyleClass.cs
+++ b/Content.Client/Stylesheets/StyleClass.cs
@@ -41,8 +41,8 @@ public static class StyleClass
     public const string LabelKeyText = "LabelKeyText";
     public const string LabelWeak = "LabelWeak"; // replaces `LabelSecondaryColor`
     public const string LabelMonospaceText = "ConsoleText";
-    public const string LabelMonospaceHeading = "ConsoleText";
-    public const string LabelMonospaceSubHeading = "ConsoleText";
+    public const string LabelMonospaceHeading = "ConsoleHeading";
+    public const string LabelMonospaceSubHeading = "ConsoleSubHeading";
 
     public const string BackgroundPanel = "BackgroundPanel"; // replaces `AngleRect`
     public const string BackgroundPanelOpenLeft = "BackgroundPanelOpenLeft"; // replaces `BackgroundOpenLeft`

From 1e738be80174b13c75a08cfb842da10cd3a680cb Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sat, 3 Jan 2026 19:48:37 +1300
Subject: [PATCH 220/360] Intercom resprite (#41962)

* intercom resprite

* fix typo

* change copyright
---
 .../Wallmounts/intercom.rsi/base.png          | Bin 729 -> 714 bytes
 .../Wallmounts/intercom.rsi/broadcasting.png  | Bin 137 -> 407 bytes
 .../Wallmounts/intercom.rsi/build.png         | Bin 656 -> 761 bytes
 .../Wallmounts/intercom.rsi/meta.json         |  60 ++++++++++++++++--
 .../Wallmounts/intercom.rsi/panel.png         | Bin 316 -> 558 bytes
 .../Wallmounts/intercom.rsi/speaker.png       | Bin 134 -> 404 bytes
 .../Wallmounts/intercom.rsi/unshaded.png      | Bin 217 -> 954 bytes
 7 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
index a85cbfbecc6aa5f549067703687291f9ea7634a6..707f642a69eb769b3b3433ef3aee9fdc32672c74 100644
GIT binary patch
literal 714
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xYHMqoni%@}`etQi0rjgSF=^B?1O^65ONmEEM^;x?dwDurhe=D>
z3rk6e*zoekC@286{#qz80Z0jz1o;L3M+Xd#_U{)0%5oNXL>4nJ@ErkR#;MwT(m+AU
z64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrW1!!8c7b3jEqQX@RmJUz7-IDi~h1}R2X
z21X#u3y7tmY>;;~7@5K1OhC3FBNKxlkd6Z4%yt&Acn**a0zBo63@?D80;ADwWnchG
zPGDzX0jf1HGB#jb05KP2C+h-;S<`@Q5MTnD%mh{$WN86pL3J4#7=UD(HvHLi=~wa|
zV91Mkx;TbJxWAp+%h#;H)8bh2Z^Oo)|MaZ`x{|Y3p4g<?rhhT)ig&Vw|C!c5J`Q^x
zU;oa<aZ^L{mfnR!-PNp8S2ZriGR3ZIcoiD2l5qe3XO^I^sqz;Mb<$T991mwxJYG2G
zP2$CMr(zgu_rCO$Ufi?s>%R*(g(KL?n`UVS?3tSBr}Du5Y+HQ#NB&E7&lwmmy_ZpN
z*wxF-;<3NDCYK4sec<r-oS@nUIrqQk7@3ybw>-r1pm@bhrlZk6EkYM?S)5aQP`hPf
zOkCw&g+q#SB?J50ovn-)$^AE7{{IG)v#)~5M&{B?!LNPi3nHY9fU^AUC220Ua(pk(
wbo>(F3J7m3;G8O?aqm?73Z~Elff@$q{jVH*q{$|A$r}_}p00i_>zopr02oT(hX4Qo

delta 716
zcmX@bdXsg6WIY=L1H-D!!h1l9u{g-xiDBJ2nU@R<Op`rb978JRyqy);Efgqn{J$&D
z>aPL0PF~EL9ABHA?pe57p_cRI!u19Z*rPsdt$L;Si_1-M$Ejx<+P(%%dpM=VZHnHv
z1b*+y%kI71RQ-PDjL+4Qd&<|9zk7Jc^85LEhPF<V=PTqLT2kvHFJJ!WzWS=rx{rr4
z)dN~nBQIB+Iq>xf?~G-gf1^Yfe`MKiJoCZ4W!GaQp5Hik-#0i=z)6~c;ozg)clFB3
zxL1T|RRpembm^!C!+~>8#gCatmogmqF0VW#MtuFP+=ns?`5H23eW<nH!Q^nV^y7nz
z&Np`2ta<x(>Ek_avZ~izFMqE0oAdb3OuLVgkAK@uI+;?y+OW6C@<qO^+_}5<zpK~B
zv?bqGKPUK#XGZLw_dGkIH6CObHC|tF7-(111JhSG&g3MXHTb8=>?GR&bglJn)*t)&
z`|tW)*q0_zkfVO%{brp?PA<+|$(S&v{e1f$e43iAeSFQU|M{yOY|<WFdp3Vl{dB+l
z1(z##f4TQ?L4VRli|hZNl}a!E=wji%f_Z{RjO+8~#(RF(wB*=ymsBwyc9hrW?|WVU
z@m{S>?I#I_344p@`~nKzpLcyiT)cbIYqfjzKUC%@Ux`+bGk$ifYOh?-$}6V~Pycd%
z+*!cgV#d%gZ?S=JY0FE&R*{%U){>QmS@kWc0qs(Y-6R-fvwEZ!N?loaY=vN21D~l|
zuK|PA6$w-A`{#B6sY5&$Kr(C&AjLaaOI8?WDb<UlNwg(`QK!l!FW;q3O9JKxecR!+
zx#d*H#D8`UOCy~Uk9e>{>3X&0mvj~yBrP#Ul5hp7n94IXjdQA?@?1u(vqD_TZdMEs
sx{7;+k@t$887JghCBYWWSn-LwI(7ES#x#FmB4A+fboFyt=akR{0M^V>IsgCw

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
index 962417ccb4d81d45d10de39580760a2931ae3484..d6eff47d1ef6d3adec44cfa619dc65070434cec5 100644
GIT binary patch
literal 407
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk
zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!Q#w7wjm=EgCLNO
z0^-be7O;2@kPQNhCo?d-04jpf=(aL203|1|Gq3>F8W<THFfM?Y3$l}S0mQ6nKsE?4
z0ZnECs|>QV0J5OE3=IrGvNxU@RGj^?xB$p>_H=O!sfc@f(~*}!frsUw+6@P_I)T;&
zpAI^4avJZSTyPVpXr4(}%6#4PAdB@r90%FQ@F0KcT8DNZ<CSZUR=xo5kLQ<4K;oXR
KelF{r5}E+T$5dAU

delta 95
zcmbQv+{rk>Fv8i>#WAE}&fA;bybKCFE(g_aIH=VLv@TfG<bO$$wfgQJ4hDt>{$A0W
w>8Gz-GcYh@eLMyvfnt~ZjtMEUF)-{%WY)?T;I-A0Ee45uy85}Sb4q9e057>7X#fBK

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
index e8edab0fa02d1783102470f9b37da0cfdada2e67..6dce382221457fdef07c7bb33ac185c5a661abe5 100644
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~u2Ka=yDkvzZsj3JI3EJ7(3JVJ-#K&7$SU5R3nwlC}TU!HFb<ck50i?J~
zg8YL2!vTYrKjSB$FlT{BWHAE+-w_aIoT|+y4HT3tag8Vm&QB{TPb^Ah2uRG#E79|F
z4N)-FGt@IQ?BWnR2UN5pHNrE^(^HFq1IS@zkYZ$IU<9(ffLI#J26;(?kr^z`1Y{dB
zGBF4O=_nx1Y-a(B=K$Ftz*El1@B-*_7>#Z#0|QWU0y_f>P_2QHu>s=(h`As;Sr<Ue
zng(Qp029z;Ca}sNOA8<is>{&803_SA;m@W^zmoR=LpRaW#W5tp{q59x;bsMnw!eYd
zuYcD+U`$%hIq7Qd|1Wp)7+-2vDdz1xah~OlT%WvXfgQ{Hq#n7(^fSW!Tr3BC<w_Xd
zFaJ5^z?^5zhic52XYnzq8+Yj6JCyy0M^9eKX|?i`r{;f53hE-o=E*VLs0(=@%k)R0
zq|KNi=+y?%5;oRLiZwzh#eX(1Y~tMD-@_5`${}ICgrLAq-v+*AEsxb~0{(~SZepmD
zPud$D!W6VO`i;?omkI?&%q#EdZaVPP*(Ia2WzUyGDW@G)mv`$dxVHP~G)9GMyItkn
zjf;0G$(U=hcYVzZ<P&>+Hz~uk)BS;<!#mLhT3RpLgqJS9ll}Mgx=kOAGG{jnrA0L^
zv(!jjCYmt|!P%5}Vk^)F$(B8SGgjv8wER--mU{Z^!u!Tr(%(-!PPpwLG~uvM=H<NY
z@0#lG7Az_fSZcY#_HiBK(%l+~jtNuTAN*%}{fm|DOk=5sqg6jB;5}XaT-G@yGywo?
CxAPDH

delta 642
zcmV-|0)74Y1&{@h8Gi-<0063Kaozv`00DDSM?wIu&K&6g00K%$L_t(|ob8%HPr@)5
zhF=ZiCaCp*K~0@E{VU_w$`8Q<-bCUgnh?}&Hz2`-VKFc|oAv8A;`f}It?k-3rR&Q(
zKoI^l2iyZNp|xIB?PEM18|T=l`T#1l)~jaFz-%@H04Sv}Uw<rdb$OZBd4GS~YS-zU
zZ(drNM5wI*0P@MN%SWv?hL4X>rzczYx7vPuq8CMYiDTn44&4mZAH667uzT|B>%Az#
zXf!JAZ|?-S@Av;)FAT%ddbR!u6mfTZi}_*!pm-H1rEsdw(CM82X$90;0HxH{CI|q{
zASl}G02FS5Mt^E8z<ja9QLCMovoyhQn3T4$q1FO4g9a{sz4jgkgVHu(c%7GD<G56i
zS_{xVZsn5>Z>~#f|Bz(~Mo-Uqo9Xn!SijZ+Bws0%QhAx8&0Zaavoy)~gd&RWmmP&`
zEx;yP>s7bg-Fbg9nUqd=lf63#xyHB$_;6!3WNCtFuz!2VS!#Yo7O``1uH4v596J@k
zHO3X-!;Nucy$85<W87E^;M$FGV|@^E?Z&t<3gE+yabpy~ha2O@D1Z+)#*I+`A8w2r
zqX0hK7&pcfnh!U|jn&{N+!#0F25l-+xG_Nx1VIo4LEypKxKM^A96^kg7ohxf&DUpf
zn^^xVOnVuYa0D?<>@a0mLLJ075r8r*p$=l4d?7*^mQV*V)&fw5B^*JFwE&c12}clP
zEdXU$!V$z+3qTo`a0D^d0#Jq}96?Owqp-`cgd>Ql9AZ$0B|d@}2}Y`RKpB=u5F-eJ
cAPA&<1DlE_b9Db(vH$=807*qoM6N<$g64`IjsO4v

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
index f5a9d7b89c..998ac78bb1 100644
--- a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
@@ -1,11 +1,11 @@
 {
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Assets taken from baystation 12 at https://github.com/Baystation12/Baystation12/commit/026fb168bc9551f16c65385e941a1d449f13c97f | build and panel modified by K-Dynamic (github)",
     "version": 1,
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi",
     "states": [
         {
             "name": "base",
@@ -19,17 +19,63 @@
             "name": "build",
             "directions": 4
         },
+        {
+            "name": "panel",
+            "directions": 4
+        },
         {
             "name": "speaker",
             "directions": 4
         },
         {
             "name": "unshaded",
-            "directions": 4
-        },
-        {
-            "name": "panel",
-            "directions": 4
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    2.0
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    2.0
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    2.0
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    2.0
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
index 68f4cd1240b80165a5489ef7287b8bc3b48dc143..9373404dd745531e3435044d726bfcddfc1d08c3 100644
GIT binary patch
literal 558
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}zDkvxj3kw^k{r?XX`OhFMBxr4It){91<n6fgdp(fiED7=p{tpEV
z!TuFOAi)BU$YKTtzQZ8Qcszea3Q$n8#5JNMI6tkVJh3R1As{g`uSCz!HAKNw&rr|M
zu!}?N9LUtv2+uT6Pb~%xAcvJfijkFp5y<iaVreKF<P{A@X0SNOGlq;z41z#93Wzh?
zS-|2sKsE?0p3K1T0;mW^qua{B0F<1-&cFgxYhYw-z_<WnF33*S1rW2Q0ofqH1T>im
ztTM>b0?2~uGBhv%$=-NsP;vIl;sPLZo~MgrNQC>_sg8UN3Op>1u0Q{G^9BfS%$>#6
z*?Dv4!NdjaZ`*7*SOi3DnhG4BcX<m;-*HU0PTj-AaZ&Nnug!Zu*0lsWT1l;U7ieT?
zIuz>=`SNq#Mb0HVqI^U<D!0F=Q#g7xX_dp7-L0=pIXM(G92guMIWsoeoo>{tO#i@L
zxqY>E{XPdx_N~S{0`I+jb!xtTz$wSKJZc}94)U{D&OZ@V_4fB3hEE_@d%F6$taD0e
F0st9=nUnwk

delta 300
zcmV+{0n`4j1iS)}8Gi-<0063Kaozv`00DDSM?wIu&K&6g008z$L_t(|obB4N5`r)c
zfZ^!rs1A-SJdN-F26S=q)Pp>L4z6-uTGAZ${}u)c7r2&d5<~z10MMpQbO088-@ks1
zNhz70X`3HT3{{o$We`=BAtg~&NyF!uV|6cJX)J;KaO%@(EPp!x%`P{X2#4cIx~`i&
ze-)AY<7v9*s%C(PRm}jMM!D_hL(W+O0DzX6wv8TJ(P-w4(9+phwB~n$ECI`4k8CWO
zDHrg_#-cU<4KU3BvM~Sv0001hKTur3^{f=vs6sDN6ZCABcsF92FN(4RN-h@hZI;w%
y#1#J|<=HH$(Itp!{u@v{13a50G-3b%aP<b53#oU`jpnrg0000<MNUMnLSTaL*@CG6

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
index 4bcd29d7f4bedbfe0efad7a738265da1ea9ca702..57c0432aea51e71ec6876567b210ddb706e2bfef 100644
GIT binary patch
literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk
zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!Q#w7wjm=EgCLNO
z0^-be7O;2@kPQNhCo?d-04jpf=(aL203|1|Gq3>F8W<THFfM?Y3$l}S0mQ6nKsE?4
z0ZnECs|>QV0J5OE3=IrGvNxU@RGj^?xB$p>@N{tusfc@f(@>B>L4f(-3I~%<2474h
z7Bn!G?e;hk!@$sx{$-1l=UPsn;+O~hAWtwHxbL@(NtOv{&}5&)3%my({rr;#68CiV
Kb6Mw<&;$VcKUC@f

delta 92
zcmbQj+{QS;Fx0`*#WAE}&fA-gybKBg%m-IFn0zuQ$#~%Cu|tyeui0z{28NoXv@2e(
uzVb0JG{o&O1PU-PEZ91Gqe}-P1A|{~;sxG=%)BBMAYo5eKbLh*2~7avpdPFM

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
index a8fda54fc9332fe037dae35c49093bc5c4650995..aa96bdf1413ef62c74bf66a89b6c77178ca55855 100644
GIT binary patch
literal 954
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCim11AIbU85|f?l9;?NuxQi*g&1O=CZ7jVtR+Ey!T*7P;rBMaV4whJfk$L9
z0|Va?5N4dJ%_j{Mlq_+LC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGc@et5IYA{v?Ddb
zGtJXei-7}VE`t;!D+42t<pspjP&UZv8jQ?faV8+!kdcW&5J*P>ab`OUSUd;F1_7RO
zMurzaAHryKTNxODk`ve&Sb%B`jEoH!7eLGf*~z*9V%9Vu8w8kuCNqIm23cAFSx{Yu
z1_mJ6rVW2KUHX;02dK`<)5S5QBJS<&i+QUJ1Y9ppdh&n&PG(tUVKu>plG}3UF8%hf
zY{g+QCs)6B=NA`qEzoRO#xRR11BsE#RJSZt;@YE{;s+(W@4o+*dVli&jO0xdtBtq2
z#{H|SY@Ggi|I6E7#b5uiT+ku@VPR&P-3`$XD=qgp^v=j<irV9uebL5dgF3>*A1>ef
zg(UrVhqH@(<otC(X5MSAnnyP{_4v-~^S=0}c5VU80cK$i$L9aanJqp`e%dqkW4{tt
zrhVR2Tk|SW=djrU`E9;6O?D>BpGmUqX8QN)*%i)5jCb!Ju?=GIWi(;EAmSjct?)Zg
zDS4lz!Q;y+TmSg4{&9FuCzAUrn^vEGHoHMA|5B6*KmVIf6i;IY14!gn1EcP~{*dZf
z@B3$-vhIxkv)*m1{{B!&Hj$4^b|$)K-1jiqnYxSJ*jcfUKjV$s-O5?*$G^BhoD&Rl
z7ZM})K*N%?2bZKaH&lKuxo7|F>}A>6)89V!H%s4awzrw#evSD@FFTX@XC_aR{lul?
zuJ`YwS9jICEpIx^3)4j$kPL!)87gv&^Te%R+MAxew%_+>;itKk^ESMUW&QDNH`w=C
zb{9agQ`_|J(od-iuY9BS%xY)<j^@Y%RW@~u@3ggAbro)@gHn{ItDnm{r-UW|>cUJ0

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CVRR#hE&XX
zd&`mQuz~=?fwk-3?ElnRr}jkn?aF+P+s>W~zlbHREoHNL;TRH85Ub4a;<AZ;W!&}f
z+0Rs?*T2l(cGf-3&F-ybOHg*>*1PMsZ~v#Mq_?!D=l|A)&I}9<)7tiR$xZFuy3Ja8
zO7GDJia;BIuDMdH`R`}=i&;k}MHS2c@?Dp<amj3_GZ(<JB@Y=>Ex#>pl(<m^QtRpJ
K=d#Wzp$Pz#c~))!


From be5022a069b5f8876395b3d7953e6e92784e9ed1 Mon Sep 17 00:00:00 2001
From: Aearo-Deepwater <77557990+Aearo-Deepwater@users.noreply.github.com>
Date: Fri, 2 Jan 2026 23:54:00 -0700
Subject: [PATCH 221/360] Ironsands Structures (#39793)

* Add 6 new ironsand tiles

Ironsand plating and ironsand tile are based on the asteroid plating and
asteroid tile tiles. Ironsand concrete tiles are based on the concrete
and gray concrete tiles. Packed ironsand is slightly based on smooth gray
concrete, but mostly original.

* Add ironsand cobble wall

* Finish adding tile objects for ironsand concrete tiles

Includes inhands, even though the other concrete tiles don't even have
'em.

* Add cutter recipes for ironsand concrete

I'm sad that I can't require iron ore for these recipes. Iron ore can't
go in a cutter, though, and changing that seems like it'd be more
complicated than it's worth. Assuming I don't just make the thing accept
any and all ores, which... um.

* Delete temporary .swp file that shouldn't have been in the repo to begin with

* Add ironsand pavement tile

* Add ironsand stone door

* Add ironsandstone walls

* Improve packed ironsand texture

* Add ironsand step

* Add ironsand step corner

* Add three mysterious, runed pillars

* Lighten ironsand wall border

* Replace art for paved ironsand

* Make steps more closely match paved ironsand tiles

* Increase border contrast of ironstone door

* Add fake "astro-" versions of ironsand tiles

* Add second tall pillar sprite

* Add prototype for second tall statue

* Make astro-ironsand researchable and latheable

* Update corner step texture to match straight steps

* Add corner steps that go the other way

* Add door variant to match cobbled ironsand wall

* Fix license for ironsand step sprites

* Darken ironsandstone walls for better contrast

* Update ironstone doors to match walls and be more distinct

* Remove merge conflict detritus

* Fix duplicate component

* Update tile stack prototypes

* Add detail to copyright info

* Improve ironstone wall and door destruction

* Normalize ironsand statue prototypes

* Normalize ironsand tile object prototypes

* Move ironsand plating in with the rest of the plating tiles

* Remove .gitignore additions

I might just make a new PR just for this, though. I'm very tempted.

* Add sound effect to ironsand step destruction

* Add abstract base class to stairs and steps

* Remove redundant destruction trigger behavior from cardboard door

* Add destruction behavior to ironsand statues

* Fix up ironsand step prototypes

* Remove redundant bits from ironsandstone wall prototypes

* Remove ironstone door crush behavior

* Add individual ironstone statue bounding boxes

* Make ironstone statues shootable

* Tweak ironsand statue bounding boxes
---
 Resources/Locale/en-US/stack/stacks.ftl       |   5 +
 Resources/Locale/en-US/tiles/tiles.ftl        |   9 ++
 .../Entities/Objects/Misc/tiles.yml           |  78 +++++++++++
 .../Structures/Decoration/statues.yml         | 121 ++++++++++++++++++
 .../Doors/MaterialDoors/material_doors.yml    |  59 +++++++++
 .../Entities/Structures/Walls/asteroid.yml    |  31 +++++
 .../Entities/Structures/Walls/walls.yml       |  34 +++++
 .../Entities/Structures/ironsand_steps.yml    |  52 ++++++++
 .../Prototypes/Entities/Structures/stairs.yml |  19 ++-
 .../Prototypes/Recipes/Lathes/Packs/tiles.yml |   7 +-
 Resources/Prototypes/Recipes/Lathes/tiles.yml |  25 ++++
 .../Prototypes/Research/civilianservices.yml  |   2 +
 .../Prototypes/Stacks/Tiles/concrete.yml      |  18 +++
 Resources/Prototypes/Stacks/Tiles/faux.yml    |  12 ++
 Resources/Prototypes/Tiles/floors.yml         |  20 +++
 Resources/Prototypes/Tiles/ironsand.yml       |  98 ++++++++++++++
 Resources/Prototypes/Tiles/plating.yml        |  11 ++
 .../Objects/Tiles/tile.rsi/astro-ironsand.png | Bin 0 -> 925 bytes
 .../Tiles/tile.rsi/ironsand-inhand-left.png   | Bin 0 -> 488 bytes
 .../Tiles/tile.rsi/ironsand-inhand-right.png  | Bin 0 -> 500 bytes
 .../Objects/Tiles/tile.rsi/ironsand.png       | Bin 0 -> 741 bytes
 .../tile.rsi/ironsandconcrete-inhand-left.png | Bin 0 -> 328 bytes
 .../ironsandconcrete-inhand-right.png         | Bin 0 -> 338 bytes
 .../Tiles/tile.rsi/ironsandconcrete-mono.png  | Bin 0 -> 705 bytes
 .../tile.rsi/ironsandconcrete-smooth.png      | Bin 0 -> 632 bytes
 .../Tiles/tile.rsi/ironsandconcrete.png       | Bin 0 -> 801 bytes
 .../Textures/Objects/Tiles/tile.rsi/meta.json |  41 +++++-
 .../Decoration/ironsand_statue.rsi/meta.json  |  17 +++
 .../ironsand_statue.rsi/small_pillar.png      | Bin 0 -> 1007 bytes
 .../ironsand_statue.rsi/small_pillar_2.png    | Bin 0 -> 1289 bytes
 .../inverse_pillar.png                        | Bin 0 -> 2980 bytes
 .../ironsand_statue_tall.rsi/meta.json        |  17 +++
 .../pillar_of_weh.png                         | Bin 0 -> 2448 bytes
 .../encrusted_ironstone_door.rsi/closed.png   | Bin 0 -> 2187 bytes
 .../encrusted_ironstone_door.rsi/closing.png  | Bin 0 -> 4383 bytes
 .../encrusted_ironstone_door.rsi/meta.json    |  57 +++++++++
 .../encrusted_ironstone_door.rsi/open.png     | Bin 0 -> 1017 bytes
 .../encrusted_ironstone_door.rsi/opening.png  | Bin 0 -> 4488 bytes
 .../ironstone_door.rsi/closed.png             | Bin 0 -> 2186 bytes
 .../ironstone_door.rsi/closing.png            | Bin 0 -> 4362 bytes
 .../MineralDoors/ironstone_door.rsi/meta.json |  63 +++++++++
 .../MineralDoors/ironstone_door.rsi/open.png  | Bin 0 -> 953 bytes
 .../ironstone_door.rsi/opening.png            | Bin 0 -> 4472 bytes
 .../ironstone_door.rsi/runes_bright.png       | Bin 0 -> 524 bytes
 .../ironstone_door.rsi/runes_dim.png          | Bin 0 -> 984 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick0.png | Bin 0 -> 1602 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick1.png | Bin 0 -> 1481 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick2.png | Bin 0 -> 1602 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick3.png | Bin 0 -> 1481 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick4.png | Bin 0 -> 1491 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick5.png | Bin 0 -> 1457 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick6.png | Bin 0 -> 1491 bytes
 .../cobblebrick_ironsand.rsi/cobblebrick7.png | Bin 0 -> 305 bytes
 .../Walls/cobblebrick_ironsand.rsi/full.png   | Bin 0 -> 1284 bytes
 .../Walls/cobblebrick_ironsand.rsi/meta.json  |  47 +++++++
 .../Walls/rock.rsi/ironsandstone.png          | Bin 0 -> 1193 bytes
 .../Walls/rock.rsi/ironsandstone_east.png     | Bin 0 -> 446 bytes
 .../Walls/rock.rsi/ironsandstone_north.png    | Bin 0 -> 309 bytes
 .../Walls/rock.rsi/ironsandstone_south.png    | Bin 0 -> 432 bytes
 .../Walls/rock.rsi/ironsandstone_west.png     | Bin 0 -> 460 bytes
 .../Structures/Walls/rock.rsi/meta.json       |  17 ++-
 .../ironsand_steps.rsi/corner_concave.png     | Bin 0 -> 2809 bytes
 .../ironsand_steps.rsi/corner_convex.png      | Bin 0 -> 1619 bytes
 .../Structures/ironsand_steps.rsi/meta.json   |  23 ++++
 .../ironsand_steps.rsi/straight.png           | Bin 0 -> 1883 bytes
 .../Tiles/Asteroid/ironsand_packed.png        | Bin 0 -> 7210 bytes
 .../Tiles/Asteroid/ironsand_paved.png         | Bin 0 -> 9080 bytes
 .../Asteroid/ironsand_paved_border_e.png      | Bin 0 -> 305 bytes
 .../Asteroid/ironsand_paved_border_n.png      | Bin 0 -> 308 bytes
 .../Asteroid/ironsand_paved_border_s.png      | Bin 0 -> 305 bytes
 .../Asteroid/ironsand_paved_border_w.png      | Bin 0 -> 334 bytes
 .../Tiles/Asteroid/ironsand_plating.png       | Bin 0 -> 1147 bytes
 .../Textures/Tiles/Asteroid/ironsand_tile.png | Bin 0 -> 1909 bytes
 .../Tiles/Asteroid/ironsand_uneven_paved.png  | Bin 0 -> 10729 bytes
 .../Planet/Concrete/ironsandconcrete.png      | Bin 0 -> 6083 bytes
 .../Planet/Concrete/ironsandconcrete_mono.png | Bin 0 -> 5949 bytes
 .../Concrete/ironsandconcrete_smooth.png      | Bin 0 -> 6365 bytes
 77 files changed, 870 insertions(+), 13 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Structures/ironsand_steps.yml
 create mode 100644 Resources/Prototypes/Tiles/ironsand.yml
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png
 create mode 100644 Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png
 create mode 100644 Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png
 create mode 100644 Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png
 create mode 100644 Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png
 create mode 100644 Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png
 create mode 100644 Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png
 create mode 100644 Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png
 create mode 100644 Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png
 create mode 100644 Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png
 create mode 100644 Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png
 create mode 100644 Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png
 create mode 100644 Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png
 create mode 100644 Resources/Textures/Structures/ironsand_steps.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/ironsand_steps.rsi/straight.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_packed.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_paved.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_plating.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_tile.png
 create mode 100644 Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png
 create mode 100644 Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png
 create mode 100644 Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png
 create mode 100644 Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png

diff --git a/Resources/Locale/en-US/stack/stacks.ftl b/Resources/Locale/en-US/stack/stacks.ftl
index 6ff0906b83..7a9898ea10 100644
--- a/Resources/Locale/en-US/stack/stacks.ftl
+++ b/Resources/Locale/en-US/stack/stacks.ftl
@@ -217,6 +217,9 @@ stack-gray-concrete-smooth = gray concrete smooth
 stack-old-concrete-tile = old concrete tile
 stack-old-concrete-mono-tile = old concrete mono tile
 stack-old-concrete-smooth = old concrete smooth
+stack-ironsand-concrete-tile = ironsand concrete tile
+stack-ironsand-concrete-mono-tile = ironsand concrete mono tile
+stack-ironsand-concrete-smooth = ironsand concrete smooth
 stack-silver-floor-tile = silver floor tile
 stack-bcircuit-floor-tile = bcircuit floor tile
 stack-grass-floor-tile = grass floor tile
@@ -248,3 +251,5 @@ stack-white-marble-floor = white marble floor
 stack-dark-marble-floor = dark marble floor
 stack-plasma-marble-floor = plasmarble floor
 stack-uranium-marble-floor = uranium marble floor
+stack-astro-ironsand-floor = astro-ironsand floor
+stack-astro-ironsand-floor-borderless = borderless astro-ironsand floor
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index fd41511590..67e46915b3 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -135,6 +135,8 @@ tiles-astro-ice = astro-ice
 tiles-astro-snow = astro-snow
 tiles-astro-asteroid-sand = asteroid astro-sand
 tiles-astro-asteroid-sand-borderless = borderless asteroid astro-sand
+tiles-astro-ironsand = astro-ironsand
+tiles-astro-ironsand-borderless = borderless astro-ironsand
 tiles-desert-astro-sand = desert astro-sand
 tiles-wood-large = large wood
 tiles-xeno-floor = xeno floor
@@ -147,3 +149,10 @@ tiles-white-marble = white marble tile
 tiles-dark-marble = dark marble tile
 tiles-plasma-marble = plasmarble tile
 tiles-uranium-marble = uranium marble tile
+tiles-ironsand-plating = ironsand plating
+tiles-ironsand-tile = ironsand tile
+tiles-ironsand-concrete-tile = ironsand concrete tile
+tiles-ironsand-concrete-slab = ironsand concrete slab
+tiles-ironsand-concrete-smooth = smooth ironsand concrete floor
+tiles-ironsand-packed = packed ironsand
+tiles-ironsand-paved = paved ironsand
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index a57a2908e0..bc52f42da5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -997,6 +997,50 @@
   - type: Stack
     stackType: FloorTileOldConcreteSmooth
 
+- type: entity
+  parent: FloorTileItemBase
+  id: FloorTileItemIronsandConcrete
+  name: iron sand concrete tile
+  components:
+  - type: Sprite
+    state: ironsandconcrete
+  - type: Item
+    heldPrefix: ironsandconcrete
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorIronsandConcrete
+  - type: Stack
+    stackType: FloorTileIronsandConcrete
+
+- type: entity
+  parent: FloorTileItemIronsandConcrete
+  id: FloorTileItemIronsandConcreteMono
+  name: iron sand concrete mono tile
+  components:
+  - type: Sprite
+    state: ironsandconcrete-mono
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorIronsandConcreteMono
+  - type: Stack
+    stackType: FloorTileIronsandConcreteMono
+
+- type: entity
+  parent: FloorTileItemIronsandConcrete
+  id: FloorTileItemIronsandConcreteSmooth
+  name: iron sand concrete smooth
+  components:
+  - type: Sprite
+    state: ironsandconcrete-smooth
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorIronsandConcreteSmooth
+  - type: Stack
+    stackType: FloorTileIronsandConcreteSmooth
+
 # Carpets
 - type: entity
   name: blue arcade floor
@@ -1609,6 +1653,40 @@
   - type: Stack
     stackType: FloorTileAstroAsteroidSand
 
+- type: entity
+  parent: FloorTileItemBase
+  id: FloorTileItemAstroIronsand
+  name: astro-ironsand
+  description: Fake red sand. Imported from fake Mars.
+  components:
+  - type: Sprite
+    state: astro-ironsand
+  - type: Item
+    heldPrefix: ironsand
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorAstroIronsand
+  - type: Stack
+    stackType: FloorTileAstroIronsand
+
+- type: entity
+  parent: FloorTileItemBase
+  id: FloorTileItemAstroIronsandBorderless
+  name: borderless astro-ironsand
+  description: Fake red sand. Imported from fake Mars.
+  components:
+  - type: Sprite
+    state: ironsand
+  - type: Item
+    heldPrefix: ironsand
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorAstroIronsandBorderless
+  - type: Stack
+    stackType: FloorTileAstroIronsandBorderless
+
 - type: entity
   parent: FloorTileItemBase
   id: FloorTileItemDesertAstroSand
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
index 1781190e29..3e6f874ce1 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
@@ -41,3 +41,124 @@
   - type: Construction
     graph: BananiumStatueClown
     node: bananiumStatue
+
+# Ironsand Statues
+
+- type: entity
+  abstract: true
+  parent: BaseStructure
+  id: BaseIronsandStatue
+  description: A mysterious statue found in a desert of iron sand.
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Rock
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150 # Overkill
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SteelOre1:
+            min: 1
+            max: 2
+
+- type: entity
+  parent: BaseIronsandStatue
+  id: StatueIronsandSmall
+  name: ironsand small statue
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/ironsand_statue.rsi
+    state: small_pillar
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: BaseIronsandStatue
+  id: StatueIronsandSmall2
+  name: ironsand small statue
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/ironsand_statue.rsi
+    state: small_pillar_2
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: BaseIronsandStatue
+  id: StatueIronsandTall
+  name: ironsand tall statue
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/ironsand_statue_tall.rsi
+    state: pillar_of_weh
+    offset: "0.0,0.5"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.30,-0.30,0.30,0.30"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: BaseIronsandStatue
+  id: StatueIronsandTall2
+  name: ironsand tall statue
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/ironsand_statue_tall.rsi
+    state: inverse_pillar
+    offset: "0.0,0.5"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.1,0.45,0.1"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index e9faaece39..35261b1506 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -367,3 +367,62 @@
           MaterialCardboard:
             min: 3
             max: 5
+
+- type: entity
+  parent: BaseMaterialDoorNavMap
+  id: IronstoneDoor
+  name: ironstone door
+  description: A mysterious door made of rune-etched stone.
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/MineralDoors/ironstone_door.rsi
+  - type: Door
+    openSound:
+      path: /Audio/Effects/stonedoor_openclose.ogg
+    closeSound:
+      path: /Audio/Effects/stonedoor_openclose.ogg
+  - type: RCDDeconstructable
+    deconstructable: false
+  - type: Damageable
+    damageModifierSet: Rock
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors: *OverkillBehavior
+    - trigger:
+        !type:DamageTrigger
+        damage: 250 # A pickaxe can destroy this in two hits, since the door is rock.
+      behaviors: &IronstoneDestructionBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SteelOre1:
+            min: 0
+            max: 1
+
+- type: entity
+  parent: IronstoneDoor
+  id: EncrustedIronstoneDoor
+  name: encrusted ironstone door
+  description: A stone door covered in nacreous blobs of an unknown substance.
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors: *OverkillBehavior
+    - trigger:
+        !type:DamageTrigger
+        damage: 375
+      behaviors: *IronstoneDestructionBehavior
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 9c8b1ac62f..6cda8347bb 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -500,6 +500,37 @@
     oreChance: 0.33
     oreRarityPrototypeId: RandomOreDistributionStandard
 
+- type: entity
+  id: IronSandstone
+  parent: AsteroidRock
+  name: ironsandstone
+  suffix: no ore yield
+  components:
+  - type: Icon
+    state: ironsandstone
+  - type: Sprite
+    sprite: Structures/Walls/rock.rsi
+    layers:
+    - state: ironsandstone
+    - map: [ "enum.EdgeLayer.South" ]
+      state: ironsandstone_south
+    - map: [ "enum.EdgeLayer.East" ]
+      state: ironsandstone_east
+    - map: [ "enum.EdgeLayer.North" ]
+      state: ironsandstone_north
+    - map: [ "enum.EdgeLayer.West" ]
+      state: ironsandstone_west
+
+- type: entity
+  id: IronSandstoneMining
+  parent: IronSandstone
+  name: ironsandstone
+  suffix: higher ore yield
+  components:
+  - type: OreVein
+    oreChance: 0.33
+    oreRarityPrototypeId: RandomOreDistributionStandard
+
 # Ore veins
 - type: entity
   id: IronRockCoal
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 08df0091f7..749ad6a246 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -1707,6 +1707,40 @@
     key: cobblebricks
     base: cobblebrick
 
+- type: entity
+  parent: WallCobblebrick
+  id: WallIronsandCobblebrick
+  name: ironsand brick wall
+  description: The pale, rounded shapes that make up this wall look strikingly different from the iron sands they were allegedly made from.
+  components:
+  - type: Sprite
+    sprite: Structures/Walls/cobblebrick_ironsand.rsi
+  - type: Icon
+    sprite: Structures/Walls/cobblebrick_ironsand.rsi
+  - type: IconSmooth
+    key: cobblebricks
+    base: cobblebrick
+  - type: RCDDeconstructable
+    deconstructable: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SteelOre1:
+            min: 0
+            max: 2
+
 # Cardboard
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/ironsand_steps.yml b/Resources/Prototypes/Entities/Structures/ironsand_steps.yml
new file mode 100644
index 0000000000..67ce012c2e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/ironsand_steps.yml
@@ -0,0 +1,52 @@
+- type: entity
+  parent: BaseFloorDecoration
+  id: IronsandStep
+  name: ironsand step
+  description: Takes your ironsand up a level.
+  components:
+  - type: Sprite
+    sprite: Structures/ironsand_steps.rsi
+    state: straight
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Rock
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SteelOre1:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  parent: IronsandStep
+  id: IronsandStepConvexCorner
+  name: ironsand step convex corner
+  components:
+  - type: Sprite
+    state: corner_convex
+
+- type: entity
+  parent: IronsandStep
+  id: IronsandStepConcaveCorner
+  name: ironsand step concave corner
+  components:
+  - type: Sprite
+    state: corner_concave
diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml
index c796a7a06a..83ddf5cef9 100644
--- a/Resources/Prototypes/Entities/Structures/stairs.yml
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -1,22 +1,29 @@
+- type: entity
+  abstract: true
+  id: BaseFloorDecoration
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: Sprite
+    drawdepth: FloorTiles
+
 - type: entity
   id: Stairs
+  parent: BaseFloorDecoration
   name: stairs
   suffix: Steel
   description: The greatest invention since rocket-propelled grenades.
-  placement:
-    mode: SnapgridCenter
   components:
   - type: Anchorable
     flags:
     - Anchorable
   - type: Rotatable
-  - type: Clickable
   - type: Sprite
     sprite: _DV/Structures/stairs.rsi # Delta V - Resprite stairs
     state: stairs_steel
-    drawdepth: FloorTiles
-  - type: Transform
-    anchored: true
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
index 5a8babcffa..c0ee0bb7ee 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
@@ -68,6 +68,9 @@
   - FloorTileItemOldConcrete
   - FloorTileItemOldConcreteMono
   - FloorTileItemOldConcreteSmooth
+  - FloorTileItemIronsandConcrete
+  - FloorTileItemIronsandConcreteMono
+  - FloorTileItemIronsandConcreteSmooth
 
 - type: latheRecipePack
   id: CircuitFloorsStatic
@@ -96,4 +99,6 @@
   - FauxTileAstroSnow
   - FauxTileAstroAsteroidSand
   - FauxTileDesertAstroSand
-  - FauxTileMowedAstroSnow # DeltaV
\ No newline at end of file
+  - FauxTileMowedAstroSnow # DeltaV
+  - FauxTileAstroIronsand
+  - FauxTileAstroIronsandBorderless
diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
index a28f1b7a50..e43e69e934 100644
--- a/Resources/Prototypes/Recipes/Lathes/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml
@@ -346,6 +346,21 @@
   id: FloorTileItemOldConcreteSmooth
   result: FloorTileItemOldConcreteSmooth
 
+- type: latheRecipe
+  parent: BaseConcreteTileRecipe
+  id: FloorTileItemIronsandConcrete
+  result: FloorTileItemIronsandConcrete
+
+- type: latheRecipe
+  parent: BaseConcreteTileRecipe
+  id: FloorTileItemIronsandConcreteMono
+  result: FloorTileItemIronsandConcreteMono
+
+- type: latheRecipe
+  parent: BaseConcreteTileRecipe
+  id: FloorTileItemIronsandConcreteSmooth
+  result: FloorTileItemIronsandConcreteSmooth
+
 # Faux
 - type: latheRecipe
   parent: BaseFauxTileRecipe
@@ -397,6 +412,16 @@
   id: FauxTileDesertAstroSand
   result: FloorTileItemDesertAstroSand
 
+- type: latheRecipe
+  parent: BaseFauxTileRecipe
+  id: FauxTileAstroIronsand
+  result: FloorTileItemAstroIronsand
+
+- type: latheRecipe
+  parent: BaseFauxTileRecipe
+  id: FauxTileAstroIronsandBorderless
+  result: FloorTileItemAstroIronsandBorderless
+
 # Marble
 - type: latheRecipe
   parent: BaseMarbleTileRecipe
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 5e347d8e74..484913091f 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -118,6 +118,8 @@
   - FauxTileMowedAstroSnow # DeltaV
   - FauxTileAstroAsteroidSand
   - FauxTileDesertAstroSand
+  - FauxTileAstroIronsand
+  - FauxTileAstroIronsandBorderless
 
 - type: technology
   id: BiochemicalStasis
diff --git a/Resources/Prototypes/Stacks/Tiles/concrete.yml b/Resources/Prototypes/Stacks/Tiles/concrete.yml
index a10b2e212e..108a7f56e8 100644
--- a/Resources/Prototypes/Stacks/Tiles/concrete.yml
+++ b/Resources/Prototypes/Stacks/Tiles/concrete.yml
@@ -53,3 +53,21 @@
   id: FloorTileOldConcreteSmooth
   name: stack-old-concrete-smooth
   spawn: FloorTileItemOldConcreteSmooth
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileIronsandConcrete
+  name: stack-ironsand-concrete-tile
+  spawn: FloorTileItemIronsandConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileIronsandConcreteMono
+  name: stack-ironsand-concrete-mono-tile
+  spawn: FloorTileItemIronsandConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileIronsandConcreteSmooth
+  name: stack-ironsand-concrete-smooth
+  spawn: FloorTileItemIronsandConcreteSmooth
diff --git a/Resources/Prototypes/Stacks/Tiles/faux.yml b/Resources/Prototypes/Stacks/Tiles/faux.yml
index 00c9e52525..48761bdfe8 100644
--- a/Resources/Prototypes/Stacks/Tiles/faux.yml
+++ b/Resources/Prototypes/Stacks/Tiles/faux.yml
@@ -53,3 +53,15 @@
   id: FloorTileDesertAstroSand
   name: stack-desert-astro-sand-floor
   spawn: FloorTileItemDesertAstroSand
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroIronsand
+  name: stack-astro-ironsand-floor
+  spawn: FloorTileItemAstroIronsand
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroIronsandBorderless
+  name: stack-astro-ironsand-floor-borderless
+  spawn: FloorTileItemAstroIronsandBorderless
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index c3840aaaa4..249ba7a4d9 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -2065,6 +2065,26 @@
   itemDrop: FloorTileItemDesertAstroSand
   weather: false
 
+- type: tile
+  id: FloorAstroIronsand
+  name: tiles-astro-ironsand
+  parent: FloorAsteroidIronsand
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  itemDrop: FloorTileItemAstroIronsand
+  weather: false
+
+- type: tile
+  id: FloorAstroIronsandBorderless
+  name: tiles-astro-ironsand-borderless
+  parent: FloorAsteroidIronsandBorderless
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  itemDrop: FloorTileItemAstroIronsandBorderless
+  weather: false
+
 - type: tile
   id: FloorWoodLarge
   name: tiles-wood-large
diff --git a/Resources/Prototypes/Tiles/ironsand.yml b/Resources/Prototypes/Tiles/ironsand.yml
new file mode 100644
index 0000000000..f1558d9f20
--- /dev/null
+++ b/Resources/Prototypes/Tiles/ironsand.yml
@@ -0,0 +1,98 @@
+- type: tile
+  id: FloorIronsandTile
+  name: tiles-ironsand-tile
+  sprite: /Textures/Tiles/Asteroid/ironsand_tile.png
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorIronsandConcrete
+  name: tiles-ironsand-concrete-tile
+  sprite: /Textures/Tiles/Planet/Concrete/ironsandconcrete.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemIronsandConcrete
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorIronsandConcreteMono
+  name: tiles-ironsand-concrete-slab
+  sprite: /Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemIronsandConcreteMono
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorIronsandConcreteSmooth
+  name: tiles-ironsand-concrete-smooth
+  sprite: /Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: FloorTileItemIronsandConcreteSmooth
+  heatCapacity: 10000
+
+- type: tile
+  id: IronsandPacked
+  name: tiles-ironsand-packed
+  sprite: /Textures/Tiles/Asteroid/ironsand_packed.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Space
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepAsteroid
+  friction: 1.5
+  heatCapacity: 10000
+
+- type: tile
+  id: IronsandPaved
+  name: tiles-ironsand-paved
+  sprite: /Textures/Tiles/Asteroid/ironsand_uneven_paved.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Space
+  isSubfloor: false
+  footstepSounds:
+    collection: FootstepTile
+  friction: 1.5
+  heatCapacity: 10000
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 6275b02aef..6d8609d80f 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -75,6 +75,17 @@
   friction: 0.75 #a little less then actual snow
   heatCapacity: 10000
 
+- type: tile
+  id: PlatingIronsand
+  name: tiles-ironsand-plating
+  sprite: /Textures/Tiles/Asteroid/ironsand_plating.png
+  baseTurf: Lattice
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 1.5
+  heatCapacity: 10000
+
 - type: tile
   id: Lattice
   name: tiles-lattice
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png b/Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png
new file mode 100644
index 0000000000000000000000000000000000000000..07420fc23b5e7abc2004e557a356781118e820f6
GIT binary patch
literal 925
zcmV;O17iG%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2NMAv1*rOE>;M1)
z^GQTOR9M69mP>9NM+}BPvT8;%BaamrvXw**l3k)B1kk0j(iybMr3B;%LN<YcXq3c(
zWQ-oIepHcJ^i1mkqkAB4vJim=`cc*VN&fs<@M16aVjI}e;ej6=9{AIDecv}V8Cvkm
z&p-NiU(JZBES5$0et&1iVp-t8`<)rdjDN1nM|+P?PUVXL9339`-h9GH6;;8^Ia?O&
z%_k^A(EIJ~PBtf~A_8a2f;t<&{`PyX5AAclzcVAKQX~A41KFMZohfk*$lI(36-1<S
z4)E>k8RMXXCD1<S01d*q2j1_#=1)dk7Bx7ifH`DqBX{VW-=$1YVSi`F5H|)Pj&Z)p
zHTB;gd6!DwOt%mLUx5fJeDFxN)=!m;?NKCUBbl)`pY($GEP&&aQ&|&EfKd>pqsTNy
z+E`bcS0Vo(>7EY)sx3dFDp8eZWnc}WN`^{XZxIM0WOI@^=FVl=a8WjVDjNW{f|9ba
zq6f*W7eE*yq2uU-Xnl1r2$yBzr`<VbPMM9{I%DosIio752!CDO^|oU#3F~B-fj{Zn
zpu$DjaIiZ^MR>Ipc{>|Z=R}#En<`PJypa&~a$p>lt*DQpcUtC;f^bted@5_Ms)l6F
z*RQ7BmNg-SRo>w3_A^NMl!)tk%Id1Kk+O49R9u%e|K5~bR}G8h9V%_=r?LI@IQEk;
z4y7oYgFw#CXeBh`puCv~7iHqMs#?9cYe3-jWQ(8>S6#7K7QGyZLnIX7gGb(3g?VNY
zTi%+(?sUX_tdHs)6viqW52HAwgaF@@um@aN%P&9>WqYJuomxp2HXV(+NeM(ik<U&p
zl{Vel%>zMXgE70Y63RV@hn7~-D-Tq0ofY>sL+4k;;7A_q0uez}Xw0ZmdjXg^bvB$f
z-3Hwnb7;)F?s;|zIuJlmMYV0Kvt_}@+maaCu2`?>#7f|NS!{G58RWo25bIOX@yV$i
zpPb71vgn={%c2`Riw&KB@wxChYhLWd{&)5tOD&wOl?D+~00000NkvXXu0mjflm3@B

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b678bffeb086491d7373ff22a88627049883083b
GIT binary patch
literal 488
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a
z5n0T@z%2~Ij105pNB{-dOFVsD*<Z2?Gx75@>~vrR+GpqK;uunK>+P+LUabK#Y#-KF
zuPbm^=vq)>-*`dj&PK<KoR_Xr)eOhw7KFcGZDL#aw9m1i`It4EUgIJ8C;h%$x<{{O
zD?I<L`{>ik`Es&<m|dXY$@IxPo8GTKXU!lGddGIZY|R{{^H$kB3=h7&EZz1w=B!}U
zlSuVd0-;A1%1%w}bxdJqIB@u@>-HH;T{f@1R1UXZztne1Ff^o>=k`u7iz>!z5*E)l
zc$-fyessZ4@6&zmj+}-kdym|#v$o8hp7-I#oO8c~V&ttiWU&-x1bTC4^SG3L5%RE)
zn;@mINi0<PPl_Nin7AKkN!{)Lr?XzNen~d@dsN<P;-<JN#)-UbyYKy<_Wc#-i>V%M
z6Q$O3tyt>X$#TxJX4h$X??c_H3afT-?r-=jwsp&5^`MT96Ylrzj%D~g<z9OO7`P0c
Lu6{1-oD!M<<s`Xv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa2c52bb798e0babe35db7b252f5c50ad62c57ae
GIT binary patch
literal 500
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a
z5n0T@z%2~Ij105pNB{-dOFVsD*<Z2?Gx1r4Nj$j;w9m`a#WAGf*4tb5-iIAzj(uF7
z>CG2Zz*+ic9^cWW7tStS5FOvWSbqT!<sURxun5^@(dFFQ*XMMMZQYcZIZ9vsc@DmO
z^?h?of%}Q~<>ir|Jb=~!!H@W;Q0C7sR~Wo?m{d~w{mQ4c8)kQJcAAv)uB7&V%+G(0
zR~=+pH|?B!cJ8ywfe(W}cHi7FVadFgt748E<Gpd~ue<WJSJjtWj^@NHx#?$CuC;#u
z%PY18wlg#)rkJf1UtPbWp#6JqxkKiUUn?$8XaDMReRckU+_FVq6N0SQ7qQ>Cb8-uF
z?%TLR5v{XjaUyxe%PqJ{GlMfXud-!=I1faAID5UPA^%|Kd=_7|<AFa`zS#ApmEX!&
zZTkLGr`3K;ll<|SPa|2~`)mKR2=lClO!g}8b5m71r@gv<%)jp)$BjFg8zNVx?~-y0
fnl*7B(8F(JZz*NXi0e<E2{PQ%)z4*}Q$iB}@$$|9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee24ca8ebf3840f995e8c1105d39158f3dc40722
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2NMAv7A!<0G5`Pq
zJ4r-AR9M69mQ8LGK@f$%S3TpO{D5Sl2&71`i*f{{T#5~xffbiR;s}UMgcJz@A|Zjq
zj>p|yEM~?@5ZEJZiH&RPp6;)zUcEAGViTMA&!J@pUOYeaUa-IZ?h7t?{r0_90(f<N
z<OdJ805B6dI})VqxI?hp&)uDro#GDc$@vv;-hEj3hAkt^K!rF-f#gnhM^X*s4%8r$
z2zGm2c34!o&HyvSCl4I#J>Zm*^Kk_ZruvbT>&zWclj|g=d(~M9pojA$RaBq9vLA04
z4f{yo4MZ^U(F;<pt1*q4?Xn=I+zFuQB9bzQo(gbq95vFhCgo>}c$>azy#&{K0H!h1
zFO1|)kT67SN^XLSX`D~OXi(A*MogJT9;>&&tX6nvGR%$Wg2eev<nYlhqkaj%w{gW)
z75Q1sh`y#41nJ(as{#0OU2(Lxi%IPC3yL64FRwu*vls!09m=o}K)UU7YdTOXzYOB4
znvonPvxrGN-WhUwF=p5=aco|-e+Fn1aIaz7>#CHA$vGQO2@>BY6<fW6%gGFrFo|Jd
z{8&c|Qg#re<dkMewZV)A;_N1JJ)PEmF`0qj!JtntC~Qqr(9ZdOo{~K=D8k(7_J$?9
zJ>w>(JLjR-@$pUo08feJ!tUvzb-Ey9yR><~YD*R!r*Qcgre*<IV?R#2jJz?Uy4*J3
z2b$}}R|Tk2o^QXqf;Nf#+d8%8@m93KM3+u1J@WGSXsN0G=|4f0^3qkjiA`)`69B&e
X6s7B07DE!100000NkvXXu0mjf>Owsz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..20cd2c5015a7a924ab705c4d5bd667d37e70b847
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a
z5n0T@z%2~Ij105pNB{-dOFVsD*<Z4;F)%Uz>8@M{6q@Jh;uunK>+LN=z9s_^wgiPU
zdQ}XES!H_6KSkU-VNk*Nn6cm^lSN{W@HHFZTkoS^T(bW%wd`T2C{Qm$>dM7U{I}0q
z^q$|o@Za}8J8yMdc)YKA@1LjtJkH%*8-BUi=IiwdN+uJn_qW_x_QiU^52ltojQi*O
z?vMfL2D<*}?>Evvw)HElzW@0BT+QOGOZ99{>pL(Cr4+K1Ok$YujI-BIvA6tx3dr{i
Mp00i_>zopr0OFN&bpQYW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc1144f00c2ee4db8b1d803cd2305343a3f9b3c
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a
z5n0T@z%2~Ij105pNB{-dOFVsD*<Z4;F);CewKZ)83a#*TaSW-r_4bw_Uz33dTY|zF
zy()&otTH|3pCay^u&7`>%vkb~$>OSnu(rX)Z@<MnxR(6&+`T6}6sVVB%F=(P1vm2A
z3hLjzFU{hXw*GJSZQ|W3(RGJk7I~|+Jl<EW|L<3Y+x*;TDzi?_mtU;;mq){{;f3Uf
z{Qo+kt3HGL4FqD3c7L1ab>893lTSa=zq|6?vea)CDAI6#Eud-Ja5CEAJ1fJ_3dSpO
VDz;H`FNlJ4c)I$ztaD0e0sw!WaykG2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png
new file mode 100644
index 0000000000000000000000000000000000000000..306a572ca51f4edd1b713bd8c29276b5a2905dd3
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk1_TBmAK|>$_y7O`
z7fD1xR9M69R>6wfFch3xlKs*su>*@KfnIVd{r`{X7xb7*%TipjS$CaAiY2#)_&pq2
zlCa68)N`?sgx@gp-pIg+5hMP0yg9e|;bH!(AcIsTIK)oYQ<b3Fc>q8`M%MVuvujaK
zGaO=vPhU4@Yv^;E1sN=76O@(!0JUr3Lqur_ANw;dM37dfU5lIyYS#h)e)twIzP+eG
za*a$?<KRLB0F;)b2mtud_0Qve-YfDxe|wb$X9=V#LDL45mOxq|(+OON$jP8;912RY
zoJ~+Q4w+U$mNB&L)e5W@7E_}|YL@-z^#Qw{U`__>ZG%iJu_9H;eJt4Qy%Z;{;6sPf
zk`OueON!OP!iRXG!d(dX(4Bmgeg5800swq#_R=G)LN(Zb6#@Q0PDUnSh<SGGg{pCQ
zXD0)~5e20vr`c@;c*g&RsnIf$r6o~-@$3%wX+oZV09bDudEe~)AF6OqWPL8&+=Qu0
zu--P}`OtqR#uMU0cM?cG#M>39b{?yR?cW`2U#xa59$)sz$-t-tK6FAX(}}2X^Ar?)
z-~d3T6iQ2ye9PHHyw1r8v0*aa#RB%36E7!&oD4`SxDds6PD)P6($ei?IE+?Kyx~2-
zp~TI}VRfzi7YQ6<hxtHWF8-zddD4`tg_RyCD8**)FOKn5*Kw*6te+ZGJ1_S;gRfd%
n<9`G`_qnRazpW7?{tf&F=Cmpayz$l#00000NkvXXu0mjfg}*FT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d4fc66a8228ba7b38ad367e2828edb7cedc8947
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk1_TBm5OD*_X#fBL
z&PhZ;R9M69RY7jsFc6%Iq_s-u&^|;c4CGM%pg-!<`lJ59IRpp-1%{)Ru9gv{_7Ibh
z;x<-b9ST%)p`<0agPGw9m@r|&|BerD6~BD`^y}OPU%%bH*&{i1z;~`eQh=m@^KI{)
zqyT_e3#;=j9`|k#!DPs$!ZO%50DxQ*O0Hwg`S!5B)D0;Bz>T>Whk&g;a!nv9kjez?
z8yHe3EMq}4tmYXC%SaDu6qes*(Mba9rN*U_VBbW^gBnl#jQxS2A%)G(B9#J$R8OU|
zE!bA>$nRWJBmw{nnqj@vaK3q$3WEqZ-}Vj-K6iumV5^vspu%Vb3@PNAj=o=|FIgxo
z<D<?xgc~eqHXeaL;ZjLB-yqk7TvJpa;EA8dBM<_$+1dEKt=y3+Arq+-<Arduvpqk%
z&n4IKhJ-;>at%W&&V^B~ApjJ6hCVbaxyJpE3WgMvNZ@=MiKQ}$DvUxPq(2n`xu!Vz
zR`V=+ZAe98uP5Uv$Wt4F&#QTc+nw$C9z1{jUnnde&55%W2otXxt}v8BI0K2H@(&_#
z)sZ(ezbk+CLb+b*n1Kb&u&vx+0&?ia5H0|?mg!&ReXtc)^K6j(6DCafC-57?*z^>o
Sk)65#0000<MNUMnLSTYn3jwGA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3ebee2b140ac7de728611a019590a5cba2da4c1
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk1_TBmEM9E3?f?J+
zcS%G+R9M69mQ8OHF%X8ItnIbaESoJPp&(UMT&RS^PvG}+f-|?Of)=$Y4e2IX@7fy<
zn{`_xlB%i1fy~V_mOWqZI|Dn}$xi-v>8vvz57K336tRdXeI4|%h`5+p05YS3uDvrU
zDn>m`>1#fHyIT8)TxZOT;xOG~m>2-A7bVttUM7b3z?buD-VIW;jF{SrR4b;o0-$s?
z<GJ0Kf#@M=y37j-=K&ZchDlKcoAr&pteWUk-DKn_>piFhYaNJ1#7*TGCI%w~T1FJk
z(>IFCykJiXUO($H&MmQOo*L)3QQs}wqciY!KOu=Fh4bvGrebY2=FXFsjzOYHwc=zl
zBUTZqR!oYLSVT`#g7Ms9qyWH3fps;*#Ng^>xU+9!j<OzQRo~0PlQ>{q&1GJMbKfW?
zMMYk^p!>114-!qRA~F*Pq&(Vz_JO`p3=_k=aum*o5*QgV&Mo8Ia<D>5+mJ81F{7T|
z=)gu8em?v8*9HYR%NGEgPUpy|f&9$6px?>?fDZ>*!1&2z#`A7WsukANd>v0Y9;Ts8
zK;Q%|1mCCg?O}K_nFVa$#d(W{o|0HsW4*seNY?r7VR$jKflw}ImP9t6O>M<_zQ9O<
zj5=8FgJW8VRVKvtD9DTokkT?@km$gCuaYhRze2=~W3AmfzdaAcqWKgEjF)OfsufyB
zxO#c7_F4#1t+<+%j1sdw4DV8F%Xsau0YdsuC-bK9Wb>Sood*-qS`?JNrr%XmzNT13
z+M&bQbirYNuNh7~!>DKOlr84$X2Ga;JE|YO4}5$xT(-^F&i6lgpw+cILVK^>4>s)s
fJK4!j{<-`HECDxuSmjXq00000NkvXXu0mjfLz`Y9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index b1fb0057d7..52bc656cd4 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github), Ironsands concrete variants modified from other concrete and inhands modified from generic inhands by SeaWyrm (github Aearo-Deepwater)",
     "size": {
         "x": 32,
         "y": 32
@@ -73,6 +73,23 @@
         {
             "name": "oldconcrete-smooth"
         },
+        {
+            "name": "ironsandconcrete"
+        },
+        {
+            "name": "ironsandconcrete-mono"
+        },
+        {
+            "name": "ironsandconcrete-smooth"
+        },
+        {
+            "name": "ironsandconcrete-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "ironsandconcrete-inhand-right",
+            "directions": 4
+        },
         {
             "name": "gcircuit"
         },
@@ -600,6 +617,20 @@
             "name": "asteroid-inhand-left",
             "directions": 4
         },
+        {
+            "name": "ironsand"
+        },
+        {
+            "name": "astro-ironsand"
+        },
+        {
+            "name": "ironsand-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ironsand-inhand-left",
+            "directions": 4
+        },
         {
             "name": "xenofloor"
         },
@@ -618,10 +649,10 @@
         {
             "name": "dark-squiggly"
         },
-	{
-	    "name": "white-marble"
-	},
-	{
+        {
+            "name": "white-marble"
+        },
+        {
             "name": "white-marble-inhand-left",
             "directions": 4
         },
diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json
new file mode 100644
index 0000000000..e24b5b182f
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "small_pillar"
+    },
+    {
+      "name": "small_pillar_2"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b884d6d4a858592c00694bc6a98c769ddfce7534
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rk2L}Q*B{<o}+yDRr
zMM*?KR9M69mdkD&MHGg=s_Jg{+<hg9Ng%Q85CkHE6%h;Auw%pCyaCcI*!cmxV`0f}
z0BrLFEMOH0Py~vC0#5AsG9J&^<C$^KbWh)^Siq1?6!(lRdy}&)9o6~kKmUK~z$J$`
zEn$7NYR*#N>y@=v*08c%^2O)(2!fC(NjUNP<XjiaQeX^GoZ#3NQb`m58mTONKj6W`
zC#T+hDuDe)izgd9%uN^R_I&EiF6E+2&yOe<a(Mj!0Tc@kjl&M_EzM)F`0deC_8YCU
zw*X+Jx@_)!bO$LQi6a2~$S^lu=HRf))wv2%f)avSvrRCFc(z?<b?tj`E&zrg02bf6
zilr1%8{T>M7D=k<`vd-b_!#Bb)Vh6uOvOh6FpRZtzA^w#&c)5UNU7)?zM#7L?RVl_
zUGOSKKK=MELcmWC{>c2|u>riyj<*-CV+?F;?Tu`|kpQf(R?UrTGt5p^xbnsfagvbB
zxoqzqkZR4s+w=eDHk&PsHvIZ%BNK>Bb6~&G;@VV+=bJkm)EX2^d2HKadUld1itzh=
z>bo_9C?(Z~B+;2HI8qCS;>(wd*pB`0p)n}S!m=%tl1QbfZSIaFMlp`~06w^VlR_yE
zK+yB~{jcXE*>4zfQ~<*QLJIck#~il0C`*l1JhKK~N}ZHcDg|8IBGr2A&q|IDKoG|X
zjn)a~G5{C@UM~O)LX17n&d>q@cNVYH?synuE}j8PDUOa$XdZO|bMXuqAn!Va1s5UY
z#WP@AipEiwU=Uvp140POr5r{>lB5^UK&myz?H-er0uzpN@eC-XSX!6|V-WHZY#4ey
z;=aP5(dqbuXe8+Ct5uV>j=8yb11uYzXu>EYm(SySeVVlc)Xa3|Wn`p<1mKeomk0(S
zVKAUvDWLz8kVMnz1~`t*<Ybwje|emFD>^k{rMhgEzx)iN4UVnY-r2=*94vc+FiI#E
zbF@1iS7yp6%O(tCl#<wPo*(Z2c<K+CNdr%}>a;o@em}rSNhLo)+w-~g<}CF_n`YZ%
zW3x^W#!QuRBt~%e{l)VWVY}5v7{i1xm^8-kM%bxl``I386l1hzkfcZ@33QC(PO$O!
d7Ox{q`~$*Kbj(01dE)>8002ovPDHLkV1m!yz)}DJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d617045935fa72bacecd905945d3d98c627bb03
GIT binary patch
literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rk2L}Q>H&x@B8UO$U
zUr9tkR9M69mq~9`WgLf}cRJ&}rD@9?8XQQBF5H+H<Hn5}<43@6VA8dG09cdo4d5dX
z62-(}(}fZz3~^zC*tFcrE$!{S_YCjk;<kjLlv{z7yvf;|<ecAge*f{ntMh+9;_(}o
z&M(E6Dfs!hi;rmP$HhPW_=A`I(eYu3M*voPeXd?##%P6-0wpCvf|e4k6`e98F&bkG
zLI{Wvh<G1x&f$H)$3XBA=RMX18tVul6654r?e+H$!MUZg4?=L_=sabfkR_TdHRP$G
zQ|1V%K<qpkcV8ZeJL1-RTI;B4i*ue||G4wu{pT-U5&Hr>4)g9?ix{m)jHXC6${3U~
z2q_UlPMl!EETYA`fb*WFX=z%=@-KfrAv!exz!#r=5>FgCgi?yM$jFMEye!Ddf+S5*
zN&(>7mciy0)u>{;J)#~}tlit<!sToGYRG2+T)2EqtT{!cGgR4OU<E48s9j{Gw@DO&
zmGw<37nwc0z!-(@cDWnWGsUL@01!f8ij0MY8I+ccT2HrIf)H#CE1dK6H;4Sw-$Y8u
zsZ)oiE(twV-NcBLivCu`?4b^wPC=e!oO$g80Q0jmSZlFuMVe>^!+L6fsT??e@rqdO
z_33oG6lIAq3D)^Z*@c}l43XLjMor+x@3;3&yaPJ`5H~iszp_R-)5VoJCYkhtrf#Um
zHQsyb(U@vDCT?uJ*bo4SxjAZ+kZKLaV6qfrG<m0BG#ukXB&I2~Nf51nu_1Uk3`LQl
zl%#4b!%@x3TAxm*L@LSgWAm)``cvC~AO`@XoHU+|%^^xD7Ec}~0)Mad(OQzH>GMy+
zr=8tFH5^s6t;P9(_Z}rBQb~-~<atVBG*_=LKQZ;5+kw?ypRd3Fkt|6_6OD)wtrcmO
zB7~%FEgSt!Y}2s1e*eWgu-ldw-#kt9jx<fsTBEcgFH72{#X8HapKndo0sm7D02m1f
zjnM{`Xrz$TqcJ+s=$*N6pu9Rz!pzMf^BikZ%K2I5jx5j!g_-HHK5P(KhM1dsIRNLD
z&c;*67s!$XV-!LN?rjWcnikhsqVtRgL*7_C`p8c4+&QqjBg(qs<gs~@G{IyU%4nnz
zM8GyJu5AfEAOzgLbC;0id+vY-0=RU3DSr6g+l&U=R8@_$4sA3hO<_ko`hfQi+qATG
zjTC~iThi%v=*)EZX8E^$A;h!lez3I#K;5)>TO)PKVAM=1V5c#K5C}1lX^9dZkD|yD
z5Q?Hm`SQD;o(dtJCjQa;?+~NMN5OipN0KCDY098-fWT-?h=HnZnduhPbxZJ`+0rno
z8?*?NhvrEXWM!AHzWrfO2(eeKzkcR4^CyqtU4zjI5X_Vr);St4F-A{f-&(v6WLZk^
zp1Nr$@)RQ@gHcUuJyL*>3R^YYym9l19<gU1aKPGMD=4kdiNPd>?d>sA3fQq-$_ZE`
zQq|3a?YL=LTx+qdWwf=8Z7qa|O3bU@z&+2uVyhcI(jHEf00000NkvXXu0mjftdUai

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f280eab5d266462ed4224fc7dbd640851a92d18
GIT binary patch
literal 2980
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
am;4XdE}dqwgo!->0000<MNUMnLSTaYzo>rz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json
new file mode 100644
index 0000000000..8bafff87e5
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "pillar_of_weh"
+    },
+    {
+      "name": "inverse_pillar"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png
new file mode 100644
index 0000000000000000000000000000000000000000..16d7a1fbd712173075bcfff07f3b6b1a04a0222b
GIT binary patch
literal 2448
zcmV;B32*j^P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rk2L}TO8x;!WF#rGv
z=1D|BRA}DinM-e5#}&tabDw;Q57ClkD>7ooPUJ`AJnS@u+q!Mywnjce{0$0tEw9>*
zyAF_Dm(4e55flvqq(G7)sU6peWBKh^HYJgwNb$}4n3*mp3Up%0B(0!}&PEXD&N=7K
zod5s)=Un(753$w6`xnpaopSQ~3-4{|$J)yIJ8!@FgWrAM$23iZFc1QS_@Uh}47-M{
z$4u+3f_P#8ONBN5`Pmg_rY9LsCs@p{l1?W`C*#x_ZK|~fGt-lJo=>aYp;E1rO2&z}
z4xS&dUTZQnk;U^v7V|}x3Ts>Lj<MB*(wZRfDVNs>0}s3!p_GJyPY{Nb*4FWSpQvji
zLxonV`}SI+m7-d$;+PVx)V9ZCZ8f2RFp$Juhg>#E#IXqjk3`HR8g&Vkz!VTFn4HXE
zo848m0g-5qpwp(&4j4-%h7UlO%ak08(o&J<rm|R;MKoezm<D^Mawtp;p#gyq;2MhJ
z(kcppO+cj?qLiXgs^K^`x?CO}1@q_5Zld7W@k7|QMZ4a>GzDOx0IeZAkp-Z-S|*cA
zQ){$PO7YE=o13=&^p_9C&;j(13+La}r%%3w>sZ*PKo}Onv{_v#Z6HA-R6u%HmWL}9
zzP_=@#rHlC&%^^y3gQ=U%o4FpEZas11B8LtNZ2s&38m!Y&%Yhm`L;>;q>&y=B2Y*r
zHWO88jg*Q|Lfapnqy`Q^m&<(h*=6=0oIz@V(%k?SZ-0jYq{q_;)7&=UMm~b~FP_(L
zpE|~JzDRMYfD9F()@Us-1RS0_h;5nJZWPP1`1>c9x24~ac0h$8<GV7XGYO<rbbJMd
zKp;>`Ath+f8$79=#)SQEf9CWF49g*u5J-Vk-Lv<6MXTdeZ+b|n(ZT}5;>_t20~a&#
zH0P&I9w8QsAv<-NZ6B>9*S@_+d8vf$I4CJ`#}d5o;tZKol6cg{j3jBb+I;%uwWl71
z7zBRDU!2CVO^VBFNDYg37CHLr5t7+7>!mUa|5@PBkppP0NoG<A0bgBzFc2IEI<on5
zXLV-x1OSzlA|jjRm7_1vZhOSzQ7(Ud3tcYL|IBvmH&hPvsI;<De9W-xIHZzsT*uz>
znH@#J_l<UHby|LaYg+?x{xef?e`3xZ*h8c3<M{!$Z4r+~xOOi;F!o0Zpa-kp{Cp0j
zpzVbOVTjU@j72aF_~_HCPt||}=RiM>-@kZXzjbPk-~RG-5C)w<;s=sYYLwFWfsfXj
zGpAnW%+Kb2uy*Ji=o6(H;H3l8G+Q3ag(ae{MaK^Tf#(PG%8~$Li3Bq6dE=GYO~*Yu
zLyOX8tIeCQ9i~=qQLk5VMSyK;nyog`NQ8E$OS_SXgXj6=vPq;8_&5|xWzL*FK@fx#
zRx8_z(k)R?Z!{4IVo{q!EQcjDF|83OG=fkkFoi&Cy|DutjUeU<I)O?4;UY>ysIAdp
zc<JhG;!&I36Il#lV3`8fHi<YUy+aMP?&>nFFtkt8(+B~rmX9!CC0`<tYBUt|G~v{~
zJ=nH|>UgAb84ewqMi?ea8|aNnD1<=}_$Vd0e`k@77f>%(sg$eFt_l0a=~y(v*mw%Z
zv2k4o1ZV|Hg&P|oxpOx^6fq4&92d^NtKT?&5U<|Gb{z~M&`RPY6Equ5u3W!AlpY*f
z69Sl~O)TvYk4G?!E{!ZcDxmaecUfbYhcCYOf%yFLb(B{4et=Tlztwt^n|B`${q`f(
zg5FUaJ1~us3aKPF77HUeAL$5sBeN@u)|yZ%SS*a(I~XYdT`qI~`W?oyX|&cuOYxya
zX@5bPKX+Cief21oWfF}#IF8Ni@!7}V`u#P}BuaaolD~cQF92rtP7;ecn1->@Edi-C
zYn2+y8=U{n+i$Y`XobrQ_n%st&Fv;X{P>GM#$u5_Bpr*{+5If$i^O6P3`5}gK9%)4
zo*!Zw2GNK^sa)gGbCax<D*WT~tIS{g^Ue^_h4b&~!~3S_cpiK9?xN#|1fgOq8OJaT
z9NS`bxriS~0Iok+{&8-{06%^G2(Duj1R?E?hwIoR;!&0#F7eI%<xRfWaU$v&_56TV
zyWK^DhHAY@v+dy|lS4b-7KZ&<+)E@~E|b4?pUgy-v22?4@;ZhgD0e)9AbbptPg?&h
zeL@ZJ^OJ{ZHfr3yc9&|w$FEdLWiwcYV&A?Tzxwr0*gJc$Uy6<1C(N&u*fpL;`W|nc
znnP<v7%FVr=HT&TT|wgegn>sUX=5U()f@co^lK=s2>lL9SX9>Qqe-%rVwqN}L&ELe
zf`uV)B5@q$(Q37+HafVDi|>1YCYLk`e4nQDX|y^d?U06w(`>az>=P<Q7zBK`R6<IL
z?}tq6-OX6sCJ~FEFi0mO7{q8cn@AjPF5E#%Nxj}7JDDYwXw&xOXnn$ax4zr_zp_#U
zpj2rPiP)sa;zV2*$DU-pw2sn}Th|}Z?szQaR{?0WyvOW4Q=hOWt>(|2)q9?Qj(9wZ
zS8re#CaGMSAP5P9fZN~RdF<Iiq?tA7WfVYUv*e~Gh(%qJ2WBu$6Ri|M7*eY@5!vj}
z7uA7@sE2FEv57?^Sf)v{*#;qKwmO@eIqY|afxBeA3Rf(wqHUX0GRAtXMIsTUyj~}n
zh+%0+=dyfxWnth8>Ogwn*x~(L`u8{d^^;3PQ)8I6i($Krk7v-r#CBX(9u@fH(sh;#
zC0?I<ap0XWp5{F1SUkM<h_7xwK$pubKPpgLE2EW0Y2B4&p~Tyu;xDe;;L-9bM_+n=
zpdiGcRj^lN=Fgqgd-u;UmW*$HmI;D@8(-hpOuX-}*>P1of9|ZFJMl6~DZ)^)aCKp%
z_RPqlRAjRxGAUfg?)C`!;P<0mO!|lC2VDck$R<W_QthAFO*G;Xgc94b=y)D?A1sg5
zq%wweKAB5xI<KtPXtg^?DVdtcjP$W{s2s>I+$MGMWjbC!X=N2*7&QC<r8Tu$jr^?#
zJAVZIMP=9Y6o!CkG=fwL%QQE+K!pk|Ab)Rh=lTQvJ>pTuux;D_&+%Wf@#8QS@gD^M
O0000<MNUMnLSTZZABye(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..41618084302aa112dc203898fd8cdbb852a64b04
GIT binary patch
literal 2187
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
N002ovPDHLkV1o4^9&rEw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png
new file mode 100644
index 0000000000000000000000000000000000000000..c072ef70dd18c75e4bc7b1e039e498e611b76341
GIT binary patch
literal 4383
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
Rn|vn$=xQ2jl&RT8{vT^XM~(mh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json
new file mode 100644
index 0000000000..adc48a74f8
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "closed",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "closing",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fec6a2494c368cdd0f761eb19172b5767516717
GIT binary patch
literal 1017
zcmV<V0|xwwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk2ox3%2!nhe+yDRr
zPf0{UR9M5kmrrP1RTRd5=e{@7PFhH)2rjIXQ0dB~tst0<(uGqbP7n-@i7~YuNY%DG
zg$&l|B5EWBL9G@`CT%e?j>b*L`e%x$h%F+uiqb_zrlYf%RUpujba?L`7cVn0``$UL
z$9osP@BF#ncb>fT@J<zA&uEI$`~?u9@JCf}6wmZ0b?8u<YsE5~d=EnlJYND4&VP9h
z*YSD2#GcU<jb?y(a5P0Je*pn@bay!i|LFIsh>1u%G`0^@%9jA4uRDPX9SKha5xBTe
z!U(XVXA3HVYG()ta9?*93K-uAo)HWX^9_}1jpje!I;HZ+(<$n=R`EqJ3Ix`&+4p#5
z@f34MU*(1LL8l}#*)#IkfgyZPq87wFLtrhHYOQ_f|IaR>D-j0;ndndI_MR<xBE$r;
zi>CmHZ{O=|B=fUV`r{{;Pz56b9zrv)1gcc3HK*VJ-+x@DXHyI#f-w^H!S^7r9l8bz
zz7Z6~SB2YFnJK&vz}26AaIXWNU=;+xHv%(-_gGr`Y<)N!#Kb^St%4C~G()D}J<i;*
z6Zi^zxL6>QJ>#tJ<NZlpxVX_{rk|RMMCrh;UOoTYO{ea6_KR~=sx_AD6#%x~(??(O
zUS1r|L~iI-_t!P$gP8^9Uq8FyyK(J5G0(I!_e5wJPK%Up9TPCJp5p1!LK}R!UO`c0
za-dfq9ZNYK!smAP>EYuCH@sUqxyVX0Kqdx~dL)<O`kyrto8xpP;yn5MTX&qy<Umr5
z5dy2ILhkfy%pJ=`73kfzmB)|nZyz2U$vGX3$z8pAcOu5h?Ev4ZqM_xhw~JU+Cf>}t
zS7HSv%F!SoMzAPBhgKpZf`=fH4+(-|QR2pQgg~g45M8SPN)Rd{64?|uU&;24?W5jU
zjrIXu6APm-KAY{xN_M$e_Vync!Ky}590C??E0$|p&i{I|t$#B1KvM6&Yb!yhct&{k
zjcJza6$VFg^77zLIeF#A9j`=wc1pi1lv@>0{#w3;s?ul%ZEye=-~d-X{f2Pu#+h_x
z7^}+PEC04;(0Qx|0VoU|N@IR0mKn|rqd>i}>KuH$KdGUGCo<6=vI#9*D_$a<Nh82J
nC+3|JuvSTD()?Wb8i4-*QY>sqMDgjs00000NkvXXu0mjfUV*mR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png
new file mode 100644
index 0000000000000000000000000000000000000000..321f3a3469d98fc1c28e38e14c85f446b261e2f9
GIT binary patch
literal 4488
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
P2XOC>zGj&^D)j#Vqo$e2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..2af73b62ec992fc07c13bf96337b6e437fb4d2dc
GIT binary patch
literal 2186
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
M07*qoM6N<$f{Z)$2LJ#7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png
new file mode 100644
index 0000000000000000000000000000000000000000..1855600c638537905cabb97d73a4c5bfafb47a1b
GIT binary patch
literal 4362
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
Eg7~Aaf&c&j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json
new file mode 100644
index 0000000000..b8c0934e8d
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json
@@ -0,0 +1,63 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "closed",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "closing",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+	{
+	    "name": "runes_dim"
+	},
+	{
+	    "name": "runes_bright"
+	}
+    ]
+}
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c12d23512ecdcfec64e1294278e4e55da5f0cbbb
GIT binary patch
literal 953
zcmV;q14jIbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk2pa$j7c<Ki_y7O{
z4@pEpR9M5kmrsjaRS?C0RrkGq(;Z|+Ou{4)M+vx_8C~f@1j$4}H!ehU3~?a@K@bEL
z`~-mzT#2BPjUWi3f=iiMxXMmUTq{Hvh+u-^bf&xK-a0N`ck%^tt-E}S`g2a5I?vvH
z{J0Egld<O=Pp+=;;qG;#QoOOgrjvQftOQ+h9H0PuX$j0|l2beOQbz#eT<{`sYp{d?
zr<X^RP}SsL{d&X9;nrYCV}{@EMu73y@(>v$x9Sr}W|+ZW-4Hk6^vV%rh6IZ0`7z*;
z<q-nBaU;3mK-)NGaCz&AsyICR+VkAppY#w2$Pp|xiPnt$X=a);m(FZfE8?w>KDV=P
zzC@F(hoDVPjv#=gfn#pC)#buyH~@i%#56?4kc0uPJMZuOQmuk37cc0C&%W<DU<L^z
zx{fRX#s@pss<!{r*FUn-wYVAXHpgLdKn@X7{WTCYZV1sxFb#2h*iq&XRM&xIgupNw
zH+W#sa^l5j?vZ2X+I>%YZevX$aD(xz@L<;qP9xyN*{9fk?~`iHZ?CUub<`1p644WH
zE_lsiFKb@Eqoa<Q1QLOW0GVNn0_y5Mpg<D;&I-wmE;(uby{S#QHaW>0Pa+)#NOZ|z
zzHLqI+v8@mjnR5ya3nD;g<S5fp`%`zY8CLs&%fKB;~B#G?%f%+j${2hx3Q-6W6K=f
zdYa+VfYETk%Wr>t-;p`Lu_kvThmc@(IN<NYOyd~i60my}WYv`L%j-ApHg$gUQQ^HW
zXhK3IxKsM%!#34dV!=Xl9RqVC5Lsf>R^LqAjD%tR9WsnwAO`LnMtx6K6cjX{03sJ*
zW-JDCd26%kNqp}07q~f|Akka0HaRYEH^#F=4h}Py&TLe*WUs#S3L)M5F$qM>jj32n
zq<%Cd7PwgN(cBn%Th$d^xp+a}e)`>F0^+yZ`$%Fu%j{1|bxU^jn_bFWZ~URzgpl~-
zpF1GX|6s``IfLNgJjES2m8S@LW>U9+?e#U4fRkm)qy%0BIpEmr0ORhJtQHaCRGD&+
b3jqHCSJh(@NkLCk00000NkvXXu0mjfRR*fF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png
new file mode 100644
index 0000000000000000000000000000000000000000..06cd2785c424637c3260e5c064e0a7a2ad1dec01
GIT binary patch
literal 4472
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f7b279f1c539d95fa4d6bcec5075048a252a49e
GIT binary patch
literal 524
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szho2U7BcJ3cs>DWUy`SbV@Sl|<OB&;m4=;fGykv5
zRZ}+eUZUDkko7=(YU+kBC(~4(1Y~k5F1lirDE!6aO+wADN3u5;PKmMXzNoyh`Qxpp
z-8{#)`?zwNme_IYHBZt`H$231IGsVSc0<6QAHNI_f7A{BFU-Zch*6PUz)SzdFG<hN
z`k>1Up1(3C9`ZcLx}=3++ZV?ZJUI&ww9IRmx39uIMDIYFrJlE~khKH|>(*|Pym*;G
z*l<>2pQ75oiJJ}21l3$T-Euzt#5BQd%Z-Z02@Ls;E!vENud8F8Rj8C1T(VuBxH)IR
zCab4g75A^uVFrTDOZ~su2Q6k4`*T9{YQvSk2A@5&*fk1yHpxX~yqOXI@&Du3$9Y^r
zk6&TiutH&*+0w`>0(TV-rtX}!&h93kddNlI8nc$40%45{%ym3Zxkc3Yg>-h!tGf8~
zgs01iX981s6T2qVdV9(Qt!+~=XVJ);GHDXuiL42IO^qxJdnSBk*<Q!33yc5;Pgg&e
IbxsLQ0H4Riy8r+H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a7daf6c891b7a9004731f402569f39e8f956195
GIT binary patch
literal 984
zcmV;}11J26P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk1``VsAb-44!2kdQ
zE=fc|R9M69R!wgcR}?+>eT|KR#P8^WB%Ulw5yg(prWD#gQdE`1ahypU8Pfh1(zL-1
zG-Xi;3os?>KdDqzfHO0vi#Nfs<BUTRDJ;0sEavIGd*8k1oO>Ve$v(j9<td)EPZ?hL
z;rbMfGav*6p&+p0cM1Sy3utaUlRT#j)sWg6#LA-m>rU=ob!b5W?X6dm#xaZ%XaV-<
z6KD42R;e=0_`f%J^UuGqy|-xG{CwcZ@c-cpWJOuq-W7=xw0`SKd+U`fce=9N>57xw
zgwWpJm0+TX;-v}DXy`P?@~tn<4!V1{kLRpW3rFs2etm^Ua$vqZMX?52Jm5}gBp`&o
zR3d<~0qW~dbIUManWl9XN+|$@01y+P`E$;>@2^erJd`zXqq}8)a}gi~U_?L?PJ3n~
zB#bMd{@_okS4wPezn0P2n~Yonia-FQBur31bEtX)BwYJrSCYLLt<Fo)N$O>&{3S?2
z2_TswMg`A8Lcu4HfKbLEdiX+CIxnTU{#2qN4jfW}K2Vy#6%cK{kX|naGaTo~;Gd*K
z)aiN!b-J>&@k|=kJ|VS|{64UnWfrFi7P4R>f<(Lb|9Q6d<Zl6hcPU3A&GT;Otsxnk
z0RqjI7&r%l@KAf~ohxE-V|@1ecIVn<UMM)E^h93S>IwiHgyLKV*HSG!cLc^y!^Z41
zm9bD+&sR!7ZLu_F0*>kjLEt60zqVKl*?RQX@%+q{r_Z!p&05HXE1z-o_Lx5Ko}CA#
z-r@<ct5^C7G;1N1H7H)Xh;*-qBUNzF(o<$^wI2A7Ha!&gzqxw4%C6j)IhBK-zP-w0
zRp6-Lws_%0ftP9_jnzm}e#A1oTb^Wb;v%Ar9jVWjXq<(00T#0v5Y<9P$Cc4O_SKNa
z8UHA;4)ygha&A;g?DvF0_P1`#@FXOPs(qhpL+204u$L0eue?@QfA448sFs*$jkn2%
z>mz#He>)^;nlHm2pX`n-(dy&Z(x}bQIXM;P?}kV?;O)CFCs_y_5)w)TDF~+oiE_BN
z`CI^Cu2SOtBVI!QFn4{5I<O!CrvMTV8zA~+NASr$M*APKQ9qP#Wx&w@0000<MNUMn
GLSTZCp1DZ?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png
new file mode 100644
index 0000000000000000000000000000000000000000..5483a9bb0ea33ee8f5125bee5cf265547aee8369
GIT binary patch
literal 1602
zcmV-I2EF--P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2M!krD!g!vqW}N}
zm`OxIRCwCmTU|(7XBd9chS5QDVGb){Mq+5Xi<a72WSz(gf~18Ga}!7|awA^EpFty>
z!L&HGiuIxgmcnY|g#@}V;^s|+!L$XzZrDPww&2BPO3c(Dc2P#kESr#B)c5o|C+DQY
z9LSgRK_EF_Vtk+TeDB}$#sW^($FBE^hxy#Y+zU%3-)rT?_})lBcRw{b17CNiHUI<P
zpr!#}jdwSkQ0%4SDFA@u_%Y-kETW~$r@3GA3{V@NloE=)pcq0@N+2U8<mW~$3oi^H
z0A{D>aoOLl`QF*-dF-xjqOP%Ceow3a3yUcjkdCL2$rlh5LjVA~!>!og*~;Rwza2>_
zAserL&tcXP9*j>-&XhHtz2*^Yh8fQd0KV={cm$j7*><~}aJ!r`OUU`TT~2cV0HDOf
zv&I9!M30C}zJNYy7@2$lb7N6MzLy&xpg!+*hg&v2dFwV>x_s~+(7sO^mO(KM16WT_
zAY^kJnCKC4>e2<pnI~YpgAsE95EMh$UE4%bN+2CiVQwsnOukTJ{4Y}}L(V^U03@XZ
z>Kf}26hoRm!R>P5r|BQD{A>jP4Dkcp06?Cdjq%>Wh#dCl&Od+h6xRHXA?Kf)Oz?f%
zyKo#oR+0y>5x_ebQM}$4>;Qm)d-rQU6ZCa=;_=j+?tUg;Kt>#q*+8p*bO;0Y?pK!q
z|E$j!?_9qLYko)Z4+FrhA0_|*+1!Tg+3Bob40v%jI#qE!U-dlT&h?w}^KeX(4St)0
zN=?pi;d_o&`UgI7)_r+oZw~<QcrlHC|J*@S+lLU&p2qi|-+*xTbjjWK2sSkPJCJ^~
zg5Ur8`>SdKU`P}Q$0Y0vcARWJhqi!EraYyrWIQD~dTDP>9s$b6&NrPwoByh8yjH18
z$qrA;5C&v(8;Uzml=lcWcn2eB>GB~chEUg7Z)i7%3joO3sf}M<SVA}^!R>O&ab2&|
zQ_}#1V-n`Zq8JxP0086S2-5Ksf}dSe0Ao}GgUcg8DeL$_vciVLa%nFQtKuZ&*Pp*F
z67AFR6k57`x_6rmg<CIQ;g7;z)e|8@7(j-Rr>EC?#(M;tuFz3)VNf08sjaOA!tC_C
z90s%N+vWg(4QnJ?By|J~-f{p#0PqMlMP?TiLrBL{GS#&*KVI&>Ax`kSuRks76+7k5
zIS-YfAplfM*5)b-)bgs>2lPe)Z>78Desrp6iX(9CqYsK&&QM(mvisx&P0<me&{j^r
zr)w<-uiXtNxQPT6qrW(PqsS&YYW-fF2+{TI`ZgB~sMrbG9qy8Hm+kGV_f6LiV1XcC
zpjG~wwj3tyo-K1(WtaDI*f0i=kjZNIMhTeQhe7K7u@&O#!cs|B$h7?cR=1-gaO%<p
zg@DOxKcHd&Jc3PAv$s3k$m9!{=n>7W3(#7Awt~V@E3PowK%X@Hx>;&=U0|X|gf+i|
z=TDw0m_SWZQ|kizf?d|?`$vZq0tq=sQ|ki#qeBWNknwY4QCS#KCqkxbiyP5U>5T-C
zf3PS|i|S2?5U|9&{?Q@4)6j0Ix(_g7v5|qI293#)@otw>7F_`4Y(mwefKiKWt5Yw*
zi#J13%g<I|1r!r0reFYtNOn$;Mq`N$Z2=!nHlM@3U{^4~GytgQ1W9kCmCbG7ivKFk
zH=W_H7^-w>%?XBM5<G%Up)#?v2$WpaJOJf>FA$DNSY22u0l}zgajwIlIuz0!XC-*k
zgh9PUi51Nts7r6t_<(X1Vm7xS9|5_wp4-qJz^Hi!sHOG)Gk;*3Jb?Yd1U=YZf_mR{
z3}9R5G;5HQ64+haR3u8KD~5nKzaG_+)6_Ww9f#YGeyi;$@G$qnayL5l+Oe%~BfGv0
zp`#UBFJD3EXqB(A58A&N@YX&9SSB16z)HUNKi|PI>dWivYXATM07*qoM6N<$f-$Dq
A{{R30

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6065c97c7e156dbc8edc4af8bd41f775fbf24448
GIT binary patch
literal 1481
zcmV;)1vdJLP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2M!ks08Hi<wg3PH
zA4x<(RCwCuTTe(MXB7XrN-6B-V1~BhW}6M_9=og#G_q8%h&?RrT-=&NE}@6GNQn#M
zL50#5bPt(>(n^zq<dQ?|dKp3JE*8OEtA*&gQV*?>tgI`c?PL!*ZP&#f+V}BICUILP
zGJo<w^5@N{@0ahr-|ze0O9L#n5BzVPn7RMK!5<A~?r*XhfLkMjQ0EpQefCM!Yfke&
zxcx004S=@1j+P5=LR(&k7?E_oY)VB=D^>N^!WygwAQrrG5|YEnC}{uy|D0X}sOq2D
z_^rXw0IV;3&1%5Cg%v!1@(j(FFXE$tUc<GO{M`dzn2O<?)c|-~0`Rs30DuKWkK{Ye
zZ`LdafCmBq+67O=;9lo<Gynm=4*|cA6}@aq)x96^`&dz=;ORZb13-Z!hh*fm5<+qq
zIjw~IccyjM-M=%9oL18LY5{`fMewhuD<_%w3_5x`4L({C?SjWZfqSc42#v<@#-(0o
zv%ohux=tuKKCg>~Jfpvm95&>9v5-eLrQ-9YO=q(}PAjqCk2W?D@cVGIv1urJ01W<G
z2qRk*!Hkkd!0*HM&MtmfSi<(sE-Q+Z3YGl4AaZmHn7Q9<3Ru1uI2OE?{(W1pfSLO(
zX924NFl(k$V0K~(PBzm3G-*Xg17Mm4b6N?}go0zi3x8iPjs-8G2}O5JB|phptF6)O
zFPNT=efi>5BhJ4(#)qGNjF*2F@yc@n%^mOHX!}=)5eb$2ZSTE{Uw+!b&xhJqj$Q%T
zl!{^@kJexp@&|`#4R#q+Ub&xSF0b+&OM}%mGpB82YPp%Q1pxeZmOfd&4)9yujFQ&*
ztp>n!3gizC0Ra7DBWM>qXcs)_9~;qKL%#Ch>0U?EAO%8sP0PJJI58ptDHUQwvPIxE
z-3?Oke9`+qen$g9!Q5L|(LELmdG>Rf-|;LE3tnM+f$|0i?e(kqGfLWYW5aR)_{K&#
z1rj4vYk9Q`9@G1I%Zp(C>F<X3guZS(<Qkgg*O34H!G2(A)7dFtb$i?L74YN3?=d?u
zg(j_7Q3&yrS1jb277+Tn@!j;iJ7|!%kQ{~>k&ubc05CQ$sPUoBExJbskj3vN*>QG9
zPbZQ?vVksX1)Mez;aC7>C#G~~`Z=wH<dAI80%tMkV5t-)YrA$8*9UH}yl1@6(IV*s
zS4m;A{YQ_nHm|bRwA{srgpeFY^W}>*X=d0KfZ@q;!+}Tt*oa}k!L<PJ`JPRwh$a-q
z0(^6mT3)WJ0p&8d8ck-DGz7N-AVwsJ|KU@1r4EQD6gJc(MkFMMWX1?}r31)loTYAc
zK&84+S2}=bur77L-s%>k!Mf1_qc@{$cqud*(`|=qHP~po1Cd%BsN5PEMBvif6(_>@
zIYKcaF%~%%ycnJwH{Dn{XU9*4Sc8Jk#AhHzBzRi_h~G`x`#{93@yF)*gF_^TWOVd&
zvN5_^4`ejiDR`2}w9H9Mi2wSp4@xLCHsN4-#hn0Tl(g=<0OfLeZC=Ix&TdWrY1^a#
z1<QXIfSRggt-&q~Pma5<2B>q3tbNW?X29=5G@-B|jA9|LJ7;ta0I%B^<+KtqO8QLB
z5p0tJG(S+yN5}211%MBZbO6yHKTcmhf#zx*K;IIf;Lkz_*b0D<9LDn}&se_mg^_eX
z+qJ9i1%Pw_<$HNuSesX||LCzh0jQ({q6vlR0Gc(dD;)s*bI!Q8y2U^ky%}|<4yZ(f
jti?7OLpG(J$!XHxZPofCTFImc00000NkvXXu0mjfYv!TG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png
new file mode 100644
index 0000000000000000000000000000000000000000..47714622e3b6cdd1e8b49ed416b1398ccd698d9c
GIT binary patch
literal 1602
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
Af&c&j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cd5ff6f2514a954c76ea1dd308f8a67efa9b743
GIT binary patch
literal 1481
zcmV;)1vdJLP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2M!ksB?scd@c;k?
zA4x<(RCwCuTTe(MXB7XrN-6B-V1~BhW}6M_9=og#G_q8%h&?RrT-=&NE}@6GNQn#M
zL50#5bPt(>(n^zq<dQ?|dKp3JE*8OEtA*&gQV*?>tgI`c?PL!*ZP&#f+V}BICUILP
zGJo<w^5@N{@0ahr-|ze0O9L#n5BzVPn7RMK!5<A~?r*XhfLkMjQ0EpQefCM!Yfke&
zxcx004S=@1j+P5=LR(&k7?E_oY)VB=D^>N^!WygwAQrrG5|YEnC}{uy|D0X}sOq2D
z_^rXw0IV;3&1%5Cg%v!1@(j(FFXE$tUc<GO{M`dzn2O<?)c|-~0`Rs30DuKWkK{Ye
zZ`LdafCmBq+67O=;9lo<Gynm=4*|cA6}@aq)x96^`&dz=;ORZb13-Z!hh*fm5<+qq
zIjw~IccyjM-M=%9oL18LY5{`fMewhuD<_%w3_5x`4L({C?SjWZfqSc42#v<@#-(0o
zv%ohux=tuKKCg>~Jfpvm95&>9v5-eLrQ-9YO=q(}PAjqCk2W?D@cVGIv1urJ01W<G
z2qRk*!Hkkd!0*HM&MtmfSi<(sE-Q+Z3YGl4AaZmHn7Q9<3Ru1uI2OE?{(W1pfSLO(
zX924NFl(k$V0K~(PBzm3G-*Xg17Mm4b6N?}go0zi3x8iPjs-8G2}O5JB|phptF6)O
zFPNT=efi>5BhJ4(#)qGNjF*2F@yc@n%^mOHX!}=)5eb$2ZSTE{Uw+!b&xhJqj$Q%T
zl!{^@kJexp@&|`#4R#q+Ub&xSF0b+&OM}%mGpB82YPp%Q1pxeZmOfd&4)9yujFQ&*
ztp>n!3gizC0Ra7DBWM>qXcs)_9~;qKL%#Ch>0U?EAO%8sP0PJJI58ptDHUQwvPIxE
z-3?Oke9`+qen$g9!Q5L|(LELmdG>Rf-|;LE3tnM+f$|0i?e(kqGfLWYW5aR)_{K&#
z1rj4vYk9Q`9@G1I%Zp(C>F<X3guZS(<Qkgg*O34H!G2(A)7dFtb$i?L74YN3?=d?u
zg(j_7Q3&yrS1jb277+Tn@!j;iJ7|!%kQ{~>k&ubc05CQ$sPUoBExJbskj3vN*>QG9
zPbZQ?vVksX1)Mez;aC7>C#G~~`Z=wH<dAI80%tMkV5t-)YrA$8*9UH}yl1@6(IV*s
zS4m;A{YQ_nHm|bRwA{srgpeFY^W}>*X=d0KfZ@q;!+}Tt*oa}k!L<PJ`JPRwh$a-q
z0(^6mT3)WJ0p&8d8ck-DGz7N-AVwsJ|KU@1r4EQD6gJc(MkFMMWX1?}r31)loTYAc
zK&84+S2}=bur77L-s%>k!Mf1_qc@{$cqud*(`|=qHP~po1Cd%BsN5PEMBvif6(_>@
zIYKcaF%~%%ycnJwH{Dn{XU9*4Sc8Jk#AhHzBzRi_h~G`x`#{93@yF)*gF_^TWOVd&
zvN5_^4`ejiDR`2}w9H9Mi2wSp4@xLCHsN4-#hn0Tl(g=<0OfLeZC=Ix&TdWrY1^a#
z1<QXIfSRggt-&q~Pma5<2B>q3tbNW?X29=5G@-B|jA9|LJ7;ta0I%B^<+KtqO8QLB
z5p0tJG(S+yN5}211%MBZbO6yHKTcmhf#zx*K;IIf;Lkz_*b0D<9LDn}&se_mg^_eX
z+qJ9i1%Pw_<$HNuSesX||LCzh0jQ({q6vlR0Gc(dD;)s*bI!Q8y2U^ky%}|<4yZ(f
jti?7OLpG(J$!XHxZPofCTFImc00000NkvXXu0mjfW;3FR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a6429d9115e5d75657636e302b4e285a43dbebb
GIT binary patch
literal 1491
zcmV;^1uXiBP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2M!ksG;LDi0{{R8
zDM>^@RCwCuTR})1XB7UdQVPu;oFVOEOgDpTjty}Kx)LH-#2!Ms7gP7Jm!*d_NLd5x
zAqu4}Xb#RnX{Ead*~=bA;$;M(34&m1wXhl^_0YPqkr<J-vpMXkjlmx3`}^<guC~m`
z&dfgWGN0r4zWLvK-}~P`4XCl*^j$o@Gt>|1@;gwK48n;B1h2$!$=3=1NDU+)M?+AR
z4E&-8N1}kiu@Ss^xx2y4^WT6Ct#FtxabBI6f*cJ&@Jg6?kh1hywj<!-+!7-pzqgOn
zKmzSu9T2<{4%XH&Jvwgb^P24Bd^iz-s$|$Q2Y{SjgnWYE=ntXT*o3{sC3g~_Dj76i
zxrC4Ux&Z*$v{r(z%xc)(+P3tcwoM3-v*f(smC$={h^+(wXbA=|I5y(G9H7n2Bc~S;
zPDGgVlmuf*1=+NQ!eJhT!#q+03HK2Y`s|Za@tj_Ss$|MS!c`&Q7d=pwOjRtLh(L~p
z+)DuO9O(cmgM<lQ39+P7KRV#i{Ym8XB6I#cbbzf02qz+V`RoOYcRn$a4rsf6&AkMW
z4xo59=7p764ZBaCx|4uPIv|!*m<}i$=Ic)f06;9MU}t%QkuZEa=1v_@sSM`#_W#KZ
z!*OKOTGcXX#v082fxn(F9Z!#rqe(BYjO`aatXz>3^aiQX5qmoE-Q+AD@BQ9TOY$vW
z0hGYhiK&vFp2u@~5!%eWEpm^g1WY_gvG{H8>L}6eByMO0oF#u9Nx<~zI1bj<83{SP
zh}1xWIZq<zJS43x_5<3kU&D>QTmL4nlMN1>h#I<PC$n?~>^^ylm07Js*!V>c<Y)-t
zL<G%OE}cszw+#V<V<Tt@2H2AKiyrje8)6|rBFD7^@bR8aYltNkRt0!*a~^%YEph-k
zNAX^*OsYx-qFV`&qan!u;VrvT2gH&J1g`|aD?yHikQzv^icnWNfGnpM@#y|!{px^9
zd7-X!0F}YI)B!uo8>|f0jSd*T9Yf(Tk8D~)csO3t4)Z#|PG-6nzv;VpZ07!2?+2Jp
zf_H}cq0P*nTGmd(AK(4f*;PPaT!r_-ThJF*%gP&N|7y4^LLeTzdd%8hz6Iu_FA1PZ
z_|)334UQ&Yb?$4H10K#T;pMXzB{P2BD&d`dUpRYDkfbkP=J>t+vvAjxL2`x$8Aj*M
z!W~V3<ZFfGYh_7~IzhTldjfP_@JeO7#f~L_KgUPY9cqGjqe(B1*?|O01|#ak6xzEw
zs&0<Zz94Tq%Nqy}$4wt}tT_SS+zK4?2N=ls{@-}|lkjX>!{-a@&aMK+0}PU{wPZHH
zpYk%|b`VCEBtcclK=QR>b88#l&n;kcYnvrS3WZ9z9a>{cLcq-ZwGIK(y}*$uz{zGw
z6)<zZ<Ewzv39R{HX{(RDIgWrPz2J^!$c&DNB^4Zr0(?E)I1+`j)1Z}blGSFdvDO4k
zPR76d^K~QMeszQoKm8c5{wUzJ=K`AB-^Ib^FOZ`lRKnZde-A(ZxP_ng^{*Vg0_Z4w
zOE7@^-acA_fijh8#QE{NE2==HX6m#?%F1TSHf507X?nAK9^hMT8m<!V_|N8Oa6+HQ
z&^V1Z!i>%vXONC8gX9RsH7$3eb8<8Uq&3LVkR^`WW(Dwj2Yk}|Ke(d_FrFRYKbWAO
z({RUEfq3vL>jjJh7TRm5hO0`(^kAjt1n`3uV+o{+P;KPq7d@u;6Kb9W^Ur@PyC(K@
t;s<V^YWy9-Kj`lT7S^2|0<|8m{|%5{{vg1Nt6l&A002ovPDHLkV1i;5vFHE*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png
new file mode 100644
index 0000000000000000000000000000000000000000..61bdb81ec8991ae48783303e6c082e00d8f540e7
GIT binary patch
literal 1457
zcmV;i1y1^jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk1_cBs2L`EXVgLXI
z2T4RhRCwCuTR&(UR~Y}P5v7ZVp1=rILOC2y2LGvUPze|e#w~czVp9!TG@ZZ=_HY_(
zLpR%l4q{OZQWilFMI~7@q_iPm2!wi&^2gvQGG}4M2!oVCODPKOkbKYYP9{yQ6L)%f
zV2s|gIDfzUzTfxvdEoH+_3lp>03e4(QPPWuYY9kxnVrkwAOIkr(x4<`DCtGq@{OSD
zld!V2fiFXIo_?PH1zfn=O~WL7DU*egj6w3t$UMl~`Ygu*Xg&E0a%hx&{`28J1Hq^_
zkWXnCpZyk+U&h%%6?>c8wm#qMGyt_$2Q|IOKEFMA!_=J4l@DjPe~h7X!;AWpeQ^MY
zYYEfae|z$V?Nth8)89V(t&HQtBU}Gz$4x-;%Z&8CUz#)RFRZUIO#pyEG=i0_4Y4?Y
z7Z`v^U^yIwn$uA!l+kV)Xg3YyQ<|6n$l)LZ!K(VTRtF`$*t0JL0CG6U+}-1y-S?!}
z>frItF8iBXz7fQ=1e9dV_UC)uq5<UV6>cw|(ok!4m{~}E8EQ_q)eIa5fP|qyhhIuE
zhMHbvZ~p9{ir??u7t0IOS{)|**+CU@IEb@@s!9EMk{p|v5|0E+dJ%Fsh?j>)_~YRt
zygWRD91b$ls}#!Y-0tOZTKHcUBNx~Co?Xe1;~dcSNsd0>aSizAbpN8C@As<#o?#cj
z6>iY(6m{qT003{RJ(K|0>ITE}bLjdcs5#xVujX`geUj;%LSCT&0D$Sq2^jSTi{6xE
z3`V_y>B$NFu(Zg|`8t3w035$~1>mx#$G_n~Gy<dEKp+}HyJ?_OD4SB>q2~YqSlQZu
zQExB-DT=dZaj%~~XJ&FIG$#%KRJx``6<o^dD7Lq9gfIZm8@H0%!ulHUA-`W(UjqOb
z^@eyHK%^Jf5<T`!nnC4mA>E*w(^-*INyd;*X(nMwGl(RG17L4++my>wX^R(_Z+y4`
z2wOQ|Y-S3#mlk_eoaY5<d<aQ`$1h&t*}E<R(FkMwh4nSGn+6p8cjIH|O<-kfg9SR|
z>-lmw-}o?2&*7W@PAmY@%PI?k;^|eByR#NNg(N`$pJd-|Q2l`c@F_{oAQ~L503h=q
z&tia5CJW$l$ieFJ<j|;TE<gw`u(!F5>B$KMq7jVGzRv;33-B?3ux`*A2h>^}mILtl
z!PhsxVICp7^s~5e0B`dON0KDG8$826>H)MU5Tey?8a=Hpp-3>F(pZdNDU?|tL_|pL
zPx8xb@3W`}0GGXg0Km>J14lRj$lfc3vZ=ps?fsWBSr#n{1Av;-Sxu0F9qR8}ZJyku
zkoADSPuf=wJ@Ng23YdffU~Fazog3bd_V@YzzZ(J~TbiSLo7>lJjoo=v^$5WMPWSm8
z)qsA!?{s_ovmcOfd_<<7*#bM}h8+jsy5wmW=eS}{@T&O%Yk)=P;dy(Tsg45>*AiFG
z4_q~0F!HX;TJXXEK%?;d`~a^VltzDbQyR#90mnH&&FLs*vKXK31&05vBx7hd4bv34
z5C8x`JiYqS8G`h(iW+y1NGKDa3KCt9u~v}?kU`xSaK*4RrO>46v`5$GD4nMJ0>YU9
zKUAe~pQ*Z}aOt$&_XWIe5#HJ}xXRvzyf<jA3Gh7w$uG0M0wCzU!MK)SKLAX^)3v$R
zPoJ|`LAZN^#_2hX({s}vmD9*W#M7%RU`j8m;&}l+;Q2r1V#oRyb6l$~4?z3)00000
LNkvXXu0mjf(zc;z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png
new file mode 100644
index 0000000000000000000000000000000000000000..b658073c3e79def6276edf3cd1e2daf12dc4ae8c
GIT binary patch
literal 1491
zcmV;^1uXiBP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2M!kt4J%ArN&o-_
zDM>^@RCwCuTR})1XB7UdQVPu;oFVOEOgDpTjty}Kx)LH-#2!Ms7gP7Jm!*d_NLd5x
zAqu4}Xb#RnX{Ead*~=bA;$;M(34&m1wXhl^_0YPqkr<J-vpMXkjlmx3`}^<guC~m`
z&dfgWGN0r4zWLvK-}~P`4XCl*^j$o@Gt>|1@;gwK48n;B1h2$!$=3=1NDU+)M?+AR
z4E&-8N1}kiu@Ss^xx2y4^WT6Ct#FtxabBI6f*cJ&@Jg6?kh1hywj<!-+!7-pzqgOn
zKmzSu9T2<{4%XH&Jvwgb^P24Bd^iz-s$|$Q2Y{SjgnWYE=ntXT*o3{sC3g~_Dj76i
zxrC4Ux&Z*$v{r(z%xc)(+P3tcwoM3-v*f(smC$={h^+(wXbA=|I5y(G9H7n2Bc~S;
zPDGgVlmuf*1=+NQ!eJhT!#q+03HK2Y`s|Za@tj_Ss$|MS!c`&Q7d=pwOjRtLh(L~p
z+)DuO9O(cmgM<lQ39+P7KRV#i{Ym8XB6I#cbbzf02qz+V`RoOYcRn$a4rsf6&AkMW
z4xo59=7p764ZBaCx|4uPIv|!*m<}i$=Ic)f06;9MU}t%QkuZEa=1v_@sSM`#_W#KZ
z!*OKOTGcXX#v082fxn(F9Z!#rqe(BYjO`aatXz>3^aiQX5qmoE-Q+AD@BQ9TOY$vW
z0hGYhiK&vFp2u@~5!%eWEpm^g1WY_gvG{H8>L}6eByMO0oF#u9Nx<~zI1bj<83{SP
zh}1xWIZq<zJS43x_5<3kU&D>QTmL4nlMN1>h#I<PC$n?~>^^ylm07Js*!V>c<Y)-t
zL<G%OE}cszw+#V<V<Tt@2H2AKiyrje8)6|rBFD7^@bR8aYltNkRt0!*a~^%YEph-k
zNAX^*OsYx-qFV`&qan!u;VrvT2gH&J1g`|aD?yHikQzv^icnWNfGnpM@#y|!{px^9
zd7-X!0F}YI)B!uo8>|f0jSd*T9Yf(Tk8D~)csO3t4)Z#|PG-6nzv;VpZ07!2?+2Jp
zf_H}cq0P*nTGmd(AK(4f*;PPaT!r_-ThJF*%gP&N|7y4^LLeTzdd%8hz6Iu_FA1PZ
z_|)334UQ&Yb?$4H10K#T;pMXzB{P2BD&d`dUpRYDkfbkP=J>t+vvAjxL2`x$8Aj*M
z!W~V3<ZFfGYh_7~IzhTldjfP_@JeO7#f~L_KgUPY9cqGjqe(B1*?|O01|#ak6xzEw
zs&0<Zz94Tq%Nqy}$4wt}tT_SS+zK4?2N=ls{@-}|lkjX>!{-a@&aMK+0}PU{wPZHH
zpYk%|b`VCEBtcclK=QR>b88#l&n;kcYnvrS3WZ9z9a>{cLcq-ZwGIK(y}*$uz{zGw
z6)<zZ<Ewzv39R{HX{(RDIgWrPz2J^!$c&DNB^4Zr0(?E)I1+`j)1Z}blGSFdvDO4k
zPR76d^K~QMeszQoKm8c5{wUzJ=K`AB-^Ib^FOZ`lRKnZde-A(ZxP_ng^{*Vg0_Z4w
zOE7@^-acA_fijh8#QE{NE2==HX6m#?%F1TSHf507X?nAK9^hMT8m<!V_|N8Oa6+HQ
z&^V1Z!i>%vXONC8gX9RsH7$3eb8<8Uq&3LVkR^`WW(Dwj2Yk}|Ke(d_FrFRYKbWAO
z({RUEfq3vL>jjJh7TRm5hO0`(^kAjt1n`3uV+o{+P;KPq7d@u;6Kb9W^Ur@PyC(K@
t;s<V^YWy9-Kj`lT7S^2|0<|8m{|%5{{vg1Nt6l&A002ovPDHLkV1msJu{r<%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png
new file mode 100644
index 0000000000000000000000000000000000000000..032ed030a95c768e992cd6e98cd0b9c1457b2383
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a
z5n0T@z;_sg8IR|$NC676mw5WRvcF_wWtKO+vu@%XpisM~i(^Q|t+%%~@*Ys&VQ`$I
z6m8(6cHSUoBAeTS4I<)qzPr6(VP(D8_4}B$@#pe-CFA<7hnayIk$}3`P1aTSKl>pG
m;b3miU1k1Ye}gufbX`8<kuN-T(jE2kAQ?|rKbLh*2~7ZJ_(=-@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc159b8e48bc7619ec95304eec9e9b52362ac174
GIT binary patch
literal 1284
zcmV+f1^fDmP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2M!ktAsLi6sQ>^3
zT1iAfRCwC$Suto6Q5gP|tQnd^2{e)(rjuZ;bdjPUNEHgrQfP)O(xFiYGn_*er&2R`
zLmaHlAXze`&?N=I20^HZ2&G!VsV8Y@Dn+?;I6;Ss4)%Y(cex8yU+smy5019)f2a3<
z|Ns8~d+z}X3JMAe3JMAe3JMAe3JQk}M`Zm&=i|qI{Lc@6QU5IE+e5OPzm^^IwO1Z5
zAUQrF*PfsIA%lb?GM(2?92acM#R>qxvK=I}Fb1wBTkMwY0Dz~RpTpa08=n9GkMeW>
zoCzUWDakuuHcNsnWu#FyOR&rm`<=JZJ6?AF{Q>U(A`$|V0Yt#!{Bv9$z34f2asD~B
z*EiAC)9pEDFLoNQZG4iF0Y_zJz;dyIvRPsu7>Vk_1Ay7Q=Iqt(&W?YD6ap%b7hu^A
zOK19E9yFHF!k%;XYL^Wu1SH2tkkG=u(b3~E=<ygUXjB|&T#v_uq8W+mY|Jm)0!07-
z&k9aX0ze^Sz_J}&H}Ar-9aM99VO}+thh;m0tsM!05kh<sEbmrvcNEL_AE5Wb*_JdW
zrxRKjLz7uH-rTBTZD|FmTQ`3dyn2I;Q^(l)@(mxIufZvTe5Iz3t<@VSWQ-Q)i5PNv
zXfi8AI}+8=d*Lh!8ABk2oKI-sw!-Pa2uK-eY_D&kY?iQGtgr~Xoqsu3VGbv>aLX8x
zVA&1|8G|`b<oYeQ11F$tmeAGHjg*o0{75|>!_)aEc>C@>TLOf)@809-{1br$su$E^
zx7Rn>5(^vwRGIl6J~WwSZH=P*;ms;Sc2h|2LdHPIZsNn6RUs2*j4398Q$`wHJ>8w9
z1N3+d6SF3&xjbt11_sBHxG{Yj0I;J)ga-g_Oy9=fSdtYzDvoZUBok8h0?F|ayq>H2
z+AZ6GwHr+yM8?BA_gE%SVXWrzn3y$L7l=f4RtuJk6=;{v1#1bk6G90sjO*rIq1E}J
zn#*Ixm}0v`uR`l*JJ8+Wz||zIT>_e0HAJF1YV`)Hxjb{6mISSTiaddjxLYWBExW*V
z0k;mIHpmx2ayn!;g@*{CA~-aeMImE&ilC0s0VI7Xs)J)mob2zzjuv6jrpWJT5uEJr
z6N(_o;{DVCA(;e_4q(-~Siy`jC6I7sbQmwc@341hd7L?Y3WKA=%z3|)qmI%66SF1~
zT9`$U&xBgN!JOj9c<D=Ruw!)qrT5y>N(%{8<mji{`L(4LOw5|l<FU@r0rs<3!fue9
z(&I6tZrx<tVQPzf4dA!Rr2hDhK&0{{268Xp1#*C7v3u*w+x(pG=mQaQgrdiew(AY{
z&^YOSe%wz81y%>}J=^^^ErCC^@23us+6GfbnjKxcouD56w|25ojgfUP5Rx5zI=XIm
z!NC_x_azB$_j*6DXM(`*+aa&(EI(n>?#hgIk8Zont1&4ztX`L+`*I=5L5B0v2p|&h
uA0g{{TtPuWK|w)5K|w)5K|w*`@Zl$rGw%tIW?<9+0000<MNUMnLSTaaU^%b=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json
new file mode 100644
index 0000000000..2f865df84d
--- /dev/null
+++ b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by SeaWyrm (github Aearo-Deepwater) for SS14, based on the 'cobblebrick' sprites created by TheShuEd for SS14",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "full"
+      },
+      {
+        "name": "cobblebrick0",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick1",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick2",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick3",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick4",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick5",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick6",
+        "directions": 4
+      },
+      {
+        "name": "cobblebrick7",
+        "directions": 4
+      }
+    ]
+  }
+  
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ad7dacb1f4bf00ff88b08eb14f50b669cb32dee
GIT binary patch
literal 1193
zcmV;a1XlZrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk2pAL-5lAw=mjD0*
z|4BqaR9M5UmQ8XiHw=WoZgQlgl6|g_>*esN@{@)@762u^R92pBT(V7(0QwL5>(4)O
zNC2!%3?u@QKtv|PVp=>R`DKV7E4Yt=6V3<%ctm2slv%(4EXYhUAxJEdnE=#Ja01V@
ze}zntKnP37A`#E1O9}XGn2g|SEd;Dcl*x)DGRR00IJ2q<)%^l2F(qy`hm3C$_aPz@
zC8Vl|Q?N(|!X$&5&dT5nh=jXMQlF!rc&sYsT!DcIn3%(6b@%7HUFMlp?X;>BYFuPp
zJY3UAvPUW;7zvSeUaC<_APHLy;=ZrWq8j}G&I~~Ka9x;CUzC`t@!V|edVESm)&mjs
z>S`pdYG6aSvhR~vjrTE(n^OxgDxN%}PG=unJ)#FeQUtQ9qlq{Kc9Bax$k`;G7SnJv
z*&-<jyJ#V9!-!-^Mf$@={lK}RTFAs0`tO;^=4oX8ehhK9iSF8}?y8?;%0<wI&ac8@
z*gUh;Gil6?n8PKT#%`qGr3hZ~8Lp1bmTlCrI_JWCZTU)7py6zeO+<EchGOZ8Zn3{W
zW`WS~tV~uHwxS-*=71!kxd2(-@!<gpoKd(-O?DMcUB-~yhd3k2Ol%dUoBhLuuO)C@
z_>9=kvof0XTkX6)Wp<ZY1rEU&LJ9XGre4Pl47qTU2&&S^kE{Da6;(bwjV50EMI@`?
zJQL(n$JeUDgW}aLj<0jI&ZFd$rPrbQ;tGf;xBC%w#uC}sZwYp-+$>hm3Tri4SZ>AD
z|L6ARJ>oKrVyG>ikuM_>;u%pmZtd#*X!e*2qD0z6Ey+cj)ry+nA}b5dtl)WO`G8c`
zDQ#|VZx0R^+FRd7jCL}&8iqg(#nCf9nsjO?w~5V-;HH!@izHGIb;*Zyb2cv?t(r0<
zF~{2nwxTv?6!26q?3aD-`=&d!o(WU%Yz~|m3<`f6jvn>au3V#ZTls$Q=Hk!WCCxdK
zqjfUJTZSuO{=F8zj!|hSxObi((ocE5jb$@EJA`Oo=QDH~v}n!@mq9(EihpEsw>b>{
zeT++aes!Oi|CQ&5;9SWu{K|8=%x6fPz|kPyBp7d-&32^K1Q`5_d>Iga?Gy8Ap6A7V
zV(vUwo6pX3soZb}&N0kdjlaZb`;o=7i>Te9!iJuPTn09G{O)L0S@_&}zA|g6$YN;4
zWj`c7@?4w|47u`Pn@|&Sy<{C#Nb0A3VyJ>Fb~45*D5{A1TzO6##_dCAuRQN<_-1pq
zwx26d=eFgJ^4=$U1KRt-F{-$EHP8Q#ed1D{U)?8sHP5f^6TX_~SN92D&GW1K#9V#(
zck_JocfY$&_-dYC-6!T_#icyo2K3#1VvdV>t|sYs_lbW1Xc+u6(q8Jj00000NkvXX
Hu0mjfQ&TJg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png
new file mode 100644
index 0000000000000000000000000000000000000000..e96818d4348110aeb3ee22671b5e8999e906b96e
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^?=T269?xHq0u*E~@$_|Nf5{;sqN%-l`py`jeIlMNjv*0;k52dXJ8U4*vj6)d
z7Qq__#H7}>OwcNHp0Gotr29nQDwB=!-A9^)Q)-$%{;4?jrv0`<#h-QgmA76xRHV0Q
zO3qL=X#U&W#+rXuVqKIhb1)}|#IL^NcYQe|3Ua<4Ox?U!T4sR&ivW|jg~Oqfsv1oE
zOCr|SUcAwiR?N2M)w)W48HI++bN+A0;auP~;f})rN3Mjv0|uR(d)3x2c&Yr|^nb8p
z@}c*0Jo9Sism0yfZ+85_bzf&aN99*3{0mrwn3;4Q3hN22*YM#~;7p%6-L&m{?eWbC
z({}3HE}44ZOp2yQ!V`@id*k);i#a7CQtZ<L#anW^)(E9I8M*ymdcZ>FypcfNIo87!
i);&_PA@zr<>KH@L#r>O_n^Xe~G6qjqKbLh*2~7ae;-e1$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png
new file mode 100644
index 0000000000000000000000000000000000000000..542b66959d21b9431b6b427c86cd16bf10e2d152
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^?=T269?xHq0u*E~@$_|Nf5{;sq9tLU)!hjc>h^ST42d}W_WWKx#zcYEhu?3g
z3UbB2pIl%&NwsjM(DW^i{>k0F^A{(4U1Z{KUfgBOtk@#p!~rA@?Z5ftNvPkuG)A4}
z!qbJAxH{dZ-+Hl^{f3<1ucdoVo$S8I;CW^Gw7Va5))s%Nv2ozIEh1F@J2-09ao)?$
uSA2heRSfmhV^B#uY<KCkXY#kRQ`Oxg)mpBK<paIPz~JfX=d#Wzp$P!@Eoj65

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed254568f3381ad011eba6087106a2fbd2813536
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^?=T269?xHq0u*E~@$_|Nf5{;sqGecnL-;AsJ~mGm$B>A_Z!aA5V+!PHefa;2
zk;9bMH*=?c%<VaH-Q<Y)r5PO6F$q1)e*N8!C5|<W@3-&DowaTIuI%UgX8AI_$YnBM
z@=?09tVN>r#?qN$7r&ldB68@%Oi!lWCW;c8FB+Lz4w#v#sHx;ICnWsc=g!bw_U`q~
zmV0h&tp^f1<rXjOIbb5RxS@7dE#F5y-&-mdT0FXi4mohXFg_Sy@};uwHAm;utl|?4
z=F`RJxz)6*T$tCd*`95aXFtPDq40zQ!`quP)|q!UK5Xwb(Fsn9V4CnC^ETtN#J^Q@
zs%z$K%6Oiq;#BZ|lVxP}?SDG&;(2+Ov>)UNPv3d#kLCJRFz{>sJ_fb2f{t>ws<XgA
OV(@hJb6Mw<&;$S*IjFP%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f9e180b1ccbfcfb44b274f28ff995f8d66e93f8
GIT binary patch
literal 460
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^?=T269?xHq0u*E~@$_|Nf5{;sqRs2QCQcb>pOUAGV@Sl|qtmVZm>mUN;=d-W
zuUELuqM{=&{KJStkwx+Qex^x#V_9~y#2mPLFk_R})soV$4vDpPZ`OK!IJ`?)>p=Yb
z?R7Ux8g{Ny*wFFd4NHhKgQEhAslUPkPo6T~Mw2;nR4(Z8{=4_SW>2J#*NabFXPkL5
zRTx?Q6*{lA@WgU^v0aSb|Mg>)<K(Pa1vi<L+jKT9T%Nq(MB70QzNuV3(~Vf4DLS!6
zez=xjyM0dM5gjg(h^+~CnbJQQ^GsJycrYhfu0+r^bA@5cCM90x6Ecxg&M+z}9WZM;
zz59T~?K86uu$paI*m|O6GxxM0&bC7Nqk6Zx+_lpJ`F%de%XLoCQHk%bwqN^fhf`yH
x;Tt7Z2D@K#`DZWM|1e&8-lZwmzJFd@&seXVocvVRqyrd$44$rjF6*2UngBrUr>g(}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index 9f649e0bbb..dc2dfe3059 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi, rock_bananium made by brainfood1183 (github) for ss14, rock_snow, rock_asteroid, \u0026 rock_wall and co from https://github.com/tgstation/tgstation/tree/e929cf39cded5207d63df1fa8521f41f2816b383. ironrock taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e, sand rock made by TheShuEd for ss14, https://github.com/tgstation/tgstation/blob/5f3e12178e1fbe75ae4b1ff12e256f61b5bdddd5/icons/turf/mining.dmi",
+    "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi, rock_bananium made by brainfood1183 (github) for ss14, rock_snow, rock_asteroid, \u0026 rock_wall and co from https://github.com/tgstation/tgstation/tree/e929cf39cded5207d63df1fa8521f41f2816b383. ironrock taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e, sand rock made by TheShuEd for ss14, https://github.com/tgstation/tgstation/blob/5f3e12178e1fbe75ae4b1ff12e256f61b5bdddd5/icons/turf/mining.dmi, ironsandstone made by SeaWyrm (github Aearo-Deepwater) for SS14",
     "size": {
         "x": 32,
         "y": 32
@@ -88,6 +88,21 @@
         {
             "name": "ironrock_west"
         },
+        {
+            "name": "ironsandstone"
+        },
+        {
+            "name": "ironsandstone_south"
+        },
+        {
+            "name": "ironsandstone_east"
+        },
+        {
+            "name": "ironsandstone_north"
+        },
+        {
+            "name": "ironsandstone_west"
+        },
         {
             "name": "rock_artifact_fragment"
         },
diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png b/Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png
new file mode 100644
index 0000000000000000000000000000000000000000..3435f5a510afd52dd15ec90f2142e03eb4f174c6
GIT binary patch
literal 2809
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
LNkvXXu0mjf5Xm-+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png b/Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8b15e56e7d27092350e505135710586d7c10ea3
GIT binary patch
literal 1619
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
RJIeq7002ovPDHLkV1m@8<(2>d

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/meta.json b/Resources/Textures/Structures/ironsand_steps.rsi/meta.json
new file mode 100644
index 0000000000..1eaca47c43
--- /dev/null
+++ b/Resources/Textures/Structures/ironsand_steps.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+	    "name": "straight",
+	    "directions": 4
+	},
+	{
+	    "name": "corner_convex",
+	    "directions": 4
+	},
+	{
+	    "name": "corner_concave",
+	    "directions": 4
+	}
+    ]
+}
diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/straight.png b/Resources/Textures/Structures/ironsand_steps.rsi/straight.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3c6c98c8f2a1445696f6686a9b217f38ec5467e
GIT binary patch
literal 1883
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
V13jo#5EK9a002ovPDHLkV1i9HR<i&A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_packed.png b/Resources/Textures/Tiles/Asteroid/ironsand_packed.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb977bdec4c20763398744148da769251e474c02
GIT binary patch
literal 7210
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved.png
new file mode 100644
index 0000000000000000000000000000000000000000..9724ec250c229099f9628d1da27c6714384cbd23
GIT binary patch
literal 9080
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..2353c993186f5b4c9a87abbd7ebef2698f5b23e4
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szhn~@V`6XVI(h>r)b8ox7!q;#?S+lJha3c4F7AK*
zS$3N0X(a{6MeIUW3QM_FxE64&THw2(*4xeDO+!N5m&u;TA`X5o?0#!uz$dG^eaW%H
z@~i_v%^eH}cyB$~^Q!I6SDEwS-fK?n6J@z9!*a|-cgeAc1}TH%vwi+=j(FI5xQ<<7
osmQD;1?7IzcPlD^!Kd?fWwr|61*g6(1UiYq)78&qol`;+05`;B-v9sr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..869151e54da71a86a0d43b8c7f833329f2db9b78
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szhn~@V`iT9$Djcy)aB{o7!q;#?KwkUCPxw1i@*Qz
zu(EPStq5@F<jqQ1!|bELz&NF2p<?8TGww{2b2IJ<78D;{@VoSsMk|M7zK5rWf}+Be
zlOo03OBg!;eq0lO*UD<cy`0SXlCG|Td*c12oCF&jS~aFBbwr)K*S;%h;qkYVgi`#C
qCZF+Jsa@87`O&hOU~n_OhH=6(W!3CS4U2%TV(@hJb6Mw<&;$VQU}Cla

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..854577a945f7458f0a518e4fce635b61592e85c5
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szhn~@HPKkYczrEUsNK`WF(l&f+cO(^4;hHGJS@&}
z-5A8^ZOFPPg-J{6l#jzq%?NF$O@B5dCvgQ#;ak3Fr+?Me-=$ov@BXT8-{uya9Wu4)
z-@QvS)Ru(1&0=`Y{H=Yp)=e|jiv~6i?x^3*H5aHnXP+%Cu~_hNhk()^jy>X2f+7~a
n_xl-MY;!*>S4a>H{@#^Vx}>&rQnV~D&`AuQu6{1-oD!M<KC58Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..98108cc7bb884773d7f441f0b286b1a6b7662b16
GIT binary patch
literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szhn~@W0HIDFc&1W#M8wwB;xSfiw6S_I|#U3+^>A{
zsX=Fx!I7yJ1!CupvU+$VUEh7#?uM(VxZVp3{l<CkJQ<!}UcsUg8sJ=HWqd|RsG*?q
zT+hqw$Hj3w_nfz}-LLj<CA-H-hpAsUip1B3W)=UsXCcS7$I?>#+qcUP{+M|cMd>bR
z+x^*4SEfzQ`0(A6PfvY|jo7}&`*%G1o%oN7CYgJk)Hz*e+%Dk6q1XZ>>UT0uHi>z=
USoY0npnDlSUHx3vIVCg!0K5%!`v3p{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_plating.png b/Resources/Textures/Tiles/Asteroid/ironsand_plating.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf95f4264d55d18e608b755de4a217b5ad597fb8
GIT binary patch
literal 1147
zcmV->1cdvEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rk1_KiyD@QVVZvX%T
z(Md!>R9M5USJ86gHVj;V6s?P|P1~ow_7nO~{r@&s=b}&q&<BweNy$!brkv5pk_8G_
z0J{+V_2(Z(*p~q)*VNntfQk1fS2c{Q*nZ}@nSj}QcmnYIb;kd_k{LYF-Tz;fh^Pub
zF~JO2)`Y*;1p4F)0)VH<<NKQM-k^21s6p|!;BlEe%nU>X4**2K_ch_lgozoeYBi2(
z2u$@{BW$3ZfbPFX>lPC(liz}124l#xn1PA#G&wL4X2;$66pid46CoMEM2DjUGcLwZ
za7=_KiX|ytlGF`Sc5HM)%rG(IIrz@ea!kDK_mcF0QdEU6P>LBm2#Y8}-sIN|Ra8Y_
z-W^nf*k<RMAZ8G;Q-s8T;256m&<U540yDs6j{_g0EH7^%clnv@M`sh88oIZ*Jr~=O
z#}THkh(r<9s*Ro2#P0Cy`H-^Kj(w9CPmd#rs`%;{A-66*Xg>g0l6FD4Awb3l5sbgT
zCCQMVJ2+k!R!r6-aO%KWo0JWrYDEA5)Q<2UYlX3@;aig00kw9D1FIS=Z#KIv!kg@o
zyo=%{3Qq)21T}-^C`J&<{adyv_kQ*cOTI1{pwfmd52#rap;h){GdS8A(grBY@2G~^
zQQc#at@qV-7Hu;Sn0G4P>D4+#jACE_Z#nm6{S+odk*Wtu8;na5h*^a?iajjSionz4
ze@N}3NIgHYwFjLtd)^)RjH-=F7)21A`(YLR5`1k@-wqGIc-JZ6sEnnb#SE`&!ZpMH
z!~_CxaeO*}l=|>=98kKxd6SJa76Uvp4BJ@&yf!T9h`NXaGZx!;zc@M`h2rU64H$rl
zw(1WJBL?PtY}aa=7T7?q9!E_WC!~?}ZX)M$9GL6NUz+L<%$ReFjq_r;e~%fj-W}_K
z=$wkn%cCm3<Qkbhcf;oB_}PnFW-Ph4A$6P@Wh?OA(}J=|Y-WfmI+^L(*<qZdOAWMX
zVjI}$9=9(^yLq4`o0jQDJ=mSr17+7PDA(nWMf5JL<r&wsWK_fKxjqxSp;qxNN!5{Y
z&u$<oLQ=Y+Rl)M|G;HE>i!Et~zC|IaAprPy2+CS5Xjdyn0Pre`=Ul;>KQ`31x@jk=
zz<21@F`^o-bY8p%vqiLn>e)M}*&!`vd+GucUbEdI+C95D-ACR{#nscv<2@yC_tDW8
z%b8jhm}e#=-N`1NKu!RzgK*WWYw);ckudA);?cTZrbBTR`?Gxx^T5o6f8O5j%4qqn
zvlHU6PpaqX_af1jf{Sw<^OXv2?@|7U7+a{l*V^7h@b!az0pN9A@gK2Eb5;Qh%|`$L
N002ovPDHLkV1kl04x#`6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_tile.png b/Resources/Textures/Tiles/Asteroid/ironsand_tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..065935125f059f99330b20899952b43f4ac1adb4
GIT binary patch
literal 1909
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png b/Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png
new file mode 100644
index 0000000000000000000000000000000000000000..3927000277addbf816f305bebba4b0861324cbd3
GIT binary patch
literal 10729
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
bzUKb}-1HfgUd*4N00000NkvXXu0mjfKX$uF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png
new file mode 100644
index 0000000000000000000000000000000000000000..da10aecc471b8d8f2f8509dd4330111635a3b4da
GIT binary patch
literal 6083
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
JPDHLkV1jtWcya&$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png
new file mode 100644
index 0000000000000000000000000000000000000000..19163b1fe26df1e395127813dcaef15ccbea5622
GIT binary patch
literal 5949
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png
new file mode 100644
index 0000000000000000000000000000000000000000..fff7fa7a59aeee12875d0351f9cabd0fd99ff1a0
GIT binary patch
literal 6365
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

literal 0
HcmV?d00001


From 862675e71b1663f329178a3338fdf151cfc63d97 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 3 Jan 2026 11:33:28 -0800
Subject: [PATCH 222/360] [STAGING] Fix Disabler SMG bolts going through walls
 (#42195)

* RAH RAH RASPUTIN LOVER OF THE RUSSIAN QUEEN!

* delete if we do 0 damage

* actually change that

* dont get soaped into cleaning things up challenge impossible

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Projectiles/ProjectileSystem.cs           | 96 ++++++++++---------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index cc4eda4307..87fc13b563 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Destructible;
 using Content.Server.Effects;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Camera;
+using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -69,51 +70,11 @@ public sealed class ProjectileSystem : SharedProjectileSystem
                 LogImpact.Medium,
                 $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {damage:damage} damage");
 
-            // If penetration is to be considered, we need to do some checks to see if the projectile should stop.
-            if (component.PenetrationThreshold != 0)
-            {
-                // If a damage type is required, stop the bullet if the hit entity doesn't have that type.
-                if (component.PenetrationDamageTypeRequirement != null)
-                {
-                    var stopPenetration = false;
-                    foreach (var requiredDamageType in component.PenetrationDamageTypeRequirement)
-                    {
-                        if (!damage.DamageDict.Keys.Contains(requiredDamageType))
-                        {
-                            stopPenetration = true;
-                            break;
-                        }
-                    }
-                    if (stopPenetration)
-                        component.ProjectileSpent = true;
-                }
-
-                var pierceEv = new ProjectilePierceEvent(target, damageRequired); // DeltaV - Addition of the NT-3
-                RaiseLocalEvent(uid, ref pierceEv);
-
-                // If the object won't be destroyed, it "tanks" the penetration hit.
-                if (damage.GetTotal() < damageRequired)
-                {
-                    component.ProjectileSpent = true;
-                }
-
-                if (!component.ProjectileSpent)
-                {
-                    component.PenetrationAmount += damageRequired;
-                    // The projectile has dealt enough damage to be spent.
-                    if (component.PenetrationAmount >= component.PenetrationThreshold)
-                    {
-                        component.ProjectileSpent = true;
-                    }
-                }
-
-                if (component.ProjectileSpent && pierceEv.Pierced) // DeltaV - Addition of the NT-3
-                    component.ProjectileSpent = false;
-            }
-            else
-            {
-                component.ProjectileSpent = true;
-            }
+            component.ProjectileSpent = !TryPenetrate((uid, component), damage, damageRequired, target); // DeltaV - Addition of the NT-3
+        }
+        else
+        {
+            component.ProjectileSpent = true;
         }
 
         if (!deleted)
@@ -132,4 +93,49 @@ public sealed class ProjectileSystem : SharedProjectileSystem
             RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, GetNetCoordinates(xform.Coordinates)), Filter.Pvs(xform.Coordinates, entityMan: EntityManager));
         }
     }
+
+    private bool TryPenetrate(Entity<ProjectileComponent> projectile, DamageSpecifier damage, FixedPoint2 damageRequired, EntityUid target) // DeltaV - Addition of the NT-3
+    {
+        // If penetration is to be considered, we need to do some checks to see if the projectile should stop.
+        if (projectile.Comp.PenetrationThreshold == 0)
+            return false;
+
+        // If a damage type is required, stop the bullet if the hit entity doesn't have that type.
+        if (projectile.Comp.PenetrationDamageTypeRequirement != null)
+        {
+            foreach (var requiredDamageType in projectile.Comp.PenetrationDamageTypeRequirement)
+            {
+                if (damage.DamageDict.Keys.Contains(requiredDamageType))
+                    continue;
+
+                return false;
+            }
+        }
+
+        var pierceEv = new ProjectilePierceEvent(target, damageRequired); // DeltaV - Addition of the NT-3
+        RaiseLocalEvent(projectile, ref pierceEv);
+
+        // If the object won't be destroyed, it "tanks" the penetration hit.
+        if (damage.GetTotal() < damageRequired)
+        {
+            return false;
+        }
+
+        if (!projectile.Comp.ProjectileSpent)
+        {
+            projectile.Comp.PenetrationAmount += damageRequired;
+            // The projectile has dealt enough damage to be spent.
+            if (projectile.Comp.PenetrationAmount >= projectile.Comp.PenetrationThreshold)
+            {
+                return false;
+            }
+
+            if (projectile.Comp.ProjectileSpent && pierceEv.Pierced) // DeltaV - Addition of the NT-3
+            {
+                return true;
+            }
+        }
+
+        return true;
+    }
 }

From 4677401244fb917a4dbde874a5725305c3afdeb7 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 3 Jan 2026 11:39:17 -0800
Subject: [PATCH 223/360] [Staging] Let admins ignore the laws of physics
 again. (#42221)

admin ignore physics

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Movement/Systems/SharedMoverController.cs  | 4 +++-
 Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index f2926562f3..1627dfb7cc 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -224,11 +224,13 @@ public abstract partial class SharedMoverController : VirtualController
          * Physics simulation, which will cause issues for Dynamic bodies (Such as Friction being applied twice).
          * Kinematic bodies have even less Physics options and as such aren't suitable for a player, especially
          * when we move to Box2D v3 where there will be more support for players updating outside of simulation.
+         * However, Kinematic bodies are useful currently for mobs which explicitly ignore physics, you should use
+         * this type extremely sparingly and only for mobs which *explicitly* disobey the laws of physics (A-Ghosts).
          * Lastly, static bodies can't move so they shouldn't be updated. If a static body makes it here we're
          * doing unnecessary calculations.
          * Only a Kinematic Controller should be making it to this point.
          */
-        DebugTools.Assert(physicsComponent.BodyType == BodyType.KinematicController,
+        DebugTools.Assert(physicsComponent.BodyType == BodyType.KinematicController || physicsComponent.BodyType == BodyType.Kinematic,
             $"Input mover: {ToPrettyString(uid)} in HandleMobMovement is not the correct BodyType, BodyType found: {physicsComponent.BodyType}, expected: KinematicController.");
 
         // If the body is in air but isn't weightless then it can't move
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 97d9bee2e9..678d15f9f5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -43,6 +43,7 @@
     needsHands: false
   - type: CombatMode
   - type: Physics
+    bodyType: Kinematic # Admin ghosts should ignore the laws of physics.
     ignorePaused: true
   - type: Access
     groups:

From 6c8f446f1208b4d12ced98720709b06b4201a106 Mon Sep 17 00:00:00 2001
From: Red <96445749+TheShuEd@users.noreply.github.com>
Date: Sun, 4 Jan 2026 00:29:48 +0300
Subject: [PATCH 224/360] Melee weapons animations upgrade (#41425)

* upgrading

* Update MeleeWeaponSystem.Effects.cs

* Easing
---
 .../Melee/MeleeWeaponSystem.Effects.cs        | 80 +++++++++++--------
 .../Weapons/Melee/MeleeWeaponComponent.cs     | 19 ++++-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |  6 ++
 .../Objects/Weapons/Melee/e_sword.yml         |  1 -
 4 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
index 15d137d8a9..0bccd5b1b3 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
@@ -43,6 +43,9 @@ public sealed partial class MeleeWeaponSystem
             return;
         }
 
+        var length = 1f;
+        var offset = 1f;
+
         var spriteRotation = Angle.Zero;
         if (arcComponent.Animation != WeaponArcAnimation.None
             && TryComp(weapon, out MeleeWeaponComponent? meleeWeaponComponent))
@@ -55,10 +58,11 @@ public sealed partial class MeleeWeaponSystem
 
             if (meleeWeaponComponent.SwingLeft)
                 angle *= -1;
-            if (meleeWeaponComponent.ChangeSwingDirection) meleeWeaponComponent.SwingLeft = !meleeWeaponComponent.SwingLeft; // DeltaV - Nice swing animation for desword
+
+            length = (1 / meleeWeaponComponent.AttackRate) * 0.6f;
+            offset = meleeWeaponComponent.AnimationOffset;
         }
         _sprite.SetRotation((animationUid, sprite), localPos.ToWorldAngle());
-        var distance = Math.Clamp(localPos.Length() / 2f, 0.2f, 1f);
 
         var xform = _xformQuery.GetComponent(animationUid);
         TrackUserComponent track;
@@ -68,16 +72,16 @@ public sealed partial class MeleeWeaponSystem
             case WeaponArcAnimation.Slash:
                 track = EnsureComp<TrackUserComponent>(animationUid);
                 track.User = user;
-                _animation.Play(animationUid, GetSlashAnimation(sprite, angle, spriteRotation), SlashAnimationKey);
+                _animation.Play(animationUid, GetSlashAnimation((animationUid, sprite), angle, spriteRotation, length, offset), SlashAnimationKey);
                 if (arcComponent.Fadeout)
-                    _animation.Play(animationUid, GetFadeAnimation(sprite, 0.065f, 0.065f + 0.05f), FadeAnimationKey);
+                    _animation.Play(animationUid, GetFadeAnimation(sprite, length * 0.5f, length + 0.15f), FadeAnimationKey);
                 break;
             case WeaponArcAnimation.Thrust:
                 track = EnsureComp<TrackUserComponent>(animationUid);
                 track.User = user;
-                _animation.Play(animationUid, GetThrustAnimation((animationUid, sprite), distance, spriteRotation), ThrustAnimationKey);
+                _animation.Play(animationUid, GetThrustAnimation((animationUid, sprite), offset, spriteRotation, length), ThrustAnimationKey);
                 if (arcComponent.Fadeout)
-                    _animation.Play(animationUid, GetFadeAnimation(sprite, 0.05f, 0.15f), FadeAnimationKey);
+                    _animation.Play(animationUid, GetFadeAnimation(sprite, length * 0.5f, length + 0.15f), FadeAnimationKey);
                 break;
             case WeaponArcAnimation.None:
                 var (mapPos, mapRot) = TransformSystem.GetWorldPositionRotation(userXform);
@@ -90,21 +94,22 @@ public sealed partial class MeleeWeaponSystem
         }
     }
 
-    private Animation GetSlashAnimation(SpriteComponent sprite, Angle arc, Angle spriteRotation)
+    private Animation GetSlashAnimation(Entity<SpriteComponent> sprite, Angle arc, Angle spriteRotation, float length, float offset)
     {
-        const float slashStart = 0.03f;
-        const float slashEnd = 0.065f;
-        const float length = slashEnd + 0.05f;
-        var startRotation = sprite.Rotation + arc / 2;
-        var endRotation = sprite.Rotation - arc / 2;
-        var startRotationOffset = startRotation.RotateVec(new Vector2(0f, -1f));
-        var endRotationOffset = endRotation.RotateVec(new Vector2(0f, -1f));
+        var startRotation = sprite.Comp.Rotation + (arc * 0.5f);
+        var endRotation = sprite.Comp.Rotation - (arc * 0.5f);
+
+        var startRotationOffset = startRotation.RotateVec(new Vector2(0f, -offset * 0.9f));
+        var minRotationOffset = sprite.Comp.Rotation.RotateVec(new Vector2(0f, -offset * 1.1f));
+        var endRotationOffset = endRotation.RotateVec(new Vector2(0f, -offset * 0.9f));
+
         startRotation += spriteRotation;
         endRotation += spriteRotation;
+        sprite.Comp.NoRotation = true;
 
         return new Animation()
         {
-            Length = TimeSpan.FromSeconds(length),
+            Length = TimeSpan.FromSeconds(length + 0.05f),
             AnimationTracks =
             {
                 new AnimationTrackComponentProperty()
@@ -113,10 +118,12 @@ public sealed partial class MeleeWeaponSystem
                     Property = nameof(SpriteComponent.Rotation),
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(startRotation, 0f),
-                        new AnimationTrackProperty.KeyFrame(startRotation, slashStart),
-                        new AnimationTrackProperty.KeyFrame(endRotation, slashEnd)
-                    }
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.0f), length * 0.0f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.5f), length * 0.10f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,1.0f), length * 0.15f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.9f), length * 0.20f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.80f), length * 0.6f, Easings.OutQuart)
+                    },
                 },
                 new AnimationTrackComponentProperty()
                 {
@@ -124,21 +131,21 @@ public sealed partial class MeleeWeaponSystem
                     Property = nameof(SpriteComponent.Offset),
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(startRotationOffset, 0f),
-                        new AnimationTrackProperty.KeyFrame(startRotationOffset, slashStart),
-                        new AnimationTrackProperty.KeyFrame(endRotationOffset, slashEnd)
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.0f), length * 0.0f),
+                        new AnimationTrackProperty.KeyFrame(minRotationOffset, length * 0.10f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,1.0f), length * 0.15f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.80f), length * 0.6f, Easings.OutQuart)
                     }
                 },
             }
         };
     }
 
-    private Animation GetThrustAnimation(Entity<SpriteComponent> sprite, float distance, Angle spriteRotation)
+    private Animation GetThrustAnimation(Entity<SpriteComponent> sprite, float offset, Angle spriteRotation, float length)
     {
-        const float thrustEnd = 0.05f;
-        const float length = 0.15f;
-        var startOffset = sprite.Comp.Rotation.RotateVec(new Vector2(0f, -distance / 5f));
-        var endOffset = sprite.Comp.Rotation.RotateVec(new Vector2(0f, -distance));
+        var startOffset = sprite.Comp.Rotation.RotateVec(new Vector2(0f, 0f));
+        var endOffset = sprite.Comp.Rotation.RotateVec(new Vector2(0f, -offset * 1.2f));
+
         _sprite.SetRotation(sprite.AsNullable(), sprite.Comp.Rotation + spriteRotation);
 
         return new Animation()
@@ -152,9 +159,11 @@ public sealed partial class MeleeWeaponSystem
                     Property = nameof(SpriteComponent.Offset),
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(startOffset, 0f),
-                        new AnimationTrackProperty.KeyFrame(endOffset, thrustEnd),
-                        new AnimationTrackProperty.KeyFrame(endOffset, length),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 0f), length * 0f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 0.65f), length * 0.10f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 1f), length * 0.20f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 0.9f), length * 0.30f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 0.7f), length * 0.60f, Easings.OutQuart)
                     }
                 },
             }
@@ -201,11 +210,12 @@ public sealed partial class MeleeWeaponSystem
                     InterpolationMode = AnimationInterpolationMode.Linear,
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(direction.Normalized() * 0.15f, 0f),
-                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, length)
-                    }
-                }
-            }
+                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, 0f),
+                        new AnimationTrackProperty.KeyFrame(direction.Normalized() * 0.15f, length*0.4f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, length*0.6f),
+                    },
+                },
+            },
         };
     }
 
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 6ea5ad3ca0..8a4dea37dc 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -100,7 +100,7 @@ public sealed partial class MeleeWeaponComponent : Component
     public Angle Angle = Angle.FromDegrees(60);
 
     [DataField, AutoNetworkedField]
-    public EntProtoId Animation = "WeaponArcPunch";
+    public EntProtoId Animation = "WeaponArcThrust";
 
     [DataField, AutoNetworkedField]
     public EntProtoId WideAnimation = "WeaponArcSlash";
@@ -112,15 +112,26 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public Angle WideAnimationRotation = Angle.Zero;
 
+    /// <summary>
+    /// Attack animation direction.
+    /// </summary>
     [DataField, AutoNetworkedField]
     public bool SwingLeft;
 
     /// <summary>
-    /// DeltaV: if true, weapon will swing in different direction each strike. Purely cosmetic.
+    /// Change <see cref="SwingLeft"/> after every attack. Allows each attack to take turns being either left or right.
+    /// Thats looks cool visually
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool SwingBeverage = true;
+
+    /// <summary>
+    /// How far away from the player the animation should be played.
+    /// We don't connect it with attack range, because different weapons have different sprites,
+    /// and this value should be adjusted manually for every weapon ideally
     /// </summary>
     [DataField]
-    public bool ChangeSwingDirection;
-
+    public float AnimationOffset = 1f;
 
     // Sounds
 
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index b626366ea7..bb947999ef 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -439,6 +439,12 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         var ev = new AttemptMeleeEvent();
         RaiseLocalEvent(weaponUid, ref ev);
 
+        if (weapon.SwingBeverage)
+        {
+            weapon.SwingLeft = !weapon.SwingLeft;
+            DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.SwingLeft));
+        }
+
         if (ev.Cancelled)
         {
             if (ev.Message != null)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 6677af6a1d..a216246c52 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -344,7 +344,6 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 2.0 # DeltaV - was 1.5
-    changeSwingDirection: true # DeltaV
     angle: 100
     damage:
       types:

From 455ab786ae373e7320bad1eedd07608459499036 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 3 Jan 2026 16:24:18 -0800
Subject: [PATCH 225/360] [STAGING] Staging Chat Fix (#42206)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 7ab18a586c..512bd7b436 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -200,7 +200,7 @@ public partial class ChatBox : UIWidget
         }
         // End EE - Chat stacking
 
-        Contents.AddMessage(formatted);
+        Contents.AddMessage(formatted, tagsAllowed: null);
     }
 
     public void Focus(ChatSelectChannel? channel = null)

From 56729fbdfab7b3b0a737de2d60b1264d4ab27cee Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 4 Jan 2026 17:28:09 +0100
Subject: [PATCH 226/360] Revert "feat: RnD tech research console now have
 reroll feature (#32931)"

This reverts commit 1f2d80297cb81e8dbbd1c1f46aeb531a2624204c.

Discussed during the maintainer meeting and voted to be reverted at this time.
---
 Content.Client/Research/ResearchSystem.cs     |  7 ++-
 .../UI/ResearchConsoleBoundUserInterface.cs   | 16 ++---
 .../Research/UI/ResearchConsoleMenu.xaml      |  3 +-
 .../Research/UI/ResearchConsoleMenu.xaml.cs   | 63 +------------------
 .../Systems/ResearchSystem.Console.cs         | 61 +++---------------
 .../Systems/ResearchSystem.Technology.cs      |  8 +--
 .../Components/ResearchServerComponent.cs     | 35 ++++-------
 .../SharedResearchConsoleComponent.cs         | 24 +++----
 .../Components/TechnologyDatabaseComponent.cs |  9 +--
 .../components/research-console-component.ftl |  2 -
 10 files changed, 60 insertions(+), 168 deletions(-)

diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs
index 7086fc928b..55d9535272 100644
--- a/Content.Client/Research/ResearchSystem.cs
+++ b/Content.Client/Research/ResearchSystem.cs
@@ -1,5 +1,8 @@
-using Content.Shared.Research.Systems;
+using Content.Shared.Research.Systems;
 
 namespace Content.Client.Research;
 
-public sealed class ResearchSystem : SharedResearchSystem;
+public sealed class ResearchSystem : SharedResearchSystem
+{
+
+}
diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index d5202eea5d..2895ada61f 100644
--- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -7,22 +7,23 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Research.UI;
 
 [UsedImplicitly]
-public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
+public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface
 {
     [ViewVariables]
     private ResearchConsoleMenu? _consoleMenu;
 
+    public ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
     protected override void Open()
     {
         base.Open();
 
-        _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
-        _consoleMenu.SetEntity(Owner);
+        var owner = Owner;
 
-        _consoleMenu.OnTechnologyRediscoverPressed += () =>
-        {
-            SendMessage(new ConsoleRediscoverTechnologyMessage());
-        };
+        _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
+        _consoleMenu.SetEntity(owner);
 
         _consoleMenu.OnTechnologyCardPressed += id =>
         {
@@ -55,7 +56,6 @@ public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKe
 
         if (state is not ResearchConsoleBoundInterfaceState castState)
             return;
-
         _consoleMenu?.UpdatePanels(castState);
         _consoleMenu?.UpdateInformationPanel(castState);
     }
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 8e3a74f933..8de9827c0c 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
@@ -22,7 +22,6 @@
             </BoxContainer>
             <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalAlignment="Right">
                 <Button Name="ServerButton" Text="{Loc 'research-console-menu-server-selection-button'}" MinHeight="40"/>
-                <Button Name="RediscoverButton" Margin="0 5 0 0" ToolTip="{Loc 'research-console-menu-server-rediscover-tooltip'}" MinHeight="40"/>
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal"
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index e0e6029667..eafbe75fbb 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -12,7 +12,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Research.UI;
@@ -21,26 +20,15 @@ namespace Content.Client.Research.UI;
 public sealed partial class ResearchConsoleMenu : FancyWindow
 {
     public Action<string>? OnTechnologyCardPressed;
-    public Action? OnTechnologyRediscoverPressed;
     public Action? OnServerButtonPressed;
 
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
     private readonly AccessReaderSystem _accessReader;
 
-    // if set to null  - we are waiting for server info and should not let rerolls
-    private TimeSpan? _nextRediscover;
-    private int _rediscoverCost;
-    private int _serverPoints;
-
-    private TimeSpan _nextUpdate;
-    private readonly TimeSpan _updateInterval = TimeSpan.FromMilliseconds(500);
-
     public EntityUid Entity;
 
     public ResearchConsoleMenu()
@@ -53,7 +41,6 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         _accessReader = _entity.System<AccessReaderSystem>();
 
         ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
-        RediscoverButton.OnPressed += OnRediscoverPressed;
     }
 
     public void SetEntity(EntityUid entity)
@@ -77,7 +64,9 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             MinHeight = 10
         });
 
-        var hasAccess = HasAccess();
+        var hasAccess = _player.LocalEntity is not { } local ||
+                        !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
+                        _accessReader.IsAllowed(local, Entity, access);
         foreach (var techId in database.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
@@ -90,12 +79,6 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         SyncTechnologyList(UnlockedCardsContainer, unlockedTech);
     }
 
-    private void UpdateRediscoverButton()
-    {
-        RediscoverButton.Disabled = !HasAccess() || _serverPoints < _rediscoverCost || _timing.CurTime < _nextRediscover;
-        RediscoverButton.Text = Loc.GetString("research-console-menu-server-rediscover-button", ("cost", _rediscoverCost));
-    }
-
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();
@@ -154,27 +137,6 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             };
             TierDisplayContainer.AddChild(control);
         }
-
-        _serverPoints = state.Points;
-        _rediscoverCost = state.RediscoverCost;
-        _nextRediscover = state.NextRediscover;
-
-        UpdateRediscoverButton();
-    }
-
-    private void OnRediscoverPressed(BaseButton.ButtonEventArgs args)
-    {
-        RediscoverButton.Disabled = true;
-        _nextRediscover = null;
-
-        OnTechnologyRediscoverPressed?.Invoke();
-    }
-
-    private bool HasAccess()
-    {
-        return _player.LocalEntity is not { } local
-               || !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access)
-               || _accessReader.IsAllowed(local, Entity, access);
     }
 
     /// <summary>
@@ -217,24 +179,5 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             container.Children.Remove(techControl);
         }
     }
-
-    /// <inheritdoc />
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        if(_nextUpdate > _timing.CurTime)
-            return;
-
-        _nextUpdate = _timing.CurTime + _updateInterval;
-
-        if (!RediscoverButton.Disabled)
-            return;
-
-        if (_nextRediscover == null || _nextRediscover > _timing.CurTime)
-            return;
-
-        UpdateRediscoverButton();
-    }
 }
 
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
index 0458408143..baaf06ea71 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -17,7 +17,6 @@ public sealed partial class ResearchSystem
     private void InitializeConsole()
     {
         SubscribeLocalEvent<ResearchConsoleComponent, ConsoleUnlockTechnologyMessage>(OnConsoleUnlock);
-        SubscribeLocalEvent<ResearchConsoleComponent, ConsoleRediscoverTechnologyMessage>(OnRediscoverTechnology);
         SubscribeLocalEvent<ResearchConsoleComponent, BeforeActivatableUIOpenEvent>(OnConsoleBeforeUiOpened);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchServerPointsChangedEvent>(OnPointsChanged);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchRegistrationChangedEvent>(OnConsoleRegistrationChanged);
@@ -26,41 +25,6 @@ public sealed partial class ResearchSystem
         SubscribeLocalEvent<ResearchConsoleComponent, GotEmaggedEvent>(OnEmagged);
     }
 
-    private void OnRediscoverTechnology(
-        EntityUid uid,
-        ResearchConsoleComponent console,
-        ConsoleRediscoverTechnologyMessage args
-    )
-    {
-        var act = args.Actor;
-
-        if (!this.IsPowered(uid, EntityManager))
-            return;
-
-        if (!HasAccess(uid, act))
-        {
-            _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
-            return;
-        }
-
-        if (!TryGetClientServer(uid, out var serverEnt, out var serverComponent))
-            return;
-
-        if(serverComponent.NextRediscover > _timing.CurTime)
-            return;
-
-        var rediscoverCost = serverComponent.RediscoverCost;
-        if (rediscoverCost > serverComponent.Points)
-            return;
-
-        serverComponent.NextRediscover = _timing.CurTime + serverComponent.RediscoverInterval;
-
-        ModifyServerPoints(serverEnt.Value, -rediscoverCost);
-        UpdateTechnologyCards(serverEnt.Value);
-        SyncClientWithServer(uid);
-        UpdateConsoleInterface(uid);
-    }
-
     private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component, ConsoleUnlockTechnologyMessage args)
     {
         var act = args.Actor;
@@ -71,7 +35,7 @@ public sealed partial class ResearchSystem
         if (!PrototypeManager.TryIndex<TechnologyPrototype>(args.Id, out var technologyPrototype))
             return;
 
-        if (!HasAccess(uid, act))
+        if (TryComp<AccessReaderComponent>(uid, out var access) && !_accessReader.IsAllowed(act, uid, access))
         {
             _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
             return;
@@ -108,17 +72,17 @@ public sealed partial class ResearchSystem
         if (!Resolve(uid, ref component, ref clientComponent, false))
             return;
 
-        
-        var points = 0;
-        var nextRediscover = TimeSpan.MaxValue;
-        var rediscoverCost = 0;
-        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent) && clientComponent.ConnectedToServer)
+        ResearchConsoleBoundInterfaceState state;
+
+        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent))
         {
-            points = serverComponent.Points;
-            nextRediscover = serverComponent.NextRediscover;
-            rediscoverCost = serverComponent.RediscoverCost;
+            var points = clientComponent.ConnectedToServer ? serverComponent.Points : 0;
+            state = new ResearchConsoleBoundInterfaceState(points);
+        }
+        else
+        {
+            state = new ResearchConsoleBoundInterfaceState(default);
         }
-        var state = new ResearchConsoleBoundInterfaceState(points, nextRediscover, rediscoverCost);
 
         _uiSystem.SetUiState(uid, ResearchConsoleUiKey.Key, state);
     }
@@ -157,9 +121,4 @@ public sealed partial class ResearchSystem
 
         args.Handled = true;
     }
-
-    private bool HasAccess(EntityUid uid, EntityUid act)
-    {
-        return TryComp<AccessReaderComponent>(uid, out var access) && _accessReader.IsAllowed(act, uid, access);
-    }
 }
diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 0c871c8071..3e8888276f 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -165,10 +165,10 @@ public sealed partial class ResearchSystem
         if (args.Server != null)
             return;
         component.MainDiscipline = null;
-        component.CurrentTechnologyCards = new();
-        component.SupportedDisciplines = new();
-        component.UnlockedTechnologies = new();
-        component.UnlockedRecipes = new();
+        component.CurrentTechnologyCards = new List<string>();
+        component.SupportedDisciplines = new List<ProtoId<TechDisciplinePrototype>>();
+        component.UnlockedTechnologies = new List<ProtoId<TechnologyPrototype>>();
+        component.UnlockedRecipes = new List<ProtoId<LatheRecipePrototype>>();
         Dirty(uid, component);
     }
 }
diff --git a/Content.Shared/Research/Components/ResearchServerComponent.cs b/Content.Shared/Research/Components/ResearchServerComponent.cs
index dab33f062d..3663e760f1 100644
--- a/Content.Shared/Research/Components/ResearchServerComponent.cs
+++ b/Content.Shared/Research/Components/ResearchServerComponent.cs
@@ -1,32 +1,26 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Research.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ResearchServerComponent : Component
 {
     /// <summary>
     /// The name of the server
     /// </summary>
     [AutoNetworkedField]
-    [DataField]
+    [DataField("serverName"), ViewVariables(VVAccess.ReadWrite)]
     public string ServerName = "RDSERVER";
 
     /// <summary>
     /// The amount of points on the server.
     /// </summary>
     [AutoNetworkedField]
-    [DataField]
+    [DataField("points"), ViewVariables(VVAccess.ReadWrite)]
     public int Points;
 
-    /// <summary>
-    /// Cost of technology research options reroll.
-    /// </summary>
-    [AutoNetworkedField]
-    [DataField]
-    public int RediscoverCost = 2000;
-
     /// <summary>
     /// A unique numeric id representing the server
     /// </summary>
@@ -43,34 +37,27 @@ public sealed partial class ResearchServerComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public List<EntityUid> Clients = new();
 
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [DataField("nextUpdateTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextUpdateTime = TimeSpan.Zero;
 
-    [DataField]
+    [DataField("researchConsoleUpdateTime"), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan ResearchConsoleUpdateTime = TimeSpan.FromSeconds(1);
-
-    /// <summary>
-    /// Time when next reroll for tech to research will be available.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextRediscover;
-
-    /// <summary>
-    /// Minimal interval between rediscover actions.
-    /// </summary>
-    [DataField]
-    public TimeSpan RediscoverInterval = TimeSpan.FromSeconds(1);
 }
 
 /// <summary>
 /// Event raised on a server's clients when the point value of the server is changed.
 /// </summary>
+/// <param name="Server"></param>
+/// <param name="Total"></param>
+/// <param name="Delta"></param>
 [ByRefEvent]
 public readonly record struct ResearchServerPointsChangedEvent(EntityUid Server, int Total, int Delta);
 
 /// <summary>
 /// Event raised every second to calculate the amount of points added to the server.
 /// </summary>
+/// <param name="Server"></param>
+/// <param name="Points"></param>
 [ByRefEvent]
 public record struct ResearchServerGetPointsPerSecondEvent(EntityUid Server, int Points);
 
diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
index bf1269ad01..6b7a210ecb 100644
--- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
@@ -9,13 +9,15 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ConsoleUnlockTechnologyMessage(string id) : BoundUserInterfaceMessage
+    public sealed class ConsoleUnlockTechnologyMessage : BoundUserInterfaceMessage
     {
-        public string Id = id;
-    }
+        public string Id;
 
-    [Serializable, NetSerializable]
-    public sealed class ConsoleRediscoverTechnologyMessage : BoundUserInterfaceMessage;
+        public ConsoleUnlockTechnologyMessage(string id)
+        {
+            Id = id;
+        }
+    }
 
     [Serializable, NetSerializable]
     public sealed class ConsoleServerSelectionMessage : BoundUserInterfaceMessage
@@ -24,12 +26,12 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ResearchConsoleBoundInterfaceState(int points, TimeSpan nextRediscover, int rediscoverCost) : BoundUserInterfaceState
+    public sealed class ResearchConsoleBoundInterfaceState : BoundUserInterfaceState
     {
-        public int Points = points;
-
-        public TimeSpan NextRediscover = nextRediscover;
-
-        public int RediscoverCost = rediscoverCost;
+        public int Points;
+        public ResearchConsoleBoundInterfaceState(int points)
+        {
+            Points = points;
+        }
     }
 }
diff --git a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
index 89411a05c0..f00338aac7 100644
--- a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
@@ -3,6 +3,7 @@ using Content.Shared.Research.Prototypes;
 using Content.Shared.Research.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Research.Components;
 
@@ -13,12 +14,12 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// A main discipline that locks out other discipline technology past a certain tier.
     /// </summary>
     [AutoNetworkedField]
-    [DataField]
-    public ProtoId<TechDisciplinePrototype>? MainDiscipline;
+    [DataField("mainDiscipline", customTypeSerializer: typeof(PrototypeIdSerializer<TechDisciplinePrototype>))]
+    public string? MainDiscipline;
 
     [AutoNetworkedField]
-    [DataField]
-    public List<ProtoId<TechnologyPrototype>> CurrentTechnologyCards = new();
+    [DataField("currentTechnologyCards")]
+    public List<string> CurrentTechnologyCards = new();
 
     /// <summary>
     /// Which research disciplines are able to be unlocked
diff --git a/Resources/Locale/en-US/research/components/research-console-component.ftl b/Resources/Locale/en-US/research/components/research-console-component.ftl
index 3094b4e773..5a1e074f4d 100644
--- a/Resources/Locale/en-US/research/components/research-console-component.ftl
+++ b/Resources/Locale/en-US/research/components/research-console-component.ftl
@@ -6,8 +6,6 @@ research-console-menu-main-discipline = Main Discipline: [color={$color}]{$name}
 research-console-menu-server-selection-button = Server list
 research-console-menu-server-sync-button = Sync
 research-console-menu-server-research-button = Research
-research-console-menu-server-rediscover-button = Rediscover ({$cost})
-research-console-menu-server-rediscover-tooltip = Reroll list of technologies to research
 research-console-available-text = Researchable Technologies
 research-console-unlocked-text = Unlocked Technologies
 research-console-tier-discipline-info = Tier {$tier}, [color={$color}]{$discipline}[/color]

From 7c114ee7b9dba366693acef2a200ddf6c26f76de Mon Sep 17 00:00:00 2001
From: TheFlyingSentry <170261226+TheFlyingSentry@users.noreply.github.com>
Date: Sun, 4 Jan 2026 19:28:35 -0500
Subject: [PATCH 227/360] Dragon rift no longer deletes all rifts when
 destroyed (#42234)

Maintaining the status quo
---
 Content.Server/Dragon/DragonSystem.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 4bd665a385..a7267ace81 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -277,9 +277,6 @@ public sealed partial class DragonSystem : EntitySystem
         if (!Resolve(uid, ref comp))
             return;
 
-        // do reset the rift count since crew destroyed the rift, not deleted by the dragon dying.
-        DeleteRifts(uid, true, comp);
-
         // We can't predict the rift being destroyed anyway so no point adding weakened to shared.
         comp.WeakenedAccumulator = comp.WeakenedDuration;
         _movement.RefreshMovementSpeedModifiers(uid);

From 83e063c6b389f6e2b172220ed76663f0816448f7 Mon Sep 17 00:00:00 2001
From: John <50085876+AreYouConfused@users.noreply.github.com>
Date: Mon, 5 Jan 2026 01:54:20 -0500
Subject: [PATCH 228/360] fixed typo/duplicate adjective (#42249)

fixed typo/duplicate
---
 Resources/Locale/en-US/datasets/adjectives.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/datasets/adjectives.ftl b/Resources/Locale/en-US/datasets/adjectives.ftl
index aa23640715..be7eecfc59 100644
--- a/Resources/Locale/en-US/datasets/adjectives.ftl
+++ b/Resources/Locale/en-US/datasets/adjectives.ftl
@@ -124,7 +124,7 @@ adjectives-dataset-123 = clumsy
 adjectives-dataset-124 = combative
 adjectives-dataset-125 = condemned
 adjectives-dataset-126 = confused
-adjectives-dataset-127 = crazy,flipped-out
+adjectives-dataset-127 = flipped-out
 adjectives-dataset-128 = creepy
 adjectives-dataset-129 = cruel
 adjectives-dataset-130 = dangerous

From 4fbab916cd32780bd6405d94aa0ff2fc20ae7982 Mon Sep 17 00:00:00 2001
From: Centronias <me@centronias.com>
Date: Mon, 5 Jan 2026 03:01:00 -0800
Subject: [PATCH 229/360] Fix localization missing spam from Admin Overlay
 (#42244)

playerInfo.StartingJob is already localized
---
 Content.Client/Administration/AdminNameOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index dbf7304ce5..ce3bff6491 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -227,7 +227,7 @@ internal sealed class AdminNameOverlay : Overlay
             {
                 color = Color.GreenYellow;
                 color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? color : colorDisconnected);
+                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.StartingJob, uiScale, playerInfo.Connected ? color : colorDisconnected);
                 currentOffset += lineoffset;
             }
 

From 5127211eb7b1fe54954b4dc107b0670778ea0314 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:17:17 +0100
Subject: [PATCH 230/360] Predict thieving beacon (#39610)

predict thieving beacon
---
 .../Components/StealAreaComponent.cs          | 23 -----------
 .../Foldable/DeployFoldableSystem.cs          |  4 +-
 Content.Shared/Foldable/FoldableSystem.cs     | 15 ++++----
 .../Components/StealAreaComponent.cs          | 38 +++++++++++++++++++
 .../Thief/Components/ThiefBeaconComponent.cs  |  8 ++--
 .../Thief/Systems/ThiefBeaconSystem.cs        | 36 ++++++++++--------
 6 files changed, 73 insertions(+), 51 deletions(-)
 delete mode 100644 Content.Server/Objectives/Components/StealAreaComponent.cs
 create mode 100644 Content.Shared/Objectives/Components/StealAreaComponent.cs
 rename {Content.Server => Content.Shared}/Thief/Components/ThiefBeaconComponent.cs (71%)
 rename {Content.Server => Content.Shared}/Thief/Systems/ThiefBeaconSystem.cs (70%)

diff --git a/Content.Server/Objectives/Components/StealAreaComponent.cs b/Content.Server/Objectives/Components/StealAreaComponent.cs
deleted file mode 100644
index 26e752f2f2..0000000000
--- a/Content.Server/Objectives/Components/StealAreaComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Server.Objectives.Systems;
-using Content.Server.Thief.Systems;
-
-namespace Content.Server.Objectives.Components;
-
-/// <summary>
-/// An abstract component that allows other systems to count adjacent objects as "stolen" when controlling other systems
-/// </summary>
-[RegisterComponent, Access(typeof(StealConditionSystem), typeof(ThiefBeaconSystem))]
-public sealed partial class StealAreaComponent : Component
-{
-    [DataField]
-    public bool Enabled = true;
-
-    [DataField]
-    public float Range = 1f;
-
-    /// <summary>
-    /// all the minds that will be credited with stealing from this area.
-    /// </summary>
-    [DataField]
-    public HashSet<EntityUid> Owners = new();
-}
diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs
index c690f3d51f..8b510664e4 100644
--- a/Content.Shared/Foldable/DeployFoldableSystem.cs
+++ b/Content.Shared/Foldable/DeployFoldableSystem.cs
@@ -37,7 +37,7 @@ public sealed class DeployFoldableSystem : EntitySystem
     private void OnDragDropDragged(Entity<DeployFoldableComponent> ent, ref DragDropDraggedEvent args)
     {
         if (!TryComp<FoldableComponent>(ent, out var foldable)
-            || !_foldable.TrySetFolded(ent, foldable, true))
+            || !_foldable.TrySetFolded(ent, foldable, true, args.User))
             return;
 
         _hands.PickupOrDrop(args.User, ent.Owner);
@@ -77,7 +77,7 @@ public sealed class DeployFoldableSystem : EntitySystem
             || !_hands.TryDrop((args.User, hands), args.Used, targetDropLocation: args.ClickLocation))
             return;
 
-        if (!_foldable.TrySetFolded(ent, foldable, false))
+        if (!_foldable.TrySetFolded(ent, foldable, false, args.User))
         {
             _hands.TryPickup(args.User, args.Used, handsComp: hands);
             return;
diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs
index 88a120cbcd..0dddbb54a8 100644
--- a/Content.Shared/Foldable/FoldableSystem.cs
+++ b/Content.Shared/Foldable/FoldableSystem.cs
@@ -79,14 +79,14 @@ public sealed class FoldableSystem : EntitySystem
     /// <summary>
     /// Set the folded state of the given <see cref="FoldableComponent"/>
     /// </summary>
-    public void SetFolded(EntityUid uid, FoldableComponent component, bool folded)
+    public void SetFolded(EntityUid uid, FoldableComponent component, bool folded, EntityUid? user = null)
     {
         component.IsFolded = folded;
         Dirty(uid, component);
         _appearance.SetData(uid, FoldedVisuals.State, folded);
         _buckle.StrapSetEnabled(uid, !component.IsFolded);
 
-        var ev = new FoldedEvent(folded);
+        var ev = new FoldedEvent(folded, user);
         RaiseLocalEvent(uid, ref ev);
     }
 
@@ -98,7 +98,7 @@ public sealed class FoldableSystem : EntitySystem
 
     public bool TryToggleFold(EntityUid uid, FoldableComponent comp, EntityUid? folder = null)
     {
-        var result = TrySetFolded(uid, comp, !comp.IsFolded);
+        var result = TrySetFolded(uid, comp, !comp.IsFolded, folder);
         if (!result && folder != null)
         {
             if (comp.IsFolded)
@@ -130,7 +130,7 @@ public sealed class FoldableSystem : EntitySystem
     /// <summary>
     /// Try to fold/unfold
     /// </summary>
-    public bool TrySetFolded(EntityUid uid, FoldableComponent comp, bool state)
+    public bool TrySetFolded(EntityUid uid, FoldableComponent comp, bool state, EntityUid? user = null)
     {
         if (state == comp.IsFolded)
             return false;
@@ -141,7 +141,7 @@ public sealed class FoldableSystem : EntitySystem
         if (_pointLight.TryGetLight(uid, out var light)) // DeltaV - Holographic Rollerbeds emit light.
             _pointLight.SetEnabled(uid, !state, light);
 
-        SetFolded(uid, comp, state);
+        SetFolded(uid, comp, state, user);
         return true;
     }
 
@@ -184,6 +184,7 @@ public record struct FoldAttemptEvent(FoldableComponent Comp, bool Cancelled = f
 /// <summary>
 /// Event raised on an entity after it has been folded.
 /// </summary>
-/// <param name="IsFolded"></param>
+/// <param name="IsFolded">True is it has been folded, false if it has been unfolded.</param>
+/// <param name="User">The player who did the folding.</param>
 [ByRefEvent]
-public readonly record struct FoldedEvent(bool IsFolded);
+public readonly record struct FoldedEvent(bool IsFolded, EntityUid? User);
diff --git a/Content.Shared/Objectives/Components/StealAreaComponent.cs b/Content.Shared/Objectives/Components/StealAreaComponent.cs
new file mode 100644
index 0000000000..50e9d328ac
--- /dev/null
+++ b/Content.Shared/Objectives/Components/StealAreaComponent.cs
@@ -0,0 +1,38 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Objectives.Components;
+
+/// <summary>
+/// An abstract component that allows other systems to count adjacent objects as "stolen" when controlling other systems
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class StealAreaComponent : Component
+{
+    /// <summary>
+    /// Is the component currently enabled?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The range to check for items in.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1f;
+
+    /// <summary>
+    /// All the minds that will be credited with stealing from this area.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Network this when we have WeakEntityReference.
+    /// </remarks>
+    [DataField]
+    public HashSet<EntityUid> Owners = new();
+
+    /// <summary>
+    /// The count of the owner hashset.
+    /// This is a separate datafield because networking the list would cause PVS errors if an entity inside would be deleted and networked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int OwnerCount = 0;
+}
diff --git a/Content.Server/Thief/Components/ThiefBeaconComponent.cs b/Content.Shared/Thief/Components/ThiefBeaconComponent.cs
similarity index 71%
rename from Content.Server/Thief/Components/ThiefBeaconComponent.cs
rename to Content.Shared/Thief/Components/ThiefBeaconComponent.cs
index 65db79f861..5701254c98 100644
--- a/Content.Server/Thief/Components/ThiefBeaconComponent.cs
+++ b/Content.Shared/Thief/Components/ThiefBeaconComponent.cs
@@ -1,12 +1,14 @@
-using Content.Server.Thief.Systems;
+using Content.Shared.Thief.Systems;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Thief.Components;
+namespace Content.Shared.Thief.Components;
 
 /// <summary>
 /// working together with StealAreaComponent, allows the thief to count objects near the beacon as stolen when setting up.
 /// </summary>
-[RegisterComponent, Access(typeof(ThiefBeaconSystem))]
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(ThiefBeaconSystem))]
 public sealed partial class ThiefBeaconComponent : Component
 {
     [DataField]
diff --git a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs b/Content.Shared/Thief/Systems/ThiefBeaconSystem.cs
similarity index 70%
rename from Content.Server/Thief/Systems/ThiefBeaconSystem.cs
rename to Content.Shared/Thief/Systems/ThiefBeaconSystem.cs
index 069966a8a4..bff33cb781 100644
--- a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs
+++ b/Content.Shared/Thief/Systems/ThiefBeaconSystem.cs
@@ -1,15 +1,15 @@
-using Content.Server.Mind;
-using Content.Server.Objectives.Components;
-using Content.Server.Thief.Components;
+using Content.Shared.Mind;
+using Content.Shared.Objectives.Components;
+using Content.Shared.Roles;
+using Content.Shared.Thief.Components;
 using Content.Shared.Examine;
 using Content.Shared.Foldable;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 using Robust.Shared.Audio.Systems;
 
-namespace Content.Server.Thief.Systems;
+namespace Content.Shared.Thief.Systems;
 
 /// <summary>
 /// <see cref="ThiefBeaconComponent"/>
@@ -18,7 +18,7 @@ public sealed class ThiefBeaconSystem : EntitySystem
 {
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedRoleSystem _roles = default!;
     public override void Initialize()
     {
@@ -46,7 +46,7 @@ public sealed class ThiefBeaconSystem : EntitySystem
         {
             Act = () =>
             {
-                SetCoordinate(beacon, mind.Value);
+                SetCoordinate(beacon, mind.Value, user);
             },
             Message = Loc.GetString("thief-fulton-verb-message"),
             Text = Loc.GetString("thief-fulton-verb-text"),
@@ -56,7 +56,7 @@ public sealed class ThiefBeaconSystem : EntitySystem
     private void OnFolded(Entity<ThiefBeaconComponent> beacon, ref FoldedEvent args)
     {
         if (args.IsFolded)
-            ClearCoordinate(beacon);
+            ClearCoordinate(beacon, args.User);
     }
 
     private void OnExamined(Entity<ThiefBeaconComponent> beacon, ref ExaminedEvent args)
@@ -64,23 +64,25 @@ public sealed class ThiefBeaconSystem : EntitySystem
         if (!TryComp<StealAreaComponent>(beacon, out var area))
             return;
 
-        args.PushText(Loc.GetString(area.Owners.Count == 0
+        args.PushText(Loc.GetString(area.OwnerCount == 0
             ? "thief-fulton-examined-unset"
             : "thief-fulton-examined-set"));
     }
 
-    private void SetCoordinate(Entity<ThiefBeaconComponent> beacon, EntityUid mind)
+    private void SetCoordinate(Entity<ThiefBeaconComponent> beacon, EntityUid mind, EntityUid? user = null)
     {
         if (!TryComp<StealAreaComponent>(beacon, out var area))
             return;
 
-        _audio.PlayPvs(beacon.Comp.LinkSound, beacon);
-        _popup.PopupEntity(Loc.GetString("thief-fulton-set"), beacon);
-        area.Owners.Clear(); //We only reconfigure the beacon for ourselves, we don't need multiple thieves to steal from the same beacon.
+        _audio.PlayPredicted(beacon.Comp.LinkSound, beacon, user);
+        _popup.PopupClient(Loc.GetString("thief-fulton-set"), beacon, user);
+        area.Owners.Clear(); // We only reconfigure the beacon for ourselves, we don't need multiple thieves to steal from the same beacon.
         area.Owners.Add(mind);
+        area.OwnerCount = area.Owners.Count;
+        Dirty(beacon.Owner, area);
     }
 
-    private void ClearCoordinate(Entity<ThiefBeaconComponent> beacon)
+    private void ClearCoordinate(Entity<ThiefBeaconComponent> beacon, EntityUid? user = null)
     {
         if (!TryComp<StealAreaComponent>(beacon, out var area))
             return;
@@ -88,8 +90,10 @@ public sealed class ThiefBeaconSystem : EntitySystem
         if (area.Owners.Count == 0)
             return;
 
-        _audio.PlayPvs(beacon.Comp.UnlinkSound, beacon);
-        _popup.PopupEntity(Loc.GetString("thief-fulton-clear"), beacon);
+        _audio.PlayPredicted(beacon.Comp.UnlinkSound, beacon, user);
+        _popup.PopupClient(Loc.GetString("thief-fulton-clear"), beacon, user);
         area.Owners.Clear();
+        area.OwnerCount = area.Owners.Count;
+        Dirty(beacon.Owner, area);
     }
 }

From c3d7e8d88e06985e27a1ceb3e8ce6a085637c292 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Mon, 5 Jan 2026 22:00:15 +0100
Subject: [PATCH 231/360] Msg Toolshed Command (#41936)

* init

* subfolder

* note
---
 Content.Server/Prayer/PrayerSystem.cs         |  4 +-
 .../Toolshed/Commands/Misc/MsgCommand.cs      | 83 +++++++++++++++++++
 .../en-US/commands/toolshed/msg-command.ftl   |  5 ++
 .../{ => toolshed}/toolshed-commands.ftl      |  2 +
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 Content.Server/Toolshed/Commands/Misc/MsgCommand.cs
 create mode 100644 Resources/Locale/en-US/commands/toolshed/msg-command.ftl
 rename Resources/Locale/en-US/commands/{ => toolshed}/toolshed-commands.ftl (99%)

diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs
index 44a04cd0ae..46353dfdd3 100644
--- a/Content.Server/Prayer/PrayerSystem.cs
+++ b/Content.Server/Prayer/PrayerSystem.cs
@@ -77,7 +77,7 @@ public sealed class PrayerSystem : EntitySystem
     /// <param name="source">The IPlayerSession that sent the message</param>
     /// <param name="messageString">The main message sent to the player via the chatbox</param>
     /// <param name="popupMessage">The popup to notify the player, also prepended to the messageString</param>
-    public void SendSubtleMessage(ICommonSession target, ICommonSession source, string messageString, string popupMessage)
+    public void SendSubtleMessage(ICommonSession target, ICommonSession? source, string messageString, string popupMessage)
     {
         if (target.AttachedEntity == null)
             return;
@@ -86,7 +86,7 @@ public sealed class PrayerSystem : EntitySystem
 
         _popupSystem.PopupEntity(popupMessage, target.AttachedEntity.Value, target, PopupType.Large);
         _chatManager.ChatMessageToOne(ChatChannel.Local, messageString, message, EntityUid.Invalid, false, target.Channel);
-        _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(target.AttachedEntity.Value):player} received subtle message from {source.Name}: {message}");
+        _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(target.AttachedEntity.Value):player} received subtle message from {source?.Name ?? "unknown source"}: {message}");
     }
 
     /// <summary>
diff --git a/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs b/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs
new file mode 100644
index 0000000000..119a637c96
--- /dev/null
+++ b/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs
@@ -0,0 +1,83 @@
+using Content.Server.Administration;
+using Content.Server.Chat.Managers;
+using Content.Server.Popups;
+using Content.Server.Prayer;
+using Content.Server.Tips;
+using Content.Shared.Administration;
+using Content.Shared.Chat;
+using Content.Shared.Popups;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Toolshed.Commands.Misc;
+
+[ToolshedCommand, AdminCommand(AdminFlags.Fun)]
+public sealed class MsgCommand : ToolshedCommand
+{
+    [Dependency] private IChatManager _chatManager = default!;
+
+    private PrayerSystem? _prayer;
+    private PopupSystem? _popup;
+    private TipsSystem? _tips;
+
+    [CommandImplementation("subtle")]
+    public IEnumerable<EntityUid> Subtle(IInvocationContext ctx, [PipedArgument] IEnumerable<EntityUid> targets, string popup, string message)
+    {
+        _prayer ??= GetSys<PrayerSystem>();
+
+        foreach (var ent in targets)
+        {
+            if (!TryComp<ActorComponent>(ent, out var actor))
+                continue;
+
+            _prayer.SendSubtleMessage(actor.PlayerSession, ctx.Session, message, popup);
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("chat")]
+    public IEnumerable<EntityUid> Chat([PipedArgument] IEnumerable<EntityUid> targets, string message)
+    {
+        foreach (var ent in targets)
+        {
+            if (!TryComp<ActorComponent>(ent, out var actor))
+                continue;
+
+            _chatManager.ChatMessageToOne(ChatChannel.Local, message, message, EntityUid.Invalid, false, actor.PlayerSession.Channel);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("popup")]
+    public IEnumerable<EntityUid> Popup([PipedArgument] IEnumerable<EntityUid> targets, string popup, PopupType type, bool recipientOnly)
+    {
+        _popup ??= GetSys<PopupSystem>();
+
+        foreach (var ent in targets)
+        {
+            if (recipientOnly)
+                _popup.PopupEntity(popup, ent, ent, type); // If recipientOnly, show the popup only to the recipient.
+            else
+                _popup.PopupEntity(popup, ent, type); // Otherwise, show it to everyone within PVS of the target entity.
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("tippy")]
+    public IEnumerable<EntityUid> Tippy([PipedArgument] IEnumerable<EntityUid> targets, string message, EntProtoId prototype, float speakTime, float slideTime, float waddleInterval)
+    {
+        _tips ??= GetSys<TipsSystem>();
+
+        foreach (var ent in targets)
+        {
+            if (!TryComp<ActorComponent>(ent, out var actor))
+                continue;
+
+            _tips.SendTippy(actor.PlayerSession, message, prototype, speakTime, slideTime, waddleInterval);
+
+            yield return ent;
+        }
+    }
+}
diff --git a/Resources/Locale/en-US/commands/toolshed/msg-command.ftl b/Resources/Locale/en-US/commands/toolshed/msg-command.ftl
new file mode 100644
index 0000000000..3891decb75
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/msg-command.ftl
@@ -0,0 +1,5 @@
+# Msg
+command-description-msg-subtle = Sends a combination of a popup and a message to the input entities. Behaves same as the Subtle Message admin verb. Outputs entities that successfuly received a message.
+command-description-msg-chat = Sends a chat message to the sessions of the input entities. Outputs entities that successfuly received a message.
+command-description-msg-popup = Displays a popup above the input entiites. Can specify to only be visible to the target.
+command-description-msg-tippy = Sends a Tippy to the sessions of the input entities. All parameters must be specified. Outputs entities that successfuly received a tippy.
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl
similarity index 99%
rename from Resources/Locale/en-US/commands/toolshed-commands.ftl
rename to Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl
index cb2159260f..5773e32148 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl
@@ -1,3 +1,5 @@
+# Please add future toolshed locale to their own files. This needs to be cleaned up.
+
 command-description-visualize =
     Takes the input list of entities and puts them into a UI window for easy browsing.
 command-description-runverbas =

From 31a71d70bfd75eb0f625ae1f29436b683db38757 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Tue, 6 Jan 2026 00:01:15 +0100
Subject: [PATCH 232/360] Cleanup Toolshed Locale (#42259)

* it begins

* god help me

* FINALLY
---
 .../en-US/commands/toolshed/acmd-command.ftl  |   4 +
 .../toolshed/addaccesslog-command.ftl         |   2 +
 .../commands/toolshed/admins-command.ftl      |   4 +
 .../en-US/commands/toolshed/bank-command.ftl  |  10 +
 .../en-US/commands/toolshed/clone-command.ftl |  10 +
 .../commands/toolshed/dynamicrule-command.ftl |  16 ++
 .../commands/toolshed/inventory-command.ftl   |  20 ++
 .../commands/toolshed/jobboard-command.ftl    |   2 +
 .../en-US/commands/toolshed/jobs-command.ftl  |  12 ++
 .../en-US/commands/toolshed/laws-command.ftl  |   4 +
 .../commands/toolshed/marked-command.ftl      |   2 +
 .../en-US/commands/toolshed/mind-command.ftl  |   4 +
 .../commands/toolshed/polymorph-command.ftl   |   2 +
 .../commands/toolshed/rejuvenate-command.ftl  |   2 +
 .../commands/toolshed/runverbas-command.ftl   |   2 +
 .../en-US/commands/toolshed/scale-command.ftl |  10 +
 .../commands/toolshed/solution-command.ftl    |   4 +
 .../toolshed/stationevent-command.ftl         |   8 +
 .../commands/toolshed/stations-command.ftl    |  20 ++
 .../toolshed/statuseffect-command.ftl         |   8 +
 .../commands/toolshed/storage-command.ftl     |   4 +
 .../en-US/commands/toolshed/tag-command.ftl   |  12 ++
 .../commands/toolshed/toolshed-commands.ftl   | 180 ------------------
 .../commands/toolshed/unpolymorph-command.ftl |   2 +
 .../commands/toolshed/visualize-command.ftl   |   2 +
 .../toolshed/xenoartifact-command.ftl         |  10 +
 26 files changed, 176 insertions(+), 180 deletions(-)
 create mode 100644 Resources/Locale/en-US/commands/toolshed/acmd-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/addaccesslog-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/admins-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/bank-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/clone-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/dynamicrule-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/inventory-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/jobboard-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/jobs-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/laws-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/marked-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/mind-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/polymorph-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/rejuvenate-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/runverbas-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/scale-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/solution-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/stationevent-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/stations-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/statuseffect-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/storage-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/tag-command.ftl
 delete mode 100644 Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/unpolymorph-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/visualize-command.ftl
 create mode 100644 Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl

diff --git a/Resources/Locale/en-US/commands/toolshed/acmd-command.ftl b/Resources/Locale/en-US/commands/toolshed/acmd-command.ftl
new file mode 100644
index 0000000000..31745fb041
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/acmd-command.ftl
@@ -0,0 +1,4 @@
+command-description-acmd-perms =
+    Returns the admin permissions of the given command, if any.
+command-description-acmd-caninvoke =
+    Check if the given player can invoke the given command.
diff --git a/Resources/Locale/en-US/commands/toolshed/addaccesslog-command.ftl b/Resources/Locale/en-US/commands/toolshed/addaccesslog-command.ftl
new file mode 100644
index 0000000000..e5a13cbe01
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/addaccesslog-command.ftl
@@ -0,0 +1,2 @@
+command-description-addaccesslog =
+    Adds an access log to this entity. Do note that this bypasses the log's default limit and pause check.
diff --git a/Resources/Locale/en-US/commands/toolshed/admins-command.ftl b/Resources/Locale/en-US/commands/toolshed/admins-command.ftl
new file mode 100644
index 0000000000..56cc736d8e
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/admins-command.ftl
@@ -0,0 +1,4 @@
+command-description-admins-active =
+    Returns a list of active admins.
+command-description-admins-all =
+    Returns a list of ALL admins, including deadmined ones.
diff --git a/Resources/Locale/en-US/commands/toolshed/bank-command.ftl b/Resources/Locale/en-US/commands/toolshed/bank-command.ftl
new file mode 100644
index 0000000000..328be57656
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/bank-command.ftl
@@ -0,0 +1,10 @@
+command-description-bank-accounts =
+    Returns all accounts on a station.
+command-description-bank-account =
+    Returns a given bank account from a station.
+command-description-bank-adjust =
+    Adjusts the money for the given bank account.
+command-description-bank-set =
+    Sets the money for the given bank account.
+command-description-bank-amount =
+    Returns the money for the given bank account.
diff --git a/Resources/Locale/en-US/commands/toolshed/clone-command.ftl b/Resources/Locale/en-US/commands/toolshed/clone-command.ftl
new file mode 100644
index 0000000000..ec2935f46f
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/clone-command.ftl
@@ -0,0 +1,10 @@
+command-description-clone-humanoidappearance =
+    Clones the humanoid appearance of provided entity to all input entities.
+command-description-clone-comps =
+    Clones all components from the provided entity to all input entities. Only works for supported components.
+command-description-clone-equipment =
+    Clones the equipment from the provided entity to all input entities. Uses base prototypes, meaning changes to equipment won't persist to the cloned versions.
+command-description-clone-implants =
+    Clones the implants from the provided entity to all input entities. Uses base prototypes, meaning changes to implants won't persist to the cloned versions.
+command-description-clone-storage =
+    Clones the storage from the provided entity to all input entities. Uses base prototypes, meaning changes to contents won't persist to the cloned versions.
diff --git a/Resources/Locale/en-US/commands/toolshed/dynamicrule-command.ftl b/Resources/Locale/en-US/commands/toolshed/dynamicrule-command.ftl
new file mode 100644
index 0000000000..d03a94f7cc
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/dynamicrule-command.ftl
@@ -0,0 +1,16 @@
+command-description-dynamicrule-list =
+    Lists all currently active dynamic rules, usually this is just one.
+command-description-dynamicrule-get =
+    Gets the currently active dynamic rule.
+command-description-dynamicrule-budget =
+    Gets the current budget of the piped dynamic rule(s).
+command-description-dynamicrule-adjust =
+    Adjusts the budget of the piped dynamic rule(s) by the specified amount.
+command-description-dynamicrule-set =
+    Sets the budget of the piped dynamic rule(s) to the specified amount.
+command-description-dynamicrule-dryrun =
+    Returns a list of rules that could be activated if the rule ran at this moment with all current context. This is not a complete list of every single rule that could be run, just a sample of the current valid ones.
+command-description-dynamicrule-executenow =
+    Executes the piped dynamic rule as if it had reached its regular update time.
+command-description-dynamicrule-rules =
+    Gets a list of all the rules spawned by the piped dynamic rule.
diff --git a/Resources/Locale/en-US/commands/toolshed/inventory-command.ftl b/Resources/Locale/en-US/commands/toolshed/inventory-command.ftl
new file mode 100644
index 0000000000..3ded73915a
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/inventory-command.ftl
@@ -0,0 +1,20 @@
+command-description-inventory-getflags =
+    Gets all entities in slots on the piped inventory entity matching a certain slot flag.
+command-description-inventory-getnamed =
+    Gets all entities in slots on the piped inventory entity matching a certain slot name.
+command-description-inventory-forceput =
+    Puts a given entity on the first piped entity that has a slot matching the given flag, deleting any item previously in that slot.
+command-description-inventory-forcespawn =
+    Spawns a given prototype on the first piped entity that has a slot matching the given flag, deleting any item previously in that slot.
+command-description-inventory-put =
+    Puts a given entity on the first piped entity that has a slot matching the given flag, unequiping any item previously in that slot.
+command-description-inventory-spawn =
+    Spawns a given prototype on the first piped entity that has a slot matching the given flag, unequiping any item previously in that slot.
+command-description-inventory-tryput =
+    Tries to put a given entity on the first piped entity that has a slot matching the given flag, failing if any item is in currently in that slot.
+command-description-inventory-tryspawn =
+    Tries to spawn a given prototype on the first piped entity that has a slot matching the given flag, failing if any item is in currently in that slot.
+command-description-inventory-ensure =
+    Puts a given entity on the first piped entity that has a slot matching the given flag if none exists, passing through the UID of whatever is in the slot by the end.
+command-description-inventory-ensurespawn =
+    Spawns a given prototype on the first piped entity that has a slot matching the given flag if none exists, passing through the UID of whatever is in the slot by the end.
diff --git a/Resources/Locale/en-US/commands/toolshed/jobboard-command.ftl b/Resources/Locale/en-US/commands/toolshed/jobboard-command.ftl
new file mode 100644
index 0000000000..1e0c610f50
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/jobboard-command.ftl
@@ -0,0 +1,2 @@
+command-description-jobboard-completeJob =
+    Completes a given salvage job board job for the station.
diff --git a/Resources/Locale/en-US/commands/toolshed/jobs-command.ftl b/Resources/Locale/en-US/commands/toolshed/jobs-command.ftl
new file mode 100644
index 0000000000..918c86f87d
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/jobs-command.ftl
@@ -0,0 +1,12 @@
+command-description-jobs-jobs =
+    Returns all jobs on a station.
+command-description-jobs-job =
+    Returns a given job on a station.
+command-description-jobs-isinfinite =
+    Returns true if the input job is infinite, otherwise false.
+command-description-jobs-adjust =
+    Adjusts the number of slots for the given job.
+command-description-jobs-set =
+    Sets the number of slots for the given job.
+command-description-jobs-amount =
+    Returns the number of slots for the given job.
diff --git a/Resources/Locale/en-US/commands/toolshed/laws-command.ftl b/Resources/Locale/en-US/commands/toolshed/laws-command.ftl
new file mode 100644
index 0000000000..df0d8e6271
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/laws-command.ftl
@@ -0,0 +1,4 @@
+command-description-laws-list =
+    Returns a list of all law bound entities.
+command-description-laws-get =
+    Returns all of the laws for a given entity.
diff --git a/Resources/Locale/en-US/commands/toolshed/marked-command.ftl b/Resources/Locale/en-US/commands/toolshed/marked-command.ftl
new file mode 100644
index 0000000000..4a764acc82
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/marked-command.ftl
@@ -0,0 +1,2 @@
+command-description-marked =
+    Returns the value of $marked as a List<EntityUid>.
diff --git a/Resources/Locale/en-US/commands/toolshed/mind-command.ftl b/Resources/Locale/en-US/commands/toolshed/mind-command.ftl
new file mode 100644
index 0000000000..e396ee3105
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/mind-command.ftl
@@ -0,0 +1,4 @@
+command-description-mind-get =
+    Grabs the mind from the entity, if any.
+command-description-mind-control =
+    Assumes control of an entity with the given player.
diff --git a/Resources/Locale/en-US/commands/toolshed/polymorph-command.ftl b/Resources/Locale/en-US/commands/toolshed/polymorph-command.ftl
new file mode 100644
index 0000000000..9b0ac2354b
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/polymorph-command.ftl
@@ -0,0 +1,2 @@
+command-description-polymorph =
+    Polymorphs the input entity with the given prototype.
diff --git a/Resources/Locale/en-US/commands/toolshed/rejuvenate-command.ftl b/Resources/Locale/en-US/commands/toolshed/rejuvenate-command.ftl
new file mode 100644
index 0000000000..d624fc967e
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/rejuvenate-command.ftl
@@ -0,0 +1,2 @@
+command-description-rejuvenate =
+    Rejuvenates the given entities, restoring them to full health, clearing status effects, etc.
diff --git a/Resources/Locale/en-US/commands/toolshed/runverbas-command.ftl b/Resources/Locale/en-US/commands/toolshed/runverbas-command.ftl
new file mode 100644
index 0000000000..83b722891c
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/runverbas-command.ftl
@@ -0,0 +1,2 @@
+command-description-runverbas =
+    Runs a verb over the input entities with the given user.
diff --git a/Resources/Locale/en-US/commands/toolshed/scale-command.ftl b/Resources/Locale/en-US/commands/toolshed/scale-command.ftl
new file mode 100644
index 0000000000..ee37291f6d
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/scale-command.ftl
@@ -0,0 +1,10 @@
+command-description-scale-set =
+    Sets an entity's sprite size to a certain scale (without changing its fixture).
+command-description-scale-get =
+    Get an entity's sprite scale as set by ScaleVisualsComponent. Does not include any changes directly made in the SpriteComponent.
+command-description-scale-multiply =
+    Multiply an entity's sprite size with a certain factor (without changing its fixture).
+command-description-scale-multiplyvector =
+    Multiply an entity's sprite size with a certain 2d vector (without changing its fixture).
+command-description-scale-multiplywithfixture =
+    Multiply an entity's sprite size with a certain factor (including its fixture).
diff --git a/Resources/Locale/en-US/commands/toolshed/solution-command.ftl b/Resources/Locale/en-US/commands/toolshed/solution-command.ftl
new file mode 100644
index 0000000000..c683100960
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/solution-command.ftl
@@ -0,0 +1,4 @@
+command-description-solution-get =
+    Grabs the given solution off the given entity.
+command-description-solution-adjreagent =
+    Adjusts the given reagent on the given solution.
diff --git a/Resources/Locale/en-US/commands/toolshed/stationevent-command.ftl b/Resources/Locale/en-US/commands/toolshed/stationevent-command.ftl
new file mode 100644
index 0000000000..597c0b4e00
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/stationevent-command.ftl
@@ -0,0 +1,8 @@
+command-description-stationevent-simulate =
+    Given a BasicStationEventScheduler prototype, N Rounds, N Players, mean round end, and stddev of round end, Simulates N number of rounds in which events will occur and prints the occurrences of every event after.
+command-description-stationevent-lsprob =
+    Given a BasicStationEventScheduler prototype, lists the probability of different station events occuring out of the entire pool with current conditions.
+command-description-stationevent-lsprobtheoretical =
+    Given a BasicStationEventScheduler prototype, player count, and round time, lists the probability of different station events occuring based on the specified number of players and round time.
+command-description-stationevent-prob =
+    Given a BasicStationEventScheduler prototype and an event prototype, returns the probability of a single station event occuring out of the entire pool with current conditions.
diff --git a/Resources/Locale/en-US/commands/toolshed/stations-command.ftl b/Resources/Locale/en-US/commands/toolshed/stations-command.ftl
new file mode 100644
index 0000000000..be2f13ce49
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/stations-command.ftl
@@ -0,0 +1,20 @@
+command-description-stations-list =
+    Returns a list of all stations.
+command-description-stations-get =
+    Gets the active station, if and only if there is only one.
+command-description-stations-getowningstation =
+    Gets the station that a given entity is "owned by" (within)
+command-description-stations-grids =
+    Returns all grids associated with the input station.
+command-description-stations-config =
+    Returns the config associated with the input station, if any.
+command-description-stations-addgrid =
+    Adds a grid to the given station.
+command-description-stations-rmgrid =
+    Removes a grid from the given station.
+command-description-stations-rename =
+    Renames the given station.
+command-description-stations-largestgrid =
+    Returns the largest grid the given station has, if any.
+command-description-stations-rerollBounties =
+    Clears all the current bounties for the station and gets a new selection.
diff --git a/Resources/Locale/en-US/commands/toolshed/statuseffect-command.ftl b/Resources/Locale/en-US/commands/toolshed/statuseffect-command.ftl
new file mode 100644
index 0000000000..e00df94724
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/statuseffect-command.ftl
@@ -0,0 +1,8 @@
+command-description-statuseffect-add =
+    Adds time in seconds to a given status effect's duration, or creates one with a duration equal to time.
+command-description-statuseffect-update =
+    Sets the duration of a status effect to the higher of the inputted time or existing time. If time is 0, duration will be infinite.
+command-description-statuseffect-set =
+    Sets the duration of a status effect to the inputted time in seconds. If time is 0, duration will be infinite.
+command-description-statuseffect-remove =
+    Removes a time from a given status effect by prototype. If time isn't set, removes the status effect. 
diff --git a/Resources/Locale/en-US/commands/toolshed/storage-command.ftl b/Resources/Locale/en-US/commands/toolshed/storage-command.ftl
new file mode 100644
index 0000000000..46fe1a2627
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/storage-command.ftl
@@ -0,0 +1,4 @@
+command-description-storage-fasttake =
+    Takes the most recently placed item from the piped storage entity.
+command-description-storage-insert =
+    Inserts the piped entity into the given storage entity.
diff --git a/Resources/Locale/en-US/commands/toolshed/tag-command.ftl b/Resources/Locale/en-US/commands/toolshed/tag-command.ftl
new file mode 100644
index 0000000000..645ad3c2ff
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/tag-command.ftl
@@ -0,0 +1,12 @@
+command-description-tag-list =
+    Lists tags on the given entities.
+command-description-tag-with =
+    Returns only the entities with the given tag from the piped list of entities.
+command-description-tag-add =
+    Adds a tag to the given entities.
+command-description-tag-rm =
+    Removes a tag from the given entities.
+command-description-tag-addmany =
+    Adds a list of tags to the given entities.
+command-description-tag-rmmany =
+    Removes a list of tags from the given entities.
diff --git a/Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl
deleted file mode 100644
index 5773e32148..0000000000
--- a/Resources/Locale/en-US/commands/toolshed/toolshed-commands.ftl
+++ /dev/null
@@ -1,180 +0,0 @@
-# Please add future toolshed locale to their own files. This needs to be cleaned up.
-
-command-description-visualize =
-    Takes the input list of entities and puts them into a UI window for easy browsing.
-command-description-runverbas =
-    Runs a verb over the input entities with the given user.
-command-description-acmd-perms =
-    Returns the admin permissions of the given command, if any.
-command-description-acmd-caninvoke =
-    Check if the given player can invoke the given command.
-command-description-bank-accounts =
-    Returns all accounts on a station.
-command-description-bank-account =
-    Returns a given bank account from a station.
-command-description-bank-adjust =
-    Adjusts the money for the given bank account.
-command-description-bank-set =
-    Sets the money for the given bank account.
-command-description-bank-amount =
-    Returns the money for the given bank account.
-command-description-clone-humanoidappearance =
-    Clones the humanoid appearance of provided entity to all input entities.
-command-description-clone-comps =
-    Clones all components from the provided entity to all input entities. Only works for supported components.
-command-description-clone-equipment =
-    Clones the equipment from the provided entity to all input entities. Uses base prototypes, meaning changes to equipment won't persist to the cloned versions.
-command-description-clone-implants =
-    Clones the implants from the provided entity to all input entities. Uses base prototypes, meaning changes to implants won't persist to the cloned versions.
-command-description-clone-storage =
-    Clones the storage from the provided entity to all input entities. Uses base prototypes, meaning changes to contents won't persist to the cloned versions.
-command-description-jobs-jobs =
-    Returns all jobs on a station.
-command-description-jobs-job =
-    Returns a given job on a station.
-command-description-jobs-isinfinite =
-    Returns true if the input job is infinite, otherwise false.
-command-description-jobs-adjust =
-    Adjusts the number of slots for the given job.
-command-description-jobs-set =
-    Sets the number of slots for the given job.
-command-description-jobs-amount =
-    Returns the number of slots for the given job.
-command-description-laws-list =
-    Returns a list of all law bound entities.
-command-description-laws-get =
-    Returns all of the laws for a given entity.
-command-description-stations-list =
-    Returns a list of all stations.
-command-description-stations-get =
-    Gets the active station, if and only if there is only one.
-command-description-stations-getowningstation =
-    Gets the station that a given entity is "owned by" (within)
-command-description-stations-grids =
-    Returns all grids associated with the input station.
-command-description-stations-config =
-    Returns the config associated with the input station, if any.
-command-description-stations-addgrid =
-    Adds a grid to the given station.
-command-description-stations-rmgrid =
-    Removes a grid from the given station.
-command-description-stations-rename =
-    Renames the given station.
-command-description-stations-largestgrid =
-    Returns the largest grid the given station has, if any.
-command-description-stations-rerollBounties =
-    Clears all the current bounties for the station and gets a new selection.
-command-description-stationevent-lsprob =
-    Given a BasicStationEventScheduler prototype, lists the probability of different station events occuring out of the entire pool with current conditions.
-command-description-stationevent-lsprobtheoretical =
-    Given a BasicStationEventScheduler prototype, player count, and round time, lists the probability of different station events occuring based on the specified number of players and round time.
-command-description-stationevent-prob =
-    Given a BasicStationEventScheduler prototype and an event prototype, returns the probability of a single station event occuring out of the entire pool with current conditions.
-command-description-admins-active =
-    Returns a list of active admins.
-command-description-admins-all =
-    Returns a list of ALL admins, including deadmined ones.
-command-description-marked =
-    Returns the value of $marked as a List<EntityUid>.
-command-description-rejuvenate =
-    Rejuvenates the given entities, restoring them to full health, clearing status effects, etc.
-command-description-tag-list =
-    Lists tags on the given entities.
-command-description-tag-with =
-    Returns only the entities with the given tag from the piped list of entities.
-command-description-tag-add =
-    Adds a tag to the given entities.
-command-description-tag-rm =
-    Removes a tag from the given entities.
-command-description-tag-addmany =
-    Adds a list of tags to the given entities.
-command-description-tag-rmmany =
-    Removes a list of tags from the given entities.
-command-description-polymorph =
-    Polymorphs the input entity with the given prototype.
-command-description-unpolymorph =
-    Reverts a polymorph.
-command-description-solution-get =
-    Grabs the given solution off the given entity.
-command-description-solution-adjreagent =
-    Adjusts the given reagent on the given solution.
-command-description-mind-get =
-    Grabs the mind from the entity, if any.
-command-description-mind-control =
-    Assumes control of an entity with the given player.
-command-description-addaccesslog =
-    Adds an access log to this entity. Do note that this bypasses the log's default limit and pause check.
-command-description-stationevent-simulate =
-    Given a BasicStationEventScheduler prototype, N Rounds, N Players, mean round end, and stddev of round end, Simulates N number of rounds in which events will occur and prints the occurrences of every event after.
-command-description-jobboard-completeJob =
-    Completes a given salvage job board job for the station.
-command-description-xenoartifact-list =
-    List all EntityUids of spawned artifacts.
-command-description-xenoartifact-printMatrix =
-    Prints out matrix that displays all edges between nodes.
-command-description-xenoartifact-totalResearch =
-    Gets all research points that can be extracted from artifact currently.
-command-description-xenoartifact-averageResearch =
-    Calculates amount of research points average generated xeno artifact will output when fully activated.
-command-description-xenoartifact-unlockAllNodes =
-    Unlocks all nodes of artifact.
-command-description-stationevent-lsprobtime =
-    Lists the probability of different station events occuring based on the specified length of a round.
-command-description-scale-set =
-    Sets an entity's sprite size to a certain scale (without changing its fixture).
-command-description-scale-get =
-    Get an entity's sprite scale as set by ScaleVisualsComponent. Does not include any changes directly made in the SpriteComponent.
-command-description-scale-multiply =
-    Multiply an entity's sprite size with a certain factor (without changing its fixture).
-command-description-scale-multiplyvector =
-    Multiply an entity's sprite size with a certain 2d vector (without changing its fixture).
-command-description-scale-multiplywithfixture =
-    Multiply an entity's sprite size with a certain factor (including its fixture).
-command-description-storage-fasttake =
-    Takes the most recently placed item from the piped storage entity.
-command-description-storage-insert =
-    Inserts the piped entity into the given storage entity.
-command-description-inventory-getflags =
-    Gets all entities in slots on the piped inventory entity matching a certain slot flag.
-command-description-inventory-getnamed =
-    Gets all entities in slots on the piped inventory entity matching a certain slot name.
-command-description-inventory-forceput =
-    Puts a given entity on the first piped entity that has a slot matching the given flag, deleting any item previously in that slot.
-command-description-inventory-forcespawn =
-    Spawns a given prototype on the first piped entity that has a slot matching the given flag, deleting any item previously in that slot.
-command-description-inventory-put =
-    Puts a given entity on the first piped entity that has a slot matching the given flag, unequiping any item previously in that slot.
-command-description-inventory-spawn =
-    Spawns a given prototype on the first piped entity that has a slot matching the given flag, unequiping any item previously in that slot.
-command-description-inventory-tryput =
-    Tries to put a given entity on the first piped entity that has a slot matching the given flag, failing if any item is in currently in that slot.
-command-description-inventory-tryspawn =
-    Tries to spawn a given prototype on the first piped entity that has a slot matching the given flag, failing if any item is in currently in that slot.
-command-description-inventory-ensure =
-    Puts a given entity on the first piped entity that has a slot matching the given flag if none exists, passing through the UID of whatever is in the slot by the end.
-command-description-inventory-ensurespawn =
-    Spawns a given prototype on the first piped entity that has a slot matching the given flag if none exists, passing through the UID of whatever is in the slot by the end.
-command-description-dynamicrule-list =
-    Lists all currently active dynamic rules, usually this is just one.
-command-description-dynamicrule-get =
-    Gets the currently active dynamic rule.
-command-description-dynamicrule-budget =
-    Gets the current budget of the piped dynamic rule(s).
-command-description-dynamicrule-adjust =
-    Adjusts the budget of the piped dynamic rule(s) by the specified amount.
-command-description-dynamicrule-set =
-    Sets the budget of the piped dynamic rule(s) to the specified amount.
-command-description-dynamicrule-dryrun =
-    Returns a list of rules that could be activated if the rule ran at this moment with all current context. This is not a complete list of every single rule that could be run, just a sample of the current valid ones.
-command-description-dynamicrule-executenow =
-    Executes the piped dynamic rule as if it had reached its regular update time.
-command-description-dynamicrule-rules =
-    Gets a list of all the rules spawned by the piped dynamic rule.
-command-description-statuseffect-add =
-    Adds time in seconds to a given status effect's duration, or creates one with a duration equal to time.
-command-description-statuseffect-update =
-    Sets the duration of a status effect to the higher of the inputted time or existing time. If time is 0, duration will be infinite.
-command-description-statuseffect-set =
-    Sets the duration of a status effect to the inputted time in seconds. If time is 0, duration will be infinite.
-command-description-statuseffect-remove =
-    Removes a time from a given status effect by prototype. If time isn't set, removes the status effect. 
diff --git a/Resources/Locale/en-US/commands/toolshed/unpolymorph-command.ftl b/Resources/Locale/en-US/commands/toolshed/unpolymorph-command.ftl
new file mode 100644
index 0000000000..02551815a2
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/unpolymorph-command.ftl
@@ -0,0 +1,2 @@
+command-description-unpolymorph =
+    Reverts a polymorph.
diff --git a/Resources/Locale/en-US/commands/toolshed/visualize-command.ftl b/Resources/Locale/en-US/commands/toolshed/visualize-command.ftl
new file mode 100644
index 0000000000..0723f8654a
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/visualize-command.ftl
@@ -0,0 +1,2 @@
+command-description-visualize =
+    Takes the input list of entities and puts them into a UI window for easy browsing.
diff --git a/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl b/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl
new file mode 100644
index 0000000000..b6fc94adf9
--- /dev/null
+++ b/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl
@@ -0,0 +1,10 @@
+command-description-xenoartifact-list =
+    List all EntityUids of spawned artifacts.
+command-description-xenoartifact-printMatrix =
+    Prints out matrix that displays all edges between nodes.
+command-description-xenoartifact-totalResearch =
+    Gets all research points that can be extracted from artifact currently.
+command-description-xenoartifact-averageResearch =
+    Calculates amount of research points average generated xeno artifact will output when fully activated.
+command-description-xenoartifact-unlockAllNodes =
+    Unlocks all nodes of artifact.

From 117643aa747dbbbc04a4f8842c894fb79dfade77 Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Mon, 5 Jan 2026 18:18:23 -0500
Subject: [PATCH 233/360] jugs closeable, move chemistry entities into
 chemistry directory (#29413)

* jugs closeable, move chemitsry entities into chemsitry directory

* forgor to stage json. I hope i didnt stage robust :anxious:

* Who likes cargo? Not me. Lets remove it.

* Remove seal, make the amount examinable regardless of open or not, update jug icon

* apply iaada's parenting

* fix issues tdw parenting

* Review changes

* Fix sprite rename

* small touchup

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Prototypes/Catalog/Cargo/cargo_botany.yml |   2 +-
 .../Drinks/drinks_base_materials.yml          |   8 +
 .../{ => Chemistry}/chemical-containers.yml   | 177 ++++++------------
 .../{ => Chemistry}/chemistry-bottles.yml     |   0
 .../{ => Chemistry}/chemistry-vials.yml       |   0
 .../Specific/{ => Chemistry}/chemistry.yml    |   0
 .../_DV/Catalog/Cargo/cargo_medical.yml       |   2 +-
 .../jug.rsi/{jug1.png => fill-1.png}          | Bin
 .../jug.rsi/{jug2.png => fill-2.png}          | Bin
 .../jug.rsi/{jug3.png => fill-3.png}          | Bin
 .../jug.rsi/{jug4.png => fill-4.png}          | Bin
 .../jug.rsi/{jug5.png => fill-5.png}          | Bin
 .../jug.rsi/{jug6.png => fill-6.png}          | Bin
 .../Specific/Chemistry/jug.rsi/icon_empty.png | Bin 0 -> 328 bytes
 .../Specific/Chemistry/jug.rsi/icon_open.png  | Bin 0 -> 15248 bytes
 .../Specific/Chemistry/jug.rsi/jug.png        | Bin 346 -> 0 bytes
 .../Specific/Chemistry/jug.rsi/meta.json      |  17 +-
 17 files changed, 82 insertions(+), 124 deletions(-)
 rename Resources/Prototypes/Entities/Objects/Specific/{ => Chemistry}/chemical-containers.yml (76%)
 rename Resources/Prototypes/Entities/Objects/Specific/{ => Chemistry}/chemistry-bottles.yml (100%)
 rename Resources/Prototypes/Entities/Objects/Specific/{ => Chemistry}/chemistry-vials.yml (100%)
 rename Resources/Prototypes/Entities/Objects/Specific/{ => Chemistry}/chemistry.yml (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/jug.rsi/{jug1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/jug.rsi/{jug2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/jug.rsi/{jug3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/jug.rsi/{jug4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/jug.rsi/{jug5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/jug.rsi/{jug6.png => fill-6.png} (100%)
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_empty.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index c1ef2f1a3f..e77dddd767 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -42,7 +42,7 @@
   id: BulkPlantBGone
   icon:
     sprite: Objects/Specific/Chemistry/jug.rsi
-    state: jug
+    state: icon_empty
   product: CratePlantBGone
   cost: 750
   category: cargoproduct-category-name-hydroponics
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
index 43df992b2a..939d17ca21 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -138,7 +138,15 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalCrunch # TODO a plastic break collection
+          params:
+            volume: -4
       - !type:SpillBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 0
+            max: 1
+        transferForensics: true
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
similarity index 76%
rename from Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
index 5ba021573e..1b572abe90 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
@@ -1,92 +1,39 @@
 - type: entity
-  name: jug
-  parent: BaseItem
+  parent: [ DrinkBaseMaterialStrongPlastic, DrinkBase, DrinkBaseOpenable, DrinkVisualsAll ]
   id: Jug
+  name: jug
   description: Used to contain a very large amount of chemicals or solutions. Chugging is extremely ill-advised.
   components:
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          maxVol: 200
-    - type: Sprite
-      sprite: _DV/Objects/Specific/Chemistry/jug.rsi # DeltaV - Resprited some medical items
-      layers:
-        - state: jug
-        - state: jug1
-          map: [ "enum.SolutionContainerLayers.Fill" ]
-          visible: false
-    - type: Item
-      size: Normal
-      sprite: _DV/Objects/Specific/Chemistry/jug.rsi # DeltaV - Resprited some medical items
-    - type: MixableSolution
-      solution: beaker
-    - type: RefillableSolution
-      solution: beaker
-    - type: DrainableSolution
-      solution: beaker
-    - type: ExaminableSolution
-      solution: beaker
-      exactVolume: true
-    - type: DrawableSolution
-      solution: beaker
-    - type: InjectableSolution
-      solution: beaker
-    - type: SolutionTransfer
-      canChangeTransferAmount: true
-    - type: SolutionItemStatus
-      solution: beaker
-    - type: UserInterface
-      interfaces:
-        enum.TransferAmountUiKey.Key:
-          type: TransferAmountBoundUserInterface
-    - type: Edible
-      edible: Drink
-      solution: beaker
-      destroyOnEmpty: false
-      utensil: Spoon
-    - type: Spillable
-      solution: beaker
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 6
-      fillBaseName: jug
-      inHandsMaxFillLevels: 5
-      inHandsFillBaseName: -fill-
-    - type: StaticPrice
-      price: 60
-    - type: Damageable
-      damageContainer: Inorganic
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 200
-        behaviors:
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
-      - trigger:
-          !type:DamageTrigger
-          damage: 20
-        behaviors:
-        - !type:PlaySoundBehavior
-          sound:
-            collection: MetalBreak
-            params:
-              volume: -4
-        - !type:SpillBehavior { }
-        - !type:SpawnEntitiesBehavior
-          spawn:
-            SheetPlastic1:
-              min: 0
-              max: 1
-          transferForensics: true
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - type: Label
-    - type: Tag
-      tags:
-      - ChemDispensable
-    - type: DnaSubstanceTrace
+  - type: Sprite
+    sprite: _DV/Objects/Specific/Chemistry/jug.rsi # DeltaV - Resprited some medical items
+    layers:
+      - state: jug
+      - state: jug1
+        map: [ "enum.SolutionContainerLayers.Fill" ]
+        visible: false
+  - type: Item
+    size: Normal
+    sprite: _DV/Objects/Specific/Chemistry/jug.rsi # DeltaV - Resprited some medical items
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 200
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    inHandsMaxFillLevels: 5
+  - type: ExaminableSolution
+    exactVolume: true # Chemistry item
+  - type: Openable
+    sound:
+      collection: bottleOpenSounds
+    closeable: true
+    closeSound:
+      collection: bottleCloseSounds
+  - type: StaticPrice
+    price: 60
+  - type: Tag
+    tags:
+    - ChemDispensable
 
 - type: entity
   parent: Jug
@@ -97,7 +44,7 @@
     currentLabel: reagent-name-puncturase-tranexamic
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Puncturase
           Quantity: 160
@@ -113,7 +60,7 @@
     currentLabel: reagent-name-pyrazine-dermaline
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Pyrazine
           Quantity: 50
@@ -129,7 +76,7 @@
     currentLabel: reagent-name-dexalin-plus-saline
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: DexalinPlus
           Quantity: 100
@@ -145,7 +92,7 @@
     currentLabel: reagent-name-tricordrazine
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Tricordrazine
           Quantity: 200
@@ -159,7 +106,7 @@
     currentLabel: reagent-name-blood
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Blood
           Quantity: 200
@@ -173,7 +120,7 @@
     currentLabel: reagent-name-water
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Water
           Quantity: 200
@@ -188,7 +135,7 @@
     currentLabel: reagent-name-carbon
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Carbon
           Quantity: 200
@@ -203,7 +150,7 @@
     currentLabel: reagent-name-iodine
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Iodine
           Quantity: 200
@@ -218,7 +165,7 @@
     currentLabel: reagent-name-fluorine
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Fluorine
           Quantity: 200
@@ -233,7 +180,7 @@
     currentLabel: reagent-name-chlorine
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Chlorine
           Quantity: 200
@@ -248,7 +195,7 @@
     currentLabel: reagent-name-aluminium
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Aluminium
           Quantity: 200
@@ -263,7 +210,7 @@
     currentLabel: reagent-name-phosphorus
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Phosphorus
           Quantity: 200
@@ -278,7 +225,7 @@
     currentLabel: reagent-name-sulfur
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Sulfur
           Quantity: 200
@@ -293,7 +240,7 @@
     currentLabel: reagent-name-silicon
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Silicon
           Quantity: 200
@@ -308,7 +255,7 @@
     currentLabel: reagent-name-hydrogen
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Hydrogen
           Quantity: 200
@@ -323,7 +270,7 @@
     currentLabel: reagent-name-lithium
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Lithium
           Quantity: 200
@@ -338,7 +285,7 @@
     currentLabel: reagent-name-sodium
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Sodium
           Quantity: 200
@@ -353,7 +300,7 @@
     currentLabel: reagent-name-potassium
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Potassium
           Quantity: 200
@@ -368,7 +315,7 @@
     currentLabel: reagent-name-radium
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Radium
           Quantity: 200
@@ -383,7 +330,7 @@
     currentLabel: reagent-name-iron
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Iron
           Quantity: 200
@@ -398,7 +345,7 @@
     currentLabel: reagent-name-copper
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Copper
           Quantity: 200
@@ -413,7 +360,7 @@
     currentLabel: reagent-name-gold
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Gold
           Quantity: 200
@@ -428,7 +375,7 @@
     currentLabel: reagent-name-mercury
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Mercury
           Quantity: 200
@@ -443,7 +390,7 @@
     currentLabel: reagent-name-silver
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Silver
           Quantity: 200
@@ -458,7 +405,7 @@
     currentLabel: reagent-name-ethanol
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Ethanol
           Quantity: 200
@@ -473,7 +420,7 @@
     currentLabel: reagent-name-sugar
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Sugar
           Quantity: 200
@@ -488,7 +435,7 @@
     currentLabel: reagent-name-nitrogen
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Nitrogen
           Quantity: 200
@@ -503,7 +450,7 @@
     currentLabel: reagent-name-oxygen
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: Oxygen
           Quantity: 200
@@ -518,7 +465,7 @@
     currentLabel: reagent-name-plant-b-gone
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: PlantBGone
           Quantity: 200
@@ -533,7 +480,7 @@
     currentLabel: reagent-name-welding-fuel
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         reagents:
         - ReagentId: WeldingFuel
           Quantity: 200
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml
index c1b0ed2d71..ab453e5241 100644
--- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml
@@ -33,7 +33,7 @@
   id: ViralCarePackageCrate
   icon:
     sprite: Objects/Specific/Chemistry/jug.rsi
-    state: jug
+    state: icon_empty
   product: CrateViralCarePackage
   cost: 10000
   category: Medical
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png
rename to Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png
rename to Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png
rename to Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png
rename to Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png
rename to Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png
rename to Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_empty.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c70bba71e521673f5c2a86725f2d42c088304cf
GIT binary patch
literal 328
zcmV-O0k{5%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003GNkl<ZSi|j=
zF$%&k7=>SgI&=_<gQd7R2(BGV>EPf6dJpHGz`f`20uByAI=U(jf`b&D1cy%2xTw^U
zQlhB{=9`kH{O|Gdw?ClKXf*#0k$Kq<St5GQroR1HFSdv4ec2cddX+UBGUA?VrNYCI
zC2Z>3e#nweyR`>^Nwi4-*vbq%SjI;qzxP}#^;|2(J)PO=ELBh1KxqmUXDSSI$HO+A
zuP+?HRUrPX$vGzgGSvo7^YtaoGTsN!6m~QLI0q;tI{-#4S3oJ*1&&#I*MtCpV`3Q}
z>*)azfn&bxWg1b5fuf*Jp!Nhrf?rLb_!WGTz+1zp_{Ym9Fo`xsaX=|EP&E~0gf$w?
a&u{}}zG&%?54BqW0000<MNUMnLSTY{MTi{$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..315d3e94dbdb42a05348a5ebafa288cf2aa59c34
GIT binary patch
literal 15248
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
Ib@%3f0E}F!!~g&Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png
deleted file mode 100644
index 1fda41e3b5423a7609477b27828c95a3eb0ea5a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$6iGxuR9J=Wl`#s!Fc^hjf;u<|#la$O4uWgPQaU(zf!@QpCvf*1UckX26h~LZ
zL2!_wli<)v8W$@yMB8Wt!F*Gi|L6UW*R%l)27}?>Au7#&$YR+(8~g2SJ>Tpv*?Q3H
zREjhU8}h?F*G{Cxki~55xBZaC%|>kp0HeveUPiaHfsANzco6nnJMmmQ!7ZKX@}#7v
zY~X1M1vMQ8TEl*W&Q@m*;35`1*S>3V&Iy22w}InqbxzWhcL7vo4TJ!k1C)|2fbX0E
zO35~Gtf%jq5Fl_YM2kZyJ!Jzj0>^rIRyl}T42T0w0$)!+Ht<zly8-bl_#}b1E+g@e
smro$O1M(M?HUpv&8D$3>42GZK3X-~K^Hy*hS^xk507*qoM6N<$g2i}@kN^Mx

diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
index 85c293d34d..fb7b2d4737 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
@@ -8,7 +8,10 @@
   },
   "states": [
     {
-      "name": "jug"
+      "name": "icon_empty"
+    },
+    {
+      "name": "icon_open"
     },
     {
       "name": "inhand-left",
@@ -59,22 +62,22 @@
       "directions": 4
     },
     {
-      "name": "jug1"
+      "name": "fill-1"
     },
     {
-      "name": "jug2"
+      "name": "fill-2"
     },
     {
-      "name": "jug3"
+      "name": "fill-3"
     },
     {
-      "name": "jug4"
+      "name": "fill-4"
     },
     {
-      "name": "jug5"
+      "name": "fill-5"
     },
     {
-      "name": "jug6"
+      "name": "fill-6"
     }
   ]
 }

From 36366518996df79f513f82ea6bcc0eb61fdfd11d Mon Sep 17 00:00:00 2001
From: SnappingOpossum <snappingopossum@outlook.com>
Date: Tue, 6 Jan 2026 11:14:02 +1100
Subject: [PATCH 234/360] Move some miscellaneous random spawners to entity
 tables (#42245)

* Move some miscellaneous RandomSpawners to entity tables

* Fix a parenting issue and some conventions
---
 .../Catalog/Fills/Crates/permaescape.yml      | 55 ++++++++++---------
 .../Clothing/Uniforms/random_suit.yml         | 15 ++---
 .../Markers/Spawners/Random/crates.yml        | 33 +++++------
 .../Entities/Mobs/NPCs/elemental.yml          | 46 ++++++++--------
 .../Entities/Mobs/Player/silicon.yml          | 15 ++---
 .../Objects/Materials/crystal_shard.yml       | 22 ++++----
 6 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
index 1516cb71c7..6c80d93bbd 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -3,33 +3,34 @@
   id: CratePermaEscapeSpawner
   name: Perma Escape Crate Spawner
   components:
-  - type: RandomSpawner
-    prototypes:
-    # Please note any duplicates & alphabetize <3
-      - ClosetMaintenanceFilledRandom # x3
-      - ClosetMaintenanceFilledRandom
-      - ClosetMaintenanceFilledRandom
-      - CrateEngineeringMiniJetpack
-      - CratePermaEscapeBureaucracy
-      - CratePermaEscapeComs # x2
-      - CratePermaEscapeComs
-      - CratePermaEscapeDigging # x2
-      - CratePermaEscapeDigging
-      - CratePermaEscapeEVA
-      - CratePermaEscapeGiftsFromSyndicate
-      - CratePermaEscapeGun
-      - CratePermaEscapeLights
-      - CratePermaEscapeMats #x2
-      - CratePermaEscapeMats
-      - CratePermaEscapeMerc
-      - CratePermaEscapeTowercap # x2
-      - CratePermaEscapeTowercap
-      - CrateTrashCartFilled
-      - CrateServiceCustomSmokable
-    rarePrototypes:
-      - MobTick # These need to be killable by one dude with a shovel.
-    rareChance: .30
-    chance: 1
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: MobTick # These need to be killable by one dude with a shovel.
+        weight: 0.3
+      - !type:GroupSelector
+        weight: 0.7
+        children:
+        # Please alphabetize <3
+        - id: ClosetMaintenanceFilledRandom
+          weight: 3
+        - id: CrateEngineeringMiniJetpack
+        - id: CratePermaEscapeBureaucracy
+        - id: CratePermaEscapeComs
+          weight: 2
+        - id: CratePermaEscapeDigging
+          weight: 2
+        - id: CratePermaEscapeEVA
+        - id: CratePermaEscapeGiftsFromSyndicate
+        - id: CratePermaEscapeGun
+        - id: CratePermaEscapeLights
+        - id: CratePermaEscapeMats
+          weight: 2
+        - id: CratePermaEscapeMerc
+        - id: CratePermaEscapeTowercap
+          weight: 2
+        - id: CrateTrashCartFilled
+        - id: CrateServiceCustomSmokable
     offset: 0.0
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
index 7d4dfc5990..28a045ce6c 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
@@ -36,14 +36,15 @@
   id: ClothingRandomSpawner
   name: random colorful costume
   components:
-  - type: RandomSpawner
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: ClothingUniformRandomArmless
+      - id: ClothingUniformRandomStandard
+      - id: ClothingUniformRandomBra
+      - id: ClothingUniformRandomShorts
+      - id: ClothingUniformRandomShirt
     offset: 0
-    prototypes:
-    - ClothingUniformRandomArmless
-    - ClothingUniformRandomStandard
-    - ClothingUniformRandomBra
-    - ClothingUniformRandomShorts
-    - ClothingUniformRandomShirt
 
 - type: entity
   parent: ClothingUniformRandom
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index 31f15ffad0..f8761987cd 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -1,27 +1,28 @@
 - type: entity
-  name: Empty Crate Spawner
-  id: CrateEmptySpawner
   parent: MarkerBase
+  id: CrateEmptySpawner
+  name: Empty Crate Spawner
   components:
   - type: Sprite
     layers:
     - state: red
     - sprite: Structures/Storage/Crates/generic.rsi
       state: icon
-  - type: RandomSpawner
-    prototypes:
-    - CrateGenericSteel
-    - CratePlastic
-    - CrateFreezer
-    - CrateHydroponics
-    - CrateMedical
-    - CrateRadiation
-    - CrateInternals
-    - CrateElectrical
-    - CrateEngineering
-    - CrateScience
-    - CrateSurgery
-    chance: 0.7
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      prob: 0.7
+      children:
+      - id: CrateGenericSteel
+      - id: CratePlastic
+      - id: CrateFreezer
+      - id: CrateHydroponics
+      - id: CrateMedical
+      - id: CrateRadiation
+      - id: CrateInternals
+      - id: CrateElectrical
+      - id: CrateEngineering
+      - id: CrateScience
+      - id: CrateSurgery
     offset: 0.0
 
 - type: entityTable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 2f2a7f6458..e965e09f4d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -388,31 +388,31 @@
     solution: bloodstream
 
 - type: entity
-  name: Reagent Slime Spawner
-  id: ReagentSlimeSpawner
   parent: MarkerBase
+  id: ReagentSlimeSpawner
+  name: Reagent Slime Spawner
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Mobs/Aliens/elemental.rsi
-          state: alive
-    - type: RandomSpawner
-      prototypes:
-        - ReagentSlime
-        - ReagentSlimeBeer
-        - ReagentSlimePax
-        - ReagentSlimeNocturine
-        - ReagentSlimeTHC
-        - ReagentSlimeBicaridine
-        - ReagentSlimeToxin
-        - ReagentSlimeNapalm
-        - ReagentSlimeOmnizine
-        - ReagentSlimeMuteToxin
-        - ReagentSlimeNorepinephricAcid
-        - ReagentSlimeEphedrine
-        - ReagentSlimeRobustHarvest
-      chance: 1
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Mobs/Aliens/elemental.rsi
+        state: alive
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: ReagentSlime
+      - id: ReagentSlimeBeer
+      - id: ReagentSlimePax
+      - id: ReagentSlimeNocturine
+      - id: ReagentSlimeTHC
+      - id: ReagentSlimeBicaridine
+      - id: ReagentSlimeToxin
+      - id: ReagentSlimeNapalm
+      - id: ReagentSlimeOmnizine
+      - id: ReagentSlimeMuteToxin
+      - id: ReagentSlimeNorepinephricAcid
+      - id: ReagentSlimeEphedrine
+      - id: ReagentSlimeRobustHarvest
 
 - type: entity
   id: ReagentSlimeBeer
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index aeba9fb623..c380498b12 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -655,20 +655,21 @@
     - type: GhostTakeoverAvailable
 
 - type: entity
-  name: syndicate invasion borg spawner
-  id: PlayerBorgSyndicateInvasionGhostRoleSpawner
   parent: MarkerBase
+  id: PlayerBorgSyndicateInvasionGhostRoleSpawner
+  name: syndicate invasion borg spawner
   components:
   - type: Sprite
     layers:
       - state: red
       - sprite: Structures/Decoration/banner.rsi
         state: banner_syndicate
-  - type: RandomSpawner
-    prototypes:
-    - PlayerBorgSyndicateAssaultGhostRole
-    - PlayerBorgSyndicateAssaultGhostRole # Saboteurs are kinda like cyborg medics, we want less.
-    - PlayerBorgSyndicateSaboteurGhostRole
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: PlayerBorgSyndicateAssaultGhostRole
+      - id: PlayerBorgSyndicateSaboteurGhostRole
+        weight: 0.5 # Saboteurs are kinda like cyborg medics, we want less.
 
 - type: entity
   parent: EngineeringBorgChassisDerelict
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index f4c110817c..25d80eaee6 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -174,14 +174,14 @@
   id: ShardCrystalRandom
   name: random crystal shard
   components:
-  - type: RandomSpawner
-    prototypes:
-      - ShardCrystalGreen
-      - ShardCrystalPink
-      - ShardCrystalYellow
-      - ShardCrystalBlack
-      - ShardCrystalOrange
-      - ShardCrystalBlue
-      - ShardCrystalCyan
-      - ShardCrystalRed
-    chance: 1
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: ShardCrystalGreen
+      - id: ShardCrystalPink
+      - id: ShardCrystalYellow
+      - id: ShardCrystalBlack
+      - id: ShardCrystalOrange
+      - id: ShardCrystalBlue
+      - id: ShardCrystalCyan
+      - id: ShardCrystalRed

From b63dc6c07e1324b1c59e4a7b6da7edf38359673e Mon Sep 17 00:00:00 2001
From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Date: Tue, 6 Jan 2026 00:47:28 -0600
Subject: [PATCH 235/360] Adds sky blue curtains/tables to their respective
 spawners (#42266)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
---
 .../Prototypes/Entities/Markers/Spawners/Random/curtains.yml    | 2 ++
 .../Prototypes/Entities/Markers/Spawners/Random/fancytables.yml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml
index 83ab633ac7..54c275fd58 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml
@@ -13,6 +13,7 @@
         - HospitalCurtains
         - CurtainsBlack
         - CurtainsBlue
+        - CurtainsSkyBlue
         - CurtainsCyan
         - CurtainsGreen
         - CurtainsOrange
@@ -27,6 +28,7 @@
         - CurtainsOrangeOpen
         - CurtainsGreenOpen
         - CurtainsCyanOpen
+        - CurtainsSkyBlueOpen
         - CurtainsBlueOpen
         - CurtainsBlackOpen
         - HospitalCurtainsOpen
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml
index 274db34437..191153c1bd 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml
@@ -11,6 +11,7 @@
     - type: RandomSpawner
       prototypes:
         - TableFancyBlue
+        - TableFancySkyBlue
         - TableFancyCyan
         - TableFancyBlack
         - TableFancyRed

From 1bd5ab6b02a94091471475de7c07362bfad01ffc Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Mon, 5 Jan 2026 23:02:44 -0800
Subject: [PATCH 236/360] Revert Closable Jugs (#42267)

* remove lid

* remove changelog

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Specific/Chemistry/chemical-containers.yml  |   8 +-------
 .../Specific/Chemistry/jug.rsi/icon_open.png    | Bin 15248 -> 0 bytes
 .../Specific/Chemistry/jug.rsi/meta.json        |   3 ---
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
index 1b572abe90..d81715d497 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ DrinkBaseMaterialStrongPlastic, DrinkBase, DrinkBaseOpenable, DrinkVisualsAll ]
+  parent: [ DrinkBaseMaterialStrongPlastic, DrinkBase, DrinkVisualsAll ]
   id: Jug
   name: jug
   description: Used to contain a very large amount of chemicals or solutions. Chugging is extremely ill-advised.
@@ -23,12 +23,6 @@
     inHandsMaxFillLevels: 5
   - type: ExaminableSolution
     exactVolume: true # Chemistry item
-  - type: Openable
-    sound:
-      collection: bottleOpenSounds
-    closeable: true
-    closeSound:
-      collection: bottleCloseSounds
   - type: StaticPrice
     price: 60
   - type: Tag
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png
deleted file mode 100644
index 315d3e94dbdb42a05348a5ebafa288cf2aa59c34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15248
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
Ib@%3f0E}F!!~g&Q

diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
index fb7b2d4737..7f363e1e50 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
@@ -10,9 +10,6 @@
     {
       "name": "icon_empty"
     },
-    {
-      "name": "icon_open"
-    },
     {
       "name": "inhand-left",
       "directions": 4

From 18280c51d11a7f7d721014e933ebc18f5b3e76f4 Mon Sep 17 00:00:00 2001
From: ThatGuyUSA <thatguyusa123@gmail.com>
Date: Tue, 6 Jan 2026 02:28:04 -0800
Subject: [PATCH 237/360] [FEATURE] More icons (#42200)

* innit bruv, but also done!

* added comment to signify why it's like that

* init, but done

* init commit

* you think you got everythin, until you didn't

* credits and one last touch up

* i fucking hate git

* KILL OLD COMMITS

This reverts commit 6f834a51de611f215ede02f291a9d834777884a5.

* KILLING OLD COMMITS

This reverts commit 36e1f4a476b873f2326723740eccf455060520d8.

* I am going to become the joker

* one day i'll learn how to delete old commits properly

* god fucking damn it

* capitalization!
---
 .../Locale/en-US/job/job-description.ftl      |   2 +-
 Resources/Locale/en-US/job/job-names.ftl      | 106 ++--
 .../Locale/en-US/prototypes/roles/antags.ftl  |   2 +
 .../Entities/Mobs/Corpses/corpses.yml         |   2 +-
 .../Entities/Mobs/Player/humanoid.yml         |   2 +-
 .../Entities/Objects/Devices/pda.yml          |  40 +-
 .../Objects/Misc/identification_cards.yml     |  44 +-
 Resources/Prototypes/Roles/Antags/ninja.yml   |   4 +-
 Resources/Prototypes/Roles/Antags/nukeops.yml |   6 +-
 Resources/Prototypes/Roles/Antags/pirate.yml  |  14 +
 .../Prototypes/Roles/Jobs/CentComm/cburn.yml  |   2 +-
 .../Roles/Jobs/CentComm/deathsquad.yml        |   2 +-
 .../Jobs/CentComm/emergencyresponseteam.yml   |  12 +-
 .../Roles/Jobs/CentComm/official.yml          |   8 +-
 .../Roles/Jobs/Fun/wizard_startinggear.yml    |   1 +
 Resources/Prototypes/StatusIcon/job.yml       | 114 +++-
 .../Interface/Misc/job_icons.rsi/Ninja.png    | Bin 0 -> 645 bytes
 .../Interface/Misc/job_icons.rsi/Pirate.png   | Bin 0 -> 599 bytes
 .../Interface/Misc/job_icons.rsi/meta.json    |  12 +-
 .../Objects/Devices/pda.rsi/meta.json         | 502 +++++++++---------
 .../Objects/Devices/pda.rsi/pda-ninja.png     | Bin 0 -> 904 bytes
 .../Devices/pda.rsi/pda-seniorcourier.png     | Bin 0 -> 599 bytes
 .../Objects/Misc/id_cards.rsi/meta.json       |   5 +-
 .../Objects/Misc/id_cards.rsi/ninja.png       | Bin 0 -> 1195 bytes
 .../Objects/Misc/id_cards.rsi/orange.png      | Bin 398 -> 846 bytes
 .../Objects/Misc/id_cards.rsi/pirate.png      | Bin 444 -> 850 bytes
 26 files changed, 553 insertions(+), 327 deletions(-)
 create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png
 create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png
 create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png
 create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png
 create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png

diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index 69295b3ddf..d0afddbd8d 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -8,7 +8,7 @@ job-description-cadet = Learn the basics of arresting criminals and managing the
 job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
 job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo shuttle to the trade station and back, and work with others to make ludicrous amounts of cash and then waste it all gambling.
 job-description-ce = Manage the Engineering department to ensure power, atmospherics, and the hull are in perfect shape.
-job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet.
+job-description-centcommoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet.
 job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing and miracles with your bible.
 job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively.
 job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index 7d4d0c9668..8d5352b59d 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -1,74 +1,86 @@
-job-name-warden = Warden
-job-name-security = Security Officer
-job-name-cadet = Security Cadet
-job-name-hos = Head of Security
-job-name-detective = Detective
-job-name-brigmedic = Corpsman
-job-name-borg = Cyborg
-job-name-scientist = Scientist
-job-name-research-assistant = Research Assistant
-job-name-rd = Mystagogue
-job-name-psychologist = Psychologist
-job-name-intern = Medical Intern
-job-name-doctor = Medical Doctor
-job-name-paramedic = Paramedic
-job-name-cmo = Chief Medical Officer
-job-name-chemist = Chemist
-job-name-technical-assistant = Technical Assistant
-job-name-engineer = Station Engineer
 job-name-atmostech = Atmospheric Technician
-job-name-hop = Head of Personnel
-job-name-captain = Captain
-job-name-serviceworker = Service Worker
-job-name-centcomoff = CentComm Official
-job-name-cburn = Centcomm Quarantine Officer
-job-name-deathsquad = Centcomm Agent
-job-name-reporter = Reporter
-job-name-musician = Musician
-# DeltaV - Changed Librarian to Archivist
-# job-name-librarian = Librarian
-# DeltaV - Changed Lawyer to Attorney
-# job-name-lawyer = Lawyer
-job-name-mime = Mime
-job-name-ce = Chief Engineer
-job-name-janitor = Janitor
-job-name-chaplain = Chaplain
-job-name-botanist = Botanist
 job-name-bartender = Bartender
-# DeltaV - Changes Passenger to Assistant. job-name-passenger is used in a dozen other places as the default job so we dont want to change that overly much.
-job-name-passenger = Assistant
-job-name-salvagespec = Salvage Specialist
-job-name-station-ai = Station AI
-# DeltaV - Hopefully makes LO maintaining easier
-# job-name-qm = Quartermaster
+job-name-borg = Cyborg
+job-name-botanist = Botanist
+# DeltaV - Changed Brigmedic to Corpsman
+#job-name-brigmedic = Brigmedic
+job-name-cadet = Security Cadet
+job-name-captain = Captain
 job-name-cargotech = Cargo Technician
+job-name-cburn = CentComm Quarantine Officer
+job-name-ce = Chief Engineer
+job-name-centcommoff = CentComm Official
 job-name-chef = Chef
+job-name-chaplain = Chaplain
+job-name-chemist = Chemist
 job-name-clown = Clown
-job-name-ertleader = ERT Leader
+job-name-cluwne = Cluwne
+job-name-cmo = Chief Medical Officer
+job-name-deathsquad = Death Squad
+job-name-detective = Detective
+job-name-doctor = Medical Doctor
+job-name-engineer = Station Engineer
 job-name-ertchaplain = ERT Chaplain
 job-name-ertengineer = ERT Engineer
-job-name-ertsecurity = ERT Security
-job-name-ertmedic = ERT Medic
 job-name-ertjanitor = ERT Janitor
+job-name-ertleader = ERT Leader
+job-name-ertmedic = ERT Medic
+job-name-ertsecurity = ERT Security
+job-name-hop = Head of Personnel
+job-name-hos = Head of Security
+job-name-intern = Medical Intern
+job-name-janitor = Janitor
+# DeltaV - Changed Lawyer to Attorney
+#job-name-lawyer = Lawyer
+# DeltaV - Changed Librarian to Archivist
+#job-name-librarian = Librarian
+job-name-mime = Mime
+job-name-musician = Musician
+job-name-paramedic = Paramedic
+# DeltaV - Changes Passenger to Assistant. job-name-passenger is used in a dozen other places as the default job so we dont want to change that overly much.
+job-name-passenger = Assistant
+job-name-psychologist = Psychologist
+# DeltaV - Hopefully makes LO maintaining easier
+# job-name-qm = Quartermaster
+# DeltaV - Changed RD to Mystagogue
+# job-name-rd = Research Director
+job-name-reporter = Reporter
+job-name-research-assistant = Research Assistant
+job-name-salvagespec = Salvage Specialist
+job-name-scientist = Scientist
+job-name-security = Security Officer
+job-name-serviceworker = Service Worker
+job-name-station-ai = Station AI
+job-name-technical-assistant = Technical Assistant
 job-name-visitor = Visitor
-job-name-cluwne = Cluwne
+job-name-warden = Warden
 
 # unused jobs
 # these are required for the agent ID job icon tooltips
 # I am keeping them for roleplaying opportunities
 job-name-geneticist = Geneticist
+#job-name-boxer = Boxer # DeltaV - Keeping boxer/Zookeper job
 job-name-no-id = No ID
 job-name-prisoner = Prisoner
 job-name-roboticist = Roboticist
-job-name-syndicate = Syndicate
 job-name-unknown = Unknown
 job-name-virologist = Virologist
+#job-name-zookeeper = Zookeeper # DeltaV - Keeping Boxer/Zookeper job
+
+# antagonist jobs
+job-name-ninja = Ninja
+job-name-syndicate = Syndicate
+job-name-syndicate-commander = Syndicate Commander
+job-name-syndicate-corpsman = Syndicate Corpsman
+job-name-syndicate-operative = Syndicate Operative
+job-name-pirate = Pirate
+job-name-wizard = Wizard
 job-name-zombie = Zombie
 
 # Job titles
-job-title-visitor = Visitor
 job-title-cluwne = Cluwne
 job-title-universal = Universal
+job-title-visitor = Visitor
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl
index 3fa969d170..f0c80f9dfc 100644
--- a/Resources/Locale/en-US/prototypes/roles/antags.ftl
+++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl
@@ -36,6 +36,8 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 roles-antag-paradox-clone-name = Paradox Clone
 roles-antag-paradox-clone-objective = A freak space-time anomaly has teleported you into another reality! Now you have to find your counterpart and kill and replace them.
 
+roles-antag-pirate-name = Pirate
+
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
 
diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml
index 16c88afa91..cae8bc13a1 100644
--- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml
+++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml
@@ -85,7 +85,7 @@
   - type: Loadout
     prototypes:
     - HoPGear
-    - CentcomGear
+    - CentcommGear
     - CaptainGear
     - HoSGear
     - ResearchDirectorGear
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index cd924c1e85..4f4cf4ba23 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -606,7 +606,7 @@
         settings: default
       job: CentralCommandOfficial
     - type: Loadout
-      prototypes: [ CentcomGear ]
+      prototypes: [ CentcommGear ]
       roleLoadout: [ RoleSurvivalStandard ]
 
 ## Syndicate
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 48308a97b6..868265305c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1164,7 +1164,7 @@
   #   enum.PdaVisuals.PdaType:
   #     !type:String
   #     pda-syndi-operative
-  #- type: Icon 
+  #- type: Icon
   #  state: pda-syndi-operative
 
 
@@ -1204,7 +1204,7 @@
   #   enum.PdaVisuals.PdaType:
   #     !type:String
   #     pda-syndi-commander
-  #- type: Icon  
+  #- type: Icon
   #   state: pda-syndi-commander
 
 - type: entity
@@ -1554,6 +1554,42 @@
   - type: Icon
     state: pda-seniorofficer
 
+# DeltaV - No senior courier job
+#- type: entity
+#  parent: BasePDA
+#  id: SeniorCourierPDA
+#  name: senior courier PDA
+#  description: Smells like postage stamps and shuttle fuel.
+#  components:
+#  - type: Pda
+#    id: CargoIDCard
+#  - type: Appearance
+#    appearanceDataInit:
+#     enum.PdaVisuals.PdaType:
+#       !type:String
+#       pda-seniorcourier
+#  - type: PdaBorderColor
+#    borderColor: "#e39751"
+#    accentVColor: "#DFDFDF"
+#  - type: Icon
+#    state: pda-seniorcourier
+
+- type: entity
+  parent: [ BaseHighlyIllegalContraband, BasePDA ]
+  id: NinjaPDA
+  name: ninja PDA
+  description: You stealthy bastard, you!
+  components:
+  - type: Pda
+    id: NinjaIDCard
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-ninja
+  - type: Icon
+    state: pda-ninja
+
 - type: entity
   parent: [ BaseMajorContraband, SyndiPDA ]
   id: PiratePDA
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 5f53afd6a7..cf8542a05e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -1018,6 +1018,8 @@
       offset: *icon-offset
       state: SyndicateOperative
   - type: AgentIDCard
+  - type: IdCard
+    jobIcon: JobIconSyndicateOperative
 
 - type: entity
   parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ]
@@ -1034,6 +1036,8 @@
     - sprite: *icon-rsi
       offset: *icon-offset
       state: SyndicateCorpsman
+  - type: IdCard
+    jobIcon: JobIconSyndicateCorpsman
 
 - type: entity
   parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ]
@@ -1050,6 +1054,33 @@
     - sprite: *icon-rsi
       offset: *icon-offset
       state: SyndicateCommander
+  - type: IdCard
+    jobIcon: JobIconSyndicateCommander
+
+- type: entity
+  parent: [ IDCardStandard, BaseHighlyIllegalContraband ]
+  id: NinjaIDCard
+  name: ninja ID card
+  suffix: Ninja
+  components:
+  - type: Sprite
+    layers:
+    - state: ninja
+    - state: stripe_top
+      color: "#38D848"
+    - state: stripe_bottom
+      color: "#309000"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Ninja
+  - type: Item
+    heldPrefix: green
+  - type: AgentIDCard
+  - type: IdCard
+    jobIcon: JobIconNinja
+  - type: Access
+    tags:
+    - Maintenance
 
 - type: entity
   parent: [ IDCardStandard, BaseMajorContraband ]
@@ -1059,12 +1090,13 @@
   - type: Sprite
     layers:
     - state: pirate
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Pirate
   - type: Item
     heldPrefix: orange #this is close enough to the weird puce color pirate IDs have going on
-  - type: Access
-    tags:
-    - NuclearOperative
-    - SyndicateAgent
+  - type: IdCard
+    jobIcon: JobIconPirate
   - type: NanoChatCard # DeltaV
     listNumber: false
 
@@ -1081,7 +1113,7 @@
     - Xenoborg
 
 - type: entity
-  parent: IDCardStandard
+  parent: [ IDCardStandard, BaseMagicalContraband ]
   id: WizardIDCard
   name: wizard ID card
   components:
@@ -1098,6 +1130,8 @@
     - Wizard
     - External
     - Maintenance
+  - type: IdCard
+    jobIcon: JobIconWizard
 
 #ERT/Centcomm
 
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index 619c39e7a1..186abb40a7 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -21,7 +21,7 @@
     gloves: ClothingHandsGlovesSpaceNinja
     outerClothing: ClothingOuterSuitSpaceNinja
     shoes: ClothingShoesSpaceNinja
-    id: AgentIDCard
+    id: NinjaPDA
     ears: ClothingHeadsetNinja
     pocket1: SpiderCharge
     pocket2: PinpointerStation
@@ -44,7 +44,7 @@
 - type: chameleonOutfit
   id: NinjaChameleonOutfit
   name: roles-antag-space-ninja-name
+  icon: "JobIconNinja"
   startingGear: SpaceNinjaGear
   equipment:
-    id: PassengerPDA
     neck: ClothingNeckGoldmedal
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 8b769c4c0a..34d9be83b2 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -84,7 +84,7 @@
   id: NukeopsOutfit
   name: roles-antag-nuclear-operative-name
   startingGear: SyndicateOperativeGearFullNoUplink
-  icon: "JobIconSyndicate"
+  icon: "JobIconSyndicateOperative"
   equipment:
     head: ClothingHeadHelmetHardsuitSyndie
     neck: ClothingNeckScarfStripedSyndieRed
@@ -105,7 +105,7 @@
   id: NukeopsCommanderOutfit
   name: roles-antag-nuclear-operative-commander-name
   startingGear: SyndicateCommanderGearFull
-  icon: "JobIconSyndicate"
+  icon: "JobIconSyndicateCommander"
   equipment:
     head: ClothingHeadHelmetHardsuitSyndieCommander
     neck: ClothingNeckScarfStripedSyndieGreen
@@ -139,7 +139,7 @@
   id: NukeopsMedicOutfit
   name: roles-antag-nuclear-operative-agent-name
   startingGear: SyndicateOperativeMedicFull
-  icon: "JobIconSyndicate"
+  icon: "JobIconSyndicateCorpsman"
   equipment:
     head: ClothingHeadHelmetHardsuitSyndieMedic
     neck: ClothingNeckScarfStripedLightBlue
diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml
index 849e9dc1f2..0585ec075a 100644
--- a/Resources/Prototypes/Roles/Antags/pirate.yml
+++ b/Resources/Prototypes/Roles/Antags/pirate.yml
@@ -23,3 +23,17 @@
   equipment:
     head: ClothingHeadHatPirateTricord
     outerClothing: ClothingOuterCoatGentle
+
+- type: chameleonOutfit
+  id: PirateChameleonOutfit
+  name: roles-antag-pirate-name
+  icon: "JobIconPirate"
+  startingGear: PirateFirstmateGear
+  equipment:
+    eyes: ClothingEyesEyepatch
+    ears: ClothingHeadsetFreelance
+    mask: ClothingMaskNeckGaiter
+    neck: ClothingNeckBling
+    gloves: ClothingHandsGlovesColorLightBrown
+    outerClothing: ClothingOuterCoatPirate
+
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
index 084fd78b2a..c1ee5a0fee 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobCBURN
   setPreference: false
   startingGear: CBURNGearDeltaV # DeltaV - Different startingGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconCBURN"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirements
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
index 3231783fd3..0b197af4d8 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobDeathSquad
   setPreference: false
   startingGear: DeathSquadGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconDeathSquad"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
index 2baf53c243..815f774fa2 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -6,7 +6,7 @@
   playTimeTracker: JobERTLeader
   setPreference: false
   startingGear: ERTLeaderGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTLeader"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirement
@@ -112,7 +112,7 @@
   playTimeTracker: JobERTChaplain
   setPreference: false
   startingGear: ERTChaplainGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTChaplain"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirement
@@ -196,7 +196,7 @@
   playTimeTracker: JobERTEngineer
   setPreference: false
   startingGear: ERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTEngineer"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirements
@@ -297,7 +297,7 @@
   playTimeTracker: JobERTSecurity
   setPreference: false
   startingGear: ERTSecurityGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTSecurity"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirements
@@ -488,7 +488,7 @@
   playTimeTracker: JobERTMedical
   setPreference: false
   startingGear: ERTMedicalGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTMedic"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirements
@@ -595,7 +595,7 @@
   playTimeTracker: JobERTJanitor
   setPreference: false
   startingGear: ERTJanitorGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTJanitor"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   requirements: # DeltaV - Playtime requirements
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
index 3683aa5c12..d917c5f8e7 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
@@ -1,10 +1,10 @@
 - type: job
   id: CentralCommandOfficial
-  name: job-name-centcomoff
-  description: job-description-centcomoff
+  name: job-name-centcommoff
+  description: job-description-centcommoff
   playTimeTracker: JobCentralCommandOfficial
   setPreference: false
-  startingGear: CentcomGear
+  startingGear: CentcommGear
   icon: "JobIconNanotrasen"
   supervisors: job-supervisors-hos
   canBeAntag: false
@@ -17,7 +17,7 @@
     implants: [ CentCommImplant, DeathRattleImplantCentcomm ] # Delta-V - Changed Mindshield implant to Centcomm implant
 
 - type: startingGear
-  id: CentcomGear
+  id: CentcommGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomOfficial
     back: ClothingBackpackSatchelCentcom # Delta-V - Added CC satchel
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
index e59e08bf79..a02fdfadf1 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
@@ -33,6 +33,7 @@
   id: WizardChameleonOutfit
   name: roles-antag-wizard-name
   startingGear: WizardBlueGear
+  icon: "JobIconWizard"
   equipment:
     eyes: ClothingEyesGlassesCheapSunglasses
     mask: ClothingMaskBreath
diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml
index 8879e99d6a..8a560ba364 100644
--- a/Resources/Prototypes/StatusIcon/job.yml
+++ b/Resources/Prototypes/StatusIcon/job.yml
@@ -395,6 +395,22 @@
     state: Cluwne
   jobName: job-name-cluwne
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconNinja
+  icon:
+    sprite: *icon-rsi
+    state: Ninja
+  jobName: job-name-ninja
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconPirate
+  icon:
+    sprite: *icon-rsi
+    state: Pirate
+  jobName: job-name-pirate
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconPrisoner
@@ -411,6 +427,38 @@
     state: Syndicate
   jobName: job-name-syndicate
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicateCommander
+  icon:
+    sprite: *icon-rsi
+    state: SyndicateCommander
+  jobName: job-name-syndicate-commander
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicateCorpsman
+  icon:
+    sprite: *icon-rsi
+    state: SyndicateCorpsman
+  jobName: job-name-syndicate-corpsman
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicateOperative
+  icon:
+    sprite: *icon-rsi
+    state: SyndicateOperative
+  jobName: job-name-syndicate-operative
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconWizard
+  icon:
+    sprite: *icon-rsi
+    state: Wizard
+  jobName: job-name-wizard
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconZombie # This is a perfectly legitimate profession to pursue
@@ -421,13 +469,77 @@
 
 # Admin
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCBURN
+  icon:
+    sprite: *icon-rsi
+    state: CBURN
+  jobName: job-name-cburn
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconDeathSquad
+  icon:
+    sprite: *icon-rsi
+    state: DeathSquad
+  jobName: job-name-deathsquad
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTLeader
+  icon:
+    sprite: *icon-rsi
+    state: ERTLeader
+  jobName: job-name-ertleader
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTChaplain
+  icon:
+    sprite: *icon-rsi
+    state: ERTChaplain
+  jobName: job-name-ertchaplain
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTEngineer
+  icon:
+    sprite: *icon-rsi
+    state: ERTEngineer
+  jobName: job-name-ertengineer
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTSecurity
+  icon:
+    sprite: *icon-rsi
+    state: ERTSecurity
+  jobName: job-name-ertsecurity
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTMedic
+  icon:
+    sprite: *icon-rsi
+    state: ERTMedical
+  jobName: job-name-ertmedic
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTJanitor
+  icon:
+    sprite: *icon-rsi
+    state: ERTJanitor
+  jobName: job-name-ertjanitor
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
     sprite: *icon-rsi
     state: Nanotrasen
-  jobName: job-name-centcomoff
+  jobName: job-name-centcommoff
 
 - type: jobIcon
   parent: JobIcon
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png
new file mode 100644
index 0000000000000000000000000000000000000000..0345d9de1cfc6962c361cf4b6c4a3d9ed7acb853
GIT binary patch
literal 645
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enLwjaOL`j6Nk5zJhu3lnFep0GlMQ#C5H3Nf<
zeMLcHa&~HoLQ-maW}dD3``!E16*5z7)x%AF4SWlnQ!_F>s)|yBtNcQetFn_VQ`GJ4
zc)4sUtbiuurj{fsROII56<bx<DuE5Q0<uBE`bu^-MJZ`kK`w4k6+oV?QbtKhft9{~
zd3m{Bxv^e;QM$gNrKP35fswwEkuFe$ZgFK^Nn(X=Ua>ON0GHI_<f6=ilFa-(1(1P>
zN%^HEwo0X?nJHFjiD{-uDJiD9Nr}cOx`u`+iMoj?#)i5n#>Oe;riK<qX@*HkQ0q%F
z(-8LO6+?po7$Eu}8GS=N1CWzJY%Bkw%v7K&Kvvor+JNOz#BB6I4ncC59Yh4^S0D=>
zGN53Bhi+;fFi6XRVW%@?1~)L=+dW+zLo|YuQxXyq9z1;d?|cJm&CfqmC(dl2{(JxY
zaE<2UH}CU25}zx1C3Ne<H^2My%nc5P*xR2xSMd6tb6fOxIU^hUlYHi^>mCH@i68zy
z#h>SYu$^Jdsi%iR8n_RLzVQ8b?0`jke`6t^eDl30`7^jw&ej{P&^&1j!XC5!w`eD%
cC_M0GXx*-(`MO>5D<~~^y85}Sb4q9e0B)n<ssI20

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png
new file mode 100644
index 0000000000000000000000000000000000000000..9299eda291a40286faecbb1f87fbebe28d73951e
GIT binary patch
literal 599
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enLwjaOL`j6Nk5zJhu3lnFep0GlMQ#C5H3Nf<
zeMLcHa&~HoLQ-maW}dD3``!E16*5z7)x%AF4SWlnQ!_F>s)|yBtNcQetFn_VQ`GJ4
zc)4sUtbiuurj{fsROII56<bx<DuE5Q0<uBE`bu^-MJZ`kK`w4k6+oV?QbtKhft9{~
zd3m{Bxv^e;QM$gNrKP35fswwEkuFe$ZgFK^Nn(X=Ua>ON0GHI_<f6=ilFa-(1(1P>
zN%^HEwo0X?nJHFjiD{-uDJiD9Nr}cOx`u`+iMoj?#)i5n#>Oe;riK<qX@*HkQ0q%F
z(-8LO6+?po7$Eu}8GS=N1CWzJY%Bkw%v7K&Kvvor+JNOz#BB6I4ncC59Yh4^S0D=>
zGN53Bhi+;fFi6XRVW%@?1~)L=BRyRlLo|Y0`!8}HP~dTik5Nv(t8ng-T%pc$kNT{@
z%$JTFG4JG#FsP{NzuFr;af)E$?tEcE53k8n-uY$cW?zqzOb!T3z8mbHAmn#R_(5~f
hj_BuwlX~Wx>rY};zq3|c8I)icJYD@<);T3K0RVaQ!Xy9y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 97c3546aba..4b137a937a 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github)",
+    "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github), ninja icon by ThatGuyUSA (github)",
     "size": {
         "x": 8,
         "y": 8
@@ -130,6 +130,9 @@
         {
             "name": "Nanotrasen"
         },
+        {
+            "name": "Ninja"
+        },
         {
             "name": "NoId"
         },
@@ -142,6 +145,9 @@
         {
             "name": "Passenger"
         },
+        {
+            "name": "Pirate"
+        },
         {
             "name": "Prisoner"
         },
@@ -230,10 +236,10 @@
             "name": "Wizard"
         },
         {
-            "name": "Zombie"
+            "name": "Zookeeper"
         },
         {
-            "name": "Zookeeper"
+            "name": "Zombie"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
index 5a41d91443..e5833360bd 100644
--- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -1,257 +1,263 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser, pda-wizard recolour by Velken, pda-syndi-commander/operative by Archee1 (Github)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser, pda-wizard recolour by Velken, pda-syndi-commander/operative by Archee1 (Github), pda-ninja by ThatGuyUSA (github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-      {
-        "name": "id_overlay"
-      },
-      {
-        "name": "id_overlay_wide"
-      },
-      {
-        "name": "equipped-BELT",
-        "directions": 4
-      },
-      {
-        "name": "inhand-left",
-        "directions": 4
-      },
-      {
-        "name": "inhand-right",
-        "directions": 4
-      },
-      {
-        "name": "insert_overlay"
-      },
-      {
-        "name": "light_overlay"
-      },
-      {
-        "name": "light_overlay_wide"
-      },
-      {
-        "name": "pda"
-      },
-      {
-        "name": "pda-atmos"
-      },
-      {
-        "name": "pda-bartender"
-      },
-      {
-        "name": "pda-boxer"
-      },
-      {
-        "name": "pda-captain"
-      },
-      {
-        "name": "pda-cargo"
-      },
-      {
-        "name": "pda-ce"
-      },
-      {
-        "name": "pda-chaplain"
-      },
-      {
-        "name": "pda-chemistry"
-      },
-      {
-        "name": "pda-clear"
-      },
-      {
-        "name": "pda-clown"
-      },
-      {
-        "name": "pda-cmo"
-      },
-      {
-        "name": "pda-cook"
-      },
-      {
-        "name": "pda-detective"
-      },
-      {
-        "name": "pda-engineer"
-      },
-      {
-        "name": "pda-genetics"
-      },
-      {
-        "name": "pda-hop"
-      },
-      {
-        "name": "pda-hos"
-      },
-      {
-        "name": "pda-hydro"
-      },
-      {
-        "name": "pda-janitor"
-      },
-      {
-        "name": "pda-lawyer"
-      },
-      {
-        "name": "pda-library",
-        "delays": [
-          [
-            0.3,
-            0.3,
-            0.3,
-            0.3
-          ]
-        ]
-      },
-      {
-        "name": "pda-medical"
-      },
-      {
-        "name": "pda-paramedic"
-      },
-      {
-        "name": "pda-mime"
-      },
-      {
-        "name": "pda-miner"
-      },
-      {
-        "name": "pda-pirate"
-      },
-      {
-        "name": "pda-qm"
-      },
-      {
-        "name": "pda-r",
-        "delays": [
-          [
-            0.8,
-            0.8
-          ]
-        ]
-      },
-      {
-        "name": "pda-r-library",
-        "delays": [
-          [
-            0.8,
-            0.8
-          ]
-        ]
-      },
-      {
-        "name": "pda-rd"
-      },
-      {
-        "name": "pda-roboticist"
-      },
-      {
-        "name": "pda-science"
-      },
-      {
-        "name": "pda-security"
-      },
-      {
-        "name": "pda-brigmedic",
-        "delays": [
-          [
-            0.3,
-            0.3,
-            0.3,
-            0.3
-          ]
-        ]
-      },
-      {
-        "name": "pda-syndi"
-      },
-      {
-        "name": "pda-syndi-corpsman"
-      },
-      {
-        "name": "pda-syndi-commander"
-      },
-      {
-        "name": "pda-syndi-operative"
-      },
-      {
-        "name": "pda-centcom",
-        "delays": [
-          [
-            1.2,
-            1.2,
-            1.2,
-            1.2
-          ]
-        ]
-      },
-      {
-        "name": "pda-virology"
-      },
-      {
-        "name": "pda-warden"
-      },
-      {
-        "name": "pda-musician"
-      },
-      {
-        "name": "pda-reporter"
-      },
-      {
-        "name": "pda-interncadet"
-      },
-      {
-        "name": "pda-internmed"
-      },
-      {
-        "name": "pda-internsci"
-      },
-      {
-        "name": "pda-internservice"
-      },
-      {
-        "name": "pda-interntech"
-      },
-      {
-        "name": "pda-zookeeper"
-      },
-      {
-        "name": "pda-ert"
-      },
-      {
-        "name": "pda-cluwne"
-      },
-      {
-        "name": "pda-seniorengineer"
-      },
-      {
-        "name": "pda-seniorresearcher"
-      },
-      {
-        "name": "pda-seniorphysician"
-      },
-      {
-        "name": "pda-seniorofficer"
-      },
-    {
-        "name": "pda-wizard",
-        "delays": [
-          [
-            0.3,
-            0.3,
-            0.3,
-            0.3
-          ]
-        ]
-      },
-      {
-        "name": "equipped-IDCARD",
-        "directions": 4
-      }
-  ]
+        {
+            "name": "id_overlay"
+        },
+        {
+            "name": "id_overlay_wide"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "insert_overlay"
+        },
+        {
+            "name": "light_overlay"
+        },
+        {
+            "name": "light_overlay_wide"
+        },
+        {
+            "name": "pda"
+        },
+        {
+            "name": "pda-atmos"
+        },
+        {
+            "name": "pda-bartender"
+        },
+        {
+            "name": "pda-boxer"
+        },
+        {
+            "name": "pda-captain"
+        },
+        {
+            "name": "pda-cargo"
+        },
+        {
+            "name": "pda-ce"
+        },
+        {
+            "name": "pda-chaplain"
+        },
+        {
+            "name": "pda-chemistry"
+        },
+        {
+            "name": "pda-clear"
+        },
+        {
+            "name": "pda-clown"
+        },
+        {
+            "name": "pda-cmo"
+        },
+        {
+            "name": "pda-cook"
+        },
+        {
+            "name": "pda-detective"
+        },
+        {
+            "name": "pda-engineer"
+        },
+        {
+            "name": "pda-genetics"
+        },
+        {
+            "name": "pda-hop"
+        },
+        {
+            "name": "pda-hos"
+        },
+        {
+            "name": "pda-hydro"
+        },
+        {
+            "name": "pda-janitor"
+        },
+        {
+            "name": "pda-lawyer"
+        },
+        {
+            "name": "pda-library",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "pda-medical"
+        },
+        {
+            "name": "pda-paramedic"
+        },
+        {
+            "name": "pda-mime"
+        },
+        {
+            "name": "pda-miner"
+        },
+        {
+            "name": "pda-ninja"
+        },
+        {
+            "name": "pda-pirate"
+        },
+        {
+            "name": "pda-qm"
+        },
+        {
+            "name": "pda-r",
+            "delays": [
+                [
+                    0.8,
+                    0.8
+                ]
+            ]
+        },
+        {
+            "name": "pda-r-library",
+            "delays": [
+                [
+                    0.8,
+                    0.8
+                ]
+            ]
+        },
+        {
+            "name": "pda-rd"
+        },
+        {
+            "name": "pda-roboticist"
+        },
+        {
+            "name": "pda-science"
+        },
+        {
+            "name": "pda-security"
+        },
+        {
+            "name": "pda-brigmedic",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "pda-syndi"
+        },
+        {
+            "name": "pda-syndi-corpsman"
+        },
+        {
+            "name": "pda-syndi-commander"
+        },
+        {
+            "name": "pda-syndi-operative"
+        },
+        {
+            "name": "pda-centcom",
+            "delays": [
+                [
+                    1.2,
+                    1.2,
+                    1.2,
+                    1.2
+                ]
+            ]
+        },
+        {
+            "name": "pda-virology"
+        },
+        {
+            "name": "pda-warden"
+        },
+        {
+            "name": "pda-musician"
+        },
+        {
+            "name": "pda-reporter"
+        },
+        {
+            "name": "pda-interncadet"
+        },
+        {
+            "name": "pda-internmed"
+        },
+        {
+            "name": "pda-internsci"
+        },
+        {
+            "name": "pda-internservice"
+        },
+        {
+            "name": "pda-interntech"
+        },
+        {
+            "name": "pda-zookeeper"
+        },
+        {
+            "name": "pda-ert"
+        },
+        {
+            "name": "pda-cluwne"
+        },
+        {
+            "name": "pda-seniorengineer"
+        },
+        {
+            "name": "pda-seniorresearcher"
+        },
+        {
+            "name": "pda-seniorphysician"
+        },
+        {
+            "name": "pda-seniorofficer"
+        },
+        {
+            "name": "pda-seniorcourier"
+        },
+        {
+            "name": "pda-wizard",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "equipped-IDCARD",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d980a3d4f9aa3cd0be4190a189bfca75bc46dc5
GIT binary patch
literal 904
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSK$uZf!>a+Pp*=Gsq9nrC$0|8LS1&OoKPgqOBDVmjnt{Q_
zzM>#8IXksPAt^OIGtXB2{qFth3YjUk>fxro2EGN(sTr9bRYj@6RemAKRoTgwDeCri
zyj(UFRzMSSQ%e#RDspr3imfVamB0pD0ofp7eI+}aqLehNAQv~N3Lwu`DWjyMz)D}g
zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvsfJ<s|a#3bMNoIbY0?5F`
zr2NtnTcy&{%oMA%#5B{SloV6lq(tKsT|>i^MBT&`V?*5(W8)NaQ$q`*G{Yn%sP!e8
zX$brCilM;(3=n;gjJ~0s0m#W9wv~TTW-8DXAS>+*ZNTy<VmA69hafr34k7~dE06^b
z8Bj36LpL=K7^LOEu+y0`gButnU7jwEArbCxr`mcSc91zX-%I?h_mUMWN`ogX(sPOr
zYp-FnZ<-w~ZtuF>r;b6;e7m147hjU52fJ%ml;EX+o{vk9ExaTp{{GgyqMzYO%YPp{
z`1EJ{laqh-&ogqhHhJhx{^+91q2`i!r^UrlMXLMH&(n9em*0QxogWeDS9!U!GEnWI
zg<8(-Po|2xM$G-MQ@7|J&6@v1%Ak0o>5`rAjD0>^Nig>YNFJYRJ0(CUzmZS&_Dv=s
zKQ8yZs&CGfHRdzl?dQwOTfgMJLjIvWfesf}EX=sFBg`c0gfwei?X6wUi?vdiXYbUJ
zUv$jkhQ}vM(M^q?H**1bH?|+H@oUX#*u=DkHEeU=x7W<qQz!81q*&K<NHuRwFx=U-
z!|ZseWC}CSHbHiC<>svq;=>%;`Tkt$Iy`ru;I*c}Fo$3LeL^k|CyPX6MV+-`NXQEM
ze3mh@(4Z@RUR2Ug_U4UmcbWNo)|;WSChWAw^7h5o`W+ToNOf0yoWaKMWL{mBEkncA
n9EKL*z^Ee<eaWp(3x6;zaayyF^NPGQC_8w%`njxgN@xNAS|n30

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1224dae9c1db2eb0bea360aba004bd7df508314
GIT binary patch
literal 599
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikV0(?STEzHb-OjA>}$I}Dv-@kvcFX&*o@tH;&2M7ICyJoe_&RMCfT+kY|
zh>59gT6*o&w5+<YnKNhp2kK#9IJ4~IPaq{y666>B9}_V6`#%>1%5xTYL>4nJ@ErzW
z#^d=bQh<UIC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL%D-PgWb0@Z9wjqptK^weVD
z0CHFvq!?Kl7=bJ=AeM%*LB7^tWCn{f0ojI(Obh}*Itqw0+gZTkSwJ=jBmgl;Ka57R
zlmQrS6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7EG>X6s4hbT1CXq$`@G)8
zCR>jJne#kd978PppH95UcSwQ9b!q9=kZUXd{NEqN(X1Nu^=gIO?8(&&ZJ+Z0nPpJE
zU!3Vpi_>gAMuCqx3VJ1x6LuT2<T2)GU2<vAXyqs|WxVxAW62bkAf_l;$57XhMz5o{
zS=KL7Uvt7n_?5KlpRP&ys!NmR3Amb1o&CFepT_DLY6^FGjpq2;-O|-szn$ZZZR3pN
nmgS1qmHBUdQK<OSI^nZ${2$vl+49!+L9X_6^>bP0l+XkK0|c^m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index 29a2e4f741..24f3e34af4 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-	"copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github)",
+	"copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github), ninja made by ThatGuyUSA (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -65,6 +65,9 @@
         {
             "name": "icon-captain"
         },
+        {
+            "name": "ninja"
+        },
         {
             "name": "orange"
         },
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png
new file mode 100644
index 0000000000000000000000000000000000000000..5312d9fd3e4420d0d1cd6f9418fc39834c3c85ed
GIT binary patch
literal 1195
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFg9j7I|q0=J1Z0v<)>xlq%tsQ
zoS!<;(u3JiqSbz}qu|j)3QA(pF50Ytg5I5rIM`I&K4{%J?4r24?JkS7_d&CShZieE
z&92>wy1~`-fH6rwLi3hK#D7mFPA3-jwx1Qo?+rh*F}Z7A{`TtEfik1K9Hm8P&+2D<
zUC)xapjYhBu9r&}8$T{w)wjMn>q^!2)ti3Y&)61bBb;UOP|)~oTFdm-b~B^Qqt%BL
zi$k}!oNuj;*}34u;!C|s`!)T<EEX6!=h>KP$p~GWB$^YlVdtw`hnf#1o-R|dHwaJh
z{<tj3da9}S_YnP@sKT`LDSDeHbE<V3^|m=qGYv|4G4-n8QDwE?6Se;JHPuJOwC%WN
zaMbXam08un{$I`a?^bm-{!0o9W@*yj_x~d6SL+GqfByTv@%?lE1>Yps&Dm7{m!r+z
z_59SW9~8Ib96VYYX<YWONcz_NOS@K!FNvDj=)!dG{FB+w7Je0z67SwS^_yjF!;TWu
zQs&?67v@fRvsCMS-ikMG&l@lOSI3Y$zi8?DR2BnZoNyL+L>4nJ@ErnSMo|r~24D=e
zXNE+SMELqxCFkerC8p#jrRr7W764T<Fxc2v6eK2Rr<N!rrKV@**{Z+ay<c4+GsRXt
z+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt-QJFu%cjB#XhLpkNuokUZcbjYRfVk**kCIl
z8zii+WM@;9l4cd;;s#X#<k>1^l#~=$>Fbx5m+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1
zSLT%@R_NvxD?<%%Ni9w;$}A|!%+FH*8JL)qUs__TR9c#uVwIMdW}1|eVyc^zXq=*J
zXqb|yo0wv3sGDMJoMLWjXknCQn4|=?z9cgZVSipRG#G#Zq7RbMH`Fr#IT^&Z@-NCv
z1-b%crJbP-SRO^pMjzx5B!}5SM1Xz;vfv>D3MP2yrse^Iv>X_AI#XtF1Ea*&)5S3)
z!u{=3N3X*UB5nV7c`AAaduv999t@Hyc$<2s^zotY3P$m~qK3Ew);q+4nw&~Qy-b%y
zozPKPx6J3>nI*naE(LZRD)(8Qou9o&@<4*YpK_^?0-5XQR<1sM{dtsif6;-$w>2ia
z7VI*+{Ic1sCCF;s+~0fa4lZ4t`f%pst-C@zw^;8pYf)LiF=5>_3rk!5J%=l2+P)J>
z+E)?EX0gcW$=h1L(9}f+ZX(Ba?2fyvm=N8d;<@CAmBi^O-w#%FB-k9ex^{1&(o#mg
zgK?rOno>;<Mz9?-iU=!y{J(~EO7@xE4_;bk@tkXtvEH)q$I~rbD{iwY#jRewXWPbb
z)?2dj^6VL|Q$iesR_qXb`9L~E<QPN4$-m}$`A>eTFuF2K`NM2=<Y}Ug^CZ1hp$~4n
p4vdw)`{V-a0e!jSY|RHhF#lUH?ZVBAo2o%6*wfX|Wt~$(6985i?i2t3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png
index bcb2261e22805a559d3c46541c81439219472656..8f29d0eaff536b9af981da45edd9c66ac16e3bc1 100644
GIT binary patch
literal 846
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSK$uZf!>a+Pp*=Gsq9nrC$0|8LS1&OoKPgqOBDVmjnt{Q_
zzM>#8IXksPAt^OIGtXB2{qFth3YjUk>fxro2EGN(sTr9bRYj@6RemAKRoTgwDeCri
zyj(UFRzMSSQ%e#RDspr3imfVamB0pD0ofp7eI+}aqLehNAQv~N3Lwu`DWjyMz)D}g
zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvsfJ<s|a#3bMNoIbY0?5F`
zr2NtnTcy&{%oMA%#5B{SloV6lq(tKsT|>i^MBT&`V?*5(W8)NaQ$q`*G{Yn%sP!e8
zX$brCilM;(3=n;gjJ~0s0m#W9wv~TTW-8DXAS>+*ZNTy<VmA69hafr34k7~dE06^b
z8Bj36LpL=K7^LOEu+y0`gButn0iG_7ArbCxr`mcQagb=c|CLMmpxM_$G71xpDeEjL
za@?><DCiYqNB~DfBxloAu5D#zhvXhKheR)lJ@SS(MQ79I*=PLKI=j!F3--O|`D5N0
z{RbZ_zRjH|<?)EY>1^AlpQ-DU-*hl{^tZ2+;(zwz(NV2Lp2rN2OrQ4ZoLuoyC-A=U
zL8rW_7nmeiCiN85X6coD^_i<Osi%jDJu4u6W6<P(8#LIvi{{K<X)C&x>7#7sv0BaN
z$x}WX%FVwruPdxE_QP_)7hK$y5j$epzkb`_;}98Qy(BK;krd-&nbWZaC7z3)@`}IM
zz#DlYP;AS@2|+@)^)4_)u*7&U-aHo7<Z8)~@a<po<mkO|uSGhZ)-Hb(@Nb7s#^*Ot
z%(Db}*aN@0J!tO@pL4-{g5Qo}mMsiyjB8YXP4L@xUq9?>=gn;18-4c_Z*(12YmkjU
hUJ!Fqu0MVMPgdg>J#R(R&aDF_YEM@`mvv4FO#t9SKHUHS

delta 359
zcmV-t0hs>I295)eFn<9^Nkl<ZScUDCv1-FG5QhJhzJW@2&jvk!Ay6`R3S<iuI%NuY
z?E{oT3x-Ud5>m1S@(5W1et-i{8N9Zk3iJuwAx&@`$-2ab4%IhVoR9z4=}rP14#$6|
zWeT)!kvA!{+UT{eP2$T@zcKO7aAu5Y4FG`3=xE)GNc-PBlz&zO%TXVl;Vjox!Dyf?
z{`{a9>P2KVQQl0EtE$BHmSe9P5u^}7ioxRr2HLM=Y*H>N@u3nQ@mL>c9YGyLkOBY(
z-@xkSG+tQ&wumPoJbAR<W2-<T2KG%>6h4@-^Z@G!=AmSbp~~pQgi3q>Ks?sxvwMIu
z??n^Ble_OaJz$W3ys@w2;;gHT4(nP|@Hu%007MIdyy05eL0>@FmDUQdjv(wxL<{q6
zX3D{D1=d?2o}SqQ<y-Lnj@JXa{HG}yU&B9tjvWq%;|BoXe0{8>djbFe002ovPDHLk
FV1nuVq`UwC

diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png
index b7029d819fe44470f18ac2eff3b50841d1179e7a..2ea87c6abeb1d664133c712fc04c7ca066da2121 100644
GIT binary patch
literal 850
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSK$uZf!>a+Pp*=Gsq9nrC$0|8LS1&OoKPgqOBDVmjnt{Q_
zzM>#8IXksPAt^OIGtXB2{qFth3YjUk>fxro2EGN(sTr9bRYj@6RemAKRoTgwDeCri
zyj(UFRzMSSQ%e#RDspr3imfVamB0pD0ofp7eI+}aqLehNAQv~N3Lwu`DWjyMz)D}g
zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvsfJ<s|a#3bMNoIbY0?5F`
zr2NtnTcy&{%oMA%#5B{SloV6lq(tKsT|>i^MBT&`V?*5(W8)NaQ$q`*G{Yn%sP!e8
zX$brCilM;(3=n;gjJ~0s0m#W9wv~TTW-8DXAS>+*ZNTy<VmA69hafr34k7~dE06^b
z8Bj36LpL=K7^LOEu+y0`gButnA)YRdArbCxr*8B+Y#`9~UrFu&cTV6YL#1tJWV?Pb
zX>{lcF*6J03zR0mKhQ8m^fGJbQ6=ZJZL5Nhx?Nq`s;b{`s7d>Ij=8T=>B0F=6!+)e
zegF9<lZ8y*f4_dNNd_OhS8aXzw>Yskc@78jejk1P6?bO+$V@U#6ghlA-~F(otG7$o
z&uJG*)ohNfQ8Qs=W9~d5Fn4a)HIE-9+a`Cqq_{D&hXl-Ae=X!z*YO)^9=`&+>ZUw0
ziwe2swM}YAb>&r=+aDwjZ_+Sxo^_(KXU=hn;`w=uuXsulBSjpp^O!i!n-zC3&NyLL
z(=HyFpo2#;ELPOEZDP}~>}O<1p2&E?SEAd;?(paK<M(c#{d!I|(06YXGlPMk{f=GN
zA7?U&FsmPT|MBD3vde2Xd}Z`?IP8|Ph~>kd>kF(>9gc=En_c<)`KnZnRra(-HT89e
l#bnHwZ#;f~<6(hC9pn9|d5dLVMT7DRgQu&X%Q~loCIG0BJhlJ;

delta 406
zcmV;H0crly2D}51Fn<AdNkl<ZScUDCKTE?v9EM-T-BK_LLE26H23=en1ou$vnxSj_
z2IA&=bjy&nM+pcng$|j!l}^RYQUXntk}n|b;;-bAyZn)WgZID<$K`n5ytyQRMx*)f
z9H|yM?bfa?$@F8X^hg&v?bgogb?frO9*&eDPE?y#aV*T;&3{&UUEgRH2Jm`a*u&9I
z7UH;Y_mAB7eVC>x4Bz*a!IGqJCW*2E09dReTwk060362wV@z0g97mX6HX0e}?SlsZ
z_&WW@^d;-aZQ$|sO{k27X)(!HaeNpQCg3&#Zeze(Qb%qBX{dp86EbRPK!&OXx@#Il
zZ4EHSGIGWkEPu-qLJ;&wiW(>tpl>t<5n)-@;WZ>-nt<B?fWdeIVEMZMDDl204<0I<
z0p*wQ`Th=9#u?r>pJg-V@-&`EzlOODklfvDVVY(oVHk$!8_oL8fE$LD0?;E1xQ)d+
z0-w#Roq@$V66QCR^x}R#n=5}tfBrkxXf&EVe+ja3J`Z`fJ^%m!07*qoM6N<$f=V2|
AkpKVy


From f8f03e2dd37cd229e8a46e29d655e27acfcb3dda Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 7 Feb 2026 14:01:51 +0100
Subject: [PATCH 238/360] Downstream fixes for #42200

---
 Resources/Locale/en-US/_DV/job/job-names.ftl      |   2 ++
 Resources/Prototypes/_DV/QuickPhrases/jobs.yml    |   2 +-
 .../_DV/Objects/Devices/pda.rsi/meta.json         |   5 ++++-
 .../_DV/Objects/Devices/pda.rsi/pda-ninja.png     | Bin 0 -> 584 bytes
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-ninja.png

diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl
index 90793fee54..b0873222f1 100644
--- a/Resources/Locale/en-US/_DV/job/job-names.ftl
+++ b/Resources/Locale/en-US/_DV/job/job-names.ftl
@@ -15,6 +15,8 @@ job-name-senior-engineer = Engineering Mentor
 job-name-senior-officer = Security Mentor
 job-name-qm = Logistics Officer
 job-name-centcomintern = CentComm Intern
+job-name-rd = Mystagogue
+job-name-brigmedic = Corpsman
 
 # Alternate titles
 job-alt-title-tourist = Tourist
diff --git a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml
index 864b2da29c..57b67c9dff 100644
--- a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml
+++ b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml
@@ -65,7 +65,7 @@
 - type: quickPhrase
   parent: BaseCommandJobPhrase
   id: CentralCommandOfficialPhrase
-  text: job-name-centcomoff
+  text: job-name-centcommoff
 
 - type: quickPhrase
   parent: BaseCommandJobPhrase
diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json
index adb3ae6312..2d31a5228b 100644
--- a/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician, modified interntech, added the cargo assistant by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae <chell@alterae.online>, surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security PDAs modified by TJohnson. Cryogenics Specialist PDA by willow_de_luna. Wizard PDA by Exile152 (github). Pharmacist PDA by Requiem(Croix). Secborg PDA modled by dahalo3rat (Discord) and coded by BungleBoss (Github). CentComm Intern PDA Modified by @Stxcking (github).",
+    "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician, modified interntech, added the cargo assistant by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae <chell@alterae.online>, surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security PDAs modified by TJohnson. Cryogenics Specialist PDA by willow_de_luna. Wizard PDA by Exile152 (github). Pharmacist PDA by Requiem(Croix). Secborg PDA modled by dahalo3rat (Discord) and coded by BungleBoss (Github). CentComm Intern PDA Modified by @Stxcking (github). Ninja PDA by BarryNorfolk (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -314,6 +314,9 @@
         {
             "name": "pda-wizard"
         },
+        {
+            "name": "pda-ninja"
+        },
         {
             "name": "pda-secborg"
         },
diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-ninja.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-ninja.png
new file mode 100644
index 0000000000000000000000000000000000000000..b63b0ae25f9ece1c9c5898a5a92db750e65d7942
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;zd>NdOv#iPnGs000SaNLh0L01FcU01FcV0GgZ_00007
zbV*G`2kHU`3<4apF+MZ^00E3iL_t(o!|m6xPQpMK!0|s#7YQ}jfx*NO22E;MaKO#M
zf%p_W0B^x7IQalRgE7Xz!A%BqkdVM&h#Ny2N~!}%nIHs8uf025^jq4d?d5mh-F>-(
z|M=@sNP8)Sh?n=(PLQkN&yHB#2SHHC4G==aPohD)JlE>s?Zl=Tbax``w4dAMIiq0@
z0MGM?qKGgI0q}hvfJ&u87=}BaTSrw$NuHIpCxgL&VzG$hH~_e=3&40h#&MjT&$37a
z#Bm%ajkzi!ZT=(z`u)DKOekfbR;v|E4TloI<eb<Wz!bvLtz<I9-T^X%G9Y+2gOIgl
zBm-FxzXC`?Xalk?Csl+LkY`ONA+!N`3(F?L$PnltlmXKZbBOh}l;*%bGa&_Ru4~f>
zOQpD&L|Cd7&J;pxPiO*>x-CCBJ!dxawR%`8xr~NAwQc#b0f5WyGsnOoFa^GVm&VoV
zyX#k<#|wAsDhpe7sAwHb0C+g7Z-20so%@?NerENp>)m&mrir6jmb$(kQ50o5nk@hZ
Wn%?1eKsQeS0000<MNUMnLSTaW=Hqt&

literal 0
HcmV?d00001


From 4ce6d3d1af3ce082d0742e7925afe0b6e6b5e2f7 Mon Sep 17 00:00:00 2001
From: SnappingOpossum <snappingopossum@outlook.com>
Date: Tue, 6 Jan 2026 21:56:57 +1100
Subject: [PATCH 239/360] Replace recently added StorageFill with
 EntityTableContainerFill (#42269)

I HATE STORAGE FILL
---
 .../Catalog/Fills/Boxes/emergency.yml         | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 4d451d55d4..4dca8de2cf 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -335,11 +335,13 @@
   suffix: Military O2
   description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
   components:
-  - type: StorageFill
-    contents:
-    - id: DoubleEmergencyOxygenTankFilled
-    - id: EmergencyMedipen
-    - id: Flare
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: DoubleEmergencyOxygenTankFilled
+        - id: EmergencyMedipen
+        - id: Flare
   - type: Sprite
     layers:
     - state: internals
@@ -350,11 +352,13 @@
   id: BoxSurvivalMilitaryDoubleNitrogen
   suffix: Military N2
   components:
-  - type: StorageFill
-    contents:
-    - id: DoubleEmergencyNitrogenTankFilled
-    - id: EmergencyMedipen
-    - id: Flare
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: DoubleEmergencyNitrogenTankFilled
+        - id: EmergencyMedipen
+        - id: Flare
   - type: Sprite
     layers:
     - state: internals

From c859a9f33b9827b649f5ad23866ec7244b20d5e5 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 6 Jan 2026 11:29:10 -0800
Subject: [PATCH 240/360] Fix admin loc spam 2 (#42265)

---
 Content.Client/Administration/AdminNameOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index ce3bff6491..1614b4ab67 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -134,7 +134,7 @@ internal sealed class AdminNameOverlay : Overlay
                 ? null
                 : _prototypeManager.Index(playerInfo.RoleProto.Value);
 
-            var roleName = Loc.GetString(rolePrototype?.Name ?? RoleTypePrototype.FallbackName);
+            var roleName = rolePrototype?.Name ?? RoleTypePrototype.FallbackName;
             var roleColor = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor;
             var roleSymbol = rolePrototype?.Symbol ?? RoleTypePrototype.FallbackSymbol;
 
@@ -255,7 +255,7 @@ internal sealed class AdminNameOverlay : Overlay
                     color = roleColor;
                     symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty;
                     text = IsFiltered(playerInfo.RoleProto)
-                        ? roleName.ToUpper()
+                        ? Loc.GetString(roleName).ToUpper()
                         : string.Empty;
                     break;
                 case AdminOverlayAntagFormat.Subtype:

From 848a1e2185b52bdb37893fe28b203f3150555448 Mon Sep 17 00:00:00 2001
From: 0-Anon <cec124@case.edu>
Date: Tue, 6 Jan 2026 20:19:22 -0500
Subject: [PATCH 241/360] Guarantee glue and lube in toybox (#42146)

Update fun.yml
---
 Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 35d94accab..5b565e8f7c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -402,6 +402,8 @@
     containers:
       entity_storage: !type:AllSelector
         children:
+        - id: CrazyGlue
+        - id: CrazyLube
         - !type:NestedSelector
           tableId: AllToyWeaponsTable
           rolls: 2

From caded37f81e22d1fa45b57ce2e097ce6a0039203 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Wed, 7 Jan 2026 06:51:44 +0100
Subject: [PATCH 242/360] Chameleon Projector Battery, Price Decrease (#42271)

* init

* fuck using

* glowup

* unused

* meta

* whuh

* review

* tests

* Update SharedChameleonProjectorSystem.cs
---
 .../Power/Visualizers/PowerDeviceVisuals.cs   |   3 +-
 .../Systems/SharedChameleonProjectorSystem.cs |  60 ++++++++++++++----
 .../Prototypes/Catalog/uplink_catalog.yml     |   4 +-
 .../Objects/Devices/chameleon_projector.yml   |  48 +++++++++++++-
 .../Specific/Robotics/borg_modules.yml        |   2 +-
 .../chameleon_projector.rsi/decharging.png    | Bin 0 -> 6799 bytes
 .../Devices/chameleon_projector.rsi/icon.png  | Bin 716 -> 6240 bytes
 .../Devices/chameleon_projector.rsi/meta.json |  18 +++++-
 .../chameleon_projector.rsi/powered.png       | Bin 0 -> 8097 bytes
 9 files changed, 116 insertions(+), 19 deletions(-)
 create mode 100644 Resources/Textures/Objects/Devices/chameleon_projector.rsi/decharging.png
 create mode 100644 Resources/Textures/Objects/Devices/chameleon_projector.rsi/powered.png

diff --git a/Content.Client/Power/Visualizers/PowerDeviceVisuals.cs b/Content.Client/Power/Visualizers/PowerDeviceVisuals.cs
index 5cc86d203d..057dabae5d 100644
--- a/Content.Client/Power/Visualizers/PowerDeviceVisuals.cs
+++ b/Content.Client/Power/Visualizers/PowerDeviceVisuals.cs
@@ -3,5 +3,6 @@ namespace Content.Client.Power;
 /// Remains in use by portable scrubbers and lathes.
 public enum PowerDeviceVisualLayers : byte
 {
-    Powered
+    Powered,
+    Charging
 }
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index 6c686ff555..bf6fea5b47 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -14,6 +14,8 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Damage.Systems;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 
 namespace Content.Shared.Polymorph.Systems;
 
@@ -34,6 +36,7 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
 
     public override void Initialize()
     {
@@ -53,6 +56,7 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
         SubscribeLocalEvent<ChameleonProjectorComponent, HandDeselectedEvent>(OnDeselected);
         SubscribeLocalEvent<ChameleonProjectorComponent, GotUnequippedHandEvent>(OnUnequipped);
         SubscribeLocalEvent<ChameleonProjectorComponent, ComponentShutdown>(OnProjectorShutdown);
+        SubscribeLocalEvent<ChameleonProjectorComponent, ItemToggledEvent>(OnProjectorToggled);
     }
 
     #region Disguise entity
@@ -105,6 +109,18 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
         TryDisguise(ent, args.User, target);
     }
 
+    private void OnProjectorToggled(Entity<ChameleonProjectorComponent> ent, ref ItemToggledEvent args)
+    {
+        if (args.Activated)
+            return;
+
+        if (ent.Comp.Disguised == null)
+            return;
+
+        // We don't toggle here as this is only called when we subscribe to being toggled off.
+        TryReveal(ent.Comp.Disguised.Value);
+    }
+
     private void OnGetVerbs(Entity<ChameleonProjectorComponent> ent, ref GetVerbsEvent<UtilityVerb> args)
     {
         if (!args.CanAccess)
@@ -136,6 +152,10 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
             return false;
         }
 
+        // We do a TryComp, so if the item has variations without ItemToggle, they can still be used just fine.
+        if (TryComp<ItemToggleComponent>(ent.Owner, out var itemToggle) && !_toggle.TryActivate((ent.Owner, itemToggle), user))
+            return false;
+
         _popup.PopupClient(Loc.GetString("chameleon-projector-success"), target, user);
         Disguise(ent, user, target);
         return true;
@@ -206,7 +226,8 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
             return;
 
         // reveal first to allow quick switching
-        TryReveal(user);
+        if (ent.Comp.Disguised != null)
+            ClearDisguise(ent, ent.Comp.Disguised.Value);
 
         // add actions for controlling transform aspects
         _actions.AddAction(user, ref proj.NoRotActionEntity, proj.NoRotAction, container: ent);
@@ -216,7 +237,7 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
 
         var disguise = SpawnAttachedTo(proj.DisguiseProto, user.ToCoordinates());
 
-        var disguised = AddComp<ChameleonDisguisedComponent>(user);
+        var disguised = EnsureComp<ChameleonDisguisedComponent>(user);
         disguised.Disguise = disguise;
         Dirty(user, disguised);
 
@@ -246,21 +267,38 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
         if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (TryComp<ChameleonDisguiseComponent>(ent.Comp.Disguise, out var disguise)
-            && TryComp<ChameleonProjectorComponent>(disguise.Projector, out var proj))
-        {
-            proj.Disguised = null;
-        }
+        if (!TryComp<ChameleonDisguiseComponent>(ent.Comp.Disguise, out var disguise)
+            || !TryComp<ChameleonProjectorComponent>(disguise.Projector, out var proj))
+            return false;
 
-        var xform = Transform(ent);
-        xform.NoLocalRotation = false;
-        _xform.Unanchor(ent, xform);
+        ClearDisguise((disguise.Projector, proj), ent);
+        _toggle.TryDeactivate(disguise.Projector);
 
-        Del(ent.Comp.Disguise);
         RemComp<ChameleonDisguisedComponent>(ent);
         return true;
     }
 
+    /// <summary>
+    /// Clears the disguise for the projector, allowing the user to immediately disguise again.
+    /// </summary>
+    /// <param name="ent">The entity for which to clear the disguise</param>
+    /// <param name="disguised">The disguised entity.</param>
+    private void ClearDisguise(Entity<ChameleonProjectorComponent> ent, Entity<ChameleonDisguisedComponent?> disguised)
+    {
+        if (!Resolve(disguised, ref disguised.Comp, false))
+            return;
+
+        if (ent.Comp.Disguised == null)
+            return;
+
+        var xform = Transform(ent.Comp.Disguised.Value);
+        xform.NoLocalRotation = false;
+        _xform.Unanchor(disguised, xform);
+
+        ent.Comp.Disguised = null;
+        Del(disguised.Comp.Disguise);
+    }
+
     /// <summary>
     /// Reveal a projector's user, if any.
     /// </summary>
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index f3589fc5bc..ddbaed4f7c 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -847,9 +847,9 @@
   productEntity: ChameleonProjector
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 3 # DeltaV - was 4
+    Telecrystal: 3 # DeltaV - was 2
   cost:
-    Telecrystal: 5 # DeltaV - was 7
+    Telecrystal: 5 # DeltaV - was 3
   categories:
   - UplinkDeception
 
diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
index 9260574c66..e69b092afa 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -1,12 +1,18 @@
 - type: entity
   parent: [BaseItem, BaseSyndicateContraband]
-  id: ChameleonProjector
+  id: ChameleonProjectorNoBattery
   name: chameleon projector
   description: Holoparasite technology used to create a hard-light replica of any object around you. Disguise is destroyed when picked up or deactivated.
   components:
   - type: Sprite
     sprite: /Textures/Objects/Devices/chameleon_projector.rsi
-    state: icon
+    layers:
+    - state: icon
+    - state: powered
+      map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+    - state: decharging
+      map: [ "enum.PowerDeviceVisualLayers.Charging" ]
+      visible: false
   - type: ChameleonProjector
     whitelist:
       components:
@@ -29,6 +35,44 @@
   - type: StaticPrice
     price: 5000
 
+- type: entity
+  parent: ChameleonProjectorNoBattery
+  id: ChameleonProjector
+  name: chameleon projector
+  description: Holoparasite technology used to create a hard-light replica of any object around you. Disguise is destroyed when picked up or deactivated.
+  suffix: Battery
+  components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.BatteryVisuals.State:
+        enum.PowerDeviceVisualLayers.Powered:
+          Full: { visible: true }
+          Neither: { visible: true }
+          Empty: { visible: false }
+      enum.BatteryVisuals.Charging:
+        enum.PowerDeviceVisualLayers.Charging:
+          Charging: { visible: false }
+          Decharging: { visible: true }
+          Constant: { visible: false }
+  - type: BatteryVisuals
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: PowerCellDraw
+    drawRate: 4 # About 3 minutes with a medium cell.
+  - type: ToggleCellDraw
+  - type: ItemToggle
+    onActivate: false
+    onUse: false
+
 - type: entity
   categories: [ HideSpawnMenu ]
   id: ChameleonDisguise
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index a3a7ea960f..1e11068c88 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1714,7 +1714,7 @@
     - state: icon-xenoborg-projector
   - type: ItemBorgModule
     hands:
-    - item: ChameleonProjector
+    - item: ChameleonProjectorNoBattery
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-projector-module }
 
diff --git a/Resources/Textures/Objects/Devices/chameleon_projector.rsi/decharging.png b/Resources/Textures/Objects/Devices/chameleon_projector.rsi/decharging.png
new file mode 100644
index 0000000000000000000000000000000000000000..a818589da1118b57be9f81faebfd59d7eb8deeb8
GIT binary patch
literal 6799
zcmdT|ZHQD=7#>lx4oXl&Vn3RSus_wEbIv{I-pcG_H(dfr$ucYK&dj~EsO*r7PLZ$(
z(Z?SR`X!r@Q1m0Le)J=-jiN6Jp-cibOQVv_)B?+oWv%Bu_s-mVoY~pg6`A!6_v3uL
z&-*;@`<^p!Uw&xGqB(3H%jI%&dKPyr!*c*v{_@Lk-+yD}W<0K_EPiZVE_d5abWN+i
zwQzkdH|_iW?iKyZf(`k~GksC-nlRu0Y$eQx)!rz_=+5%gc!4wNYESt}IcU<CJ`eEX
zQ4fvY9jD+(b2pumxtqQ<&UkHt!$6=z7n*0Ffl?bU#N$|HS|Pxji`S&jyu?MJXixaW
z0*!kZC-53j;z$%QLM#${<|i+LJY%AeEDREP%J+0uTCuK;+@R4qT#Rl}iTgC>7U|yD
zmm1M4yYM484+VVT&dm=aLWw{)48wQ`g+&D+@Gi`VE65YcK`<<7HHqXAjm_Wx&mQD_
zWz+QbR{BdhM)x?qd9Il2C{ION;u7YK2ntXGn(!ni(uhG4TI0lFUwzm6V=i~?jHX_y
zYb!a1oAJRt&tsw_B8^b0f)c8zTrIhyxN?<7VTGcMctpiwG2$HKzLGTJYT?SVaAX-N
z5Lk;MWYW`thM_BTAVXIwJOL;Kj5rsO2%SKbv?l`8EDTkdoGDZm^;JoQ8bQ@y1P@>X
z)x<*t@kD*OVUofCqG&jIaRR|7A{rbClL!@E4ll<$MJwc&6B7iogk@48w=S1bBCQsW
zc#f!eOrt)uBLW`rNSnq(4YoWqzBG?e2|oSsMkN$c>F{#w08gP2OD&lyXpfgk5Y5Lt
zvP?h&u|?##^0fnLK7tT}S;7=y;c)4K5otzBASC`-<jD}tMAFN$H?G4px(pH!Fja=I
z#E8V0m?6+(z?=Np;EZB(K6(b+gLG$nXa#BJM6=ObgCl0f#)ik4M!%XYq}g{-7YJ{p
zN}5W~1eY8kdyddT3J(?$65=BSb@2#x5>8Y~BY^9w5ZN*bK}pojGFDz}$0q7Ig^*O!
zK6V<aNEKp62zN}rnNR6s!xXTIU6(d83RroGR39W0mWWZtN8Lo0$dl4_Bhr-$i_;&-
zGW3|xXzYH_!gAO6;Is+iQ_~!gO%Kf`fT(*0&jbX$I6@+d7(tG8K&K$JA`k(c0IGyw
z141MRTg(edt?fCp>*{%xwBIC7H3u-TLgeU#LKsBI(oK*a88AR_Q!uKubQXrb2!$s~
z*jBZz3q}}B!NxZjYdyo6*wlk<koA5(Uo(gEC_W~FR{CSc7Ffe6MU@@K;<5|lgO$e3
zXv5KOhl666Y+8D~uwN&Dvbk+!-w8&IEV3gl8MPLZg}DT>HW4vXUfSfvOg(9~mX-x+
zlW*PY43I6xX4n}<HV3;m4x?6LCIn<JZq*xyQ7cn>t^ufhG2;N))9v>f7`1O|uLRI!
z#WVof1C#AtkhH9p3j)fr?-Wp0OqS0j@CRwrrQX<L?6sW=w#_2jYr?2qF<F=?o3+V_
znVQm4Elsj!Q*O7{IiOUG&9!rkY#wQ^4Mt;$NkQnX4ItZKtlq^1YEO*K?cy@BeYMw1
z7)?fu?O^Iit7(}qBl@J!<ioYg@ZHLMiqje&d+^bj9l8JH3Ve0{v#0CchpU6f_AX$b
zIdcaN@7=d+*V4X2w`_VYH}k#2GiPkhS2rKuH0!TfpMRj=KlID5zdvz?z0u#ha(3aB
z6Vu=9J}}ffd){>5B<=L0yQ|xFeY<XS=fUCdj_3c~uvtF6YAb(n%f@4W+;#Up{l((H
zy^p>;v!&<EVAt|h54<$AbHmp|J3fB!lch(tKfbk#pWJ!+;JK=EbY%GT^=re??$ujP
z{Wf>|?I&*C`16{h3lF|Kxb4Z+(_ee_h3l_ewB+i_4GRZOZtT0~y5W(Z2GoIldxp=w
zbM~rlc8?xE+Bg5sRfF5Q|2uWI#_Z6@f@vdffB3^ApDw?K#(KJ!bnUqBsZIX_2}Qc*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/chameleon_projector.rsi/icon.png b/Resources/Textures/Objects/Devices/chameleon_projector.rsi/icon.png
index ce20b5eeeed277078a03893f96e9ce1aa8ca518f..2d74fcfb85ba6d2e8b9fce94af65ced378f2465c 100644
GIT binary patch
literal 6240
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
DWNLMK

literal 716
zcmV;-0yF)IP)<h;3K|Lk000e1NJLTq006)M001Be1^@s6M3{Gl00009a7bBm001r{
z001r{0eGc9b^rhZen~_@RCwC$nZIikK@@;zjfh1mix`!F*xCeajzIJvb{Yvbv9PeS
zwTXp)fQV^q?JNXiBd20#;F3VN<{*uv6Cr4#g_VUx!g+6HFU$Uzow=FIWcB;tnAyF#
z{pNA+&Hhpf000000000000000;2$K)?r68$g#+*0d(e}1<;An8te^c&v)NQd$1mDn
z_5I|<X(PYx*e1BfkH232lT`x}!NTqN!FE}{tPosC65rHcRMalm#*e>Ve(f0`5$t{2
zQJ;5q<9(N=&Xx8j&rhk=oA+w(%T{E&!WVrn$v=!=SA<n7gpc^~hxP07&-x4yCu0A=
z@=0$O^%HK4jrBep9C%v^Z2ik~bG@b2Rs8>{-zNXG1u${pY+O+`$ZuXxoKlP3u5%GM
z`91sz_-pJp%s*`b{P_A^H5$`a6X<ld)T`ZXFO`oU|ET>&mp~tHosQe<?|#R9Y315W
zCYY`~xeglz`0<a*Z&U!|k2-%l{c4Q+{Z`~xHXaVfbZ4IqCeYg7S3d6nhVlEn2G#kO
z&djLgpPNDaE1z12H;k7Tg2cbJv97MoUJVleug8tULH+&1<lhOCL2@UaJZ?(bqeSPI
z1PtX*+@qd@F8-Tup9G6vl0V&sh+m4&1*0>7JccUjrvo2PjrY0wSNYe}dd}~2_0jny
z`Q#6fd4%xGnMeH6ssR3U@^w|`$o*x-XOn-GZ-P@V7;;tleDmdC`~J+`+%sSwZ-SE-
zVWxhYXTW8Cm-zA5%bz;~6eMSqouEugDp91_%5;4do~!;$KvjNMT;s=IFMl*_g%(w&
ytp2_W06+fY<Ocu%00000000000001h<IW!u7Hdt?jm#wg0000<MNUMnLSTaQ!d|oh

diff --git a/Resources/Textures/Objects/Devices/chameleon_projector.rsi/meta.json b/Resources/Textures/Objects/Devices/chameleon_projector.rsi/meta.json
index 6a28032ba6..5a007d22ae 100644
--- a/Resources/Textures/Objects/Devices/chameleon_projector.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/chameleon_projector.rsi/meta.json
@@ -1,14 +1,17 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/71a1fee2f13730adee5302d34bfa0f0262314d63,  Inhands by TiniestShark (github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/71a1fee2f13730adee5302d34bfa0f0262314d63,  Inhands by TiniestShark (github), decharging, icon and powered seperated by ScarKy0(Github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "icon",
+      "name": "icon"
+    },
+    {
+      "name": "powered",
       "delays": [
         [
           0.2,
@@ -20,6 +23,17 @@
         ]
       ]
     },
+    {
+      "name": "decharging",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Devices/chameleon_projector.rsi/powered.png b/Resources/Textures/Objects/Devices/chameleon_projector.rsi/powered.png
new file mode 100644
index 0000000000000000000000000000000000000000..628dac6f3d04dc91fb64b986c663d33331afc7f7
GIT binary patch
literal 8097
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
MqkZ_B1}>rh0)7B4Qvd(}

literal 0
HcmV?d00001


From 75cb2931c5a3f4e184941f3a2b9eb0830c396a1c Mon Sep 17 00:00:00 2001
From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Wed, 7 Jan 2026 10:33:22 -0500
Subject: [PATCH 243/360] Fix attributions for /Resources/Audio/Misc/ (#42230)

* commit

* cleanup
---
 Resources/Audio/Misc/attributions.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml
index 25856d8c93..8fda833b1d 100644
--- a/Resources/Audio/Misc/attributions.yml
+++ b/Resources/Audio/Misc/attributions.yml
@@ -1,14 +1,9 @@
-- files: ["tension_session.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Created by qwertyquerty"
-  source: "https://www.youtube.com/@qwertyquerty"
-
 - files: ["ninja_greeting.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Created by Chillyconmor"
   source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Misc/ninja_greeting.ogg"
 
-- files: ["nparadox_clone_greeting.ogg"]
+- files: ["paradox_clone_greeting.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Created by ps3moira"
   source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Misc/ninja_greeting.ogg"
@@ -72,3 +67,23 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from stevielematt via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
   source: "https://freesound.org/people/stevielematt/sounds/538066/"
+
+- files: ["notice1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station"
+  source: "https://github.com/phil235/-tg-station/blob/462ce9c87771c6fa4a0ac29270ef78ea47364d6a/sound/misc/notice1.ogg"
+
+- files: ["notice2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station"
+  source: "https://github.com/phil235/-tg-station/blob/c80f22bf524a900ca484011f1bea55a2c182ac53/sound/misc/notice2.ogg"
+
+- files: ["zip.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station"
+  source: "https://github.com/phil235/-tg-station/blob/c80f22bf524a900ca484011f1bea55a2c182ac53/sound/items/zip.ogg"
+
+- files: ["delta.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from Citadel station"
+  source: "https://github.com/Citadel-Station-13/Citadel-Station-13/blob/e31455667ebf3331255c1143e1e7215bc737a287/sound/misc/deltakalaxon.ogg"

From eac1f40d4d0b26c4718de241fbe31dca8a5ee709 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Wed, 7 Jan 2026 16:58:28 +0100
Subject: [PATCH 244/360] Predict Rotting Examine (#42254)

* init

* review

* test

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Server/Atmos/Rotting/RottingSystem.cs |  4 +++-
 .../Atmos/Rotting/PerishableComponent.cs      |  4 ++--
 .../Atmos/Rotting/SharedRottingSystem.cs      | 21 +++++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 5feb95e3c4..e83d80748b 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -72,19 +72,21 @@ public sealed class RottingSystem : SharedRottingSystem
         {
             if (_timing.CurTime < perishable.RotNextUpdate)
                 continue;
+
             perishable.RotNextUpdate += perishable.PerishUpdateRate;
 
             var stage = PerishStage((uid, perishable), MaxStages);
             if (stage != perishable.Stage)
             {
                 perishable.Stage = stage;
-                Dirty(uid, perishable);
+                DirtyField(uid, perishable, nameof(PerishableComponent.Stage));
             }
 
             if (IsRotten(uid) || !IsRotProgressing(uid, perishable))
                 continue;
 
             perishable.RotAccumulator += perishable.PerishUpdateRate * GetRotRate(uid);
+            DirtyField(uid, perishable, nameof(PerishableComponent.RotAccumulator));
             if (perishable.RotAccumulator >= perishable.RotAfter)
             {
                 var rot = AddComp<RottingComponent>(uid);
diff --git a/Content.Shared/Atmos/Rotting/PerishableComponent.cs b/Content.Shared/Atmos/Rotting/PerishableComponent.cs
index 99b30fc906..3acda1c3ff 100644
--- a/Content.Shared/Atmos/Rotting/PerishableComponent.cs
+++ b/Content.Shared/Atmos/Rotting/PerishableComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Atmos.Rotting;
 /// This makes mobs eventually start rotting when they die.
 /// It may be expanded to food at some point, but it's just for mobs right now.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
 [Access(typeof(SharedRottingSystem))]
 public sealed partial class PerishableComponent : Component
 {
@@ -20,7 +20,7 @@ public sealed partial class PerishableComponent : Component
     /// <summary>
     /// How much rotting has occured
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan RotAccumulator = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
index 60c89c012a..5fd9aaf3e2 100644
--- a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
+++ b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
@@ -31,21 +31,22 @@ public abstract class SharedRottingSystem : EntitySystem
         SubscribeLocalEvent<RottingComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnPerishableMapInit(EntityUid uid, PerishableComponent component, MapInitEvent args)
+    private void OnPerishableMapInit(Entity<PerishableComponent> ent, ref MapInitEvent args)
     {
-        component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
+        ent.Comp.RotNextUpdate = _timing.CurTime + ent.Comp.PerishUpdateRate;
     }
 
-    private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
+    private void OnMobStateChanged(Entity<PerishableComponent> ent, ref MobStateChangedEvent args)
     {
         if (args.NewMobState != MobState.Dead && args.OldMobState != MobState.Dead)
             return;
 
-        if (HasComp<RottingComponent>(uid))
+        if (HasComp<RottingComponent>(ent))
             return;
 
-        component.RotAccumulator = TimeSpan.Zero;
-        component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
+        ent.Comp.RotAccumulator = TimeSpan.Zero;
+        ent.Comp.RotNextUpdate = _timing.CurTime + ent.Comp.PerishUpdateRate;
+        DirtyField(ent.Owner, ent.Comp, nameof(PerishableComponent.RotAccumulator));
     }
 
     private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref ExaminedEvent args)
@@ -62,9 +63,9 @@ public abstract class SharedRottingSystem : EntitySystem
         args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
     }
 
-    private void OnShutdown(EntityUid uid, RottingComponent component, ComponentShutdown args)
+    private void OnShutdown(Entity<RottingComponent> ent, ref ComponentShutdown args)
     {
-        if (TryComp<PerishableComponent>(uid, out var perishable))
+        if (TryComp<PerishableComponent>(ent, out var perishable))
         {
             perishable.RotNextUpdate = TimeSpan.Zero;
         }
@@ -74,6 +75,7 @@ public abstract class SharedRottingSystem : EntitySystem
     {
         if (args.NewMobState == MobState.Dead)
             return;
+
         RemCompDeferred(uid, component);
     }
 
@@ -148,6 +150,7 @@ public abstract class SharedRottingSystem : EntitySystem
         if (!TryComp<RottingComponent>(uid, out var rotting))
         {
             perishable.RotAccumulator -= time;
+            DirtyField(uid, perishable, nameof(PerishableComponent.RotAccumulator));
             return;
         }
         var total = (rotting.TotalRotTime + perishable.RotAccumulator) - time;
@@ -156,8 +159,8 @@ public abstract class SharedRottingSystem : EntitySystem
         {
             RemCompDeferred(uid, rotting);
             perishable.RotAccumulator = total;
+            DirtyField(uid, perishable, nameof(PerishableComponent.RotAccumulator));
         }
-
         else
             rotting.TotalRotTime = total - perishable.RotAfter;
     }

From 8eb0d3eb3270e279e595ea2d931480da5e969672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Wed, 7 Jan 2026 10:05:58 -0600
Subject: [PATCH 245/360] Grappling gun rope visual change (#42207)

* sprite changes

* system changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Weapons/Misc/SharedGrapplingGunSystem.cs    |   5 ++---
 .../Guns/Launchers/grappling_gun.rsi/hook.png   | Bin 737 -> 715 bytes
 .../Guns/Launchers/grappling_gun.rsi/meta.json  |   2 +-
 .../Guns/Launchers/sticky_hand.rsi/hook.png     | Bin 343 -> 338 bytes
 .../Guns/Launchers/sticky_hand.rsi/meta.json    |   2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 77af2e6543..47e726b0e7 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -65,7 +65,6 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             Dirty(uid, component);
             var visuals = EnsureComp<JointVisualsComponent>(shotUid.Value);
             visuals.Sprite = component.RopeSprite;
-            visuals.OffsetA = new Vector2(0f, 0.5f);
             visuals.Target = uid;
             Dirty(shotUid.Value, visuals);
         }
@@ -229,10 +228,10 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             return;
 
         var jointComp = EnsureComp<JointComponent>(uid);
-        var joint = _joints.CreateDistanceJoint(uid, args.Weapon.Value, anchorA: new Vector2(0f, 0.5f), id: GrapplingJoint);
+        var joint = _joints.CreateDistanceJoint(uid, args.Weapon.Value, id: GrapplingJoint);
         joint.MaxLength = joint.Length + 0.2f;
         joint.Stiffness = 1f;
-        joint.MinLength = 0.35f;
+        joint.MinLength = 1f; // Length of a tile to prevent pulling yourself into / through walls
         // Setting velocity directly for mob movement fucks this so need to make them aware of it.
         // joint.Breakpoint = 4000f;
         Dirty(uid, jointComp);
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/hook.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/hook.png
index 0b79c8618b8b1e8c07bc0714aa3aeeb94a92a9a5..f84b63ff3ee8ca38c82ae66e2f9612e4bd1cc1e8 100644
GIT binary patch
delta 691
zcmV;k0!;nk1<M7HB!7NsLqkwWLqi~Na&Km7Y-IodD3N`UJ4nM&6o$W~ilP+}i-<U6
zsJiH)B92nUA}B~(p{)+)VQZmDOVZ-vD7Xp^J{Dhti?gl{u7V)=0C9D3QgjiC+@{bX
z#<Sdy|DOMF&woKa%<HDpFaf4jvSZPRl1!zQrWYFNqLl$URDazm&c&w__}1qgk~nXN
z#4P{5Kda4HadeOrU_vk2C6JbZv9(fB@GcP2S5*U~Ghon8rqUoi2wn5|RdBY#vX~jN
z6R}B<Lx7U4W37($Roeu46bKupWq_RY*buxf*vyyp>N~}T!4+#EE_9%mC^O74kAg;-
z9C=C%k;6j4A%8}ch>yRg;-9CCMxGox3R4s?Q7eALAN<bN$&3tplY$Xwe0JUUK4{v8
z?=9E;I&$6bV+cIKrB(A64q^NQ0$VjLd;skmaDG+Ov>mwEgzm?pYO56~0LYmPyq!W@
z3Oa9~Wzoy6de6x{B-UZ}8us>~KMU<kK6^LU=k{+;HGjV!ra^MMSYyn~00039Nkl<Z
zScUDAF>b>!3`LouU5$=f>I>uo-MbL*s3o&<fok#@JQzNJ0G~rXhOgiPg2qB?24<4s
zwh0v3EdmsLlR%03pA-eaFbu;m%$?b7Nk&9EeSW~x^9xvOH{G>Ld>lu5d)?D841|cZ
z=AMV&Fn=>m)9T#E)PZGX-`niHhr{t5LI_!TSs)@g=g1iIqs@p&ZQEXq8)L{hmwcLJ
z2duR_r4;pjA43FJs)}M#N~o#|lv2s+lLnS1wALV{{9<G&9{0+!yh$8#zab)0(=_0{
zp9e3507X&E!a@kB>-y$*&mNB0X00^{A?CRE9xS@91K2urIY#1u#`T|zUNdqRVTSoP
ZoB{mHgjg9Z>&pND002ovPDHLkV1mq#Mce=Y

delta 713
zcmV;)0yh221>psdB!7izLqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~N-OGPUp77=mC
zP<643ia3@k7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rv#YxdcO8j3^
zXc6PVaX;SOd)&PPyp0M|jIJo4sHUEZ$AoNdRS3Mok0JD80)GP{Gqgl{F$34}bq^0;
z?;<?Q{oJ3UPtF?*@Cd|Frs*c}2J!5ssd3&X4zZFb6Q2`L>U2TkN3Kf_zi}?w?B$su
zJ(HRz4iO8*4wgEYm2`!8hBz!MD&>2#4$GXkI4hMJYu%H-Fql_Y(p;xGia3^#KoSBZ
z)KEqRCL*+|q<<Jl(SFRuKVtin<dVo$1|!D;s!$->e(*o|-K|lWo^q0cF~I*~Ss!CS
zU>9iCE$jQ(vYID=?-{sK+x}_;nENEX-qylLK>s#yaoyIWJ>YT&7=F@3U9=@1O>dz9
zyr0oG<$%Fkpl8kLt+kKS2OvXTE#CkKhroD|ve#YS-GANL+rMX8{rv!@L2|op@qcIl
z009?CL_t(oh3%CwYQ!)QMgNA>u2uO0dx0hGHUlozgp|q!qRMA*VSE6A&mkYfS8yRz
zZJ|C)DjA1t@Y>oC67(xE(&#_U3<yZjOZCL((~(o|ct}aUhcZA0$N(8217v`|4RCoc
z002ak^nWGq5)tt@j(k2Hc^C%X3vrhgOw+VG_i^pO@@3ZA!*b7ikLTAngb+66Z4wc&
zbB>KMU&>5G+_vr2xG{#EbE~act$?-mpp@di?_-E#{2D9(NGVZO6_iq|uU`dNLTIfa
zrThf4G>>~_S>9w00GoP4MBFqDy!Z3qg%D5_#X@W>gg{-_H}`$>aKtiets#V%<KBC8
vT?Zg>=(d2w0gdY)H~kLeSB$f={*68Wt#^dTQ+&)+00000NkvXXu0mjf7f?!k

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json
index 0de49fca27..d383045c47 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/456cd10d94084c7c2574f628cf7ac9b67087ba26. Recolored, adjusted, and inhands created by EmoGarbage404",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/456cd10d94084c7c2574f628cf7ac9b67087ba26. Recolored, adjusted, and inhands created by EmoGarbage404. A portion of 'hook' removed by iaada.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png
index 4367a5ed61dc75b0a247b05e2ba438184e284abc..006225853eb1820a44bc1a9296c1235bc6ec158d 100644
GIT binary patch
delta 251
zcmV<X00jTn0@4DIF#!ybGBSUq(o)F3m>A6e-R~WMlarH^latdwD=M?$a5@g3+_BpZ
z=gR<5nGL!%Rm|30HFDg0!iQdVzykqQoRjV(1E9Gld;kFGWj8ygLXZHKm7_2Ln<U6R
zfR*EODojH)(zq{-0kHbVt${i%7@F}wz;s=w1*1Ta5>Ty#OLl&V7EN!LdlLxjF|5;q
zsdnBE@_HW)b?2J^gn6Q^XqkekNC12<$OgKpu>z>#obf=65Nk=GVVEa_2{1PWK#1AL
z6N5FwcfW=Npfg*GST`*?Sxv#TQmhc)**4?P^aPdfh8a!i5##^>002ovPDHLkV1gNy
BaTWjo

delta 256
zcmV+b0ssEe0@nhNF#!>gGBSTfp%n5jCI<6=_j?DhK~b3vr^|WRa>rrI$9u>DH~<IW
z033h=Z~*@c5S7`WTT{hs%~d1Ey(fI=Wd}SEP{ldvPBH+Rd%_0*fL?a9b1DQ0U|Bf|
z6R=5w+yhuSKBvMoR3nZ1!WaOne?1zg(}JNH4+Kotby_eA1StX4O1N}o*N<q?bh$Ty
zupYxYEtqQO{UGnp(NK533qY7B+KQGbn2H3zkAiHVn;I*CD$W@X#0asL1R92UGME5!
zQvigReLOK(GyL{zNB}yswTN}oqLbAWOe@6-@ttim{!DL5Vum*()Z!8V0000<MNUMn
GLSTX>h-wP}

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
index f96629f129..1570dc188a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by august-sun(GitHub)/augustsun(Discord) for Space Station 14.",
+    "copyright": "Sprited by august-sun(GitHub)/augustsun(Discord) for Space Station 14. A portion of 'hook' removed by iaada.",
     "size": {
         "x": 32,
         "y": 32

From 5b0006bde9715f6312cc671c7c09093b727b4a94 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Wed, 7 Jan 2026 13:24:35 -0300
Subject: [PATCH 246/360] Xenoborg camera monitor now shows xenoborgs names
 (#42205)

* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name
---
 .../SurveillanceCamera/Systems/SurveillanceCameraSystem.cs  | 5 +++--
 .../Components/SurveillanceCameraComponent.cs               | 6 ++++++
 .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 70d9c8ae93..06fba6638d 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -81,7 +81,7 @@ public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
             {
                 { DeviceNetworkConstants.Command, string.Empty },
                 { CameraAddressData, deviceNet.Address },
-                { CameraNameData, component.CameraId },
+                { CameraNameData, component.UseEntityNameAsCameraId ? MetaData(uid).EntityName : component.CameraId },
                 { CameraSubnetData, string.Empty }
             };
 
@@ -215,7 +215,8 @@ public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
             }
         }
 
-        var state = new SurveillanceCameraSetupBoundUiState(camera.CameraId, deviceNet.ReceiveFrequency ?? 0,
+        var name = camera.UseEntityNameAsCameraId ? MetaData(uid).EntityName : camera.CameraId;
+        var state = new SurveillanceCameraSetupBoundUiState(name, deviceNet.ReceiveFrequency ?? 0,
             camera.AvailableNetworks, camera.NameSet, camera.NetworkSet);
         _userInterface.SetUiState(uid, SurveillanceCameraSetupUiKey.Camera, state);
     }
diff --git a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
index 1c5ba8ad17..21381e753f 100644
--- a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
+++ b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
@@ -34,6 +34,12 @@ public sealed partial class SurveillanceCameraComponent : Component
     [DataField("id")]
     public string CameraId = "camera";
 
+    /// <summary>
+    /// If true, instead of showing the camera id it will show the entity name
+    /// </summary>
+    [DataField]
+    public bool UseEntityNameAsCameraId = false;
+
     [DataField, AutoNetworkedField]
     public bool NameSet;
 
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 9980abc282..fbff177f89 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -328,6 +328,7 @@
     networkSet: true
     nameSet: True
     id: Xenoborg
+    useEntityNameAsCameraId: true
   - type: Explosive
     explosionType: Minibomb
     deleteAfterExplosion: false # let damage threshold gib the borg

From 0dd1a6708c2918b635aa1e0097531a46d3da3885 Mon Sep 17 00:00:00 2001
From: SomegnihT <145168694+SomegnihT@users.noreply.github.com>
Date: Wed, 7 Jan 2026 12:24:19 -0700
Subject: [PATCH 247/360] Vox now say they become fried chicken upon taking
 enough heat dmg (#42280)

* Made it so that vox now say they become fried chicken upon taking enough heat dmg

* updated a comment to be more clear

* changed the name of bodyburnvox-text-other to bodyburn-vox-text-other

* forgot that I needed to also update the text in vox.yml to go with the previous commit change

* BurnBodyBehavior now takes bodyburn-text-others as default

* fixed suggested changes

* Relized I forgot to do a suggested change, I have now done it

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs  | 7 ++++++-
 Resources/Locale/en-US/burning/bodyburn.ftl                | 1 +
 Resources/Prototypes/Entities/Mobs/Species/vox.yml         | 3 ++-
 Resources/Prototypes/Entities/Mobs/base.yml                | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
index 091a49b944..6a6947d97b 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -12,6 +12,11 @@ namespace Content.Server.Destructible.Thresholds.Behaviors;
 [DataDefinition]
 public sealed partial class BurnBodyBehavior : IThresholdBehavior
 {
+    /// <summary>
+    ///     The popup displayed upon destruction.
+    /// </summary>
+    [DataField]
+    public LocId PopupMessage = "bodyburn-text-others";
 
     public void Execute(EntityUid bodyId, DestructibleSystem system, EntityUid? cause = null)
     {
@@ -37,7 +42,7 @@ public sealed partial class BurnBodyBehavior : IThresholdBehavior
         }
         else
         {
-            sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyIdentity)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
+            sharedPopupSystem.PopupCoordinates(Loc.GetString(PopupMessage, ("name", bodyIdentity)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
         }
         // End Shitmed Changes
 
diff --git a/Resources/Locale/en-US/burning/bodyburn.ftl b/Resources/Locale/en-US/burning/bodyburn.ftl
index 929b2344cf..7387c2826a 100644
--- a/Resources/Locale/en-US/burning/bodyburn.ftl
+++ b/Resources/Locale/en-US/burning/bodyburn.ftl
@@ -1 +1,2 @@
 bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash!
+bodyburn-vox-text-others = {CAPITALIZE(THE($name))} turned into fried vox!
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 3adc024b56..4699ae9bb5 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -50,7 +50,8 @@
     #      FoodMeatChickenFriedVox:
     #        min: 3
     #        max: 5
-    #  - !type:BurnBodyBehavior { }
+    #  - !type:BurnBodyBehavior
+    #    popupMessage: bodyburn-vox-text-others
     #  - !type:PlaySoundBehavior
     #    sound:
     #      collection: MeatLaserImpact
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index e34de219a9..c43edfc744 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -80,7 +80,7 @@
         damage: 400
       behaviors:
       - !type:GibBehavior { }
-#    - trigger:                       # DeltaV- We don't like round removing people for being in the same room as a plasma trapped crate.
+#    - trigger: # DeltaV- We don't like round removing people for being in the same room as a plasma trapped crate.
 #        !type:DamageTypeTrigger
 #        damageType: Heat
 #        damage: 1500
@@ -91,7 +91,7 @@
 #          Ash:
 #            min: 1
 #            max: 1
-#      - !type:BurnBodyBehavior { }
+#      - !type:BurnBodyBehavior
 #      - !type:PlaySoundBehavior
 #        sound:
 #          collection: MeatLaserImpact

From 2b54519baa33dd3a8eb6dcd2ff828991fc73f41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Wed, 7 Jan 2026 15:49:24 -0600
Subject: [PATCH 248/360] Reorganize and clean Fun yml (#42184)

* don't look at this commit size i'm not proud

* self review

* more final changes

* more comments

* review

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Fun/{ => Figurines}/figurine_boxes.yml    |    0
 .../Objects/Fun/{ => Figurines}/figurines.yml |    0
 .../Fun/{ => Figurines}/mech_figurines.yml    |    0
 .../Fun/Instruments/base_instruments.yml      |    8 +-
 .../Fun/{ => Plushies}/plushielizard_jobs.yml |    2 +-
 .../Objects/Fun/{ => Plushies}/plushies.yml   |   74 ++
 .../Objects/Fun/Tabletop/backgammon.yml       |    6 +-
 .../Entities/Objects/Fun/Tabletop/base.yml    |   31 +-
 .../Objects/Fun/Tabletop/checkers.yml         |   24 +-
 .../Entities/Objects/Fun/Tabletop/chess.yml   |  100 +-
 .../Entities/Objects/Fun/Tabletop/dnd.yml     |   92 +-
 .../Entities/Objects/Fun/Tabletop/parchis.yml |    8 +-
 .../Objects/Fun/Tabletop/tabletopGeneric.yml  |   17 +-
 .../Entities/Objects/Fun/balloons.yml         |   61 +
 .../Entities/Objects/Fun/bike_horn.yml        |  234 ----
 .../Entities/Objects/Fun/crayons.yml          |   58 +-
 .../Prototypes/Entities/Objects/Fun/darts.yml |    6 +-
 .../Prototypes/Entities/Objects/Fun/dice.yml  |   43 +
 .../Entities/Objects/Fun/dice_bag.yml         |   40 -
 .../Prototypes/Entities/Objects/Fun/error.yml |   43 -
 .../Prototypes/Entities/Objects/Fun/orbs.yml  |  106 ++
 .../Prototypes/Entities/Objects/Fun/pai.yml   |    2 +
 .../Entities/Objects/Fun/puppet.yml           |   42 -
 .../Prototypes/Entities/Objects/Fun/skub.yml  |   38 -
 .../Entities/Objects/Fun/snap_pops.yml        |   62 -
 .../Entities/Objects/Fun/sound_maker.yml      |  495 +++++++
 .../Entities/Objects/Fun/spectral_locator.yml |   57 -
 .../Entities/Objects/Fun/sports.yml           |  159 +++
 .../Prototypes/Entities/Objects/Fun/toys.yml  | 1158 +++--------------
 .../Entities/Objects/Fun/weapons.yml          |  340 +++++
 .../Entities/Objects/Fun/whistles.yml         |   58 -
 .../Objects/{Fun => Magic}/immovable_rod.yml  |    4 +-
 .../Objects/{Fun => Misc}/candy_bucket.yml    |    2 +-
 .../Weapons/Guns/Launchers/launchers.yml      |   27 -
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |   36 -
 .../Prototypes/Entities/Objects/base_item.yml |   23 +
 36 files changed, 1654 insertions(+), 1802 deletions(-)
 rename Resources/Prototypes/Entities/Objects/Fun/{ => Figurines}/figurine_boxes.yml (100%)
 rename Resources/Prototypes/Entities/Objects/Fun/{ => Figurines}/figurines.yml (100%)
 rename Resources/Prototypes/Entities/Objects/Fun/{ => Figurines}/mech_figurines.yml (100%)
 rename Resources/Prototypes/Entities/Objects/Fun/{ => Plushies}/plushielizard_jobs.yml (100%)
 rename Resources/Prototypes/Entities/Objects/Fun/{ => Plushies}/plushies.yml (94%)
 create mode 100644 Resources/Prototypes/Entities/Objects/Fun/balloons.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/error.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Fun/orbs.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/puppet.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/skub.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Fun/sound_maker.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Fun/sports.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Fun/weapons.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Fun/whistles.yml
 rename Resources/Prototypes/Entities/Objects/{Fun => Magic}/immovable_rod.yml (100%)
 rename Resources/Prototypes/Entities/Objects/{Fun => Misc}/candy_bucket.yml (97%)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/Figurines/figurine_boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
rename to Resources/Prototypes/Entities/Objects/Fun/Figurines/figurine_boxes.yml
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/Figurines/figurines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Fun/figurines.yml
rename to Resources/Prototypes/Entities/Objects/Fun/Figurines/figurines.yml
diff --git a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/Figurines/mech_figurines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
rename to Resources/Prototypes/Entities/Objects/Fun/Figurines/mech_figurines.yml
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index d6bd2e949a..61b976c4d3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -23,10 +23,10 @@
 
 #These are for instruments that are larger, can't be picked up, or have collision
 - type: entity
-  name: baseinstrument
-  id: BasePlaceableInstrument
-  parent: BaseStructureDynamic
   abstract: true
+  parent: BaseStructureDynamic
+  id: BasePlaceableInstrument
+  name: baseinstrument
   components:
   - type: Instrument
   - type: ActivatableUI
@@ -73,10 +73,10 @@
   - type: RequireProjectileTarget
 
 - type: entity
+  abstract: true
   parent: BasePlaceableInstrument
   id: BasePlaceableInstrumentRotatable
   name: baseinstrumentrotatable
-  abstract: true
   components:
   - type: Rotatable
     rotateWhileAnchored: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml
rename to Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml
index 7639579139..8690533d03 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml
@@ -1,8 +1,8 @@
 # This base is created so we don't have to define the different sprite path for each plushie job.
 - type: entity
+  abstract: true
   parent: PlushieLizard
   id: BasePlushieLizardJob
-  abstract: true
   components:
   - type: Sprite
     sprite: Objects/Fun/plushielizard_jobs.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Objects/Fun/plushies.yml
rename to Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml
index 6336b69f71..a6d19a76d1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml
@@ -1243,3 +1243,77 @@
   - type: FoodSequenceElement
     entries:
       CottonBurger: PlushieVulp
+
+- type: entity
+  parent: BasePlushie
+  id: ToyIan
+  name: ian toy
+  description: Unable to eat, but just as fluffy as the real guy!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toy_ian.rsi
+    state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/toy_ian.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.06"
+  - type: Item
+    size: Tiny
+  - type: EmitSoundOnUse
+    sound: &SoundIan
+  - type: EmitSoundOnLand
+    sound: *SoundIan
+  - type: EmitSoundOnActivate
+    sound: *SoundIan
+  - type: EmitSoundOnTrigger
+    sound: *SoundIan
+  - type: EmitSoundOnCollide
+    sound: *SoundIan
+  - type: MeleeWeapon
+    soundHit: *SoundIan
+  - type: Edible
+    useSound: *SoundIan
+  - type: FoodSequenceElement
+    entries:
+      CottonBurger: IanPlushie
+
+- type: entity
+  parent: BasePlushie
+  id: ToyAmongPequeno
+  name: among pequeño
+  description: Sus!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/pequeno.rsi
+    layers:
+    - state: base
+      map: [ "enum.DamageStateVisualLayers.Base" ]
+    - state: visor
+  - type: Clothing
+    sprite: Objects/Fun/pequeno.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET-body
+      - state: equipped-HELMET-vis
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-body
+      - state: inhand-left-vis
+      right:
+      - state: inhand-right-body
+      - state: inhand-right-vis
+  - type: RandomSprite
+    available:
+    - enum.DamageStateVisualLayers.Base:
+        base: Sixteen
+#  - type: FoodSequenceElement - does not work with randomized sprites
+#    entries:
+#      CottonBurger: AmongPequeno
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
index 965b25dbc0..9eb178c132 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
@@ -12,12 +12,12 @@
     size: 550, 410
     setup:
       !type:TabletopBackgammonSetup
-      boardPrototype: BackgammonBoardTabletop
+      boardPrototype: &BackgammonBoard BackgammonBoardTabletop
 
 - type: entity
-  id: BackgammonBoardTabletop
-  name: backgammon
   parent: BaseBoardTabletop
+  id: *BackgammonBoard
+  name: backgammon
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
index f9ef69b1d1..5629aee022 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
@@ -1,38 +1,39 @@
+# When adding a new board game, also add it to id: AllBoardGamesTable
+
+# The actual item that players can pick up, or throw when they lose
 - type: entity
+  abstract: true
   parent: BaseItem
   id: BaseBoardEntity # Board item
   name: board
-  abstract: true
   description: A blank board.
   components:
-    - type: TabletopGame
-      size: 256, 256
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: Crowbar
-    - type: Tag
-      tags:
-        - TabletopBoard
+  - type: TabletopGame
+    size: 256, 256
+    setup:
+      !type:TabletopEmptySetup
+      boardPrototype: Crowbar
+  - type: Tag
+    tags:
+    - TabletopBoard
 
 - type: entity
-  id: BaseTabletopPiece # Board piece
-  parent: BaseItem
   abstract: true
+  parent: BaseItem
+  id: BaseTabletopPiece # Board piece
   components:
   - type: TabletopDraggable
   - type: Sprite
     noRot: true
   - type: Appearance
 
+# Entity which acts as the background sprite in the tabletop game
 - type: entity
+  abstract: true
   id: BaseBoardTabletop
   name: baseboard
-  abstract: true
   categories: [ HideSpawnMenu ]
   components:
-  - type: Tag
-    tags:
-      - TabletopBoard
   - type: Sprite
     noRot: false
     drawdepth: FloorTiles
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
index 6c206ca26f..20daf02291 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
@@ -36,33 +36,33 @@
   name: white checker piece
   parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/checker_pieces.rsi
-      state: w_checker_piece
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/checker_pieces.rsi
+    state: w_checker_piece
 
 - type: entity
   id: *crownWhite
   name: white checker crown
   parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/checker_pieces.rsi
-      state: w_checker_crown
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/checker_pieces.rsi
+    state: w_checker_crown
 
 - type: entity
   id: *pieceBlack
   name: black checker piece
   parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/checker_pieces.rsi
-      state: b_checker_piece
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/checker_pieces.rsi
+    state: b_checker_piece
 
 - type: entity
   id: *crownBlack
   name: black checker crown
   parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/checker_pieces.rsi
-      state: b_checker_crown
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/checker_pieces.rsi
+    state: b_checker_crown
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
index aeba3918c4..6a2793fedd 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
@@ -1,5 +1,4 @@
-# Chessboard item (normal in game item you can hold in your hand)
-- type: entity
+- type: entity
   parent: BaseBoardEntity
   id: ChessBoard
   name: chessboard
@@ -13,13 +12,12 @@
     size: 338, 274
     setup:
       !type:TabletopChessSetup
-      boardPrototype: ChessBoardTabletop
+      boardPrototype: &ChessBoard ChessBoardTabletop
 
-# Chessboard tabletop item (item only visible in tabletop game)
 - type: entity
-  id: ChessBoardTabletop
-  name: chessboard
   parent: BaseBoardTabletop
+  id: *ChessBoard
+  name: chessboard
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
@@ -28,110 +26,110 @@
 
 # White pieces
 - type: entity
+  parent: BaseTabletopPiece
   id: WhiteKing
   name: white king
-  parent: BaseTabletopPiece
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/chess_pieces.rsi
     state: w_king
 
 - type: entity
+  parent: BaseTabletopPiece
   id: WhiteQueen
   name: white queen
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: w_queen
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: w_queen
 
 - type: entity
+  parent: BaseTabletopPiece
   id: WhiteRook
   name: white rook
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: w_rook
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: w_rook
 
 - type: entity
+  parent: BaseTabletopPiece
   id: WhiteBishop
   name: white bishop
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: w_bishop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: w_bishop
 
 - type: entity
+  parent: BaseTabletopPiece
   id: WhiteKnight
   name: white knight
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: w_knight
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: w_knight
 
 - type: entity
+  parent: BaseTabletopPiece
   id: WhitePawn
   name: white pawn
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: w_pawn
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: w_pawn
 
 # Black pieces
 - type: entity
+  parent: BaseTabletopPiece
   id: BlackKing
   name: black king
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: b_king
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: b_king
 
 - type: entity
+  parent: BaseTabletopPiece
   id: BlackQueen
   name: black queen
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: b_queen
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: b_queen
 
 - type: entity
+  parent: BaseTabletopPiece
   id: BlackRook
   name: black rook
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: b_rook
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: b_rook
 
 - type: entity
+  parent: BaseTabletopPiece
   id: BlackBishop
   name: black bishop
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: b_bishop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: b_bishop
 
 - type: entity
+  parent: BaseTabletopPiece
   id: BlackKnight
   name: black knight
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: b_knight
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: b_knight
 
 - type: entity
+  parent: BaseTabletopPiece
   id: BlackPawn
   name: black pawn
-  parent: BaseTabletopPiece
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/chess_pieces.rsi
-      state: b_pawn
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/chess_pieces.rsi
+    state: b_pawn
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
index 9b00ef5e01..6eb38c66b7 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
@@ -1,19 +1,17 @@
-# Board item (given to players)
+# When adding a new battlemap, also add it to id: AllBattlemapsTable
+
+# Board item (given to players)
 - type: entity
+  abstract: true
   parent: BaseBoardEntity
   id: BaseBattlemap
   name: battlemap
-  abstract: true
   description: A battlemap for your epic dungeon exploring to begin, pieces not included!
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/grassbm.rsi
-      state: icon
-    - type: TabletopGame
-      boardName: tabletop-battlemap-board-name
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: GrassBoardTabletop
+  - type: Sprite
+    state: icon
+  - type: TabletopGame
+    boardName: tabletop-battlemap-board-name
 
 - type: entity
   parent: BaseBattlemap
@@ -21,12 +19,12 @@
   name: grass battlemap
   description: A battlemap for your epic dungeon exploring to begin, pieces not included!
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/Battlemaps/grassbm.rsi
-    - type: TabletopGame
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: GrassBoardTabletop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/Battlemaps/grassbm.rsi
+  - type: TabletopGame
+    setup:
+      !type:TabletopEmptySetup
+      boardPrototype: &GrassBoard GrassBoardTabletop
 
 - type: entity
   parent: BaseBattlemap
@@ -34,12 +32,12 @@
   name: moon battlemap
   description: A battlemap for your epic moon exploring to begin, pieces not included!
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/Battlemaps/moonbm.rsi
-    - type: TabletopGame
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: MoonBoardTabletop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/Battlemaps/moonbm.rsi
+  - type: TabletopGame
+    setup:
+      !type:TabletopEmptySetup
+      boardPrototype: &MoonBoard MoonBoardTabletop
 
 - type: entity
   parent: BaseBattlemap
@@ -47,12 +45,12 @@
   name: sand battlemap
   description: A battlemap for your epic beach episodes to begin, pieces not included!
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/Battlemaps/sandbm.rsi
-    - type: TabletopGame
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: SandBoardTabletop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/Battlemaps/sandbm.rsi
+  - type: TabletopGame
+    setup:
+      !type:TabletopEmptySetup
+      boardPrototype: &SandBoard SandBoardTabletop
 
 - type: entity
   parent: BaseBattlemap
@@ -60,12 +58,12 @@
   name: snow battlemap
   description: A battlemap for your frigid exploring to begin, pieces not included! # if this isn't funny enough i can remove it
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/Battlemaps/snowbm.rsi
-    - type: TabletopGame
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: SnowBoardTabletop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/Battlemaps/snowbm.rsi
+  - type: TabletopGame
+    setup:
+      !type:TabletopEmptySetup
+      boardPrototype: &SnowBoard SnowBoardTabletop
 
 - type: entity
   parent: BaseBattlemap
@@ -73,30 +71,28 @@
   name: ship battlemap
   description: A battlemap for your epic space exploring to begin, pieces not included!
   components:
-    - type: Sprite
-      sprite: Objects/Fun/Tabletop/Battlemaps/shipbm.rsi
-    - type: TabletopGame
-      size: 543, 543
-      setup:
-        !type:TabletopEmptySetup
-        boardPrototype: ShipBoardTabletop
+  - type: Sprite
+    sprite: Objects/Fun/Tabletop/Battlemaps/shipbm.rsi
+  - type: TabletopGame
+    size: 543, 543
+    setup:
+      !type:TabletopEmptySetup
+      boardPrototype: &ShipBoard ShipBoardTabletop
 
 # Background entity (actually shown in the board)
 - type: entity
   parent: BaseBoardTabletop
-  id: GrassBoardTabletop
+  id: *GrassBoard
   name: grass battlemap
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi
     state: tabletop
-    noRot: false
-    drawdepth: FloorTiles
 
 - type: entity
   parent: BaseBoardTabletop
-  id: MoonBoardTabletop
+  id: *MoonBoard
   name: grass battlemap
   categories: [ HideSpawnMenu ]
   components:
@@ -106,7 +102,7 @@
 
 - type: entity
   parent: BaseBoardTabletop
-  id: SandBoardTabletop
+  id: *SandBoard
   name: sand battlemap
   categories: [ HideSpawnMenu ]
   components:
@@ -116,7 +112,7 @@
 
 - type: entity
   parent: BaseBoardTabletop
-  id: SnowBoardTabletop
+  id: *SnowBoard
   name: snow battlemap
   categories: [ HideSpawnMenu ]
   components:
@@ -126,7 +122,7 @@
 
 - type: entity
   parent: BaseBoardTabletop
-  id: ShipBoardTabletop
+  id: *ShipBoard
   name: ship battlemap
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
index b608f4e787..17e4f3392a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
@@ -1,4 +1,3 @@
-# Parchís board item (normal in game item you can hold in your hand)
 - type: entity
   parent: BaseBoardEntity
   id: ParchisBoard
@@ -13,13 +12,12 @@
     size: 574, 574
     setup:
       !type:TabletopParchisSetup
-      boardPrototype: ParchisBoardTabletop
+      boardPrototype: &ParchisBoard ParchisBoardTabletop
 
-# Parchís tabletop item (item only visible in tabletop game)
 - type: entity
-  id: ParchisBoardTabletop
-  name: parchís
   parent: BaseBoardTabletop
+  id: *ParchisBoard
+  name: parchís
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml
index 120112b9de..1d16f02fa5 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml
@@ -1,56 +1,55 @@
 - type: entity
-  id: BaseGenericTabletopPiece
-  parent: BaseTabletopPiece
   abstract: true
+  parent: BaseTabletopPiece
+  id: BaseGenericTabletopPiece
   components:
   - type: Sprite
-    noRot: true
     sprite: Objects/Fun/Tabletop/generic_pieces.rsi
 
 - type: entity
+  parent: BaseGenericTabletopPiece
   id: RedTabletopPiece
   name: red piece
-  parent: BaseGenericTabletopPiece
   components:
   - type: Sprite
     state: red
 
 - type: entity
+  parent: BaseGenericTabletopPiece
   id: GreenTabletopPiece
   name: green piece
-  parent: BaseGenericTabletopPiece
   components:
   - type: Sprite
     state: green
 
 - type: entity
+  parent: BaseGenericTabletopPiece
   id: YellowTabletopPiece
   name: yellow piece
-  parent: BaseGenericTabletopPiece
   components:
   - type: Sprite
     state: yellow
 
 - type: entity
+  parent: BaseGenericTabletopPiece
   id: BlueTabletopPiece
   name: blue piece
-  parent: BaseGenericTabletopPiece
   components:
   - type: Sprite
     state: blue
 
 - type: entity
+  parent: BaseGenericTabletopPiece
   id: WhiteTabletopPiece
   name: white piece
-  parent: BaseGenericTabletopPiece
   components:
   - type: Sprite
     state: white
 
 - type: entity
+  parent: BaseGenericTabletopPiece
   id: BlackTabletopPiece
   name: black piece
-  parent: BaseGenericTabletopPiece
   components:
   - type: Sprite
     state: black
diff --git a/Resources/Prototypes/Entities/Objects/Fun/balloons.yml b/Resources/Prototypes/Entities/Objects/Fun/balloons.yml
new file mode 100644
index 0000000000..f5193896a0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/balloons.yml
@@ -0,0 +1,61 @@
+# When adding new balloons, also add it to id: AllMiscToysTable
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseBalloon
+  components:
+  - type: Sprite
+    noRot: true
+  - type: Item
+    size: Small
+  - type: EmitSoundOnCollide
+    sound: &SoundBalloonHit
+      path: /Audio/Effects/balloon_hits.ogg
+  - type: EmitSoundOnLand
+    sound: *SoundBalloonHit
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: TileFrictionModifier
+    modifier: 0.3
+  - type: Tag
+    tags:
+    - Balloon
+
+- type: entity
+  parent: BaseBalloon
+  id: BalloonSyn
+  name: syndie balloon
+  description: Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balloons/syndicate.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Balloons/syndicate.rsi
+  - type: StaticPrice
+    price: 100 # Entertainment.
+
+- type: entity
+  parent: BaseBalloon
+  id: BalloonNT
+  name: nanotrasen balloon
+  description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balloons/nanotrasen.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Balloons/nanotrasen.rsi
+
+- type: entity
+  parent: BaseBalloon
+  id: BalloonCorgi
+  name: corgi balloon
+  description: Just like owning a real dog - but a lot floatier.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balloons/corgi.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Balloons/corgi.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
deleted file mode 100644
index e7efa14dc4..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ /dev/null
@@ -1,234 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: BikeHorn
-  name: bike horn
-  description: A horn off of a bicycle.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/bikehorn.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/bikehorn.rsi
-    size: Tiny
-  - type: Clothing
-    sprite: Objects/Fun/bikehorn.rsi
-    slots: [Belt]
-    quickEquip: false
-  - type: UseDelay
-    delay: 0.5
-  - type: EmitSoundOnUse
-    sound:
-      collection: BikeHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnLand
-    sound:
-      collection: BikeHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnTrigger
-    sound:
-      collection: BikeHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnActivate
-    sound:
-      collection: BikeHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnCollide
-    sound:
-      collection: BikeHorn
-      params:
-        variation: 0.125
-  - type: Tag
-    tags:
-    - Payload # yes, you can make re-usable prank grenades
-    - BikeHorn
-  - type: MeleeWeapon
-    wideAnimationRotation: 135
-    soundHit:
-      collection: BikeHorn
-      params:
-        variation: 0.125
-    damage:
-      types:
-        Blunt: 0
-  - type: Tool
-    qualities:
-    - Honking
-    useSound:
-      collection: BikeHorn
-
-- type: entity
-  parent: BaseItem
-  id: CluwneHorn
-  name: broken bike horn
-  description: A broken horn off of a bicycle.
-  components:
-  - type: UseDelay
-  - type: Sprite
-    sprite: Objects/Fun/cluwnehorn.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/cluwnehorn.rsi
-    size: Tiny
-  - type: Clothing
-    sprite: Objects/Fun/cluwnehorn.rsi
-    slots: [Belt]
-    quickEquip: false
-  - type: Tag
-    tags:
-    - Payload # yes, you can make re-usable prank grenades
-    - CluwneHorn
-  - type: EmitSoundOnTrigger
-    sound:
-      collection: CluwneHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnUse
-    sound:
-      collection: CluwneHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnActivate
-    sound:
-      collection: CluwneHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnCollide
-    sound:
-      collection: CluwneHorn
-      params:
-        variation: 0.125
-  - type: EmitSoundOnLand
-    sound:
-      collection: CluwneHorn
-      params:
-        variation: 0.125
-  - type: MeleeWeapon
-    wideAnimationRotation: 135
-    soundHit:
-      collection: CluwneHorn
-      params:
-        variation: 0.125
-    damage:
-      types:
-        Blunt: 5
-
-
-- type: entity
-  parent: BikeHorn
-  id: GoldenBikeHorn
-  name: golden honker
-  categories: [ DoNotMap ]
-  description: A happy honk prize, pray to the gods for your reward.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/goldbikehorn.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/goldbikehorn.rsi
-    size: Tiny
-  - type: Clothing
-    sprite: Objects/Fun/goldbikehorn.rsi
-    slots: [Belt]
-  - type: Prayable
-  - type: StaticPrice
-    price: 100 # reduced price due to heisentests
-  - type: PointLight
-    radius: 1.2
-    energy: 2.2
-    castShadows: false
-    color: "#ffca1b"
-
-- type: entity
-  parent: BikeHorn
-  id: BananiumHorn
-  name: bananium horn
-  description: An air horn made from bananium.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/bananiumhorn.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/bananiumhorn.rsi
-    size: Small
-  - type: Clothing
-    sprite: Objects/Fun/bananiumhorn.rsi
-    slots: [Belt]
-    quickEquip: false
-  - type: UseDelay
-    delay: 3
-  - type: EmitSoundOnUse
-    sound:
-      collection: BananiumHorn
-      params:
-        variation: 0.246
-  - type: EmitSoundOnLand
-    sound:
-      collection: BananiumHorn
-      params:
-        variation: 0.246
-  - type: EmitSoundOnTrigger
-    sound:
-      collection: BananiumHorn
-      params:
-        variation: 0.246
-  - type: EmitSoundOnActivate
-    sound:
-      collection: BananiumHorn
-      params:
-        variation: 0.246
-  - type: EmitSoundOnCollide
-    sound:
-      collection: BananiumHorn
-      params:
-        variation: 0.246
-  - type: MeleeWeapon
-    wideAnimationRotation: 135
-    soundHit:
-      collection: BananiumHorn
-      params:
-        variation: 0.246
-    damage:
-      types:
-        Blunt: 0
-    hidden: true
-  - type: Construction
-    graph: BananiumHorn
-    node: bananiumHorn
-
-- type: entity
-  parent: BaseItem
-  id: PushHorn
-  name: push horn
-  description: This powerful bikehorn is sure to blast frowns away.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/push_horn.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/push_horn.rsi
-    size: Tiny
-  - type: Clothing
-    sprite: Objects/Fun/push_horn.rsi
-    slots: [Belt]
-    quickEquip: false
-  - type: EmitSoundOnUse
-    handle: false
-    sound: "/Audio/Items/Toys/pushHornHonk.ogg"
-  - type: EmitSoundOnLand
-    sound: "/Audio/Items/Toys/pushHornFloor.ogg"
-  - type: UseDelay
-    delay: 10
-  - type: TriggerOnUse
-  - type: RepulseAttractOnTrigger
-    speed: 50
-    range: 3.5
-    whitelist:
-      components:
-      - MobMover
-  - type: SpawnOnTrigger
-    proto: EffectGravityPulse
-    predicted: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 574d6953f2..2652a8c117 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -1,9 +1,11 @@
+# When adding new crayons, also add it to id: AllCrayonsTable
+
 - type: entity
   abstract: true
   parent: BaseItem
   id: CrayonInedible
   name: crayon
-  description: A colourful crayon. Looks tasty. Mmmm...
+  description: A colourful crayon. A forbidden flavor.
   components:
   - type: Sprite
     sprite: Objects/Fun/crayons.rsi
@@ -15,6 +17,7 @@
     - Write
     - Crayon
     - Trash
+    - Recyclable
   - type: SpaceGarbage
   - type: UserInterface
     interfaces:
@@ -31,17 +34,8 @@
   abstract: true
   parent: CrayonInedible
   id: Crayon
-  name: crayon
   description: A colourful crayon. Looks tasty. Mmmm...
   components:
-  - type: Sprite
-    sprite: Objects/Fun/crayons.rsi
-  - type: Item
-    sprite: Objects/Fun/crayons.rsi
-    size: Tiny
-  - type: Tag
-    tags:
-    - Recyclable
   - type: Edible
   - type: FlavorProfile
     flavors:
@@ -56,24 +50,7 @@
         - ReagentId: MindbreakerToxin
           Quantity: 2
 
-- type: entity
-  parent: Crayon
-  id: CrayonWhite
-  name: white crayon
-  components:
-  - type: Sprite
-    state: white
-  - type: Item
-    heldPrefix: white
-  - type: Crayon
-    color: white
-  - type: Tag
-    tags:
-    - Write
-    - Crayon
-    - CrayonWhite
-    - Recyclable
-    - Trash
+# special crayons
 
 - type: entity
   parent: Crayon
@@ -108,16 +85,11 @@
     selectableColor: true
   - type: LimitedCharges
     maxCharges: 30
-  - type: Tag
-    tags:
-    - Write
-    - Crayon
-    - Recyclable
-    - Trash
 
 - type: entity
   parent: CrayonRainbow
   id: CrayonInfinite # should not be player available to prevent decal spam
+  categories: [ DoNotMap ]
   name: infinite crayon
   components:
   - type: Crayon
@@ -139,14 +111,28 @@
     deleteEmpty: false
     color: Red
     selectableColor: true
-  - type: LimitedCharges
-    maxCharges: 30
   - type: AutoRecharge
     rechargeDuration: 5
+
+# monocolor crayons
+
+- type: entity
+  parent: Crayon
+  id: CrayonWhite
+  name: white crayon
+  components:
+  - type: Sprite
+    state: white
+  - type: Item
+    heldPrefix: white
+  - type: Crayon
+    color: white
   - type: Tag
     tags:
     - Write
     - Crayon
+    - CrayonWhite
+    - Recyclable
     - Trash
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 4230a36108..0890fcffd5 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: dart
-  description: Light throwing dart for playing darts. Don't get in the eye!
   parent: BaseItem
   id: Dart
+  name: dart
+  description: Light throwing dart for playing darts. Don't get in the eye!
   components:
   - type: EmbeddableProjectile
     minimumSpeed: 3
@@ -66,7 +66,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 30 #excess damage avoids cost of spawning entities.
+        damage: 50 #excess damage avoids cost of spawning entities.
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 132f92212e..ff6cc22792 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -133,3 +133,46 @@
       types:
         Piercing: 5
     # I love this
+
+# bags
+
+- type: entity
+  parent: BaseStorageItem
+  id: DiceBag
+  name: bag of dice
+  description: Contains all the luck you'll ever need.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: d4Dice
+        - id: d6Dice
+        - id: d8Dice
+        - id: d10Dice
+        - id: d12Dice
+        - id: d20Dice
+        - id: PercentileDie
+  - type: Sprite
+    sprite: Objects/Fun/dice.rsi
+    state: dicebag
+  - type: Item
+    size: Small
+  - type: Storage
+    grid:
+    - 0,0,3,1
+    whitelist:
+      tags:
+      - Dice
+
+- type: entity
+  parent: DiceBag
+  id: MagicDiceBag
+  name: bag of dice
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/dice.rsi
+    state: magicdicebag
+  - type: Storage
+    grid:
+    - 0,0,4,3
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
deleted file mode 100644
index 41cea1412c..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- type: entity
-  parent: BaseStorageItem
-  id: DiceBag
-  name: bag of dice
-  description: Contains all the luck you'll ever need.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: d4Dice
-        - id: d6Dice
-        - id: d8Dice
-        - id: d10Dice
-        - id: d12Dice
-        - id: d20Dice
-        - id: PercentileDie
-  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
-    state: dicebag
-  - type: Item
-    size: Small
-  - type: Storage
-    grid:
-    - 0,0,3,1
-    whitelist:
-      tags:
-      - Dice
-
-- type: entity
-  parent: DiceBag
-  id: MagicDiceBag
-  name: bag of dice
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/dice.rsi
-    state: magicdicebag
-  - type: Storage
-    grid:
-    - 0,0,4,3
diff --git a/Resources/Prototypes/Entities/Objects/Fun/error.yml b/Resources/Prototypes/Entities/Objects/Fun/error.yml
deleted file mode 100644
index 75507e69f3..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/error.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: Error
-  name: error
-  description: Hmmmm. Something went wrong.
-  components:
-  - type: Sprite
-    sprite: error.rsi
-    state: error
-  - type: Edible
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 26
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
-  - type: Slippery
-    slipData:
-      knockdownTime: 3
-      launchForwardsMultiplier: 3
-  - type: StepTrigger
-    intersectRatio: 0.2
-  - type: CollisionWake
-    enabled: false
-  - type: Physics
-    bodyType: Dynamic
-  - type: Fixtures
-    fixtures:
-      slips:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.4,-0.3,0.4,0.3"
-        hard: false
-        layer:
-        - SlipLayer
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.4,-0.3,0.4,0.3"
-        density: 30
-        mask:
-        - ItemMask
diff --git a/Resources/Prototypes/Entities/Objects/Fun/orbs.yml b/Resources/Prototypes/Entities/Objects/Fun/orbs.yml
new file mode 100644
index 0000000000..d155453186
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/orbs.yml
@@ -0,0 +1,106 @@
+# When adding new orbs, also add it to id: AllMiscToysTable
+# Spherical objects of incredible* powers
+
+# Do not make this easily obtainable because if more than 6 of them are on the screen
+# at the same time it will break the distortion shader.
+- type: entity
+  parent: BaseItem
+  id: SingularityToy
+  name: singuloth-brand toy
+  description: Mass-produced by a sadistic corporate conglomerate!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toy_singularity.rsi
+    state: icon
+  - type: Icon
+    sprite: Objects/Fun/toy_singularity.rsi
+    state: icon
+  - type: SingularityDistortion
+    intensity: 25
+    falloffPower: 2.6
+  - type: Item
+    size: Normal
+    inhandVisuals:
+      left:
+      - state: singu-inhand-left
+        shader: unshaded
+      right:
+      - state: singu-inhand-right
+        shader: unshaded
+
+- type: entity
+  parent: BaseItem
+  id: TeslaToy
+  name: Teddy Tesla
+  description: The favorite toy of the great engineer Nikola Tesla.
+  components:
+  - type: Sprite
+    sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
+    layers:
+    - state: tesla_projectile
+      shader: unshaded
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: tesla-inhand-left
+        shader: unshaded
+      right:
+      - state: tesla-inhand-right
+        shader: unshaded
+  - type: PointLight
+    enabled: true
+    radius: 5
+    color: "#4080FF"
+  - type: Electrified
+    shockDamage: 2
+    shockTime: 0.8
+    requirePower: false
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/Lightning/lightningshock.ogg
+      params:
+        variation: 0.65
+        volume: -10
+
+- type: entity
+  parent: [ BaseItem, BaseMagicalContraband ]
+  id: PonderingOrb
+  name: pondering orb
+  description: Ponderous, man... Really ponderous.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/pondering_orb.rsi
+    layers:
+    - state: icon
+      shader: unshaded
+  - type: PointLight
+    radius: 2
+    color: "#00CCFF"
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/pondering_orb.rsi
+  - type: TileFrictionModifier
+    modifier: 0.001
+
+# The true orb
+- type: entity
+  parent: PonderingOrb
+  id: PonderingOrbWizard
+  name: pondering orb
+  description: Ponderous, man... Really ponderous. Magically shows the station's camera network.
+  suffix: Wizard
+  components:
+  - type: ActivatableUI
+    requireActiveHand: false
+    inHandsOnly: true
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.SurveillanceCameraMonitorUiKey.Key:
+        type: SurveillanceCameraMonitorBoundUserInterface
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: SurveillanceCameraMonitor
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 46c7aa93f9..0053bcf725 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -188,6 +188,8 @@
     graph: PotatoAI
     node: potatoai
 
+# PAI Actions
+
 - type: entity
   parent: ActionIntrinsicStore
   id: ActionPAIOpenShop
diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
deleted file mode 100644
index 01a15d2e5b..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-- type: entity
-  parent: [ BaseItem, MobCombat ]
-  id: MrChips
-  name: mr chips
-  suffix: Dummy
-  description: It's a dummy, dummy!
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/mrchips.rsi
-    layers:
-    - state: icon
-  - type: Input
-    context: "human"
-  - type: DoAfter
-  - type: VentriloquistPuppet
-  - type: Item
-    size: Normal
-  - type: Muted
-  - type: TypingIndicator
-    proto: robot
-  - type: Actions
-  - type: MobState
-    allowedStates:
-      - Alive
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Weapons/boxingpunch1.ogg
-    angle: 30
-    animation: WeaponArcPunch
-    damage:
-      types:
-        Blunt: 2
-
-- type: entity
-  parent: MrChips
-  id: MrDips
-  name: mr dips
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/mrdips.rsi
-    layers:
-    - state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/skub.yml b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
deleted file mode 100644
index ce73d4f3ef..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: Skub
-  name: skub
-  description: Skub is the fifth Chaos God.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/skub.rsi
-    state: icon
-  - type: Tag
-    tags:
-      - Payload
-  - type: Item
-    sprite: Objects/Misc/skub.rsi
-  - type: EmitSoundOnUse
-    sound:
-      collection: Skub
-  - type: EmitSoundOnLand
-    sound:
-      collection: Skub
-  - type: EmitSoundOnTrigger
-    sound:
-      collection: Skub
-  - type: EmitSoundOnActivate
-    sound:
-      collection: Skub
-  - type: EmitSoundOnCollide
-    sound:
-      collection: Skub
-  - type: MeleeWeapon
-    soundHit:
-      collection: Skub
-    damage:
-      types:
-        Blunt: 0
-    hidden: true
-  - type: UseDelay
-    delay: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
deleted file mode 100644
index 4392103805..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: SnapPop
-  name: snap pop
-  description: Throw it at the floor and listen to it POP!
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/snap_pops.rsi
-    state: icon
-  - type: Item
-    size: Tiny
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/snap.ogg
-      - !type:ExplodeBehavior
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 3
-  - type: Explosive
-    explosionType: Default
-    # Cosmetic explosion :tf:
-    maxIntensity: 0.01
-    intensitySlope: 1
-    totalIntensity: 0.01
-  - type: Construction
-    graph: SnapPopExplosiveGraph
-    node: snapPop
-
-- type: entity
-  parent: BaseStorageItem
-  id: SnapPopBox
-  name: snap pop box
-  description: Contains snap pops for a few minutes of popping fun!
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: Objects/Fun/snap_pops.rsi
-    state: box
-  - type: Storage
-    grid:
-    - 0,0,4,3
-    areaInsert: true
-    maxItemSize: Tiny
-  - type: EntityTableContainerFill
-    containers:
-      storagebase:
-        id: SnapPop
-        amount: 5
-  - type: Dumpable
-
diff --git a/Resources/Prototypes/Entities/Objects/Fun/sound_maker.yml b/Resources/Prototypes/Entities/Objects/Fun/sound_maker.yml
new file mode 100644
index 0000000000..d5d9c29bd9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/sound_maker.yml
@@ -0,0 +1,495 @@
+# When adding new sound makers, also add it to id: AllToySoundMakerTable
+# These entities exist to make a (funny) sound and not much else
+
+## Bike horns
+
+- type: entity
+  parent: BaseItem
+  id: BikeHorn
+  name: bike horn
+  description: A horn off of a bicycle.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/bikehorn.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/bikehorn.rsi
+    size: Tiny
+  - type: Clothing
+    sprite: Objects/Fun/bikehorn.rsi
+    slots: [Belt]
+    quickEquip: false
+  - type: UseDelay
+    delay: 0.5
+  - type: EmitSoundOnUse
+    sound: &SoundBikeHorn
+      collection: BikeHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnLand
+    sound: *SoundBikeHorn
+  - type: EmitSoundOnTrigger
+    sound: *SoundBikeHorn
+  - type: EmitSoundOnActivate
+    sound: *SoundBikeHorn
+  - type: EmitSoundOnCollide
+    sound: *SoundBikeHorn
+  - type: Tag
+    tags:
+    - Payload # yes, you can make re-usable prank grenades
+    - BikeHorn
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    soundHit: *SoundBikeHorn
+    damage:
+      types:
+        Blunt: 0
+  - type: Tool
+    qualities:
+    - Honking
+    useSound: *SoundBikeHorn
+
+- type: entity
+  parent: BaseItem
+  id: CluwneHorn
+  name: broken bike horn
+  description: A broken horn off of a bicycle.
+  components:
+  - type: UseDelay
+  - type: Sprite
+    sprite: Objects/Fun/cluwnehorn.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/cluwnehorn.rsi
+    size: Tiny
+  - type: Clothing
+    sprite: Objects/Fun/cluwnehorn.rsi
+    slots: [Belt]
+    quickEquip: false
+  - type: Tag
+    tags:
+    - Payload # yes, you can make re-usable prank grenades
+    - CluwneHorn
+  - type: EmitSoundOnTrigger
+    sound: &SoundCluwneHorn
+      collection: CluwneHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnUse
+    sound: *SoundCluwneHorn
+  - type: EmitSoundOnActivate
+    sound: *SoundCluwneHorn
+  - type: EmitSoundOnCollide
+    sound: *SoundCluwneHorn
+  - type: EmitSoundOnLand
+    sound: *SoundCluwneHorn
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    soundHit: *SoundCluwneHorn
+    damage:
+      types:
+        Blunt: 5
+
+- type: entity
+  parent: BikeHorn
+  id: GoldenBikeHorn
+  name: golden honker
+  description: A happy honk prize, pray to the gods for your reward.
+  categories: [ DoNotMap ]
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/goldbikehorn.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/goldbikehorn.rsi
+    size: Tiny
+  - type: Clothing
+    sprite: Objects/Fun/goldbikehorn.rsi
+    slots: [Belt]
+  - type: Prayable
+  - type: StaticPrice
+    price: 100 # reduced price due to heisentests
+  - type: PointLight
+    radius: 1.2
+    energy: 2.2
+    castShadows: false
+    color: "#ffca1b"
+
+- type: entity
+  parent: BikeHorn
+  id: BananiumHorn
+  name: bananium horn
+  description: An air horn made from bananium.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/bananiumhorn.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/bananiumhorn.rsi
+    size: Small
+  - type: Clothing
+    sprite: Objects/Fun/bananiumhorn.rsi
+    slots: [Belt]
+    quickEquip: false
+  - type: UseDelay
+    delay: 3
+  - type: EmitSoundOnUse
+    sound: &SoundBananiumHorn
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+  - type: EmitSoundOnLand
+    sound: *SoundBananiumHorn
+  - type: EmitSoundOnTrigger
+    sound: *SoundBananiumHorn
+  - type: EmitSoundOnActivate
+    sound: *SoundBananiumHorn
+  - type: EmitSoundOnCollide
+    sound: *SoundBananiumHorn
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    soundHit: *SoundBananiumHorn
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
+  - type: Construction
+    graph: BananiumHorn
+    node: bananiumHorn
+  - type: Tool
+    useSound: *SoundBananiumHorn
+
+- type: entity
+  parent: BaseItem
+  id: PushHorn
+  name: push horn
+  description: This powerful bikehorn is sure to blast frowns away.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/push_horn.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/push_horn.rsi
+    size: Tiny
+  - type: Clothing
+    sprite: Objects/Fun/push_horn.rsi
+    slots: [Belt]
+    quickEquip: false
+  - type: EmitSoundOnUse
+    handle: false
+    sound: "/Audio/Items/Toys/pushHornHonk.ogg"
+  - type: EmitSoundOnLand
+    sound: "/Audio/Items/Toys/pushHornFloor.ogg"
+  - type: UseDelay
+    delay: 10
+  - type: TriggerOnUse
+  - type: RepulseAttractOnTrigger
+    speed: 50
+    range: 3.5
+    whitelist:
+      components:
+      - MobMover
+  - type: SpawnOnTrigger
+    proto: EffectGravityPulse
+    predicted: true
+
+## Whistles
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseWhistle
+  name: whistle
+  description: Someone forgot to turn off a kettle?
+  components:
+  - type: Item
+    sprite: Objects/Fun/whistles.rsi
+    size: Tiny
+  - type: Sprite
+    sprite: Objects/Fun/whistles.rsi
+  - type: Clothing
+    sprite: Objects/Fun/whistles.rsi
+    quickEquip: false
+    slots: neck
+  - type: UseDelay
+    delay: 3
+  - type: EmitSoundOnUse
+    sound:
+      collection: BaseWhistle
+  - type: Whistle
+    distance: 3
+
+- type: entity
+  parent: BaseWhistle
+  id: Whistle
+  components:
+  - type: Sprite
+    state: whistle
+
+- type: entity
+  parent: BaseWhistle
+  id: SecurityWhistle
+  description: The sound of it brings fear.
+  components:
+  - type: Sprite
+    state: whistle # DeltaV - replace sec with whistle
+  - type: Clothing
+    equippedPrefix: whistle # DeltaV - replace sec with whistle
+  - type: Whistle
+    distance: 5
+
+- type: entity
+  parent: [BaseWhistle, BaseMinorContraband]
+  id: SyndicateWhistle
+  name: trench whistle
+  description: A whistle used by Syndicate commanders to draw attention. Avanti!
+  components:
+  - type: Sprite
+    state: trench
+  - type: Clothing
+    equippedPrefix: trench
+  - type: EmitSoundOnUse
+    sound:
+      collection: TrenchWhistle
+  - type: Whistle
+    distance: 15 # Let your enemies hear the sound of death approaching
+
+## Other
+
+- type: entity
+  abstract: true
+  parent: [BaseItem, BaseStash]
+  id: BaseRubberToy
+  components:
+  - type: Tag
+    tags:
+    - Payload
+  - type: UseDelay
+    delay: 1.0
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit:
+      collection: ToySqueak
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 25
+  - type: StaticPrice
+    price: 5
+
+- type: entity
+  parent: BaseRubberToy
+  id: ToyRubberDuck
+  name: rubber ducky
+  description: Not carried here by ocean currents.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/ducky.rsi
+    state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/ducky.rsi
+    slots:
+    - HEAD
+  - type: Item
+    size: Tiny
+  - type: EmitSoundOnUse
+    sound: &SoundQuack
+      path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnLand
+    sound: *SoundQuack
+  - type: EmitSoundOnActivate
+    sound: *SoundQuack
+  - type: EmitSoundOnTrigger
+    sound: *SoundQuack
+  - type: EmitSoundOnCollide
+    sound: *SoundQuack
+  - type: MeleeWeapon
+    soundHit: *SoundQuack
+  - type: Tag
+    tags:
+    - ToyRubberDuck
+
+- type: entity
+  parent: BaseRubberToy
+  id: RubberChicken
+  name: rubber chicken
+  description: A stress inducing parody of nature's most delectable avian.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/rubber_chicken.rsi
+    state: icon
+  - type: Speech # DeltaV - chicken pai makes evil sound
+    speechSounds: RubberChicken
+  - type: EmitSoundOnUse
+    sound: &SoundRubberChicken
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: EmitSoundOnLand
+    sound: *SoundRubberChicken
+  - type: EmitSoundOnActivate
+    sound: *SoundRubberChicken
+  - type: EmitSoundOnCollide
+    sound: *SoundRubberChicken
+  - type: EmitSoundOnTrigger
+    sound: *SoundRubberChicken
+  - type: MeleeWeapon
+    wideAnimationRotation: 110
+    soundHit: *SoundRubberChicken
+
+- type: entity
+  parent: BaseItem
+  id: NewtonCradle
+  name: newton cradle
+  description: A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/newton_cradle.rsi
+    state: icon-off
+  - type: Item
+    sprite: Objects/Fun/newton_cradle.rsi
+    storedRotation: -90
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: { state: icon }
+          False: { state: icon-off }
+  - type: ItemToggle
+  - type: UseDelay
+    delay: 1
+#  - type: ItemToggleActiveSound # DeltaV - No more annoying clicking
+#    activeSound:
+#      path: /Audio/Items/newton_cradle.ogg
+#      params:
+#        volume: -9
+#        maxDistance: 3
+
+- type: entity
+  parent: BaseItem
+  id: ClownRecorder
+  name: clown recorder
+  description: When you just can't get those laughs coming the natural way!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/clownrecorder.rsi
+    state: icon
+  - type: EmitSoundOnUse
+    sound: &SoundClownRecorder
+      collection: ClownRecorder
+  - type: EmitSoundOnLand
+    sound: *SoundClownRecorder
+  - type: EmitSoundOnActivate
+    sound: *SoundClownRecorder
+  - type: EmitSoundOnTrigger
+    sound: *SoundClownRecorder
+  - type: EmitSoundOnCollide
+    sound: *SoundClownRecorder
+  - type: UseDelay
+    delay: 30.0
+  - type: Tag
+    tags:
+    - ClownRecorder
+    - Payload
+
+- type: entity
+  parent: BaseItem
+  id: WhoopieCushion
+  name: whoopie cushion
+  description: A practical joke device involving flatulence humour.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/whoopie.rsi
+    state: icon
+  - type: Tag
+    tags:
+    - Payload
+  - type: EmitSoundOnUse
+    sound: &SoundParp
+      collection: Parp
+      params:
+        variation: 0.125
+  - type: EmitSoundOnLand
+    sound: *SoundParp
+  - type: EmitSoundOnActivate
+    sound: *SoundParp
+  - type: EmitSoundOnCollide
+    sound: *SoundParp
+  - type: UseDelay
+    delay: 0.8
+  - type: Slippery
+    staminaDamage: 0
+    frictionStatusTime: 0
+    slipData:
+      stunTime: 0
+      knockdownTime: 0
+      launchForwardsMultiplier: 0
+    slipSound: *SoundParp
+  - type: MeleeWeapon
+    soundHit: *SoundParp
+    damage:
+      types:
+        Blunt: 0
+  - type: StepTrigger
+    intersectRatio: 0.2
+    requiredTriggeredSpeed: 2
+  - type: TriggerOnStepTrigger # for payloads, that don't work because of trouble with sound prediction
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        layer:
+        - SlipLayer
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        density: 30
+        mask:
+        - ItemMask
+
+- type: entity
+  parent: BaseItem
+  id: Skub
+  name: skub
+  description: Skub is the fifth Chaos God.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/skub.rsi
+    state: icon
+  - type: Tag
+    tags:
+    - Payload
+  - type: Item
+    sprite: Objects/Misc/skub.rsi
+  - type: EmitSoundOnUse
+    sound: &SoundSkub
+      collection: Skub
+  - type: EmitSoundOnLand
+    sound: *SoundSkub
+  - type: EmitSoundOnTrigger
+    sound: *SoundSkub
+  - type: EmitSoundOnActivate
+    sound: *SoundSkub
+  - type: EmitSoundOnCollide
+    sound: *SoundSkub
+  - type: MeleeWeapon
+    soundHit: *SoundSkub
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
+  - type: UseDelay
+    delay: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml b/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml
deleted file mode 100644
index 329d278bc8..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-- type: entity
-  id: SpectralLocatorUnpowered
-  parent: BaseItem
-  name: spectral locator
-  description: Appears to be a modified anomaly locator. Seems very old.
-  suffix: Always Powered
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spectrallocator.rsi
-    layers:
-      - state: icon
-      - state: screen
-        shader: unshaded
-        visible: false
-        map: ["enum.ToggleableVisuals.Layer"]
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ToggleableVisuals.Enabled:
-        enum.ToggleableVisuals.Layer:
-          True: { visible: true }
-          False: { visible: false }
-  - type: ItemToggle
-  - type: ProximityBeeper
-  - type: ProximityDetector
-    range: 12
-    components:
-    - type: Spectral # reacts to AI eye, intentional
-  - type: Beeper
-    isMuted: true
-    minBeepInterval: 0.25
-    maxBeepInterval: 0.5
-    beepSound:
-      path: "/Audio/Items/locator_beep.ogg"
-      params:
-        maxDistance: 1
-        volume: -8
-
-- type: entity
-  id: SpectralLocator
-  parent: [ SpectralLocatorUnpowered, PowerCellSlotSmallItem ]
-  suffix: ""
-  components:
-  - type: PowerCellDraw
-    drawRate: 1
-    useCharge: 0
-  - type: ToggleCellDraw
-
-- type: entity
-  id: SpectralLocatorEmpty
-  parent: SpectralLocator
-  suffix: Empty
-  components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
diff --git a/Resources/Prototypes/Entities/Objects/Fun/sports.yml b/Resources/Prototypes/Entities/Objects/Fun/sports.yml
new file mode 100644
index 0000000000..b78198f83e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/sports.yml
@@ -0,0 +1,159 @@
+# When adding new sports, also add them to id: AllMiscToysTable
+# File for SPORTS and the various oddly shaped objects used while playing them
+
+## Balls
+
+- type: entity
+  abstract: true
+  id: BaseSportsBall # How about that game with the pigskin?
+  components:
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound: &SoundSportsBounce
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: EmitSoundOnCollide
+    sound: *SoundSportsBounce
+  - type: EmitSoundOnLand
+    sound: *SoundSportsBounce
+
+- type: entity
+  parent: [ BaseItem, BaseSportsBall ]
+  id: Basketball
+  name: basketball
+  description: Where dah courts at?
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balls/basketball.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.8 # bouncy
+        friction: 0.2
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Balls/basketball.rsi
+  - type: TileFrictionModifier
+    modifier: 0.5
+
+- type: entity
+  parent: [ BaseItem, BaseSportsBall ]
+  id: Football
+  name: football
+  description: Otherwise known as a handegg.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balls/football.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.5 # a little bouncy
+        friction: 0.2
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/Balls/football.rsi
+
+- type: entity
+  parent: [ BaseItem, BaseSportsBall ]
+  id: TennisBall
+  name: tennis ball
+  description: A fuzzy orb of endless betrayal.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balls/tennisball.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.5 # a little bouncy
+        friction: 0.2
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/Balls/tennisball.rsi
+  - type: EmitSoundOnUse
+    sound:
+      collection: ToySqueak
+      params:
+        volume: -4
+  - type: UseDelay
+  - type: Clothing
+    slots: [mask]
+  - type: Tag
+    tags:
+    - PetWearable
+
+- type: entity
+  parent: [ BaseItem, BaseSportsBall ]
+  id: BeachBall
+  name: beach ball
+  description: The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balls/beach_ball.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.2 # not bouncy
+        friction: 0.2
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Balls/beach_ball.rsi
+  - type: TileFrictionModifier
+    modifier: 0.05
+
+- type: entity
+  parent: BeachBall
+  id: EvilBeachBall
+  suffix: EVIL/ADMEME
+  description: Someone's drawn ">:3c" on the side of this beach ball in indelible ink.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+        - ThrownItem
+        restitution: 0.5 # very bouncy
+        friction: 0.2
+  - type: LaunchOnTrigger
+    impulse: 100.0
+    keysIn:
+    - OnCollide
+  - type: StaminaDamageOnTrigger
+    stamina: 25.0
+    keysIn:
+    - OnCollide
+    targetUser: true
+  - type: DamageOnTrigger
+    damage:
+      types:
+        Blunt: 20
+    keysIn:
+    - OnCollide
+    targetUser: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 7f1857eaee..65c47dfd5c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1,980 +1,74 @@
-## Base stash
+# When adding new toys, also add it somewhere nested in id: AllToysTable
+# Catchall file for toys which don't have a strong grouping (only 1 or 2 prototypes)
 
 - type: entity
-  id: BaseStash
-  abstract: true
-  components:
-  - type: Speech
-    speechVerb: Default # for pais (In the secret stash)
-    speechSounds: Plushie # Imp
-  - type: SecretStash
-    secretStashName: secret-stash-plushie
-    blacklist:
-      components:
-      - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)!
-      tags:
-      - QuantumSpinInverter # It will cause issues with the grinder...
-  - type: ToolOpenable
-    openToolQualityNeeded: Slicing
-    closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added
-    name: secret-stash-plushie
-  - type: ContainerContainer
-    containers:
-      stash: !type:ContainerSlot {}
-
-## Rubber
-
-- type: entity
-  parent: [BaseItem, BaseStash]
-  id: BaseRubberToy
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-    - Payload
-  - type: UseDelay
-    delay: 1.0
-  - type: MeleeWeapon
-    wideAnimationRotation: 180
-    soundHit:
-      collection: ToySqueak
-    damage:
-      types:
-        Blunt: 0
-    hidden: true
-  - type: PhysicalComposition
-    materialComposition:
-      Plastic: 25
-  - type: StaticPrice
-    price: 5
-  - type: ContainerContainer
-    containers:
-      stash: !type:ContainerSlot {}
-
-- type: entity
-  parent: BaseRubberToy
-  id: ToyRubberDuck
-  name: rubber ducky
-  description: Not carried here by ocean currents.
+  parent: BaseItem
+  id: SnapPop
+  name: snap pop
+  description: Throw it at the floor and listen to it POP!
   components:
   - type: Sprite
-    sprite: Objects/Fun/ducky.rsi
+    sprite: Objects/Fun/snap_pops.rsi
     state: icon
-  - type: Clothing
-    quickEquip: false
-    sprite: Objects/Fun/ducky.rsi
-    slots:
-    - HEAD
   - type: Item
     size: Tiny
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/quack.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/quack.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/quack.ogg
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/quack.ogg
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/quack.ogg
-  - type: Tag
-    tags:
-    - ToyRubberDuck
-
-- type: entity
-  parent: BaseRubberToy
-  id: RubberChicken
-  name: rubber chicken
-  description: A stress inducing parody of nature's most delectable avian.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/rubber_chicken.rsi
-    state: icon
-  - type: Speech # DeltaV - chicken pai makes evil sound
-    speechSounds: RubberChicken
-  - type: EmitSoundOnUse
-    sound:
-      collection: RubberChicken
-      params:
-        variation: 0.125
-  - type: EmitSoundOnLand
-    sound:
-      collection: RubberChicken
-      params:
-        variation: 0.125
-  - type: EmitSoundOnActivate
-    sound:
-      collection: RubberChicken
-      params:
-        variation: 0.125
-  - type: EmitSoundOnCollide
-    sound:
-      collection: RubberChicken
-      params:
-        variation: 0.125
-  - type: EmitSoundOnTrigger
-    sound:
-      collection: RubberChicken
-      params:
-        variation: 0.125
-  - type: MeleeWeapon
-    wideAnimationRotation: 110
-    soundHit:
-      collection: RubberChicken
-      params:
-        variation: 0.125
-
-- type: entity
-  parent: BasePlushie
-  id: ToyIan
-  name: ian toy
-  description: Unable to eat, but just as fluffy as the real guy!
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/toy_ian.rsi
-    state: icon
-  - type: Clothing
-    quickEquip: false
-    sprite: Objects/Fun/toy_ian.rsi
-    slots:
-      - HEAD
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        offset: "0, 0.06"
-  - type: Item
-    size: Tiny
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: Edible
-    useSound:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: FoodSequenceElement
-    entries:
-      CottonBurger: IanPlushie
-
-## Toyweapons
-
-- type: entity
-  abstract: true
-  parent: BaseItem
-  id: FoamWeaponBase
-  components:
-  - type: Sprite
-  - type: Item
-    size: Normal
-  - type: PacifismAllowedGun
-
-- type: entity
-  parent: FoamWeaponBase
-  id: FoamCrossbow
-  name: foam crossbow
-  description: Aiming this at Security may get you filled with lead.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Foam/foam_crossbow.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Foam/foam_crossbow.rsi
-  - type: Gun
-    fireRate: 0.5
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/energycrossbow_shoot.ogg
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-      - BulletFoam
-    capacity: 1
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/energycrossbow_reload.ogg
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-
-- type: entity
-  parent: BaseItem
-  id: ToyGunBase
-  name: ToyGunBase
-  description: A rooty tooty point and shooty.
-  abstract: true
-  components:
-  - type: Sprite
-
-- type: entity
-  parent: ToyGunBase
-  id: RevolverCapGun
-  name: cap gun
-  description: Looks almost like the real thing! Ages 8 and up.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/capgun.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-  - type: Item
-    shape:
-    - 0,0,1,0
-    - 0,1,0,1
-    storedOffset: -2,-7
-    sprite: Objects/Fun/capgun.rsi
-  - type: Tag
-    tags:
-    - Sidearm
-    - ToySidearm
-    - ConcealCarry # DeltaV - can be stowed in military boots for now
-  - type: Gun
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    fireRate: 2
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
-      params:
-        volume: 2.25
-    clumsyProof: true
-  - type: RevolverAmmoProvider
-    whitelist:
-      tags:
-      - CartridgeCap
-      - SpeedLoaderCap
-    proto: CartridgeCap
-    capacity: 6
-    chambers: [ True, True, True, True, True, True ]
-    ammoSlots: [ null, null, null, null, null, null ]
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
-  - type: ContainerContainer
-    containers:
-      revolver-ammo: !type:Container
-
-- type: entity
-  parent: RevolverCapGun
-  id: RevolverCapGunFake
-  name: cap gun
-  suffix: Fake
-  description: Looks almost like the real thing! Ages 8 and up.
-  components:
-  - type: RevolverAmmoProvider
-    whitelist:
-      tags:
-      - CartridgeCap
-      - SpeedLoaderCap
-      - CartridgeMagnum
-      - SpeedLoaderMagnum
-    proto: CartridgeMagnumAP
-
-- type: entity
-  parent: BaseItem
-  id: FoamBlade
-  name: foamblade
-  description: It says "Sternside Changs number 1 fan" on it.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Foam/foam_blade.rsi
-    state: icon
-  - type: MeleeWeapon
-    attackRate: 1.5
-    angle: 0
-    animation: WeaponArcThrust
-    wideAnimationRotation: 90
-    damage:
-      types:
-        Blunt: 0
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/Foam/foam_blade.rsi
-  - type: UseDelay
-
-# Balloons
-
-- type: entity
-  parent: BaseItem
-  id: BaseBalloon
-  abstract: true
-  components:
-  - type: Sprite
-    noRot: true
-  - type: Item
-    size: Small
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Effects/balloon_hits.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Effects/balloon_hits.ogg
   - type: Damageable
     damageContainer: Inorganic
-  - type: TileFrictionModifier
-    modifier: 0.3
-  - type: Tag
-    tags:
-    - Balloon
-
-- type: entity
-  parent: BaseBalloon
-  id: BalloonSyn
-  name: syndie balloon
-  description: Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balloons/syndicate.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/Balloons/syndicate.rsi
-  - type: StaticPrice
-    price: 100 # Entertainment.
-
-- type: entity
-  parent: BaseBalloon
-  id: BalloonNT
-  name: nanotrasen balloon
-  description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balloons/nanotrasen.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/Balloons/nanotrasen.rsi
-
-- type: entity
-  parent: BaseBalloon
-  id: BalloonCorgi
-  name: corgi balloon
-  description: Just like owning a real dog - but a lot floatier.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balloons/corgi.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Fun/Balloons/corgi.rsi
-
-# MISC
-
-- type: entity
-  parent: BaseItem
-  id: Basketball
-  name: basketball
-  description: Where dah courts at?
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balls/basketball.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.25
-        density: 20
-        mask:
-        - ItemMask
-        restitution: 0.8 # bouncy
-        friction: 0.2
-  - type: Catchable
-    catchChance: 0.8
-    catchSuccessSound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Balls/basketball.rsi
-  - type: TileFrictionModifier
-    modifier: 0.5
-
-- type: entity
-  parent: BaseItem
-  id: Football
-  name: football
-  description: Otherwise known as a handegg.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balls/football.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.25
-        density: 20
-        mask:
-        - ItemMask
-        restitution: 0.5 # a little bouncy
-        friction: 0.2
-  - type: Catchable
-    catchChance: 0.8
-    catchSuccessSound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/Balls/football.rsi
-
-- type: entity
-  parent: BaseItem
-  id: TennisBall
-  name: tennis ball
-  description: A fuzzy orb of endless betrayal.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balls/tennisball.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.25
-        density: 20
-        mask:
-        - ItemMask
-        restitution: 0.5 # a little bouncy
-        friction: 0.2
-  - type: Catchable
-    catchChance: 0.8
-    catchSuccessSound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/Balls/tennisball.rsi
-  - type: EmitSoundOnUse
-    sound:
-      collection: ToySqueak
-      params:
-        volume: -4
-  - type: UseDelay
-  - type: Clothing
-    slots: [mask]
-  - type: Tag
-    tags:
-    - PetWearable
-
-- type: entity
-  parent: BaseItem
-  id: BeachBall
-  name: beach ball
-  description: The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balls/beach_ball.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.3
-          position: "0,-0.2"
-        density: 20
-        mask:
-          - ItemMask
-        restitution: 0.2 # not bouncy
-        friction: 0.2
-  - type: Catchable
-    catchChance: 0.8
-    catchSuccessSound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Balls/beach_ball.rsi
-  - type: TileFrictionModifier
-    modifier: 0.05
-  - type: TriggerOnCollide
-    fixtureID: fix1
-    keyOut: OnCollide
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-    keysIn:
-      - OnCollide
-
-- type: entity
-  parent: BeachBall
-  id: EvilBeachBall
-  suffix: EVIL/ADMEME
-  description: Someone's drawn ">:3c" on the side of this beach ball in indelible ink.
-  components:
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.3
-          position: "0,-0.2"
-        density: 20
-        mask:
-        - ThrownItem
-        restitution: 0.5 # very bouncy
-        friction: 0.2
-  - type: LaunchOnTrigger
-    impulse: 100.0
-    keysIn:
-      - OnCollide
-  - type: StaminaDamageOnTrigger
-    stamina: 25.0
-    keysIn:
-      - OnCollide
-    targetUser: true
-  - type: DamageOnTrigger
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/snap.ogg
+      - !type:ExplodeBehavior
+  - type: DamageOnLand
     damage:
       types:
-        Blunt: 20
-    keysIn:
-      - OnCollide
-    targetUser: true
-
-- type: entity
-  parent: BaseItem
-  id: SingularityToy
-  name: singuloth-brand toy
-  description: Mass-produced by a sadistic corporate conglomerate!
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/toy_singularity.rsi
-    state: icon
-  - type: Icon
-    sprite: Objects/Fun/toy_singularity.rsi
-    state: icon
-  - type: SingularityDistortion
-    intensity: 25
-    falloffPower: 2.6
-  - type: Item
-    size: Normal
-    inhandVisuals:
-      left:
-      - state: singu-inhand-left
-        shader: unshaded
-      right:
-      - state: singu-inhand-right
-        shader: unshaded
-
-- type: entity
-  parent: BaseItem
-  id: TeslaToy
-  name: Teddy Tesla
-  description: The favorite toy of the great engineer Nikola Tesla.
-  components:
-  - type: Sprite
-    sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
-    layers:
-    - state: tesla_projectile
-      shader: unshaded
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: tesla-inhand-left
-        shader: unshaded
-      right:
-      - state: tesla-inhand-right
-        shader: unshaded
-  - type: PointLight
-    enabled: true
-    radius: 5
-    color: "#4080FF"
-  - type: Electrified
-    shockDamage: 2
-    shockTime: 0.8
-    requirePower: false
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Effects/Lightning/lightningshock.ogg
-      params:
-        variation: 0.65
-        volume: -10
-
-- type: entity
-  parent: [ BaseItem, BaseMagicalContraband ]
-  id: PonderingOrb
-  name: pondering orb
-  description: Ponderous, man... Really ponderous.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/pondering_orb.rsi
-    layers:
-    - state: icon
-      shader: unshaded
-  - type: PointLight
-    radius: 2
-    color: "#00CCFF"
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/pondering_orb.rsi
-  - type: TileFrictionModifier
-    modifier: 0.001
-
-- type: entity
-  parent: PonderingOrb
-  id: PonderingOrbWizard
-  name: pondering orb
-  description: Ponderous, man... Really ponderous. Magically shows the station's camera network.
-  suffix: Wizard
-  components:
-  - type: ActivatableUI
-    requireActiveHand: false
-    inHandsOnly: true
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: UserInterface
-    interfaces:
-      enum.SurveillanceCameraMonitorUiKey.Key:
-        type: SurveillanceCameraMonitorBoundUserInterface
-  - type: DeviceNetwork
-    deviceNetId: Wired
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WiredNetworkConnection
-  - type: SurveillanceCameraMonitor
-
-- type: entity
-  parent: BaseItem
-  id: ToySword
-  name: toy sword
-  description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
-  components:
-    - type: EnergySword
-      colorOptions: # DeltaV - revert toy sword appearance
-      - DodgerBlue
-    - type: ItemToggle
-      soundActivate:
-        path: /Audio/Weapons/ebladeon.ogg
-      soundDeactivate:
-        path: /Audio/Weapons/ebladeoff.ogg
-    - type: ItemToggleActiveSound
-      activeSound:
-        path: /Audio/Weapons/ebladehum.ogg
-    - type: Sprite
-      sprite: Objects/Weapons/Melee/e_sword.rsi
-      layers:
-        - state: e_sword
-        - state: e_sword_blade
-          color: "#FFFFFF"
-          visible: false
-          shader: unshaded
-          map: [ "blade" ]
-    - type: Item
-      size: Small
-      sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
-    - type: UseDelay
-      delay: 1.0
-    - type: PointLight
-      enabled: false
-      radius: 2
-      energy: 2
-      color: white
-      netsync: false
-    - type: Appearance
-    - type: ToggleableVisuals
-      spriteLayer: blade
-      inhandVisuals:
-        left:
-          - state: inhand-left-blade
-            shader: unshaded
-        right:
-          - state: inhand-right-blade
-            shader: unshaded
-    - type: ItemTogglePointLight
-    - type: DisarmMalus
-      malus: 0
-    - type: StaminaDamageOnHit
-      damage: 8
-    - type: MeleeWeapon
-      wideAnimationRotation: -135
-      damage:
-        types:
-          Blunt: 0
-    - type: ItemToggleMeleeWeapon
-      activatedSoundOnHit:
-        collection: RubberHammer # DeltaV - toy sword makes squeaky sounds
-        params:
-          variation: 0.250
-      activatedSoundOnHitNoDamage:
-        collection: RubberHammer # DeltaV - toy sword makes squeaky sounds
-        params:
-          variation: 0.250
-      activatedSoundOnSwing:
-        path: /Audio/Weapons/eblademiss.ogg
-        params:
-          variation: 0.125
-
-- type: entity
-  parent: BasePlushie
-  id: ToyAmongPequeno
-  name: among pequeño
-  description: Sus!
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/pequeno.rsi
-    layers:
-    - state: base
-      map: [ "enum.DamageStateVisualLayers.Base" ]
-    - state: visor
-  - type: Clothing
-    sprite: Objects/Fun/pequeno.rsi
-    slots:
-    - HEAD
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET-body
-      - state: equipped-HELMET-vis
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-body
-      - state: inhand-left-vis
-      right:
-      - state: inhand-right-body
-      - state: inhand-right-vis
-  - type: RandomSprite
-    available:
-    - enum.DamageStateVisualLayers.Base:
-        base: Sixteen
-#  - type: FoodSequenceElement - does not work with randomized sprites
-#    entries:
-#      CottonBurger: AmongPequeno
-
-
-- type: entity
-  parent: BaseItem
-  id: FoamCutlass
-  name: foam cutlass
-  description: Cosplay as a pirate and force your friends to walk the plank.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/cutlass.rsi
-    state: foam_icon
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    attackRate: 1.5
-    range: 2.0
-    damage:
-      types:
-        Blunt: 0
-  - type: Item
-    size: Normal
-    storedSprite:
-      state: foam_storage
-      sprite: Objects/Weapons/Melee/cutlass.rsi
-    shape:
-    - 0,0,0,2
-
-- type: entity
-  parent: BaseItem
-  id: CardSword
-  name: cardboard sword
-  description: A cardboard tube fashioned into the shape of a sword.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/card_sword.rsi
-    state: icon
-  - type: Clothing
-    sprite: Objects/Fun/card_sword.rsi
-    slots:
-    - Back
-    - SuitStorage
-  - type: StaminaDamageOnHit
-    damage: 6
-  - type: Appearance
-  - type: DisarmMalus
-    malus: 0
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    attackRate: 1.25
-    damage:
-      types:
-        Blunt: 0.3
-    soundHit:
-      path: /Audio/Items/Toys/card_tube_bonk.ogg
+        Blunt: 3
+  - type: Explosive
+    explosionType: Default
+    # Cosmetic explosion :tf:
+    maxIntensity: 0.01
+    intensitySlope: 1
+    totalIntensity: 0.01
   - type: Construction
-    graph: CardSword
-    node: cardSword
+    graph: SnapPopExplosiveGraph
+    node: snapPop
+
+- type: entity
+  parent: BaseStorageItem
+  id: SnapPopBox
+  name: snap pop box
+  description: Contains snap pops for a few minutes of popping fun!
+  components:
   - type: Item
     size: Normal
-    storedSprite:
-      state: icon
-      sprite: Objects/Fun/card_sword.rsi
-    shape:
-    - 0,0,1,3
-
-- type: entity
-  parent: BaseItem
-  id: ClownRecorder
-  name: clown recorder
-  description: When you just can't get those laughs coming the natural way!
-  components:
   - type: Sprite
-    sprite: Objects/Fun/clownrecorder.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      collection: ClownRecorder
-  - type: EmitSoundOnLand
-    sound:
-      collection: ClownRecorder
-  - type: EmitSoundOnActivate
-    sound:
-      collection: ClownRecorder
-  - type: EmitSoundOnTrigger
-    sound:
-      collection: ClownRecorder
-  - type: EmitSoundOnCollide
-    sound:
-      collection: ClownRecorder
-  - type: UseDelay
-    delay: 30.0
-  - type: Tag
-    tags:
-    - ClownRecorder
-    - Payload
+    sprite: Objects/Fun/snap_pops.rsi
+    state: box
+  - type: Storage
+    grid:
+    - 0,0,4,3
+    areaInsert: true
+    maxItemSize: Tiny
+  - type: EntityTableContainerFill
+    containers:
+      storagebase:
+        id: SnapPop
+        amount: 5
+  - type: Dumpable
 
 - type: entity
-  parent: BaseItem
-  id: ToyHammer
-  name: rubber hammer
-  description: A brightly colored hammer made of rubber.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/rubber_hammer.rsi
-    state: icon
-  - type: WeaponRandom
-    damageBonus:
-      types:
-        Blunt: 1000
-  - type: StaminaDamageOnHit
-    damage: 8
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/rubber_hammer.rsi
-  - type: Appearance
-  - type: DisarmMalus
-    malus: 0
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    soundHit:
-      collection: RubberHammer
-      params:
-        variation: 0.03
-        volume: 3
-    soundNoDamage:
-      collection: RubberHammer
-      params:
-        variation: 0.03
-        volume: 3
-    damage:
-      types:
-        Blunt: 0
-
-- type: entity
-  parent: BaseItem
-  id: WhoopieCushion
-  name: whoopie cushion
-  description: A practical joke device involving flatulence humour.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/whoopie.rsi
-    state: icon
-  - type: Tag
-    tags:
-    - Payload
-  - type: EmitSoundOnUse
-    sound:
-      collection: Parp
-      params:
-        variation: 0.125
-  - type: EmitSoundOnLand
-    sound:
-      collection: Parp
-      params:
-        variation: 0.125
-  - type: EmitSoundOnActivate
-    sound:
-      collection: Parp
-      params:
-        variation: 0.125
-  - type: EmitSoundOnCollide
-    sound:
-      collection: Parp
-      params:
-        variation: 0.125
-  - type: UseDelay
-    delay: 0.8
-  - type: Slippery
-    staminaDamage: 0
-    frictionStatusTime: 0
-    slipData:
-      stunTime: 0
-      knockdownTime: 0
-      launchForwardsMultiplier: 0
-    slipSound:
-      collection: Parp
-      params:
-        variation: 0.125
-  - type: MeleeWeapon
-    soundHit:
-      collection: Parp
-      params:
-        variation: 0.125
-    damage:
-      types:
-        Blunt: 0
-  - type: StepTrigger
-    intersectRatio: 0.2
-    requiredTriggeredSpeed: 2
-  - type: TriggerOnStepTrigger # for payloads
-  - type: Appearance
-  - type: CollisionWake
-    enabled: false
-  - type: Physics
-    bodyType: Dynamic
-  - type: Fixtures
-    fixtures:
-      slips:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
-        hard: false
-        layer:
-        - SlipLayer
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
-        density: 30
-        mask:
-        - ItemMask
-
-- type: entity
-  name: banana
   parent: FoodProduceBase
   id: PlasticBanana
-  description: A plastic banana.
+  name: banana
   suffix: Plastic
+  description: A plastic banana.
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
@@ -1061,30 +155,144 @@
     solution: drink
 
 - type: entity
-  parent: BaseItem
-  id: NewtonCradle
-  name: newton cradle
-  description: A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity.
+  parent: [ BaseItem, MobCombat ]
+  id: MrChips
+  name: mr chips
+  suffix: Dummy
+  description: It's a dummy, dummy!
   components:
   - type: Sprite
-    sprite: Objects/Fun/newton_cradle.rsi
-    state: icon-off
+    sprite: Objects/Fun/mrchips.rsi
+    layers:
+    - state: icon
+  - type: Input
+    context: "human"
+  - type: DoAfter
+  - type: VentriloquistPuppet
   - type: Item
-    sprite: Objects/Fun/newton_cradle.rsi
-    storedRotation: -90
+    size: Normal
+  - type: Muted
+  - type: TypingIndicator
+    proto: robot
+  - type: Actions
+  - type: MobState
+    allowedStates:
+    - Alive
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/boxingpunch1.ogg
+    angle: 30
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Blunt: 2
+
+- type: entity
+  parent: MrChips
+  id: MrDips
+  name: mr dips
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/mrdips.rsi
+
+- type: entity
+  parent: BaseItem
+  id: Error
+  name: error
+  description: Hmmmm. Something went wrong.
+  components:
+  - type: Sprite
+    sprite: error.rsi
+    state: error
+  - type: Edible
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 26
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+  - type: Slippery
+    slipData:
+      knockdownTime: 3
+      launchForwardsMultiplier: 3
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
+        hard: false
+        layer:
+        - SlipLayer
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
+        density: 30
+        mask:
+        - ItemMask
+
+- type: entity
+  parent: BaseItem
+  id: SpectralLocatorUnpowered
+  name: spectral locator
+  suffix: Always Powered
+  description: Appears to be a modified anomaly locator. Seems very old.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spectrallocator.rsi
+    layers:
+    - state: icon
+    - state: screen
+      shader: unshaded
+      visible: false
+      map: ["enum.ToggleableVisuals.Layer"]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
       enum.ToggleableVisuals.Enabled:
         enum.ToggleableVisuals.Layer:
-          True: { state: icon }
-          False: { state: icon-off }
+          True: { visible: true }
+          False: { visible: false }
   - type: ItemToggle
-  - type: UseDelay
-    delay: 1
-#  - type: ItemToggleActiveSound # DeltaV - No more annoying clicking
-#    activeSound:
-#      path: /Audio/Items/newton_cradle.ogg
-#      params:
-#        volume: -9
-#        maxDistance: 3
+  - type: ProximityBeeper
+  - type: ProximityDetector
+    range: 12
+    components:
+    - type: Spectral # ghosts, jaunts, reventants
+  - type: Beeper
+    isMuted: true
+    minBeepInterval: 0.25
+    maxBeepInterval: 0.5
+    beepSound:
+      path: "/Audio/Items/locator_beep.ogg"
+      params:
+        maxDistance: 1
+        volume: -8
+
+- type: entity
+  parent: [ SpectralLocatorUnpowered, PowerCellSlotSmallItem ]
+  id: SpectralLocator
+  suffix: ""
+  components:
+  - type: PowerCellDraw
+    drawRate: 1
+    useCharge: 0
+  - type: ToggleCellDraw
+
+- type: entity
+  parent: SpectralLocator
+  id: SpectralLocatorEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
diff --git a/Resources/Prototypes/Entities/Objects/Fun/weapons.yml b/Resources/Prototypes/Entities/Objects/Fun/weapons.yml
new file mode 100644
index 0000000000..0d17e0715b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/weapons.yml
@@ -0,0 +1,340 @@
+# When adding new "weapons", also add it to id: AllToyWeaponsTable
+# File for fun weapons that aren't very dangerous
+
+## Toy guns
+
+- type: entity
+  abstract: true
+  id: BaseToyGun
+  components:
+  - type: PacifismAllowedGun # They don't hurt!
+  - type: Gun
+    clumsyProof: true # Clown proficiency
+
+- type: entity
+  parent: [ BaseItem, BaseToyGun ]
+  id: FoamCrossbow
+  name: foam crossbow
+  description: Aiming this at Security may get you filled with lead.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Foam/foam_crossbow.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Foam/foam_crossbow.rsi
+  - type: Gun
+    fireRate: 0.5
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/energycrossbow_shoot.ogg
+  - type: BallisticAmmoProvider
+    whitelist: &WhitelistFoam
+      tags:
+      - BulletFoam
+    capacity: 1
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/energycrossbow_reload.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  name: Foam Force Astro Ace
+  parent: [ BaseToyGun, BaseWeaponShotgun, BaseGunWieldable ]
+  id: WeaponRifleFoam
+  description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Foam/foam_rifle.rsi
+  - type: Clothing
+    sprite: Objects/Fun/Foam/foam_rifle.rsi
+  - type: Item
+    sprite: Objects/Fun/Foam/foam_rifle_inhand_64x.rsi
+    size: Normal
+    shape:
+    - 0,0,3,0
+  - type: BallisticAmmoProvider
+    whitelist: *WhitelistFoam
+    capacity: 10
+    proto: BulletFoam
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Effects/thunk.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/empty.ogg
+  - type: StaticPrice
+    price: 100
+
+- type: entity
+  parent: [ BaseItem, BaseToyGun ]
+  id: RevolverCapGun
+  name: cap gun
+  description: Looks almost like the real thing! Ages 8 and up.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/capgun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+    storedOffset: -2,-7
+    sprite: Objects/Fun/capgun.rsi
+  - type: Tag
+    tags:
+    - Sidearm
+    - ToySidearm
+  - type: AmmoCounter
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    fireRate: 2
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+      params:
+        volume: 2.25
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+      - CartridgeCap
+      - SpeedLoaderCap
+      - ConcealCarry # DeltaV - can be stowed in military boots for now
+    proto: CartridgeCap
+    capacity: 6
+    chambers: [ True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null ]
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+  - type: ContainerContainer
+    containers:
+      revolver-ammo: !type:Container
+
+- type: entity
+  parent: RevolverCapGun
+  id: RevolverCapGunFake
+  suffix: Fake
+  components:
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+      - CartridgeCap
+      - SpeedLoaderCap
+      - CartridgeMagnum
+      - SpeedLoaderMagnum
+    proto: CartridgeMagnumAP
+
+- type: entity
+  parent: [ BaseItem, BaseToyGun ]
+  id: WeaponStickyHand
+  name: sticky hand
+  description: They're saying you're reaching. They're saying it's a stretch. You'll show them all, and you'll stick it to them.
+  components:
+  - type: GrapplingGun
+    cycleSound: /Audio/Misc/woosh.ogg
+    ropeSprite:
+      sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+      state: rope
+  - type: Gun
+    soundGunshot: /Audio/Misc/stickystretch.ogg
+    fireRate: 0.5
+    soundEmpty: /Audio/Misc/boing.ogg
+  - type: BasicEntityAmmoProvider
+    proto: StickyHandPalm
+    capacity: 1
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+    state: base
+  - type: UseDelay
+    delay: 1.5
+
+## Toy swords
+
+- type: entity
+  abstract: true
+  id: BaseToySword
+  components:
+  - type: DisarmMalus
+    malus: -0.3 # Easy to disarm for epic reversals
+  - type: StaminaDamageOnHit
+    damage: 8 # Too small for real combat, but allows for foam fights to have a conclusion
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 0.3 # Not even close to real damage, but creates the red flash to give the illusion of damage
+
+- type: entity
+  parent: [ BaseItem, BaseToySword ]
+  id: FoamBlade
+  name: foamblade
+  description: It says "Sternside Changs number 1 fan" on it.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Foam/foam_blade.rsi
+    state: icon
+  - type: MeleeWeapon
+    attackRate: 1.5
+    angle: 0
+    animation: WeaponArcThrust
+    wideAnimationRotation: 90
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/Foam/foam_blade.rsi
+
+- type: entity
+  parent: [ BaseItem, BaseToySword ]
+  id: FoamCutlass
+  name: foam cutlass
+  description: Cosplay as a pirate and force your friends to walk the plank.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/cutlass.rsi
+    state: foam_icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 1.5
+    range: 2.0
+  - type: Item
+    size: Normal
+    storedSprite:
+      state: foam_storage
+      sprite: Objects/Weapons/Melee/cutlass.rsi
+    shape:
+    - 0,0,0,2
+
+- type: entity
+  parent: [ BaseItem, BaseToySword ]
+  id: ToySword
+  name: toy sword
+  description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/e_sword.rsi
+    layers:
+    - state: e_sword
+    - state: e_sword_blade
+      color: "#FFFFFF"
+      visible: false
+      shader: unshaded
+      map: [ "blade" ]
+  - type: EnergySword
+    colorOptions: # DeltaV - revert toy sword appearance
+    - DodgerBlue
+  - type: ItemToggle
+    soundActivate:
+      path: /Audio/Weapons/ebladeon.ogg
+    soundDeactivate:
+      path: /Audio/Weapons/ebladeoff.ogg
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Weapons/ebladehum.ogg
+  - type: Item
+    size: Small
+    sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
+  - type: UseDelay
+    delay: 1.0
+  - type: PointLight
+    enabled: false
+    radius: 2
+    energy: 2
+    color: white
+    netsync: false
+  - type: Appearance
+  - type: ToggleableVisuals
+    spriteLayer: blade
+    inhandVisuals:
+      left:
+      - state: inhand-left-blade
+        shader: unshaded
+      right:
+      - state: inhand-right-blade
+        shader: unshaded
+  - type: ItemTogglePointLight
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 0
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      collection: RubberHammer # DeltaV - toy sword makes squeaky sounds
+      params:
+        variation: 0.250
+    activatedSoundOnHitNoDamage:
+      collection: RubberHammer # DeltaV - toy sword makes squeaky sounds
+      params:
+        variation: 0.250
+    activatedSoundOnSwing:
+      path: /Audio/Weapons/eblademiss.ogg
+      params:
+        variation: 0.125
+    activatedDamage:
+      types:
+        Heat: 0.3
+
+- type: entity
+  parent: [ BaseItem, BaseToySword ]
+  id: CardSword
+  name: cardboard sword
+  description: A cardboard tube fashioned into the shape of a sword.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/card_sword.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Fun/card_sword.rsi
+    slots:
+    - Back
+    - SuitStorage
+  - type: Appearance
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 1.25
+    soundHit:
+      path: /Audio/Items/Toys/card_tube_bonk.ogg
+  - type: Construction
+    graph: CardSword
+    node: cardSword
+  - type: Item
+    size: Normal
+    storedSprite:
+      state: icon
+      sprite: Objects/Fun/card_sword.rsi
+    shape:
+    - 0,0,1,3
+
+- type: entity
+  parent: [ BaseItem, BaseToySword ]
+  id: ToyHammer
+  name: rubber hammer
+  description: A brightly colored hammer made of rubber.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/rubber_hammer.rsi
+    state: icon
+  - type: WeaponRandom # 1 in 100,000 to "win" the "fight"
+    damageBonus:
+      types:
+        Blunt: 1000
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/rubber_hammer.rsi
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    soundHit: &SoundRubberHammer
+      collection: RubberHammer
+      params:
+        variation: 0.03
+        volume: 3
+    soundNoDamage: *SoundRubberHammer
diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
deleted file mode 100644
index a28d0f32c3..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-- type: entity
-  abstract: true
-  parent: BaseItem
-  id: BaseWhistle
-  name: whistle
-  description: Someone forgot to turn off a kettle?
-  components:
-  - type: Item
-    sprite: Objects/Fun/whistles.rsi
-    size: Tiny
-  - type: Sprite
-    sprite: Objects/Fun/whistles.rsi
-  - type: Clothing
-    sprite: Objects/Fun/whistles.rsi
-    quickEquip: false
-    slots: neck
-  - type: UseDelay
-    delay: 3
-  - type: EmitSoundOnUse
-    sound:
-      collection: BaseWhistle
-  - type: Whistle
-    distance: 3
-
-- type: entity
-  parent: BaseWhistle
-  id: Whistle
-  components:
-  - type: Sprite
-    state: whistle
-
-- type: entity
-  parent: BaseWhistle
-  id: SecurityWhistle
-  description: The sound of it brings fear.
-  components:
-  - type: Sprite
-    state: whistle # DeltaV - replace sec with whistle
-  - type: Clothing
-    equippedPrefix: whistle # DeltaV - replace sec with whistle
-  - type: Whistle
-    distance: 5
-
-- type: entity
-  parent: [BaseWhistle, BaseMinorContraband]
-  id: SyndicateWhistle
-  name: trench whistle
-  description: A whistle used by Syndicate commanders to draw attention. Avanti!
-  components:
-  - type: Sprite
-    state: trench
-  - type: Clothing
-    equippedPrefix: trench
-  - type: EmitSoundOnUse
-    sound:
-      collection: TrenchWhistle
-  - type: Whistle
-    distance: 15 # Let your enemies hear the sound of death approaching
diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
rename to Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml
index 151f88f985..c517ebaa24 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml
@@ -44,16 +44,16 @@
       - GhostOnlyWarp
 
 - type: entity
+  parent: ImmovableRod
   id: ImmovableRodDespawn
   suffix: Despawn
-  parent: ImmovableRod
   components:
   - type: TimedDespawn
     lifetime: 30.0
 
 - type: entity
-  id: ImmovableRodSlow
   parent: ImmovableRodDespawn
+  id: ImmovableRodSlow
   suffix: Slow
   components:
   - type: ImmovableRod
diff --git a/Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml b/Resources/Prototypes/Entities/Objects/Misc/candy_bucket.yml
similarity index 97%
rename from Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml
rename to Resources/Prototypes/Entities/Objects/Misc/candy_bucket.yml
index 3efba15f93..13be355c5b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candy_bucket.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: "candy bucket"
   parent: BaseItem
   id: CandyBucket
+  name: candy bucket
   description: A festive bucket for all your treats.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index faa3dd7781..d1c008e1bf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -339,33 +339,6 @@
             False: { state: base-unshaded-off }
     - type: PacifismAllowedGun
 
-- type: entity
-  parent: BaseItem
-  id: WeaponStickyHand
-  name: sticky hand
-  description: They're saying you're reaching. They're saying it's a stretch. You'll show them all, and you'll stick it to them.
-  components:
-  - type: AmmoCounter
-  - type: GrapplingGun
-    cycleSound: /Audio/Misc/woosh.ogg
-    ropeSprite:
-      sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
-      state: rope
-  - type: Gun
-    soundGunshot: /Audio/Misc/stickystretch.ogg
-    fireRate: 0.5
-    clumsyProof: true
-    soundEmpty: /Audio/Misc/boing.ogg
-  - type: BasicEntityAmmoProvider
-    proto: StickyHandPalm
-    capacity: 1
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
-    state: base
-  - type: UseDelay
-    delay: 1.5
-  - type: PacifismAllowedGun
-
 # Admeme
 - type: entity
   name: tether gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index ff19b903fd..8206f83f3f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -282,39 +282,3 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
-
-- type: entity
-  name: Foam Force Astro Ace
-  parent: [BaseWeaponShotgun, BaseGunWieldable]
-  id: WeaponRifleFoam
-  description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Foam/foam_rifle.rsi
-  - type: Clothing
-    sprite: Objects/Fun/Foam/foam_rifle.rsi
-  - type: Item
-    sprite: Objects/Fun/Foam/foam_rifle_inhand_64x.rsi
-    size: Normal
-    shape:
-    - 0,0,3,0
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-      - BulletFoam
-    capacity: 10
-    proto: BulletFoam
-  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
-  - type: Gun
-    fireRate: 2
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      path: /Audio/Effects/thunk.ogg
-    soundEmpty:
-      path: /Audio/Weapons/Guns/Empty/empty.ogg
-    clumsyProof: true
-  - type: PacifismAllowedGun
-  - type: StaticPrice
-    price: 100
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index ca7e78033d..7a3f9f28b9 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -170,3 +170,26 @@
         cell_slot:
           name: power-cell-slot-component-slot-name-default
           startingItem: PowerCellHigh
+
+# For entities with a hidden container slot that can be opened with a tool
+- type: entity
+  abstract: true
+  id: BaseStash
+  components:
+  - type: Speech
+    speechVerb: Default # for pais (In the secret stash)
+    speechSounds: Plushie # Imp
+  - type: SecretStash
+    secretStashName: secret-stash-plushie
+    blacklist:
+      components:
+      - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)!
+      tags:
+      - QuantumSpinInverter # It will cause issues with the grinder...
+  - type: ToolOpenable
+    openToolQualityNeeded: Slicing
+    closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added
+    name: secret-stash-plushie
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}

From 584d043abb5cea16d7d6319bddb7daea786dd7f5 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Wed, 7 Jan 2026 17:31:13 -0500
Subject: [PATCH 249/360] Add origin member to class (#41250)

* Add origin member to class

* whitespace

* Add comments

Added some doc polish while I was here.

* Update comments

Clarification and accuracy

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Damage/Systems/DamageableSystem.Events.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Damage/Systems/DamageableSystem.Events.cs b/Content.Shared/Damage/Systems/DamageableSystem.Events.cs
index 44546785c5..d90fbce6e6 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.Events.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.Events.cs
@@ -240,13 +240,28 @@ public record struct BeforePartDamageChangedEvent(
 public sealed class DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null, TargetBodyPart? targetPart = null) // Shitmed
     : EntityEventArgs, IInventoryRelayEvent
 {
-    // Whenever locational damage is a thing, this should just check only that bit of armour.
+    /// <inheritdoc/>
+    /// <remarks>
+    ///     Whenever locational damage is a thing, this should just check only that bit of armor.
+    /// </remarks>
     public SlotFlags TargetSlots => ~SlotFlags.POCKET;
 
+    /// <summary>
+    ///     Contains the original damage, prior to any modifers.
+    /// </summary>
     public readonly DamageSpecifier OriginalDamage = damage;
+
+    /// <summary>
+    ///     Contains the damage after modifiers have been applied.
+    ///     This is the damage that will be inflicted.
+    /// </summary>
     public DamageSpecifier Damage = damage;
-    public EntityUid? Origin = origin; // DeltaV - Did upstream forget this?
     public readonly TargetBodyPart? TargetPart = targetPart; // Shitmed Change
+
+    /// <summary>
+    ///     Contains the entity which caused the damage, if any was responsible.
+    /// </summary>
+    public readonly EntityUid? Origin = origin;
 }
 
 public sealed class DamageChangedEvent : EntityEventArgs

From a15d8db3a2edc1c17935fd49b5809b2c678c3d11 Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Wed, 7 Jan 2026 18:48:17 -0500
Subject: [PATCH 250/360] Remove yaml'd non-existent components + test for that
 (#38878)

* chore: remove some unregistered components

* feat: test for components being ignored on client + server
---
 .../EntityPrototypeComponentsTest.cs          | 37 +++++++++++++------
 .../Machines/Medical/vaccinator.yml           |  3 --
 .../Structures/Shuttles/thrusters.yml         |  1 -
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
index 5c73245501..ef94cf0f00 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
@@ -26,7 +26,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
                 .ToList()
                 .AsParallel()
                 .Where(filePath => filePath.Extension == "yml" &&
-                                   !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
+                                   !filePath.Filename.StartsWith('.'))
                 .ToArray();
 
             var cComponentFactory = client.ResolveDependency<IComponentFactory>();
@@ -34,6 +34,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
 
             var unknownComponentsClient = new List<(string entityId, string component)>();
             var unknownComponentsServer = new List<(string entityId, string component)>();
+            var doubleIgnoredComponents = new List<(string entityId, string component)>();
             var entitiesValidated = 0;
             var componentsValidated = 0;
 
@@ -72,26 +73,32 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
 
                             var componentType = component.GetNode("type").AsString();
                             var clientAvailability = cComponentFactory.GetComponentAvailability(componentType);
-
-                            if (clientAvailability == ComponentAvailability.Unknown)
-                            {
-                                var entityId = node.GetNode("id").AsString();
-                                unknownComponentsClient.Add((entityId, componentType));
-                            }
-
                             var serverAvailability = sComponentFactory.GetComponentAvailability(componentType);
 
-                            if (serverAvailability == ComponentAvailability.Unknown)
+                            var entityId = node.GetNode("id").AsString();
+
+                            if ((clientAvailability, serverAvailability) is
+                                (ComponentAvailability.Ignore, ComponentAvailability.Ignore))
                             {
-                                var entityId = node.GetNode("id").AsString();
-                                unknownComponentsServer.Add((entityId, componentType));
+                                doubleIgnoredComponents.Add((entityId, componentType));
+                                continue;
                             }
+
+                            // NOTE: currently, the client's component factory is configured to ignore /all/
+                            // non-registered components, meaning this case will never succeed. This is here
+                            // mainly for future proofing plus any downstreams that were brave enough to not
+                            // ignore all unknown components on clientside.
+                            if (clientAvailability == ComponentAvailability.Unknown)
+                                unknownComponentsClient.Add((entityId, componentType));
+
+                            if (serverAvailability == ComponentAvailability.Unknown)
+                                unknownComponentsServer.Add((entityId, componentType));
                         }
                     }
                 }
             }
 
-            if (unknownComponentsClient.Count + unknownComponentsServer.Count == 0)
+            if (unknownComponentsClient.Count + unknownComponentsServer.Count + doubleIgnoredComponents.Count == 0)
             {
                 await pair.CleanReturnAsync();
                 Assert.Pass($"Validated {entitiesValidated} entities with {componentsValidated} components in {paths.Length} files.");
@@ -112,6 +119,12 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
                     $"SERVER: Unknown component {component} in prototype {entityId}\n");
             }
 
+            foreach (var (entityId, component) in doubleIgnoredComponents)
+            {
+                message.Append(
+                    $"Component {component} in prototype {entityId} is ignored by both client and serverV\n");
+            }
+
             Assert.Fail(message.ToString());
         }
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
index 53542cdfa9..49a77d1d09 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
@@ -15,9 +15,6 @@
       shader: unshaded
       map: ["enum.DiseaseMachineVisualLayers.IsOn"]
   - type: Appearance
-  - type: DiseaseMachineVisuals
-    idleState: icon
-    runningState: running
   - type: Machine
     board: VaccinatorMachineCircuitboard
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
index e251d1bfff..eafaae4450 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -35,7 +35,6 @@
     - type: InteractionOutline
     - type: Sprite
     - type: Appearance
-    - type: ThrusterVisuals
     - type: ApcPowerReceiver
       powerLoad: 1500
     - type: ExtensionCableReceiver

From 7fdccdb89bc7f46c00bbad49bec69ef22511d1ea Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 9 Feb 2026 18:27:14 +0100
Subject: [PATCH 251/360] Downstream fixes for #38878 (Yaml test for
 non-existent components)

---
 Resources/Prototypes/_DV/CosmicCult/Tileset/structures.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/_DV/CosmicCult/Tileset/structures.yml b/Resources/Prototypes/_DV/CosmicCult/Tileset/structures.yml
index 74c3c19c4e..a522e60659 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Tileset/structures.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Tileset/structures.yml
@@ -165,7 +165,6 @@
         Cold: 40
   - type: InteractionOutline
   - type: Appearance
-  - type: ThrusterVisuals
   - type: Sprite
     sprite: _DV/CosmicCult/Tileset/cosmicthruster.rsi
     layers:

From 45c3eedb55d9a4693b5422d17d759286ab413091 Mon Sep 17 00:00:00 2001
From: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Date: Thu, 8 Jan 2026 00:50:59 -0500
Subject: [PATCH 252/360] Fix Capitalization on HoP's Fountain Pen (#42300)

capitalization
---
 Resources/Prototypes/Entities/Objects/Misc/pen.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index 3d5959634d..ec16fa5bae 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -134,10 +134,10 @@
     state: pen_cap
 
 - type: entity
-  name: hop's fountain pen
+  name: HoP's fountain pen
   parent: PenEmbeddable
   id: PenHop
-  description: A luxurious fountain pen for the hop of the station.
+  description: A luxurious fountain pen for the HoP of the station.
   components:
   - type: Sprite
     state: pen_hop

From b8a210d1a6b3301e3e09af69b8aac0fc1aac0122 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 8 Jan 2026 02:49:50 -0800
Subject: [PATCH 253/360] Fix Internals Sounds not working.  (#42304)

ern

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
index 8c7ebe8332..4158c687bd 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
@@ -141,7 +141,7 @@ public abstract class SharedGasTankSystem : EntitySystem
         if (!component.IsConnected)
             return false;
 
-        component.ConnectStream = _audio.Stop(component.ConnectStream);
+        component.DisconnectStream = _audio.Stop(component.DisconnectStream);
         component.ConnectStream = _audio.PlayPredicted(component.ConnectSound, owner, user)?.Entity;
         UpdateUserInterface(ent);
         return true;
@@ -210,7 +210,7 @@ public abstract class SharedGasTankSystem : EntitySystem
         if (internalsUid != null && internalsComp != null)
             _internals.DisconnectTank((internalsUid.Value, internalsComp), forced: forced);
 
-        component.DisconnectStream = _audio.Stop(component.DisconnectStream);
+        component.ConnectStream = _audio.Stop(component.ConnectStream);
         component.DisconnectStream = _audio.PlayPredicted(component.DisconnectSound, owner, user)?.Entity;
         UpdateUserInterface(ent);
         return true;

From a860d2e1b9bc0fc1cdb131661cc781d930fd2c3c Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 8 Jan 2026 02:51:47 -0800
Subject: [PATCH 254/360] Goliath Hardsuit Fixes (#42303)

goliath hardsuit fixes

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 38f9fffdaa..20b6043207 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -287,7 +287,7 @@
       - state: equipped-head-light-vox
         shader: unshaded
       head-reptilian:
-      - state: equipped-head-light-reptilian # DeltaV - Use light state instead of base
+      - state: equipped-head-light-reptilian
         shader: unshaded
       head-dog:
       - state: equipped-head-light-dog

From adef13b4db39d4b2e1f457645475bbb1a3f49a84 Mon Sep 17 00:00:00 2001
From: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Date: Thu, 8 Jan 2026 06:35:39 -0800
Subject: [PATCH 255/360] fix electrify sound effects being reversed (#42294)

* The Fix

* The Fix Part 2
---
 .../Electrocution/Components/ElectrifiedComponent.cs          | 4 ++--
 .../Remotes/EntitySystems/SharedDoorRemoteSystem.cs           | 4 ++--
 .../Silicons/StationAi/SharedStationAiSystem.Airlock.cs       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs b/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs
index 1de5b47c57..c780a263de 100644
--- a/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs
+++ b/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs
@@ -112,10 +112,10 @@ public sealed partial class ElectrifiedComponent : Component
     public SoundSpecifier ShockNoises = new SoundCollectionSpecifier("sparks");
 
     [DataField, AutoNetworkedField]
-    public SoundPathSpecifier AirlockElectrifyDisabled = new("/Audio/Machines/airlock_electrify_on.ogg");
+    public SoundPathSpecifier AirlockElectrifyDisabled = new("/Audio/Machines/airlock_electrify_off.ogg");
 
     [DataField, AutoNetworkedField]
-    public SoundPathSpecifier AirlockElectrifyEnabled = new("/Audio/Machines/airlock_electrify_off.ogg");
+    public SoundPathSpecifier AirlockElectrifyEnabled = new("/Audio/Machines/airlock_electrify_on.ogg");
 
     [DataField, AutoNetworkedField]
     public bool PlaySoundOnShock = true;
diff --git a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
index 7af311cc1e..0c562a6de3 100644
--- a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
+++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
@@ -123,8 +123,8 @@ public abstract class SharedDoorRemoteSystem : EntitySystem
                 {
                     _electrify.SetElectrified((args.Target.Value, eletrifiedComp), !eletrifiedComp.Enabled);
                     var soundToPlay = eletrifiedComp.Enabled
-                        ? eletrifiedComp.AirlockElectrifyDisabled
-                        : eletrifiedComp.AirlockElectrifyEnabled;
+                        ? eletrifiedComp.AirlockElectrifyEnabled
+                        : eletrifiedComp.AirlockElectrifyDisabled;
                     _audio.PlayLocal(soundToPlay, args.Target.Value, args.User);
                     _adminLogger.Add(LogType.Action,
                         LogImpact.Medium,
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
index f11cba419e..68025ac515 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
@@ -101,8 +101,8 @@ public abstract partial class SharedStationAiSystem
         _adminLogger.Add(LogType.Action, $"{args.User} set electrified status on {ent} to [{args.Electrified}] using the Station AI radial.");
         _electrify.SetElectrified((ent, component), args.Electrified);
         var soundToPlay = component.Enabled
-            ? component.AirlockElectrifyDisabled
-            : component.AirlockElectrifyEnabled;
+            ? component.AirlockElectrifyEnabled
+            : component.AirlockElectrifyDisabled;
         _audio.PlayLocal(soundToPlay, ent, args.User);
     }
 }

From eb51cc6861ef8b8d9fe612cd07fd2184bbef9f9f Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 8 Jan 2026 14:09:23 -0500
Subject: [PATCH 256/360] Fix forced vaping checking if the user's mouth is
 blocked instead of the target's. (#42311)

Swap user and target arguments of IngestionSystem.HasMouthAvailable call.
---
 Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index 871a15ee73..547801c7ae 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -42,7 +42,7 @@ namespace Content.Server.Nutrition.EntitySystems
             if (!args.CanReach
                 || !_solutionContainerSystem.TryGetRefillableSolution(entity.Owner, out _, out var solution)
                 || !HasComp<BloodstreamComponent>(args.Target)
-                || !_ingestion.HasMouthAvailable(args.Target.Value, args.User)
+                || !_ingestion.HasMouthAvailable(args.User, args.Target.Value)
                 )
             {
                 return;

From 483989e1b13878b80661ca7c1028e395f4876d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Thu, 8 Jan 2026 13:25:15 -0600
Subject: [PATCH 257/360] Remove battery from the handheld health analyzer
 (#42292)

* commit

* review

* review 2

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Resources/Migrations/migration.yml            |  4 ++
 .../Specific/Medical/healthanalyzer.yml       | 50 ++-----------------
 .../Specific/Robotics/borg_modules.yml        | 10 ++--
 .../Prototypes/Recipes/Lathes/medical.yml     |  2 +-
 4 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 203f26be32..8db3e9a1f1 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -712,3 +712,7 @@ GlowstickBase: GlowstickGreen
 FigureSpawner: MechFigurineSpawner50
 ToySpawner: PlushieSpawner50
 SpacemenFigureSpawner: SpacemenFigurineSpawner90
+
+# 2026-01-07
+HandheldHealthAnalyzerUnpowered: HandheldHealthAnalyzer
+HandheldHealthAnalyzerEmpty: HandheldHealthAnalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 12186a2df3..bd0f03384e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -1,19 +1,15 @@
 - type: entity
-  id: HandheldHealthAnalyzerUnpowered
   parent: BaseItem
+  id: HandheldHealthAnalyzer
   name: health analyzer
-  suffix: Always Powered
   description: A hand-held body scanner capable of distinguishing vital signs of the subject.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/healthanalyzer.rsi
-    state: icon
     layers:
-      - state: icon
-      - state: analyzer
-        shader: unshaded
-        visible: true
-        map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+    - state: icon
+    - state: analyzer
+      shader: unshaded
   - type: Item
     heldPrefix: analyzer
     storedRotation: -90
@@ -31,43 +27,7 @@
       path: "/Audio/Items/Medical/healthscanner.ogg"
   - type: Tag
     tags:
-      - DiscreteHealthAnalyzer
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.BatteryVisuals.State:
-        enum.PowerDeviceVisualLayers.Powered:
-          Full: { visible: true }
-          Neither: { visible: true }
-          Empty: { visible: false }
+    - DiscreteHealthAnalyzer
   - type: GuideHelp
     guides:
     - MedicalDoctor
-
-- type: entity
-  id: HandheldHealthAnalyzer
-  parent: [ HandheldHealthAnalyzerUnpowered, PowerCellSlotSmallItem]
-  suffix: ""
-  components:
-  - type: BatteryVisuals
-  - type: PowerCellDraw
-    drawRate: 1.2 #Calculated for 5 minutes on a small cell
-  - type: ToggleCellDraw
-  - type: ActivatableUIRequiresPowerCell
-
-- type: entity
-  id: HandheldHealthAnalyzerEmpty
-  parent: HandheldHealthAnalyzer
-  suffix: Empty
-  components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: analyzer
-      shader: unshaded
-      visible: false
-      map: [ "enum.PowerDeviceVisualLayers.Powered" ]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 1e11068c88..51634359f8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -879,7 +879,7 @@
     - state: icon-diagnosis
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: ClothingNeckStethoscope
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
@@ -895,7 +895,7 @@
     - state: icon-treatment
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: Gauze
       hand:
         emptyLabel: borg-slot-topicals-empty
@@ -938,7 +938,7 @@
     - state: icon-defib
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: DefibrillatorOneHandedUnpowered
     - item: HandheldCrewMonitorUnpowered # DeltaV
     - item: Crowbar
@@ -959,7 +959,7 @@
     - state: icon-chem
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: JetInjector # DeltaV
     - item: Syringe
     - item: BorgDropper
@@ -1025,7 +1025,7 @@
     - state: icon-chemist
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: BorgHypo
     - item: Syringe
     - item: BorgDropper
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index b8b39ae175..b81066d067 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -74,7 +74,7 @@
 
 - type: latheRecipe
   id: HandheldHealthAnalyzer
-  result: HandheldHealthAnalyzerEmpty
+  result: HandheldHealthAnalyzer
   categories:
   - Tools
   completetime: 4

From ebefff61a223b53d45e20d3bcd70dd25148c3b34 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 8 Feb 2026 08:32:47 +0100
Subject: [PATCH 258/360] Downstream fixes for #42292 (Handheld health
 analyzer)

---
 .../Entities/Objects/Specific/Robotics/borg_modules.yml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
index 141894182f..7517769112 100644
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -10,7 +10,7 @@
       sprite: _Shitmed/Objects/Specific/Robotics/borgmodule.rsi
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: Scalpel
     - item: Hemostat
     - item: Retractor
@@ -25,7 +25,7 @@
         whitelist:
           tags:
           - Soap
-    - hand: 
+    - hand:
         emptyLabel: borg-slot-organ-empty
         emptyRepresentative: OrganHumanBrain
         whitelist:
@@ -47,7 +47,7 @@
       sprite: _Shitmed/Objects/Specific/Robotics/borgmodule.rsi
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered # DeltaV - Add Scanners to Surgery Modules.
+    - item: HandheldHealthAnalyzer # DeltaV - Add Scanners to Surgery Modules.
     - item: EnergyScalpel
       hand:
         emptyLabel: borg-slot-surgery-tool-empty
@@ -83,7 +83,7 @@
         whitelist:
           tags:
           - Soap
-    - hand: 
+    - hand:
         emptyLabel: borg-slot-organ-empty
         emptyRepresentative: OrganHumanBrain
         whitelist:

From 0ae4843e03e90a7b8a353cb7fc8ffd17e8433981 Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Thu, 8 Jan 2026 14:25:43 -0500
Subject: [PATCH 259/360] fix: respect AllowedSlots for gogo hat (#39189)

---
 .../VoiceTrigger/StorageVoiceControlSystem.cs      |  5 ++---
 .../Inventory/InventorySystem.Helpers.cs           | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
index ade861af98..7b58278d08 100644
--- a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
+++ b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
@@ -30,10 +30,9 @@ public sealed class StorageVoiceControlSystem : EntitySystem
 
     private void VoiceTriggered(Entity<StorageVoiceControlComponent> ent, ref VoiceTriggeredEvent args)
     {
-        // Check if the component has any slot restrictions via AllowedSlots
         // If it has slot restrictions, check if the item is in a slot that is allowed
-        if (ent.Comp.AllowedSlots != null && _inventory.TryGetContainingSlot(ent.Owner, out var itemSlot) &&
-            (itemSlot.SlotFlags & ent.Comp.AllowedSlots) == 0)
+        if (ent.Comp.AllowedSlots is { } allowedSlots
+            && !_inventory.InSlotWithAnyFlags(ent.Owner, allowedSlots))
             return;
 
         // Get the storage component
diff --git a/Content.Shared/Inventory/InventorySystem.Helpers.cs b/Content.Shared/Inventory/InventorySystem.Helpers.cs
index 259c3b6c8d..4c56a5da43 100644
--- a/Content.Shared/Inventory/InventorySystem.Helpers.cs
+++ b/Content.Shared/Inventory/InventorySystem.Helpers.cs
@@ -47,14 +47,26 @@ public partial class InventorySystem
     }
 
     /// <summary>
-    ///     Returns true if the given entity is equipped to an inventory slot with the given inventory slot flags.
+    /// Returns true if the given entity is equipped to an inventory slot with exactly matching inventory slot flags.
     /// </summary>
+    /// <seealso cref="InSlotWithAnyFlags" />
     public bool InSlotWithFlags(Entity<TransformComponent?, MetaDataComponent?> entity, SlotFlags flags)
     {
         return TryGetContainingSlot(entity, out var slot)
                && (slot.SlotFlags & flags) == flags;
     }
 
+    /// <summary>
+    /// Returns true if the given entity is equipped to an inventory slot that
+    /// has any flags in common with the given ones.
+    /// </summary>
+    /// <seealso cref="InSlotWithFlags" />
+    public bool InSlotWithAnyFlags(Entity<TransformComponent?, MetaDataComponent?> ent, SlotFlags flags)
+    {
+        return TryGetContainingSlot(ent, out var slot)
+               && (slot.SlotFlags & flags) != 0;
+    }
+
     public bool SpawnItemInSlot(EntityUid uid, string slot, string prototype, bool silent = false, bool force = false, InventoryComponent? inventory = null)
     {
         if (!Resolve(uid, ref inventory, false))

From 32d5681e9e68a405b6aeffbdddf429f7491e7203 Mon Sep 17 00:00:00 2001
From: LevitatingTree <114672939+LevitatingTree@users.noreply.github.com>
Date: Thu, 8 Jan 2026 23:29:44 +0400
Subject: [PATCH 260/360] Bring back shrug sanitization in a different form
 (#41236)

* Re-add chat-san & add o//

* changed o// to :?
---
 Content.Server/Chat/Managers/ChatSanitizationManager.cs | 1 +
 Resources/Locale/en-US/chat/sanitizer-replacements.ftl  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index bf51c4f3d4..b239b5e191 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -66,6 +66,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         Entry(".-.", "chatsan-confused"),
         Entry("-_-", "chatsan-unimpressed"),
         Entry("smh", "chatsan-unimpressed"),
+        Entry(":?", "chatsan-shrugs"),
         Entry("o/", "chatsan-waves"),
         Entry("^^/", "chatsan-waves"),
         Entry(":/", "chatsan-uncertain"),
diff --git a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
index 507eac652c..857bbde1a0 100644
--- a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
+++ b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
@@ -18,5 +18,6 @@ chatsan-unimpressed = seems unimpressed
 chatsan-waves = waves
 chatsan-salutes = salutes
 chatsan-tearfully-salutes = tearfully salutes
+chatsan-shrugs = shrugs
 chatsan-tearfully-smiles = tearfully smiles
 chatsan-winks = winks
\ No newline at end of file

From 04b9645b62aa258247e0de159e88a53b1edc7dd6 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 8 Jan 2026 16:18:23 -0500
Subject: [PATCH 261/360] Fix broken state when attempting to escape a locker
 while cuffed (#42313)

Check that the DoAfter starts successfully instead of just assuming it does.
---
 Content.Server/Resist/ResistLockerSystem.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Resist/ResistLockerSystem.cs b/Content.Server/Resist/ResistLockerSystem.cs
index 3698306b31..df77dcb272 100644
--- a/Content.Server/Resist/ResistLockerSystem.cs
+++ b/Content.Server/Resist/ResistLockerSystem.cs
@@ -57,9 +57,12 @@ public sealed class ResistLockerSystem : EntitySystem
             NeedHand = false, //No hands 'cause we be kickin'
         };
 
+        // Make sure the do after is able to start
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+            return;
+
         resistLockerComponent.IsResisting = true;
         _popupSystem.PopupEntity(Loc.GetString("resist-locker-component-start-resisting"), user, user, PopupType.Large);
-        _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
     }
 
     private void OnDoAfter(EntityUid uid, ResistLockerComponent component, DoAfterEvent args)

From 865277156b4057d3a44ddc88522080d64c2f4b80 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 8 Jan 2026 16:35:39 -0800
Subject: [PATCH 262/360] Allow items spawned in the smart fridge to show up as
 an entry. (#42268)

* Allow items spawned in the smart fridge to show up in the view

* AAAAAAAAAAAAAAAAAA

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../_DV/SmartFridge/SmartFridgeSystem.cs      | 18 ++++++++++++
 .../_DV/SmartFridge/SmartFridgeUISystem.cs    | 24 ---------------
 .../_DV/SmartFridge/SmartFridgeSystem.cs      |  5 ++++
 .../Storage/EntitySystems/DumpableSystem.cs   |  2 +-
 ...geSystem.cs => SharedSmartFridgeSystem.cs} | 29 ++++++++++++++++++-
 .../_DV/SmartFridge/SmartFridgeComponent.cs   |  2 ++
 6 files changed, 54 insertions(+), 26 deletions(-)
 create mode 100644 Content.Client/_DV/SmartFridge/SmartFridgeSystem.cs
 delete mode 100644 Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs
 create mode 100644 Content.Server/_DV/SmartFridge/SmartFridgeSystem.cs
 rename Content.Shared/_DV/SmartFridge/{SmartFridgeSystem.cs => SharedSmartFridgeSystem.cs} (86%)

diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeSystem.cs b/Content.Client/_DV/SmartFridge/SmartFridgeSystem.cs
new file mode 100644
index 0000000000..e68f0eb598
--- /dev/null
+++ b/Content.Client/_DV/SmartFridge/SmartFridgeSystem.cs
@@ -0,0 +1,18 @@
+using Content.Shared._DV.SmartFridge;
+
+namespace Content.Client._DV.SmartFridge;
+
+public sealed class SmartFridgeSystem : SharedSmartFridgeSystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+
+    protected override void UpdateUI(Entity<SmartFridgeComponent> ent)
+    {
+        base.UpdateUI(ent);
+
+        if (!_uiSystem.TryGetOpenUi<SmartFridgeBoundUserInterface>(ent.Owner, SmartFridgeUiKey.Key, out var bui))
+            return;
+
+        bui.Refresh();
+    }
+}
diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs b/Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs
deleted file mode 100644
index 32589dd5f7..0000000000
--- a/Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared._DV.SmartFridge;
-using Robust.Shared.Analyzers;
-
-namespace Content.Client._DV.SmartFridge;
-
-public sealed class SmartFridgeUISystem : EntitySystem
-{
-    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SmartFridgeComponent, AfterAutoHandleStateEvent>(OnSmartFridgeAfterState);
-    }
-
-    private void OnSmartFridgeAfterState(Entity<SmartFridgeComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        if (!_uiSystem.TryGetOpenUi<SmartFridgeBoundUserInterface>(ent.Owner, SmartFridgeUiKey.Key, out var bui))
-            return;
-
-        bui.Refresh();
-    }
-}
diff --git a/Content.Server/_DV/SmartFridge/SmartFridgeSystem.cs b/Content.Server/_DV/SmartFridge/SmartFridgeSystem.cs
new file mode 100644
index 0000000000..7474a28222
--- /dev/null
+++ b/Content.Server/_DV/SmartFridge/SmartFridgeSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._DV.SmartFridge;
+
+namespace Content.Server._DV.SmartFridge;
+
+public sealed class SmartFridgeSystem : SharedSmartFridgeSystem;
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index 83987c1498..734d3abc56 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -26,7 +26,7 @@ public sealed class DumpableSystem : EntitySystem
     [Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-    [Dependency] private readonly SmartFridgeSystem _fridge = default!; // DeltaV - ough why do you not use events for this
+    [Dependency] private readonly SharedSmartFridgeSystem _fridge = default!; // DeltaV - ough why do you not use events for this
 
     private EntityQuery<ItemComponent> _itemQuery;
 
diff --git a/Content.Shared/_DV/SmartFridge/SmartFridgeSystem.cs b/Content.Shared/_DV/SmartFridge/SharedSmartFridgeSystem.cs
similarity index 86%
rename from Content.Shared/_DV/SmartFridge/SmartFridgeSystem.cs
rename to Content.Shared/_DV/SmartFridge/SharedSmartFridgeSystem.cs
index e7406e0a29..a27050c8f1 100644
--- a/Content.Shared/_DV/SmartFridge/SmartFridgeSystem.cs
+++ b/Content.Shared/_DV/SmartFridge/SharedSmartFridgeSystem.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._DV.SmartFridge;
 
-public sealed class SmartFridgeSystem : EntitySystem
+public abstract class SharedSmartFridgeSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
@@ -25,7 +25,9 @@ public sealed class SmartFridgeSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<SmartFridgeComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<SmartFridgeComponent, EntInsertedIntoContainerMessage>(OnItemInserted);
         SubscribeLocalEvent<SmartFridgeComponent, EntRemovedFromContainerMessage>(OnItemRemoved);
+        SubscribeLocalEvent<SmartFridgeComponent, AfterAutoHandleStateEvent>((ent, ref _) => UpdateUI(ent));
 
         Subs.BuiEvents<SmartFridgeComponent>(SmartFridgeUiKey.Key,
             sub =>
@@ -119,6 +121,24 @@ public sealed class SmartFridgeSystem : EntitySystem
         _audio.PlayPredicted(ent.Comp.InsertSound, ent, args.User);
     }
 
+    private void OnItemInserted(Entity<SmartFridgeComponent> ent, ref EntInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != ent.Comp.Container || _timing.ApplyingState)
+            return;
+
+        var key = new SmartFridgeEntry(Identity.Name(args.Entity, EntityManager));
+        if (!ent.Comp.Entries.Contains(key))
+            ent.Comp.Entries.Add(key);
+
+        ent.Comp.ContainedEntries.TryAdd(key, new());
+        var entries = ent.Comp.ContainedEntries[key];
+        if (!entries.Contains(GetNetEntity(args.Entity)))
+            entries.Add(GetNetEntity(args.Entity));
+
+        Dirty(ent);
+        UpdateUI(ent);
+    }
+
     private void OnItemRemoved(Entity<SmartFridgeComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         var key = new SmartFridgeEntry(Identity.Name(args.Entity, EntityManager));
@@ -129,6 +149,7 @@ public sealed class SmartFridgeSystem : EntitySystem
         }
 
         Dirty(ent);
+        UpdateUI(ent);
     }
 
     private bool Allowed(Entity<SmartFridgeComponent> machine, EntityUid user)
@@ -162,6 +183,7 @@ public sealed class SmartFridgeSystem : EntitySystem
             contained.Remove(item);
             ent.Comp.EjectEnd = _timing.CurTime + ent.Comp.EjectCooldown;
             Dirty(ent);
+            UpdateUI(ent);
             return;
         }
 
@@ -182,4 +204,9 @@ public sealed class SmartFridgeSystem : EntitySystem
         ent.Comp.Entries.Remove(args.Entry);
         Dirty(ent);
     }
+
+    protected virtual void UpdateUI(Entity<SmartFridgeComponent> ent)
+    {
+
+    }
 }
diff --git a/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs
index f85ca5708f..7268dded55 100644
--- a/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs
+++ b/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs
@@ -10,6 +10,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 namespace Content.Shared._DV.SmartFridge;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
+[Access(typeof(SharedSmartFridgeSystem))]
 public sealed partial class SmartFridgeComponent : Component
 {
     [DataField]
@@ -28,6 +29,7 @@ public sealed partial class SmartFridgeComponent : Component
     public HashSet<SmartFridgeEntry> Entries = new();
 
     [DataField, AutoNetworkedField]
+    [Access(typeof(SharedSmartFridgeSystem), Other = AccessPermissions.ReadExecute)]
     public Dictionary<SmartFridgeEntry, HashSet<NetEntity>> ContainedEntries = new();
 
     [DataField]

From 44e41d501978db94fc8101ce7294c341d98f72b4 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 7 Feb 2026 21:06:25 +0100
Subject: [PATCH 263/360] Downstream fixes for #29413

---
 .../Entities/Objects/Specific/Chemistry/chemical-containers.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
index d81715d497..1dafa149f1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
@@ -21,6 +21,8 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     inHandsMaxFillLevels: 5
+    fillBaseName: jug # DeltaV - Resprited some medical items
+    inHandsFillBaseName: -fill- # DeltaV - Resprited some medical items
   - type: ExaminableSolution
     exactVolume: true # Chemistry item
   - type: StaticPrice

From 1cf546113da91394c980cc00d420ff66b55de79c Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Fri, 9 Jan 2026 14:00:36 +1000
Subject: [PATCH 264/360] Add craft for bonfire and bonfire with stake (#42211)

* Add craft for bonfire and bonfire with stake

* review

* review

* nullable MaxFireStacks

* retry

* retry

* review

* I will change it and hope that they will agree with me

* Revert "I will change it and hope that they will agree with me"

This reverts commit 83823692d0116bf9aa9eceb85a10e95c88b51fb9.

* construction

Merged the graphs
Changed the bonfire stake ID to follow the proper naming scheme

* add destroy sound

* planks Instead of logs

* of course I forgot about ftl

* Slarti review + Princess review

Yes I sneaked an admeme abuse change here

* a small fix

* clamp firestacks

* This was on purpose, leave as is

This reverts commit 7d63e38b66cb63e5e50b7fac5030013e2ef508b5.

* irrelevant

* Fixtures

* cleanup

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Buckle/Systems/IgniteOnBuckleSystem.cs    |  70 ++++++++++++++++++
 .../ActiveIgniteOnBuckleComponent.cs          |  41 ++++++++++
 .../Components/IgniteOnBuckleComponent.cs     |  31 ++++++++
 .../Structures/Decoration/bonfire.yml         |  62 ++++++++++++++--
 .../Recipes/Construction/structures.yml       |  28 ++++++-
 .../Recipes/Crafting/Graphs/bonfire.yml       |  42 +++++++++++
 .../Decoration/bonfire_stake.rsi/bonfire.png  | Bin 0 -> 3359 bytes
 .../bonfire_extinguished.png                  | Bin 0 -> 3837 bytes
 .../Decoration/bonfire_stake.rsi/burning.png  | Bin 0 -> 4168 bytes
 .../bonfire_stake.rsi/legionnaire_bonfire.png | Bin 0 -> 4161 bytes
 .../Decoration/bonfire_stake.rsi/meta.json    |  37 +++++++++
 11 files changed, 302 insertions(+), 9 deletions(-)
 create mode 100644 Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs
 create mode 100644 Content.Shared/Buckle/Components/ActiveIgniteOnBuckleComponent.cs
 create mode 100644 Content.Shared/Buckle/Components/IgniteOnBuckleComponent.cs
 create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml
 create mode 100644 Resources/Textures/Structures/Decoration/bonfire_stake.rsi/bonfire.png
 create mode 100644 Resources/Textures/Structures/Decoration/bonfire_stake.rsi/bonfire_extinguished.png
 create mode 100644 Resources/Textures/Structures/Decoration/bonfire_stake.rsi/burning.png
 create mode 100644 Resources/Textures/Structures/Decoration/bonfire_stake.rsi/legionnaire_bonfire.png
 create mode 100644 Resources/Textures/Structures/Decoration/bonfire_stake.rsi/meta.json

diff --git a/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs b/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs
new file mode 100644
index 0000000000..e7d088df7f
--- /dev/null
+++ b/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs
@@ -0,0 +1,70 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Buckle.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Buckle.Systems;
+
+public sealed class IgniteOnBuckleSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<IgniteOnBuckleComponent, StrappedEvent>(OnStrapped);
+        SubscribeLocalEvent<IgniteOnBuckleComponent, UnstrappedEvent>(OnUnstrapped);
+
+        SubscribeLocalEvent<ActiveIgniteOnBuckleComponent, MapInitEvent>(ActiveOnInit);
+    }
+
+    private void OnStrapped(Entity<IgniteOnBuckleComponent> ent, ref StrappedEvent args)
+    {
+        // We cache the values here to the other component.
+        // This is done so we have to do less lookups
+        var comp = EnsureComp<ActiveIgniteOnBuckleComponent>(args.Buckle);
+        comp.FireStacks = ent.Comp.FireStacks;
+        comp.MaxFireStacks = ent.Comp.MaxFireStacks;
+        comp.IgniteTime = ent.Comp.IgniteTime;
+    }
+
+    private void ActiveOnInit(Entity<ActiveIgniteOnBuckleComponent> ent, ref MapInitEvent args)
+    {
+        // Handle this via a separate MapInit so the component can be added by itself if need be.
+        ent.Comp.NextIgniteTime = _timing.CurTime + ent.Comp.NextIgniteTime;
+        Dirty(ent);
+    }
+
+    private void OnUnstrapped(Entity<IgniteOnBuckleComponent> ent, ref UnstrappedEvent args)
+    {
+        RemCompDeferred<ActiveIgniteOnBuckleComponent>(args.Buckle);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+
+        var query = EntityQueryEnumerator<ActiveIgniteOnBuckleComponent, FlammableComponent>();
+        while (query.MoveNext(out var uid, out var igniteComponent, out var flammableComponent))
+        {
+            if (curTime < igniteComponent.NextIgniteTime)
+                continue;
+
+            igniteComponent.NextIgniteTime += TimeSpan.FromSeconds(igniteComponent.IgniteTime);
+            Dirty(uid, igniteComponent);
+
+            if (flammableComponent.FireStacks > igniteComponent.MaxFireStacks)
+                continue;
+
+            var stacks = flammableComponent.FireStacks + igniteComponent.FireStacks;
+            if (igniteComponent.MaxFireStacks.HasValue)
+                stacks = Math.Min(stacks, igniteComponent.MaxFireStacks.Value);
+
+            _flammable.SetFireStacks(uid, stacks, flammableComponent, true);
+        }
+    }
+}
diff --git a/Content.Shared/Buckle/Components/ActiveIgniteOnBuckleComponent.cs b/Content.Shared/Buckle/Components/ActiveIgniteOnBuckleComponent.cs
new file mode 100644
index 0000000000..f4fd4f59a4
--- /dev/null
+++ b/Content.Shared/Buckle/Components/ActiveIgniteOnBuckleComponent.cs
@@ -0,0 +1,41 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Buckle.Components;
+
+/// <summary>
+/// Component for entities that are currently being ignited by <see cref="IgniteOnBuckleComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentPause, AutoGenerateComponentState]
+public sealed partial class ActiveIgniteOnBuckleComponent : Component
+{
+    // We cache data in this component and apply it to those who get buckled to have to do less lookups.
+
+    /// <summary>
+    /// How many fire stacks to add per cycle.
+    /// </summary>
+    [DataField]
+    public float FireStacks = 0.5f;
+
+    /// <summary>
+    /// How frequently the ignition should be applied, in seconds.
+    /// </summary>
+    [DataField]
+    public float IgniteTime = 1f;
+
+    /// <summary>
+    /// Maximum fire stacks that can be added by this source.
+    /// If target already has this many or more fire stacks, no additional stacks will be added.
+    /// Null means unlimited.
+    /// </summary>
+    [DataField]
+    public float? MaxFireStacks = 2.5f;
+
+    /// <summary>
+    /// Next time that fire stacks will be applied.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField, AutoNetworkedField]
+    public TimeSpan NextIgniteTime = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Buckle/Components/IgniteOnBuckleComponent.cs b/Content.Shared/Buckle/Components/IgniteOnBuckleComponent.cs
new file mode 100644
index 0000000000..61af16f792
--- /dev/null
+++ b/Content.Shared/Buckle/Components/IgniteOnBuckleComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Buckle.Components;
+
+/// <summary>
+/// Component that makes an entity ignite entities that are buckled to it.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class IgniteOnBuckleComponent : Component
+{
+    /// <summary>
+    /// How many fire stacks to add per cycle.
+    /// </summary>
+    [DataField]
+    public float FireStacks = 0.5f;
+
+    /// <summary>
+    /// How frequently the ignition should be applied, in seconds.
+    /// </summary>
+    [DataField]
+    public float IgniteTime = 1f;
+
+    /// <summary>
+    /// Maximum fire stacks that can be added by this source.
+    /// If target already has this many or more fire stacks, no additional stacks will be added.
+    /// Null means unlimited.
+    /// </summary>
+    [DataField]
+    public float? MaxFireStacks = 2.5f;
+}
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index b60b2bd943..d28abb2b63 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -1,15 +1,22 @@
 - type: entity
-  id: Bonfire
+  abstract: true
   parent: BaseStructure
-  name: bonfire
-  description: What can be better than a late evening under the sky with guitar and friends?
+  id: BaseBonfire
   components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.4
+        mask:
+        - Impassable
+        layer:
+        - Opaque
+        - BulletImpassable
   - type: Sprite
     noRot: true
     sprite: Structures/Decoration/bonfire.rsi
-    layers:
-      - state: bonfire
-      - state: burning
   - type: PointLight
     radius: 5
     energy: 3
@@ -23,6 +30,9 @@
           !type:DamageTrigger
           damage: 50
         behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: WoodDestroy
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
   - type: AmbientSound
@@ -31,15 +41,51 @@
     sound:
       path: /Audio/Ambience/Objects/fireplace.ogg
   - type: AlwaysHot
+  - type: IgnitionSource
+    temperature: 700
+    ignited: true
 
 - type: entity
+  parent: BaseBonfire
+  id: Bonfire
+  name: bonfire
+  description: What can be better than a late evening under the sky with guitar and friends?
+  components:
+  - type: Sprite
+    layers:
+    - state: burning
+  - type: Construction
+    graph: Bonfire
+    node: bonfire
+
+- type: entity
+  parent: BaseBonfire
+  id: BonfireStake
+  name: bonfire with stake
+  description: A sinister bonfire with a stake for... ceremonial purposes. Best not to ask.
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/bonfire_stake.rsi
+    layers:
+    - state: burning
+    offset: "0, 0.5"
+  - type: Strap
+    position: Stand
+    buckleOffset: "0, 0.5"
+    buckleDoafterTime: 5
+  - type: IgniteOnBuckle
+  - type: Construction
+    graph: Bonfire
+    node: bonfireStake
+
+- type: entity
+  parent: BaseBonfire
   id: LegionnaireBonfire
-  parent: Bonfire
   name: legionnaire bonfire
   description: There, in the land of lava and ash, place to to cook marshmallow and potato.
   components:
   - type: Sprite
     layers:
-      - state: legionnaire_bonfire
+    - state: legionnaire_bonfire
   - type: PointLight
     color: "#FF5601"
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index f615471844..68de6c3268 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1328,4 +1328,30 @@
   canRotate: false
   canBuildInImpassable: false
   conditions:
-    - !type:TileNotBlocked
\ No newline at end of file
+    - !type:TileNotBlocked
+
+- type: construction
+  id: Bonfire
+  graph: Bonfire
+  startNode: start
+  targetNode: bonfire
+  category: construction-category-structures
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  id: BonfireStake
+  graph: Bonfire
+  startNode: start
+  targetNode: bonfireStake
+  category: construction-category-structures
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml
new file mode 100644
index 0000000000..98ec98d46e
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml
@@ -0,0 +1,42 @@
+- type: constructionGraph
+  id: Bonfire
+  start: start
+  graph:
+
+  - node: start
+    edges:
+    - to: bonfire
+      steps:
+      - material: WoodPlank
+        amount: 10
+        doAfter: 4
+
+  - node: bonfire
+    entity: Bonfire
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialWoodPlank1
+        amount: 10
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Prying
+        doAfter: 4
+    - to: bonfireStake
+      steps:
+      - material: WoodPlank
+        amount: 2
+        doAfter: 2
+
+  - node: bonfireStake
+    entity: BonfireStake
+    edges:
+    - to: bonfire
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialWoodPlank1
+        amount: 2
+      steps:
+      - tool: Prying
+        doAfter: 1
diff --git a/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/bonfire.png b/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/bonfire.png
new file mode 100644
index 0000000000000000000000000000000000000000..f197142c74f90b4d2c9d030caa9fd452db375dc9
GIT binary patch
literal 3359
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
azwF;%_v*6kAA8k-yt<;s@kW_v<-Y+m&VQx=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/bonfire_extinguished.png b/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/bonfire_extinguished.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e629e1a6f0dff6c1c35b5bedd31e3c4b5d9b0c
GIT binary patch
literal 3837
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
b)5EmTy0uxAS&=CG+Coy2W?6P6<W>C({4g*m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/burning.png b/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/burning.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd5ccf1f1097f8ff027bda0fa4fc04bae4147fba
GIT binary patch
literal 4168
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
JCGKIV{{hP16wUwu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/legionnaire_bonfire.png b/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/legionnaire_bonfire.png
new file mode 100644
index 0000000000000000000000000000000000000000..d130f9625203f01200d4ae1a4b96e79dedfa5c66
GIT binary patch
literal 4161
zcmcIn2~-o;8lC`xV1<Z^OHqa>i^61?ge)ToB2YnP5m1y`Wim4fk!&OZqNTFbK1Bto
z&sIe#_F%Qh1Gg5jD2ceBEfp<Vs0#*Jw8xFbx;(MG2}^2wu=-wKbIxS$-1+aneE;|V
z_fAe!#N5#ilN|s67#$WG98KO6$ZPgUTk^l1qj3ZPil;0nC@K(Fi3u=z?i|pYB@pmu
z0DyNrmXH9eb;%mSIU(WP_dYWmG-=W6*KdkW2&gxnHP!*PIp@!e$fHn1VCwQU%V%2K
zK26Qd8WX(Y#}PZu%${tTNB5pd`5_~-$=l;={*J7yOTf7cbjA!|1N#EyaLAU!C-030
zQx}Hjv-3Z&IoC0N-N6HyO<~l>W2sdm@7ROSM}>ZXZ2$f=g=<&yDdo`oXrI}SVgBt2
zu`a}3=~nNF@$vC9`Fq>EzL;qf=dx{2hl`KC!{hdZ@of`4KHakyxH9LuoozPtquta7
zVC7dA@!c?R#(M290;+5ECb5(%9+|%^KGv3i;YnjVrqykqcG74vY|YAQcbZeTXImDU
z<!Ei)7rS<QfxGpGnIh{`)dIkHHuA+Jgu9Fc&R!k5R0{y3#+ok*P_SzvIoBqOU7}kO
zz5u~g3OZ_rlde~&NofG^574VoEQ!#8VnQlY3TY3k3^Y)N3u$qF;mmM#5RoVgU9BNv
zR!78QtCKJRP74r${(6K|pdfT8s8`69T0}3T_3K5*v3Z(71N%jENkZB{{+5JCfk7$_
z0dna~2xBr~kSCzCxEv0j?+e0An8{%B7%V0P!w8d$__4vkAC0u8!6is^@H>OH$R{B!
zQKwTQ3`Sa78a<6oS81dSk{bdB6K23LL`p!~RZ1PIhm_iBLmGk!EvAvFbuyI_G;2h~
zsuZ1&MtV9Bf<kRktJDs{L;}XpqiP0=&NPSAFNk9nIdzIg-ftYo7=)Zq5K5hvlx10D
z)rl&dN}H&9g=)*|-x(mG4G*{27}ghs!eT<J3rQuz7zAWkX>IH(HNl7`w5k*hMueo2
zZcZDDMyrb^e#7$(mXqTBi`7VwhCp>HO{_{KAIfsnP`n@v)0v=moJ@(U(zG+o)&>_4
z!KjW9(#VwiK`a<zvtnTu0{bB_--pFSn9Kpua1}0-tQt;~!$Vk{--(iZ!%-djT45YR
zBr1&pCDD>8P$|JsE2T8hk^>}2C0A)k!=!iYm*>OCCZthGWODMwADdCXx8dPPm{O}l
zl^78gEToa4(q%Fn!Esaqa|khnGkGv1K{*^q%n|b-9Oq$735UtXQP$A<U=@~PrjL33
zKqcWSjMVX)cZ3APaGZrh5`rgyBrFaNp=^{7vHWm8kIk3BOo`u+wn&YPEM`>xvR1QK
zxY;Wn8xzA49^{8|IS|3&a3KMUOV*?xjB{{|g)%v~xn%lTh=j_tWQtb}7GVsLJUEie
zz<%N(C}u7wAq_K=fxu~l)3V|4coWNm>(demQt6+NWWc&sCDEm!8X{0iVmFkXSCWwN
zO6OI|R6_HT`)X8!l6{QOXoWP1Mx_8PgaLIb5LK(?G7L2b&PY|_gT2C%D%vaUXwlR^
zhe#q2bJzr*1u-QOKE&a21P~u5cn~2F3oteZL%A?#2;$)&VsjCW-%xS<FAxpFk0qi?
zDM9W6jK2^JpAZl*TTI3w;ldCP<%l5xE@46fg2zV1<Q9Ol|1_B2Rr=o?4E9<Eye8>p
zURX%-YS3^(BYTMhFZ0ae0@%;E|Bt=bGVaZq)ByU!G45|l62rVh540P`A3M>&bMOF?
z@0hEze-lH7>p5@AL2_3^$c}62!T(ja9JH_ct6kUJH~IsA>8LU^MV^1mL(9R7e6Sqd
z2qjsm8uDP4z6cHm0Gmr;!GW>*tM?07d1C{qA+>f1)5My!APsB+WFMWg56!2h8J(Tu
zz`$F!)7NLdo!PdPtsX^Z%5%Rd2r!gh6|x`SD}T@DljDysJSyG4;>wMN=JJQn>GwK(
zw@|It0;v1!kyMvg4op|u+ljsh_jjIbdy;hb$KGR#-YX;Y-A@<xb)UJC(Ea?XeWjw8
zYPvq+&f;ImcT~`3BxO$Ku(vAEs64t;zWS|=T<NZ3sq=c5b~1_rehH|~_}=qj<Gh-Z
zF6qgDHTt4L<CEHmni<_*@A>u=8rLir)<>l?G6E!451b8sA6#+^0kU44sN{VKMXmbe
zN%ynK_LcV4o<}}mG`fWYvC9gZ;<CyvxE9<rG(TErDh8fEJ-4!jXIH*gQR`XMnsTT2
z2b;Q<`JEq@)x}M{Ca2(0@7))Ajmv99ySGhGn7LxhXCo>pznV_5Y@$-y7sW?T6?HD^
zTjNWKf97p;N7N1(mnpeZ_$4ncQ?d@bA6H8Pojto^F8Ug`q-0_xT^qOm6Y#5k+jp^(
zlY9|ybm~p4%;{@<XYW?iiQaL1`Ubm}eTN`X$3GsHc9m+U934}^7iEqsvr|tQRa>$D
z^Bkw~%{6o1{kFEgG=1M4|LVIyJ$9^S6QJF~M9-$gIA>yYEk}SO&(6P-F+arEP`s^o
z^3B2|h#$9fj2@#Mx6z+u8ajLoD^BwepmE~esgGrD1~piZQWrE66B`0ARUC}DD7bXp
zBg)xf4J^b0MT^HpIw2l!wHgapJ0ct0^3FFnEUxJ6iN9!MxK6a)z4DexNWmj6CtV(s
zva7IjX4Jz|A-T_LzN2IVd@r{RDyaP2Q5#e8qvc1fsd?Wf|FYROGNabvOiZ9MYyt4l
z#$OZ{K-cp<eiqg>zMs6SBz+U5HBMB!(Y}_}m6~1rW5e`YlX%FsvH9Q3*(|-{9zMHl
zLsL#k`n`E=#en`s{@VL{?_|4(JQZ#Rz17~7A6hrNnoP%>4|V^<`pN0;i)CZHfmtnG
z$pvqBxl@WyPp51RSg`Ku`D=aHf?HlLJzdvJ*2je0&fPFJV_oOM5tH73;9uGE)hvgE
zs`E)!h(dsN=Sm$*3wvtpti0X!eY`ZibIP;g;?47VeKXJ0PuX2ty5#4ZQ=97}ckBWp
z%8##{u*o&lv2~ne5qi>4eIVyRSoIo0lzJK$P2c%!wJ>#uX#D0|`_?VlxWe`8{npOM
ztK%*nkUH6(YLh1X`-XGo<_*GkYi_3`n7rKd_Ys?bqP~V~g?&_OTIF{27p5nlX?lv{
zBIj0389mYGMB=IYo^hW~c<NehtF%98>sEC-x2U4brK)vRPRrzfEe`&?`p|a^z0@DK
z9T^v4TvnZ4J}V#VPKHcRg`$Z1sfM2TF@5b;r9mx~Q9Tt4Z^ty3+&Q7&Q)Rni-+Dp%
z^}7?&zwA8LdqHF6b9Vno`67AD372aJxwlt`Rr;ilm)aYSRL36d@c9V)?pCA5g<9C1
z9gy~GCx4Tp{yDC4Y^YCm$GrS2MR`T+jJ8akSG?n)BTqB7K#r!Rb%LH72ipCmO_b&^
z{Wa*V!|k)0v@LOl{Bpsim1S8)K8Eu-9u<!aEfIx%PCVNOjd?#`wKspVhJ{1~m(NMa
F{tqJD5zYVr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/meta.json b/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/meta.json
new file mode 100644
index 0000000000..666b40dba9
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/bonfire_stake.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from /tg/station at commit 28b476ab6d17014e6f9e18a748d7c96be28de9a1, modified by B_Kirill",
+    "size": {
+        "x": 32,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "bonfire"
+        },
+        {
+            "name": "bonfire_extinguished"
+        },
+        {
+            "name": "burning",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "legionnaire_bonfire",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}

From cb431459fd7086402ea42d71d9ab6029bac58140 Mon Sep 17 00:00:00 2001
From: mikey <23003816+mikeysaurus@users.noreply.github.com>
Date: Thu, 8 Jan 2026 22:44:22 -0800
Subject: [PATCH 265/360] Increase shuttle FTL cooldown to prevent FTL spamming
 (#42209)

* seperate out shuttle cooldowns

* fix

* feedback

* fix spacing

* update to TimeSpan

* GOAT float

* return to TimeSpan

* add var

* clarify with seconds

* clarifying some things
---
 .../Shuttles/Components/ShuttleComponent.cs           |  7 +++++++
 .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 11 ++++++++---
 Content.Shared/CCVar/CCVars.Shuttle.cs                | 11 +++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
index 0aa815d2df..75a162f643 100644
--- a/Content.Server/Shuttles/Components/ShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -68,5 +68,12 @@ namespace Content.Server.Shuttles.Components
         /// </summary>
         [DataField]
         public float DampingModifier;
+
+        /// <summary>
+        /// Optional override for the FTL cooldown for this shuttle.
+        /// If not null, then the value will be used instead of the shuttle.cooldown CCVar.
+        /// </summary>
+        [DataField]
+        public TimeSpan? FTLCooldownOverride = null;
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index e3c225ff85..9ef26fd0ea 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -49,7 +49,8 @@ public sealed partial class ShuttleSystem
     public float DefaultStartupTime;
     public float DefaultTravelTime;
     public float DefaultArrivalTime;
-    private float FTLCooldown;
+    private TimeSpan FTLCooldown;
+    private TimeSpan ArrivalsFTLCooldown;
     public float FTLMassLimit;
     private TimeSpan _hyperspaceKnockdownTime = TimeSpan.FromSeconds(5);
 
@@ -88,7 +89,8 @@ public sealed partial class ShuttleSystem
         _cfg.OnValueChanged(CCVars.FTLStartupTime, time => DefaultStartupTime = time, true);
         _cfg.OnValueChanged(CCVars.FTLTravelTime, time => DefaultTravelTime = time, true);
         _cfg.OnValueChanged(CCVars.FTLArrivalTime, time => DefaultArrivalTime = time, true);
-        _cfg.OnValueChanged(CCVars.FTLCooldown, time => FTLCooldown = time, true);
+        _cfg.OnValueChanged(CCVars.FTLCooldown, time => FTLCooldown = TimeSpan.FromSeconds(time), true);
+        _cfg.OnValueChanged(CCVars.ArrivalsFTLCooldown, time => ArrivalsFTLCooldown = TimeSpan.FromSeconds(time), true);
         _cfg.OnValueChanged(CCVars.FTLMassLimit, time => FTLMassLimit = time, true);
         _cfg.OnValueChanged(CCVars.HyperspaceKnockdownTime, time => _hyperspaceKnockdownTime = TimeSpan.FromSeconds(time), true);
     }
@@ -543,7 +545,10 @@ public sealed partial class ShuttleSystem
         }
 
         comp.State = FTLState.Cooldown;
-        comp.StateTime = StartEndTime.FromCurTime(_gameTiming, FTLCooldown);
+        var cooldown = entity.Comp2.FTLCooldownOverride ?? (HasComp<ArrivalsShuttleComponent>(uid)
+                ? ArrivalsFTLCooldown
+                : FTLCooldown);
+        comp.StateTime = StartEndTime.FromCurTime(_gameTiming, cooldown);
         _console.RefreshShuttleConsoles(uid);
         _mapSystem.SetPaused(mapId, false);
         Smimsh(uid, xform: xform);
diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs
index 28ed146eaf..ad8e9b2d70 100644
--- a/Content.Shared/CCVar/CCVars.Shuttle.cs
+++ b/Content.Shared/CCVar/CCVars.Shuttle.cs
@@ -95,10 +95,17 @@ public sealed partial class CCVars
         CVarDef.Create("shuttle.arrival_time", 5f, CVar.SERVERONLY);
 
     /// <summary>
-    ///     How much time needs to pass before a shuttle can FTL again.
+    ///     How much time in seconds that needs to pass before a non-arrivals shuttle can FTL again.
     /// </summary>
     public static readonly CVarDef<float> FTLCooldown =
-        CVarDef.Create("shuttle.cooldown", 10f, CVar.SERVERONLY);
+        CVarDef.Create("shuttle.cooldown", 60f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How much time in seconds that needs to pass before the arrivals shuttle can FTL again.
+    ///     If this is adjusted, ensure that shuttle.arrivals_cooldown is longer than this value.
+    /// </summary>
+    public static readonly CVarDef<float> ArrivalsFTLCooldown =
+        CVarDef.Create("shuttle.arrivals_ftl_cooldown", 10f, CVar.SERVERONLY);
 
     /// <summary>
     ///     The maximum <see cref="PhysicsComponent.Mass"/> a grid can have before it becomes unable to FTL.

From 9f887379f22627e8e939864f3718212ad14ae9df Mon Sep 17 00:00:00 2001
From: Pok <113675512+Pok27@users.noreply.github.com>
Date: Fri, 9 Jan 2026 16:18:07 +0200
Subject: [PATCH 266/360] Predict DrainSystem (#41711)

* DrainSystem-move-to-shared

* random

* review

* review 2

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Fluids/Components/DrainComponent.cs       |  22 ++-
 .../Fluids/EntitySystems/DrainSystem.cs       | 183 ++++++++++--------
 Content.Shared/Fluids/SharedDrainSystem.cs    |  12 --
 3 files changed, 116 insertions(+), 101 deletions(-)
 rename {Content.Server => Content.Shared}/Fluids/EntitySystems/DrainSystem.cs (53%)
 delete mode 100644 Content.Shared/Fluids/SharedDrainSystem.cs

diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs
index a7d7bbb3ad..83ef676b4d 100644
--- a/Content.Shared/Fluids/Components/DrainComponent.cs
+++ b/Content.Shared/Fluids/Components/DrainComponent.cs
@@ -1,7 +1,10 @@
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Fluids.EntitySystems;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Fluids.Components;
 
@@ -13,18 +16,25 @@ namespace Content.Shared.Fluids.Components;
 /// When the drain is full, it can be unclogged using a plunger (i.e. an entity with a Plunger tag attached).
 /// Later this can be refactored into a proper Plunger component if needed.
 /// </summary>
-[RegisterComponent, Access(typeof(SharedDrainSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(DrainSystem))]
 public sealed partial class DrainComponent : Component
 {
     public const string SolutionName = "drainBuffer";
 
     public static readonly ProtoId<TagPrototype> PlungerTag = "Plunger";
 
+    /// <summary>
+    /// The solution that the drain is using.
+    /// </summary>
     [ViewVariables]
     public Entity<SolutionComponent>? Solution = null;
 
-    [DataField]
-    public float Accumulator = 0f;
+    /// <summary>
+    /// Next time the drain should perform its draining.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
 
     /// <summary>
     /// If true, automatically transfers solutions from nearby puddles and drains them. True for floor drains;
@@ -36,7 +46,7 @@ public sealed partial class DrainComponent : Component
     /// <summary>
     /// How many units per second the drain can absorb from the surrounding puddles.
     /// Divided by puddles, so if there are 5 puddles this will take 1/5 from each puddle.
-    /// This will stay fixed to 1 second no matter what DrainFrequency is.
+    /// This will stay fixed to 1 second no matter what DrainInterval is.
     /// </summary>
     [DataField]
     public float UnitsPerSecond = 6f;
@@ -55,11 +65,11 @@ public sealed partial class DrainComponent : Component
     public float Range = 2.5f;
 
     /// <summary>
-    /// How often in seconds the drain checks for puddles around it.
+    /// How often the drain checks for puddles around it.
     /// If the EntityQuery seems a bit unperformant this can be increased.
     /// </summary>
     [DataField]
-    public float DrainFrequency = 1f;
+    public TimeSpan DrainInterval = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// How much time it takes to unclog it with a plunger
diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Shared/Fluids/EntitySystems/DrainSystem.cs
similarity index 53%
rename from Content.Server/Fluids/EntitySystems/DrainSystem.cs
rename to Content.Shared/Fluids/EntitySystems/DrainSystem.cs
index 84718add5f..a6729b1bcd 100644
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/Content.Shared/Fluids/EntitySystems/DrainSystem.cs
@@ -1,64 +1,75 @@
-using Content.Server.DoAfter;
-using Content.Server.Popups;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
-using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Fluids.EntitySystems;
+namespace Content.Shared.Fluids.EntitySystems;
 
-public sealed class DrainSystem : SharedDrainSystem
+/// <summary>
+/// Handles the draining of solutions from containers into drains.
+/// </summary>
+public sealed class DrainSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly TagSystem _tagSystem = default!;
-    [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly PuddleSystem _puddleSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPuddleSystem _puddle = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
-    private readonly HashSet<Entity<PuddleComponent>> _puddles = new();
+    private readonly HashSet<Entity<PuddleComponent>> _puddles = [];
 
+    /// <inheritdoc/>
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<DrainComponent, MapInitEvent>(OnDrainMapInit);
         SubscribeLocalEvent<DrainComponent, GetVerbsEvent<Verb>>(AddEmptyVerb);
         SubscribeLocalEvent<DrainComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<DrainComponent, AfterInteractUsingEvent>(OnInteract);
         SubscribeLocalEvent<DrainComponent, DrainDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<DrainComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
     }
 
     private void OnDrainMapInit(Entity<DrainComponent> ent, ref MapInitEvent args)
     {
         // Randomise puddle drains so roundstart ones don't all dump at the same time.
-        ent.Comp.Accumulator = _random.NextFloat(ent.Comp.DrainFrequency);
+        ent.Comp.NextUpdate = _timing.CurTime + _random.Next(ent.Comp.DrainInterval);
+        Dirty(ent);
     }
 
-    private void AddEmptyVerb(Entity<DrainComponent> entity, ref GetVerbsEvent<Verb> args)
+    private void AddEmptyVerb(Entity<DrainComponent> ent, ref GetVerbsEvent<Verb> args)
     {
         if (!args.CanAccess || !args.CanInteract || args.Using == null)
             return;
 
-        if (!TryComp(args.Using, out SpillableComponent? spillable) ||
-            !TryComp(args.Target, out DrainComponent? drain))
+        if (!HasComp<SpillableComponent>(args.Using) ||
+            !TryComp<DrainComponent>(args.Target, out var drain))
             return;
 
+        var user = args.User;
         var used = args.Using.Value;
         var target = args.Target;
         Verb verb = new()
@@ -66,76 +77,68 @@ public sealed class DrainSystem : SharedDrainSystem
             Text = Loc.GetString("drain-component-empty-verb-inhand", ("object", Name(used))),
             Act = () =>
             {
-                Empty(used, spillable, target, drain);
+                Empty((target, drain), user, used);
             },
             Impact = LogImpact.Low,
             Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/eject.svg.192dpi.png"))
-
         };
         args.Verbs.Add(verb);
     }
 
-    private void Empty(EntityUid container, SpillableComponent spillable, EntityUid target, DrainComponent drain)
+    private void Empty(Entity<DrainComponent> ent, EntityUid user, EntityUid container)
     {
-        // Find the solution in the container that is emptied
+        // Find the solution in the container that is emptied.
         if (!_solutionContainerSystem.TryGetDrainableSolution(container, out var containerSoln, out var containerSolution) || containerSolution.Volume == FixedPoint2.Zero)
         {
-            _popupSystem.PopupEntity(
+            _popup.PopupClient(
                 Loc.GetString("drain-component-empty-verb-using-is-empty-message", ("object", container)),
-                container);
+                ent.Owner,
+                user);
             return;
         }
 
-        // try to find the drain's solution
-        if (!_solutionContainerSystem.ResolveSolution(target, DrainComponent.SolutionName, ref drain.Solution, out var drainSolution))
-        {
+        // Try to find the drain's solution.
+        if (!_solutionContainerSystem.ResolveSolution(ent.Owner, DrainComponent.SolutionName, ref ent.Comp.Solution, out var drainSolution))
             return;
-        }
-
-        // Try to transfer as much solution as possible to the drain
 
+        // Try to transfer as much solution as possible to the drain.
         var amountToPutInDrain = drainSolution.AvailableVolume;
         var amountToSpillOnGround = containerSolution.Volume - drainSolution.AvailableVolume;
 
         if (amountToPutInDrain > 0)
         {
             var solutionToPutInDrain = _solutionContainerSystem.SplitSolution(containerSoln.Value, amountToPutInDrain);
-            _solutionContainerSystem.TryAddSolution(drain.Solution.Value, solutionToPutInDrain);
+            _solutionContainerSystem.TryAddSolution(ent.Comp.Solution.Value, solutionToPutInDrain);
 
-            _audioSystem.PlayPvs(drain.ManualDrainSound, target);
-            _ambientSoundSystem.SetAmbience(target, true);
+            _audio.PlayPredicted(ent.Comp.ManualDrainSound, ent.Owner, user);
+            _ambientSound.SetAmbience(ent.Owner, true);
         }
 
-
         // Spill the remainder.
-
         if (amountToSpillOnGround > 0)
         {
             var solutionToSpill = _solutionContainerSystem.SplitSolution(containerSoln.Value, amountToSpillOnGround);
-            _puddleSystem.TrySpillAt(Transform(target).Coordinates, solutionToSpill, out _);
-            _popupSystem.PopupEntity(
-                Loc.GetString("drain-component-empty-verb-target-is-full-message", ("object", target)),
-                container);
+            _puddle.TrySpillAt(Transform(ent.Owner).Coordinates, solutionToSpill, out _);
+            _popup.PopupClient(
+                Loc.GetString("drain-component-empty-verb-target-is-full-message", ("object", ent.Owner)),
+                ent.Owner,
+                user);
         }
     }
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        var managerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
 
-        var query = EntityQueryEnumerator<DrainComponent>();
-        while (query.MoveNext(out var uid, out var drain))
+        var query = EntityQueryEnumerator<DrainComponent, SolutionContainerManagerComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var drain, out var manager))
         {
-            drain.Accumulator += frameTime;
-            if (drain.Accumulator < drain.DrainFrequency)
-            {
+            if (curTime < drain.NextUpdate)
                 continue;
-            }
-            drain.Accumulator -= drain.DrainFrequency;
 
-            if (!managerQuery.TryGetComponent(uid, out var manager))
-                continue;
+            drain.NextUpdate += drain.DrainInterval;
+            Dirty(uid, drain);
 
             // Best to do this one every second rather than once every tick...
             if (!_solutionContainerSystem.ResolveSolution((uid, manager), DrainComponent.SolutionName, ref drain.Solution, out var drainSolution))
@@ -143,15 +146,15 @@ public sealed class DrainSystem : SharedDrainSystem
 
             if (drainSolution.Volume <= 0 && !drain.AutoDrain)
             {
-                _ambientSoundSystem.SetAmbience(uid, false);
+                _ambientSound.SetAmbience(uid, false);
                 continue;
             }
 
-            // Remove a bit from the buffer
-            _solutionContainerSystem.SplitSolution(drain.Solution.Value, (drain.UnitsDestroyedPerSecond * drain.DrainFrequency));
+            // Remove a bit from the buffer.
+            _solutionContainerSystem.SplitSolution(drain.Solution.Value, drain.UnitsDestroyedPerSecond * drain.DrainInterval.TotalSeconds);
 
             // This will ensure that UnitsPerSecond is per second...
-            var amount = drain.UnitsPerSecond * drain.DrainFrequency;
+            var amount = drain.UnitsPerSecond * drain.DrainInterval.TotalSeconds;
 
             if (drain.AutoDrain)
             {
@@ -160,11 +163,11 @@ public sealed class DrainSystem : SharedDrainSystem
 
                 if (_puddles.Count == 0 && drainSolution.Volume <= 0)
                 {
-                    _ambientSoundSystem.SetAmbience(uid, false);
+                    _ambientSound.SetAmbience(uid, false);
                     continue;
                 }
 
-                _ambientSoundSystem.SetAmbience(uid, true);
+                _ambientSound.SetAmbience(uid, true);
 
                 amount /= _puddles.Count;
 
@@ -174,7 +177,7 @@ public sealed class DrainSystem : SharedDrainSystem
                     // but queuedelete should be pretty safe.
                     if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, puddle.Comp.SolutionName, ref puddle.Comp.Solution, out var puddleSolution))
                     {
-                        QueueDel(puddle);
+                        PredictedQueueDel(puddle);
                         continue;
                     }
 
@@ -185,12 +188,10 @@ public sealed class DrainSystem : SharedDrainSystem
                     var transferSolution = _solutionContainerSystem.SplitSolution(puddle.Comp.Solution.Value,
                         FixedPoint2.Min(FixedPoint2.New(amount), puddleSolution.Volume, drainSolution.AvailableVolume));
 
-                    drainSolution.AddSolution(transferSolution, _prototypeManager);
+                    drainSolution.AddSolution(transferSolution, _prototype);
 
                     if (puddleSolution.Volume <= 0)
-                    {
-                        QueueDel(puddle);
-                    }
+                        PredictedQueueDel(puddle);
                 }
             }
 
@@ -198,11 +199,11 @@ public sealed class DrainSystem : SharedDrainSystem
         }
     }
 
-    private void OnExamined(Entity<DrainComponent> entity, ref ExaminedEvent args)
+    private void OnExamined(Entity<DrainComponent> ent, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange ||
-            !HasComp<SolutionContainerManagerComponent>(entity) ||
-            !_solutionContainerSystem.ResolveSolution(entity.Owner, DrainComponent.SolutionName, ref entity.Comp.Solution, out var drainSolution))
+            !HasComp<SolutionContainerManagerComponent>(ent) ||
+            !_solutionContainerSystem.ResolveSolution(ent.Owner, DrainComponent.SolutionName, ref ent.Comp.Solution, out var drainSolution))
         {
             return;
         }
@@ -213,54 +214,70 @@ public sealed class DrainSystem : SharedDrainSystem
         args.PushMarkup(text);
     }
 
-    private void OnInteract(Entity<DrainComponent> entity, ref AfterInteractUsingEvent args)
+    private void OnInteract(Entity<DrainComponent> ent, ref AfterInteractUsingEvent args)
     {
         if (!args.CanReach || args.Target == null ||
-            !_tagSystem.HasTag(args.Used, DrainComponent.PlungerTag) ||
-            !_solutionContainerSystem.ResolveSolution(args.Target.Value, DrainComponent.SolutionName, ref entity.Comp.Solution, out var drainSolution))
+            !_tag.HasTag(args.Used, DrainComponent.PlungerTag) ||
+            !_solutionContainerSystem.ResolveSolution(args.Target.Value, DrainComponent.SolutionName, ref ent.Comp.Solution, out var drainSolution))
         {
             return;
         }
 
         if (drainSolution.AvailableVolume > 0)
         {
-            _popupSystem.PopupEntity(Loc.GetString("drain-component-unclog-notapplicable", ("object", args.Target.Value)), args.Target.Value);
+            _popup.PopupPredicted(Loc.GetString("drain-component-unclog-notapplicable", ("object", args.Target.Value)), args.Target.Value, args.User);
             return;
         }
 
-        _audioSystem.PlayPvs(entity.Comp.PlungerSound, entity);
+        _audio.PlayPredicted(ent.Comp.PlungerSound, ent.Owner, args.User);
 
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.UnclogDuration, new DrainDoAfterEvent(), entity, args.Target, args.Used)
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.UnclogDuration, new DrainDoAfterEvent(), ent, args.Target, args.Used)
         {
             BreakOnDamage = true,
             BreakOnMove = true,
-            BreakOnHandChange = true
+            BreakOnHandChange = true,
         };
 
-        _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        _doAfter.TryStartDoAfter(doAfterArgs);
     }
 
-    private void OnDoAfter(Entity<DrainComponent> entity, ref DrainDoAfterEvent args)
+    private void OnDoAfter(Entity<DrainComponent> ent, ref DrainDoAfterEvent args)
     {
         if (args.Target == null)
             return;
 
-        if (!_random.Prob(entity.Comp.UnclogProbability))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, ent.Owner.GetHashCode());
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.UnclogProbability))
         {
-            _popupSystem.PopupEntity(Loc.GetString("drain-component-unclog-fail", ("object", args.Target.Value)), args.Target.Value);
+            _popup.PopupPredicted(Loc.GetString("drain-component-unclog-fail", ("object", args.Target.Value)), args.Target.Value, args.User);
             return;
         }
 
-
-        if (!_solutionContainerSystem.ResolveSolution(args.Target.Value, DrainComponent.SolutionName, ref entity.Comp.Solution))
-        {
+        if (!_solutionContainerSystem.ResolveSolution(args.Target.Value, DrainComponent.SolutionName, ref ent.Comp.Solution))
             return;
-        }
 
+        _solutionContainerSystem.RemoveAllSolution(ent.Comp.Solution.Value);
+        _audio.PlayPredicted(ent.Comp.UnclogSound, args.Target.Value, args.User);
+        _popup.PopupPredicted(Loc.GetString("drain-component-unclog-success", ("object", args.Target.Value)), args.Target.Value, args.User);
+    }
 
-        _solutionContainerSystem.RemoveAllSolution(entity.Comp.Solution.Value);
-        _audioSystem.PlayPvs(entity.Comp.UnclogSound, args.Target.Value);
-        _popupSystem.PopupEntity(Loc.GetString("drain-component-unclog-success", ("object", args.Target.Value)), args.Target.Value);
+    // Prevent a debug assert.
+    // See https://github.com/space-wizards/space-station-14/pull/35314
+    private void OnEntRemoved(Entity<DrainComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution
+        if (ent.Comp.Solution is not { } solution || args.Entity != solution.Owner)
+            return;
+
+        // Cleared our cached reference to the solution entity
+        ent.Comp.Solution = null;
     }
 }
+
+/// <summary>
+/// Event raised when a do-after action for unclogging a drain completes.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Fluids/SharedDrainSystem.cs b/Content.Shared/Fluids/SharedDrainSystem.cs
deleted file mode 100644
index d65dddb0df..0000000000
--- a/Content.Shared/Fluids/SharedDrainSystem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Fluids;
-
-public abstract partial class SharedDrainSystem : EntitySystem
-{
-    [Serializable, NetSerializable]
-    public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-}

From 0115f943e668b8ad78b445558da7bb9357793195 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Fri, 9 Jan 2026 18:48:46 +0100
Subject: [PATCH 267/360] Stake Admin Alert (#42324)

i forgot this is a thing
---
 Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml
index 98ec98d46e..04a42261b2 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bonfire.yml
@@ -24,6 +24,10 @@
       - tool: Prying
         doAfter: 4
     - to: bonfireStake
+      completed:
+      - !type:AdminLog
+        message: "Construction"
+        impact: High
       steps:
       - material: WoodPlank
         amount: 2

From 21550736259ee79a84a738787174015c1f97d806 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sat, 10 Jan 2026 04:31:49 +1000
Subject: [PATCH 268/360] Fix projectile deceleration (#42320)

---
 .../Entities/Objects/Magic/immovable_rod.yml         |  1 -
 .../Objects/Weapons/Guns/Projectiles/meteors.yml     |  2 --
 .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 12 ++++++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml
index c517ebaa24..11c86a69c6 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/immovable_rod.yml
@@ -15,7 +15,6 @@
   - type: GravityAffected
   - type: Physics
     bodyType: Dynamic
-    linearDamping: 0
   - type: TileFrictionModifier
     modifier: 0
   - type: PointLight
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
index 70ea5503c8..ef7bfd6ebf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -20,8 +20,6 @@
   - type: Physics
     bodyType: Dynamic
     bodyStatus: InAir
-    angularDamping: 0
-    linearDamping: 0
   - type: Fixtures
     fixtures:
       projectile:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 461aee3690..0ac759a293 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -78,8 +78,8 @@
       shader: unshaded
   - type: Physics
     bodyType: Dynamic
-    linearDamping: 0
-    angularDamping: 0
+  - type: TileFrictionModifier
+    modifier: 0
   - type: Fixtures
     fixtures:
       projectile:
@@ -1021,8 +1021,8 @@
   - type: Clickable
   - type: Physics
     bodyType: Dynamic
-    linearDamping: 0
-    angularDamping: 0
+  - type: TileFrictionModifier
+    modifier: 0
   - type: TimedDespawn
     lifetime: 10
   - type: Projectile
@@ -1105,8 +1105,8 @@
         - state: hook
     - type: Physics
       bodyType: Dynamic
-      linearDamping: 0
-      angularDamping: 0
+    - type: TileFrictionModifier
+      modifier: 0
     - type: Projectile
       deleteOnCollide: false
       damage:

From a0daca78de841291610e5afc6bb04a9c4ec610ba Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Fri, 9 Jan 2026 18:11:08 -0500
Subject: [PATCH 269/360] BUGFIX: Cabbage placed on taco shells no longer turns
 into a carrot (#42326)

BUGFIX: Cabbage places on tacos no longer looks like a carrot
---
 Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
index ef3134bd7b..d8f7f61cc9 100644
--- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -533,7 +533,7 @@
   id: Cabbage
   name: food-sequence-content-cabbage
   sprites:
-  - sprite: Objects/Specific/Hydroponics/carrot.rsi
+  - sprite: Objects/Specific/Hydroponics/cabbage.rsi
     state: produce
   tags:
   - Vegetable

From 93db96603fda451326bb51d95e214573cfb19853 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sat, 10 Jan 2026 03:07:35 +0100
Subject: [PATCH 270/360] Add the Syndicate Delivery Console + Corpsman
 Medicine Bundle (#41201)

* Initial commit

* Add a note to not abuse the darrrrn machine

* Remove nukie planet (hopefully) and fix duffelbag

* jug solution name

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Resources/Locale/en-US/store/categories.ftl   |   2 +
 .../Locale/en-US/store/nukie-delivery.ftl     |   3 +
 Resources/Locale/en-US/store/store.ftl        |   1 +
 .../Catalog/Fills/Backpacks/duffelbag.yml     |  19 +++
 .../Catalog/nukie_delivery_catalog.yml        |  19 +++
 .../Chemistry/chemical-containers.yml         | 120 ++++++++++++++++++
 .../Machines/Computers/computers.yml          |  35 +++++
 Resources/Prototypes/Store/categories.yml     |   6 +
 .../Machines/computers.rsi/meta.json          |  44 ++++++-
 .../Machines/computers.rsi/request-syndie.png | Bin 0 -> 16522 bytes
 .../computers.rsi/syndie_generic_keys.png     | Bin 0 -> 14803 bytes
 11 files changed, 248 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Locale/en-US/store/nukie-delivery.ftl
 create mode 100644 Resources/Prototypes/Catalog/nukie_delivery_catalog.yml
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/request-syndie.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/syndie_generic_keys.png

diff --git a/Resources/Locale/en-US/store/categories.ftl b/Resources/Locale/en-US/store/categories.ftl
index 64ed0b5c63..4469a576cd 100644
--- a/Resources/Locale/en-US/store/categories.ftl
+++ b/Resources/Locale/en-US/store/categories.ftl
@@ -24,3 +24,5 @@ store-caregory-spellbook-utility = Utility Spells
 store-caregory-spellbook-equipment = Wizard Equipment
 store-caregory-spellbook-events = Event Spells
 
+# Nukie Delivery
+store-category-nukie-delivery = Offers
diff --git a/Resources/Locale/en-US/store/nukie-delivery.ftl b/Resources/Locale/en-US/store/nukie-delivery.ftl
new file mode 100644
index 0000000000..4c5f4bf724
--- /dev/null
+++ b/Resources/Locale/en-US/store/nukie-delivery.ftl
@@ -0,0 +1,3 @@
+nukie-delivery-medicine-bundle-name = Corpsman Medicine Bundle
+nukie-delivery-medicine-bundle-desc = Contains jugs of basic medicine that are essential for any Nuclear Operation:
+  Bicaridine, Puncturase, Dermaline, Dylovene, Hyronalin, Saline, Dexalin Plus and Tranexamic Acid.
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 9a9d75f4c0..209e143934 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -14,4 +14,5 @@ store-not-account-owner = This {$store} is not bound to you!
 
 store-preset-name-uplink = Uplink
 store-preset-name-spellbook = Spellbook
+store-preset-name-nukie-delivery = NukeOps Bluespace Delivery
 store-preset-name-changeling = DNA Store
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 2b99cc039e..950655fa24 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -44,6 +44,25 @@
         - id: SoapSyndie # DeltaV - add soap
         - id: ClothingMaskSterile # DeltaV
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateMedicalBundle
+  id: ClothingBackpackDuffelSyndicateFilledMedicine
+  name: syndicate medicine duffel bag
+  description: A large duffel bag containing essential medicinal reagents.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: JugBicaridine
+        - id: JugPuncturase
+        - id: JugDermaline
+        - id: JugDylovene
+        - id: JugHyronalin
+        - id: JugSaline
+        - id: JugDexalinPlus
+        - id: JugTranexamicAcid
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledShotgun
diff --git a/Resources/Prototypes/Catalog/nukie_delivery_catalog.yml b/Resources/Prototypes/Catalog/nukie_delivery_catalog.yml
new file mode 100644
index 0000000000..400724bf50
--- /dev/null
+++ b/Resources/Prototypes/Catalog/nukie_delivery_catalog.yml
@@ -0,0 +1,19 @@
+# The Nukie Catalog is -not- meant to be a "here's free equipment lmao" shop.
+# Anything listed in here should aim to leverage the actual benefits of the console:
+# 1. Equipment that should only be available in -limited numbers- for the Nukie team as a whole.
+# 2. Equipment that should be timegated/locked to the Nukie planet.
+# 3. Equipment that benefit from the team knowing it's been purchased/claimed.
+# If you can't justify these benefits, consider other options: Uplinks, Starting Loadouts & Mapping on the planet/shuttle.
+# NOTE: At the moment of writing the store doesn't take TC, but if you can find a scenario where pooling TC works with the above benefits, that could be changed.
+
+- type: listing
+  id: NukieDeliveryMedicineBundle
+  name: nukie-delivery-medicine-bundle-name
+  description: nukie-delivery-medicine-bundle-desc
+  productEntity: ClothingBackpackDuffelSyndicateFilledMedicine
+  categories:
+  - NukieDelivery
+  restockTime: 1200
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
index 1dafa149f1..68be5155d7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
@@ -480,3 +480,123 @@
         reagents:
         - ReagentId: WeldingFuel
           Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: bicaridine
+  id: JugBicaridine
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-bicaridine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Bicaridine
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: puncturase
+  id: JugPuncturase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-puncturase
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: dermaline
+  id: JugDermaline
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-dermaline
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Dermaline
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: dylovene
+  id: JugDylovene
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-dylovene
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Dylovene
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: tranexamic acid
+  id: JugTranexamicAcid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-tranexamic-acid
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: TranexamicAcid
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: hyronalin
+  id: JugHyronalin
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-hyronalin
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Hyronalin
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: saline
+  id: JugSaline
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-saline
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Saline
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: dexalin plus
+  id: JugDexalinPlus
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-dexalin-plus
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: DexalinPlus
+          Quantity: 200
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 621d171d89..8c1aabb204 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -1760,3 +1760,38 @@
         type: StationAiFixerConsoleBoundUserInterface
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
+
+- type: entity
+  parent: BaseComputer
+  id: ComputerNukieDelivery
+  name: syndicate delivery computer
+  description: "A computer that can bluespace in certain equipment for Nuclear Operations. \nThe circuitboard is integrated into the frame and can't be recovered if deconstructed."
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-syndie
+    - map: ["computerLayerKeys"]
+      state: syndie_generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  # - type: Computer
+  #   board: SyndicateCommsComputerCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#f71713"
+  - type: UserInterface
+    interfaces:
+      enum.StoreUiKey.Key:
+        type: StoreBoundUserInterface
+  - type: ActivatableUI
+    key: enum.StoreUiKey.Key
+  - type: Store
+    name: store-preset-name-nukie-delivery
+    categories:
+    - NukieDelivery
diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index cb11de7848..ccdb349d9c 100644
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -89,6 +89,12 @@
   name: store-category-pointless
   priority: 10
 
+#nukie delivery
+
+- type: storeCategory
+  id: NukieDelivery
+  name: store-category-nukie-delivery
+
 #revenant
 - type: storeCategory
   id: RevenantAbilities
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index ebb9a875dd..43be310a95 100644
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0, request- variants transfer made by EmoGarbage404 (github), xenorobot by Samuka-C (github), ai-fixer-progress and -purge sprites made by chromiumboy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0, request- variants transfer made by EmoGarbage404 (github), xenorobot by Samuka-C (github), ai-fixer-progress and -purge sprites made by chromiumboy, generic_syndie_keys and request-syndie modified from generic_keys and request by SlamBamActionman",
   "size": {
     "x": 32,
     "y": 32
@@ -1908,6 +1908,44 @@
                 ]
             ]
         },
+        {
+            "name": "request-syndie",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
         {
             "name": "robot",
             "directions": 4
@@ -2048,6 +2086,10 @@
             "name": "syndie_key",
             "directions": 4
         },
+        {
+            "name": "syndie_generic_keys",
+            "directions": 4
+        },
         {
             "name": "syndie_key_off",
             "directions": 4
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-syndie.png b/Resources/Textures/Structures/Machines/computers.rsi/request-syndie.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2befe73d8d323c32a0967ca5420461335de7885
GIT binary patch
literal 16522
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/syndie_generic_keys.png b/Resources/Textures/Structures/Machines/computers.rsi/syndie_generic_keys.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5b0de39cf1f4a3b50fee0119393c67856d5a821
GIT binary patch
literal 14803
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
EKM9^2u>b%7

literal 0
HcmV?d00001


From 97ed41c4082ffe2326d8d8ca638bd67337314ef9 Mon Sep 17 00:00:00 2001
From: SolidSyn <jacksonbeard01@gmail.com>
Date: Sat, 10 Jan 2026 08:48:33 -0800
Subject: [PATCH 271/360] Foldable wig on clowns mask (#42208)

* Clowns base mask now has the ability to toggle the wig on and off.

* Changes the clown mask to have a foldable wig.

* Adds my credit for the wigless sprites in the meta.json

* Redid the description.

* Added an a to the description. Smiles.

* Resolved changes, thanks beck!
---
 .../Entities/Clothing/Masks/masks.yml         |  37 ++++++++++++++++--
 .../Clothing/Mask/clown.rsi/icon-opened.png   | Bin 0 -> 214 bytes
 .../Clothing/Mask/clown.rsi/meta.json         |  25 +++++++++++-
 .../opened-equipped-MASK-hamster.png          | Bin 0 -> 243 bytes
 .../opened-equipped-MASK-reptilian.png        | Bin 0 -> 424 bytes
 .../clown.rsi/opened-equipped-MASK-vox.png    | Bin 0 -> 553 bytes
 .../opened-equipped-MASK-vulpkanin.png        | Bin 0 -> 429 bytes
 .../Mask/clown.rsi/opened-equipped-MASK.png   | Bin 0 -> 396 bytes
 8 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png
 create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png
 create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png
 create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png
 create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png
 create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 49d53cc481..f5a0d881e2 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -212,9 +212,24 @@
     - Snout
 
 - type: entity
-  parent: ClothingMaskClownBase
+  parent: [ClothingMaskClownBase, BaseFoldable]
   id: ClothingMaskClown
+  description: A clown mask featuring a foldable wig; a true prankster's attire.
   components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+  - type: FoldableClothing
+    foldedEquippedPrefix: opened
+    foldedHeldPrefix: opened
+  - type: Sprite
+    sprite: Clothing/Mask/clown.rsi
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon-opened
+      map: [ "foldedLayer" ]
+      visible: false
   - type: Tag
     tags:
     - ClownMask
@@ -225,7 +240,7 @@
     - Snout
 
 - type: entity
-  parent: ClothingMaskClown
+  parent: ClothingMaskClownBase
   id: ClothingMaskClownBanana
   name: banana clown wig and mask
   components:
@@ -236,9 +251,17 @@
   - type: Construction
     graph: BananaClownMask
     node: mask
+  - type: Tag
+    tags:
+    - ClownMask
+    - HamsterWearable
+    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Snout
 
 - type: entity
-  parent: [ClothingMaskClown, BaseSecurityContraband]
+  parent: [ClothingMaskClownBase, BaseSecurityContraband]
   id: ClothingMaskClownSecurity
   name: security clown wig and mask
   description: A debatably oxymoronic but protective mask and wig.
@@ -254,6 +277,14 @@
         Slash: 0.95
         Piercing: 0.95
         Heat: 0.95
+  - type: Tag
+    tags:
+    - ClownMask
+    - HamsterWearable
+    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Snout
 
 - type: entity
   parent: ClothingMaskBase
diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png b/Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b86fae3d19e78d01a57078b0be89b0b55e903bf
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FglULn2z=
zUUuYSGURD}7|&TT^^p-z)rNV8TE!<X^nMx2#<WXAPsH4<h4KD&PLWB=a=Db0l>X;U
z_S|*u^V`x~d*78&(>$3p>KK>|s&=QG-tgDtVPVzgjXyiy=RZ~FWe_P>;^9#0c{ERR
zay~<X<@^JE%5{pS%zI6}*6JKs7gm-1k}YU5_xb#Je;JjOHgT0#x~W^Nmyrqpx{blp
L)z4*}Q$iB}=Tu7>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json
index c465987d07..8b4143ca93 100644
--- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers | Wigless variants edited by Solid_Syn",
   "size": {
     "x": 32,
     "y": 32
@@ -37,6 +37,29 @@
     {
       "name": "equipped-MASK-vox",
       "directions": 4
+    },
+    {
+      "name": "icon-opened"
+    },
+    {
+      "name": "opened-equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "opened-equipped-MASK-hamster",
+      "directions": 4
+    },
+    {
+      "name": "opened-equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "opened-equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "opened-equipped-MASK-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png
new file mode 100644
index 0000000000000000000000000000000000000000..a715be59141972fad3d06b3a8e33fd2573d30857
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_S@)hE&XX
zd&^L$$v}YhLT~t`-}4!w*KHQ_o6#Y{lqmCMZ(kGd?{+<VCI*Hd?y0A}XU@!T_PS~E
z`nFzn{E0Jj)<>Nx(n#N+)v)WymaLtwziX}u*qQM;hY98?_&+xIQ^p{;UUAF6q)MP&
zK#;IY!S=T0>femsuh?bp3TN!*+<We(tV6Z7%~zI3w`^OiHplKh-di%=K4IOFz16YL
mI%eKI(=F_N$sMS-;jWxn-c(05jeB_@qdZ;xT-G@yGywqDfn8t#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb3dca0ef3e0256133fb2c2da5e82a1d07d4091e
GIT binary patch
literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zlRRA<Ln`LH
zy=Cin*g=5x!FCSKbi>qZ;v5?84+O4E)GTTc=?g06=o2VxF7*1XwWLbqoYxU9jxb^N
zDc?;en%}x9U;Q?TO<-cSSdrD%G?{I8r>2Ij@!oy*ZNw2F21b^W-k)bPQq1?io$#)X
z<L{&2_b>Y&t^e?vm!Uz)Z2}{MBb$h!m4CL)P4|TT>kKRPHm=Y1(K@eLo4+-xaQ9t1
zp4-nq|GZta)8>Em3e)6lw@EeYvnQowS^s`e?-}*w2KWE0J*#&!Dj@-J!?Ly$#e3Gg
z`Jm~l<L>FdHSJBda7{{jd%M$%;HN5`0ZI!B&t4IlxIpo$%9d+8j-0*KkhQU5>)m%x
zGn(3~8vh+?cra&W+A61)=DV_aHs5?>_czvWx&Q04&n}i<ke6C^+H;qDtH}3auY1bt
zZVSGc#pW8yc<_CVoaK?Z7cQ9E_3vN3aUV-~WRD`;Nspc~M=~51b!hW>1q^xyPgg&e
IbxsLQ0IA%zZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..c00b4106e93fa5f4e5087ebf514b53d132027a0d
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$<4Ht8RCt{2+OcZeKpe;M@0CEG#a-pK5T|(T;3w#&H%JCU38CP@d4hP$69`N;
zlM={!TAig^UZS1;9nR-UN=nh$awGivfUzz6?sTXBNyGmSB1g@oG+KLa&0`;i!=%3c
zx0BR{gDl&Aek#kooJ=pQy|>rA78QN)F0ENJ+It!OK+7{<dvAj*!#OZ>fB_EY470Em
zy1p08W;0u@R-c;3$K&z+bUN+!O8g0b%*-r@+V?(ggVtN%*Y!1EESw_)7A{0WINrU#
zE%Lz@e_0fkgL$x<&3g{EEQ;P;{bb9c*iQcD*d`w>i^BY|PCh#7$%}}Hh=_=Yh=_>v
z(cW@t)yzy+`N2bsk))Y2UwgmTJYnqb&8FkKtQqLK9wD(lpnihYYLOsB=a1*-UAwRJ
zQIGgRmhB}W+PXyM+trnQe|UJ2pMNULP1#JW7jWE7AO~9{-fMEOyUB#l#<owe%2+TO
zjn3l#&rVP8zg}J*?%q%h&w8kadI1mib3V5`R8q8(Z`%4s4MKCQU87*9)v692uSl#D
zxV^X_Zj42EwHhlAX?Flh;LCgt!29!apkA1@%M+oK$6)k090FkiDGLx6@T2!Het%Ps
r!GB5J0$rSoh=_=Yh=_=Yh#a@y$nb%)kB#`400000NkvXXu0mjf4=4}o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png
new file mode 100644
index 0000000000000000000000000000000000000000..dce368a1b05f39fb5e6fdd40640441a3125c35c1
GIT binary patch
literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z(>+}rLn`LH
zy=9np$UuVi!SroG=O^|3*~t)MDVX$-foG#d;1y|$o`R`q4(pwz6f~!H8ER(U-!7pe
zX?>&Z;opW6`=_<=+^RZXci(#&YwflCYA)FsQEUwiLT|L>^IgB^y|(ofNLX%Lu668z
zVvdBP+T5}=P3s)q%FGi#vToG`sX%M?Gie*ImtD)+niM&0{oj8!=kHHD{q${p`z-Ab
zoMjc3*R%y%4EBk$dYb9xY-s=guAA>}!vp2wUl%x61^#30>Og>)oY#LBT#PvLlj-uq
z^+Bg+E%<ZHW7A6C9m0RB8qG9Rds<v)HXFz}-`ru!DSrHM_s^R5=Cl87SzqS5+)u%j
z`9-73CBKWxw)+@oE+}I)U|x3lrQ-DSYLhRmz20A__P4Pv<eu8G_7^sfI5W0pmaK{R
z_bOz2tV7ndn;&m<7OFQbKfZ1iLrnY}(bS2{cNe_Q+Nk(kNDu}l?tjM2YRz@%b+-I@
QVE8k5y85}Sb4q9e0N&HS2mk;8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..da4a338d446d953191b3f1bf45e98f23479eddf6
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-8@|!Ln`LH
zy=9o!Y#_n<;Q6Ycb56%^h%XRzf1zmQ{_+5$M2FFL0b8b5ygqJ4Q`4$s1wtJ>wO9Dw
zdREIlY2we^=Ey$`6IZ7#E6LjPe8bywJ3Y_u+H!lPtnh0Ffrf+ozCCm^**trr?5^$k
zKGr|KRsCB1gWFA?fkEY3lL-UIC54S<A2vKQuH=?6Qx!YU*S_gUl5CMjymnVpXs9jE
z?aeyXr$5{Lt6%YPUhj96lixR~c$Vc}?EbHIcggd4KXz7ye`j(*0#AgV*(q^H=3n~w
zL$k9~L9$lRV-s(B%g4v85^QRZxTQ}?%;k?*AGW@3d$ncWYgV-f83FE*oQH%y%-{O0
zwAaM<{qEm+J8N#`Z0|SBnt$~)*MVdAnKtZ=ae7mAUy4mF={mRUDUMGo<@i;~V)D*K
eDZ#=2bL?gR4?X!jEi)AuybPYMelF{r5}E)*BdEs!

literal 0
HcmV?d00001


From 580ee0b13f1ee26f5b2c40d7b6a6b488243e8c48 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 10 Jan 2026 20:56:17 +0100
Subject: [PATCH 272/360] Use NextByte to properly construct colours (#42335)

---
 .../NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
index 19da5aa959..cd57c3b5fb 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
@@ -41,9 +41,9 @@ public sealed class NetworkConfiguratorLinkOverlay : Overlay
             if (!Colors.TryGetValue(uid, out var color))
             {
                 color = new Color(
-                    _random.Next(0, 255),
-                    _random.Next(0, 255),
-                    _random.Next(0, 255));
+                    _random.NextByte(0, 255),
+                    _random.NextByte(0, 255),
+                    _random.NextByte(0, 255));
                 Colors.Add(uid, color);
             }
 

From e9b4130ec907e7f45105f6a9a756722b3675b20b Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sun, 11 Jan 2026 00:02:56 +0100
Subject: [PATCH 273/360] Predict Mind State Examine (#42253)

* init

* review

* i might be stupid

* docs

* datafieldn't

* update comments
---
 .../SSDIndicator/SSDIndicatorSystem.cs        |   3 +-
 .../Mind/Components/MindContainerComponent.cs |  14 +-
 .../Components/MindExaminableComponent.cs     |  33 +++++
 Content.Shared/Mind/MindExamineSystem.cs      | 127 ++++++++++++++++++
 Content.Shared/Mind/SharedMindSystem.cs       |  42 +-----
 .../Entities/Mobs/Player/familiars.yml        |   4 +-
 .../Prototypes/Entities/Mobs/Species/base.yml |   2 +-
 7 files changed, 168 insertions(+), 57 deletions(-)
 create mode 100644 Content.Shared/Mind/Components/MindExaminableComponent.cs
 create mode 100644 Content.Shared/Mind/MindExamineSystem.cs

diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
index 3880596626..9b0060d956 100644
--- a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
@@ -33,8 +33,7 @@ public sealed class SSDIndicatorSystem : EntitySystem
             _cfg.GetCVar(CCVars.ICShowSSDIndicator) &&
             !_mobState.IsDead(uid) &&
             !HasComp<ActiveNPCComponent>(uid) &&
-            TryComp<MindContainerComponent>(uid, out var mindContainer) &&
-            mindContainer.ShowExamineInfo)
+            HasComp<MindExaminableComponent>(uid))
         {
             // Begin DeltaV Addition
             var ev = new ShowSSDIndicatorEvent();
diff --git a/Content.Shared/Mind/Components/MindContainerComponent.cs b/Content.Shared/Mind/Components/MindContainerComponent.cs
index eb0e0233fc..f2afae2fd0 100644
--- a/Content.Shared/Mind/Components/MindContainerComponent.cs
+++ b/Content.Shared/Mind/Components/MindContainerComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class MindContainerComponent : Component
     ///     The mind controlling this mob. Can be null.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public EntityUid? Mind { get; set; }
+    public EntityUid? Mind;
 
     /// <summary>
     /// DeltaV: The first mind to control this mob. Will only be null if the mob never had a mind at all.
@@ -28,19 +28,11 @@ public sealed partial class MindContainerComponent : Component
     [MemberNotNullWhen(true, nameof(Mind))]
     public bool HasMind => Mind != null;
 
-    /// <summary>
-    ///     Whether examining should show information about the mind or not.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("showExamineInfo"), AutoNetworkedField]
-    public bool ShowExamineInfo { get; set; }
-
     /// <summary>
     ///     Whether the mind will be put on a ghost after this component is shutdown.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("ghostOnShutdown")]
-    public bool GhostOnShutdown { get; set; } = true;
+    [DataField]
+    public bool GhostOnShutdown = true;
 }
 
 public abstract class MindEvent : EntityEventArgs
diff --git a/Content.Shared/Mind/Components/MindExaminableComponent.cs b/Content.Shared/Mind/Components/MindExaminableComponent.cs
new file mode 100644
index 0000000000..880c0f331d
--- /dev/null
+++ b/Content.Shared/Mind/Components/MindExaminableComponent.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Examine;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Mind.Components;
+
+/// <summary>
+/// This component adds an examine text to the owner entity based on the state of their mind.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(MindExamineSystem))]
+public sealed partial class MindExaminableComponent : Component
+{
+    /// <summary>
+    /// The state the mind is currently in.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public MindState State = MindState.None;
+}
+
+/// <summary>
+/// The states for when an entity with a mind is examined.
+/// </summary>
+[Serializable, NetSerializable]
+public enum MindState : byte
+{
+    None, // No text
+    Dead, // Player is dead but still connected
+    Catatonic, // Entity is alive but has no mind attached to it.
+    SSD, // Player disconnected while alive
+    DeadSSD, // Player died and disconnected
+    Irrecoverable // Entity is dead and has no mind attached
+}
diff --git a/Content.Shared/Mind/MindExamineSystem.cs b/Content.Shared/Mind/MindExamineSystem.cs
new file mode 100644
index 0000000000..b3c488e034
--- /dev/null
+++ b/Content.Shared/Mind/MindExamineSystem.cs
@@ -0,0 +1,127 @@
+using Content.Shared.Examine;
+using Content.Shared.Mind.Components;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Content.Shared._DV.Mind; // DeltaV
+
+namespace Content.Shared.Mind;
+
+public sealed class MindExamineSystem : EntitySystem
+{
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly ISharedPlayerManager _player = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MindExaminableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<MindExaminableComponent, ComponentStartup>((e, ref _) => RefreshMindStatus(e.AsNullable()));
+        SubscribeLocalEvent<MindExaminableComponent, MindAddedMessage>((e, ref _) => RefreshMindStatus(e.AsNullable()));
+        SubscribeLocalEvent<MindExaminableComponent, MindRemovedMessage>((e, ref _) => RefreshMindStatus(e.AsNullable()));
+        SubscribeLocalEvent<MindExaminableComponent, MobStateChangedEvent>((e, ref _) => RefreshMindStatus(e.AsNullable()));
+
+        SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetached);
+    }
+
+    private void OnExamined(Entity<MindExaminableComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        // Begin DeltaV Addition
+        var ev = new ShowSSDIndicatorEvent();
+        RaiseLocalEvent(ent, ref ev);
+        if (ev.Hidden)
+            return;
+        // End DeltaV Addition
+
+        var message = ent.Comp.State switch
+        {
+            MindState.Irrecoverable => $"[color=mediumpurple]{Loc.GetString("comp-mind-examined-dead-and-irrecoverable", ("ent", ent.Owner))}[/color]",
+            MindState.DeadSSD => $"[color=yellow]{Loc.GetString("comp-mind-examined-dead-and-ssd", ("ent", ent.Owner))}[/color]",
+            MindState.Dead => $"[color=red]{Loc.GetString("comp-mind-examined-dead", ("ent", ent.Owner))}[/color]",
+            MindState.Catatonic => $"[color=mediumpurple]{Loc.GetString("comp-mind-examined-catatonic", ("ent", ent.Owner))}[/color]",
+            MindState.SSD => $"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", ent.Owner))}[/color]",
+            _ => null,
+        };
+
+        if (message != null)
+            args.PushMarkup(message);
+    }
+
+    private void OnPlayerAttached(PlayerAttachedEvent args)
+    {
+        // We use the broadcasted event because we need to access the body of a ghost if it disconnects.
+        // DeadSSD does not check if a player is attached, but if the session is valid (connected).
+        // To properly track that, we subscribe to the broadcast version of this event
+        // and update the mind status of the original entity accordingly.
+        // Otherwise, if you ghost out and THEN disconnect, it would not update your status as it gets raised on your ghost and not your body.
+        if (!_mind.TryGetMind(args.Entity, out _, out var mindComp))
+            return;
+
+        if (mindComp.OwnedEntity is not { } refreshEnt)
+            return;
+
+        RefreshMindStatus(refreshEnt);
+    }
+
+    private void OnPlayerDetached(PlayerDetachedEvent args)
+    {
+        // Same reason as in the subscription above.
+        if (!_mind.TryGetMind(args.Entity, out _, out var mindComp))
+            return;
+
+        if (mindComp.OwnedEntity is not { } refreshEnt)
+            return;
+
+        RefreshMindStatus(refreshEnt);
+    }
+
+
+    public void RefreshMindStatus(Entity<MindExaminableComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        // Only allow the local client to handle this.
+        // This is because the mind is only networked to the owner, and other clients will always be wrong.
+        // So instead, we do this on server and dirty the result to the client.
+        // And since it is stored on the component, the text won't flicker anymore.
+        // Will cause a small jump when examined during networking due to the server update coming in.
+        if (_net.IsClient && _player.LocalEntity != ent)
+            return;
+
+        var dead = _mobState.IsDead(ent);
+        _mind.TryGetMind(ent.Owner, out _, out var mindComp);
+        var hasUserId = mindComp?.UserId;
+        var hasActiveSession = hasUserId != null && _player.ValidSessionId(hasUserId.Value);
+
+        // Scenarios:
+        // 1. Dead + No User ID: Entity is dead and has no mind attached
+        // 2. Dead + Has User ID + No Session: Player died and disconnected
+        // 3. Dead + Has Session: Player is dead but still connected
+        // 4. Alive + No User ID: Entity is alive but has no mind attached to it
+        // 5. Alive + No Session: Player disconnected while alive (SSD)
+
+        if (dead && hasUserId == null)
+            ent.Comp.State = MindState.Irrecoverable;
+        else if (dead && !hasActiveSession)
+            ent.Comp.State = MindState.DeadSSD;
+        else if (dead)
+            ent.Comp.State = MindState.Dead;
+        else if (hasUserId == null)
+            ent.Comp.State = MindState.Catatonic;
+        else if (!hasActiveSession)
+            ent.Comp.State = MindState.SSD;
+        else
+            ent.Comp.State = MindState.None;
+
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index e5d0bedfd3..301a69c409 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -52,8 +52,8 @@ public abstract partial class SharedMindSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<MindContainerComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<MindContainerComponent, SuicideEvent>(OnSuicide);
+
         SubscribeLocalEvent<VisitingMindComponent, EntityTerminatingEvent>(OnVisitingTerminating);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnReset);
         SubscribeLocalEvent<MindComponent, ComponentStartup>(OnMindStartup);
@@ -166,46 +166,6 @@ public abstract partial class SharedMindSystem : EntitySystem
             UnVisit(component.MindId.Value);
     }
 
-    private void OnExamined(EntityUid uid, MindContainerComponent mindContainer, ExaminedEvent args)
-    {
-        if (!mindContainer.ShowExamineInfo || !args.IsInDetailsRange)
-            return;
-
-        // TODO: Move this out of the SharedMindSystem into its own comp and predict it
-        if (_net.IsClient)
-            return;
-
-        // Begin DeltaV Addition
-        var ev = new ShowSSDIndicatorEvent();
-        RaiseLocalEvent(uid, ref ev);
-        if (ev.Hidden)
-            return;
-        // End DeltaV Addition
-
-        var dead = _mobState.IsDead(uid);
-        var mind = CompOrNull<MindComponent>(mindContainer.Mind);
-        var hasUserId = mind?.UserId;
-        var hasActiveSession = hasUserId != null && _playerManager.ValidSessionId(hasUserId.Value);
-
-        // Scenarios:
-        // 1. Dead + No User ID: Entity is permanently dead with no player ever attached
-        // 2. Dead + Has User ID + No Session: Player died and disconnected
-        // 3. Dead + Has Session: Player is dead but still connected
-        // 4. Alive + No User ID: Entity was never controlled by a player
-        // 5. Alive + No Session: Player disconnected while alive (SSD)
-
-        if (dead && hasUserId == null)
-            args.PushMarkup($"[color=mediumpurple]{Loc.GetString("comp-mind-examined-dead-and-irrecoverable", ("ent", uid))}[/color]");
-        else if (dead && !hasActiveSession)
-            args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-dead-and-ssd", ("ent", uid))}[/color]");
-        else if (dead)
-            args.PushMarkup($"[color=red]{Loc.GetString("comp-mind-examined-dead", ("ent", uid))}[/color]");
-        else if (hasUserId == null)
-            args.PushMarkup($"[color=mediumpurple]{Loc.GetString("comp-mind-examined-catatonic", ("ent", uid))}[/color]");
-        else if (!hasActiveSession)
-            args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", uid))}[/color]");
-    }
-
     /// <summary>
     /// Checks to see if the user's mind prevents them from suicide
     /// Handles the suicide event without killing the user if true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
index bc2cf92ece..58548c1a96 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -29,7 +29,7 @@
     damageContainer: BiologicalMetaphysical
     damageModifierSet: ManifestedSpirit
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: NpcFactionMember
     factions:
     - PetsNT
@@ -94,7 +94,7 @@
     tags:
     - Chapel
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: Familiar
   - type: Dispellable
   - type: Psionic #Nyano - Summary: makes psionic on creation.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 03c4998942..5ddb26fbe3 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -174,7 +174,7 @@
   - type: Crawler
   - type: Dna
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: CanEnterCryostorage
   - type: InteractionPopup
     successChance: 1

From fc1ea0522dc4cbf046dd4324c748194de70f2282 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 8 Feb 2026 08:25:36 +0100
Subject: [PATCH 274/360] Downstream fixes for #42253 (Predicted mind examine)

---
 Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml   | 2 +-
 .../Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml     | 2 +-
 Resources/Prototypes/_DV/CosmicCult/Mobs/astralforms.yml        | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml       | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml             | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/NPCs/salvage.yml         | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/Player/harpy.yml         | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml    | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/Player/ovinia.yml        | 2 +-
 Resources/Prototypes/_DV/Entities/Mobs/Player/vulpkanin.yml     | 2 +-
 Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml  | 2 +-
 .../_Impstation/Entities/Mobs/Anomalites/anomalites.yml         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
index 1166d8a29f..6aa8db0e82 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -11,7 +11,7 @@
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable # DeltaV - Update for predicted mind examine
   - type: Input
     context: "human"
   - type: MobMover
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
index 7363df80cf..ce95635319 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -11,7 +11,7 @@
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable # DeltaV - Update for predicted mind examine
   - type: Input
     context: "human"
   - type: MobMover
diff --git a/Resources/Prototypes/_DV/CosmicCult/Mobs/astralforms.yml b/Resources/Prototypes/_DV/CosmicCult/Mobs/astralforms.yml
index d210557d00..6a2e364b23 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Mobs/astralforms.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Mobs/astralforms.yml
@@ -31,7 +31,7 @@
   - type: StatusIcon
     bounds: -0.5,-0.5,0.5,0.5
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: Examiner
   - type: ContentEye
     maxZoom: 1.2, 1.2
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
index 0e6e9d5ef4..1c15f9b82a 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
@@ -63,7 +63,7 @@
     - Research
     - Robotics
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: Familiar
   - type: Dispellable
   - type: Damageable
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml
index 7fdaabf577..07d534c139 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml
@@ -55,7 +55,7 @@
   - type: Puller
     needsHands: false
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: PotentialPsionic
   - type: Psionic
     removable: false
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/salvage.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/salvage.yml
index 808444ed70..5684fc30a1 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/salvage.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/salvage.yml
@@ -12,7 +12,7 @@
         0: Alive
         100: Dead #Tweak for "Acidify on Crit"
     - type: MindContainer
-      showExamineInfo: False
+    - type: MindExaminable
     - type: Loadout
       prototypes:
         - RadioGuardGear
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/harpy.yml
index e2541def03..fbf6af411a 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/harpy.yml
@@ -11,7 +11,7 @@
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: Input
     context: "human"
   - type: MobMover
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml
index 5976a5f0cb..31eefb6810 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml
@@ -58,7 +58,7 @@
     rootTask:
       task: IdleCompound
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: CosmicMarkVisuals
     subtleState: kitsunefox
     starState: kitsunefox
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/ovinia.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/ovinia.yml
index 91c67f260a..6068a59168 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/ovinia.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/ovinia.yml
@@ -5,7 +5,7 @@
   components:
   - type: CombatMode
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable
   - type: Input
     context: "human"
   - type: MobMover
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/vulpkanin.yml
index ea2357a5c0..772f56c50a 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/vulpkanin.yml
@@ -11,7 +11,7 @@
       interactSuccessSound: /Audio/Effects/thudswoosh.ogg
       messagePerceivedByOthers: hugging-success-generic-others
     - type: MindContainer
-      showExamineInfo: true
+    - type: MindExaminable
     - type: Input
       context: "human"
     - type: MobMover
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
index 115ad2628f..547a1ad054 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
@@ -236,7 +236,7 @@
     - type: Climbing
     - type: StandingState
     - type: MindContainer
-      showExamineInfo: true
+    - type: MindExaminable # DeltaV - Update for predicted mind examine
     - type: SSDIndicator
     - type: CanEscapeInventory
     - type: HumanoidAppearance
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
index 7c7a6ab754..166cdb05f3 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
@@ -16,7 +16,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: MindContainer
-    showExamineInfo: true
+  - type: MindExaminable # DeltaV - Update for predicted mind examine
   - type: Sprite
     noRot: true
     drawdepth: Mobs

From 96640650a0dcb96180c7fbb0885f366a9ce6140d Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 11 Jan 2026 01:46:54 +0100
Subject: [PATCH 275/360] Fix warning spam from ShortKeyName (#42351)

---
 Content.Client/UserInterface/BoundKeyHelpers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/BoundKeyHelpers.cs b/Content.Client/UserInterface/BoundKeyHelpers.cs
index a4a09a4507..ce4e5d1f46 100644
--- a/Content.Client/UserInterface/BoundKeyHelpers.cs
+++ b/Content.Client/UserInterface/BoundKeyHelpers.cs
@@ -10,7 +10,7 @@ public static class BoundKeyHelper
     public static string ShortKeyName(BoundKeyFunction keyFunction)
     {
         // need to use shortened key names so they fit in the buttons.
-        return TryGetShortKeyName(keyFunction, out var name) ? Loc.GetString(name) : " ";
+        return TryGetShortKeyName(keyFunction, out var name) ? name : " ";
     }
 
     public static bool IsBound(BoundKeyFunction keyFunction)

From dcf776afe486fbdddaf7f6dc2468596b9e1be1c0 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sun, 11 Jan 2026 05:06:06 +0100
Subject: [PATCH 276/360] Janiborg Module Cleanup (#42330)

init
---
 Content.Shared/Tools/Components/ToolComponent.cs  |  2 +-
 .../Objects/Specific/Janitorial/janitor.yml       |  9 +++++++++
 .../Objects/Specific/Janitorial/spray.yml         | 15 +++++++++------
 .../Objects/Specific/Robotics/borg_modules.yml    |  2 ++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Content.Shared/Tools/Components/ToolComponent.cs b/Content.Shared/Tools/Components/ToolComponent.cs
index a7210c6fa0..67806e3e16 100644
--- a/Content.Shared/Tools/Components/ToolComponent.cs
+++ b/Content.Shared/Tools/Components/ToolComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class ToolComponent : Component
     ///     For tool interactions that have a delay before action this will modify the rate, time to wait is divided by this value
     /// </summary>
     [DataField]
-    public float SpeedModifier  = 1;
+    public float SpeedModifier = 1f;
 
     [DataField]
     public SoundSpecifier? UseSound;
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 19e3ed66e6..a72abc0a7b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -378,3 +378,12 @@
         Piercing: 3
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
+
+- type: entity
+  parent: WireBrush
+  id: WireBrushElectrical
+  name: electrical wire brush
+  description: A bristly steel wire brush with a moving head, allowing for a way easier time cleaning.
+  components:
+  - type: Tool
+    speedModifier: 1.5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index e83d4fece0..47e3af78aa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -142,22 +142,25 @@
   id: BorgMegaSprayBottle
   name: adv. internal spray jet
   suffix: Filled
-  description: An upgraded version of the integrated spray bottle, installed directly into a custodial cyborg. Typically filled with space cleaner for dealing with those nasty spills.
+  description: An upgraded version of the integrated spray bottle, installed directly into a custodial cyborg. This one is capable of creating space cleaner from moisture in the air.
   components:
   - type: SolutionContainerManager
     solutions:
       spray:
-        maxVol: 500
+        maxVol: 250
         reagents:
         - ReagentId: SpaceCleaner
-          Quantity: 500
-  - type: SolutionRegeneration # Delta-V - Refill borg's mega spray 1 full use per 5 seconds
+          Quantity: 250
+  - type: SolutionTransfer
+    canSend: false # No giving away infinite space cleaner!
+  - type: SolutionRegeneration
     solution: spray
+    duration: 5 # Delta-V - Refill borg's mega spray 1 full use per 5 seconds
     generated:
       reagents:
       - ReagentId: SpaceCleaner
-        Quantity: 10
-    duration: 5
+        Quantity: 10 # Delta-V - Refill borg's mega spray 1 full use per 5 seconds
+
 
 # Vapor
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 51634359f8..20d92cdf17 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -833,6 +833,7 @@
   - type: ItemBorgModule
     hands:
     - item: MopItem
+    - item: WireBrush
     - item: BorgBucket
     - item: BorgSprayBottle
     - item: HoloprojectorBorg
@@ -852,6 +853,7 @@
   - type: ItemBorgModule
     hands:
     - item: AdvMopItem
+    - item: WireBrushElectrical
     - item: BorgMegaSprayBottle
     - item: WireBrush # DeltaV
     - item: HoloprojectorBorg

From e3e6867491e94edb993350b09c7378047250718c Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Sun, 11 Jan 2026 11:39:21 -0500
Subject: [PATCH 277/360] fix: clear health bar/icon overlay damage containers
 on update (#39288)

* fix: clear health overlay damage containers on update

* linqn't

* import

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Client/Overlays/ShowHealthBarsSystem.cs  | 5 +++--
 Content.Client/Overlays/ShowHealthIconsSystem.cs | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Overlays/ShowHealthBarsSystem.cs b/Content.Client/Overlays/ShowHealthBarsSystem.cs
index 9fefe93094..a25e08d1fe 100644
--- a/Content.Client/Overlays/ShowHealthBarsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthBarsSystem.cs
@@ -1,8 +1,6 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Overlays;
 using Robust.Client.Graphics;
-using System.Linq;
-using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Overlays;
@@ -35,6 +33,9 @@ public sealed class ShowHealthBarsSystem : EquipmentHudSystem<ShowHealthBarsComp
     {
         base.UpdateInternal(component);
 
+        _overlay.DamageContainers.Clear();
+        _overlay.StatusIcon = null;
+
         foreach (var comp in component.Components)
         {
             foreach (var damageContainerId in comp.DamageContainers)
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index 1b1f777ccd..e574366843 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -5,7 +5,6 @@ using Content.Shared.Overlays;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
 using Robust.Shared.Prototypes;
-using System.Linq;
 using Content.Shared.Damage.Components;
 using Content.Shared.Mobs; // DeltaV - Nuke Health icons.
 
@@ -33,9 +32,13 @@ public sealed class ShowHealthIconsSystem : EquipmentHudSystem<ShowHealthIconsCo
     {
         base.UpdateInternal(component);
 
-        foreach (var damageContainerId in component.Components.SelectMany(x => x.DamageContainers))
+        DamageContainers.Clear();
+        foreach (var comp in component.Components)
         {
-            DamageContainers.Add(damageContainerId);
+            foreach (var damageContainerId in comp.DamageContainers)
+            {
+                DamageContainers.Add(damageContainerId);
+            }
         }
     }
 

From 399a86860d288f115675de7fe444a591763531d5 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sun, 11 Jan 2026 21:05:32 +0100
Subject: [PATCH 278/360] Fix action tooltip warnings (#42361)

fix action examine warnings
---
 .../UserInterface/Systems/Actions/Controls/ActionButton.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index ec66e4a9da..b77d81dc6e 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -198,8 +198,8 @@ public sealed class ActionButton : Control, IEntityControl
         if (!_entities.TryGetComponent(Action, out MetaDataComponent? metadata))
             return null;
 
-        var name = FormattedMessage.FromMarkupPermissive(Loc.GetString(metadata.EntityName));
-        var desc = FormattedMessage.FromMarkupPermissive(Loc.GetString(metadata.EntityDescription));
+        var name = FormattedMessage.FromMarkupPermissive(metadata.EntityName);
+        var desc = FormattedMessage.FromMarkupPermissive(metadata.EntityDescription);
 
         if (_player.LocalEntity is null)
             return null;

From 66ac4f1e42936a236554a06ab04f49e8e4268b82 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 11 Jan 2026 22:34:08 +0100
Subject: [PATCH 279/360] Add admin logs for connecting/disconnecting players
 (#42363)

* Initial commit

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 Content.Server/GameTicking/GameTicker.Player.cs | 6 ++++++
 Content.Shared.Database/LogType.cs              | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index cc126441e3..0bd7e1d1c6 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
 using Content.Shared.Players;
@@ -92,6 +93,7 @@ namespace Content.Server.GameTicking
                         else
                             SpawnWaitDb();
 
+                        _adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} connected to the game.");
                         break;
                     }
 
@@ -118,6 +120,8 @@ namespace Content.Server.GameTicking
                         }
                     }
 
+                    _adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} connected to the game.");
+
                     break;
                 }
 
@@ -130,6 +134,8 @@ namespace Content.Server.GameTicking
                     }
 
                     _userDb.ClientDisconnected(session);
+
+                    _adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} disconnected from the game.");
                     break;
                 }
             }
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index cbf9a44dde..cbb544366b 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -482,6 +482,11 @@ public enum LogType
     /// </summary>
     Instrument = 103,
 
+    /// <summary>
+    /// Events related to players connecting/disconnecting.
+    /// </summary>
+    Connection = 104,
+
     /// <summary>
     /// Delta V - RMC Pose port
     /// </summary>

From dc7b12ae47fdc7037cbdcad8fef0ffa5e653d0c3 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sun, 11 Jan 2026 23:48:01 +0100
Subject: [PATCH 280/360] Predict BarSignBoundUserinterface (#42364)

fix bar sign prediction
---
 Content.Client/BarSign/BarSignSystem.cs       | 53 -------------------
 .../BarSign/BarSignVisualizerSystem.cs        | 30 +++++++++++
 .../BarSign/Ui/BarSignBoundUserInterface.cs   | 19 +++----
 Content.Shared/BarSign/BarSignComponent.cs    | 22 ++++++++
 Content.Shared/BarSign/BarSignSystem.cs       | 29 ++++++++++
 5 files changed, 88 insertions(+), 65 deletions(-)
 delete mode 100644 Content.Client/BarSign/BarSignSystem.cs
 create mode 100644 Content.Client/BarSign/BarSignVisualizerSystem.cs

diff --git a/Content.Client/BarSign/BarSignSystem.cs b/Content.Client/BarSign/BarSignSystem.cs
deleted file mode 100644
index 1ea99864a1..0000000000
--- a/Content.Client/BarSign/BarSignSystem.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Content.Client.BarSign.Ui;
-using Content.Shared.BarSign;
-using Content.Shared.Power;
-using Robust.Client.GameObjects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.BarSign;
-
-public sealed class BarSignSystem : VisualizerSystem<BarSignComponent>
-{
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly UserInterfaceSystem _ui = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<BarSignComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
-    }
-
-    private void OnAfterAutoHandleState(EntityUid uid, BarSignComponent component, ref AfterAutoHandleStateEvent args)
-    {
-        if (_ui.TryGetOpenUi<BarSignBoundUserInterface>(uid, BarSignUiKey.Key, out var bui))
-            bui.Update(component.Current);
-
-        UpdateAppearance(uid, component);
-    }
-
-    protected override void OnAppearanceChange(EntityUid uid, BarSignComponent component, ref AppearanceChangeEvent args)
-    {
-        UpdateAppearance(uid, component, args.Component, args.Sprite);
-    }
-
-    private void UpdateAppearance(EntityUid id, BarSignComponent sign, AppearanceComponent? appearance = null, SpriteComponent? sprite = null)
-    {
-        if (!Resolve(id, ref appearance, ref sprite))
-            return;
-
-        AppearanceSystem.TryGetData<bool>(id, PowerDeviceVisuals.Powered, out var powered, appearance);
-
-        if (powered
-            && sign.Current != null
-            && _prototypeManager.Resolve(sign.Current, out var proto))
-        {
-            SpriteSystem.LayerSetSprite((id, sprite), 0, proto.Icon);
-            sprite.LayerSetShader(0, "unshaded");
-        }
-        else
-        {
-            SpriteSystem.LayerSetRsiState((id, sprite), 0, "empty");
-            sprite.LayerSetShader(0, null, null);
-        }
-    }
-}
diff --git a/Content.Client/BarSign/BarSignVisualizerSystem.cs b/Content.Client/BarSign/BarSignVisualizerSystem.cs
new file mode 100644
index 0000000000..3e641fed70
--- /dev/null
+++ b/Content.Client/BarSign/BarSignVisualizerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.BarSign;
+using Content.Shared.Power;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.BarSign;
+
+public sealed class BarSignVisualizerSystem : VisualizerSystem<BarSignComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    protected override void OnAppearanceChange(EntityUid uid, BarSignComponent component, ref AppearanceChangeEvent args)
+    {
+        AppearanceSystem.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var powered, args.Component);
+        AppearanceSystem.TryGetData<string>(uid, BarSignVisuals.BarSignPrototype, out var currentSign, args.Component);
+
+        if (powered
+            && currentSign != null
+            && _prototypeManager.Resolve<BarSignPrototype>(currentSign, out var proto))
+        {
+            SpriteSystem.LayerSetSprite((uid, args.Sprite), 0, proto.Icon);
+            args.Sprite?.LayerSetShader(0, "unshaded");
+        }
+        else
+        {
+            SpriteSystem.LayerSetRsiState((uid, args.Sprite), 0, "empty");
+            args.Sprite?.LayerSetShader(0, null, null);
+        }
+    }
+}
diff --git a/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs b/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs
index fe07f0f1d1..8265877edf 100644
--- a/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs
+++ b/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs
@@ -19,32 +19,27 @@ public sealed class BarSignBoundUserInterface(EntityUid owner, Enum uiKey) : Bou
         var sign = EntMan.GetComponentOrNull<BarSignComponent>(Owner)?.Current is { } current
             ? _prototype.Index(current)
             : null;
-        var allSigns = Shared.BarSign.BarSignSystem.GetAllBarSigns(_prototype)
+        var allSigns = BarSignSystem.GetAllBarSigns(_prototype)
             .OrderBy(p => Loc.GetString(p.Name))
             .ToList();
         _menu = new(sign, allSigns);
 
         _menu.OnSignSelected += id =>
         {
-            SendMessage(new SetBarSignMessage(id));
+            SendPredictedMessage(new SetBarSignMessage(id));
         };
 
         _menu.OnClose += Close;
         _menu.OpenCentered();
     }
 
-    public void Update(ProtoId<BarSignPrototype>? sign)
+    public override void Update()
     {
-        if (_prototype.Resolve(sign, out var signPrototype))
-            _menu?.UpdateState(signPrototype);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
+        if (!EntMan.TryGetComponent<BarSignComponent>(Owner, out var signComp))
             return;
-        _menu?.Dispose();
+
+        if (_prototype.Resolve(signComp.Current, out var signPrototype))
+            _menu?.UpdateState(signPrototype);
     }
 }
 
diff --git a/Content.Shared/BarSign/BarSignComponent.cs b/Content.Shared/BarSign/BarSignComponent.cs
index 98c6e815cc..f62d2f7a93 100644
--- a/Content.Shared/BarSign/BarSignComponent.cs
+++ b/Content.Shared/BarSign/BarSignComponent.cs
@@ -4,6 +4,10 @@ using Robust.Shared.Serialization;
 
 namespace Content.Shared.BarSign;
 
+/// <summary>
+/// Makes it possible to switch this entity's sprite and name using a BUI.
+/// <seealso cref="BarSignPrototype"/>
+/// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class BarSignComponent : Component
 {
@@ -14,14 +18,32 @@ public sealed partial class BarSignComponent : Component
     public ProtoId<BarSignPrototype>? Current;
 }
 
+/// <summary>
+/// The key for the BoundUserInterface.
+/// </summary>
 [Serializable, NetSerializable]
 public enum BarSignUiKey : byte
 {
     Key
 }
 
+/// <summary>
+/// The enum to be used for appearance data of the bar sign.
+/// </summary>
+[Serializable, NetSerializable]
+public enum BarSignVisuals : byte
+{
+    BarSignPrototype,
+}
+
+/// <summary>
+/// Send from the client when setting the bar sign.
+/// </summary>
 [Serializable, NetSerializable]
 public sealed class SetBarSignMessage(ProtoId<BarSignPrototype> sign) : BoundUserInterfaceMessage
 {
+    /// <summary>
+    /// The new prototype to use.
+    /// </summary>
     public ProtoId<BarSignPrototype> Sign = sign;
 }
diff --git a/Content.Shared/BarSign/BarSignSystem.cs b/Content.Shared/BarSign/BarSignSystem.cs
index 0c9770bfe9..57ba72ecf9 100644
--- a/Content.Shared/BarSign/BarSignSystem.cs
+++ b/Content.Shared/BarSign/BarSignSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -9,10 +10,14 @@ public sealed class BarSignSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
 
     public override void Initialize()
     {
         SubscribeLocalEvent<BarSignComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<BarSignComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
         Subs.BuiEvents<BarSignComponent>(BarSignUiKey.Key,
             subs =>
         {
@@ -29,25 +34,49 @@ public sealed class BarSignSystem : EntitySystem
         SetBarSign(ent, newPrototype);
     }
 
+    private void OnAfterAutoHandleState(Entity<BarSignComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        // Update the UI if the component was changed.
+        if (_ui.TryGetOpenUi(ent.Owner, BarSignUiKey.Key, out var bui))
+            bui.Update();
+    }
+
     private void OnSetBarSignMessage(Entity<BarSignComponent> ent, ref SetBarSignMessage args)
     {
         if (!_prototypeManager.Resolve(args.Sign, out var signPrototype))
             return;
 
+        if (signPrototype.Hidden)
+            return; // Hidden signs cannot be selected from the BUI.
+
         SetBarSign(ent, signPrototype);
     }
 
+    /// <summary>
+    /// Set the sprite, name and description of the bar sign to a given <see cref="BarSignPrototype"/>.
+    /// </summary>
     public void SetBarSign(Entity<BarSignComponent> ent, BarSignPrototype newPrototype)
     {
+        if (ent.Comp.Current == newPrototype.ID)
+            return;
+
         var meta = MetaData(ent);
         var name = Loc.GetString(newPrototype.Name);
         _metaData.SetEntityName(ent, name, meta);
         _metaData.SetEntityDescription(ent, Loc.GetString(newPrototype.Description), meta);
+        _appearance.SetData(ent.Owner, BarSignVisuals.BarSignPrototype, newPrototype.ID);
 
         ent.Comp.Current = newPrototype.ID;
         Dirty(ent);
+
+        // Predict updating the BUI if it's open.
+        if (_ui.TryGetOpenUi(ent.Owner, BarSignUiKey.Key, out var bui))
+            bui.Update();
     }
 
+    /// <summary>
+    /// Returns a list of all <see cref="BarSignPrototype"/>s that are not hidden.
+    /// </summary>
     public static List<BarSignPrototype> GetAllBarSigns(IPrototypeManager prototypeManager)
     {
         return prototypeManager

From 7a324cfbe234c8344327263b0bec02143c0d086a Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Mon, 12 Jan 2026 03:47:47 +0100
Subject: [PATCH 281/360] Add the ability for station maps to track grids they
 are not on (#41248)

* Initial commit

* Accidentally included the nukie map changes

* Fix the gridcheck

* Addressing review

* Review change

* Review comments
---
 .../UI/StationMapBoundUserInterface.cs        |  10 +++-
 .../GameTicking/Rules/NukeopsRuleSystem.cs    |  19 +++++++
 Content.Server/Pinpointer/StationMapSystem.cs |  53 +++++++++++++++++-
 .../Pinpointer/NukeopsStationMapComponent.cs  |  10 ++++
 .../Pinpointer/StationMapComponent.cs         |  20 ++++++-
 .../Entities/Objects/Devices/station_map.yml  |  34 +++++++++++
 .../tablets.rsi/inhand-left-syndie.png        | Bin 0 -> 15446 bytes
 .../tablets.rsi/inhand-right-syndie.png       | Bin 0 -> 15527 bytes
 .../Objects/Devices/tablets.rsi/meta.json     |  19 ++++++-
 .../Objects/Devices/tablets.rsi/syndie.png    | Bin 0 -> 15127 bytes
 10 files changed, 158 insertions(+), 7 deletions(-)
 create mode 100644 Content.Shared/Pinpointer/NukeopsStationMapComponent.cs
 create mode 100644 Resources/Textures/Objects/Devices/tablets.rsi/inhand-left-syndie.png
 create mode 100644 Resources/Textures/Objects/Devices/tablets.rsi/inhand-right-syndie.png
 create mode 100644 Resources/Textures/Objects/Devices/tablets.rsi/syndie.png

diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
index 3d1eb1723c..49b383a7d7 100644
--- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
@@ -17,7 +17,11 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface
         base.Open();
         EntityUid? gridUid = null;
 
-        if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
+        if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.TargetGrid != null)
+        {
+            gridUid = comp.TargetGrid;
+        }
+        else if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
         {
             gridUid = xform.GridUid;
         }
@@ -30,8 +34,8 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface
         {
             stationName = gridMetaData.EntityName;
         }
-        
-        if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.ShowLocation)
+
+        if (comp != null && comp.ShowLocation)
             _window.Set(stationName, gridUid, Owner);
         else
             _window.Set(stationName, gridUid, null);
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 247e2341a4..d4777faadb 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -91,6 +91,8 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
             return;
 
         component.TargetStation = RobustRandom.Pick(eligible);
+        var ev = new NukeopsTargetStationSelectedEvent(uid, component.TargetStation);
+        RaiseLocalEvent(ref ev);
     }
 
     #region Event Handlers
@@ -584,3 +586,20 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
         return null;
     }
 }
+
+/// <summary>
+/// Raised when a station has been assigned as a target for the NukeOps rule.
+/// </summary>
+[ByRefEvent]
+public readonly struct NukeopsTargetStationSelectedEvent(EntityUid ruleEntity, EntityUid? targetStation)
+{
+    /// <summary>
+    /// The entity containing the NukeOps gamerule.
+    /// </summary>
+    public readonly EntityUid RuleEntity = ruleEntity;
+
+    /// <summary>
+    /// The target station, if it exists.
+    /// </summary>
+    public readonly EntityUid? TargetStation = targetStation;
+}
diff --git a/Content.Server/Pinpointer/StationMapSystem.cs b/Content.Server/Pinpointer/StationMapSystem.cs
index c8e5b22617..bf2d2e2817 100644
--- a/Content.Server/Pinpointer/StationMapSystem.cs
+++ b/Content.Server/Pinpointer/StationMapSystem.cs
@@ -1,7 +1,10 @@
+using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.PowerCell;
 using Content.Shared.Pinpointer;
+using Content.Shared.Station;
 using Robust.Server.GameObjects;
-using Robust.Shared.Player;
 
 namespace Content.Server.Pinpointer;
 
@@ -9,12 +12,18 @@ public sealed class StationMapSystem : EntitySystem
 {
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly PowerCellSystem _cell = default!;
+    [Dependency] private readonly SharedStationSystem _station = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly GameTicker _gameTicker = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<StationMapComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<StationMapUserComponent, EntParentChangedMessage>(OnUserParentChanged);
 
+        SubscribeLocalEvent<NukeopsStationMapComponent, NukeopsTargetStationSelectedEvent>(OnNukeopsStationSelected);
+
         Subs.BuiEvents<StationMapComponent>(StationMapUiKey.Key, subs =>
         {
             subs.Event<BoundUIOpenedEvent>(OnStationMapOpened);
@@ -22,6 +31,33 @@ public sealed class StationMapSystem : EntitySystem
         });
     }
 
+    private void OnMapInit(Entity<StationMapComponent> ent, ref MapInitEvent args)
+    {
+        if (!ent.Comp.InitializeWithStation)
+            return;
+
+        // If we ever find a need to make more exceptions like this, just turn this into an event.
+        if (HasComp<NukeopsStationMapComponent>(ent))
+        {
+            foreach (var rule in _gameTicker.GetActiveGameRules())
+            {
+                if (TryComp<NukeopsRuleComponent>(rule, out var nukeopsRule) && nukeopsRule.TargetStation != null)
+                {
+                    ent.Comp.TargetGrid = _station.GetLargestGrid((nukeopsRule.TargetStation.Value, null));
+                    Dirty(ent);
+                    return;
+                }
+            }
+        }
+
+        var station = _station.GetStationInMap(_xform.GetMapId(ent.Owner));
+        if (station != null)
+        {
+            ent.Comp.TargetGrid = _station.GetLargestGrid((station.Value, null));
+            Dirty(ent);
+        }
+    }
+
     private void OnStationMapClosed(EntityUid uid, StationMapComponent component, BoundUIClosedEvent args)
     {
         if (!Equals(args.UiKey, StationMapUiKey.Key))
@@ -43,4 +79,19 @@ public sealed class StationMapSystem : EntitySystem
         var comp = EnsureComp<StationMapUserComponent>(args.Actor);
         comp.Map = uid;
     }
+
+    private void OnNukeopsStationSelected(Entity<NukeopsStationMapComponent> ent, ref NukeopsTargetStationSelectedEvent args)
+    {
+        if (args.TargetStation == null)
+            return;
+
+        if (!TryComp<StationMapComponent>(ent, out var stationMap) || !TryComp<RuleGridsComponent>(args.RuleEntity, out var ruleGrids))
+            return;
+
+        if (Transform(ent).MapID != ruleGrids.Map)
+            return;
+
+        stationMap.TargetGrid = _station.GetLargestGrid((args.TargetStation.Value, null));
+        Dirty(ent);
+    }
 }
diff --git a/Content.Shared/Pinpointer/NukeopsStationMapComponent.cs b/Content.Shared/Pinpointer/NukeopsStationMapComponent.cs
new file mode 100644
index 0000000000..2b57959f9e
--- /dev/null
+++ b/Content.Shared/Pinpointer/NukeopsStationMapComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Pinpointer;
+
+/// <summary>
+/// Used to indicate that an entity with the StationMapComponent should be updated to target the TargetStation of NukeopsRuleComponent.
+/// Uses the most recent active NukeopsRule when spawned, or the NukeopsRule which spawned the grid that the entity is on.
+/// </summary>
+[RegisterComponent]
+public sealed partial class NukeopsStationMapComponent : Component
+{
+}
diff --git a/Content.Shared/Pinpointer/StationMapComponent.cs b/Content.Shared/Pinpointer/StationMapComponent.cs
index 07cc99605e..bba46215d7 100644
--- a/Content.Shared/Pinpointer/StationMapComponent.cs
+++ b/Content.Shared/Pinpointer/StationMapComponent.cs
@@ -1,11 +1,27 @@
+using Robust.Shared.GameStates;
+
 namespace Content.Shared.Pinpointer;
 
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class StationMapComponent : Component
 {
     /// <summary>
     /// Whether or not to show the user's location on the map.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool ShowLocation = true;
+
+    /// <summary>
+    /// If true, when this entity initializes it will target and remember the station grid of the map the entity is in.
+    /// If there is no station, the entity will target a random station in the current session.
+    /// </summary>
+    [DataField]
+    public bool InitializeWithStation = false;
+
+    /// <summary>
+    /// The target grid that the map will display.
+    /// If null, it will display the user's current grid.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? TargetGrid;
 }
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
index e440cec09a..8724a4060b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
@@ -52,3 +52,37 @@
   id: HandheldStationMapUnpowered
   parent: BaseHandheldStationMap
   suffix: Handheld, Always Powered
+
+- type: entity
+  parent: HandheldStationMap
+  id: HandheldStationMapStatic
+  suffix: Handheld, Works Off-Station
+  components:
+  - type: StationMap
+    initializeWithStation: true
+
+- type: entity
+  parent: HandheldStationMap
+  id: HandheldStationMapNukeops
+  name: target station map
+  suffix: Handheld, NukeOps
+  description: Displays a readout of the target station.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/tablets.rsi
+    layers:
+    - state: tablet
+    - state: syndie
+      shader: unshaded
+  - type: Item
+    sprite: Objects/Devices/tablets.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left-syndie
+      right:
+      - state: inhand-right-syndie
+  - type: StationMap
+    showLocation: false
+    initializeWithStation: true
+  - type: NukeopsStationMap
+
diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/inhand-left-syndie.png b/Resources/Textures/Objects/Devices/tablets.rsi/inhand-left-syndie.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bff1528e7dd7fd72e8d101b1e7bcf5bdce08ed5
GIT binary patch
literal 15446
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
DJljbz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/inhand-right-syndie.png b/Resources/Textures/Objects/Devices/tablets.rsi/inhand-right-syndie.png
new file mode 100644
index 0000000000000000000000000000000000000000..89e389cdb2e5a88a83b7b213dbd441696a4faf4b
GIT binary patch
literal 15527
zcmeI3dt4J&7RN`VtBZ>GTC6W(6st%wlLUm!CP5?!QG*Dm(dE;2NG32P$)uSH2_S_}
z(N?jx+E#IWb#3vr6w4O;;G=437u#K{RO(~JRl3;K(k`%UtvtHO&LkmRB6QmQ^v}uX
z6XxXJ-#O>b_uPA!e`ZT^Qo^`^X#o%fjngEmQ<&>w_8aso=5J4T#eU}UYir^<3WCIQ
z*zXAEp_m*98c{;T#U&?aku*tVkye2wE>2*zkw(IVLy)s^=jY0-)De^GI-2rVg*7zR
zj!i*7nEg#g@RaAnk4^O-6S{4?dej@G^TvI3Xm-d+dUE=hz!$>T%uL^Bw_B(9*NzWz
z)M~E8FPkwjF-Yh<^6{z8^tRqfZ8gnhj;x(!x7+VgH;?MV5~yc3?JC=s^X|k>^xM6q
zV~p3|>-2NhG?ct?ps##W;~IG0=E`Y~(*-Z?J!vg(YMJ!+1oY1FtD_IxT~VV8o3ufF
z8f|FWZkfCsUy|q;(;fLy#M>9%Jf76zJhM0GK*Hf&)!7^Cb{xMp+Ob2kzSy}Tv#7h`
z;R&swGW>pteY$Y<NUf+~;hsjJGFN`{$?nkbTS)S?hRIvg-=DMU%GJZn>I$n`uhs9L
zY2H(B>$+&|x;vM0$p1DyurOv;;P?aEdp;|FIQM*2ecfAS59d97Z^G7^+>X5F)$JYs
z34BUr54#<ZIQ!ij-H%?`H1U%r+k>9Xw@$XVj0!lDUhr}8%ln?Ibm}iOB^*B0OBp|F
zAOE`6R<+@UPxB!tI-5w-(K_u4R8N}4n1Rf|#ZI%8sUZX@Vw_e?pN-Rk3_O#tD2453
z&I<*EK`C4tsYSHbI6R9;%(LOCc}Z#dyllPPAdFE3D4Zx0z>L$Fz-cyFDAcJGy5gdY
z%?`stflESXD}}LaLV-@3EQlj*xFAxzNTf#=MG2zhVo79FR76y`K#E8rVMGSY5Rp`d
zMj&W}RN(mtRRN5puo;YKih8Lh9rH^m%%W*43d0VEL+p@=Nn0i?k;~;UB88<=5u*@M
zxfU98iY(L|caZ)#YMj#B2rEsH76BU<%OLHvQYd5-c|V@}GF!cgER=^GLlJgjR#+lN
z;GvuhdasYwZZo--X3)d92{+>wnqvGUL;6|!&yCl8P)hIgu!)(PXthH-_pjG%9x^pW
z$LBBzJV*zn?f0b8a;-R=f>Wg3rpM!Rm|K}M)ZNpBaiBPZBC#{Wt{rz0!?>|CZa3Ff
za92pd+$$Pq!!eq)rIDmb<=$ljt%vD6?5+~bUrSgFq=Q<ZfPGyC>OBw*S7S7;k|NSb
zkwhXwq-ls0MdWB?#6m=ZA_x$~t@MeZB@KizcZe7g2`ZC<F#x4+4Cee8FdF+wQ9vya
z$Dl`zq|J=cD#DCq;;_|{selIt0i}0Wp>d>%v@y%VRWb!U)bNmAOp8x;cX(BThB@OI
zcEUu92#bJ9Nmv5L0fayx*Oo;!7K+9!dR(JcF#}?PFra!o5{r@;aM7YDd4x!>kBAmw
zizG6UTpkfA%Rr*!MtQWW8d@#r{#a-=skgJo&J)`3GeZOJkA+@oBbb(nnE(yD`k$L(
zh%k?(N+c*|qvrw#fH?-PrkIL9KX|l%!bG^5n-#NBID2%J!v3@C?S|fF$NIQh0E+3^
zwy4sxCkr<y;6bAU%kp}9+=&0TfbRH!`|vp&S-9oLPNqAQOEr8DiZs#=%!bEiGJE2u
zG!1vu!EV0c6)^j6#6%1(gnM*wefoFo<MmXq-4SK>0<$j6RRf6ver#+Yvs<rYYihE)
z^fJWtfhFw4;|tFF`mW>f1?PQz2V7TM2wEler1KdDyx1o0?l7s$^9HVBZq9eeSDj2a
zag$C>FsGMd_vE4okB{%fkdEtya|9+lj_yJMPX(?zx<{F34(4$O_CD_nF0uC*{KCe-
z9sR<A!Ek&MkOrsC<KjdF3V2)~4NjZK#fb<M@VG!4oHmb(6A>ujae*{AZ5|gVB2d8N
z0%>sCJT6W|pn%5((%`gtT%3qN0gnr$!D;ijI1zyY9v4W1)8=t;A_4_GE|3PN&Ew)k
z1PXXuAPr8N$Hj>V6!5q}8k{zdixUwj;BkR8IBgymCn8Y5;{s`L+B_~!M4*7j1=8TO
zd0d=`Kmm^nq`_(PxHu7k0v;DggVW}5aUuc*JT8z1r_JNyL<9<WTp$fjo5#h82o&(R
zKpLDjkBbu#DBy8{G&t=a#T78{1|e=?UK?~U?+0%FP3%49-9mvrF+~eOd7%(gR187g
zeay85g6s$cee)~?p}Qd{n0)=2x}^~0C(x*4)0~a}x?R7_FLuU<9Zef&zIkXd+_v!Q
zUyASiweb6~SI!=pe>C;%l9?YQ)F(eG->a%^`%~cZ*n^c{AKcVZId=M{w92a|3u1yb
zp%?bQ*Y<~3!YWQ&U;pow71q(CA%DmZ8d1c&!YY7*An(uZt4>w-9ZXraAhf|0`MXQk
zZ-hj2=J!5*{z%%I@s+J1HAiL@{l07I*;VA#;3iVKf5lT@e1+i3jfInnCiuq&`3t+3
zoZAl1y-}a}-OUa2nol49_VkLy_pU?O)R(ZX?mSsXNb%weep6q&@J`44+yzmS&VSt=
zU;CxwXm#)c<Akist=HC{SW~ej`qjJ9m+x=sn>u#uhbx|dZjJo10J=VSoj%L<`B_<J
zD^wO$eNoX`(HdX#T<^5jYDc56{M6ny?TtIigpTMFuYR(?=A<3@j_kf!$M%Uv%A@B`
zSzc#ou7|^RE{iuHGscdJ+fjb8v*uPN88a*Momr!Pc%Td0RbouteRj4kC*bp*uCjD-
zY17L8_B8hF>8+nDOOjc>i*`QI^^ZU2pSz!b?o-QeOWsaAmUO@SpWS%w<zr`ByPhn(
z{r!gen!Xy{BSp~<FJIbrX`7+>(%QNQ`RjBUqFNPERUogp_*PF_sYX;@{TkU=S`xCY
oxd1GW`##@q8wWvseIucsk9Mp7DC%irUs~0~C#jDwdG^Ks0TR-8%m4rY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
index 5c572d32e4..224ccf739c 100644
--- a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077 and heavily modified by Flareguy for Space Station 14. Inhands by carousel",
+    "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077 and heavily modified by Flareguy for Space Station 14. Inhands by carousel. Syndie versions modified from generic by SlamBamActionman",
     "size": {
         "x": 32,
         "y": 32
@@ -29,6 +29,23 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "syndie",
+        "delays": [
+            [
+            0.3,
+            0.3
+            ]
+        ]
+        },
+        {
+            "name": "inhand-left-syndie",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-syndie",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/syndie.png b/Resources/Textures/Objects/Devices/tablets.rsi/syndie.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c288c8bf65e6b752c19230d562002ca6c212d3d
GIT binary patch
literal 15127
zcmeI3U5MON6vuBBw63lde5e#3!jwWwo5{y~WG0=Ny4`8rwa&V3N4hPAZ6>+18+Im%
zNoHquYfH5cDuRMvv}GyUH(Tt73W^m4p;l0^s1Kr``=V4)R76Yhq246(k-al}S!u<W
zn_)iAJ@<c3^1Jt($xEId9l5{1Z%rQnpnrHMKZd>;^uBN9E$DOqv$fOc>o#j>w*$cK
zcYE&@;Mn{<0HnXwi{tKi;Xzq7t5HQWOEB7~T4*)^nJo=VQKzBHl;EUpWFx<x{~*HX
zS~jvPQQ!;KAe_>N=4`lgZltKrO{-}wvL)A-X~-x*6}k%3s8$R|Ze$~VTp9iLhPepi
zPjRQSkpV9uGhP^F22C3>iD;5l`J}{1>8Oy9q`0(+5qTlO@i8vOvtmq+^Kx8dnnxtp
zhkj*jtt^k_w>Q%vD;t?|T}$S;dc7X4$D*b^$qDInn&U-I6j?Nbb!H7$X|RT~HVD#+
zlZTFK>z1pV2IIw5N@mT?Mj~FK_R+kqs?|<pI8AnlBG*tXPKfecFOjCUHCD~8_@}0+
z9IU`9G+YPigq}KU%5+U<%3LC4+r4CBv?hf@J9p3XtyX)ccHC_<2tgBRPo-0wwIDYJ
z9kXVuaN7*Jl(oIC-qp*U#aR@|^DKGpu%Ry@^E`pf-wMGBWze<CgEmxL(=M83B^T_n
z(H25xaM0gX%=%rrp_z4OLx#g8o%QZSgL%b;Igu9=tRS$wSmZ^SPopilkr!m14+RNk
zVlfJ)rk7`X#6a7ckB4J~X5ukW{b-7-EGtTQZYYkX%4O58DsE1%DwB}2jL8hw84S&A
z?<#rFte7@BEtrdCxL(5{mA}*EVZ(71Lxscn92$t~x+bf9n%B~0ku8a0iA~4i0-I9B
z6f5y+N=We%FR2M1VxbV0cZJTIYR#*bW@rtCmS8f@3#!1Dlcf|ZCgUl#qzWjBDy1Yv
zf_x$_v_gmEU7;Vcb=2vUN@$LE_Ww3Tk1$=ShI9w*&)LwvMZ4GUWjo=ci$`0IithI$
zOR*j3Ra`dGD!FzOYxgKm<5#Y%s9rbAsa`=qEyFDu?VMIy*_7$s3%ESWLHv+>=^XVb
zXpjmj2<6XOI*4PI-MV7Kfl0I{mQ(9N)WtG9e1`M7e?|Wf7Q#_xu5THZS4Y>k42ycw
z|F;aCU93(i#w65oTx$cj29~#S!Fn#PtX4zluEdP@cO;`KMmtLJs|R(DuCY$$VE(vQ
zjg^`|UlMtAaDw;Ql!o27bT?TVcH`2H@)1LKb7C_aHXKrU|CvEU--&MTU@n<R#8BVG
zhjGQI-hh?yypB4r<Mopm%H(TsM^EAIjxZSy3qy{kFj%V4jhJ79!6>@TLwA^5`xdjS
zJlkFDM*iqr(T$9X#iB_tAY_x`BJ;t#6c+}BY*JigKA4x{!hn!Xii^w#^HN+G5VA>e
zk@;X=iVFimHYqMLAIwW}VL-?x#YN_Wc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@;
z;v)0Gyc8D(gltk=WImXe;=+KCO^S=m2lG-~7!a~aagq68UWy9?LN+NbG9S!KabZBn
zCdEbOgLx?~3<%kzxX64kFU5rcA)6EznGfcrxG*4Olj0)t!Mqd~283)<Tx33&m*T>J
zkWGq<%m?#QTo@3tNyOFHd1w<F=t<2wdL;8?YRx=)oRd+9#tHz;tpniDVF0dPL*G9F
zP~!pkX&(Uc5dc=3&re*~j^@5OoF6DQzW(`W_Rhon9ows4veKc=Z(O<Qm*bm%Sox_^
zTEDgS%)q$?_{nqgtG}^NaC@d-dinJiKI%tOu%NJwRfkU%b2}bhedwu=Q-$-%&o*4m
z{&wosFSefj{_*+GFMjpzwN>xzd0RPh@7a;r1FIg}aS0yWD1Eq}Ik;}`lM9!RU3%}X
zqv=;pp6=iD_uh+M$l&;W;=-BtuRQSD<(q@oxj$Ec7bjxKx$qbG1H5(Sz{WGjZ~e}j
OJiKire|qb_C;kC0PiYkZ

literal 0
HcmV?d00001


From e6d30f7f950ea3a5ba4abc54c32b14b17d92ced1 Mon Sep 17 00:00:00 2001
From: Velken <8467292+Velken@users.noreply.github.com>
Date: Sun, 11 Jan 2026 23:51:49 -0300
Subject: [PATCH 282/360] Admin: fixes description for "help osay" (#42368)

2 diff 2 me
---
 .../Locale/en-US/administration/commands/osay-command.ftl     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/administration/commands/osay-command.ftl b/Resources/Locale/en-US/administration/commands/osay-command.ftl
index de7cecf158..11090909b2 100644
--- a/Resources/Locale/en-US/administration/commands/osay-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/osay-command.ftl
@@ -1,5 +1,5 @@
-osay-command-description = Forces another entity to try to send a message
-osay-command-help-text = Usage: {$command} <uid> <type> <message>
+cmd-osay-desc = Forces another entity to try to send a message
+cmd-osay-help = Usage: {$command} <uid> <type> <message>
 
 osay-command-arg-uid = source uid
 osay-command-arg-type = type

From 0631053495e4a2d47e3daeed7488c72dfffeeca5 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Mon, 12 Jan 2026 03:58:56 +0100
Subject: [PATCH 283/360] Fix GenpopLockerBoundUserInterface prediction
 (#42365)

fix genpop prediction
---
 Content.Client/Security/Ui/GenpopLockerBoundUserInterface.cs | 2 +-
 Content.Shared/Security/Systems/SharedGenpopSystem.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Security/Ui/GenpopLockerBoundUserInterface.cs b/Content.Client/Security/Ui/GenpopLockerBoundUserInterface.cs
index a546fa6fc6..63276e1a90 100644
--- a/Content.Client/Security/Ui/GenpopLockerBoundUserInterface.cs
+++ b/Content.Client/Security/Ui/GenpopLockerBoundUserInterface.cs
@@ -16,7 +16,7 @@ public sealed class GenpopLockerBoundUserInterface(EntityUid owner, Enum uiKey)
 
         _menu.OnConfigurationComplete += (name, time, crime) =>
         {
-            SendMessage(new GenpopLockerIdConfiguredMessage(name, time, crime));
+            SendPredictedMessage(new GenpopLockerIdConfiguredMessage(name, time, crime));
             Close();
         };
 
diff --git a/Content.Shared/Security/Systems/SharedGenpopSystem.cs b/Content.Shared/Security/Systems/SharedGenpopSystem.cs
index 66bf5ca254..410922747b 100644
--- a/Content.Shared/Security/Systems/SharedGenpopSystem.cs
+++ b/Content.Shared/Security/Systems/SharedGenpopSystem.cs
@@ -59,7 +59,7 @@ public abstract class SharedGenpopSystem : EntitySystem
         // Instead, we just fill in the spot temporarily til the checks pass.
         ent.Comp.LinkedId = EntityUid.Invalid;
 
-        _lock.Lock(ent.Owner, null);
+        _lock.Lock(ent.Owner, args.Actor);
         _entityStorage.CloseStorage(ent);
 
         CreateId(ent, args.Name, args.Sentence, args.Crime);

From 77f524fa251c60a40481348227b34a0652c29b71 Mon Sep 17 00:00:00 2001
From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Mon, 12 Jan 2026 09:24:32 -0500
Subject: [PATCH 284/360] Fix holywater locale string usage. (#42378)

Update chemistry-bottles.yml
---
 .../Entities/Objects/Specific/Chemistry/chemistry-bottles.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml
index 153629b07f..3397175351 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml
@@ -475,7 +475,7 @@
   parent: BaseChemistryBottleFilled
   components:
   - type: Label
-    currentLabel: reagent-name-holy-water
+    currentLabel: reagent-name-holywater
   - type: SolutionContainerManager
     solutions:
       drink:

From 13ddcdea36b41321545ce0016a04e84d4bfb7fce Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Mon, 12 Jan 2026 12:56:37 -0800
Subject: [PATCH 285/360] Medical Cyborg Modules Rework. (#42123)

* PUSH!!!

* Femtanyl

* eh swap em back

* My PR is ruined!!!

* review 2 electric boogaloo

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Locale/en-US/robotics/borg_modules.ftl    |  1 +
 Resources/Migrations/migration.yml            |  3 +
 .../Spawners/Random/Department/science.yml    |  2 +-
 .../Specific/Robotics/borg_modules.yml        | 90 +++++++++----------
 .../Recipes/Lathes/Packs/robotics.yml         |  2 +-
 .../Recipes/Lathes/robot_modules.yml          |  4 +-
 .../Prototypes/Research/civilianservices.yml  |  2 +-
 Resources/Prototypes/tags.yml                 |  2 +-
 8 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/Resources/Locale/en-US/robotics/borg_modules.ftl b/Resources/Locale/en-US/robotics/borg_modules.ftl
index 83d97e7429..c9c674e865 100644
--- a/Resources/Locale/en-US/robotics/borg_modules.ftl
+++ b/Resources/Locale/en-US/robotics/borg_modules.ftl
@@ -4,6 +4,7 @@ borg-slot-circuitboards-empty = Circuitboards
 borg-slot-flatpacks-empty = Flatpacks
 borg-slot-tiles-empty = Floor tiles
 borg-slot-topicals-empty = Topicals
+borg-slot-injector-dropper-empty = Precision injectors
 borg-slot-small-containers-empty = Small containers
 borg-slot-chemical-containers-empty = Chemical containers
 borg-slot-documents-empty = Books and papers
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 8db3e9a1f1..6b80aa694b 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -716,3 +716,6 @@ SpacemenFigureSpawner: SpacemenFigurineSpawner90
 # 2026-01-07
 HandheldHealthAnalyzerUnpowered: HandheldHealthAnalyzer
 HandheldHealthAnalyzerEmpty: HandheldHealthAnalyzer
+
+#2026-01-09
+BorgModuleAdvancedChemical: BorgModuleAdvancedTopical
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
index 35e748f89c..eca0b4b88f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -103,7 +103,7 @@
       state: generic
   - type: RandomSpawner
     rarePrototypes:
-    - BorgModuleAdvancedChemical
+    - BorgModuleAdvancedTopical
     - BorgModuleAdvancedCleaning
     - BorgModuleAdvancedTool
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 20d92cdf17..793b3c8d9f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -889,7 +889,7 @@
 - type: entity
   id: BorgModuleTopicals
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: topicals cyborg module
+  name: first aid cyborg module
   components:
   - type: Sprite
     layers:
@@ -898,6 +898,7 @@
   - type: ItemBorgModule
     hands:
     - item: HandheldHealthAnalyzer
+    - item: AdvancedJetInjector
     - item: Gauze
       hand:
         emptyLabel: borg-slot-topicals-empty
@@ -919,13 +920,6 @@
         whitelist:
           components:
           - Healing
-    - item: Bloodpack
-      hand:
-        emptyLabel: borg-slot-topicals-empty
-        emptyRepresentative: Bloodpack
-        whitelist:
-          components:
-          - Healing
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
 
@@ -946,7 +940,6 @@
     - item: Crowbar
     - item: BorgFireExtinguisher
     - item: BorgHandheldGPSBasic
-    - item: HandLabeler
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: defib-module }
 
@@ -958,31 +951,40 @@
   - type: Sprite
     layers:
     - state: medical
-    - state: icon-chem
+    - state: icon-chemist
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzer
-    - item: JetInjector # DeltaV
+    - item: HandLabeler
     - item: Syringe
-    - item: BorgDropper
-    - item: BaseChemistryEmptyVial
+      hand:
+        emptyLabel: borg-slot-injector-dropper-empty
+        emptyRepresentative: Syringe
+        whitelist:
+          tags:
+          - Dropper
+          - Syringe
+    - item: PillCanister
       hand:
         emptyLabel: borg-slot-small-containers-empty
-        emptyRepresentative: BaseChemistryEmptyVial
+        emptyRepresentative: PillCanister
+        whitelist:
+          tags:
+          - PillCanister
+          - Bottle
+          - Pill
+    - item: Beaker
+      hand:
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: Beaker
         whitelist:
           components:
           - FitsInDispenser
-    - item: BaseChemistryEmptyVial
+          tags:
+          - ChemDispensable
+    - item: Beaker
       hand:
-        emptyLabel: borg-slot-small-containers-empty
-        emptyRepresentative: BaseChemistryEmptyVial
-        whitelist:
-          components:
-          - FitsInDispenser
-    - item: BaseChemistryEmptyVial
-      hand:
-        emptyLabel: borg-slot-small-containers-empty
-        emptyRepresentative: BaseChemistryEmptyVial
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: Beaker
         whitelist:
           components:
           - FitsInDispenser
@@ -1016,48 +1018,40 @@
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: chem-module }
 
 - type: entity
-  id: BorgModuleAdvancedChemical
+  id: BorgModuleAdvancedTopical
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: advanced chemical cyborg module
+  name: advanced first aid cyborg module
   description: Advanced medical module containing the cyborg adaptation of the highly coveted hypospray. Now your cyborgs can inject crew-harmers with chloral hydrate even faster!
   components:
   - type: Sprite
     layers:
     - state: medical
-    - state: icon-chemist
+    - state: icon-chem
   - type: ItemBorgModule
     hands:
     - item: HandheldHealthAnalyzer
     - item: BorgHypo
-    - item: Syringe
-    - item: BorgDropper
-    - item: Beaker
+    - item: Gauze
       hand:
-        emptyLabel: borg-slot-chemical-containers-empty
-        emptyRepresentative: Beaker
+        emptyLabel: borg-slot-topicals-empty
+        emptyRepresentative: Gauze
         whitelist:
           components:
-          - FitsInDispenser
-          tags:
-          - ChemDispensable
-    - item: Beaker
+          - Healing
+    - item: Brutepack
       hand:
-        emptyLabel: borg-slot-chemical-containers-empty
-        emptyRepresentative: Beaker
+        emptyLabel: borg-slot-topicals-empty
+        emptyRepresentative: Brutepack
         whitelist:
           components:
-          - FitsInDispenser
-          tags:
-          - ChemDispensable
-    - item: Beaker
+          - Healing
+    - item: Ointment
       hand:
-        emptyLabel: borg-slot-chemical-containers-empty
-        emptyRepresentative: Beaker
+        emptyLabel: borg-slot-topicals-empty
+        emptyRepresentative: Ointment
         whitelist:
           components:
-          - FitsInDispenser
-          tags:
-          - ChemDispensable
+          - Healing
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-chem-module }
 
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 5d47f01544..f482c07787 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -40,7 +40,7 @@
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
   - BorgModuleAdvancedClowning
-  - BorgModuleAdvancedChemical
+  - BorgModuleAdvancedTopical
   - BorgModuleAdvancedMining
 
 - type: latheRecipePack
diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
index 0888acafce..10d51b51fd 100644
--- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
@@ -82,8 +82,8 @@
 
 - type: latheRecipe
   parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleAdvancedChemical
-  result: BorgModuleAdvancedChemical
+  id: BorgModuleAdvancedTopical
+  result: BorgModuleAdvancedTopical
 
 # Science Modules
 
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 484913091f..ee51e2f7c7 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -146,7 +146,7 @@
   tier: 1 # DeltaV - was 2
   cost: 5000
   recipeUnlocks:
-  - BorgModuleAdvancedChemical
+  - BorgModuleAdvancedTopical
   - AdvancedJetInjector
 
 - type: technology
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a7294fd8b2..ae28f4350b 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -296,7 +296,7 @@
   id: ChefPilot # Tagged entity can control someone wearing a Chef's hat if inside their hat.
 
 - type: Tag
-  id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical
+  id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleChemical
 
 - type: Tag
   id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken

From 74f7357c40d6564a4e3f80f5eb4804244a011f1c Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 8 Feb 2026 08:32:33 +0100
Subject: [PATCH 286/360] Downstream fixes for #42123 (Medical borg module
 rework)

---
 Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml  | 2 +-
 Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml
index b3929c2b03..4223c93cbf 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml
@@ -48,7 +48,7 @@
       - SyndicateNeuroling
       borg_module:
       - BorgModuleTopicals
-      - BorgModuleAdvancedChemical
+      - BorgModuleAdvancedTopical
       - BorgModuleAdvancedSurgery
       borg_id_chip:
       - IdChipSyndie
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml
index f4e94cac76..bef7fd5f33 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml
@@ -35,7 +35,7 @@
   - BorgModuleFauna
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
-  - BorgModuleAdvancedChemical
+  - BorgModuleAdvancedTopical
   - BorgModuleAdvancedMining
   - BorgModuleAdvancedSurgery
 

From 4ac5f8b1d3634f947100a4d6f24eb395985ba742 Mon Sep 17 00:00:00 2001
From: chaisftw <30545471+chaisftw@users.noreply.github.com>
Date: Tue, 13 Jan 2026 08:01:35 +1000
Subject: [PATCH 287/360] Spray bottles with visible reagent contents (#42155)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Spray bottles with visible reagent contents

* Fixed cargo catalog to correctly reference the new spray bottle rsi

* Fixed indentation on rsi meta files

* Updated copyright in spray_bottle.rsi meta

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

Co-authored-by: āda <ss.adasts@gmail.com>

* Updated to follow yml convention, modified to inherit from DrinkBase and renamed fill textures

* Fixed solution names

* Updated solution name in BorgMegaSprayBottle

* de-hardcode solution name

* less breaking

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Fluids/EntitySystems/SpraySystem.cs       |   2 +-
 .../Fluids/Components/SprayComponent.cs       |  15 +-
 .../Catalog/Cargo/cargo_service.yml           |   2 +-
 .../Objects/Specific/Hydroponics/sprays.yml   |  32 ++--
 .../Objects/Specific/Janitorial/spray.yml     |  95 ++++++------
 .../Janitorial/janitorial.rsi/cleaner.png     | Bin 411 -> 0 bytes
 .../janitorial.rsi/cleaner_large.png          | Bin 436 -> 0 bytes
 .../Janitorial/janitorial.rsi/inhand-left.png | Bin 339 -> 0 bytes
 .../janitorial.rsi/inhand-right.png           | Bin 342 -> 0 bytes
 .../Janitorial/janitorial.rsi/meta.json       | 138 ++++++++----------
 .../spray_bottle.rsi/cleaner-fill-1.png       | Bin 0 -> 124 bytes
 .../spray_bottle.rsi/cleaner-fill-2.png       | Bin 0 -> 155 bytes
 .../spray_bottle.rsi/cleaner-fill-3.png       | Bin 0 -> 163 bytes
 .../spray_bottle.rsi/cleaner-fill-4.png       | Bin 0 -> 178 bytes
 .../spray_bottle.rsi/cleaner-fill-5.png       | Bin 0 -> 186 bytes
 .../Janitorial/spray_bottle.rsi/cleaner.png   | Bin 0 -> 395 bytes
 .../spray_bottle.rsi/cleaner_large-fill-1.png | Bin 0 -> 138 bytes
 .../spray_bottle.rsi/cleaner_large-fill-2.png | Bin 0 -> 151 bytes
 .../spray_bottle.rsi/cleaner_large-fill-3.png | Bin 0 -> 187 bytes
 .../spray_bottle.rsi/cleaner_large-fill-4.png | Bin 0 -> 193 bytes
 .../spray_bottle.rsi/cleaner_large-fill-5.png | Bin 0 -> 210 bytes
 .../spray_bottle.rsi/cleaner_large-fill-6.png | Bin 0 -> 220 bytes
 .../spray_bottle.rsi/cleaner_large-fill-7.png | Bin 0 -> 226 bytes
 .../spray_bottle.rsi/cleaner_large.png        | Bin 0 -> 384 bytes
 .../spray_bottle.rsi/inhand-left-fill-1.png   | Bin 0 -> 123 bytes
 .../spray_bottle.rsi/inhand-left-fill-2.png   | Bin 0 -> 130 bytes
 .../spray_bottle.rsi/inhand-left-fill-3.png   | Bin 0 -> 148 bytes
 .../spray_bottle.rsi/inhand-left-fill-4.png   | Bin 0 -> 163 bytes
 .../spray_bottle.rsi/inhand-left.png          | Bin 0 -> 235 bytes
 .../spray_bottle.rsi/inhand-right-fill-1.png  | Bin 0 -> 128 bytes
 .../spray_bottle.rsi/inhand-right-fill-2.png  | Bin 0 -> 136 bytes
 .../spray_bottle.rsi/inhand-right-fill-3.png  | Bin 0 -> 159 bytes
 .../spray_bottle.rsi/inhand-right-fill-4.png  | Bin 0 -> 171 bytes
 .../spray_bottle.rsi/inhand-right.png         | Bin 0 -> 233 bytes
 .../Janitorial/spray_bottle.rsi/meta.json     |  93 ++++++++++++
 35 files changed, 230 insertions(+), 147 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner.png
 delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner_large.png
 delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-6.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-7.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/meta.json

diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
index 4708954ea1..3b7b4327c4 100644
--- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
@@ -88,7 +88,7 @@ public sealed class SpraySystem : SharedSpraySystem
 
     public override void Spray(Entity<SprayComponent> entity, MapCoordinates mapcoord, EntityUid? user = null)
     {
-        if (!_solutionContainer.TryGetSolution(entity.Owner, SprayComponent.SolutionName, out var soln, out var solution))
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var soln, out var solution))
             return;
 
         var ev = new SprayAttemptEvent(user);
diff --git a/Content.Shared/Fluids/Components/SprayComponent.cs b/Content.Shared/Fluids/Components/SprayComponent.cs
index cc0032c3fb..9cc8f6a1c4 100644
--- a/Content.Shared/Fluids/Components/SprayComponent.cs
+++ b/Content.Shared/Fluids/Components/SprayComponent.cs
@@ -9,24 +9,25 @@ namespace Content.Shared.Fluids.Components;
 [Access(typeof(SharedSpraySystem))]
 public sealed partial class SprayComponent : Component
 {
-    public const string SolutionName = "spray";
+    [DataField]
+    public string Solution = "spray";
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public FixedPoint2 TransferAmount = 10;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public float SprayDistance = 3.5f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public float SprayVelocity = 3.5f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public EntProtoId SprayedPrototype = "Vapor";
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public int VaporAmount = 1;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public float VaporSpread = 90f;
 
     /// <summary>
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index 3aa5b01289..14f484c5ea 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -1,7 +1,7 @@
 - type: cargoProduct
   id: ServiceJanitorial
   icon:
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    sprite: Objects/Specific/Janitorial/spray_bottle.rsi
     state: cleaner
   product: CrateServiceJanitorialSupplies
   cost: 560
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
index 9d9f3b7324..7bca0fb699 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
@@ -1,9 +1,9 @@
 - type: entity
-  name: Plant-B-Gone
+  parent: SprayBottleBase
   id: PlantBGoneSpray
-  parent: SprayBottle
-  description: Kills those pesky weeds!
+  name: Plant-B-Gone
   suffix: "Filled"
+  description: Kills those pesky weeds!
   components:
   - type: Tag
     tags:
@@ -13,38 +13,32 @@
     state: plantbgone
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 100
         reagents:
         - ReagentId: PlantBGone
           Quantity: 100
-  - type: DrainableSolution
-    solution: spray
   - type: Item
     sprite: Objects/Tools/Hydroponics/sprays.rsi
     heldPrefix: plantbgone
 
 - type: entity
-  name: weed spray
+  parent: SprayBottleBase
   id: WeedSpray
-  parent: SprayBottle
-  description: It's a toxic mixture, in spray form, to kill small weeds.
+  name: weed spray
   suffix: "Filled"
+  description: It's a toxic mixture, in spray form, to kill small weeds.
   components:
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/sprays.rsi
     state: weedspray
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 50
         reagents:
         - ReagentId: WeedKiller
           Quantity: 50
-  - type: DrainableSolution
-    solution: spray
-  - type: Spillable
-    solution: spray
   - type: Tag
     tags:
     - Spray
@@ -54,22 +48,20 @@
     sprite: Objects/Tools/Hydroponics/sprays.rsi
 
 - type: entity
-  name: pest spray
-  id: PestSpray
   parent: WeedSpray
-  description: It's some pest eliminator spray! Do not inhale!
+  id: PestSpray
+  name: pest spray
   suffix: "Filled"
+  description: It's some pest eliminator spray! Do not inhale!
   components:
   - type: Sprite
     state: pestspray
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 50
         reagents:
         - ReagentId: PestKiller
           Quantity: 50
-  - type: DrainableSolution
-    solution: spray
   - type: Item
     sprite: Objects/Tools/Hydroponics/sprays.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index 47e3af78aa..3dbec13e76 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -1,15 +1,11 @@
 - type: entity
-  name: spray bottle
-  id: SprayBottle
-  parent: BaseItem
-  suffix: Empty
-  description: A spray bottle with an unscrewable top.
+  abstract: true
+  parent: [ DrinkBaseMaterialPlastic, DrinkBase ]
+  id: SprayBottleBase
   components:
   - type: Edible
     edible: Drink
-    solution: spray
-    destroyOnEmpty: false
-    utensil: None
+    solution: drink
     transferAmount: 10
     useSound:
       path: /Audio/Effects/spray3.ogg
@@ -20,47 +16,62 @@
     - Spray
     - Trash
   - type: Sprite
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    sprite: Objects/Specific/Janitorial/spray_bottle.rsi
     state: cleaner
   - type: Item
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    sprite: Objects/Specific/Janitorial/spray_bottle.rsi
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 100
-  - type: RefillableSolution
-    solution: spray
-  - type: DrainableSolution
-    solution: spray
-  - type: SolutionTransfer
-    canChangeTransferAmount: true
-  - type: SolutionItemStatus
-    solution: spray
   - type: UseDelay
   - type: Spray
+    solution: drink
     transferAmount: 10
     sprayVelocity: 2
     spraySound:
       path: /Audio/Effects/spray2.ogg
   - type: TrashOnSolutionEmpty
-    solution: spray
-  - type: ExaminableSolution
-    solution: spray
-    exactVolume: true
+    solution: drink
+
+- type: entity
+  parent: [ SprayBottleBase, DrinkVisualsFill ]
+  id: SprayBottle
+  name: spray bottle
+  suffix: Empty
+  description: A spray bottle with an unscrewable top.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/spray_bottle.rsi
+    layers:
+    - state: cleaner
+    - state: cleaner-fill-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: SolutionContainerVisuals
+    fillBaseName: cleaner-fill-
+    inHandsMaxFillLevels: 4
 
 - type: entity
-  name: mega spray bottle
-  id: MegaSprayBottle
   parent: SprayBottle
+  id: MegaSprayBottle
+  name: mega spray bottle
   suffix: Empty
   description: A huge spray bottle, capable of unrivaled janitorial power.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
-    state: cleaner_large
+    sprite: Objects/Specific/Janitorial/spray_bottle.rsi
+    layers:
+    - state: cleaner_large
+    - state: cleaner_large-fill-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: SolutionContainerVisuals
+    maxFillLevels: 7
+    fillBaseName: cleaner_large-fill-
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 250
   - type: Spray
     transferAmount: 15
@@ -71,31 +82,31 @@
       path: /Audio/Effects/spray2.ogg
 
 - type: entity
-  name: spray bottle
-  id: SprayBottleWater
-  suffix: Filled
   parent: SprayBottle
+  id: SprayBottleWater
+  name: spray bottle
+  suffix: Filled
   components:
   - type: Tag
     tags:
     - Spray
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 100
         reagents:
         - ReagentId: Water
           Quantity: 100
 
 - type: entity
-  description: BLAM!-brand non-foaming space cleaner!
-  id: SprayBottleSpaceCleaner
   parent: SprayBottle
+  id: SprayBottleSpaceCleaner
   suffix: Space Cleaner
+  description: BLAM!-brand non-foaming space cleaner!
   components:
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 100
         reagents:
         - ReagentId: SpaceCleaner
@@ -109,12 +120,12 @@
 - type: entity
   parent: MegaSprayBottle
   id: MegaSprayBottleSpaceCleaner
-  description: BLAM!-brand non-foaming space cleaner, now in a bigger package for those huge blood puddles!
   suffix: Space Cleaner
+  description: BLAM!-brand non-foaming space cleaner, now in a bigger package for those huge blood puddles!
   components:
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 250
         reagents:
         - ReagentId: SpaceCleaner
@@ -131,7 +142,7 @@
   components:
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 200
         reagents:
         - ReagentId: SpaceCleaner
@@ -146,7 +157,7 @@
   components:
   - type: SolutionContainerManager
     solutions:
-      spray:
+      drink:
         maxVol: 250
         reagents:
         - ReagentId: SpaceCleaner
@@ -154,7 +165,7 @@
   - type: SolutionTransfer
     canSend: false # No giving away infinite space cleaner!
   - type: SolutionRegeneration
-    solution: spray
+    solution: drink
     duration: 5 # Delta-V - Refill borg's mega spray 1 full use per 5 seconds
     generated:
       reagents:
@@ -165,8 +176,8 @@
 # Vapor
 - type: entity
   id: Vapor
-  name: "vapor"
   categories: [ HideSpawnMenu ]
+  name: "vapor"
   components:
   - type: SolutionContainerManager
     solutions:
@@ -200,8 +211,8 @@
   - type: VaporVisuals
 
 - type: entity
-  id: BigVapor
   parent: Vapor
+  id: BigVapor
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner.png
deleted file mode 100644
index f25c12a24e5f108c5823143509ea7f563118acaa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SO-V#SRCt_YIdI?r!$1O-0kwV90izBWat?U1$mu^WIhnY9j5K!u
z2=Mc;F!*Ty!VsT2!|A^O7wHZm$pIk4_xC#eKXac6%y-lL2c~yjXJT+Hrc(%jECM+K
zMDGI94L<*X4j{*BG93U)2ju#eDh@!7<EyqE4E_&4F#M8w%iu^a2f#qzk)!{;tE(8^
zJ$l6O>dqa8y1DcJHzg;M95O?z9Do6k@1udf2Wb|UlVkYLD$1Z1!2%40c_fDd*&%S}
zEfV|GafbN;&J1?3@g$o=l_<E^-^AcQaW=#IGe_v>fa(VjI-)0%;b24^1H;pM40dFg
zLs1BTEMJj1lY!yd8M4hF+X42)4h$=z4lpp>0CH{t@oOL^qj)0A0Yx^}jAiG}|2Nwi
z3g-X%_6<xoRg}@M9O%l+p-OQ)Gz+3p2aGyk)B(fF0RYA$Y!HhXn)m<!002ovPDHLk
FV1lFxss{i7

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner_large.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner_large.png
deleted file mode 100644
index eae006982a6f28e2e767b3465efc7b32b546cbb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Zb?KzR9J=Wm9b01P!Pty#G)vI1*eLrAP6F;lZwU+4!URt2dAJ=T%4R-RFFc7
z;C~>fL+MmHrJEo^oph|wfJ3W`9UK%zX*%Q_YG{LWxR;{K`$6DwFL(FxzFZz4kx2d-
zh4XScu2QQ#^TK1*@`-R0`g$W+ov8hazkR6`?cobyt3Fz5oWk<B2LQNqR3vg@C!lf@
z{6>kKrxcz$Fh45NwgKCMbX+A-zuO|9x%t)PG0KjE!ayg0Qy~Ft3w#VKNi#cp=$_Ir
zsBJ(uH(O3f+XWa_lC<6ZKx}MfOIQTEIj*0m;u4`mw0)i-*yZ|jk|nMP_BQ|k_yl72
zKkE+<sFmvL_g8i)wgCI^Krt+k-9J|kJlp}p3jhH9@do*HiZvl@0fv<%d)h>0X$Y|*
z0QUvxiUI)gBa6^Y5J!aY6vT?6nL(rl;Vn>wON0~Pb2hskDqrYQY5v)`)oNhxHk)bN
eMJ16){)BIGJcoa!{(NBo0000<MNUMnLSTZ*le=pG

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png
deleted file mode 100644
index 2c7a2692eb06fd61bbf55512d2a8530711541bc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=>VS)S0G*Q%k+OHL(YuZGynf@
zee<8;%ztNR=djXp?#nX&fzpg6L4Lsu4$p3+0XaEUArU1msl~}fnFS@8`FRWs6?1~a
z3W`d<e+e%5`1OgFx31Q?Gv|Xhgc@8le(*@=ypQHdhN7O{9Tvtx#+Qw~6y`jdbYxP9
zLa?T#x~ZZ5R*%kZW7W+oB$o7c8?V(cG#5Q$_9Q5*;A=6XG!H}hYN;1*m$146?alLa
zaSZY3OiqwsJuJk*m9QzGVS>_>gDYBM8I{GvxDt*Xa$;0to1r7Z%p~w8VGWm%z?+mc
zTwDTglGfzC$T*PF+Z1TPHG#3uh>7vRQdYf&#XSxTGN~*~3Hr(tcsLH|pFc3i!NZY}
fk#%t@%SvE432>Zfkt}Ed+RWhT>gTe~DWM4f1FLn!

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png
deleted file mode 100644
index 3757bcdf6e1e747014d3b9dcf4597e473708c422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=>VS)*Z=?j*ZVU4pUIFjWA@Dd
z|6AYuXE^iU+1WX)wEX#OlSe>hj3q&S!3+-1ZlnP@IaMJMB`&GO$wiq3C7Jno3=9=>
zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5
zQiwvZrlq>6q5f8n&TeDX%_}69^mZGs)i5*{J!1AGD6HUXF{3mOL-}f{7jKuax&!Sk
z^mK6y@#suWkYGK`!@>1HJT>IdDhCh2b16r%^d@N-hp~DrQe(RzqR`EjY^=c0Il0Hz
zkx6K|#Ox*}mfedPXG?GB?rRD(C}LQwz{u*6%E;HSmBW!Of}26*z#E?vEMZP=8w7(6
k_&G4Tvn!hSFflPO=>2EE@kZdpETH8Kp00i_>zopr0AMwG5&!@I

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index e138281ef6..fe2eed8ca3 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
@@ -1,79 +1,65 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts, Holocarp and Magicarp mopbucket sprites by TiniestShark (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "cleaner"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts, Holocarp and Magicarp mopbucket sprites by TiniestShark (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "cleaner_large"
-    },
-    {
-      "name": "mopbucket"
-    },
-    {
-      "name": "mopbucket_water-1"
-    },
-    {
-      "name": "mopbucket_water-2"
-    },
-    {
-      "name": "mopbucket_water-3"
-    },
-    {
-      "name": "mopbucket_shark_blue"
-    },
-    {
-      "name": "mopbucket_shark_pink"
-    },
-    {
-      "name": "mopbucket_shark_grey"
-    },
-    {
-      "name": "mopbucket_carpplush"
-    },
-    {
-      "name": "mopbucket_magicarpplush"
-    },
-    {
-      "name": "mopbucket_holocarpplush",
-      "delays": [
-          [
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1,
-              0.1
-          ]
-      ]
-    },
-    {
-      "name": "mopbucket_cube"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "mopbucket"
+        },
+        {
+            "name": "mopbucket_water-1"
+        },
+        {
+            "name": "mopbucket_water-2"
+        },
+        {
+            "name": "mopbucket_water-3"
+        },
+        {
+            "name": "mopbucket_shark_blue"
+        },
+        {
+            "name": "mopbucket_shark_pink"
+        },
+        {
+            "name": "mopbucket_shark_grey"
+        },
+        {
+            "name": "mopbucket_carpplush"
+        },
+        {
+            "name": "mopbucket_magicarpplush"
+        },
+        {
+            "name": "mopbucket_holocarpplush",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mopbucket_cube"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c609e22648c6b5422abe6a1e7a661e8b83caa8
GIT binary patch
literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}W}YsNArY-_
z&l&O_P+(wj$O-54-Einon7OajhC15=2a1+I@M2_W;EkX3eD2QQCqkqB>KP(FG22)3
VM)g*S-3FS#;OXk;vd$@?2>|kuCX4_8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..afd60f2575fa9134ef0e2a00da25882174e92a14
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArY-_
z&n@I_FpzM0sLgC(e>kB)rG=%H;V6r$r~?00)_+`QezWbU76K}7>Ux_LJ?Yt>3JG=h
zvR%_U?3RWoFFM5dwPt^O?(0RbZKA9g82<lcn6OMPZl%j%UZ4&JPgg&ebxsLQ09+9>
AS^xk5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2aaacd763cd972994e99f8baada1161708842f09
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY-_
zFKpy&a1e007|Ffkm+rA6J^}|%I4Emd7+xsoUDp`>VbcGE$A5cR7#IRxmVGY@uG^E@
zpz`%_gy=<A=SeeN#W+}1jJ3J{$OX*HzrMP3W~p5D5@v=A=h*e{7~VAZ&HM|rh{4m<
K&t;ucLK6UOL^=Wh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-4.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb9b5eb5aef34863709e8d5342864d3b2c1b3378
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ii4<#ArY-_
zFBtMUIEb`7tmND9yj-H!Pf2KM(<#;oz5#t{+XJgkW<A?|;E$w(i;Ihl-=w>B8}p*X
z<nMd9P1^5zL_{Fi;o`?~28Np21)thjj6d5v;NnP|Ca)nk;rQ~$$1J`?Ouu<qQAz24
aCBvj8{^IAamk9#xW$<+Mb6Mw<&;$Uh9zZ<+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-5.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2ba0efcfb8184ba7d4e4ce0fa26442cd8b15242
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}C7v#hArY-_
zFBx(*7znsrjOCy3xmrTn+L1+@d+nYEF9+S@YMDBl6_w6dJA5;CY3b;Aao&&NZr#GX
zs3rRXpZaQLFh5{?5~0}1&uGUYV*8IzK+rSxz#sNGtD?jVSS><(xkdOpjxT>at?)%^
hY??Q_pkVEDMvg1~lAkRS#DMlQc)I$ztaD0e0ssnFJYoO<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner.png
new file mode 100644
index 0000000000000000000000000000000000000000..67ba7ac9a9e3f92d7b697d9fca3cace577cab28d
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$MM*?KR9J=Wl|M+sKop0+gf5DptJ2L$odprZG=n0FP937+AdccvT12I@iy}qA
z!77N*p|gk`Y6P7eoTMls2!ewMP89+*E=?Bc@Gg-q_bmr^@8131KMph+O`9<!#%If>
z-|8&6R5buB%MuAlh^&F`t^_kf-k<%0L)-7^1ZhwrW7l=L+OfkdObq-0P^p=uGHMwx
zMb;2Ll*&|%O3h@nU+N*EfVWfI4@AU)xCeq}19%wQX72S1ukVwTq5yFQ0(Nh1{l#pS
zk<~4dv-9MOCoL!BUj)R3xCAt#U)bEB0Sxwb0K)*}i^slnvXnCrC~q{^qv>%aKe3eH
z(wSoA{JK2?%8tWi=|cH_Bmrf|Azdm(aiP|P00qlp&2@Qv|K{cXj*sUjB|qZ7ARt%R
p59i*i*8$jD&l%FcK%>!UG`~c6R7P`NSRMcX002ovPDHLkV1hk*s`>x`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf01da5d08ac10eaddf6b894b899ec1ea1c9c64b
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E}kxqArY-_
z&nWUW7>KZ3e7J$b@6baI&&gH+cNi{*)QO1yShnc%l^L-UR6Hk{+?XV}wd2R`eX<Qj
layH+O?pwRk-}Cb?h8dH1nUvn{76+Qg;OXk;vd$@?2>=M^FnIs~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aa3bf67e4687d334092e687aca35ef9a5727497
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}fu1goArY-_
z&n@I_FpzM0$bEYQZ{O8||4I@u!cI+WS2<U$uoYo;P<`)xZr>ahpoRy{r@w9PDA2mP
xGQ|J$qwQ<gef6>LnY5%fdg}SbrtA;e^KL$sd#_ZoSqrF^!PC{xWt~$(69A96HkSYZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..94130e29e3665bf45c916e8f5c0351d75949630f
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rJgR1ArY;~
z2@<S}6GVEN0u8v_4r)lSD$5#7T3vW-Uh{uR2?+_k_3=j!EKfcF0vG1Z^x9Ub(zyQr
z|Nre5KR-YJzy8tR?f=#9)&J%%7SU|z3~~?PI#I^Jlfl+vYybo?7S*#JK71Q}rQkBq
e;Kd0oj10=Us-MC$9^3>vfWgz%&t;ucLK6U{1x8H(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-4.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..2926bd17751b296a02789bb226db96f44687f505
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArY-_
zFD>M4aNuFRP|tE)C8s%=iDmKzrgvfoA9yshu#{`4S+F`z5Gm#S*5&vo{Z-xVEewJ{
zpedsyv}$V@Tm7jA{+YYuk~U9T@4V;j?Cx`(re}?leQuP^Ron5JjlrZe)ui%bT{RQ$
nR|dzpDGUv%a-sGPE?*dSopp)PQc7S1I)lN})z4*}Q$iB}fviD)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-5.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5afbd181bc29a11bbf73ae1a4f3db56702f5e679
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J)SO(ArY-_
zFKy&xaujKKSby}4*PCN!xOj99a_Kl8OprD-wEn<y@J-K}2aBwES`4Fhl+17YeDKqz
z#ESfbXU?3_Nth54cP`S`e$`9&w|weX)6OchifJx={8OpH{r083_6%>f&lWkk+RQ_%
zcvoZ4s$*}i3k9!F51;#3_|I1s!G}yoi?*^osN3E4uVLm*@v?boN2hI8oC<UogQu&X
J%Q~loCIC%ZR=)rM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-6.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..d06126910ec60271d28c460749f4f92da102f178
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>z@qLn2y}
z6C_v{Cy4Yk1sZU<G0uGO`v3p``~Us_U;ppV&;R~={(q}KHm~{rNyGNenA1BYB_$^w
z<>~R2JW<FJ$=6`X6#M4k+h~>9hn@PK-s$P-F}NRRSKRjSTE9IH2)v!SvZv)s5bJ@O
z{yA(XeAyQVI*3VZ33T97xXoy=KvLk`0U#)N_$G7Hr2`sZXD~4AWXL`F`<zq{(1i@1
Lu6{1-oD!M<wqaRJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-7.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..fde94637a4d6e5f46a5bd0c0efae697c31c8c1f9
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b39!fLn2y}
z6C_v{Cy4Yk1sZU*8U6V6|NsA=pP&Dqzw!Bl`l7Q5i;fgY+&*w)N@I-sgr^PbfwIrj
zQc_&Rl&=eha573%RQwh@`E0|4WJ_~pW#u#5r=OpbxZ~?%er6zWu1?cZR@@uHXmJ0q
z(8JE}_y5hW_}{zch=mkuN~5DR>l21evJA|#7$5S0fcUw2YTCSDXSgvk91F}nz5mVo
RpFnpqc)I$ztaD0e0swv+SrPyM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1bb12f4c8537644830074a50538bc13c53e1772
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$I!Q!9R9J;$U>F6XU=$26U?fHHk|d`8xa4By{UgaN7+@h)13wQ7gOBzv4Dk=&
znEnfJk?s(ZU0v^s2n9FIe+&!^3=F%jGch!7CNBh-NYwzdsB!Z@#!Jtb8LX7au@(VH
zj)EmgO#jJ^Z>l%|+48-5?F{#?UuU=^#m2zEFq13?kQ@at;MdanKc=*lfm7dxLB=nN
z!7e5aXAZ#!NDcv*<w@05aK4hEDUA95(2_+YMGwgifLU(-i-F-J8$z61N01!_$d<#v
z>pQndHizU8*i=)^$iTqxU(C=3V(F=K3=E$j<-z;YhZ*P>1>YGMPI59ZoPTwPf!#fl
zfq{X6;hu^b1O1|a6H{z73I;q1$N^+K00!W`KYyC6G(c9Rf?VwW{P6=t?&O+PRI8{)
e!6+C7bO8XYp@H>9y~u?C0000<MNUMnLSTYoY@c`l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..550999498fb5cec6e5d080ecc7996a8ef78f0397
GIT binary patch
literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Og&v3Ln`LH
zz2zv#z`(-b_*3<26JOk!H*7mt#2JC|3<u)EzAx7Uv4Egpem(<3!(2w5I<CMcPO`!v
NF;7=Nmvv4FO#ty19^(K2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2859f45e9dfe64045bf04fa9e68d7d18c70714f7
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&=~YLn`LH
zz2zv#puoZ4c<hJTQr0#H`JUa3dIw#B3K$qn-mIB*C02hCn8UzuAoOnj0eK+3obU1l
UuF%FF*8?CKPgg&ebxsLQ063Z?qyPW_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdef16ee5694cf11fc346fa25a0126db1f1b14da
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{5)M8Ln`LH
zy|s{+L4n8B@z6i#g*Vw+TVyi?ec!QFEZVl;6sU?pA?aPQR%vxv!J0RZ?&tkt1c?EG
nLVSsNz&~5LyS!8Ef!sYipYIWfoY4K=4<za7>gTe~DWM4f0Y@%y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-4.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a92e1dc66d293497bb5bcec7477dba829cd2e5b
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Vm)0PLn`LH
zy|t0I!GOp0V8`F~MQI#m3l^1>9oW{gbT{KXrR_hn89`>;k`=6fw{_ROdB@92`(Hiy
z86sZ2`zbq61_TzIT=Cao>zllUKi@0L%nkklg+82Rt2iwE%GkTo8l=M0)z4*}Q$iB}
D_vJgt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..80ab8b8b22cdb0ba36c64af53b2882131b7a3ca0
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB}^V
zU#9;v8FFUKp85ZO>zn@!XZ|}oJBO8)b6=ME50vIC3GxeO_zwl<OtY^51v5Qe977^n
z-%c~+JD|YBEUY2)zrOJMwUt7O0qwg#ibUt!;9;oi*}Xg_=EAMdQ7g{3E#ZFYDgJEz
z_pL>Raj$Be<%9Z*S<RmNSTZm)T=JX1x^>|KscVn6&Q<u_I(Nb6)%+LY{~u&3V|w$D
Z?YA?-<?O3X0YFO`JYD@<);T3K0RYugUhDt>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c02fe3484fe9d8e40c815556491d406f78aa0d41
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUO&DLn`LH
zy=lnHV8Fw&@d5v(O&*LXFT?hxDDU{Y3aEmC;l{5sfAT6OUg8Av7#KA7R4_0U#a{B|
U3Up^Ny8sgPboFyt=akR{0A$M~+5i9m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0064cbcc1dcfc5e36abd36443096f218b8db7b
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|oIG6|Ln`LH
zy>*b6K|p}PF>s$(X`z(BL&c_<T-zFaIe|(T7A(HfahcaR%=+^_5fC2;Dh}zMKhR;%
bz|i1tI&&RYsO`aAFOayWtDnm{r-UW|FDE8G

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..49a6681a834f7d47ea76b822e139e6a499f62f7d
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|B0XIkLn`LH
zy=BOCKtaIO@#DXCuerA)mR{jziR5)TGV|7>jce^yfeINOoc()c*Dl4REynKhajC1G
zmoJ|CkQpQa1O=;N&6sWH?>k<8ljq9~cA&rtwyi4#BH!%Y6akX=boFyt=akR{06us&
Ay#N3J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-4.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe05a665de9aa70036f6036ac66c6bf4c37183f6
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|QaxQ9Ln`LH
zy|t0IK|!D`@X<f#Nb45sh{$=&GXyRy*!dyO_v6#3e;|Vx9;Eem?3b?Md3pDojQfkX
zF;VjCjxU~f{%e_;JV+V{61;AjF*~Q+<hiovm)!YHk}Edy0|kS`lO{>OTJOE&AV`g;
LtDnm{r-UW|TtGab

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..543ae1f94c8aa34e4a464e1b9898d164accfa356
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_Yxc>kD
zzuuSW|4fFQ8M9~p|KIxNKf{^-&d$zZrRC3On>+$4<17jC3uXYS0|RrW*;jyq>7Fi*
zArY-_r#W&l7;-RY=N|mOe}{a4$An9<CuCG-u9kG>_-J@$&D5=yoQ_h*e!E`dbe#6J
zRk}+j=fl+d<~ldRSp*rs?OY?^)FFSkr)A6eo))KzZ-SK--wG=)T#(yP|3|e^Zhys5
ZMwV3!m-X_TT7XtEc)I$ztaD0e0sy%{T`2$n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/meta.json
new file mode 100644
index 0000000000..57e906415f
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/meta.json
@@ -0,0 +1,93 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "cleaner, cleaner_large and in-hand sprites are from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 and modified by chaisftw (GitHub), Fill levels created by chaisftw (GitHub) by modifying cleaner, cleaner_large and in-hand sprites",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cleaner"
+        },
+        {
+            "name": "cleaner-fill-1"
+        },
+        {
+            "name": "cleaner-fill-2"
+        },
+        {
+            "name": "cleaner-fill-3"
+        },
+        {
+            "name": "cleaner-fill-4"
+        },
+        {
+            "name": "cleaner-fill-5"
+        },
+        {
+            "name": "cleaner_large"
+        },
+        {
+            "name": "cleaner_large-fill-1"
+        },
+        {
+            "name": "cleaner_large-fill-2"
+        },
+        {
+            "name": "cleaner_large-fill-3"
+        },
+        {
+            "name": "cleaner_large-fill-4"
+        },
+        {
+            "name": "cleaner_large-fill-5"
+        },
+        {
+            "name": "cleaner_large-fill-6"
+        },
+        {
+            "name": "cleaner_large-fill-7"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-4",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-4",
+            "directions": 4
+        }
+    ]
+}

From ed1489903272a79b5f2f461841f0f18abc766e38 Mon Sep 17 00:00:00 2001
From: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Date: Mon, 12 Jan 2026 17:17:27 -0500
Subject: [PATCH 288/360] Allow late join from arrivals to be considered for
 antagonist. (#39837)

* Allow late join from arrivals to be considered for antagonist.

* Don't use `PendingClockInComponent` to block late join antag selection, instead do an arrivals grid transform check with new helper function `IsOnArrivals`.

* Minor formatting fixes

* missing using

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---
 Content.Server/Antag/AntagSelectionSystem.cs  | 16 +++++++++---
 .../Shuttles/Systems/ArrivalsSystem.cs        | 25 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index d5912823f6..4796ce9234 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -13,7 +13,7 @@ using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Content.Server.Roles;
 using Content.Server.Roles.Jobs;
-using Content.Server.Shuttles.Components;
+using Content.Server.Shuttles.Systems;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Antag;
 using Content.Shared.Clothing;
@@ -54,6 +54,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ArrivalsSystem _arrivals = default!;
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -168,6 +169,15 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         if (!args.LateJoin)
             return;
 
+        TryMakeLateJoinAntag(args.Player);
+    }
+
+    /// <summary>
+    /// Attempt to make this player be a late-join antag.
+    /// </summary>
+    /// <param name="session">The session to attempt to make antag.</param>
+    public void TryMakeLateJoinAntag(ICommonSession session)
+    {
         // TODO: this really doesn't handle multiple latejoin definitions well
         // eventually this should probably store the players per definition with some kind of unique identifier.
         // something to figure out later.
@@ -197,7 +207,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             if (!TryGetNextAvailableDefinition((uid, antag), out var def, players))
                 continue;
 
-            if (TryMakeAntag((uid, antag), args.Player, def.Value))
+            if (TryMakeAntag((uid, antag), session, def.Value))
                 break;
         }
     }
@@ -604,7 +614,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         if (entity == null)
             return true;
 
-        if (HasComp<PendingClockInComponent>(entity))
+        if (_arrivals.IsOnArrivals((entity.Value, null)))
             return false;
 
         if (!def.AllowNonHumans && !HasComp<HumanoidAppearanceComponent>(entity))
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 20976ca019..af0e1240ad 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Server.Administration;
+using Content.Server.Antag;
 using Content.Server.Chat.Managers;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking;
@@ -61,6 +62,7 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly ShuttleSystem _shuttles = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly AntagSelectionSystem _antag = default!;
 
     private EntityQuery<PendingClockInComponent> _pendingQuery;
     private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery;
@@ -273,6 +275,9 @@ public sealed class ArrivalsSystem : EntitySystem
 
             if (ArrivalsGodmode)
                 RemCompDeferred<GodmodeComponent>(pUid);
+
+            if (_actor.TryGetSession(pUid, out var session) && session is not null)
+                _antag.TryMakeLateJoinAntag(session);
         }
     }
 
@@ -443,6 +448,26 @@ public sealed class ArrivalsSystem : EntitySystem
         return false;
     }
 
+    /// <summary>
+    /// Check if an entity is on the arrivals grid.
+    /// </summary>
+    /// <param name="entity">Entity to check.</param>
+    /// <returns>True if the entity is on the arrivals grid. Returns false if not on arrivals, or there is no arrivals grid.</returns>
+    public bool IsOnArrivals(Entity<TransformComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        if (!TryGetArrivals(out var arrivals))
+            return false;
+
+        var arrivalsGridUid = Transform(arrivals).GridUid;
+        if (!arrivalsGridUid.HasValue)
+            return false;
+
+        return entity.Comp.GridUid == Transform(arrivals).GridUid;
+    }
+
     public TimeSpan? NextShuttleArrival()
     {
         var query = EntityQueryEnumerator<ArrivalsShuttleComponent>();

From cddae22e7ac1f841e3fbc658e45df5f0e3a7efd1 Mon Sep 17 00:00:00 2001
From: Kowlin <10947836+Kowlin@users.noreply.github.com>
Date: Tue, 13 Jan 2026 01:48:41 +0100
Subject: [PATCH 289/360] Allow the admin door remote to toggle overcharge
 (#42370)

* Allow the admin door remote to toggle overcharge

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Resources/Prototypes/Entities/Objects/Devices/door_remote.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index c6e2ed020b..e9c98ef963 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -207,7 +207,7 @@
     - Engineering
 
 - type: entity
-  parent: [DoorRemoteDefault, BaseCommandContraband]
+  parent: [DoorRemoteCanEletrifyDoors, BaseCommandContraband]
   id: DoorRemoteAll
   name: super door remote
   suffix: Admeme
@@ -232,7 +232,7 @@
     - Xenoborg
 
 - type: entity
-  parent: [ DoorRemoteCanEletrifyDoors, BaseXenoborgContraband ]
+  parent: [DoorRemoteCanEletrifyDoors, BaseXenoborgContraband]
   id: DoorRemoteXenoborg
   name: xenoborg door remote
   components:

From ea166512c4350a8465124c287bf86d16edf1f7c7 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Mon, 12 Jan 2026 23:29:34 -0800
Subject: [PATCH 290/360] Balance swing at Vestine  (#42302)

* AAAAAAAAAAAAAAAAAAAAAAA

* whhops

* full range whoop

* less diff any%

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../PlantMutateChemicalsEntityEffectSystem.cs | 10 +++++-----
 .../Hydroponics/randomChemicals.yml           | 20 +++++++++----------
 Resources/Prototypes/Reagents/medicine.yml    |  3 +++
 Resources/Prototypes/Reagents/toxins.yml      |  2 ++
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
index 1f8f3fc946..b21bc0b7b3 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Botany.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Botany;
 using Content.Shared.FixedPoint;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -19,12 +20,11 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
             return;
 
         var chemicals = entity.Comp.Seed.Chemicals;
-        var randomChems = _proto.Index(args.Effect.RandomPickBotanyReagent).Fills;
+        var randomChems = _proto.Index(args.Effect.RandomPickBotanyReagent);
 
         // Add a random amount of a random chemical to this set of chemicals
-        var pick = _random.Pick(randomChems);
-        var chemicalId = _random.Pick(pick.Reagents);
-        var amount = _random.NextFloat(0.1f, (float)pick.Quantity);
+        var (chemicalId, quantity) = randomChems.Pick(_random);
+        var amount = FixedPoint2.Max(_random.NextFloat(0f, 1f) * quantity, FixedPoint2.Epsilon);
         var seedChemQuantity = new SeedChemQuantity();
         if (chemicals.ContainsKey(chemicalId))
         {
@@ -34,7 +34,7 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
         else
         {
             //Set the minimum to a fifth of the quantity to give some level of bad luck protection
-            seedChemQuantity.Min = FixedPoint2.Clamp(pick.Quantity / 5f, FixedPoint2.Epsilon, 1f);
+            seedChemQuantity.Min = FixedPoint2.Clamp(quantity / 5f, FixedPoint2.Epsilon, 1f);
             seedChemQuantity.Max = seedChemQuantity.Min + amount;
             seedChemQuantity.Inherent = false;
         }
diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index c21e56d13b..a89ea3cd4f 100644
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -129,19 +129,19 @@
 - type: weightedRandomFillSolution
   id: EvilRandomFillSolution
   fills:
-  - quantity: 0.1 # Common but low quantity
-    weight: 20
+  - quantity: 0.05 # Common but very low quantity
+    weight: 40
+    reagents:
+    - Nocturine
+    - MuteToxin
+    - Lead
+  - quantity: 0.1
+    weight: 5 # 99.9% chance of appearing at least once with 60u of vestine with an average of 6.5 occurances.
     reagents:
     - Vestine
-  - quantity: 0.5 # High quantity but uncommon
-    weight: 10
-    reagents:
-    - Stimulants
-    - MuteToxin
-  - quantity: 0.5 # High quantity but very rare
+  - quantity: 1.0 # High quantity but on average only 1 per chemical kit
     weight: 1
     reagents:
     - Tazinide
-    - Lead
-    - Nocturine
+    - Stimulants
     - Lexorin
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index dcbf2c2195..78760c202a 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -752,6 +752,9 @@
   physicalDesc: reagent-physical-desc-starry
   flavor: medicine
   color: "#2b2f77"
+  plantMetabolism:
+  - !type:PlantAdjustToxins
+    amount: -5
   metabolisms:
     Medicine:
       effects:
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 3ffabccbc5..0e847f58d7 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -674,6 +674,8 @@
   plantMetabolism:
   - !type:PlantMutateChemicals
     randomPickBotanyReagent: EvilRandomFillSolution
+  - !type:PlantAdjustToxins
+    amount: 10
   metabolisms:
     Poison:
       effects:

From 5351060f7bbf8f90355295386c6125e795b1b9b4 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Tue, 13 Jan 2026 08:37:27 +0100
Subject: [PATCH 291/360] Lower hyperzine injector cost (#42383)

I love TC
---
 Resources/Prototypes/Catalog/uplink_catalog.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index ddbaed4f7c..39f3229d20 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -752,9 +752,9 @@
   productEntity: Stimpack
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 1
   cost:
-    Telecrystal: 3 # DeltaV - was 4
+    Telecrystal: 3 # DeltaV - was 2
   categories:
   - UplinkChemicals
 
@@ -765,9 +765,9 @@
   productEntity: StimkitFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 5 # DeltaV - was 8
+    Telecrystal: 5 # DeltaV - was 3
   cost:
-    Telecrystal: 10 # DeltaV - was 12
+    Telecrystal: 10 # DeltaV - was 5
   categories:
   - UplinkChemicals
 

From ec13e683fff2f12450638c26c117b73bb1005cfd Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Tue, 13 Jan 2026 08:57:39 +0100
Subject: [PATCH 292/360] Add the Syndicate Delivery Console to the Nukie
 planet + target station maps (#42337)

* Initial commit

* Add station maps
---
 Resources/Maps/Nonstations/nukieplanet.yml | 285 ++++++++++++++++-----
 1 file changed, 214 insertions(+), 71 deletions(-)

diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 23c1782cc9..232a049511 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 263.0.0
+  engineVersion: 270.1.0
   forkId: ""
   forkVersion: ""
-  time: 07/20/2025 06:14:13
-  entityCount: 2547
+  time: 01/12/2026 09:57:30
+  entityCount: 2553
 maps:
 - 1295
 grids:
@@ -1585,48 +1585,16 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.213781
-          - 79.80423
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.213781
+            Nitrogen: 79.80423
         - volume: 2500
           temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
         chunkSize: 4
     - type: RadiationGridResistance
     - type: OccluderTree
@@ -1638,6 +1606,7 @@ entities:
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: ImplicitRoof
+    - type: ExplosionAirtightGrid
   - uid: 1295
     components:
     - type: MetaData
@@ -1660,18 +1629,8 @@ entities:
         immutable: True
         temperature: 248.15
         moles:
-        - 21.824879
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 21.824879
+          Nitrogen: 82.10312
 - proto: AirlockExternalGlassNukeopLocked
   entities:
   - uid: 49
@@ -2086,21 +2045,29 @@ entities:
     - type: Transform
       pos: 20.5,-12.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1445
     components:
     - type: Transform
       pos: 13.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1477
     components:
     - type: Transform
       pos: 8.5,-5.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1574
     components:
     - type: Transform
       pos: 21.5,-4.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: AsteroidRock
   entities:
   - uid: 19
@@ -6570,12 +6537,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-1.5
       parent: 104
-  - uid: 2292
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 104
   - uid: 2295
     components:
     - type: Transform
@@ -10346,6 +10307,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-14.5
       parent: 104
+- proto: ComputerNukieDelivery
+  entities:
+  - uid: 1705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 104
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 1730
@@ -10376,6 +10345,8 @@ entities:
     - type: Transform
       pos: -0.5,-11.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: DresserFilled
   entities:
   - uid: 349
@@ -10423,26 +10394,36 @@ entities:
     - type: Transform
       pos: 28.5,-14.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 141
     components:
     - type: Transform
       pos: 14.5,-0.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1812
     components:
     - type: Transform
       pos: -1.5,-2.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1816
     components:
     - type: Transform
       pos: 8.5,-10.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1822
     components:
     - type: Transform
       pos: 15.5,-17.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: FaxMachineSyndie
   entities:
   - uid: 81
@@ -10708,7 +10689,7 @@ entities:
     - type: Transform
       pos: 2.5389562,-6.3072195
       parent: 104
-- proto: FoodDonutJellySlugcat
+- proto: FoodDonutJellyScurret
   entities:
   - uid: 3327
     components:
@@ -10955,6 +10936,33 @@ entities:
     - type: Transform
       pos: 11.5,-6.5
       parent: 104
+- proto: HandheldStationMapNukeops
+  entities:
+  - uid: 1703
+    components:
+    - type: Transform
+      pos: 2.4973226,-3.3453965
+      parent: 104
+  - uid: 1895
+    components:
+    - type: Transform
+      pos: 2.4973226,-3.3453965
+      parent: 104
+  - uid: 2292
+    components:
+    - type: Transform
+      pos: 2.4973226,-3.3453965
+      parent: 104
+  - uid: 2309
+    components:
+    - type: Transform
+      pos: 2.4973226,-3.3453965
+      parent: 104
+  - uid: 2310
+    components:
+    - type: Transform
+      pos: 2.4973226,-3.3453965
+      parent: 104
 - proto: HandLabeler
   entities:
   - uid: 1826
@@ -11146,11 +11154,15 @@ entities:
     - type: Transform
       pos: 9.5,1.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 146
     components:
     - type: Transform
       pos: 10.5,1.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: ModularGrenade
   entities:
   - uid: 1326
@@ -11212,16 +11224,16 @@ entities:
       parent: 104
 - proto: NukeOpsLootSpawner
   entities:
-  - uid: 1703
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 104
   - uid: 1704
     components:
     - type: Transform
       pos: 0.5,-6.5
       parent: 104
+  - uid: 1894
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 104
 - proto: NukeOpsMedkitBruteSpawner
   entities:
   - uid: 447
@@ -11374,6 +11386,8 @@ entities:
     - type: Transform
       pos: -0.5,10.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandC20r
   entities:
   - uid: 1556
@@ -11381,6 +11395,8 @@ entities:
     - type: Transform
       pos: 10.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandClown
   entities:
   - uid: 1681
@@ -11388,6 +11404,8 @@ entities:
     - type: Transform
       pos: 12.5,1.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandCybersun600
   entities:
   - uid: 2466
@@ -11395,6 +11413,8 @@ entities:
     - type: Transform
       pos: 8.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandDonk
   entities:
   - uid: 12
@@ -11402,11 +11422,15 @@ entities:
     - type: Transform
       pos: 12.5,-5.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 2465
     components:
     - type: Transform
       pos: -10.5,8.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandDonutCorp
   entities:
   - uid: 2450
@@ -11414,6 +11438,8 @@ entities:
     - type: Transform
       pos: -3.5,-1.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandEnergySwords
   entities:
   - uid: 1384
@@ -11421,6 +11447,8 @@ entities:
     - type: Transform
       pos: 14.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandEnlistGorlex
   entities:
   - uid: 2461
@@ -11428,6 +11456,8 @@ entities:
     - type: Transform
       pos: -0.5,0.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandInterdyne
   entities:
   - uid: 2464
@@ -11435,6 +11465,8 @@ entities:
     - type: Transform
       pos: 8.5,-12.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandMoth
   entities:
   - uid: 2462
@@ -11442,6 +11474,8 @@ entities:
     - type: Transform
       pos: 8.5,-2.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandNuclearDeviceInformational
   entities:
   - uid: 2298
@@ -11449,6 +11483,8 @@ entities:
     - type: Transform
       pos: -1.5,-5.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandPower
   entities:
   - uid: 1563
@@ -11456,6 +11492,8 @@ entities:
     - type: Transform
       pos: 19.5,-12.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandPunchShit
   entities:
   - uid: 2451
@@ -11463,6 +11501,8 @@ entities:
     - type: Transform
       pos: 25.5,-12.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRealExomorph
   entities:
   - uid: 754
@@ -11470,11 +11510,15 @@ entities:
     - type: Transform
       pos: -3.5,-13.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 2447
     components:
     - type: Transform
       pos: 15.5,-15.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRebelsUnite
   entities:
   - uid: 2446
@@ -11482,6 +11526,8 @@ entities:
     - type: Transform
       pos: 8.5,-3.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRedRum
   entities:
   - uid: 1387
@@ -11489,6 +11535,8 @@ entities:
     - type: Transform
       pos: 2.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRevolver
   entities:
   - uid: 2452
@@ -11496,6 +11544,8 @@ entities:
     - type: Transform
       pos: -1.5,-7.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRobustSoftdrinks
   entities:
   - uid: 1245
@@ -11503,6 +11553,8 @@ entities:
     - type: Transform
       pos: -9.5,8.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandSyndicatePistol
   entities:
   - uid: 1386
@@ -11510,6 +11562,8 @@ entities:
     - type: Transform
       pos: 12.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandSyndicateRecruitment
   entities:
   - uid: 1242
@@ -11517,21 +11571,29 @@ entities:
     - type: Transform
       pos: -15.5,7.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1561
     components:
     - type: Transform
       pos: 16.5,-11.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 2453
     components:
     - type: Transform
       pos: -3.5,-5.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 2454
     components:
     - type: Transform
       pos: 12.5,-15.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandTheBigGasTruth
   entities:
   - uid: 2455
@@ -11539,6 +11601,8 @@ entities:
     - type: Transform
       pos: 10.5,-15.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandVoteWeh
   entities:
   - uid: 1113
@@ -11546,111 +11610,155 @@ entities:
     - type: Transform
       pos: -3.5,-15.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1227
     components:
     - type: Transform
       pos: -17.5,24.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1228
     components:
     - type: Transform
       pos: -16.5,24.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1229
     components:
     - type: Transform
       pos: -15.5,24.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1230
     components:
     - type: Transform
       pos: -14.5,24.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1231
     components:
     - type: Transform
       pos: -13.5,24.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1248
     components:
     - type: Transform
       pos: -12.5,24.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1251
     components:
     - type: Transform
       pos: -12.5,23.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1252
     components:
     - type: Transform
       pos: -12.5,22.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1253
     components:
     - type: Transform
       pos: -12.5,21.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1254
     components:
     - type: Transform
       pos: -12.5,20.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1255
     components:
     - type: Transform
       pos: -12.5,19.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1256
     components:
     - type: Transform
       pos: -13.5,19.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1258
     components:
     - type: Transform
       pos: -14.5,19.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1259
     components:
     - type: Transform
       pos: -15.5,19.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1260
     components:
     - type: Transform
       pos: -16.5,19.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1261
     components:
     - type: Transform
       pos: -17.5,19.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1262
     components:
     - type: Transform
       pos: -17.5,20.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1263
     components:
     - type: Transform
       pos: -17.5,21.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1264
     components:
     - type: Transform
       pos: -17.5,22.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1265
     components:
     - type: Transform
       pos: -17.5,23.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
   - uid: 1565
     components:
     - type: Transform
       pos: 12.5,-3.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandWaffleCorp
   entities:
   - uid: 2463
@@ -11658,6 +11766,8 @@ entities:
     - type: Transform
       pos: 14.5,-2.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitAnatomyPoster
   entities:
   - uid: 2320
@@ -11665,6 +11775,8 @@ entities:
     - type: Transform
       pos: 2.5,-11.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitCleanliness
   entities:
   - uid: 955
@@ -11672,6 +11784,8 @@ entities:
     - type: Transform
       pos: 0.5,-11.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitIan
   entities:
   - uid: 1551
@@ -11679,6 +11793,8 @@ entities:
     - type: Transform
       pos: -0.5,12.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitIonRifle
   entities:
   - uid: 1558
@@ -11686,6 +11802,8 @@ entities:
     - type: Transform
       pos: 16.5,-14.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitNanotrasenLogo
   entities:
   - uid: 237
@@ -11693,6 +11811,8 @@ entities:
     - type: Transform
       pos: -0.5,14.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterMapSplit
   entities:
   - uid: 350
@@ -11700,6 +11820,8 @@ entities:
     - type: Transform
       pos: 0.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterMapWaystation
   entities:
   - uid: 2449
@@ -11707,6 +11829,8 @@ entities:
     - type: Transform
       pos: 10.5,-5.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: PottedPlant24
   entities:
   - uid: 1143
@@ -12771,6 +12895,8 @@ entities:
     - type: Transform
       pos: -1.5,-4.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEscapePods
   entities:
   - uid: 1737
@@ -12782,6 +12908,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,-8.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMedical
   entities:
   - uid: 351
@@ -12789,6 +12917,8 @@ entities:
     - type: Transform
       pos: 4.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSurgery
   entities:
   - uid: 266
@@ -12796,6 +12926,8 @@ entities:
     - type: Transform
       pos: 2.5,-12.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: SignToxins
   entities:
   - uid: 1318
@@ -12803,6 +12935,8 @@ entities:
     - type: Transform
       pos: 8.5,-15.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: SinkStemlessWater
   entities:
   - uid: 22
@@ -13228,6 +13362,8 @@ entities:
     - type: Transform
       pos: 11.5,-9.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: SyndieHandyFlag
   entities:
   - uid: 1810
@@ -13548,6 +13684,11 @@ entities:
     - type: Transform
       pos: 3.5,-2.5
       parent: 104
+  - uid: 1739
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 104
 - proto: TargetClown
   entities:
   - uid: 1291
@@ -13660,6 +13801,13 @@ entities:
     - type: Transform
       pos: 3.1117263,-2.6874027
       parent: 104
+- proto: ToyFigurineSkeleton
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 3.5882664,-8.344303
+      parent: 104
 - proto: ToyMauler
   entities:
   - uid: 2469
@@ -13679,13 +13827,6 @@ entities:
     - type: Transform
       pos: 12.453509,14.985125
       parent: 104
-- proto: ToySkeleton
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      pos: 3.5882664,-8.344303
-      parent: 104
 - proto: VendingMachineBoozeSyndicate
   entities:
   - uid: 1380
@@ -13827,6 +13968,8 @@ entities:
     - type: Transform
       pos: 6.5,1.5
       parent: 104
+    - type: Fixtures
+      fixtures: {}
 - proto: WallPlastitanium
   entities:
   - uid: 38

From ab9a1ecd68843626c804c75b893fcbae601833ba Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:02:29 +0100
Subject: [PATCH 293/360] Lower smuggler's satchel price to 1TC (#42381)

Update uplink_catalog.yml
---
 Resources/Prototypes/Catalog/uplink_catalog.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 39f3229d20..84332fb1a3 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -2339,11 +2339,8 @@
   name: uplink-smuggler-satchel-name
   description: uplink-smuggler-satchel-desc
   productEntity: ClothingBackpackSatchelSmugglerUnanchored
-  discountCategory: usualDiscounts
-  discountDownTo:
-    Telecrystal: 1
   cost:
-    Telecrystal: 2
+    Telecrystal: 1
   categories:
   - UplinkDeception
 

From abe17f5842ef5b00f163069bb4a5ae61d1154cf2 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:22:04 +0100
Subject: [PATCH 294/360] Role time tracking support for admins (#31776)

role time tracking support for admined players

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
---
 .../Players/PlayTimeTracking/PlayTimeTrackingSystem.cs      | 4 +++-
 Content.Shared/CCVar/CCVars.Admin.cs                        | 6 ++++++
 Resources/ConfigPresets/Build/development.toml              | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index 089e15d550..f247d54149 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -76,7 +76,9 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         {
             trackers.Add(PlayTimeTrackingShared.TrackerAdmin);
             trackers.Add(PlayTimeTrackingShared.TrackerOverall);
-            return;
+
+            if (!_cfg.GetCVar(CCVars.GameAdminJobTracking))
+                return;
         }
 
         if (!IsPlayerAlive(player))
diff --git a/Content.Shared/CCVar/CCVars.Admin.cs b/Content.Shared/CCVar/CCVars.Admin.cs
index bc21d8151d..2bf749f293 100644
--- a/Content.Shared/CCVar/CCVars.Admin.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.cs
@@ -195,4 +195,10 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<bool> AdminAllowMultiServerPlay =
         CVarDef.Create("admin.allow_multi_server_play", true, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Whether admins should gain role playtime even when playing while not de-adminned.
+    /// </summary>
+    public static readonly CVarDef<bool> GameAdminJobTracking =
+        CVarDef.Create("game.admin_job_tracking", false, CVar.SERVERONLY);
 }
diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml
index 0932d149a2..e05fa568e5 100644
--- a/Resources/ConfigPresets/Build/development.toml
+++ b/Resources/ConfigPresets/Build/development.toml
@@ -4,12 +4,13 @@ lobbyenabled = false
 # Dev map for faster loading & convenience
 map = "Dev"
 role_timers = false
+admin_job_tracking = true
+role_loadout_timers = false
 
 contraband_examine = false # DeltaV
 secret_weight_prototype = "SecretDeltaV" # DeltaV
 role_timer_override = "DeltaV" # DeltaV
 showgreentext = false # DeltaV
-role_loadout_timers = false
 
 [events]
 enabled = false

From 297276dcc3e3f17f1e84f47502753a537dceb744 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Tue, 13 Jan 2026 08:30:53 -0500
Subject: [PATCH 295/360] Adds EMP Resistance component, gives it to ninja suit
 and headset (#42334)

* add comp and apply to ninja gear

* cleanup

* requested changes

---------

Co-authored-by: seanpimble <149889301+seanpimble@users.noreply.github.com>
---
 Content.Shared/Emp/EmpResistanceComponent.cs  | 18 ++++++++++++++++
 Content.Shared/Emp/SharedEmpSystem.cs         | 21 +++++++++++++++++++
 .../Ninja/Systems/SharedNinjaSuitSystem.cs    |  8 -------
 .../Entities/Clothing/Ears/headsets.yml       |  2 ++
 .../Entities/Clothing/OuterClothing/suits.yml |  2 ++
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 Content.Shared/Emp/EmpResistanceComponent.cs

diff --git a/Content.Shared/Emp/EmpResistanceComponent.cs b/Content.Shared/Emp/EmpResistanceComponent.cs
new file mode 100644
index 0000000000..0768ad744f
--- /dev/null
+++ b/Content.Shared/Emp/EmpResistanceComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Emp;
+
+/// <summary>
+/// An entity with this component resists or is fully immune to EMPs.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedEmpSystem))]
+public sealed partial class EmpResistanceComponent : Component
+{
+    /// <summary>
+    ///     The proportion of the EMP effect that is resisted. 1.00 indicates full immunity while 0.00 indicates no resistance.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 Resistance = FixedPoint2.Zero;
+}
diff --git a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs
index 4b806ab153..22457e2d6e 100644
--- a/Content.Shared/Emp/SharedEmpSystem.cs
+++ b/Content.Shared/Emp/SharedEmpSystem.cs
@@ -11,6 +11,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Configuration; // Frontier
 using Robust.Shared;
 using Content.Shared.Damage; // Frontier
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Emp;
 
@@ -39,6 +40,9 @@ public abstract class SharedEmpSystem : EntitySystem
         SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<EmpDisabledComponent, ComponentRemove>(OnRemove);
         SubscribeLocalEvent<EmpDisabledComponent, RejuvenateEvent>(OnRejuvenate);
+
+        SubscribeLocalEvent<EmpResistanceComponent, EmpAttemptEvent>(OnResistEmpAttempt);
+        SubscribeLocalEvent<EmpResistanceComponent, EmpPulseEvent>(OnResistEmpPulse);
     }
 
     public static readonly EntProtoId EmpPulseEffectPrototype = "EffectEmpBlast"; // Frontier - was EffectEmpPulse
@@ -192,6 +196,23 @@ public abstract class SharedEmpSystem : EntitySystem
     {
         RemCompDeferred<EmpDisabledComponent>(ent);
     }
+
+    private void OnResistEmpAttempt(Entity<EmpResistanceComponent> ent, ref EmpAttemptEvent args)
+    {
+        if (ent.Comp.Resistance >= 1)
+            args.Cancelled = true;
+    }
+
+    private void OnResistEmpPulse(Entity<EmpResistanceComponent> ent, ref EmpPulseEvent args)
+    {
+        var empStrengthMultiplier = 1 - ent.Comp.Resistance;
+
+        if (empStrengthMultiplier <= 0)
+            return;
+
+        args.Duration *= (float) empStrengthMultiplier;
+        args.EnergyConsumption *= (float) empStrengthMultiplier;
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
index 69627badd1..a5455c6158 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
@@ -36,7 +36,6 @@ public abstract class SharedNinjaSuitSystem : EntitySystem
         SubscribeLocalEvent<NinjaSuitComponent, CreateItemAttemptEvent>(OnCreateStarAttempt);
         SubscribeLocalEvent<NinjaSuitComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
         SubscribeLocalEvent<NinjaSuitComponent, GotUnequippedEvent>(OnUnequipped);
-        SubscribeLocalEvent<NinjaSuitComponent, EmpAttemptEvent>(OnEmpAttempt);
     }
 
     private void OnEquipped(Entity<NinjaSuitComponent> ent, ref ClothingGotEquippedEvent args)
@@ -178,11 +177,4 @@ public abstract class SharedNinjaSuitSystem : EntitySystem
         if (user.Comp.Gloves is { } uid)
             _toggle.TryDeactivate(uid, user: user);
     }
-
-    private void OnEmpAttempt(Entity<NinjaSuitComponent> ent, ref EmpAttemptEvent args)
-    {
-        // ninja suit (battery) is immune to emp
-        // powercell relays the event to suit
-        args.Cancelled = true;
-    }
 }
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index 2b7e039955..1de824388e 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -315,3 +315,5 @@
     sprite: Clothing/Ears/Headsets/ninja.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/ninja.rsi
+  - type: EmpResistance
+    resistance: 1
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 7c827ec010..1d2100ee2e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -249,6 +249,8 @@
     noPowerPopup: ninja-no-power
   # core ninja suit stuff
   - type: NinjaSuit
+  - type: EmpResistance
+    resistance: 1
   - type: UseDelay
     delay: 5 # disable time
   - type: PowerCellSlot

From b9896377ad7e3e4a134efbbb279dbaa07e6e9efc Mon Sep 17 00:00:00 2001
From: Velken <8467292+Velken@users.noreply.github.com>
Date: Tue, 13 Jan 2026 10:51:40 -0300
Subject: [PATCH 296/360] Allow station tiles to be placed on solid ground and
 other platings. (#38898)

* WORK IN PROGRESS 1

* ITS ALIVE, ALIVE!!!!

* clean up

* WIP 1

* fix small oversight

* big diff of doom

* added CVAR to tile history stack size

* component time

* filescoped namespaces + remove redundant nametag

* fix silly little mistakes

* typo

* TileStacksTest

* bweeeeeeh :P

* nuke cvar

* :3

* WIP2025

* Fix submodule

* It's beginning to look a lot like Christmas

* It's the Most Wonderful Time of the Year

* tiny fix

* fixed extra spacing on yaml

* slightly improve tilestacking test

* Part 1 out of 2 (part 2 tomorrow)

* Part 2

* add a simple tile construction test for tilestacking

* guh

* address reviews (no documentation yet)

* documentation be upon ye

* remove extra spaces

* prediction fix

* dirt

* oops :p

---------

Co-authored-by: Killerqu00 <killerqueen1777@gmail.com>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 .../Tests/Construction/RCDTest.cs             |   2 +-
 .../Interaction/InteractionTest.Constants.cs  |   1 +
 .../Tests/Tiles/TileConstructionTests.cs      |  21 +
 .../Tests/Tiles/TileStackRecursionTest.cs     |  66 ++
 .../ExplosionSystem.Processing.cs             |  30 +-
 Content.Server/Maps/TileGridSplitSystem.cs    |  74 ++
 Content.Shared/CCVar/CCVars.Game.cs           |   9 +
 Content.Shared/Maps/ContentTileDefinition.cs  |   9 +-
 Content.Shared/Maps/TileHistoryComponent.cs   | 125 ++++
 Content.Shared/Maps/TileSystem.cs             | 195 ++++-
 Content.Shared/RCD/Systems/RCDSystem.cs       |   8 +-
 Content.Shared/Tiles/FloorTileSystem.cs       |  29 +-
 Resources/Prototypes/Tiles/floors.yml         | 679 +++++-------------
 Resources/Prototypes/Tiles/planet.yml         |  55 +-
 Resources/Prototypes/Tiles/plating.yml        |  72 +-
 15 files changed, 734 insertions(+), 641 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Tiles/TileStackRecursionTest.cs
 create mode 100644 Content.Server/Maps/TileGridSplitSystem.cs
 create mode 100644 Content.Shared/Maps/TileHistoryComponent.cs

diff --git a/Content.IntegrationTests/Tests/Construction/RCDTest.cs b/Content.IntegrationTests/Tests/Construction/RCDTest.cs
index 814f7e89aa..f20a0cb434 100644
--- a/Content.IntegrationTests/Tests/Construction/RCDTest.cs
+++ b/Content.IntegrationTests/Tests/Construction/RCDTest.cs
@@ -194,7 +194,7 @@ public sealed class RCDTest : InteractionTest
         // Deconstruct the steel tile.
         await Interact(null, pEast);
         await RunSeconds(settingDeconstructTile.Delay + 1); // wait for the deconstruction to finish
-        await AssertTile(Lattice, FromServer(pEast));
+        await AssertTile(Plating, FromServer(pEast));
 
         // Check that the cost of the deconstruction was subtracted from the current charges.
         newCharges = sCharges.GetCurrentCharges(ToServer(rcd));
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
index 8917ba7ead..3cfb5a5dba 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
@@ -12,6 +12,7 @@ public abstract partial class InteractionTest
     protected const string FloorItem = "FloorTileItemSteel";
     protected const string Plating = "Plating";
     protected const string Lattice = "Lattice";
+    protected const string PlatingBrass = "PlatingBrass";
 
     // Structures
     protected const string Airlock = "Airlock";
diff --git a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
index 0827e11b70..64c4c291fe 100644
--- a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
+++ b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
@@ -100,4 +100,25 @@ public sealed class TileConstructionTests : InteractionTest
 
         await AssertEntityLookup((FloorItem, 1));
     }
+
+    /// <summary>
+    /// Test brassPlating -> floor -> brassPlating using tilestacking
+    /// </summary>
+    [Test]
+    public async Task BrassPlatingPlace()
+    {
+        await SetTile(PlatingBrass);
+
+        // Brass Plating -> Tile
+        await InteractUsing(FloorItem);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
+        await AssertTile(Floor);
+        AssertGridCount(1);
+
+        // Tile -> Brass Plating
+        await InteractUsing(Pry);
+        await AssertTile(PlatingBrass);
+        AssertGridCount(1);
+        await AssertEntityLookup((FloorItem, 1));
+    }
 }
diff --git a/Content.IntegrationTests/Tests/Tiles/TileStackRecursionTest.cs b/Content.IntegrationTests/Tests/Tiles/TileStackRecursionTest.cs
new file mode 100644
index 0000000000..52c5b03265
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Tiles/TileStackRecursionTest.cs
@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Maps;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Tiles;
+
+public sealed class TileStackRecursionTest
+{
+    [Test]
+    public async Task TestBaseTurfRecursion()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var protoMan = pair.Server.ResolveDependency<IPrototypeManager>();
+        var cfg = pair.Server.ResolveDependency<IConfigurationManager>();
+        var maxTileHistoryLength = cfg.GetCVar(CCVars.TileStackLimit);
+        Assert.That(protoMan.TryGetInstances<ContentTileDefinition>(out var tiles));
+        Assert.That(tiles, Is.Not.EqualTo(null));
+        //store the distance from the root node to the given tile node
+        var nodes = new List<(ProtoId<ContentTileDefinition>, int)>();
+        //each element of list is a connection from BaseTurf tile to tile that goes on it
+        var edges = new List<(ProtoId<ContentTileDefinition>, ProtoId<ContentTileDefinition>)>();
+        foreach (var ctdef in tiles!.Values)
+        {
+            //at first, each node is unexplored and has infinite distance to root.
+            //we use space node as root - everything is supposed to start at space, and it's hardcoded into the game anyway.
+            if (ctdef.ID == ContentTileDefinition.SpaceID)
+            {
+                nodes.Insert(0, (ctdef.ID, 0)); //space is the first element
+                continue;
+            }
+            Assert.That(ctdef.BaseTurf != ctdef.ID);
+            nodes.Add((ctdef.ID, int.MaxValue));
+            if (ctdef.BaseTurf != null)
+                edges.Add((ctdef.BaseTurf.Value, ctdef.ID));
+            Assert.That(ctdef.BaseWhitelist, Does.Not.Contain(ctdef.ID));
+            edges.AddRange(ctdef.BaseWhitelist.Select(possibleTurf =>
+                (possibleTurf, new ProtoId<ContentTileDefinition>(ctdef.ID))));
+        }
+        Bfs(nodes, edges, maxTileHistoryLength);
+        await pair.CleanReturnAsync();
+    }
+
+    private void Bfs(List<(ProtoId<ContentTileDefinition>, int)> nodes, List<(ProtoId<ContentTileDefinition>, ProtoId<ContentTileDefinition>)> edges, int depthLimit)
+    {
+        var root = nodes[0];
+        var queue = new Queue<(ProtoId<ContentTileDefinition>, int)>();
+        queue.Enqueue(root);
+        while (queue.Count != 0)
+        {
+            var u = queue.Dequeue();
+            //get a list of tiles that can be put on this tile
+            var adj = edges.Where(n => n.Item1 == u.Item1).Select(n => n.Item2);
+            var adjNodes = nodes.Where(n => adj.Contains(n.Item1)).ToList();
+            foreach (var node in adjNodes)
+            {
+                var adjNode = node;
+                adjNode.Item2 = u.Item2 + 1;
+                Assert.That(adjNode.Item2, Is.LessThanOrEqualTo(depthLimit)); //we can doomstack tiles on top of each other. Bad!
+                queue.Enqueue(adjNode);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 2cec8d707a..37045097f3 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -517,17 +517,39 @@ public sealed partial class ExplosionSystem
         else if (tileDef.MapAtmosphere)
             canCreateVacuum = true; // is already a vacuum.
 
+        var history = CompOrNull<TileHistoryComponent>(tileRef.GridUid);
+
+        // break the tile into its underlying parts
         int tileBreakages = 0;
         while (maxTileBreak > tileBreakages && _robustRandom.Prob(type.TileBreakChance(effectiveIntensity)))
         {
             tileBreakages++;
             effectiveIntensity -= type.TileBreakRerollReduction;
 
-            // does this have a base-turf that we can break it down to?
-            if (string.IsNullOrEmpty(tileDef.BaseTurf))
-                break;
+            ContentTileDefinition? newDef = null;
 
-            if (_tileDefinitionManager[tileDef.BaseTurf] is not ContentTileDefinition newDef)
+            // if we have tile history, we revert the tile to its previous state
+            var chunkIndices = SharedMapSystem.GetChunkIndices(tileRef.GridIndices, TileSystem.ChunkSize);
+            if (history != null && history.ChunkHistory.TryGetValue(chunkIndices, out var chunk) &&
+                chunk.History.TryGetValue(tileRef.GridIndices, out var stack) && stack.Count > 0)
+            {
+                // last entry in the stack
+                var newId = stack[^1];
+                stack.RemoveAt(stack.Count - 1);
+                if (stack.Count == 0)
+                    chunk.History.Remove(tileRef.GridIndices);
+
+                Dirty(tileRef.GridUid, history);
+
+                newDef = (ContentTileDefinition) _tileDefinitionManager[newId.Id];
+            }
+            else if (tileDef.BaseTurf.HasValue)
+            {
+                // otherwise, we just use the base turf
+                newDef = (ContentTileDefinition) _tileDefinitionManager[tileDef.BaseTurf.Value];
+            }
+
+            if (newDef == null)
                 break;
 
             if (newDef.MapAtmosphere && !canCreateVacuum)
diff --git a/Content.Server/Maps/TileGridSplitSystem.cs b/Content.Server/Maps/TileGridSplitSystem.cs
new file mode 100644
index 0000000000..fef0efed2b
--- /dev/null
+++ b/Content.Server/Maps/TileGridSplitSystem.cs
@@ -0,0 +1,74 @@
+using System.Numerics;
+using Content.Shared.Maps;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Maps;
+
+/// <summary>
+/// This system handles transferring <see cref="TileHistoryComponent"/> data when a grid is split.
+/// </summary>
+public sealed class TileGridSplitSystem : EntitySystem
+{
+    [Dependency] private readonly SharedMapSystem _maps = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+    }
+
+    /// <summary>
+    /// Transfer tile history from the old grid to the new grids.
+    /// </summary>
+    private void OnGridSplit(ref GridSplitEvent ev)
+    {
+        if (!TryComp<TileHistoryComponent>(ev.Grid, out var oldHistory))
+            return;
+
+        var oldGrid = Comp<MapGridComponent>(ev.Grid);
+
+        foreach (var gridUid in ev.NewGrids)
+        {
+            // ensure the new grid has a history component and get its grid component
+            var newHistory = EnsureComp<TileHistoryComponent>(gridUid);
+            var newGrid = Comp<MapGridComponent>(gridUid);
+
+            foreach (var tile in _maps.GetAllTiles(gridUid, newGrid))
+            {
+                // calculate where this tile was on the old grid
+                var oldIndices = _maps.LocalToTile(ev.Grid, oldGrid, new EntityCoordinates(gridUid, new Vector2(tile.GridIndices.X + 0.5f, tile.GridIndices.Y + 0.5f)));
+
+                var chunkIndices = SharedMapSystem.GetChunkIndices(oldIndices, TileSystem.ChunkSize);
+                if (oldHistory.ChunkHistory.TryGetValue(chunkIndices, out var oldChunk) &&
+                    oldChunk.History.TryGetValue(oldIndices, out var history))
+                {
+                    // now we move the history from the old grid to the new grid
+                    var newChunkIndices = SharedMapSystem.GetChunkIndices(tile.GridIndices, TileSystem.ChunkSize);
+                    if (!newHistory.ChunkHistory.TryGetValue(newChunkIndices, out var newChunk))
+                    {
+                        newChunk = new TileHistoryChunk();
+                        newHistory.ChunkHistory[newChunkIndices] = newChunk;
+                    }
+
+                    newChunk.History[tile.GridIndices] = new List<ProtoId<ContentTileDefinition>>(history);
+                    newChunk.LastModified = _timing.CurTick;
+
+                    // clean up the old history
+                    oldChunk.History.Remove(oldIndices);
+                    if (oldChunk.History.Count == 0)
+                        oldHistory.ChunkHistory.Remove(chunkIndices);
+                    else
+                        oldChunk.LastModified = _timing.CurTick;
+                }
+            }
+
+            Dirty(gridUid, newHistory);
+        }
+
+        Dirty(ev.Grid, oldHistory);
+    }
+}
diff --git a/Content.Shared/CCVar/CCVars.Game.cs b/Content.Shared/CCVar/CCVars.Game.cs
index 8a6780356a..5bc9ffce9a 100644
--- a/Content.Shared/CCVar/CCVars.Game.cs
+++ b/Content.Shared/CCVar/CCVars.Game.cs
@@ -409,4 +409,13 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<bool> GameHostnameInTitlebar =
         CVarDef.Create("game.hostname_in_titlebar", true, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    /// The maximum amount of tiles you can stack on top of each other. 0 is unlimited.
+    /// </summary>
+    /// <remarks>
+    /// Having it too high can result in "doomstacking" tiles - this messes with efficiency of explosions, deconstruction of tiles, and might result in memory problems.
+    /// </remarks>
+    public static readonly CVarDef<int> TileStackLimit =
+        CVarDef.Create("game.tile_stack_limit", 5, CVar.SERVER | CVar.REPLICATED);
 }
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 46ce7a212e..672eb95911 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -8,6 +8,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Maps
@@ -41,7 +42,13 @@ namespace Content.Shared.Maps
         [DataField("isSubfloor")] public bool IsSubFloor { get; private set; }
 
         [DataField("baseTurf")]
-        public string BaseTurf { get; private set; } = string.Empty;
+        public ProtoId<ContentTileDefinition>? BaseTurf { get; private set; }
+
+        /// <summary>
+        /// On what tiles this tile can be placed on. BaseTurf is already included.
+        /// </summary>
+        [DataField]
+        public List<ProtoId<ContentTileDefinition>> BaseWhitelist { get; private set; } = new();
 
         [DataField]
         public PrototypeFlags<ToolQualityPrototype> DeconstructTools { get; set; } = new();
diff --git a/Content.Shared/Maps/TileHistoryComponent.cs b/Content.Shared/Maps/TileHistoryComponent.cs
new file mode 100644
index 0000000000..0e02d60984
--- /dev/null
+++ b/Content.Shared/Maps/TileHistoryComponent.cs
@@ -0,0 +1,125 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Maps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class TileHistoryComponent : Component
+{
+    // History of tiles for each grid chunk.
+    [DataField]
+    public Dictionary<Vector2i, TileHistoryChunk> ChunkHistory = new();
+
+    /// <summary>
+    ///     Tick at which PVS was last toggled. Ensures that all players receive a full update when toggling PVS.
+    /// </summary>
+    public GameTick ForceTick { get; set; }
+}
+
+[Serializable, NetSerializable]
+public sealed class TileHistoryState : ComponentState
+{
+    public Dictionary<Vector2i, TileHistoryChunk> ChunkHistory;
+
+    public TileHistoryState(Dictionary<Vector2i, TileHistoryChunk> chunkHistory)
+    {
+        ChunkHistory = chunkHistory;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TileHistoryDeltaState : ComponentState, IComponentDeltaState<TileHistoryState>
+{
+    public Dictionary<Vector2i, TileHistoryChunk> ChunkHistory;
+    public HashSet<Vector2i> AllHistoryChunks;
+
+    public TileHistoryDeltaState(Dictionary<Vector2i, TileHistoryChunk> chunkHistory, HashSet<Vector2i> allHistoryChunks)
+    {
+        ChunkHistory = chunkHistory;
+        AllHistoryChunks = allHistoryChunks;
+    }
+
+    public void ApplyToFullState(TileHistoryState state)
+    {
+        var toRemove = new List<Vector2i>();
+        foreach (var key in state.ChunkHistory.Keys)
+        {
+            if (!AllHistoryChunks.Contains(key))
+                toRemove.Add(key);
+        }
+
+        foreach (var key in toRemove)
+        {
+            state.ChunkHistory.Remove(key);
+        }
+
+        foreach (var (indices, chunk) in ChunkHistory)
+        {
+            state.ChunkHistory[indices] = new TileHistoryChunk(chunk);
+        }
+    }
+
+    public void ApplyToComponent(TileHistoryComponent component)
+    {
+        var toRemove = new List<Vector2i>();
+        foreach (var key in component.ChunkHistory.Keys)
+        {
+            if (!AllHistoryChunks.Contains(key))
+                toRemove.Add(key);
+        }
+
+        foreach (var key in toRemove)
+        {
+            component.ChunkHistory.Remove(key);
+        }
+
+        foreach (var (indices, chunk) in ChunkHistory)
+        {
+            component.ChunkHistory[indices] = new TileHistoryChunk(chunk);
+        }
+    }
+
+    public TileHistoryState CreateNewFullState(TileHistoryState state)
+    {
+        var chunks = new Dictionary<Vector2i, TileHistoryChunk>(state.ChunkHistory.Count);
+
+        foreach (var (indices, chunk) in ChunkHistory)
+        {
+            chunks[indices] = new TileHistoryChunk(chunk);
+        }
+
+        foreach (var (indices, chunk) in state.ChunkHistory)
+        {
+            if (AllHistoryChunks.Contains(indices))
+                chunks.TryAdd(indices, new TileHistoryChunk(chunk));
+        }
+
+        return new TileHistoryState(chunks);
+    }
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class TileHistoryChunk
+{
+    [DataField]
+    public Dictionary<Vector2i, List<ProtoId<ContentTileDefinition>>> History = new();
+
+    [ViewVariables]
+    public GameTick LastModified;
+
+    public TileHistoryChunk()
+    {
+    }
+
+    public TileHistoryChunk(TileHistoryChunk other)
+    {
+        History = new Dictionary<Vector2i, List<ProtoId<ContentTileDefinition>>>(other.History.Count);
+        foreach (var (key, value) in other.History)
+        {
+            History[key] = new List<ProtoId<ContentTileDefinition>>(value);
+        }
+        LastModified = other.LastModified;
+    }
+}
diff --git a/Content.Shared/Maps/TileSystem.cs b/Content.Shared/Maps/TileSystem.cs
index d87b3ca50d..908507e54d 100644
--- a/Content.Shared/Maps/TileSystem.cs
+++ b/Content.Shared/Maps/TileSystem.cs
@@ -1,10 +1,16 @@
 using System.Linq;
 using System.Numerics;
+using Content.Shared.CCVar;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Decals;
+using Content.Shared.Tiles;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Maps;
@@ -14,12 +20,85 @@ namespace Content.Shared.Maps;
 /// </summary>
 public sealed class TileSystem : EntitySystem
 {
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly SharedDecalSystem _decal = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public const int ChunkSize = 16;
+
+    private int _tileStackLimit;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<GridInitializeEvent>(OnGridStartup);
+        SubscribeLocalEvent<TileHistoryComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<TileHistoryComponent, ComponentHandleState>(OnHandleState);
+        SubscribeLocalEvent<TileHistoryComponent, FloorTileAttemptEvent>(OnFloorTileAttempt);
+
+        _cfg.OnValueChanged(CCVars.TileStackLimit, t => _tileStackLimit = t, true);
+    }
+
+    private void OnHandleState(EntityUid uid, TileHistoryComponent component, ref ComponentHandleState args)
+    {
+        if (args.Current is not TileHistoryState state && args.Current is not TileHistoryDeltaState)
+            return;
+
+        if (args.Current is TileHistoryState fullState)
+        {
+            component.ChunkHistory.Clear();
+            foreach (var (key, value) in fullState.ChunkHistory)
+            {
+                component.ChunkHistory[key] = new TileHistoryChunk(value);
+            }
+
+            return;
+        }
+
+        if (args.Current is TileHistoryDeltaState deltaState)
+        {
+            deltaState.ApplyToComponent(component);
+        }
+    }
+
+    private void OnGetState(EntityUid uid, TileHistoryComponent component, ref ComponentGetState args)
+    {
+        if (args.FromTick <= component.CreationTick || args.FromTick <= component.ForceTick)
+        {
+            var fullHistory = new Dictionary<Vector2i, TileHistoryChunk>(component.ChunkHistory.Count);
+            foreach (var (key, value) in component.ChunkHistory)
+            {
+                fullHistory[key] = new TileHistoryChunk(value);
+            }
+            args.State = new TileHistoryState(fullHistory);
+            return;
+        }
+
+        var data = new Dictionary<Vector2i, TileHistoryChunk>();
+        foreach (var (index, chunk) in component.ChunkHistory)
+        {
+            if (chunk.LastModified >= args.FromTick)
+                data[index] = new TileHistoryChunk(chunk);
+        }
+
+        args.State = new TileHistoryDeltaState(data, new(component.ChunkHistory.Keys));
+    }
+
+    /// <summary>
+    /// On grid startup, ensure that we have Tile History.
+    /// </summary>
+    private void OnGridStartup(GridInitializeEvent ev)
+    {
+        if (HasComp<MapComponent>(ev.EntityUid))
+            return;
+
+        EnsureComp<TileHistoryComponent>(ev.EntityUid);
+    }
 
     /// <summary>
     ///     Returns a weighted pick of a tile variant.
@@ -85,7 +164,7 @@ public sealed class TileSystem : EntitySystem
         return PryTile(tileRef);
     }
 
-	public bool PryTile(TileRef tileRef)
+    public bool PryTile(TileRef tileRef)
     {
         return PryTile(tileRef, false);
     }
@@ -97,7 +176,7 @@ public sealed class TileSystem : EntitySystem
         if (tile.IsEmpty)
             return false;
 
-        var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.TypeId];
+        var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.TypeId];
 
         if (!tileDef.CanCrowbar)
             return false;
@@ -112,33 +191,73 @@ public sealed class TileSystem : EntitySystem
         return ReplaceTile(tileref, replacementTile, tileref.GridUid, grid);
     }
 
-    public bool ReplaceTile(TileRef tileref, ContentTileDefinition replacementTile, EntityUid grid, MapGridComponent? component = null)
+    public bool ReplaceTile(TileRef tileref, ContentTileDefinition replacementTile, EntityUid grid, MapGridComponent? component = null, byte? variant = null)
     {
         DebugTools.Assert(tileref.GridUid == grid);
 
         if (!Resolve(grid, ref component))
             return false;
 
+        var key = tileref.GridIndices;
+        var currentTileDef = (ContentTileDefinition) _tileDefinitionManager[tileref.Tile.TypeId];
 
-        var variant = PickVariant(replacementTile);
+        // If the tile we're placing has a baseTurf that matches the tile we're replacing, we don't need to create a history
+        // unless the tile already has a history.
+        var history = EnsureComp<TileHistoryComponent>(grid);
+        var chunkIndices = SharedMapSystem.GetChunkIndices(key, ChunkSize);
+        history.ChunkHistory.TryGetValue(chunkIndices, out var chunk);
+        var historyExists = chunk != null && chunk.History.ContainsKey(key);
+
+        if (replacementTile.BaseTurf != currentTileDef.ID || historyExists)
+        {
+            if (chunk == null)
+            {
+                chunk = new TileHistoryChunk();
+                history.ChunkHistory[chunkIndices] = chunk;
+            }
+
+            chunk.LastModified = _timing.CurTick;
+            Dirty(grid, history);
+
+            //Create stack if needed
+            if (!chunk.History.TryGetValue(key, out var stack))
+            {
+                stack = new List<ProtoId<ContentTileDefinition>>();
+                chunk.History[key] = stack;
+            }
+
+            //Prevent the doomstack
+            if (stack.Count >= _tileStackLimit && _tileStackLimit != 0)
+                return false;
+
+            //Push current tile to the stack, if not empty
+            if (!tileref.Tile.IsEmpty)
+            {
+                stack.Add(currentTileDef.ID);
+            }
+        }
+
+        variant ??= PickVariant(replacementTile);
         var decals = _decal.GetDecalsInRange(tileref.GridUid, _turf.GetTileCenter(tileref).Position, 0.5f);
         foreach (var (id, _) in decals)
         {
             _decal.RemoveDecal(tileref.GridUid, id);
         }
 
-        _maps.SetTile(grid, component, tileref.GridIndices, new Tile(replacementTile.TileId, 0, variant));
+        _maps.SetTile(grid, component, tileref.GridIndices, new Tile(replacementTile.TileId, 0, variant.Value));
         return true;
     }
 
-    public bool DeconstructTile(TileRef tileRef)
+
+    public bool DeconstructTile(TileRef tileRef, bool spawnItem = true)
     {
         if (tileRef.Tile.IsEmpty)
             return false;
 
-        var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileRef.Tile.TypeId];
+        var tileDef = (ContentTileDefinition)_tileDefinitionManager[tileRef.Tile.TypeId];
 
-        if (string.IsNullOrEmpty(tileDef.BaseTurf))
+        //Can't deconstruct anything that doesn't have a base turf.
+        if (tileDef.BaseTurf == null)
             return false;
 
         var gridUid = tileRef.GridUid;
@@ -152,20 +271,68 @@ public sealed class TileSystem : EntitySystem
                 (_robustRandom.NextFloat() - 0.5f) * bounds,
                 (_robustRandom.NextFloat() - 0.5f) * bounds));
 
-        //Actually spawn the relevant tile item at the right position and give it some random offset.
-        var tileItem = Spawn(tileDef.ItemDropPrototypeName, coordinates);
-        Transform(tileItem).LocalRotation = _robustRandom.NextDouble() * Math.Tau;
+        var historyComp = EnsureComp<TileHistoryComponent>(gridUid);
+        ProtoId<ContentTileDefinition> previousTileId;
 
-        // Destroy any decals on the tile
+        var chunkIndices = SharedMapSystem.GetChunkIndices(indices, ChunkSize);
+
+        //Pop from stack if we have history
+        if (historyComp.ChunkHistory.TryGetValue(chunkIndices, out var chunk) &&
+            chunk.History.TryGetValue(indices, out var stack) && stack.Count > 0)
+        {
+            chunk.LastModified = _timing.CurTick;
+            Dirty(gridUid, historyComp);
+
+            previousTileId = stack.Last();
+            stack.RemoveAt(stack.Count - 1);
+
+            //Clean up empty stacks to avoid memory buildup
+            if (stack.Count == 0)
+            {
+                chunk.History.Remove(indices);
+            }
+
+            // Clean up empty chunks
+            if (chunk.History.Count == 0)
+            {
+                historyComp.ChunkHistory.Remove(chunkIndices);
+            }
+        }
+        else
+        {
+            //No stack? Assume BaseTurf was the layer below
+            previousTileId = tileDef.BaseTurf.Value;
+        }
+
+        if (spawnItem)
+        {
+            //Actually spawn the relevant tile item at the right position and give it some random offset.
+            var tileItem = Spawn(tileDef.ItemDropPrototypeName, coordinates);
+            Transform(tileItem).LocalRotation = _robustRandom.NextDouble() * Math.Tau;
+        }
+
+        //Destroy any decals on the tile
         var decals = _decal.GetDecalsInRange(gridUid, coordinates.SnapToGrid(EntityManager, _mapManager).Position, 0.5f);
         foreach (var (id, _) in decals)
         {
             _decal.RemoveDecal(tileRef.GridUid, id);
         }
 
-        var plating = _tileDefinitionManager[tileDef.BaseTurf];
-        _maps.SetTile(gridUid, mapGrid, tileRef.GridIndices, new Tile(plating.TileId));
+        //Replace tile with the one it was placed on
+        var previousDef = (ContentTileDefinition)_tileDefinitionManager[previousTileId];
+        _maps.SetTile(gridUid, mapGrid, indices, new Tile(previousDef.TileId));
 
         return true;
     }
+
+    private void OnFloorTileAttempt(Entity<TileHistoryComponent> ent, ref FloorTileAttemptEvent args)
+    {
+        if (_tileStackLimit == 0)
+            return;
+        var chunkIndices = SharedMapSystem.GetChunkIndices(args.GridIndices, ChunkSize);
+        if (!ent.Comp.ChunkHistory.TryGetValue(chunkIndices, out var chunk) ||
+            !chunk.History.TryGetValue(args.GridIndices, out var stack))
+            return;
+        args.Cancelled = stack.Count >= _tileStackLimit; // greater or equals because the attempt itself counts as a tile we're trying to place
+    }
 }
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 504576216a..8b3ae16a1f 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -38,6 +38,7 @@ public sealed class RCDSystem : EntitySystem
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
@@ -560,10 +561,9 @@ public sealed class RCDSystem : EntitySystem
 
                 if (target == null)
                 {
-                    // Deconstruct tile (either converts the tile to lattice, or removes lattice)
-                    var tileDef = (_turf.GetContentTileDefinition(tile).ID != "Lattice") ? new Tile(_tileDefMan["Lattice"].TileId) : Tile.Empty;
-                    _mapSystem.SetTile(gridUid, mapGrid, position, tileDef);
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {gridUid} tile: {position} open to space");
+                    // Deconstruct tile, don't drop tile as item
+                    if (_tile.DeconstructTile(tile, spawnItem: false))
+                        _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {gridUid} tile: {position} open to space");
                 }
                 else
                 {
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 2c6df5ce89..a2743ca6ca 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Tiles;
@@ -142,7 +143,7 @@ public sealed class FloorTileSystem : EntitySystem
 
                 var baseTurf = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
 
-                if (HasBaseTurf(currentTileDefinition, baseTurf.ID))
+                if (CanPlaceOn(currentTileDefinition, baseTurf.ID))
                 {
                     if (!_stackSystem.TryUse((uid, stack), 1))
                         continue;
@@ -152,7 +153,7 @@ public sealed class FloorTileSystem : EntitySystem
                     return;
                 }
             }
-            else if (HasBaseTurf(currentTileDefinition, ContentTileDefinition.SpaceID))
+            else if (HasBaseTurf(currentTileDefinition, new ProtoId<ContentTileDefinition>(ContentTileDefinition.SpaceID)))
             {
                 if (!_stackSystem.TryUse((uid, stack), 1))
                     continue;
@@ -171,19 +172,35 @@ public sealed class FloorTileSystem : EntitySystem
         }
     }
 
-    public bool HasBaseTurf(ContentTileDefinition tileDef, string baseTurf)
+    public bool HasBaseTurf(ContentTileDefinition tileDef, ProtoId<ContentTileDefinition> baseTurf)
     {
         return tileDef.BaseTurf == baseTurf;
     }
 
+    private bool CanPlaceOn(ContentTileDefinition tileDef, ProtoId<ContentTileDefinition> currentTurfId)
+    {
+        //Check exact BaseTurf match
+        if (tileDef.BaseTurf == currentTurfId)
+            return true;
+
+        // Check whitelist match
+        if (tileDef.BaseWhitelist.Count > 0 && tileDef.BaseWhitelist.Contains(currentTurfId))
+            return true;
+
+        return false;
+    }
+
     private void PlaceAt(EntityUid user, EntityUid gridUid, MapGridComponent mapGrid, EntityCoordinates location,
         ushort tileId, SoundSpecifier placeSound, float offset = 0)
     {
         _adminLogger.Add(LogType.Tile, LogImpact.Low, $"{ToPrettyString(user):actor} placed tile {_tileDefinitionManager[tileId].Name} at {ToPrettyString(gridUid)} {location}");
 
-        var random = new System.Random((int) _timing.CurTick.Value);
-        var variant = _tile.PickVariant((ContentTileDefinition) _tileDefinitionManager[tileId], random);
-        _map.SetTile(gridUid, mapGrid,location.Offset(new Vector2(offset, offset)), new Tile(tileId, 0, variant));
+        var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileId];
+        var random = new System.Random((int)_timing.CurTick.Value);
+        var variant = _tile.PickVariant(tileDef, random);
+
+        var tileRef = _map.GetTileRef(gridUid, mapGrid, location.Offset(new Vector2(offset, offset)));
+        _tile.ReplaceTile(tileRef, tileDef, gridUid, mapGrid, variant: variant);
 
         _audio.PlayPredicted(placeSound, location, user);
     }
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 249ba7a4d9..dfd6426eaf 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1,5 +1,31 @@
+- type: tile
+  id: BaseStationTile
+  abstract: true
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  heatCapacity: 10000
+  baseTurf: Plating
+  baseWhitelist:
+  - PlatingBrass
+  - FloorAsteroidIronsand
+  - FloorAsteroidSand
+  - FloorAsteroidSandBorderless
+  - FloorAsteroidIronsandBorderless
+  - FloorAsteroidSandRedBorderless
+  - PlatingAsteroid
+  - PlatingSnow
+  - FloorPlanetDirt
+  - FloorDesert
+  - FloorLowDesert
+  - FloorPlanetGrass
+  - FloorSnow
+  - FloorDirt
+
 - type: tile
   id: FloorSteel
+  parent: BaseStationTile
   name: tiles-steel-floor
   sprite: /Textures/_DV/Tiles/steel.png # DeltaV - Resprite Tiles
   variants: 4
@@ -8,16 +34,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteel
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelCheckerLight
+  parent: BaseStationTile
   name: tiles-steel-floor-checker-light
   sprite: /Textures/_DV/Tiles/cafeteria.png # DeltaV - Resprite Tiles
   variants: 4
@@ -26,16 +47,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteelCheckerLight
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelCheckerDark
+  parent: BaseStationTile
   name: tiles-steel-floor-checker-dark
   sprite: /Textures/_DV/Tiles/checker_dark.png # DeltaV - Resprite Tiles
   variants: 4
@@ -44,16 +60,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteelCheckerDark
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelMini
+  parent: BaseStationTile
   name: tiles-steel-floor-mini
   sprite: /Textures/_DV/Tiles/steel_mini.png # DeltaV - Resprite Tile
   variants: 4
@@ -62,16 +73,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteelMini
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelPavement
+  parent: BaseStationTile
   name: tiles-steel-floor-pavement
   sprite: /Textures/_DV/Tiles/steel_pavement.png # DeltaV - Resprite Tile
   variants: 4
@@ -80,16 +86,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteelPavement
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelDiagonal
+  parent: BaseStationTile
   name: tiles-steel-floor-diagonal
   sprite: /Textures/_DV/Tiles/steel_diagonal.png # DeltaV - Resprite Tile
   variants: 4
@@ -98,28 +99,18 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteelDiagonal
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelOffset
+  parent: BaseStationTile
   name: tiles-steel-floor-offset
   sprite: /Textures/_DV/Tiles/steel_offset.png # DeltaV - Resprite Tile
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteelOffset
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelMono
+  parent: BaseStationTile
   name: tiles-steel-floor-mono
   sprite: /Textures/_DV/Tiles/steel_mono.png # DeltaV - Resprite Tile
   variants: 4
@@ -128,16 +119,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepTile
   itemDrop: FloorTileItemSteelMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelPavementVertical
+  parent: BaseStationTile
   name: tiles-steel-floor-pavement-vertical
   sprite: /Textures/_DV/Tiles/steel_pavement_vertical.png # DeltaV - Resprite Tile
   variants: 4
@@ -146,16 +132,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepTile
   itemDrop: FloorTileItemSteelPavementVertical
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelHerringbone
+  parent: BaseStationTile
   name: tiles-steel-floor-herringbone
   sprite: /Textures/_DV/Tiles/steel_herringbone.png # DeltaV - Resprite Tile
   variants: 4
@@ -164,16 +145,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepTile
   itemDrop: FloorTileItemSteelHerringbone
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelDiagonalMini
+  parent: BaseStationTile
   name: tiles-steel-floor-diagonal-mini
   sprite: /Textures/_DV/Tiles/steel_diagonal_mini.png # DeltaV - Resprite Tile
   variants: 4
@@ -182,40 +158,29 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepTile
   itemDrop: FloorTileItemSteelDiagonalMini
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBrassFilled
+  parent: BaseStationTile
   name: tiles-brass-floor-filled
   sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png
-  baseTurf: PlatingBrass
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemBrassFilled
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBrassReebe
+  parent: BaseStationTile
   name: tiles-brass-floor-reebe
   sprite: /Textures/Tiles/Misc/clockwork/reebe.png
-  baseTurf: PlatingBrass
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemBrassReebe
-  heatCapacity: 10000
 
 - type: tile
   id: FloorPlastic
+  parent: BaseStationTile
   name: tiles-plastic-floor
   sprite: /Textures/_DV/Tiles/plastic.png # DeltaV - Resprite Tile
   variants: 4
@@ -224,16 +189,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteel
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWood
+  parent: BaseStationTile
   name: tiles-wood
   sprite: /Textures/_DV/Tiles/wood.png # DeltaV - Resprite Tile
   variants: 4
@@ -242,18 +202,15 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepWood
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWood
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhite
+  parent: BaseStationTile
   name: tiles-white-floor
   sprite: /Textures/_DV/Tiles/white.png # DeltaV - Resprite Tile
   variants: 4
@@ -262,16 +219,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteMini
+  parent: BaseStationTile
   name: tiles-white-floor-mini
   sprite: /Textures/_DV/Tiles/white_mini.png # DeltaV - Resprite Tile
   variants: 4
@@ -280,16 +234,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhiteMini
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhitePavement
+  parent: BaseStationTile
   name: tiles-white-floor-pavement
   sprite: /Textures/_DV/Tiles/white_pavement.png # DeltaV - Resprite Tile
   variants: 4
@@ -298,16 +249,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhitePavement
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteDiagonal
+  parent: BaseStationTile
   name: tiles-white-floor-diagonal
   sprite: /Textures/_DV/Tiles/white_diagonal.png # DeltaV - Resprite Tile
   variants: 4
@@ -316,28 +264,22 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhiteDiagonal
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteOffset
+  parent: BaseStationTile
   name: tiles-white-floor-offset
   sprite: /Textures/_DV/Tiles/white_offset.png # DeltaV - Resprite Tile
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhiteOffset
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteMono
+  parent: BaseStationTile
   name: tiles-white-floor-mono
   sprite: /Textures/_DV/Tiles/white_mono.png # DeltaV - Resprite Tile
   variants: 4
@@ -346,16 +288,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhiteMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhitePavementVertical
+  parent: BaseStationTile
   name: tiles-white-floor-pavement-vertical
   sprite: /Textures/_DV/Tiles/white_pavement_vertical.png # DeltaV - Resprite Tile
   variants: 4
@@ -364,16 +303,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhitePavementVertical
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteHerringbone
+  parent: BaseStationTile
   name: tiles-white-floor-herringbone
   sprite: /Textures/_DV/Tiles/white_herringbone.png # DeltaV - Resprite Tile
   variants: 4
@@ -382,16 +318,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhiteHerringbone
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteDiagonalMini
+  parent: BaseStationTile
   name: tiles-white-floor-diagonal-mini
   sprite: /Textures/_DV/Tiles/white_diagonal_mini.png # DeltaV - Resprite Tile
   variants: 4
@@ -400,16 +333,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhiteDiagonalMini
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhitePlastic
+  parent: BaseStationTile
   name: tiles-plastic-white-floor
   sprite: /Textures/_DV/Tiles/white_plastic.png # DeltaV - Resprite Tile
   variants: 4
@@ -418,16 +348,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDark
+  parent: BaseStationTile
   name: tiles-dark-floor
   sprite: /Textures/_DV/Tiles/dark.png # DeltaV - Resprite Tile
   variants: 4
@@ -436,16 +363,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDark
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkMini
+  parent: BaseStationTile
   name: tiles-dark-floor-mini
   sprite: /Textures/_DV/Tiles/dark_mini.png # DeltaV - Resprite Tile
   variants: 4
@@ -454,16 +378,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkMini
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkPavement
+  parent: BaseStationTile
   name: tiles-dark-floor-pavement
   sprite: /Textures/_DV/Tiles/dark_pavement.png # DeltaV - Resprite Tile
   variants: 4
@@ -472,16 +393,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkPavement
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkDiagonal
+  parent: BaseStationTile
   name: tiles-dark-floor-diagonal
   sprite: /Textures/_DV/Tiles/dark_diagonal.png # DeltaV - Resprite Tile
   variants: 4
@@ -490,28 +408,22 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkDiagonal
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkOffset
+  parent: BaseStationTile
   name: tiles-dark-floor-offset
   sprite: /Textures/_DV/Tiles/dark_offset.png # DeltaV - Resprite Tile
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkOffset
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkMono
+  parent: BaseStationTile
   name: tiles-dark-floor-mono
   sprite: /Textures/_DV/Tiles/dark_mono.png # DeltaV - Resprite Tile
   variants: 4
@@ -520,16 +432,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkPavementVertical
+  parent: BaseStationTile
   name: tiles-dark-floor-pavement-vertical
   sprite: /Textures/_DV/Tiles/dark_pavement_vertical.png # DeltaV - Resprite Tile
   variants: 4
@@ -538,16 +447,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkPavementVertical
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkHerringbone
+  parent: BaseStationTile
   name: tiles-dark-floor-herringbone
   sprite: /Textures/_DV/Tiles/dark_herringbone.png # DeltaV - Resprite Tile
   variants: 4
@@ -556,16 +462,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkHerringbone
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkDiagonalMini
+  parent: BaseStationTile
   name: tiles-dark-floor-diagonal-mini
   sprite: /Textures/_DV/Tiles/dark_diagonal_mini.png # DeltaV - Resprite Tile
   variants: 4
@@ -574,16 +477,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDarkDiagonalMini
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkPlastic
+  parent: BaseStationTile
   name: tiles-plastic-dark-floor
   sprite: /Textures/_DV/Tiles/dark_plastic.png # DeltaV - Resprite Tile
   variants: 4
@@ -592,136 +492,109 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemDark
-  heatCapacity: 10000
 
 - type: tile
   id: FloorTechMaint
+  parent: BaseStationTile
   name: tiles-techmaint-floor
   sprite: /Textures/Tiles/tech_maint.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemTechmaint
-  heatCapacity: 10000
 
 - type: tile
   id: FloorTechMaintDark
+  parent: BaseStationTile
   name: tiles-techmaint-floor-dark
   sprite: /Textures/Tiles/tech_maint_dark.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemTechmaintDark
-  heatCapacity: 10000
 
 - type: tile
   id: FloorReinforced
+  parent: BaseStationTile
   name: tiles-reinforced-floor
   sprite: /Textures/Tiles/reinforced.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: PartRodMetal1
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMono
+  parent: BaseStationTile
   name: tiles-mono-floor
   sprite: /Textures/Tiles/mono.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorLino
+  parent: BaseStationTile
   name: tiles-linoleum-floor
   sprite: /Textures/Tiles/lino.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemLino
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelDirty
+  parent: BaseStationTile
   name: tiles-dirty-steel-floor
   sprite: /Textures/_DV/Tiles/steel_dirty.png # DeltaV - Resprite Tile
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
+  #variants: 4 # DeltaV - No resprited variants
+  #placementVariants:
+  #- 1.0
+  #- 1.0
+  #- 1.0
+  #- 1.0
   footstepSounds:
     collection: FootstepPlating
   itemDrop: FloorTileItemDirty
-  heatCapacity: 10000
 
 - type: tile
   id: FloorElevatorShaft
+  parent: BaseStationTile
   name: tiles-elevator-shaft
   sprite: /Textures/Tiles/elevator_shaft.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemElevatorShaft
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMetalDiamond
+  parent: BaseStationTile
   name: tiles-diamond-plate-floor
   sprite: /Textures/Tiles/metaldiamond.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemMetalDiamond
-  heatCapacity: 10000
 
 - type: tile
   id: FloorRockVault
+  parent: BaseStationTile
   name: tiles-rock-floor
   sprite: /Textures/Tiles/rock_vault.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepAsteroid
   itemDrop: FloorTileItemRockVault
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBlue
+  parent: BaseStationTile
   name: tiles-blue-tile
   sprite: /Textures/_DV/Tiles/blue.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemBlue
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelLime
+  parent: BaseStationTile
   name: tiles-lime-floor
   sprite: /Textures/_DV/Tiles/lime.png # DeltaV - Resprite Tiles
   variants: 4
@@ -730,89 +603,62 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemLime
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMining
+  parent: BaseStationTile
   name: tiles-mining-tile
   sprite: /Textures/Tiles/mining_floor.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemMining
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMiningDark
+  parent: BaseStationTile
   name: tiles-mining-dark-tile
   sprite: /Textures/Tiles/mining_floor_dark.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemMiningDark
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMiningLight
+  parent: BaseStationTile
   name: tiles-mining-light-tile
   sprite: /Textures/Tiles/mining_floor_light.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemMiningLight
-  heatCapacity: 10000
 
 # Departmental
 - type: tile
   id: FloorFreezer
+  parent: BaseStationTile
   name: tiles-freezer
   sprite: /Textures/_DV/Tiles/freezer.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemFreezer
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShowroom
+  parent: BaseStationTile
   name: tiles-showroom-floor
   sprite: /Textures/_DV/Tiles/showroom.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShowroom
-  heatCapacity: 10000
 
 - type: tile
   id: FloorHydro
+  parent: BaseStationTile
   name: tiles-hydro-floor
   sprite: /Textures/_DV/Tiles/hydro.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemHydro
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBar
+  parent: BaseStationTile
   name: tiles-bar-floor
   sprite: /Textures/_DV/Tiles/bar.png # DeltaV - Resprite Tiles
   variants: 4
@@ -821,64 +667,43 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemBar
-  heatCapacity: 10000
 
 - type: tile
   id: FloorClown
+  parent: BaseStationTile
   name: tiles-clown-floor
   sprite: /Textures/_DV/Tiles/clown.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemClown
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMime
+  parent: BaseStationTile
   name: tiles-mime-floor
   sprite: /Textures/_DV/Tiles/mime.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemMime
-  heatCapacity: 10000
 
 - type: tile
   id: FloorKitchen
+  parent: BaseStationTile
   name: tiles-kitchen-floor
   sprite: /Textures/_DV/Tiles/kitchen.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemKitchen
-  heatCapacity: 10000
 
 - type: tile
   id: FloorLaundry
+  parent: BaseStationTile
   name: tiles-laundry-floor
   sprite: /Textures/_DV/Tiles/laundry.png # DeltaV - Resprite Tiles
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemLaundry
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSteelDamaged
+  parent: BaseStationTile
   name: tiles-steel-floor
   sprite: /Textures/Tiles/steel_damaged.png
   variants: 5
@@ -888,17 +713,12 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything.
-  heatCapacity: 10000
 
 # Concrete
 - type: tile
   id: FloorConcrete
+  parent: BaseStationTile
   name: tiles-concrete-tile
   sprite: /Textures/Tiles/Planet/Concrete/concrete.png
   variants: 4
@@ -907,16 +727,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemConcrete
-  heatCapacity: 10000
 
 - type: tile
   id: FloorConcreteMono
+  parent: BaseStationTile
   name: tiles-concrete-slab
   sprite: /Textures/Tiles/Planet/Concrete/concrete_mono.png
   variants: 4
@@ -925,16 +742,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemConcreteMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorConcreteSmooth
+  parent: BaseStationTile
   name: tiles-concrete-smooth
   sprite: /Textures/Tiles/Planet/Concrete/concrete_smooth.png
   variants: 4
@@ -943,16 +757,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemConcreteSmooth
-  heatCapacity: 10000
 
 - type: tile
   id: FloorGrayConcrete
+  parent: BaseStationTile
   name: tiles-gray-concrete-tile
   sprite: /Textures/Tiles/Planet/Concrete/grayconcrete.png
   variants: 4
@@ -961,16 +772,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemGrayConcrete
-  heatCapacity: 10000
 
 - type: tile
   id: FloorGrayConcreteMono
+  parent: BaseStationTile
   name: tiles-gray-concrete-slab
   sprite: /Textures/Tiles/Planet/Concrete/grayconcrete_mono.png
   variants: 4
@@ -979,16 +787,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemGrayConcreteMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorGrayConcreteSmooth
+  parent: BaseStationTile
   name: tiles-gray-concrete-smooth
   sprite: /Textures/Tiles/Planet/Concrete/grayconcrete_smooth.png
   variants: 4
@@ -997,16 +802,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemGrayConcreteSmooth
-  heatCapacity: 10000
 
 - type: tile
   id: FloorOldConcrete
+  parent: BaseStationTile
   name: tiles-old-concrete-tile
   sprite: /Textures/Tiles/Planet/Concrete/oldconcrete.png
   variants: 4
@@ -1015,16 +817,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemOldConcrete
-  heatCapacity: 10000
 
 - type: tile
   id: FloorOldConcreteMono
+  parent: BaseStationTile
   name: tiles-old-concrete-slab
   sprite: /Textures/Tiles/Planet/Concrete/oldconcrete_mono.png
   variants: 4
@@ -1033,16 +832,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemOldConcreteMono
-  heatCapacity: 10000
 
 - type: tile
   id: FloorOldConcreteSmooth
+  parent: BaseStationTile
   name: tiles-old-concrete-smooth
   sprite: /Textures/Tiles/Planet/Concrete/oldconcrete_smooth.png
   variants: 4
@@ -1051,107 +847,86 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemOldConcreteSmooth
-  heatCapacity: 10000
 
 # Carpets (non smoothing)
 - type: tile
   id: FloorArcadeBlue
+  parent: BaseStationTile
   name: tiles-blue-arcade-floor
   sprite: /Textures/Tiles/arcadeblue.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   friction: 1.25
   itemDrop: FloorTileItemArcadeBlue
-  heatCapacity: 10000
 
 - type: tile
   id: FloorArcadeBlue2
+  parent: BaseStationTile
   name: tiles-blue-arcade-floor
   sprite: /Textures/Tiles/arcadeblue2.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   friction: 1.25
   itemDrop: FloorTileItemArcadeBlue2
-  heatCapacity: 10000
 
 - type: tile
   id: FloorArcadeRed
+  parent: BaseStationTile
   name: tiles-red-arcade-floor
   sprite: /Textures/Tiles/arcadered.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   friction: 1.25
   itemDrop: FloorTileItemArcadeRed
-  heatCapacity: 10000
 
 - type: tile
   id: FloorEighties
+  parent: BaseStationTile
   name: tiles-eighties-floor
   sprite: /Textures/Tiles/eighties.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   friction: 1.25
   itemDrop: FloorTileItemEighties
-  heatCapacity: 10000
 
 - type: tile
   id: FloorCarpetClown
+  parent: BaseStationTile
   name: tiles-clown-carpet-floor
   sprite: /Textures/Tiles/carpetclown.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   friction: 1.25
   itemDrop: FloorTileItemCarpetClown
-  heatCapacity: 10000
 
 - type: tile
   id: FloorCarpetOffice
+  parent: BaseStationTile
   name: tiles-office-carpet-floor
   sprite: /Textures/Tiles/carpetoffice.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   friction: 1.25
   itemDrop: FloorTileItemCarpetOffice
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBoxing
+  parent: BaseStationTile
   name: tiles-boxing-ring-floor
   sprite: /Textures/Tiles/boxing.png
   variants: 4
@@ -1160,17 +935,12 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   friction: 1.25
   itemDrop: FloorTileItemBoxing
-  heatCapacity: 10000
 
 - type: tile
   id: FloorGym
+  parent: BaseStationTile
   name: tiles-gym-floor
   sprite: /Textures/Tiles/gym.png
   variants: 4
@@ -1179,18 +949,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   friction: 1.25
   itemDrop: FloorTileItemGym
-  heatCapacity: 10000
 
 # Shuttle
 - type: tile
   id: FloorShuttleWhite
+  parent: BaseStationTile
   name: tiles-white-shuttle-floor
   sprite: /Textures/Tiles/shuttlewhite.png
   variants: 4
@@ -1199,16 +964,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttleWhite
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShuttleGrey
+  parent: BaseStationTile
   name: tiles-grey-shuttle-floor
   sprite: /Textures/Tiles/shuttlegrey.png
   variants: 4
@@ -1217,16 +977,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttleGrey
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShuttleBlack
+  parent: BaseStationTile
   name: tiles-black-shuttle-floor
   sprite: /Textures/Tiles/shuttleblack.png
   variants: 4
@@ -1235,16 +990,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttleBlack
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShuttleBlue
+  parent: BaseStationTile
   name: tiles-blue-shuttle-floor
   sprite: /Textures/Tiles/shuttleblue.png
   variants: 4
@@ -1253,16 +1003,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttleBlue
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShuttleOrange
+  parent: BaseStationTile
   name: tiles-orange-shuttle-floor
   sprite: /Textures/Tiles/shuttleorange.png
   variants: 4
@@ -1271,16 +1016,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttleOrange
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShuttlePurple
+  parent: BaseStationTile
   name: tiles-purple-shuttle-floor
   sprite: /Textures/Tiles/shuttlepurple.png
   variants: 4
@@ -1289,16 +1029,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttlePurple
-  heatCapacity: 10000
 
 - type: tile
   id: FloorShuttleRed
+  parent: BaseStationTile
   name: tiles-red-shuttle-floor
   sprite: /Textures/Tiles/shuttlered.png
   variants: 4
@@ -1307,42 +1042,31 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemShuttleRed
-  heatCapacity: 10000
 
 
 # Materials
 - type: tile
   id: FloorGold
+  parent: BaseStationTile
   name: tiles-gold-tile
   sprite: /Textures/Tiles/gold.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemGold
-  heatCapacity: 10000
 
 - type: tile
   id: FloorSilver
+  parent: BaseStationTile
   name: tiles-silver-tile
   sprite: /Textures/Tiles/silver.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemSilver
-  heatCapacity: 10000
 
 - type: tile
   id: FloorGlass
+  parent: BaseStationTile
   name: tiles-glass-floor
   sprite: /Textures/_DV/Tiles/glass.png # DeltaV - Resprite Tile
   variants: 4
@@ -1351,16 +1075,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: SheetGlass1
-  heatCapacity: 10000
 
 - type: tile
   id: FloorRGlass
+  parent: BaseStationTile
   name: tiles-reinforced-glass-floor
   sprite: /Textures/_DV/Tiles/rglass.png # DeltaV - Resprite Tile
   variants: 4
@@ -1369,65 +1090,49 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: SheetRGlass1
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMetalFoam
+  parent: BaseStationTile
   name: tiles-metal-foam
   sprite: /Textures/Tiles/foammetal.png
   variants: 1
   placementVariants:
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: SheetSteel1
-  heatCapacity: 10000
 
 # Circuits
 - type: tile
   id: FloorGreenCircuit
+  parent: BaseStationTile
   name: tiles-green-circuit-floor
   sprite: /Textures/Tiles/green_circuit.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemGCircuit
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBlueCircuit
+  parent: BaseStationTile
   name: tiles-blue-circuit-floor
   sprite: /Textures/Tiles/blue_circuit.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemBCircuit
-  heatCapacity: 10000
 
 - type: tile
   id: FloorRedCircuit
+  parent: BaseStationTile
   name: tiles-red-circuit-floor
   sprite: /Textures/Tiles/red_circuit.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemRCircuit
-  heatCapacity: 10000
 
 # Terrain
 - type: tile
@@ -1536,19 +1241,19 @@
   sprite: /Textures/Tiles/Asteroid/asteroid.png
   variants: 13
   placementVariants:
-  - 0.8
-  - 0.0166 #Should be roughly 20%.... I think??? I don't know dude, I'm just a YAML monkey.
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0166
-  - 0.0116
-  - 0.0116
+    - 0.8
+    - 0.0166 #Should be roughly 20%.... I think??? I don't know dude, I'm just a YAML monkey.
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0166
+    - 0.0116
+    - 0.0116
   baseTurf: Space
   isSubfloor: true
   footstepSounds:
@@ -1787,6 +1492,7 @@
 
 - type: tile
   id: FloorFlesh
+  parent: BaseStationTile
   name: tiles-flesh-floor
   sprite: /Textures/Tiles/meat.png
   variants: 4
@@ -1795,29 +1501,23 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepBlood
   itemDrop: FloorTileItemFlesh
   friction: 0.25 #slippy
-  heatCapacity: 10000
 
 - type: tile
   id: FloorTechMaint2
+  parent: BaseStationTile
   name: tiles-techmaint2-floor
   sprite: /Textures/Tiles/steel_maint.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemSteelMaint
-  heatCapacity: 10000
 
 - type: tile
   id: FloorTechMaint3
+  parent: BaseStationTile
   name: tiles-techmaint3-floor
   sprite: /Textures/Tiles/grating_maint.png
   variants: 4
@@ -1826,16 +1526,13 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemGratingMaint
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWoodTile
+  parent: BaseStationTile
   name: tiles-wood2
   sprite: /Textures/_DV/Tiles/wood_tile.png # DeltaV - Resprite Tile
   variants: 4
@@ -1844,18 +1541,15 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepWood
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWoodPattern
-  heatCapacity: 10000
 
 - type: tile
   id: FloorBrokenWood
+  parent: BaseStationTile
   name: tiles-wood3
   sprite: /Textures/_DV/Tiles/wood_broken.png # DeltaV - Resprite Tile
   variants: 7
@@ -1867,29 +1561,22 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepWood
   barestepSounds:
     collection: BarestepWood
   itemDrop: MaterialWoodPlank1
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWebTile
+  parent: BaseStationTile
   name: tiles-web
   sprite: /Textures/Tiles/Misc/Web/web_tile.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepCarpet
   barestepSounds:
     collection: BarestepCarpet
   itemDrop: FloorTileItemWeb
-  heatCapacity: 10000
 
 - type: tile
   id: FloorChromite
@@ -1913,21 +1600,18 @@
 #Hull tiles
 - type: tile
   id: FloorHull
+  parent: BaseStationTile
   name: tiles-hull
   sprite: /Textures/Tiles/hull.png
-  baseTurf: Plating
-  isSubfloor: false
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemSteel #probably should not be normally obtainable, but the game shits itself and dies when you try to put null here
-  heatCapacity: 10000
 
 - type: tile
   id: FloorHullReinforced
+  parent: BaseStationTile
   name: tiles-hull-reinforced
   sprite: /Textures/Tiles/hull_reinforced.png
-  baseTurf: Plating
-  isSubfloor: false
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemSteel
@@ -1936,10 +1620,9 @@
 
 - type: tile
   id: FloorReinforcedHardened
+  parent: BaseStationTile
   name: tiles-super-reinforced-floor
   sprite: /Textures/Tiles/super_reinforced.png
-  baseTurf: Plating
-  isSubfloor: false
   footstepSounds:
     collection: FootstepHull
   itemDrop: PartRodMetal1 #same case as FloorHull
@@ -1949,6 +1632,7 @@
 # Grass
 - type: tile
   id: FloorAstroGrass
+  parent: BaseStationTile
   name: tiles-astro-grass
   sprite: /Textures/Tiles/Planet/Grass/grass.png
   variants: 4
@@ -1967,28 +1651,23 @@
     East: /Textures/Tiles/Planet/Grass/double_edge.png
     North: /Textures/Tiles/Planet/Grass/double_edge.png
     West: /Textures/Tiles/Planet/Grass/double_edge.png
-  baseTurf: Plating
-  isSubfloor: false
   deconstructTools: [ Cutting ]
   footstepSounds:
     collection: FootstepGrass
   itemDrop: FloorTileItemAstroGrass
-  heatCapacity: 10000
 
 - type: tile
   id: FloorMowedAstroGrass
+  parent: [ BaseStationTile, FloorGrass ]
   name: tiles-mowed-astro-grass
-  parent: FloorGrass
-  baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemMowedAstroGrass
 
 - type: tile
   id: FloorJungleAstroGrass
+  parent: [ BaseStationTile, FloorGrassJungle ]
   name: tiles-jungle-astro-grass
-  parent: FloorGrassJungle
-  baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemJungleAstroGrass
@@ -2014,22 +1693,18 @@
 # Ice
 - type: tile
   id: FloorAstroIce
+  parent: BaseStationTile
   name: tiles-astro-ice
   sprite: /Textures/Tiles/Planet/Snow/ice.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   friction: 0.05
-  heatCapacity: 10000
   mobFriction: 0.05
   mobAcceleration: 0.1
   itemDrop: FloorTileItemAstroIce
 
 - type: tile
   id: FloorAstroSnow
+  parent: [ BaseStationTile, FloorSnow ]
   name: tiles-astro-snow
-  parent: FloorSnow
-  baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
   itemDrop: FloorTileItemAstroSnow
@@ -2037,9 +1712,8 @@
 # Asteroid Sand
 - type: tile
   id: FloorAstroAsteroidSand
+  parent: [ BaseStationTile, FloorAsteroidSand ]
   name: tiles-astro-asteroid-sand
-  parent: FloorAsteroidSand
-  baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
   itemDrop: FloorTileItemAstroAsteroidSand
@@ -2047,9 +1721,8 @@
 
 - type: tile
   id: FloorAstroAsteroidSandBorderless
+  parent: [ BaseStationTile, FloorAsteroidSandBorderless ]
   name: tiles-astro-asteroid-sand-borderless
-  parent: FloorAsteroidSandBorderless
-  baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
   itemDrop: FloorTileItemAstroAsteroidSand
@@ -2087,6 +1760,7 @@
 
 - type: tile
   id: FloorWoodLarge
+  parent: BaseStationTile
   name: tiles-wood-large
   sprite: /Textures/_DV/Tiles/wood_large.png # DeltaV - Resprite Tile
   variants: 4
@@ -2095,15 +1769,11 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepWood
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWoodLarge
-  heatCapacity: 10000
 
 - type: tile
   id: FloorXenoborg
@@ -2119,44 +1789,36 @@
 
 - type: tile
   id: FloorXeno
+  parent: BaseStationTile
   name: tiles-xeno-floor
   sprite: /Textures/Tiles/xeno_flooring.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepBlood
   itemDrop: FloorTileItemXeno
-  heatCapacity: 10000
 
 - type: tile
   id: FloorXenoSteel
+  parent: BaseStationTile
   name: tiles-xeno-steel
   sprite: /Textures/Tiles/xeno_steel.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemXenoSteel
-  heatCapacity: 10000
   allowRotationMirror: true
 
 - type: tile
   id: FloorXenoSteelCorner
+  parent: BaseStationTile
   name: tiles-xeno-steel-corner
   sprite: /Textures/Tiles/xeno_steel_corner.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   itemDrop: FloorTileItemXenoSteelCorner
-  heatCapacity: 10000
   allowRotationMirror: true
 
 - type: tile
   id: FloorDarkSquiggly
+  parent: BaseStationTile
   name: tiles-dark-squiggly
   sprite: /Textures/Tiles/dark_squiggly.png
   variants: 4
@@ -2165,29 +1827,21 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
   itemDrop: FloorTileItemDarkSquiggly
-  heatCapacity: 10000
   allowRotationMirror: true
 
 - type: tile
   id: FloorXenoMaint
+  parent: BaseStationTile
   name: tiles-xeno-maint
   sprite: /Textures/Tiles/xeno_maint.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemXenoMaint
-  heatCapacity: 10000
 
 - type: tile
   id: FloorWhiteMarble
+  parent: BaseStationTile
   name: tiles-white-marble
   sprite: /Textures/Tiles/white_marble.png
   variants: 8
@@ -2200,17 +1854,14 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   friction: 0.8
   itemDrop: FloorTileItemWhiteMarble
-  heatCapacity: 10000
 
 - type: tile
   id: FloorDarkMarble
+  parent: BaseStationTile
   name: tiles-dark-marble
   sprite: /Textures/Tiles/dark_marble.png
   variants: 8
@@ -2223,17 +1874,14 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   friction: 0.8
   itemDrop: FloorTileItemDarkMarble
-  heatCapacity: 10000
 
 - type: tile
   id: FloorPlasmaMarble
+  parent: BaseStationTile
   name: tiles-plasma-marble
   sprite: /Textures/Tiles/plasmarble.png
   variants: 8
@@ -2246,17 +1894,14 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   friction: 0.8
   itemDrop: FloorTileItemPlasmaMarble
-  heatCapacity: 10000
 
 - type: tile
   id: FloorUraniumMarble
+  parent: BaseStationTile
   name: tiles-uranium-marble
   sprite: /Textures/Tiles/uranium_marble.png
   variants: 8
@@ -2269,11 +1914,7 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
   friction: 0.8
   itemDrop: FloorTileItemUraniumMarble
-  heatCapacity: 10000
diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml
index 9ad7347362..d75afd7b64 100644
--- a/Resources/Prototypes/Tiles/planet.yml
+++ b/Resources/Prototypes/Tiles/planet.yml
@@ -1,6 +1,17 @@
+- type: tile
+  id: BaseFloorPlanet
+  abstract: true
+  heatCapacity: 10000
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepAsteroid
+  weather: true
+  indestructible: true
+
 - type: tile
   id: FloorPlanetDirt
-  name: tiles-dirt-floor
+  parent: BaseFloorPlanet
+  name: tiles-dirt-planet-floor
   sprite: /Textures/Tiles/dirt.png # DeltaV - Was /Textures/Tiles/Planet/dirt.rsi/dirt.png, this breaks.
   variants: 4
   placementVariants:
@@ -8,16 +19,11 @@
   - 1.0
   - 1.0
   - 1.0
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 # Desert
 - type: tile
   id: FloorDesert
+  parent: BaseFloorPlanet
   name: tiles-desert-floor
   sprite: /Textures/Tiles/Planet/Desert/desert.png
   variants: 6
@@ -28,12 +34,6 @@
   - 1.0
   - 1.0
   - 1.0
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 - type: tile
   id: FloorLowDesert
@@ -47,16 +47,11 @@
   - 1.0
   - 1.0
   - 1.0
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 # Grass
 - type: tile
   id: FloorPlanetGrass
+  parent: BaseFloorPlanet
   name: tiles-grass-planet-floor
   sprite: /Textures/Tiles/Planet/Grass/grass.png
   variants: 4
@@ -76,29 +71,20 @@
     North: /Textures/Tiles/Planet/Grass/double_edge.png
     West: /Textures/Tiles/Planet/Grass/double_edge.png
   baseTurf: FloorPlanetDirt
-  isSubfloor: true
   footstepSounds:
     collection: FootstepGrass
-  itemDrop: FloorTileItemGrass
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 # Lava
 - type: tile
   id: FloorBasalt
   name: tiles-basalt-floor
+  parent: BaseFloorPlanet
   sprite: /Textures/Tiles/Planet/basalt.png
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 # Snow
 - type: tile
   id: FloorSnow
+  parent: BaseFloorPlanet
   name: tiles-snow
   sprite: /Textures/Tiles/Planet/Snow/snow.png
   variants: 13
@@ -122,13 +108,9 @@
     East: /Textures/Tiles/Planet/Snow/snow_double_edge_east.png
     North: /Textures/Tiles/Planet/Snow/snow_double_edge_north.png
     West: /Textures/Tiles/Planet/Snow/snow_double_edge_west.png
-  isSubfloor: true
   itemDrop: FloorTileItemSnow # Delta V
   footstepSounds:
     collection: FootstepSnow
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 # Ice
 - type: tile
@@ -145,6 +127,7 @@
 # Dug snow
 - type: tile
   id: FloorSnowDug
+  parent: BaseFloorPlanet
   name: tiles-snow-dug
   sprite: /Textures/Tiles/Planet/Snow/snow_dug.png
   edgeSpritePriority: 1
@@ -153,11 +136,7 @@
     East: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_east.png
     North: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_north.png
     West: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_west.png
-  isSubfloor: true
   footstepSounds:
     collection: FootstepSnow
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
 
 # Wasteland
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 6d8609d80f..0b71e17c2c 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -1,17 +1,25 @@
 - type: tile
-  id: Plating
-  name: tiles-plating
-  sprite: /Textures/_DV/Tiles/plating.png #Delta V - Resprite Tile
-  baseTurf: Lattice
+  id: BasePlating
+  abstract: true
+  friction: 1.5
+  heatCapacity: 10000
   isSubfloor: true
   deconstructTools: [ Axing ] # DeltaV - The return of fireaxe prying
   footstepSounds:
     collection: FootstepPlating
-  friction: 1.5
-  heatCapacity: 10000
+  baseTurf: Lattice
+  baseWhitelist:
+    - TrainLattice
+
+- type: tile
+  id: Plating
+  parent: BasePlating
+  name: tiles-plating
+  sprite: /Textures/_DV/Tiles/plating.png #Delta V - Resprite Tile
 
 - type: tile
   id: PlatingDamaged
+  parent: BasePlating
   name: tiles-plating
   sprite: /Textures/Tiles/plating_damaged.png
   variants: 3
@@ -19,61 +27,25 @@
   - 1.0
   - 1.0
   - 1.0
-  baseTurf: Lattice
-  isSubfloor: true
-  deconstructTools: [ Axing ] # DeltaV - The return of fireaxe prying
-  footstepSounds:
-    collection: FootstepPlating
-  friction: 0.3
-  heatCapacity: 10000
-
-- type: tile
-  id: PlatingBurnt
-  name: tiles-plating
-  sprite: /Textures/Tiles/plating_burnt.png
-  baseTurf: Lattice
-  isSubfloor: true
-  deconstructTools: [ Axing ] # DeltaV - The return of fireaxe prying
-  footstepSounds:
-    collection: FootstepPlating
-  friction: 1.5
-  heatCapacity: 10000
 
 - type: tile
   id: PlatingAsteroid
+  parent: BasePlating
   name: tiles-asteroid-plating
   sprite: /Textures/Tiles/Asteroid/asteroid_plating.png
-  baseTurf: Lattice
-  isSubfloor: true
-  deconstructTools: [ Axing ] # DeltaV - The return of fireaxe prying
-  footstepSounds:
-    collection: FootstepPlating
-  friction: 1.5
-  heatCapacity: 10000
 
 - type: tile
   id: PlatingBrass
+  parent: BasePlating
   name: tiles-brass-plating
   sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
-  baseTurf: Lattice
-  isSubfloor: true
-  deconstructTools: [ Axing ] # DeltaV - The return of fireaxe prying
-  footstepSounds:
-    collection: FootstepPlating
-  friction: 1.5
-  heatCapacity: 10000
 
 - type: tile
   id: PlatingSnow
   name: tiles-snow-plating
+  parent: BasePlating
   sprite: /Textures/Tiles/snow_plating.png #Not in the snow planet RSI because it doesn't have any metadata. Should probably be moved to its own folder later.
-  baseTurf: Lattice
-  isSubfloor: true
-  deconstructTools: [ Axing ] # DeltaV - The return of fireaxe prying
-  footstepSounds:
-    collection: FootstepPlating
   friction: 0.75 #a little less then actual snow
-  heatCapacity: 10000
 
 - type: tile
   id: PlatingIronsand
@@ -104,16 +76,8 @@
 
 - type: tile
   id: TrainLattice
+  parent: Lattice
   name: tiles-lattice-train
   sprite: /Textures/Tiles/latticeTrain.png
-  baseTurf: Space
-  isSubfloor: true
-  deconstructTools: [ Cutting ]
-  weather: true
   footstepSounds:
     collection: FootstepPlating
-  friction: 1.5
-  isSpace: true
-  itemDrop: PartRodMetal1
-  heatCapacity: 10000
-  mass: 200

From 1c571adb68665d3c67f744b93920ad2da9970dd5 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 8 Feb 2026 09:00:55 +0100
Subject: [PATCH 297/360] Downstream fixes for #38898 (Station tile changes)

---
 Resources/Prototypes/_DV/Tiles/plating.yml       | 11 +++++++++++
 Resources/Prototypes/_Nuclear14/Tiles/floors.yml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/_DV/Tiles/plating.yml

diff --git a/Resources/Prototypes/_DV/Tiles/plating.yml b/Resources/Prototypes/_DV/Tiles/plating.yml
new file mode 100644
index 0000000000..dab7bb1ff1
--- /dev/null
+++ b/Resources/Prototypes/_DV/Tiles/plating.yml
@@ -0,0 +1,11 @@
+- type: tile
+  id: PlatingBurnt
+  name: tiles-plating
+  sprite: /Textures/Tiles/plating_burnt.png
+  baseTurf: Lattice
+  isSubfloor: true
+  deconstructTools: [ Axing ]
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 1.5
+  heatCapacity: 10000
diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml
index de2b82e549..fe6db26b63 100644
--- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml
+++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml
@@ -1635,7 +1635,7 @@
   sprite: /Textures/_Nuclear14/Tiles/wasteland.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurf: space
+  baseTurf: Space # Delta-V - Update due to upstream changes, was lowercase space
   isSubfloor: false
   footstepSounds:
     collection: N14FootstepDirt

From d43c3ba32f0aae8c6a84bec730e2039f89ba2a3d Mon Sep 17 00:00:00 2001
From: War__Prophet <tripwiregamer@gmail.com>
Date: Tue, 13 Jan 2026 08:07:20 -0600
Subject: [PATCH 298/360] WYA to Where you at (#42350)

* god is dead

* bro

* Update speech-chatsan.ftl
---
 Resources/Locale/en-US/speech/speech-chatsan.ftl   | 3 +++
 Resources/Prototypes/Accents/word_replacements.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 8002360813..93168a5692 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -193,3 +193,6 @@ chatsan-replacement-67 = all good
 # Delta V - Replaced idk to do /me shrugs as per issue 5151
 # chatsan-word-68 = idk
 # chatsan-replacement-68 = i don't know
+
+chatsan-word-69 = wya
+chatsan-replacement-69 = where you at
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index eff31c67a1..b4f1f223b0 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -449,6 +449,7 @@
     chatsan-word-66: chatsan-replacement-66
     chatsan-word-67: chatsan-replacement-67
     # chatsan-word-68: chatsan-replacement-68 # DeltaV - Changed idk chatsan back to /me shrugs as per #5151
+    chatsan-word-69: chatsan-replacement-69 # :godo:
 
 - type: accent
   id: liar

From a1c9b4ee3bad929d4205fed222fc4671cdd03d1d Mon Sep 17 00:00:00 2001
From: ConstantlyConfused
 <67894661+Eternally-Confused@users.noreply.github.com>
Date: Tue, 13 Jan 2026 08:11:44 -0600
Subject: [PATCH 299/360] A handful of typo fixes (#42396)

fix a handful of typos
---
 Resources/Locale/en-US/alerts/alerts.ftl          | 2 +-
 Resources/Locale/en-US/reagents/meta/medicine.ftl | 2 +-
 Resources/Locale/en-US/store/uplink-catalog.ftl   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 9593b01321..3be836ed70 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -11,7 +11,7 @@ alerts-low-pressure-name = [color=red]Low Pressure[/color]
 alerts-low-pressure-desc = The air around you is [color=red]hazardously thin[/color]. A [color=green]space suit[/color] would protect you.
 
 alerts-high-pressure-name = [color=red]High Pressure[/color]
-alerts-high-pressure-desc = The air around you is [color=red]hazardously thick[/color]. A [color=green]pressurized suit[/color] would be enough protect you.
+alerts-high-pressure-desc = The air around you is [color=red]hazardously thick[/color]. A [color=green]pressurized suit[/color] would be enough to protect you.
 
 alerts-on-fire-name = [color=red]On Fire[/color]
 alerts-on-fire-desc = You're [color=red]on fire[/color]. Click the alert to stop, drop and roll to put the fire out or move to a vacuum area.
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index d088cab41f..25602f6215 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -111,7 +111,7 @@ reagent-name-saline = saline
 reagent-desc-saline = A mixture of salt and water. Commonly used to treat dehydration or low fluid presence in blood.
 
 reagent-name-lacerinol = lacerinol
-reagent-desc-lacerinol = A fairly unreactive chemical that boosts collagen sythesis to incredible levels, healing slash trauma.
+reagent-desc-lacerinol = A fairly unreactive chemical that boosts collagen synthesis to incredible levels, healing slash trauma.
 
 reagent-name-puncturase = puncturase
 reagent-name-puncturase-tranexamic = puncturase & tranexamic
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 5d6b764cd0..fedcab4599 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -482,7 +482,7 @@ uplink-barber-scissors-name = Barber Scissors
 uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself.
 
 uplink-backpack-syndicate-name = Syndicate backpack
-uplink-backpack-syndicate-desc = A lightweight explosion-proof backpack for holding various traitor goods
+uplink-backpack-syndicate-desc = A lightweight explosion-proof backpack for holding various traitor goods.
 
 uplink-cameraBug-name = Camera bug
 uplink-cameraBug-desc = A portable device that allows you to view the station's cameras.

From 7e8ded7fc06abaf199ef3e71a40180698c9ef151 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:50:30 +0100
Subject: [PATCH 300/360] Buff throwing knives kit (#42391)

init
---
 Resources/Locale/en-US/store/uplink-catalog.ftl             | 2 +-
 Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml      | 6 +++---
 .../Prototypes/Entities/Objects/Weapons/Melee/knife.yml     | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index fedcab4599..adaf1f3bde 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -246,7 +246,7 @@ uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes two vials of vestine for all your criminal needs!
 
 uplink-knives-kit-name = Throwing Knives Kit
-uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. Capable of ignoring armor entirely when thrown.
+uplink-knives-kit-desc = A set of 8 syndicate branded throwing knives, perfect for embedding into the body of your victims. Capable of ignoring armor entirely when thrown.
 
 uplink-meds-bundle-name = Interdyne Medical Bundle
 uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index c2578294de..7fcfbf2110 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -57,16 +57,16 @@
   parent: [BoxCardboard, BaseSyndicateContraband]
   id: ThrowingKnivesKit
   name: throwing knives kit
-  description: A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+  description: A set of 8 syndicate branded throwing knives, perfect for embedding into the body of your victims.
   components:
   - type: Storage
     grid:
-    - 0,0,3,1
+    - 0,0,3,3
   - type: EntityTableContainerFill
     containers:
       storagebase:
         id: ThrowingKnife
-        amount: 4
+        amount: 8
   - type: Sprite
     layers:
       - state: box_of_doom
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 8a38f20cf2..522a81a94e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -358,6 +358,7 @@
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
     offset: -0.15,0.0
+    removalTime: 1.5
   - type: LandAtCursor
   - type: DamageOtherOnHit
     ignoreResistances: true
@@ -370,7 +371,7 @@
   - type: ThrowingAngle
     angle: 225
   - type: StaticPrice
-    price: 500 # 2000 for a set of 4
+    price: 500 # 4000 for a set of 8
   - type: Fixtures
     fixtures:
       fix1:

From 1bbbd161b819c7f9ed00482eb611fe4fb45ca853 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:56:05 +0100
Subject: [PATCH 301/360] Fix scram allowing you to bring someone along
 (#42393)

1 line bugfix
---
 Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
index eded400712..cd79eed13b 100644
--- a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
@@ -25,7 +25,7 @@ public sealed class ScramOnTriggerSystem : XOnTriggerSystem<ScramOnTriggerCompon
         // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
         // This can for example happen when the user is cuffed and being pulled.
         if (TryComp<PullableComponent>(target, out var pull) && _pulling.IsPulled(target, pull))
-            _pulling.TryStopPull(ent, pull);
+            _pulling.TryStopPull(target, pull);
 
         // Check if the user is pulling anything, and drop it if so.
         if (TryComp<PullerComponent>(target, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))

From 4204e1eefff68746dc58e90e2c505abf2d0b7f9c Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Tue, 13 Jan 2026 19:17:22 +0100
Subject: [PATCH 302/360] Viper High Capacity Ammo (#42392)

* yeah

* Fix sprite & let mk58 use the mag

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---
 Resources/Locale/en-US/store/uplink-catalog.ftl |   2 +-
 Resources/Prototypes/Catalog/uplink_catalog.yml |   4 ++--
 .../Guns/Ammunition/Magazines/pistol.yml        |   8 ++++----
 .../Objects/Weapons/Guns/Pistols/pistols.yml    |   3 ++-
 .../pistol_high_capacity_mag.rsi/base-icon.png  | Bin 0 -> 15145 bytes
 .../pistol_high_capacity_mag.rsi/meta.json      |   5 ++++-
 6 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index adaf1f3bde..abaf053f47 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -93,7 +93,7 @@ uplink-shrapnel-grenade-desc = Launches a spray of sharp fragments dealing great
 
 # Ammo
 uplink-pistol-magazine-name = Pistol Magazine (.35 auto)
-uplink-pistol-magazine-desc = Pistol magazine with 10 cartridges. Compatible with the Viper.
+uplink-pistol-magazine-desc = Pistol magazine with 15 cartridges. Compatible with the Viper.
 
 uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto)
 uplink-pistol-magazine-c20r-desc = SMG magazine with 30 cartridges. Compatible with C-20r.
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 84332fb1a3..8b016f0a47 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -524,8 +524,8 @@
   id: UplinkPistol9mmMagazine
   name: uplink-pistol-magazine-name
   description: uplink-pistol-magazine-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
-  productEntity: MagazinePistol
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: base-icon }
+  productEntity: MagazinePistolHighCapacity
   cost:
     Telecrystal: 1
   categories:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 146aae1447..66dca35032 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -45,7 +45,7 @@
     whitelist:
       tags:
         - CartridgePistol
-    capacity: 20 # Delta-V, was 16
+    capacity: 20 # Delta-V, was 15
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -397,7 +397,7 @@
   id: MagazinePistolHighCapacityEmpty
   name: machine pistol magazine (.35 auto any)
   suffix: empty
-  description: Custom 16-round double-stack magazine for the Viper pistol.
+  description: Custom 15-round double-stack magazine for the Viper pistol.
   components:
   - type: BallisticAmmoProvider
     proto: null
@@ -418,7 +418,7 @@
   parent: BaseMagazinePistolHighCapacity
   id: MagazinePistolHighCapacity
   name: machine pistol magazine (.35 auto)
-  description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition.
+  description: Custom 15-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistol
@@ -439,7 +439,7 @@
   parent: BaseMagazinePistolHighCapacity
   id: MagazinePistolHighCapacityPractice
   name: machine pistol magazine (.35 auto practice)
-  description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition.
+  description: Custom 15-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 6dd8977341..c00789d0ca 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -49,6 +49,7 @@
         whitelist:
           tags:
             - MagazinePistol
+            - MagazinePistolHighCapacity
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
@@ -85,7 +86,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazinePistol
+        startingItem: MagazinePistolHighCapacity
         insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
         priority: 2
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..40b0988c3ec594d5a34095739086046a48d38257
GIT binary patch
literal 15145
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
OU~FU}`|hJhUicdttbDit

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
index 4a31ca1326..1bab5b591e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github), base-icon made via base combined with mag-5 by SlamBamActionman (github)",
     "states": [
         {
             "name": "base"
@@ -43,6 +43,9 @@
         {
             "name": "inhand-right-stripe",
             "directions": 4
+        },
+        {
+            "name": "base-icon"
         }
     ]
 }

From 969997a693782bb0166b76699782876ba1fc4b28 Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Tue, 13 Jan 2026 23:08:45 +0100
Subject: [PATCH 303/360] Pry open critical Borgs (#42319)

* One commit ops

* Please the maintainer gods

* More requested changes

* review

* actually this is probably a good idea

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 .../Components/BypassLockComponent.cs         |  25 ++++
 .../BypassLockRequiresMobStateComponent.cs    |  18 +++
 .../Systems/BypassLockSystem.MobState.cs      |  41 ++++++
 .../BypassLock/Systems/BypassLockSystem.cs    | 132 ++++++++++++++++++
 .../en-US/lock/bypass-lock-component.ftl      |   4 +
 .../Mobs/Cyborgs/base_borg_chassis.yml        |  12 +-
 6 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs
 create mode 100644 Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs
 create mode 100644 Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs
 create mode 100644 Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs
 create mode 100644 Resources/Locale/en-US/lock/bypass-lock-component.ftl

diff --git a/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs b/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs
new file mode 100644
index 0000000000..38c6275d86
--- /dev/null
+++ b/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Lock.BypassLock.Systems;
+using Content.Shared.Tools;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Lock.BypassLock.Components;
+
+/// <summary>
+/// This component lets the lock on this entity be pried open when the entity is in critical or dead state.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(BypassLockSystem))]
+public sealed partial class BypassLockComponent : Component
+{
+    /// <summary>
+    /// The tool quality needed to bypass the lock.
+    /// </summary>
+    [DataField]
+    public ProtoId<ToolQualityPrototype> BypassingTool = "Prying";
+
+    /// <summary>
+    /// Amount of time in seconds it takes to bypass
+    /// </summary>
+    [DataField]
+    public TimeSpan BypassDelay = TimeSpan.FromSeconds(5f);
+}
diff --git a/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs b/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs
new file mode 100644
index 0000000000..7e40a8fcd5
--- /dev/null
+++ b/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Lock.BypassLock.Systems;
+using Content.Shared.Mobs;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock.BypassLock.Components;
+
+/// <summary>
+/// This component lets the lock on this entity be pried open when the entity is in critical or dead state.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(BypassLockSystem))]
+public sealed partial class BypassLockRequiresMobStateComponent : Component
+{
+    /// <summary>
+    /// The mobstate where the lock can be bypassed.
+    /// </summary>
+    [DataField]
+    public HashSet<MobState> RequiredMobState = [];
+}
diff --git a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs
new file mode 100644
index 0000000000..02ec502004
--- /dev/null
+++ b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Lock.BypassLock.Components;
+using Content.Shared.Mobs.Components;
+
+namespace Content.Shared.Lock.BypassLock.Systems;
+
+public sealed partial class BypassLockSystem
+{
+    private void InitializeMobStateLockSystem()
+    {
+        SubscribeLocalEvent<BypassLockRequiresMobStateComponent, ForceOpenLockAttemptEvent>(OnForceOpenLockAttempt);
+        SubscribeLocalEvent<BypassLockRequiresMobStateComponent, CheckBypassLockVerbRequirements>(OnGetVerb);
+    }
+
+    private void OnForceOpenLockAttempt(Entity<BypassLockRequiresMobStateComponent> target, ref ForceOpenLockAttemptEvent args)
+    {
+        if (!TryComp<MobStateComponent>(target, out var mobState))
+            return;
+
+        args.CanForceOpen &= target.Comp.RequiredMobState.Contains(mobState.CurrentState);
+    }
+
+    private void OnGetVerb(Entity<BypassLockRequiresMobStateComponent> target, ref CheckBypassLockVerbRequirements args)
+    {
+        if (!TryComp<MobStateComponent>(target, out var mobState))
+            return;
+
+        // Only show disabled verb on a too healthy target when they have the right tool.
+        if (!target.Comp.RequiredMobState.Contains(mobState.CurrentState) && args.RightTool)
+        {
+            args.Verb.Disabled = true;
+            args.Verb.Message = Loc.GetString("bypass-lock-disabled-healthy");
+        }
+        // Show verb of using the wrong tool when the target is critical.
+        else if (target.Comp.RequiredMobState.Contains(mobState.CurrentState) && !args.RightTool)
+        {
+            args.ShowVerb = true;
+            args.Verb.Disabled = true;
+            args.Verb.Message = Loc.GetString("bypass-lock-disabled-wrong-tool", ("quality", args.ToolQuality.ToString().ToLower()));
+        }
+    }
+}
diff --git a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs
new file mode 100644
index 0000000000..1dcc4ee74a
--- /dev/null
+++ b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs
@@ -0,0 +1,132 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Lock.BypassLock.Components;
+using Content.Shared.Tools;
+using Content.Shared.Tools.Systems;
+using Content.Shared.Verbs;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Lock.BypassLock.Systems;
+
+public sealed partial class BypassLockSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly LockSystem _lock = default!;
+    [Dependency] private readonly SharedToolSystem _tool = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BypassLockComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<LockComponent, ForceOpenLockDoAfterEvent>(OnBypassAccessDoAfterEvent);
+        SubscribeLocalEvent<BypassLockComponent, GetVerbsEvent<InteractionVerb>>(OnGetVerb);
+
+        InitializeMobStateLockSystem();
+    }
+
+    private void OnInteractUsing(Entity<BypassLockComponent> target, ref InteractUsingEvent args)
+    {
+        if (target.Owner == args.User)
+            return;
+        
+        if (!_tool.HasQuality(args.Used, target.Comp.BypassingTool)
+            || !_lock.IsLocked(target.Owner))
+            return;
+
+        var ev = new ForceOpenLockAttemptEvent(args.User);
+        RaiseLocalEvent(target.Owner, ref ev);
+
+        if (!ev.CanForceOpen)
+            return;
+
+        args.Handled = TryStartDoAfter(target, args.User, args.Used);
+    }
+
+    private bool TryStartDoAfter(Entity<BypassLockComponent> target, EntityUid user, EntityUid used)
+    {
+        if (!_tool.UseTool(
+                used,
+                user,
+                target,
+                (float) target.Comp.BypassDelay.TotalSeconds,
+                target.Comp.BypassingTool,
+                new ForceOpenLockDoAfterEvent()))
+        {
+            return false;
+        }
+
+        _adminLogger.Add(LogType.Action, LogImpact.Low,
+            $"{ToPrettyString(user):user} is prying {ToPrettyString(target):target}'s lock open at {Transform(target).Coordinates:targetlocation}");
+        return true;
+    }
+
+    private void OnBypassAccessDoAfterEvent(Entity<LockComponent> target, ref ForceOpenLockDoAfterEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        _lock.Unlock(target, args.User, target.Comp);
+    }
+
+    private void OnGetVerb(Entity<BypassLockComponent> target, ref GetVerbsEvent<InteractionVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Using == null)
+            return;
+
+        var rightTool = _tool.HasQuality(args.Using.Value, target.Comp.BypassingTool);
+        var item = args.Using.Value;
+        var bypassVerb = new InteractionVerb
+        {
+            IconEntity = GetNetEntity(item),
+        };
+
+        bypassVerb.Text = bypassVerb.Message = Loc.GetString("bypass-lock-verb");
+
+        var ev = new CheckBypassLockVerbRequirements(bypassVerb, rightTool, rightTool, target.Comp.BypassingTool);
+        RaiseLocalEvent(target, ref ev);
+
+        if (!ev.ShowVerb)
+            return;
+
+        var user = args.User;
+
+        bypassVerb.Act = () => TryStartDoAfter(target, user, item);
+
+        if (!_lock.IsLocked(target.Owner))
+        {
+            bypassVerb.Disabled = true;
+            bypassVerb.Message = Loc.GetString("bypass-lock-disabled-already-open");
+        }
+
+        args.Verbs.Add(bypassVerb);
+    }
+}
+
+/// <summary>
+/// This event gets raised on the entity with the <see cref="BypassLockRequiresMobStateComponent"/> after someone finished
+/// a doafter forcing the lock open.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ForceOpenLockDoAfterEvent : SimpleDoAfterEvent;
+
+/// <summary>
+/// This gets raised on the target whose lock is attempted to be forced open.
+/// </summary>
+/// <param name="User">Entity attempting to open this.</param>
+/// <param name="CanForceOpen">Whether the lock can be forced open.</param>
+[ByRefEvent]
+public record struct ForceOpenLockAttemptEvent(EntityUid User, bool CanForceOpen = true);
+
+/// <summary>
+/// This gets raised on the target that is being right-clicked to check for verb requirements.
+/// </summary>
+/// <param name="Verb">The interaction verb that will be shown.</param>
+/// <param name="RightTool">Whether the tool has the right properties to force the lock open.</param>
+/// <param name="ShowVerb">Whether the verb should be shown.</param>
+/// <param name="ToolQuality">The required tool quality to force the lock open.</param>
+[ByRefEvent]
+public record struct CheckBypassLockVerbRequirements(InteractionVerb Verb, bool RightTool, bool ShowVerb, ProtoId<ToolQualityPrototype> ToolQuality);
diff --git a/Resources/Locale/en-US/lock/bypass-lock-component.ftl b/Resources/Locale/en-US/lock/bypass-lock-component.ftl
new file mode 100644
index 0000000000..d37996041d
--- /dev/null
+++ b/Resources/Locale/en-US/lock/bypass-lock-component.ftl
@@ -0,0 +1,4 @@
+bypass-lock-verb = Force open the access lock
+bypass-lock-disabled-healthy = The lock needs to be damaged further before it can be forced open.
+bypass-lock-disabled-wrong-tool = This lock requires {$quality} to be forced open.
+bypass-lock-disabled-already-open = The lock is already open.
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index fbff177f89..7f1a7cc184 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -120,7 +120,6 @@
       - BorgChassis
       - RoboticsConsole
   - type: WiresPanel
-    openingTool: Prying
   - type: ActivatableUIRequiresPanel
   - type: NameIdentifier
     group: Silicon
@@ -278,6 +277,11 @@
       groups:
         Electronic: -0.5
   - type: SiliconEmp # DeltaV - EMP damage
+  - type: BypassLock
+  - type: BypassLockRequiresMobState
+    requiredMobState:
+    - Critical
+    - Dead
 
 - type: entity
   abstract: true
@@ -402,6 +406,8 @@
     color: "#dd200b"
   - type: Fiber # DeltaV - syndiborgs have black plasteel fibers
     fiberColor: fibers-black
+  - type: BypassLock
+    bypassDelay: 15 # We don't want people to easily be able to remove syndieborg brains.
 
 - type: entity
   id: BaseBorgChassisDerelict
@@ -463,6 +469,8 @@
       Unsexed: UnisexSiliconSyndicate
   - type: PointLight
     color: "#dd200b"
+  - type: BypassLock
+    bypassDelay: 15 # We don't want people to easily be able to remove syndieborg brains.
 
 - type: entity
   parent: BaseBorgChassisNotIonStormable
@@ -588,3 +596,5 @@
   - type: Fiber # DeltaV - xenoborgs have replicated plasteel fibers
     fiberMaterial: fibers-replicated-plasteel
   - type: Xenoborg
+  - type: BypassLock
+    bypassDelay: 15 # We don't want people to easily be able to remove xenoborg brains.

From f2124ce549ecbb37e4cb49eddb0ba261edfa862c Mon Sep 17 00:00:00 2001
From: Sarah C <93578146+SapphicOverload@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:16:09 -0500
Subject: [PATCH 304/360] Fix tritium fires breaking conservation of mass
 (#41870)

* i can't believe this went unnoticed for so long

* i may be stupid
---
 Content.Server/Atmos/Reactions/TritiumFireReaction.cs | 7 ++++---
 Content.Shared/Atmos/Atmospherics.cs                  | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
index 8b7d4e4872..45443b5a86 100644
--- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
@@ -27,12 +27,13 @@ namespace Content.Server.Atmos.Reactions
                     burnedFuel = initialTrit;
 
                 mixture.AdjustMoles(Gas.Tritium, -burnedFuel);
+                mixture.AdjustMoles(Gas.Oxygen, -burnedFuel / Atmospherics.TritiumBurnFuelRatio);
             }
             else
             {
-                burnedFuel = initialTrit;
-                mixture.SetMoles(Gas.Tritium, mixture.GetMoles(Gas.Tritium ) * (1 - 1 / Atmospherics.TritiumBurnTritFactor));
-                mixture.AdjustMoles(Gas.Oxygen, -mixture.GetMoles(Gas.Tritium));
+                burnedFuel = Math.Max(initialTrit, mixture.GetMoles(Gas.Oxygen) / Atmospherics.TritiumBurnFuelRatio) / Atmospherics.TritiumBurnTritFactor;
+                mixture.AdjustMoles(Gas.Tritium, -burnedFuel);
+                mixture.AdjustMoles(Gas.Oxygen, -burnedFuel / Atmospherics.TritiumBurnFuelRatio);
                 energyReleased += (Atmospherics.FireHydrogenEnergyReleased * burnedFuel * (Atmospherics.TritiumBurnTritFactor - 1));
             }
 
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 5d4741fb73..808b58353a 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -240,6 +240,7 @@ namespace Content.Shared.Atmos
 
         public const float TritiumBurnOxyFactor = 100f;
         public const float TritiumBurnTritFactor = 10f;
+        public const float TritiumBurnFuelRatio = 2f;
 
         public const float FrezonCoolLowerTemperature = 23.15f;
 

From 3a14020a2f2dbf3eb00adda11bd162c3c7429fa5 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 13 Jan 2026 15:06:59 -0800
Subject: [PATCH 305/360] AirtightSystem Tests (#42190)

---
 .../Tests/Atmos/AirtightTest.cs               | 585 ++++++++++++++++++
 .../Atmos/Components/AirtightComponent.cs     |  19 +-
 .../Atmos/EntitySystems/AirtightSystem.cs     |   5 +-
 .../EntitySystems/AtmosphereSystem.API.cs     |   4 +
 4 files changed, 607 insertions(+), 6 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Atmos/AirtightTest.cs

diff --git a/Content.IntegrationTests/Tests/Atmos/AirtightTest.cs b/Content.IntegrationTests/Tests/Atmos/AirtightTest.cs
new file mode 100644
index 0000000000..63e4d9f2d2
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/AirtightTest.cs
@@ -0,0 +1,585 @@
+using System.Numerics;
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+/// <summary>
+/// Mega-testclass for testing <see cref="AirtightSystem"/> and <see cref="AirtightComponent"/>.
+/// </summary>
+[TestOf(typeof(AirtightSystem))]
+[TestOf(typeof(AtmosphereSystem))]
+public sealed class AirtightTest : AtmosTest
+{
+    // Load the same DeltaPressure test because it's quite a useful testmap for testing airtightness.
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
+
+    private readonly EntProtoId _wallProto = new("WallSolid");
+
+    private EntityUid _targetWall = EntityUid.Invalid;
+    private EntityUid _targetRotationEnt = EntityUid.Invalid;
+
+    #region Prototypes
+
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: AirtightDirectionalRotationTest
+  parent: WindowDirectional
+  components:
+  - type: Airtight
+    airBlockedDirection: North
+    fixAirBlockedDirectionInitialize: true
+    noAirWhenFullyAirBlocked: false
+";
+
+    #endregion
+
+    #region Component and Helper Assertions
+
+    /*
+     Tests for asserting that proper ComponentInit and other events properly work.
+     */
+
+    [Test]
+    public async Task Component_InitDataCorrect()
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, Vector2.Zero);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        SEntMan.TryGetComponent<AirtightComponent>(_targetWall, out var airtightComp);
+        Assert.That(airtightComp, Is.Not.Null, "Expected spawned wall entity to have AirtightComponent.");
+
+        // The data on the component itself should reflect full blockage.
+        // It should also hold the proper last position.
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(airtightComp.AirBlockedDirection, Is.EqualTo(AtmosDirection.All));
+            Assert.That(airtightComp.LastPosition, Is.EqualTo((RelevantAtmos.Owner, Vector2i.Zero)));
+        }
+    }
+
+    [Test]
+    [TestCase(AtmosDirection.North)]
+    [TestCase(AtmosDirection.South)]
+    [TestCase(AtmosDirection.East)]
+    [TestCase(AtmosDirection.West)]
+    public async Task MultiTile_Component_InitDataCorrect(AtmosDirection direction)
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        var offsetVec = Vector2i.Zero.Offset(direction);
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, offsetVec);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        SEntMan.TryGetComponent<AirtightComponent>(_targetWall, out var airtightComp);
+        Assert.That(airtightComp, Is.Not.Null, "Expected spawned wall entity to have AirtightComponent.");
+
+        // The data on the component itself should reflect full blockage.
+        // It should also hold the proper last position.
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(airtightComp.AirBlockedDirection, Is.EqualTo(AtmosDirection.All));
+            Assert.That(airtightComp.LastPosition, Is.EqualTo((RelevantAtmos.Owner, offsetVec)));
+        }
+    }
+
+    #endregion
+
+    #region Single Tile Assertion
+
+    /*
+     Tests for asserting single tile airtightness state on both reconstructed and cached data.
+     These tests just spawn a wall in the center and make sure that both reconstructed and cached
+     airtight data reflect the expected states both immediately after the action and after an atmos tick.
+     */
+
+    /// <summary>
+    /// Tests that the reconstructed airtight map reflects properly when an airtight entity is spawned.
+    /// </summary>
+    [Test]
+    public async Task Spawn_ReconstructedUpdatesImmediately()
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // Before an entity is spawned, the tile in question should be completely unblocked.
+        // This should be reflected in a reconstruction.
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(
+                SAtmos.IsTileAirBlocked(ProcessEnt.Owner, Vector2i.Zero, mapGridComp: ProcessEnt.Comp3),
+                Is.False,
+                "Expected no airtightness for reconstructed AirtightData before spawning an airtight entity.");
+        }
+
+        // We cannot use the Spawn InteractionTest helper because it runs ticks,
+        // which invalidate testing for cached data (ticks would update the cache).
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, Vector2.Zero);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        // Now, immediately after spawn, the reconstructed data should reflect airtightness.
+        Assert.That(
+            SAtmos.IsTileAirBlocked(ProcessEnt.Owner, Vector2i.Zero, mapGridComp: ProcessEnt.Comp3),
+            Is.True,
+            "Expected airtightness for reconstructed AirtightData immediately after spawn.");
+    }
+
+    /// <summary>
+    /// Tests that the AirtightData cache updates properly when an airtight entity is spawned.
+    /// </summary>
+    [Test]
+    public async Task Spawn_CacheUpdatesOnAtmosTick()
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // Space should be blank before spawn.
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(
+                SAtmos.IsTileAirBlockedCached(RelevantAtmos, Vector2i.Zero),
+                Is.False,
+                "Expected cached AirtightData to be unblocked before spawning an airtight entity.");
+
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected tile to be completely unblocked before spawning an airtight entity.");
+
+            Assert.That(tile.AirtightData.BlockedDirections,
+                Is.EqualTo(AtmosDirection.Invalid),
+                "Expected AirtightData to reflect non-airtight state before spawning an airtight entity.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+            }
+        }
+
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, Vector2.Zero);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        // Now, immediately after spawn, the reconstructed data should reflect airtightness,
+        // but the cached data should still be stale.
+        // This goes the same for the references, which haven't been updated, as well as the AirtightData.
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(
+                SAtmos.IsTileAirBlockedCached(RelevantAtmos, Vector2i.Zero),
+                Is.False,
+                "Expected cached AirtightData to remain stale immediately after spawn before atmos tick.");
+
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected tile to still show non-airtight state before an atmos tick.");
+
+            Assert.That(tile.AirtightData.BlockedDirections,
+                Is.EqualTo(AtmosDirection.Invalid),
+                "Expected AirtightData to reflect non-airtight state after spawn before an atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+            }
+        }
+
+        // Tick to update cache.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(
+                SAtmos.IsTileAirBlocked(ProcessEnt.Owner, Vector2i.Zero, mapGridComp: ProcessEnt.Comp3),
+                Is.True,
+                "Expected airtightness for reconstructed AirtightData after atmos tick.");
+
+            Assert.That(
+                SAtmos.IsTileAirBlockedCached(RelevantAtmos, Vector2i.Zero),
+                Is.True,
+                "Expected cached AirtightData to reflect airtightness after atmos tick.");
+
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.Invalid),
+                "Expected tile to reflect airtight state after atmos tick.");
+
+            Assert.That(tile.AirtightData.BlockedDirections,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected AirtightData to reflect airtight state after spawn before an atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Null, $"Center tile holds unexpected reference to adjacent tile in direction {direction}.");
+            }
+        }
+    }
+
+    /// <summary>
+    /// Tests that an airtight reconstruction reflects properly after an entity is deleted.
+    /// </summary>
+    [Test]
+    public async Task Delete_ReconstructedUpdatesImmediately()
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, Vector2.Zero);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        Assert.That(
+            SAtmos.IsTileAirBlocked(ProcessEnt.Owner, Vector2i.Zero, mapGridComp: ProcessEnt.Comp3),
+            Is.True,
+            "Expected airtightness for reconstructed AirtightData before deletion.");
+
+        await Server.WaitPost(delegate
+        {
+            SEntMan.DeleteEntity(_targetWall);
+        });
+
+        Assert.That(
+            SAtmos.IsTileAirBlocked(ProcessEnt.Owner, Vector2i.Zero, mapGridComp: ProcessEnt.Comp3),
+            Is.False,
+            "Expected no airtightness for reconstructed AirtightData immediately after deletion.");
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        Assert.That(
+            SAtmos.IsTileAirBlocked(ProcessEnt.Owner, Vector2i.Zero, mapGridComp: ProcessEnt.Comp3),
+            Is.False,
+            "Expected no airtightness for reconstructed AirtightData after atmos tick.");
+    }
+
+    /// <summary>
+    /// Tests that the cached airtight map reflects properly when an entity is deleted
+    /// </summary>
+    [Test]
+    public async Task Delete_CacheUpdatesOnAtmosTick()
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, Vector2.Zero);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitPost(delegate
+        {
+            SEntMan.DeleteEntity(_targetWall);
+        });
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(
+                SAtmos.IsTileAirBlockedCached(RelevantAtmos, Vector2i.Zero),
+                Is.True,
+                "Expected cached AirtightData to remain stale immediately after deletion before atmos tick.");
+
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.Invalid),
+                "Expected tile to still show airtight state before atmos tick after deletion.");
+
+            Assert.That(tile.AirtightData.BlockedDirections,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected AirtightData to reflect non-airtight state before after deletion before an atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Null, $"Center tile holds unexpected reference to adjacent tile in direction {direction}.");
+            }
+        }
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(
+                SAtmos.IsTileAirBlockedCached(RelevantAtmos, Vector2i.Zero),
+                Is.False,
+                "Expected cached AirtightData to reflect deletion after atmos tick.");
+
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected tile to reflect non-airtight state after atmos tick.");
+
+            Assert.That(tile.AirtightData.BlockedDirections,
+                Is.EqualTo(AtmosDirection.Invalid),
+                "Expected AirtightData to reflect non-airtight state after atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+            }
+        }
+    }
+
+    #endregion
+
+    #region Multi-Tile Assertion
+
+    /*
+     Tests for asserting multi-tile airtightness state on cached data.
+     These tests spawn multiple entities and check that the center unblocked entity
+     properly reflects partial airtightness states.
+
+     Note that reconstruction won't save you in the case where you're surrounded by airtight entities,
+     as those don't show up in the reconstruction. Thus, only cached data tests are done here.
+     */
+
+    /// <summary>
+    /// Tests that the cached airtight map reflects properly when airtight entities are spawned
+    /// along the cardinal directions.
+    /// </summary>
+    /// <param name="atmosDirection">The direction to spawn the airtight entity in.</param>
+    [Test]
+    [TestCase(AtmosDirection.North)]
+    [TestCase(AtmosDirection.South)]
+    [TestCase(AtmosDirection.East)]
+    [TestCase(AtmosDirection.West)]
+    public async Task MultiTile_Spawn_CacheUpdatesOnAtmosTick(AtmosDirection atmosDirection)
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // Tile should be completely unblocked.
+        using (Assert.EnterMultipleScope())
+        {
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected tile to be completely unblocked before spawning an airtight entity.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+            }
+        }
+
+        await Server.WaitPost(delegate
+        {
+            var offsetVec = Vector2i.Zero.Offset(atmosDirection);
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, offsetVec);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        using (Assert.EnterMultipleScope())
+        {
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected tile to still show non-airtight state before an atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+            }
+        }
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        using (Assert.EnterMultipleScope())
+        {
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All & ~atmosDirection),
+                "Expected tile to reflect airtight state after atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                if (direction == atmosDirection)
+                {
+                    Assert.That(curTile, Is.Null, $"Center tile holds unexpected reference to adjacent tile in direction {direction}.");
+                }
+                else
+                {
+                    Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Tests that the cached airtight map reflects properly when an airtight entity is deleted
+    /// along a cardinal direction.
+    /// </summary>
+    /// <param name="atmosDirection">The direction the airtight entity is spawned and then deleted in.</param>
+    [Test]
+    [TestCase(AtmosDirection.North)]
+    [TestCase(AtmosDirection.South)]
+    [TestCase(AtmosDirection.East)]
+    [TestCase(AtmosDirection.West)]
+    public async Task MultiTile_Delete_CacheUpdatesOnAtmosTick(AtmosDirection atmosDirection)
+    {
+        // Ensure grid/atmos is initialized.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitPost(delegate
+        {
+            var offsetVec = Vector2i.Zero.Offset(atmosDirection);
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, offsetVec);
+            _targetWall = SEntMan.SpawnAtPosition(_wallProto, coords);
+        });
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitPost(delegate
+        {
+            SEntMan.DeleteEntity(_targetWall);
+        });
+
+        using (Assert.EnterMultipleScope())
+        {
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All & ~atmosDirection),
+                "Expected tile to remain stale immediately after deletion before an atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                if (direction == atmosDirection)
+                {
+                    Assert.That(curTile, Is.Null, $"Center tile holds unexpected reference to adjacent tile in direction {direction}.");
+                }
+                else
+                {
+                    Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+                }
+            }
+        }
+
+        // Tick to update cache after deletion.
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        using (Assert.EnterMultipleScope())
+        {
+            var tile = RelevantAtmos.Comp.Tiles[Vector2i.Zero];
+            Assert.That(tile.AdjacentBits,
+                Is.EqualTo(AtmosDirection.All),
+                "Expected tile to reflect non-airtight state after deletion after atmos tick.");
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                var curTile = tile.AdjacentTiles[i];
+                Assert.That(curTile, Is.Not.Null, $"Center tile does not hold expected reference to adjacent tile in direction {direction}.");
+            }
+        }
+    }
+
+    #endregion
+
+    #region Rotation Assertion
+
+    /// <summary>
+    /// Asserts that an airtight entity with a directional air blocked direction
+    /// properly reflects rotation on spawn.
+    /// </summary>
+    /// <param name="degrees">The degrees to rotate the entity on spawn.</param>
+    /// <param name="expected">The expected blocked direction after rotation.</param>
+    /// <remarks>Yeah, so here I learned that RT handles rotation directions
+    /// as positive == counterclockwise.</remarks>
+    [Test]
+    [TestCase(0f, AtmosDirection.North)]
+    [TestCase(90f, AtmosDirection.West)]
+    [TestCase(180f, AtmosDirection.South)]
+    [TestCase(270f, AtmosDirection.East)]
+    [TestCase(-90f, AtmosDirection.East)]
+    [TestCase(-180f, AtmosDirection.South)]
+    [TestCase(-270f, AtmosDirection.West)]
+    public async Task Rotation_AirBlockedDirectionsOnSpawn(float degrees, AtmosDirection expected)
+    {
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        var rotation = Angle.FromDegrees(degrees);
+
+        await Server.WaitPost(delegate
+        {
+            var coords = new EntityCoordinates(RelevantAtmos.Owner, Vector2.Zero);
+            _targetRotationEnt = SEntMan.SpawnAtPosition("AirtightDirectionalRotationTest", coords);
+
+            Transform.SetLocalRotation(_targetRotationEnt, rotation);
+        });
+
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        await Server.WaitAssertion(delegate
+        {
+            using (Assert.EnterMultipleScope())
+            {
+                SEntMan.TryGetComponent<AirtightComponent>(_targetRotationEnt, out var airtight);
+                Assert.That(airtight, Is.Not.Null);
+
+                var initial = (AtmosDirection)airtight.InitialAirBlockedDirection;
+                Assert.That(initial,
+                    Is.EqualTo(AtmosDirection.North),
+                    "Directional airtight entity should block North on spawn.");
+
+                Assert.That(airtight.AirBlockedDirection,
+                    Is.EqualTo(expected),
+                    $"Expected AirBlockedDirection to be {expected} after rotating by {degrees} degrees on spawn.");
+
+                // i dont trust you airtightsystem
+                if (degrees is 90f or 270f)
+                {
+                    Assert.That(expected,
+                        Is.Not.EqualTo(initial),
+                        "Rotated directions should differ for 90/270 degrees.");
+                }
+            }
+        });
+    }
+
+    #endregion
+}
diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs
index 69488a7130..29c1f18af3 100644
--- a/Content.Server/Atmos/Components/AirtightComponent.cs
+++ b/Content.Server/Atmos/Components/AirtightComponent.cs
@@ -40,14 +40,23 @@ namespace Content.Server.Atmos.Components
         // depressurizing a room. However it can also effectively be used as a means of generating gasses for free
         // TODO ATMOS Mass conservation. Make it actually push/pull air from adjacent tiles instead of destroying & creating,
 
-
-        // TODO ATMOS Do we need these two fields?
+        // TODO ATMOS slate for removal. Stuff doesn't use this.
         [DataField("rotateAirBlocked")]
         public bool RotateAirBlocked { get; set; } = true;
 
-        // TODO ATMOS remove this? What is this even for??
-        [DataField("fixAirBlockedDirectionInitialize")]
-        public bool FixAirBlockedDirectionInitialize { get; set; } = true;
+        /// <summary>
+        /// Whether to fix the <see cref="CurrentAirBlockedDirection"/> on initialization
+        /// to the entity's current rotation.
+        /// </summary>
+        /// <remarks>This is an optimization routine for initializing airtight components.
+        /// If this entity doesn't have unique airtight directions
+        /// (ex. not all directions are blocked but some are), we can skip
+        /// a lot of event/transform business during initialization.
+        /// This field marks whether this is skipped or not.</remarks>
+        /// <example>If your entity only blocks air in one direction,
+        /// and that can depend on rotation, this needs to be set to true.</example>
+        [DataField]
+        public bool FixAirBlockedDirectionInitialize = true;
 
         /// <summary>
         /// If true, then the tile that this entity is on will have no air at all if all directions are blocked.
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 431707c835..78f61c80a4 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -25,7 +25,10 @@ namespace Content.Server.Atmos.EntitySystems
 
         private void OnAirtightInit(Entity<AirtightComponent> airtight, ref ComponentInit args)
         {
-            // TODO AIRTIGHT what FixAirBlockedDirectionInitialize even for?
+            // If this entity has unique airtight directions that are affected by rotation,
+            // we need to fix up the current airtight directions based on its rotation.
+            // Otherwise, we can skip all of that logic (stuff adds up when you're initing
+            // a morbillion walls).
             if (!airtight.Comp.FixAirBlockedDirectionInitialize)
             {
                 UpdatePosition(airtight);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index 5cce6075b7..e2e39abdda 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -300,6 +300,8 @@ public partial class AtmosphereSystem
 
     /// <summary>
     /// Checks if a tile on a grid is air-blocked in the specified directions.
+    /// This only checks for if the current tile, and only the current tile, is blocking
+    /// air.
     /// </summary>
     /// <param name="gridUid">The grid to check.</param>
     /// <param name="tile">The tile on the grid to check.</param>
@@ -323,6 +325,8 @@ public partial class AtmosphereSystem
 
     /// <summary>
     /// Checks if a tile on a grid is air-blocked in the specified directions, using cached data.
+    /// This only checks for if the current tile, and only the current tile, is blocking
+    /// air.
     /// </summary>
     /// <param name="grid">The grid to check.</param>
     /// <param name="tile">The tile on the grid to check.</param>

From cb87000ee8cee714827eee2fa50d74adae06197f Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 13 Jan 2026 15:28:51 -0800
Subject: [PATCH 306/360] Increase trit-to-frezon ratio from 1:8 to 1:50
 (#42400)

roll back to old trit -> frez ratio
---
 Content.Shared/Atmos/Atmospherics.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 808b58353a..5539ccbac8 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -268,7 +268,7 @@ namespace Content.Shared.Atmos
         /// <summary>
         ///     1 mol of Tritium is required per X mol of oxygen.
         /// </summary>
-        public const float FrezonProductionTritRatio = 50.0f; // DeltaV - Change back to 50
+        public const float FrezonProductionTritRatio = 50.0f;
 
         /// <summary>
         ///     1 / X of the tritium is converted into Frezon each tick

From b1b7e884f8c4cfea90d463a26cb20fe5013576c3 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Wed, 14 Jan 2026 01:59:19 +0100
Subject: [PATCH 307/360] EmpResistance cleanup (#42402)

* init

* yeah

* Update SharedEmpSystem.cs
---
 Content.Shared/Emp/EmpResistanceComponent.cs  | 10 +++++--
 Content.Shared/Emp/SharedEmpSystem.cs         | 30 +++++++++----------
 .../Entities/Clothing/Ears/headsets.yml       |  2 +-
 .../Entities/Clothing/OuterClothing/suits.yml |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Content.Shared/Emp/EmpResistanceComponent.cs b/Content.Shared/Emp/EmpResistanceComponent.cs
index 0768ad744f..9f83a1ad7b 100644
--- a/Content.Shared/Emp/EmpResistanceComponent.cs
+++ b/Content.Shared/Emp/EmpResistanceComponent.cs
@@ -11,8 +11,14 @@ namespace Content.Shared.Emp;
 public sealed partial class EmpResistanceComponent : Component
 {
     /// <summary>
-    ///     The proportion of the EMP effect that is resisted. 1.00 indicates full immunity while 0.00 indicates no resistance.
+    /// The strength of the EMP gets multiplied by this value.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public FixedPoint2 Resistance = FixedPoint2.Zero;
+    public float StrengthMultiplier = 1f;
+
+    /// <summary>
+    /// The duration of the EMP gets multiplied by this value.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float DurationMultiplier = 1f;
 }
diff --git a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs
index 22457e2d6e..270baf6f0e 100644
--- a/Content.Shared/Emp/SharedEmpSystem.cs
+++ b/Content.Shared/Emp/SharedEmpSystem.cs
@@ -32,6 +32,7 @@ public abstract class SharedEmpSystem : EntitySystem
     private static readonly DamageSpecifier? DefaultEmpDamage = new() { DamageDict = new() { { "Ion", 130 } } };
 
     private HashSet<EntityUid> _entSet = new();
+    private EntityQuery<EmpResistanceComponent> _resistanceQuery;
 
     public override void Initialize()
     {
@@ -42,7 +43,8 @@ public abstract class SharedEmpSystem : EntitySystem
         SubscribeLocalEvent<EmpDisabledComponent, RejuvenateEvent>(OnRejuvenate);
 
         SubscribeLocalEvent<EmpResistanceComponent, EmpAttemptEvent>(OnResistEmpAttempt);
-        SubscribeLocalEvent<EmpResistanceComponent, EmpPulseEvent>(OnResistEmpPulse);
+
+        _resistanceQuery = GetEntityQuery<EmpResistanceComponent>();
     }
 
     public static readonly EntProtoId EmpPulseEffectPrototype = "EffectEmpBlast"; // Frontier - was EffectEmpPulse
@@ -149,7 +151,14 @@ public abstract class SharedEmpSystem : EntitySystem
     /// <returns>If the entity was affected by the EMP.</returns>
     public bool DoEmpEffects(EntityUid uid, float energyConsumption, TimeSpan duration, EntityUid? user = null, DamageSpecifier? damage = null) // DeltaV - Add Ion Damage
     {
-        var ev = new EmpPulseEvent(energyConsumption, false, false, duration, user, damage); // DeltaV - Add Ion Damage
+        var strMultiplier = 1f;
+        var durMultiplier = 1f;
+        if (_resistanceQuery.TryComp(uid, out var resistance))
+        {
+            strMultiplier = resistance.StrengthMultiplier;
+            durMultiplier = resistance.DurationMultiplier;
+        }
+        var ev = new EmpPulseEvent(energyConsumption * strMultiplier, false, false, duration * durMultiplier, user, damage); // DeltaV - Add Ion Damage
         RaiseLocalEvent(uid, ref ev);
 
         // TODO: replace with PredictedSpawn once it works with animated sprites
@@ -160,7 +169,7 @@ public abstract class SharedEmpSystem : EntitySystem
             return ev.Affected;
 
         var disabled = EnsureComp<EmpDisabledComponent>(uid);
-        disabled.DisabledUntil = Timing.CurTime + duration;
+        disabled.DisabledUntil = Timing.CurTime + duration * durMultiplier;
         Dirty(uid, disabled);
 
         return ev.Affected;
@@ -199,20 +208,11 @@ public abstract class SharedEmpSystem : EntitySystem
 
     private void OnResistEmpAttempt(Entity<EmpResistanceComponent> ent, ref EmpAttemptEvent args)
     {
-        if (ent.Comp.Resistance >= 1)
+        // We only cancel if the strength multiplier is 0, because then the effect basically doesn't exist.
+        // Allows us to make things resistant to the duration, but still lose charge to the EMP.
+        if (ent.Comp.StrengthMultiplier <= 0)
             args.Cancelled = true;
     }
-
-    private void OnResistEmpPulse(Entity<EmpResistanceComponent> ent, ref EmpPulseEvent args)
-    {
-        var empStrengthMultiplier = 1 - ent.Comp.Resistance;
-
-        if (empStrengthMultiplier <= 0)
-            return;
-
-        args.Duration *= (float) empStrengthMultiplier;
-        args.EnergyConsumption *= (float) empStrengthMultiplier;
-    }
 }
 
 /// <summary>
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index 1de824388e..d32713c2f6 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -316,4 +316,4 @@
   - type: Clothing
     sprite: Clothing/Ears/Headsets/ninja.rsi
   - type: EmpResistance
-    resistance: 1
+    strengthMultiplier: 0
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 1d2100ee2e..f734df7545 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -250,7 +250,7 @@
   # core ninja suit stuff
   - type: NinjaSuit
   - type: EmpResistance
-    resistance: 1
+    strengthMultiplier: 0
   - type: UseDelay
     delay: 5 # disable time
   - type: PowerCellSlot

From 3f34d833fb268a469f393892d382a2ac1064307f Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 13 Jan 2026 21:08:25 -0800
Subject: [PATCH 308/360] Fix TritiumFireReaction low fuel limiting behavior
 (#42407)

fix fuel burn limiting logic incorrectly taking max instead of min
---
 Content.Server/Atmos/Reactions/TritiumFireReaction.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
index 45443b5a86..d6e4b9624e 100644
--- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
@@ -31,7 +31,8 @@ namespace Content.Server.Atmos.Reactions
             }
             else
             {
-                burnedFuel = Math.Max(initialTrit, mixture.GetMoles(Gas.Oxygen) / Atmospherics.TritiumBurnFuelRatio) / Atmospherics.TritiumBurnTritFactor;
+                // Limit the amount of fuel burned by the limiting reactant, either our initial tritium or the amount of oxygen available given the burn ratio.
+                burnedFuel = Math.Min(initialTrit, mixture.GetMoles(Gas.Oxygen) / Atmospherics.TritiumBurnFuelRatio) / Atmospherics.TritiumBurnTritFactor;
                 mixture.AdjustMoles(Gas.Tritium, -burnedFuel);
                 mixture.AdjustMoles(Gas.Oxygen, -burnedFuel / Atmospherics.TritiumBurnFuelRatio);
                 energyReleased += (Atmospherics.FireHydrogenEnergyReleased * burnedFuel * (Atmospherics.TritiumBurnTritFactor - 1));

From 66ddb7473fcd107322d55f05e2474b8278ed91fe Mon Sep 17 00:00:00 2001
From: pathetic meowmeow <uhhadd@gmail.com>
Date: Wed, 14 Jan 2026 00:57:08 -0500
Subject: [PATCH 309/360] Decouple gibbing from the body system (#42405)

* Decouple gibbing from the body system

* allow gibs that don't drop giblets

* pass through user

* prediction gon

* comment

* destructible

* playpvs

* very very very very very very very minor cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Tests/Body/GibTest.cs                     |  43 ---
 .../Tests/Gibbing/GibTest.cs                  |  36 ++
 .../Systems/AdminVerbSystem.Smites.cs         |   4 +-
 .../Anomaly/Effects/InnerBodyAnomalySystem.cs |   6 +-
 Content.Server/Atmos/Rotting/RottingSystem.cs |   5 +-
 Content.Server/Body/Systems/BodySystem.cs     |  93 -----
 .../Destructible/DestructibleSystem.cs        |   6 +-
 .../Thresholds/Behaviors/GibBehavior.cs       |   8 +-
 .../Forensics/Systems/ForensicsSystem.cs      |   9 +-
 .../Gibbing/Systems/GibOnRoundEndSystem.cs    |   6 +-
 Content.Server/Guardian/GuardianSystem.cs     |   6 +-
 .../ImmovableRod/ImmovableRodSystem.cs        |   5 +-
 Content.Server/Implants/ImplantedSystem.cs    |   5 +-
 .../Kitchen/EntitySystems/SharpSystem.cs      |   9 +-
 .../Materials/MaterialReclaimerSystem.cs      |   8 +-
 .../Mind/TransferMindOnGibSystem.cs           |  14 +-
 .../Systems/ShuttleSystem.FasterThanLight.cs  |   2 +-
 .../Shuttles/Systems/ShuttleSystem.cs         |   4 +-
 .../Systems/ArtifactCrusherSystem.cs          |   3 +-
 .../Thresholds/Behaviors/GibPartBehavior.cs   |   2 +-
 .../Body/Events/BeingGibbedEvent.cs           |   7 -
 .../Body/Systems/SharedBloodstreamSystem.cs   |   5 +-
 .../Body/Systems/SharedBodySystem.Body.cs     | 152 ++------
 Content.Shared/Devour/DevourSystem.cs         |   8 +-
 .../Gibbing/Components/GibbableComponent.cs   |  34 --
 .../Gibbing/Events/GibbingEvents.cs           |  50 ---
 .../GibOnRoundEndComponent.cs                 |   0
 Content.Shared/Gibbing/GibbingSystem.cs       |  84 +++++
 .../Gibbing/Systems/GibbingSystem.cs          | 344 ------------------
 .../Kitchen/SharedKitchenSpikeSystem.cs       |   7 +-
 Content.Shared/Magic/SharedMagicSystem.cs     |  11 +-
 .../Silicons/Borgs/SharedBorgSystem.cs        |   5 +-
 .../Species/Systems/GibActionSystem.cs        |   6 +-
 .../Trigger/Systems/GibOnTriggerSystem.cs     |   6 +-
 .../Prototypes/Body/Organs/Animal/animal.yml  |   9 +-
 Resources/Prototypes/Body/Organs/human.yml    |  11 +-
 Resources/Prototypes/Body/Parts/base.yml      |   1 -
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   1 -
 .../Entities/Mobs/Species/skeleton.yml        |   1 -
 .../_Shitmed/Body/Organs/Animal/animal.yml    |   2 +-
 40 files changed, 222 insertions(+), 796 deletions(-)
 delete mode 100644 Content.IntegrationTests/Tests/Body/GibTest.cs
 create mode 100644 Content.IntegrationTests/Tests/Gibbing/GibTest.cs
 delete mode 100644 Content.Shared/Body/Events/BeingGibbedEvent.cs
 delete mode 100644 Content.Shared/Gibbing/Components/GibbableComponent.cs
 delete mode 100644 Content.Shared/Gibbing/Events/GibbingEvents.cs
 rename Content.Shared/Gibbing/{Components => }/GibOnRoundEndComponent.cs (100%)
 create mode 100644 Content.Shared/Gibbing/GibbingSystem.cs
 delete mode 100644 Content.Shared/Gibbing/Systems/GibbingSystem.cs

diff --git a/Content.IntegrationTests/Tests/Body/GibTest.cs b/Content.IntegrationTests/Tests/Body/GibTest.cs
deleted file mode 100644
index e3d5dac33c..0000000000
--- a/Content.IntegrationTests/Tests/Body/GibTest.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#nullable enable
-using Content.Server.Body.Systems;
-using Robust.Shared.GameObjects;
-
-namespace Content.IntegrationTests.Tests.Body;
-
-[TestFixture]
-public sealed class GibTest
-{
-    [Test]
-    public async Task TestGib()
-    {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
-        var (server, client) = (pair.Server, pair.Client);
-        var map = await pair.CreateTestMap();
-
-        EntityUid target1 = default;
-        EntityUid target2 = default;
-
-        await server.WaitAssertion(() => target1 = server.EntMan.Spawn("MobHuman", map.MapCoords));
-        await server.WaitAssertion(() => target2 = server.EntMan.Spawn("MobHuman", map.MapCoords));
-        await pair.WaitCommand($"setoutfit {server.EntMan.GetNetEntity(target1)} CaptainGear");
-        await pair.WaitCommand($"setoutfit {server.EntMan.GetNetEntity(target2)} CaptainGear");
-
-        await pair.RunTicksSync(5);
-        var nuid1 = pair.ToClientUid(target1);
-        var nuid2 = pair.ToClientUid(target2);
-        Assert.That(client.EntMan.EntityExists(nuid1));
-        Assert.That(client.EntMan.EntityExists(nuid2));
-
-        await server.WaitAssertion(() => server.System<BodySystem>().GibBody(target1, acidify: false));
-        await server.WaitAssertion(() => server.System<BodySystem>().GibBody(target2, acidify: true));
-
-        await pair.RunTicksSync(5);
-        await pair.WaitCommand("dirty");
-        await pair.RunTicksSync(5);
-
-        Assert.That(!client.EntMan.EntityExists(nuid1));
-        Assert.That(!client.EntMan.EntityExists(nuid2));
-
-        await pair.CleanReturnAsync();
-    }
-}
diff --git a/Content.IntegrationTests/Tests/Gibbing/GibTest.cs b/Content.IntegrationTests/Tests/Gibbing/GibTest.cs
new file mode 100644
index 0000000000..ee0f7a742d
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Gibbing/GibTest.cs
@@ -0,0 +1,36 @@
+#nullable enable
+using Content.Shared.Gibbing;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Body;
+
+[TestFixture]
+public sealed class GibTest
+{
+    [Test]
+    public async Task TestGib()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
+        var (server, client) = (pair.Server, pair.Client);
+        var map = await pair.CreateTestMap();
+
+        EntityUid target = default;
+
+        await server.WaitAssertion(() => target = server.EntMan.Spawn("MobHuman", map.MapCoords));
+        await pair.WaitCommand($"setoutfit {server.EntMan.GetNetEntity(target)} CaptainGear");
+
+        await pair.RunTicksSync(5);
+        var nuid = pair.ToClientUid(target);
+        Assert.That(client.EntMan.EntityExists(nuid));
+
+        await server.WaitAssertion(() => server.System<GibbingSystem>().Gib(target));
+
+        await pair.RunTicksSync(5);
+        await pair.WaitCommand("dirty");
+        await pair.RunTicksSync(5);
+
+        Assert.That(!client.EntMan.EntityExists(nuid));
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 5301031636..306508835a 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -29,6 +29,7 @@ using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Electrocution;
+using Content.Shared.Gibbing;
 using Content.Shared.Gravity;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
@@ -92,6 +93,7 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly SuperBonkSystem _superBonkSystem = default!;
     [Dependency] private readonly SlipperySystem _slipperySystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
 
     private readonly EntProtoId _actionViewLawsProtoId = "ActionViewLaws";
     private readonly ProtoId<SiliconLawsetPrototype> _crewsimovLawset = "Crewsimov";
@@ -128,7 +130,7 @@ public sealed partial class AdminVerbSystem
                         4, 1, 2, args.Target, maxTileBreak: 0), // it gibs, damage doesn't need to be high.
                     CancellationToken.None);
 
-                _bodySystem.GibBody(args.Target);
+                _gibbing.Gib(args.Target);
             },
             Impact = LogImpact.Extreme,
             Message = string.Join(": ", explodeName, Loc.GetString("admin-smite-explode-description")) // we do this so the description tells admins the Text to run it via console.
diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
index f040514424..06a2e11089 100644
--- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
@@ -10,6 +10,7 @@ using Content.Shared.Anomaly.Effects;
 using Content.Shared.Body.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Gibbing;
 using Content.Shared.Mobs;
 using Content.Shared.Popups;
 using Content.Shared.Whitelist;
@@ -25,7 +26,7 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly AnomalySystem _anomaly = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly BodySystem _body = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
@@ -139,8 +140,7 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
         if (!TryComp<BodyComponent>(ent, out var body))
             return;
 
-        // DeltaV acidify: false preserves inventory items when anomaly goes supercritical
-        _body.GibBody(ent, false, body, splatModifier: 5f);
+        _gibbing.Gib(ent.Owner);
     }
 
     private void OnSeverityChanged(Entity<InnerBodyAnomalyComponent> ent, ref AnomalySeverityChangedEvent args)
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index e83d80748b..ea45bf5ed6 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Atmos;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Body.Events;
 using Content.Shared.Damage.Systems;
+using Content.Shared.Gibbing;
 using Content.Shared.Temperature.Components;
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
@@ -21,12 +22,12 @@ public sealed class RottingSystem : SharedRottingSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<RottingComponent, BeingGibbedEvent>(OnGibbed);
+        SubscribeLocalEvent<RottingComponent, GibbedBeforeDeletionEvent>(OnGibbed);
 
         SubscribeLocalEvent<TemperatureComponent, IsRottingEvent>(OnTempIsRotting);
     }
 
-    private void OnGibbed(EntityUid uid, RottingComponent component, BeingGibbedEvent args)
+    private void OnGibbed(EntityUid uid, RottingComponent component, GibbedBeforeDeletionEvent args)
     {
         if (!TryComp<PhysicsComponent>(uid, out var physics))
             return;
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 3cf09a122b..1b906e5319 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -22,7 +22,6 @@ using Content.Shared.Damage.Components;
 // Shitmed Change
 using System.Linq;
 using Content.Shared.Damage;
-using Content.Shared.Gibbing.Events;
 
 namespace Content.Server.Body.Systems;
 
@@ -107,99 +106,7 @@ public sealed class BodySystem : SharedBodySystem
         _appearance.SetData(bodyEnt, layer, true); // Shitmed Change
     }
 
-    public override HashSet<EntityUid> GibBody(
-        EntityUid bodyId,
-        bool acidify = false, // DeltaV - Changed paramater from gibOrgans
-        BodyComponent? body = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null,
-        // Shitmed Change
-        GibType gib = GibType.Gib,
-        GibContentsOption contents = GibContentsOption.Drop)
-    {
-        if (!Resolve(bodyId, ref body, logMissing: false)
-            || TerminatingOrDeleted(bodyId)
-            || EntityManager.IsQueuedForDeletion(bodyId))
-        {
-            return new HashSet<EntityUid>();
-        }
-
-        if (HasComp<GodmodeComponent>(bodyId))
-            return new HashSet<EntityUid>();
-
-        // DeltaV - If a polymorph configured to revert on death is gibbed without dying,
-        // revert it then gib so the parent is gibbed instead of the polymorph.
-        if (TryComp<PolymorphedEntityComponent>(bodyId, out var polymorph)
-            && !polymorph.Reverted
-            && polymorph.Configuration.RevertOnDeath)
-        {
-            _polymorph.Revert(bodyId);
-            if (polymorph.Configuration.TransferDamage && polymorph.Parent.HasValue)
-                GibBody(polymorph.Parent.Value, acidify, null, launchGibs: launchGibs, splatDirection: splatDirection,
-                splatModifier: splatModifier, splatCone: splatCone);
-            return new HashSet<EntityUid>();
-        }
-        // END DeltaV
-
-        var xform = Transform(bodyId);
-        if (xform.MapUid is null)
-            return new HashSet<EntityUid>();
-
-        var gibs = base.GibBody(bodyId, acidify, body, launchGibs: launchGibs,
-            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone,
-            gib: gib, contents: contents); // Shitmed Change
-
-        var ev = new BeingGibbedEvent(gibs);
-        RaiseLocalEvent(bodyId, ref ev);
-
-        QueueDel(bodyId);
-
-        return gibs;
-    }
-
     // Shitmed Change Start
-    public override HashSet<EntityUid> GibPart(
-        EntityUid partId,
-        BodyPartComponent? part = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false)
-            || TerminatingOrDeleted(partId)
-            || EntityManager.IsQueuedForDeletion(partId))
-            return new HashSet<EntityUid>();
-
-        if (Transform(partId).MapUid is null)
-            return new HashSet<EntityUid>();
-
-        var gibs = base.GibPart(partId, part, launchGibs: launchGibs,
-            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone);
-
-        var ev = new BeingGibbedEvent(gibs);
-        RaiseLocalEvent(partId, ref ev);
-
-        if (gibs.Any())
-            QueueDel(partId);
-
-        return gibs;
-    }
-
-    public override bool BurnPart(EntityUid partId, BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false)
-            || TerminatingOrDeleted(partId)
-            || EntityManager.IsQueuedForDeletion(partId))
-            return false;
-
-        return base.BurnPart(partId, part);
-    }
-
     protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
     {
         return;
diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index 01118db1ff..b39a6fe183 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using Content.Server._DV.Administration; // DeltaV - Admin QOL
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems; // DeltaV Keep body here for shitmed
 using Content.Server.Construction;
 using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible.Thresholds.Behaviors;
@@ -17,6 +17,7 @@ using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.Destructible.Thresholds.Triggers;
 using Content.Shared.FixedPoint;
+using Content.Shared.Gibbing;
 using Content.Shared.Humanoid;
 using Content.Shared.Trigger.Systems;
 using JetBrains.Annotations;
@@ -35,7 +36,8 @@ namespace Content.Server.Destructible
 
         [Dependency] public readonly AtmosphereSystem AtmosphereSystem = default!;
         [Dependency] public readonly AudioSystem AudioSystem = default!;
-        [Dependency] public readonly BodySystem BodySystem = default!;
+        [Dependency] public readonly GibbingSystem Gibbing = default!;
+        [Dependency] public readonly BodySystem BodySystem = default!; // Delta-V - Keep body here for shitmed
         [Dependency] public readonly ConstructionSystem ConstructionSystem = default!;
         [Dependency] public readonly ExplosionSystem ExplosionSystem = default!;
         [Dependency] public readonly StackSystem StackSystem = default!;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
index 5cc0fb39de..1addf96b62 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Database;
-using Content.Shared.Gibbing.Events; // Shitmed Change
 using JetBrains.Annotations;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
@@ -9,18 +8,13 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
     [DataDefinition]
     public sealed partial class GibBehavior : IThresholdBehavior
     {
-        [DataField] public GibType GibType = GibType.Gib; // Shitmed Change
-        [DataField] public GibContentsOption GibContents = GibContentsOption.Drop; // Shitmed Change
         [DataField("recursive")] private bool _recursive = true;
 
         public LogImpact Impact => LogImpact.Extreme;
 
         public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
         {
-            if (system.EntityManager.TryGetComponent(owner, out BodyComponent? body))
-            {
-                system.BodySystem.GibBody(owner, _recursive, body, gib: GibType, contents: GibContents); // Shitmed Change
-            }
+            system.Gibbing.Gib(owner, _recursive);
         }
     }
 }
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index f0f8fc2541..787c054b94 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -13,6 +13,7 @@ using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
 using Content.Shared.Forensics.Components;
 using Content.Shared.Forensics.Systems;
+using Content.Shared.Gibbing;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
@@ -40,7 +41,7 @@ namespace Content.Server.Forensics
             // The solution entities are spawned on MapInit as well, so we have to wait for that to be able to set the DNA in the bloodstream correctly without ResolveSolution failing
             SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit, after: new[] { typeof(BloodstreamSystem) });
 
-            SubscribeLocalEvent<ForensicsComponent, BeingGibbedEvent>(OnBeingGibbed);
+            SubscribeLocalEvent<ForensicsComponent, GibbedBeforeDeletionEvent>(OnBeingGibbed);
             SubscribeLocalEvent<ForensicsComponent, MeleeHitEvent>(OnMeleeHit);
             SubscribeLocalEvent<ForensicsComponent, GotRehydratedEvent>(OnRehydrated);
             SubscribeLocalEvent<CleansForensicsComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(AbsorbentSystem) });
@@ -94,14 +95,14 @@ namespace Content.Server.Forensics
             }
         }
 
-        private void OnBeingGibbed(EntityUid uid, ForensicsComponent component, BeingGibbedEvent args)
+        private void OnBeingGibbed(Entity<ForensicsComponent> ent, ref GibbedBeforeDeletionEvent args)
         {
             string dna = Loc.GetString("forensics-dna-unknown");
 
-            if (TryComp(uid, out DnaComponent? dnaComp) && dnaComp.DNA != null)
+            if (TryComp(ent, out DnaComponent? dnaComp) && dnaComp.DNA != null)
                 dna = dnaComp.DNA;
 
-            foreach (EntityUid part in args.GibbedParts)
+            foreach (var part in args.Giblets)
             {
                 var partComp = EnsureComp<ForensicsComponent>(part);
                 partComp.DNAs.Add(dna);
diff --git a/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs b/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs
index d23832984f..8736908da6 100644
--- a/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs
+++ b/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs
@@ -2,12 +2,12 @@
 using Content.Shared.Gibbing.Components;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Systems;
-using Content.Server.Body.Systems;
+using Content.Shared.Gibbing;
 
 namespace Content.Server.Gibbing.Systems;
 public sealed class GibOnRoundEndSystem : EntitySystem
 {
-    [Dependency] private readonly BodySystem _body = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
 
@@ -49,7 +49,7 @@ public sealed class GibOnRoundEndSystem : EntitySystem
             if (gibComp.SpawnProto != null)
                 SpawnAtPosition(gibComp.SpawnProto, Transform(uid).Coordinates);
 
-            _body.GibBody(uid, splatModifier: 5f);
+            _gibbing.Gib(uid);
         }
     }
 }
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 5f2597afef..16907dda8d 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Body.Systems;
 using Content.Server.Popups;
 using Content.Shared.Actions;
 using Content.Shared.Damage.Systems;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
+using Content.Shared.Gibbing;
 using Content.Shared.Guardian;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -31,7 +31,7 @@ namespace Content.Server.Guardian
         [Dependency] private readonly SharedActionsSystem _actionSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly BodySystem _bodySystem = default!;
+        [Dependency] private readonly GibbingSystem _gibbing = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
 
@@ -130,7 +130,7 @@ namespace Content.Server.Guardian
 
             // Ensure held items are dropped before deleting guardian.
             if (HasComp<HandsComponent>(guardian))
-                _bodySystem.GibBody(component.HostedGuardian.Value);
+                _gibbing.Gib(component.HostedGuardian.Value);
 
             QueueDel(guardian);
             QueueDel(component.ActionEntity);
diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
index 646b5c97bb..a06d521a3b 100644
--- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
@@ -5,6 +5,7 @@ using Content.Server.Popups;
 using Content.Shared.Body.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Examine;
+using Content.Shared.Gibbing;
 using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
@@ -20,7 +21,7 @@ public sealed class ImmovableRodSystem : EntitySystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    [Dependency] private readonly BodySystem _bodySystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -125,7 +126,7 @@ public sealed class ImmovableRodSystem : EntitySystem
                 return;
             }
 
-            _bodySystem.GibBody(ent, body: body);
+            _gibbing.Gib(ent);
             return;
         }
 
diff --git a/Content.Server/Implants/ImplantedSystem.cs b/Content.Server/Implants/ImplantedSystem.cs
index 7851758730..be477119a0 100644
--- a/Content.Server/Implants/ImplantedSystem.cs
+++ b/Content.Server/Implants/ImplantedSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Body.Events;
+using Content.Shared.Gibbing;
 using Content.Shared.Implants.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
@@ -11,7 +12,7 @@ public sealed partial class ImplanterSystem
     {
         SubscribeLocalEvent<ImplantedComponent, ComponentInit>(OnImplantedInit);
         SubscribeLocalEvent<ImplantedComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<ImplantedComponent, BeingGibbedEvent>(OnGibbed);
+        SubscribeLocalEvent<ImplantedComponent, GibbedBeforeDeletionEvent>(OnGibbed);
     }
 
     private void OnImplantedInit(Entity<ImplantedComponent> ent, ref ComponentInit args)
@@ -26,7 +27,7 @@ public sealed partial class ImplanterSystem
         _container.CleanContainer(ent.Comp.ImplantContainer);
     }
 
-    private void OnGibbed(Entity<ImplantedComponent> ent, ref BeingGibbedEvent args)
+    private void OnGibbed(Entity<ImplantedComponent> ent, ref GibbedBeforeDeletionEvent args)
     {
         // Drop the storage implant contents before the implants are deleted by the body being gibbed
         foreach (var implant in ent.Comp.ImplantContainer.ContainedEntities)
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index 39a3ecb7bb..29c4d65d5b 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -1,9 +1,8 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
+using Content.Shared.Gibbing;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen;
@@ -24,7 +23,7 @@ namespace Content.Server.Kitchen.EntitySystems;
 
 public sealed class SharpSystem : EntitySystem
 {
-    [Dependency] private readonly BodySystem _bodySystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
@@ -134,7 +133,7 @@ public sealed class SharpSystem : EntitySystem
             args.Args.User,
             popupType);
 
-        _bodySystem.GibBody(args.Args.Target.Value); // does nothing if ent can't be gibbed
+        _gibbing.Gib(args.Args.Target.Value); // does nothing if ent can't be gibbed
         _destructibleSystem.DestroyEntity(args.Args.Target.Value);
 
         args.Handled = true;
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 15ff93833d..7af39b84a1 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -4,7 +4,6 @@ using Content.Server.Ghost;
 using Content.Server.Popups;
 using Content.Server.Stack;
 using Content.Server.Wires;
-using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -25,6 +24,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Gibbing;
 using Content.Shared.Humanoid;
 
 namespace Content.Server.Materials;
@@ -39,7 +39,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
     [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!; //bobby
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly PuddleSystem _puddle = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
@@ -112,7 +112,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
             Filter.PvsExcept(victim, entityManager: EntityManager),
             true);
 
-        _body.GibBody(victim, true);
+        _gibbing.Gib(victim);
         _appearance.SetData(entity.Owner, RecyclerVisuals.Bloody, true);
         args.Handled = true;
     }
@@ -193,7 +193,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
             _adminLogger.Add(LogType.Gib, logImpact, $"{ToPrettyString(item):victim} was gibbed by {ToPrettyString(uid):entity} ");
             if (component.ReclaimSolutions)
                 SpawnChemicalsFromComposition(uid, item, completion, false, component, xform);
-            _body.GibBody(item, true);
+            _gibbing.Gib(item);
             _appearance.SetData(uid, RecyclerVisuals.Bloody, true);
         }
         else
diff --git a/Content.Server/Mind/TransferMindOnGibSystem.cs b/Content.Server/Mind/TransferMindOnGibSystem.cs
index ff71fa0560..81ebf96a87 100644
--- a/Content.Server/Mind/TransferMindOnGibSystem.cs
+++ b/Content.Server/Mind/TransferMindOnGibSystem.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Shared.Body.Events;
+using Content.Shared.Gibbing;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Tag;
@@ -21,19 +21,19 @@ public sealed class TransferMindOnGibSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<TransferMindOnGibComponent, BeingGibbedEvent>(OnGib);
+        SubscribeLocalEvent<TransferMindOnGibComponent, GibbedBeforeDeletionEvent>(OnGib);
     }
 
-    private void OnGib(EntityUid uid, TransferMindOnGibComponent component, BeingGibbedEvent args)
+    private void OnGib(Entity<TransferMindOnGibComponent> ent, ref GibbedBeforeDeletionEvent args)
     {
-        if (!_mindSystem.TryGetMind(uid, out var mindId, out var mind))
+        if (!_mindSystem.TryGetMind(ent, out var mindId, out var mind))
             return;
 
-        var validParts = args.GibbedParts.Where(p => _tag.HasTag(p, component.TargetTag)).ToHashSet();
+        var validParts = args.Giblets.Where(p => _tag.HasTag(p, ent.Comp.TargetTag)).ToHashSet();
         if (!validParts.Any())
             return;
 
-        var ent = _random.Pick(validParts);
-        _mindSystem.TransferTo(mindId, ent, mind: mind);
+        var transfer = _random.Pick(validParts);
+        _mindSystem.TransferTo(mindId, transfer, mind: mind);
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 9ef26fd0ea..d135e7c7eb 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -1004,7 +1004,7 @@ public sealed partial class ShuttleSystem
                 {
                     _logger.Add(LogType.Gib, LogImpact.Extreme, $"{ToPrettyString(ent):player} got gibbed by the shuttle" +
                                                                 $" {ToPrettyString(uid)} arriving from FTL at {xform.Coordinates:coordinates}");
-                    var gibs = _bobby.GibBody(ent, body: mob);
+                    var gibs = _gibbing.Gib(ent);
                     _immuneEnts.UnionWith(gibs);
                     continue;
                 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 86b97c40a6..43607ea1ea 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
 using Content.Server.Buckle.Systems;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
@@ -9,6 +8,7 @@ using Content.Server.Station.Systems;
 using Content.Server.Stunnable;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage.Systems;
+using Content.Shared.Gibbing;
 using Content.Shared.Light.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Salvage;
@@ -42,7 +42,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly BiomeSystem _biomes = default!;
-    [Dependency] private readonly BodySystem _bobby = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly BuckleSystem _buckle = default!;
     [Dependency] private readonly DamageableSystem _damageSys = default!;
     [Dependency] private readonly DockingSystem _dockSystem = default!;
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 3a32e55665..73fd14c4e9 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Body.Systems;
 using Content.Server.Stack;
 using Content.Shared.Body.Components;
+using Content.Shared.Gibbing;
 using Content.Shared.Storage.Components;
 using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.Equipment;
@@ -14,7 +15,7 @@ namespace Content.Server.Xenoarchaeology.Equipment.Systems;
 public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly BodySystem _body = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
diff --git a/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs b/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
index abbbd0928a..a2bd729129 100644
--- a/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
+++ b/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
@@ -2,7 +2,7 @@ using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using JetBrains.Annotations;
 
-// Leaving this one in the default namespace because I am afraid to test it 
+// Leaving this one in the default namespace because I am afraid to test it
 // in the Shitmed namespace lmao.
 namespace Content.Server.Destructible.Thresholds.Behaviors;
 
diff --git a/Content.Shared/Body/Events/BeingGibbedEvent.cs b/Content.Shared/Body/Events/BeingGibbedEvent.cs
deleted file mode 100644
index 7ab34f2e18..0000000000
--- a/Content.Shared/Body/Events/BeingGibbedEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Body.Events;
-
-/// <summary>
-/// Raised when a body gets gibbed, before it is deleted.
-/// </summary>
-[ByRefEvent]
-public readonly record struct BeingGibbedEvent(HashSet<EntityUid> GibbedParts);
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index e86fd0c06b..2bce22c045 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -11,6 +11,7 @@ using Content.Shared.EntityEffects.Effects.Solution;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Forensics.Components;
+using Content.Shared.Gibbing;
 using Content.Shared.HealthExaminable;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
@@ -50,7 +51,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         SubscribeLocalEvent<BloodstreamComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
         SubscribeLocalEvent<BloodstreamComponent, DamageChangedEvent>(OnDamageChanged);
         SubscribeLocalEvent<BloodstreamComponent, HealthBeingExaminedEvent>(OnHealthBeingExamined);
-        SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BloodstreamComponent, GibbedBeforeDeletionEvent>(OnBeingGibbed);
         SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
         SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<BloodstreamComponent, MetabolismExclusionEvent>(OnMetabolismExclusion);
@@ -262,7 +263,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         }
     }
 
-    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref BeingGibbedEvent args)
+    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref GibbedBeforeDeletionEvent args)
     {
         SpillAllSolutions(ent.AsNullable());
     }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index 69b7ac7023..102f1015d3 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -5,9 +5,7 @@ using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.DragDrop;
-using Content.Shared.Gibbing.Components;
-using Content.Shared.Gibbing.Events;
-using Content.Shared.Gibbing.Systems;
+using Content.Shared.Gibbing;
 using Content.Shared.Inventory;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -42,7 +40,6 @@ public partial class SharedBodySystem
      */
 
     // [Dependency] private readonly InventorySystem _inventory = default!; // Shitmed - Declared in SharedBodySystem.cs
-    [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly ItemSlotsSystem _slots = default!; // Shitmed Change
 
@@ -62,6 +59,8 @@ public partial class SharedBodySystem
         SubscribeLocalEvent<BodyComponent, ProfileLoadFinishedEvent>(OnProfileLoadFinished); // Shitmed change
         SubscribeLocalEvent<BodyComponent, IsEquippingAttemptEvent>(OnBeingEquippedAttempt); // Shitmed Change
 
+        SubscribeLocalEvent<BodyComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BodyPartComponent, BeingGibbedEvent>(OnPartBeingGibbed); // Shitmed Change
     }
 
     private void OnBodyInserted(Entity<BodyComponent> ent, ref EntInsertedIntoContainerMessage args)
@@ -309,152 +308,51 @@ public partial class SharedBodySystem
         }
     }
 
-    public virtual HashSet<EntityUid> GibBody(
-        EntityUid bodyId,
-        bool acidify = false,
-        BodyComponent? body = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null,
-        // Shitmed Change
-        GibType gib = GibType.Gib,
-        GibContentsOption contents = GibContentsOption.Drop)
+    private void OnBeingGibbed(Entity<BodyComponent> ent, ref BeingGibbedEvent args)
     {
-        var gibs = new HashSet<EntityUid>();
-
-        if (!Resolve(bodyId, ref body, logMissing: false))
-            return gibs;
-
-        var root = GetRootPartOrNull(bodyId, body);
-        if (root != null && TryComp(root.Value.Entity, out GibbableComponent? gibbable))
-        {
-            gibSoundOverride ??= gibbable.GibSound;
-        }
-        var parts = GetBodyChildren(bodyId, body).ToArray();
-        gibs.EnsureCapacity(parts.Length);
+        var parts = GetBodyChildren(ent, ent).ToArray();
+        args.Giblets.EnsureCapacity(args.Giblets.Capacity + parts.Length);
         foreach (var part in parts)
         {
-
-            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, gib, contents, ref gibs, // Shitmed Change
-                playAudio: false, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
-                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
-
-            if (!acidify)
-                continue;
-
             foreach (var organ in GetPartOrgans(part.Id, part.Component))
             {
-                _gibbingSystem.TryGibEntityWithRef(bodyId, organ.Id, GibType.Drop, GibContentsOption.Skip,
-                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
+                args.Giblets.Add(organ.Id);
             }
+            PredictedQueueDel(part.Id);
         }
 
-        var bodyTransform = Transform(bodyId);
-        _audioSystem.PlayPredicted(gibSoundOverride, bodyTransform.Coordinates, null);
-
-        // Begin DeltaV Additions
-        var ev = new BodyGibbedEvent(gibs);
-        RaiseLocalEvent(bodyId, ref ev);
-        // End DeltaV Additions
-
-        if (acidify)
-            return gibs;
-
-        if (TryComp<InventoryComponent>(bodyId, out var inventory))
+        foreach (var item in _inventory.GetHandOrInventoryEntities(ent.Owner))
         {
-            foreach (var item in _inventory.GetHandOrInventoryEntities(bodyId))
-            {
-                SharedTransform.DropNextTo(item, (bodyId, bodyTransform));
-                gibs.Add(item);
-            }
+            args.Giblets.Add(item);
         }
-        return gibs;
     }
 
     // Shitmed Change Start
-
-    public virtual HashSet<EntityUid> GibPart(
-        EntityUid partId,
-        BodyPartComponent? part = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null)
+    private void OnPartBeingGibbed(Entity<BodyPartComponent> part, ref BeingGibbedEvent args)
     {
-        var gibs = new HashSet<EntityUid>();
-
-        if (!Resolve(partId, ref part, logMissing: false))
-            return gibs;
-
-        if (part.Body is { } bodyEnt)
+        if (part.Comp.Body is { } bodyEnt)
         {
-            if (IsPartRoot(bodyEnt, partId, part: part) || !part.CanSever)
-                return gibs;
+            if (IsPartRoot(bodyEnt, part, part: part) || !part.Comp.CanSever)
+                return;
 
-            DropSlotContents((partId, part));
-            RemovePartChildren((partId, part), bodyEnt);
-            foreach (var organ in GetPartOrgans(partId, part))
+            DropSlotContents(part);
+            RemovePartChildren(part, bodyEnt);
+
+            var organs = GetPartOrgans(part, part).ToArray();
+            args.Giblets.EnsureCapacity(args.Giblets.Capacity + organs.Length);
+            foreach (var organ in organs)
             {
-                _gibbingSystem.TryGibEntityWithRef(bodyEnt, organ.Id, GibType.Drop, GibContentsOption.Skip,
-                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
+                args.Giblets.Add(organ.Id);
             }
-            var ev = new BodyPartDroppedEvent((partId, part));
+
+            var ev = new BodyPartDroppedEvent(part);
             RaiseLocalEvent(bodyEnt, ref ev);
         }
 
-        _gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Drop, ref gibs,
-                playAudio: true, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
-                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
-
-
-        if (HasComp<InventoryComponent>(partId))
+        foreach (var item in _inventory.GetHandOrInventoryEntities(part.Owner))
         {
-            foreach (var item in _inventory.GetHandOrInventoryEntities(partId))
-            {
-                SharedTransform.AttachToGridOrMap(item);
-                gibs.Add(item);
-            }
+            args.Giblets.Add(item);
         }
-        _audioSystem.PlayPredicted(gibSoundOverride, Transform(partId).Coordinates, null);
-        return gibs;
-    }
-
-    public virtual bool BurnPart(EntityUid partId,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            return false;
-
-        if (part.Body is { } bodyEnt)
-        {
-            if (IsPartRoot(bodyEnt, partId, part: part))
-                return false;
-
-            var gibs = new HashSet<EntityUid>();
-            // Todo: Kill this in favor of husking.
-            DropSlotContents((partId, part));
-            RemovePartChildren((partId, part), bodyEnt);
-            foreach (var organ in GetPartOrgans(partId, part))
-                _gibbingSystem.TryGibEntityWithRef(bodyEnt, organ.Id, GibType.Drop, GibContentsOption.Skip,
-                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse, launchImpulseVariance: GibletLaunchImpulseVariance);
-
-            _gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Gib, ref gibs,
-                playAudio: false, launchGibs: true, launchImpulse: GibletLaunchImpulse, launchImpulseVariance: GibletLaunchImpulseVariance);
-
-            if (HasComp<InventoryComponent>(partId))
-                foreach (var item in _inventory.GetHandOrInventoryEntities(partId))
-                    SharedTransform.AttachToGridOrMap(item);
-
-            QueueDel(partId);
-            return true;
-        }
-
-        return false;
     }
 
     private void OnProfileLoadFinished(EntityUid uid, BodyComponent component, ProfileLoadFinishedEvent args)
diff --git a/Content.Shared/Devour/DevourSystem.cs b/Content.Shared/Devour/DevourSystem.cs
index c63ffb34f1..fc905a1eef 100644
--- a/Content.Shared/Devour/DevourSystem.cs
+++ b/Content.Shared/Devour/DevourSystem.cs
@@ -1,10 +1,10 @@
 using Content.Shared._Goobstation.Devour;
 using Content.Shared.Actions;
-using Content.Shared.Body.Events;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Devour.Components;
 using Content.Shared.DoAfter;
+using Content.Shared.Gibbing;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
@@ -34,7 +34,7 @@ public sealed class DevourSystem : EntitySystem
         SubscribeLocalEvent<DevourerComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<DevourerComponent, DevourActionEvent>(OnDevourAction);
         SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
+        SubscribeLocalEvent<DevourerComponent, GibbedBeforeDeletionEvent>(OnGibContents);
     }
 
     private void OnStartup(Entity<DevourerComponent> ent, ref ComponentStartup args)
@@ -135,13 +135,11 @@ public sealed class DevourSystem : EntitySystem
         _audioSystem.PlayPredicted(ent.Comp.SoundDevour, ent.Owner, ent.Owner);
     }
 
-    private void OnGibContents(Entity<DevourerComponent> ent, ref BeingGibbedEvent args)
+    private void OnGibContents(Entity<DevourerComponent> ent, ref GibbedBeforeDeletionEvent args)
     {
         if (ent.Comp.StomachStorageWhitelist == null)
             return;
 
-        // For some reason we have two different systems that should handle gibbing,
-        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
         _containerSystem.EmptyContainer(ent.Comp.Stomach);
     }
 }
diff --git a/Content.Shared/Gibbing/Components/GibbableComponent.cs b/Content.Shared/Gibbing/Components/GibbableComponent.cs
deleted file mode 100644
index 9c7501f028..0000000000
--- a/Content.Shared/Gibbing/Components/GibbableComponent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Gibbing.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Gibbing.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(GibbingSystem))]
-public sealed partial class GibbableComponent : Component
-{
-    /// <summary>
-    /// Giblet entity prototypes to randomly select from when spawning additional giblets
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public List<EntProtoId> GibPrototypes = new();
-
-    /// <summary>
-    /// Number of giblet entities to spawn in addition to entity contents
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public int GibCount;
-
-    /// <summary>
-    /// Sound to be played when this entity is gibbed, only played when playsound is true on the gibbing function
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier? GibSound = new SoundCollectionSpecifier("gib", AudioParams.Default.WithVariation(0.025f));
-
-    /// <summary>
-    /// Max distance giblets can be dropped from an entity when NOT using physics-based scattering
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float GibScatterRange = 0.3f;
-}
diff --git a/Content.Shared/Gibbing/Events/GibbingEvents.cs b/Content.Shared/Gibbing/Events/GibbingEvents.cs
deleted file mode 100644
index 949b10eab9..0000000000
--- a/Content.Shared/Gibbing/Events/GibbingEvents.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Gibbing.Events;
-
-
-
-/// <summary>
-/// Called just before we actually gib the target entity
-/// </summary>
-/// <param name="Target">The entity being gibed</param>
-/// <param name="GibType">What type of gibbing is occuring</param>
-/// <param name="AllowedContainers">Containers we are allow to gib</param>
-/// <param name="ExcludedContainers">Containers we are allow not allowed to gib</param>
-[ByRefEvent] public record struct AttemptEntityContentsGibEvent(
-    EntityUid Target,
-    GibContentsOption GibType,
-    List<string>? AllowedContainers,
-    List<string>? ExcludedContainers
-    );
-
-
-/// <summary>
-/// Called just before we actually gib the target entity
-/// </summary>
-/// <param name="Target">The entity being gibed</param>
-/// <param name="GibletCount">how many giblets to spawn</param>
-/// <param name="GibType">What type of gibbing is occuring</param>
-[ByRefEvent] public record struct AttemptEntityGibEvent(EntityUid Target, int GibletCount, GibType GibType);
-
-/// <summary>
-/// Called immediately after we gib the target entity
-/// </summary>
-/// <param name="Target">The entity being gibbed</param>
-/// <param name="DroppedEntities">Any entities that are spilled out (if any)</param>
-[ByRefEvent] public record struct EntityGibbedEvent(EntityUid Target, List<EntityUid> DroppedEntities);
-
-[Serializable, NetSerializable]
-public enum GibType : byte
-{
-    Skip,
-    Drop,
-    Gib,
-}
-
-public enum GibContentsOption : byte
-{
-    Skip,
-    Drop,
-    Gib
-}
diff --git a/Content.Shared/Gibbing/Components/GibOnRoundEndComponent.cs b/Content.Shared/Gibbing/GibOnRoundEndComponent.cs
similarity index 100%
rename from Content.Shared/Gibbing/Components/GibOnRoundEndComponent.cs
rename to Content.Shared/Gibbing/GibOnRoundEndComponent.cs
diff --git a/Content.Shared/Gibbing/GibbingSystem.cs b/Content.Shared/Gibbing/GibbingSystem.cs
new file mode 100644
index 0000000000..08c8fc268e
--- /dev/null
+++ b/Content.Shared/Gibbing/GibbingSystem.cs
@@ -0,0 +1,84 @@
+using Content.Shared.Destructible;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.Network;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Gibbing;
+
+public sealed class GibbingSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDestructibleSystem _destructible = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    private static readonly SoundSpecifier? GibSound = new SoundCollectionSpecifier("gib", AudioParams.Default.WithVariation(0.025f));
+
+    /// <summary>
+    /// Gibs an entity.
+    /// </summary>
+    /// <param name="ent">The entity to gib.</param>
+    /// <param name="dropGiblets">Whether or not to drop giblets.</param>
+    /// <param name="user">The user gibbing the entity, if any.</param>
+    /// <returns>The set of giblets for this entity, if any.</returns>
+    public HashSet<EntityUid> Gib(EntityUid ent, bool dropGiblets = true, EntityUid? user = null)
+    {
+        // user is unused because of prediction woes, eventually it'll be used for audio
+
+        // BodySystem handles prediction rather poorly and causes client-sided bugs when we gib on the client
+        // This guard can be removed once it is gone and replaced by a prediction-safe system.
+        if (!_net.IsServer)
+            return new();
+
+        if (!_destructible.DestroyEntity(ent))
+            return new();
+
+        _audio.PlayPvs(GibSound, ent);
+
+        var gibbed = new HashSet<EntityUid>();
+        var beingGibbed = new BeingGibbedEvent(gibbed);
+        RaiseLocalEvent(ent, ref beingGibbed);
+
+        if (dropGiblets)
+        {
+            foreach (var giblet in gibbed)
+            {
+                _transform.DropNextTo(giblet, ent);
+                FlingDroppedEntity(giblet);
+            }
+        }
+
+        var beforeDeletion = new GibbedBeforeDeletionEvent(gibbed);
+        RaiseLocalEvent(ent, ref beforeDeletion);
+
+        return gibbed;
+    }
+
+    private const float GibletLaunchImpulse = 8;
+    private const float GibletLaunchImpulseVariance = 3;
+
+    private void FlingDroppedEntity(EntityUid target)
+    {
+        var impulse = GibletLaunchImpulse + _random.NextFloat(GibletLaunchImpulseVariance);
+        var scatterVec = _random.NextAngle().ToVec() * impulse;
+        _physics.ApplyLinearImpulse(target, scatterVec);
+    }
+}
+
+/// <summary>
+/// Raised on an entity when it is being gibbed.
+/// </summary>
+/// <param name="Giblets">If a component wants to provide giblets to scatter, add them to this hashset.</param>
+[ByRefEvent]
+public readonly record struct BeingGibbedEvent(HashSet<EntityUid> Giblets);
+
+/// <summary>
+/// Raised on an entity when it is about to be deleted after being gibbed.
+/// </summary>
+/// <param name="Giblets">The set of giblets this entity produced.</param>
+[ByRefEvent]
+public readonly record struct GibbedBeforeDeletionEvent(HashSet<EntityUid> Giblets);
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
deleted file mode 100644
index 9eaadbb970..0000000000
--- a/Content.Shared/Gibbing/Systems/GibbingSystem.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
-using Content.Shared.Gibbing.Components;
-using Content.Shared.Gibbing.Events;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Gibbing.Systems;
-
-public sealed class GibbingSystem : EntitySystem
-{
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    //TODO: (future optimization) implement a system that "caps" giblet entities by deleting the oldest ones once we reach a certain limit, customizable via CVAR
-
-    /// <summary>
-    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
-    /// work on the target and any entities it contains (depending on gibContentsOption)
-    /// </summary>
-    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
-    /// <param name="gibbable">Target entity/comp we wish to gib</param>
-    /// <param name="gibType">What type of gibing are we performing</param>
-    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
-    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
-    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
-    /// <param name="playAudio">Should we play audio</param>
-    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
-    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
-    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
-    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
-    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
-    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
-    /// /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
-    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
-    /// <returns>True if successful, false if not</returns>
-    public bool TryGibEntity(Entity<TransformComponent?> outerEntity, Entity<GibbableComponent?> gibbable, GibType gibType,
-        GibContentsOption gibContentsOption,
-        out HashSet<EntityUid> droppedEntities, bool launchGibs = true,
-        Vector2 launchDirection = default, float launchImpulse = 0f, float launchImpulseVariance = 0f,
-        Angle launchCone = default,
-        float randomSpreadMod = 1.0f, bool playAudio = true, List<string>? allowedContainers = null,
-        List<string>? excludedContainers = null, bool logMissingGibable = false)
-    {
-        droppedEntities = new();
-        return TryGibEntityWithRef(outerEntity, gibbable, gibType, gibContentsOption, ref droppedEntities,
-            launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone, randomSpreadMod, playAudio,
-            allowedContainers, excludedContainers, logMissingGibable);
-    }
-
-
-    /// <summary>
-    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
-    /// work on the target and any entities it contains (depending on gibContentsOption)
-    /// </summary>
-    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
-    /// <param name="gibbable">Target entity/comp we wish to gib</param>
-    /// <param name="gibType">What type of gibing are we performing</param>
-    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
-    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
-    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
-    /// <param name="playAudio">Should we play audio</param>
-    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
-    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
-    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
-    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
-    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
-    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
-    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
-    /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
-    /// <returns>True if successful, false if not</returns>
-    public bool TryGibEntityWithRef(
-        Entity<TransformComponent?> outerEntity,
-        Entity<GibbableComponent?> gibbable,
-        GibType gibType,
-        GibContentsOption gibContentsOption,
-        ref HashSet<EntityUid> droppedEntities,
-        bool launchGibs = true,
-        Vector2? launchDirection = null,
-        float launchImpulse = 0f,
-        float launchImpulseVariance = 0f,
-        Angle launchCone = default,
-        float randomSpreadMod = 1.0f,
-        bool playAudio = true,
-        List<string>? allowedContainers = null,
-        List<string>? excludedContainers = null,
-        bool logMissingGibable = false)
-    {
-        if (!Resolve(gibbable, ref gibbable.Comp, logMissing: false))
-        {
-            DropEntity(gibbable, (outerEntity, Transform(outerEntity)), randomSpreadMod, ref droppedEntities,
-                launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-            if (logMissingGibable)
-            {
-                Log.Warning($"{ToPrettyString(gibbable)} does not have a GibbableComponent! " +
-                            $"This is not required but may cause issues contained items to not be dropped.");
-            }
-
-            return false;
-        }
-
-        if (gibType == GibType.Skip && gibContentsOption == GibContentsOption.Skip)
-            return true;
-        if (launchGibs)
-        {
-            randomSpreadMod = 0;
-        }
-
-        HashSet<BaseContainer> validContainers = new();
-        var gibContentsAttempt =
-            new AttemptEntityContentsGibEvent(gibbable, gibContentsOption, allowedContainers, excludedContainers);
-        RaiseLocalEvent(gibbable, ref gibContentsAttempt);
-
-        foreach (var container in _containerSystem.GetAllContainers(gibbable))
-        {
-            var valid = true;
-            if (allowedContainers != null)
-                valid = allowedContainers.Contains(container.ID);
-            if (excludedContainers != null)
-                valid = valid && !excludedContainers.Contains(container.ID);
-            if (valid)
-                validContainers.Add(container);
-        }
-
-        switch (gibContentsOption)
-        {
-            case GibContentsOption.Skip:
-                break;
-            case GibContentsOption.Drop:
-            {
-                foreach (var container in validContainers)
-                {
-                    foreach (var ent in container.ContainedEntities)
-                    {
-                        DropEntity(new Entity<GibbableComponent?>(ent, null), outerEntity, randomSpreadMod,
-                            ref droppedEntities, launchGibs,
-                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                    }
-                }
-
-                break;
-            }
-            case GibContentsOption.Gib:
-            {
-                foreach (var container in validContainers)
-                {
-                    foreach (var ent in container.ContainedEntities)
-                    {
-                        GibEntity(new Entity<GibbableComponent?>(ent, null), outerEntity, randomSpreadMod,
-                            ref droppedEntities, launchGibs,
-                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                    }
-                }
-
-                break;
-            }
-        }
-
-        switch (gibType)
-        {
-            case GibType.Skip:
-                break;
-            case GibType.Drop:
-            {
-                DropEntity(gibbable, outerEntity, randomSpreadMod, ref droppedEntities, launchGibs,
-                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                break;
-            }
-            case GibType.Gib:
-            {
-                GibEntity(gibbable, outerEntity, randomSpreadMod, ref droppedEntities, launchGibs,
-                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                break;
-            }
-        }
-
-        if (playAudio)
-        {
-            _audioSystem.PlayPredicted(gibbable.Comp.GibSound, outerEntity, null);
-        }
-
-        if (gibType == GibType.Gib)
-            PredictedQueueDel(gibbable.Owner);
-        return true;
-    }
-
-    private void DropEntity(Entity<GibbableComponent?> gibbable, Entity<TransformComponent?> parent, float randomSpreadMod,
-        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
-        float scatterImpulseVariance, Angle scatterCone)
-    {
-        var gibCount = 0;
-        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
-        {
-            gibCount = gibbable.Comp.GibCount;
-        }
-
-        if (!Resolve(parent, ref parent.Comp, logMissing: false))
-            return;
-
-        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
-        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
-        switch (gibAttemptEvent.GibType)
-        {
-            case GibType.Skip:
-                return;
-            case GibType.Gib:
-                GibEntity(gibbable, parent, randomSpreadMod, ref droppedEntities, flingEntity, scatterDirection,
-                    scatterImpulse, scatterImpulseVariance, scatterCone, deleteTarget: false);
-                return;
-        }
-
-        _transformSystem.DropNextTo(gibbable.Owner, parent);
-        _transformSystem.SetWorldRotation(gibbable, _random.NextAngle());
-        droppedEntities.Add(gibbable);
-        if (flingEntity)
-        {
-            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
-        }
-
-        var gibbedEvent = new EntityGibbedEvent(gibbable, new List<EntityUid> {gibbable});
-        RaiseLocalEvent(gibbable, ref gibbedEvent);
-    }
-
-    private List<EntityUid> GibEntity(Entity<GibbableComponent?> gibbable, Entity<TransformComponent?> parent,
-        float randomSpreadMod,
-        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
-        float scatterImpulseVariance, Angle scatterCone, bool deleteTarget = true)
-    {
-        var localGibs = new List<EntityUid>();
-        var gibCount = 0;
-        var gibProtoCount = 0;
-        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
-        {
-            gibCount = gibbable.Comp.GibCount;
-            gibProtoCount = gibbable.Comp.GibPrototypes.Count;
-        }
-
-        if (!Resolve(parent, ref parent.Comp, logMissing: false))
-            return [];
-
-        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
-        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
-        switch (gibAttemptEvent.GibType)
-        {
-            case GibType.Skip:
-                return localGibs;
-            case GibType.Drop:
-                DropEntity(gibbable, parent, randomSpreadMod, ref droppedEntities, flingEntity,
-                    scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
-                localGibs.Add(gibbable);
-                return localGibs;
-        }
-
-        if (gibbable.Comp != null && gibProtoCount > 0)
-        {
-            if (flingEntity)
-            {
-                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
-                {
-                    if (!TryCreateRandomGiblet(gibbable.Comp, parent.Comp.Coordinates, false, out var giblet,
-                            randomSpreadMod))
-                        continue;
-                    FlingDroppedEntity(giblet.Value, scatterDirection, scatterImpulse, scatterImpulseVariance,
-                        scatterCone);
-                    droppedEntities.Add(giblet.Value);
-                }
-            }
-            else
-            {
-                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
-                {
-                    if (TryCreateRandomGiblet(gibbable.Comp, parent.Comp.Coordinates, false, out var giblet,
-                            randomSpreadMod))
-                        droppedEntities.Add(giblet.Value);
-                }
-            }
-        }
-
-        _transformSystem.AttachToGridOrMap(gibbable, Transform(gibbable));
-        if (flingEntity)
-        {
-            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
-        }
-
-        var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
-        RaiseLocalEvent(gibbable, ref gibbedEvent);
-        if (deleteTarget)
-            PredictedQueueDel(gibbable.Owner);
-        return localGibs;
-    }
-
-
-    public bool TryCreateRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
-        float randomSpreadModifier = 1.0f, bool playSound = true)
-    {
-        gibletEntity = null;
-        return Resolve(gibbable, ref gibbable.Comp) && TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates,
-            playSound, out gibletEntity, randomSpreadModifier);
-    }
-
-    public bool TryCreateAndFlingRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
-        Vector2 scatterDirection, float force, float scatterImpulseVariance, Angle scatterCone = default,
-        bool playSound = true)
-    {
-        gibletEntity = null;
-        if (!Resolve(gibbable, ref gibbable.Comp) ||
-            !TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates, playSound, out gibletEntity))
-            return false;
-        FlingDroppedEntity(gibletEntity.Value, scatterDirection, force, scatterImpulseVariance, scatterCone);
-        return true;
-    }
-
-    private void FlingDroppedEntity(EntityUid target, Vector2? direction, float impulse, float impulseVariance,
-        Angle scatterConeAngle)
-    {
-        var scatterAngle = direction?.ToAngle() ?? _random.NextAngle();
-        var scatterVector = _random.NextAngle(scatterAngle - scatterConeAngle / 2, scatterAngle + scatterConeAngle / 2)
-            .ToVec() * (impulse + _random.NextFloat(impulseVariance));
-        _physicsSystem.ApplyLinearImpulse(target, scatterVector);
-    }
-
-    private bool TryCreateRandomGiblet(GibbableComponent gibbable, EntityCoordinates coords,
-        bool playSound, [NotNullWhen(true)] out EntityUid? gibletEntity, float? randomSpreadModifier = null)
-    {
-        gibletEntity = null;
-        if (gibbable.GibPrototypes.Count == 0)
-            return false;
-        gibletEntity = Spawn(gibbable.GibPrototypes[_random.Next(0, gibbable.GibPrototypes.Count)],
-            randomSpreadModifier == null
-                ? coords
-                : coords.Offset(_random.NextVector2(gibbable.GibScatterRange * randomSpreadModifier.Value)));
-        if (playSound)
-            _audioSystem.PlayPredicted(gibbable.GibSound, coords, null);
-        _transformSystem.SetWorldRotation(gibletEntity.Value, _random.NextAngle());
-        return true;
-    }
-}
diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
index 59535eee50..6e8dbd19fd 100644
--- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
+++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
@@ -1,12 +1,12 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Part; // DeltaV
-using Content.Shared.Body.Systems;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Examine;
+using Content.Shared.Gibbing;
 using Content.Shared.Hands;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
@@ -44,7 +44,7 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
@@ -339,8 +339,7 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
         if (butcherable.SpawnedEntities.Count == 0)
         {
             // DeltaV - Gib the body, then body parts, but leave the organs
-            var gibs = _bodySystem.GibBody(args.Target.Value, true);
-
+            var gibs = _gibbing.Gib(args.Target.Value);
             foreach (var gib in gibs)
             {
                 if (HasComp<BodyPartComponent>(gib))
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 50ef5f413a..82cae19ec1 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -1,12 +1,11 @@
 using System.Numerics;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
 using Content.Shared.Charges.Components;
 using Content.Shared.Charges.Systems;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Examine;
+using Content.Shared.Gibbing;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
@@ -53,7 +52,7 @@ public abstract class SharedMagicSystem : EntitySystem
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedDoorSystem _door = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
@@ -390,11 +389,7 @@ public abstract class SharedMagicSystem : EntitySystem
         var impulseVector = direction * 10000;
 
         _physics.ApplyLinearImpulse(ev.Target, impulseVector);
-
-        if (!TryComp<BodyComponent>(ev.Target, out var body))
-            return;
-
-        _body.GibBody(ev.Target, true, body);
+        _gibbing.Gib(ev.Target);
     }
 
     // End Touch Spells
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 9c28f5eb04..42da1c6d5d 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
+using Content.Shared.Gibbing;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -88,7 +89,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
         SubscribeLocalEvent<BorgChassisComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
         SubscribeLocalEvent<BorgChassisComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<BorgChassisComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<BorgChassisComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BorgChassisComponent, GibbedBeforeDeletionEvent>(OnBeingGibbed);
         SubscribeLocalEvent<BorgChassisComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
         SubscribeLocalEvent<BorgChassisComponent, GetCharacterUnrevivableIcEvent>(OnGetUnrevivableIC);
         SubscribeLocalEvent<BorgChassisComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
@@ -293,7 +294,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
             SetActive(chassis, false, user: args.Origin);
     }
 
-    private void OnBeingGibbed(Entity<BorgChassisComponent> chassis, ref BeingGibbedEvent args)
+    private void OnBeingGibbed(Entity<BorgChassisComponent> chassis, ref GibbedBeforeDeletionEvent args)
     {
         // Don't use the ItemSlotsSystem eject method since we don't want to play a sound and want we to eject the battery even if the slot is locked.
         if (TryComp<PowerCellSlotComponent>(chassis, out var slotComp) &&
diff --git a/Content.Shared/Species/Systems/GibActionSystem.cs b/Content.Shared/Species/Systems/GibActionSystem.cs
index 85a99fe4e4..26c14f8699 100644
--- a/Content.Shared/Species/Systems/GibActionSystem.cs
+++ b/Content.Shared/Species/Systems/GibActionSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Species.Components;
 using Content.Shared.Actions;
 using Content.Shared.Body.Systems;
+using Content.Shared.Gibbing;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
@@ -12,7 +13,7 @@ namespace Content.Shared.Species;
 public sealed partial class GibActionSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
 
@@ -52,8 +53,7 @@ public sealed partial class GibActionSystem : EntitySystem
     {
         // When they use the action, gib them.
         _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
-        // DeltaV acidify: false drops inventory items instead of deleting them
-        _bodySystem.GibBody(uid, false);
+        _gibbing.Gib(uid, user: args.Performer);
     }
 
 
diff --git a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
index 237c925716..83b4790af9 100644
--- a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Systems;
+using Content.Shared.Gibbing;
 using Content.Shared.Inventory;
 using Content.Shared.Trigger.Components.Effects;
 
@@ -6,7 +6,7 @@ namespace Content.Shared.Trigger.Systems;
 
 public sealed class GibOnTriggerSystem : XOnTriggerSystem<GibOnTriggerComponent>
 {
-    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
 
     protected override void OnTrigger(Entity<GibOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
@@ -20,7 +20,7 @@ public sealed class GibOnTriggerSystem : XOnTriggerSystem<GibOnTriggerComponent>
             }
         }
 
-        _body.GibBody(target, true);
+        _gibbing.Gib(target, user: args.User);
         args.Handled = true;
     }
 }
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index 643a086c80..f9cf8b7fcd 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseAnimalOrganUnGibbable
+  id: BaseAnimalOrgan
   parent: BaseItem
   abstract: true
   components:
@@ -23,13 +23,6 @@
     tags:
       - Meat
 
-- type: entity
-  id: BaseAnimalOrgan
-  parent: BaseAnimalOrganUnGibbable
-  abstract: true
-  components:
-  - type: Gibbable
-
 - type: entity
   id: OrganAnimalLungs
   parent: BaseAnimalOrgan
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 923289fc47..1881aade70 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseHumanOrganUnGibbable
+  id: BaseHumanOrgan
   parent: BaseItem
   abstract: true
   components:
@@ -27,16 +27,9 @@
     tags:
       - Meat
 
-- type: entity
-  id: BaseHumanOrgan
-  parent: BaseHumanOrganUnGibbable
-  abstract: true
-  components:
-  - type: Gibbable
-
 - type: entity
   id: OrganHumanBrain
-  parent: BaseHumanOrganUnGibbable
+  parent: BaseHumanOrgan
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index 0f9087a94c..75270eeaf8 100644
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ b/Resources/Prototypes/Body/Parts/base.yml
@@ -19,7 +19,6 @@
       path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
     endSound:
       path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Gibbable
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index d0ddde80d8..8979c908f7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -440,7 +440,6 @@
         damage: 10
       behaviors:
       - !type:GibBehavior
-        gibContents: Skip # Shitmed Change
         recursive: false
   - type: NonSpreaderZombie
   - type: StepTrigger
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 1e53816aa2..6943447f82 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -40,7 +40,6 @@
         damage: 150
       behaviors:
       - !type:GibBehavior # Shitmed Change
-        gibContents: Skip # Shitmed Change
   - type: SlowOnDamage #modified speeds because they're so weak
     speedModifierThresholds:
       60: 0.9
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
index ed87d11ae3..273a5375f8 100644
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: OrganAnimalBrain
-  parent: BaseAnimalOrganUnGibbable
+  parent: BaseAnimalOrgan
   name: animal brain
   description: "Not so intelligence, not so honk."
   components:

From 669cc6f49b4d830431d2e9df33971d5fc615926a Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 8 Feb 2026 15:40:45 +0100
Subject: [PATCH 310/360] Downstream fixes for #42405 (Decouple gibbing)

---
 .../Systems/ArtifactCrusherSystem.cs          |  3 +-
 .../PsionicEruption/PsionicEruptionSystem.cs  |  5 ++-
 .../_DV/Chapel/SacrificialAltarSystem.cs      |  6 ++-
 .../_DV/CosmicCult/CosmicCultRuleSystem.cs    |  4 +-
 .../Thresholds/Behaviors/GibPartBehavior.cs   |  4 +-
 .../Systems/SharedBodySystem.GibDirtying.cs   | 13 ++----
 .../Body/Systems/SharedBodySystem.Burn.cs     | 45 +++++++++++++++++++
 Resources/Prototypes/_EE/Body/Parts/ipc.yml   |  2 +-
 8 files changed, 63 insertions(+), 19 deletions(-)
 create mode 100644 Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Burn.cs

diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 73fd14c4e9..5db6ba78e9 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -45,8 +45,7 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
             if (!TryComp<BodyComponent>(contained, out var body))
                 Del(contained);
 
-            // DeltaV acidify: false preserves inventory items, which get added to the output container
-            var gibs = _body.GibBody(contained, body: body, acidify: false);
+            var gibs = _gibbing.Gib(contained);
             foreach (var gib in gibs)
             {
                 ContainerSystem.Insert((gib, null, null, null), crusher.OutputContainer);
diff --git a/Content.Server/_DV/Abilities/Psionics/PsionicEruption/PsionicEruptionSystem.cs b/Content.Server/_DV/Abilities/Psionics/PsionicEruption/PsionicEruptionSystem.cs
index 490bfa6072..d01a2047e8 100644
--- a/Content.Server/_DV/Abilities/Psionics/PsionicEruption/PsionicEruptionSystem.cs
+++ b/Content.Server/_DV/Abilities/Psionics/PsionicEruption/PsionicEruptionSystem.cs
@@ -13,6 +13,7 @@ using Content.Shared.Actions.Events;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.DoAfter;
+using Content.Shared.Gibbing;
 using Content.Shared.Mind;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Events;
@@ -44,6 +45,7 @@ public sealed class PsionicEruptionSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
 
     private static readonly EntProtoId? Sparks = "EffectSparks";
 
@@ -217,8 +219,7 @@ public sealed class PsionicEruptionSystem : EntitySystem
             return;
 
         var pos = _transform.GetMapCoordinates(entity);
-        // acidify: false preserves inventory items when erupting
-        _body.GibBody(entity, acidify: false, body, launchGibs: true);
+        _gibbing.Gib(entity);
         int boom = _glimmer.GetGlimmerTier(_glimmer.Glimmer) switch
         {
             GlimmerTier.Minimal => 4,
diff --git a/Content.Server/_DV/Chapel/SacrificialAltarSystem.cs b/Content.Server/_DV/Chapel/SacrificialAltarSystem.cs
index bfb27df955..d425c57243 100644
--- a/Content.Server/_DV/Chapel/SacrificialAltarSystem.cs
+++ b/Content.Server/_DV/Chapel/SacrificialAltarSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Database;
+using Content.Shared.Gibbing;
 using Content.Shared._DV.Chapel;
 using Content.Shared.DoAfter;
 using Content.Shared.EntityTable;
@@ -29,6 +30,7 @@ public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem
     [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
 
     public override void Initialize()
     {
@@ -70,8 +72,8 @@ public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem
         // TODO GOLEMS: create a soul crystal and transfer mind into it
 
         // finally gib the targets old body
-        if (TryComp<BodyComponent>(target, out var body))
-            _body.GibBody(target, acidify: true, body, launchGibs: true);
+        if (HasComp<BodyComponent>(target))
+            _gibbing.Gib(target);
         else
             QueueDel(target);
     }
diff --git a/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs b/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs
index 74a6179a7c..48ba99831f 100644
--- a/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs
+++ b/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs
@@ -33,6 +33,7 @@ using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.Gibbing;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Light.Components;
@@ -100,6 +101,7 @@ public sealed class CosmicCultRuleSystem : GameRuleSystem<CosmicCultRuleComponen
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] private readonly VisibilitySystem _visibility = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
 
     private ISawmill _sawmill = default!;
     private TimeSpan _t3RevealDelay = default!;
@@ -415,7 +417,7 @@ public sealed class CosmicCultRuleSystem : GameRuleSystem<CosmicCultRuleComponen
         Spawn(cultRule.WarpVFX, spawnTgt);
         Spawn(cultRule.WarpVFX, Transform(player).Coordinates);
         _audio.PlayPvs(cultRule.WarpSFX, spawnTgt, AudioParams.Default.WithVolume(3f));
-        _body.GibBody(player); // you don't need that body anymore
+        _gibbing.Gib(player); // you don't need that body anymore
     }
 
     private static void SetWinType(Entity<CosmicCultRuleComponent> ent, WinType type)
diff --git a/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs b/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
index a2bd729129..fc14067570 100644
--- a/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
+++ b/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
@@ -12,10 +12,10 @@ public sealed partial class GibPartBehavior : IThresholdBehavior
 {
     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        if (!system.EntityManager.TryGetComponent(owner, out BodyPartComponent? part))
+        if (!system.EntityManager.HasComponent<BodyPartComponent>(owner))
             return;
 
-        system.BodySystem.GibPart(owner, part);
+        system.Gibbing.Gib(owner);
     }
 }
 
diff --git a/Content.Shared/_DV/Body/Systems/SharedBodySystem.GibDirtying.cs b/Content.Shared/_DV/Body/Systems/SharedBodySystem.GibDirtying.cs
index d024f67d3d..e5eff94afb 100644
--- a/Content.Shared/_DV/Body/Systems/SharedBodySystem.GibDirtying.cs
+++ b/Content.Shared/_DV/Body/Systems/SharedBodySystem.GibDirtying.cs
@@ -2,6 +2,7 @@ using Content.Shared._DV.Surgery;
 using Content.Shared.Body.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics.Components;
+using Content.Shared.Gibbing;
 
 namespace Content.Shared.Body.Systems;
 
@@ -20,22 +21,16 @@ public abstract partial class SharedBodySystem
 
     private void InitializeGibDirtying()
     {
-        SubscribeLocalEvent<BodyComponent, BodyGibbedEvent>(OnGibbed);
+        SubscribeLocalEvent<BodyComponent, GibbedBeforeDeletionEvent>(OnGibbed);
     }
 
-    private void OnGibbed(Entity<BodyComponent> ent, ref BodyGibbedEvent args)
+    private void OnGibbed(Entity<BodyComponent> ent, ref GibbedBeforeDeletionEvent args)
     {
         var dna = CompOrNull<DnaComponent>(ent)?.DNA;
-        foreach (var giblet in args.Gibs)
+        foreach (var giblet in args.Giblets)
         {
             _clean.AddDirt(giblet, DirtAdded);
             _clean.AddDna(giblet, dna);
         }
     }
 }
-
-/// <summary>
-/// Raised by body system on the body entity after being gibbed.
-/// </summary>
-[ByRefEvent]
-public record struct BodyGibbedEvent(HashSet<EntityUid> Gibs);
diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Burn.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Burn.cs
new file mode 100644
index 0000000000..66a1bc360b
--- /dev/null
+++ b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Burn.cs
@@ -0,0 +1,45 @@
+using Content.Shared.Body.Part;
+using Content.Shared.Gibbing;
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Body.Systems;
+
+/// <summary>
+/// Contains only the logic relevant for burning parts on an entity.
+/// Since this is still requiring gibbing, it's best to quarantine the code away from the shared
+/// body system before NuBody comes.
+/// </summary>
+public partial class SharedBodySystem
+{
+    [Dependency] private GibbingSystem _gibbing = default!;
+
+    public bool BurnPart(EntityUid partId,
+        BodyPartComponent? part = null)
+    {
+        if (!Resolve(partId, ref part, logMissing: false))
+            return false;
+
+        if (part.Body is { } bodyEnt)
+        {
+            if (IsPartRoot(bodyEnt, partId, part: part))
+                return false;
+
+            // Todo: Kill this in favor of husking.
+            DropSlotContents((partId, part));
+            RemovePartChildren((partId, part), bodyEnt);
+            foreach (var organ in GetPartOrgans(partId, part))
+                _gibbing.Gib(organ.Id);
+
+            _gibbing.Gib(partId);
+
+            if (HasComp<InventoryComponent>(partId))
+                foreach (var item in _inventory.GetHandOrInventoryEntities(partId))
+                    SharedTransform.AttachToGridOrMap(item);
+
+            QueueDel(partId);
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/Resources/Prototypes/_EE/Body/Parts/ipc.yml b/Resources/Prototypes/_EE/Body/Parts/ipc.yml
index 99b4ec9bca..d8dee5a6a4 100644
--- a/Resources/Prototypes/_EE/Body/Parts/ipc.yml
+++ b/Resources/Prototypes/_EE/Body/Parts/ipc.yml
@@ -7,7 +7,7 @@
   - type: Damageable
     damageContainer: Inorganic # Shitmed Change
   - type: BodyPart
-  - type: Gibbable
+  #- type: Gibbable # Shitmed - Update for new gibbing system
   - type: ContainerContainer
     containers:
       bodypart: !type:Container

From d0ad7dbe9753ef29bd6149a17030bf1affdb44d1 Mon Sep 17 00:00:00 2001
From: Vy <142624468+skrybl@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:49:22 +0000
Subject: [PATCH 311/360] Maid uniform sprite change. (#38335)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
---
 .../equipped-INNERCLOTHING-monkey.png         | Bin 20747 -> 1280 bytes
 .../janimaid.rsi/equipped-INNERCLOTHING.png   | Bin 1210 -> 1246 bytes
 .../Uniforms/Jumpskirt/janimaid.rsi/icon.png  | Bin 506 -> 536 bytes
 .../Jumpskirt/janimaid.rsi/inhand-left.png    | Bin 592 -> 635 bytes
 .../Jumpskirt/janimaid.rsi/inhand-right.png   | Bin 597 -> 644 bytes
 .../Uniforms/Jumpskirt/janimaid.rsi/meta.json |   2 +-
 .../equipped-INNERCLOTHING-monkey.png         | Bin 20673 -> 1280 bytes
 .../equipped-INNERCLOTHING.png                | Bin 540 -> 1236 bytes
 .../Jumpskirt/janimaidmini.rsi/icon.png       | Bin 250 -> 514 bytes
 .../janimaidmini.rsi/inhand-left.png          | Bin 278 -> 555 bytes
 .../janimaidmini.rsi/inhand-right.png         | Bin 319 -> 565 bytes
 .../Jumpskirt/janimaidmini.rsi/meta.json      |   2 +-
 12 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png
index 5e747639ee2b822a5581715c79ed9fbdad8a88c2..910ea84259f8ec885a74655c8b99bfd5adb0d80c 100644
GIT binary patch
delta 1261
zcmV<J1QPp;q5*&kkR*Qrb5ch_0Itp)=>Px(x=BPqRCt{2nn7qAM-+ztEyczrhf=(I
zu>{hg!m?FVY_#X1AmW1$rh$?i9101+J_v$MjoZ{dM6{R&`=Wz`aRafTCMjubFr~q@
zFUE#llMoYG&gNo+tjjJ45lELdhv`9@=~{A>osHJCFdr<^&J2I^&wKmk&1gq}Kp+qZ
z1OkCT@J@Qw0n)1u5W_Htv)nKYLhE|f0blhsO{>#+Te%xP;1QRVPRL3p06^0;Vi*R|
zG>rg&qs|v6^r{0S6pkVii6Eh-FqfTV`Uy3KNF;(#ILfX6p-b_KfpW!oMNyEMzK`_q
z1!V6$Ms_yM>MVb==+VT+`T!uy0hp$VU46ZxWgSD71K8EqVVeDr<p7Qj54iev8v%qG
z2mrQiWBeoF<KH%M`;&99ZJX6KI|{1(kc66IWzO%l_tozwrf4HvPXPe1tRnLJI>v7<
zpyTUnuwT6a`RWqJZ!RFeufwv6a5}2lSk^Jh<uXRo{Xl;;A^>1C-H&p)49hy^?o)Ep
zh|Yh@ETX$dm9n#GQn-~xa4HS@nI6qb`F)+WqkTWs*SH7e&_zN`VOL*gPc#&cN=JtW
zWaIG?Yj^&_5SEu_q{~BNtld+6&6RC#BR~Qm$x5e`-`7ccv|=;>YCQ7$I&rq+G1QHI
zLQP53_)vd1imSsvz%)%vOfDi6j^gsr7zu@=QYaji5^Bn|KGzhW{P_K~hWE|n=qL{W
z*wxorf|KO{e!BB5X0yLzI&+0hg`>j*{CfX3OOkHjdQvnYt*y+Xt*wof+qR8?!Rr7Z
zy-&!y)vry0s5;1tK5qn&?j99|LV;y|+qO|C6wrU&qr$H}fKxxArdYCbe$wpEtM4fS
z0AMaViC{2@LZN_>bml~Veno*(zZN?0clC8HeODWy8YF5w00e_UtgXz~I>I-25}X@c
zcSd)Ebf@QZLap(BL_n?nY0!EeeeP9Y@$NL%R_2-Us7Ar!-D&na!B1qR6U$382!*5U
zT3&ye@vP15fU$`zN~O|?vQnvpv5Bmw0eIn?sfC93Jb2m%P$$sqER6?%*RNmIU0(6B
z3Y;2lbZ(x(KA@@ko-*obYptJ#|JU>d0)apv5C{YUfk5zo$J5W@SUgGJ%u2bvO%USx
zEb_gOr265;;z`gq#ksxBW}isa6N@KFE|-5Jxm=DIhCyQSBq4<0EG~+sX^6#>h{cn{
zFbp;x$AfVVm&ao9BqCjXgdRmrXRg3BO<eqPg!T9Q*#_?zTq8*mc6N4fedId=01qF`
zK~WS;OfCY|1Cp07o=Ca9P1k*LpA1ps0bpWs5sISV;e$Cm8mvFA@{31<sXF8F?{R-Q
zR}^@9DQa2A*xp)&WgRmoble!m&&khyPX_0H`Ga)a7-q&h$KnM~4ydJAZ2sS3&PtQl
z0hRNAIdCF(Ol9s>I=lKsQwG%tszEg=)iFuDdCgM<Y;UcSNLSy9va^hWTCGS|AGWtv
zJxxC@2eh=dGvl4f5RNDE>1XGC%L8R}nLFj_GbgmPwsZB#<$&d-nYY%-a-eQtelV4}
zSLb{ujmCHy+$TeS|Me#tEj7=dZTPkuyLf3FFJC-q6k$?JYr8lk5eNhVfj}S-2;R*<
XoC0?hN}*KG00000NkvXXu0mjfwV`6K

literal 20747
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

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png
index fa7398710a243e43c14809c2ba9826270891a4ed..52616f916bd4a498bcc8a48c35b5516c78bd9fcd 100644
GIT binary patch
delta 1213
zcmV;u1Va0|3El~iF@KmzL_t(|ob8%lNLyDN$G?$oj?n}zu7(xT>PuIdLr6eh#vUAF
z4B|t(j)Guc%0L7~3t??2VU_l_va*GRl|ra5!hBevg~>qJ26Zm5h#6}pY5Nirp)`eY
z*Bgn;6wV&vxji>c<2l!Rufom;B;G$c-{1M3KlhT~50FSC5`T$AB9TaTB)ya)!QL<_
z6g9%0FBCNr><yFjQjWa*+xt_$MMS**xKPwy5OvA~w%rRCRg?aOi>kBw)ZHhgGNEpt
zJRKqFr5rhVI%15<lTw+`QF23{{_RG8#~Bdp4U>+}E?m1lZJfJvdj_8$_ClGvi*I_~
z#GTtS#<gqLr+?AW*#)~yXr$lK*=4$iJr>pHUIMH697e__0RTQP@Xz2U*w8nz_Q6N+
zd29EKj7?%SpW|&(h}C=!)#?@i;MUEk=^8z*R=0%pn;JmfuT<8JASkbW`yB$YQ7ChF
zO+f-crLu0zEU4E%acZdP{q(wsKGzI*T3SOUJ?8;{iGPTS>`ESi*eC$tjqzb*SMr#M
z)Hb3_dd~B-w8qmcH>`eZ>jCKH=c9h>W)yn4cHWBqfo2!!+V*(?MNzmL{b_y%db#%h
z(Ifod+Y9}s1{^)2c(_#=6vf*2c=SicCUN8I81(X%Y4qv-B&shI=)z)#0KhwMcfN2f
zyOIY0ynpv@(3Z|OqEOTb-Ej4CZD!C<dQNoExSs+5Fn%t!tLwYv#Hk^i9af>2YkLv<
zd3IRcag%I>kOBLJiHM4?zKEJWt-@_Uus2NF{Q&@gr{$pO8a;0J2W)!*YNpS2nwnr$
zzv(8}jCvE?g1!^*p5F=KC7@0vaX*_iox7jSLVuk~S_;4l^;3Q~OTf|$P^XfJe)g&9
z*iEdCb|Zuy8FYQowa7x>zUUj96F8x7DcD9EjguYUZ~796L?V$$Boc{4B9Z*x=<ew!
z3yT@Du$VCwDmYyn!NO`4ikcBmcTc}_1rpfq{ITO9#1pf?cFL+y)X3nO2#F`AkxHc;
zH-90ON|AVC8iQvdgiVyh6SFvWJOoh_EawH{iCJV<^6+_qtCyoV-{!@k`FmEI<L1!(
zJ)Cdz;_BrneBN3{iVlbsEE(`jU&o^d%eZtUX_yd*jbcOJv>XU88~P>!u~DP*m#!r7
z=)p3c=`Q^&ZdJ$)ti)z(YV7Zi!*(|3ihqVB14@q{0syqX>@9?_0*!&jBno$8MAJ0#
z{)a>O@rN6xpPzsE^>^1Ee~noF?R!%^p}qm4X&T|J5#TmJQ4|lY4`69jE8rH5wBuh+
z3Kd9jFM&c)BTnc4?O^;|4E2?y%@8o4Rsj;~8!#H*>*-$~1C5Qw$^*9nwDhIjAAdlo
zZ-7v-y-Jg_+B6=TGZZP)5qb*zTde@wCbatlMylM?a?n*Hs2)wr(|Bl%B1ID1PIdS6
z6aV42006JlZJjh#u1+OQHGOtNt3+5mmd#orDN2tY;?F;R=88ec004NI32-4r-Yh-N
zb{>HJ27oaEj1j1NA#yrR%}#Hn?KZg)?28a@=V7%zfHmUP*4KeO$j?(F=)MHOj!PsG
b2>|>D@N<k{6DwJ-00000NkvXXu0mjf=fzS>

delta 1177
zcmV;K1ZMl*3Azc8F@JPPL_t(|ob8%VXxmmC$G=_1CT1AEI3QBYc3I}c5O9bLDT9$w
z+Jj4urGu{BXdny>p`qX&;zJB;SZGNxgur?Ug|#{K5Y|IW=opLz?2y7h_M%*7M1r6q
z#xpSpa(Fw0CnVX4^`31trSAhm=soLwfA9DHTJHx41OkCTAb$`D1Z^o43M8SVh^A@8
znXYLXNhm2&C=|#^@19lt4_U;$&*5+wwOXy|cgbY(9IGKL`VaCiT>204FSzx6IUu2=
z2mnZugeQ;h<J$FE3=JztPhUcQ<t56cBAz_H56iM(Sr!sXio7m9@0t@@={wmfZgA_j
z{ZT?mk)dG)0Do|2W)hMl0RU>X8uBYIk)FPUa5xMAuq+FUOX~oDa;b=JI3b~=$e3~w
z0Py3~*N`O1)#8-f>C3Pz3(LR!0pQpve)K=^Ye>0Nv@0jeG5}yMbJg{{xU`OPspz*z
zCbo(jw(}Q%`regCpCw7cR&j%=+*2JuTi-PI0l-zcSbr=AS(Xut#q2biZ<_lU8dmJC
z%L{G&N~H_{uCCu`{AXVjnqR4uF{WJfrSGc;m~Zy&?vz_tgRbkYd|lU(TUY}Cye>XJ
zXTI6@Q><^C`j%zEFbpg|oB;qVKb(PK7_cmhOTVoHXzMc@&H0`e+WNhE@6=U*cM|K?
z3ec*Y#eb!B+?koQdjV~IIzO@MGa0I?Dgl6KG}@F$hebRd@A@8qqG=kT6Ru$xkY(Av
z)3m|CK_-3Qs{jCe_d}+m{7$)ceHJ&Taxe@7xrH^?{pM7zX@B4cCI_4q?q(lhE_2m&
z=f$@J5=x3h`Ue02hlhu*Jo+5zALw}L^P_)n{(qKT>ATrSxHo@`Ti^G80WV%B1Vy7!
zXG(7e^AMQL<Wa3wU1`;76|<Q<mjOI@yL=!+zzKB%y@ISfaNOG7ix;LPgN`pc7M;-D
zS2zC!2BFVoY^#Z;mlZ#2`T~JKAP@)y0)apv5WH{1M<$4>szg;)SD-?#gCm?cwKPq$
z?SF}nOfcKP^bsLGGC?kUH3<MnPk)1GGz!Bo?BnVi-;QB?e7vV0CN?)W$?C6L0FIBu
zWm$%<>&UOX0s#E==Q`BCfA4O9L@V+uuWTpWPG1H992^|*7RLnD^H!b*E(e(A9(H%O
zVVZlGpSxinm3hNudO=@bpM4aj>pHTzRe$X6Y~zbBM-hpfXD*NVtFUSAotPI2g_sRs
z<ur}cY&(f}@@TA^a5-RiXBz-e`S+i$8p8v%f!f3h(;V>8$DiQY)1O^4Y^hWVZ24=&
zcHuXdJ)_Ahy|YKtG(rf0^QzbDgkIhN#$MUr)b!fJY6H^{Xm|d8bacd092f00Sbt*#
znCAdz7kk^?-)jR;_h)uMq<;XT$t#44y{%(%r#7{x)tO;CxHdwO{sDwSpEem16kfg0
zK92<#A3$j|>d59+n_>lmq*|>an_KPZc)X*HP@_?I#R>$4GcKW%$^#t7<IY$eCqcvq
rP<`O!7=ia9KH#j_AP@-Nef|d$K@zJK?7;7d00000NkvXXu0mjfM>;Fy

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png
index 4c978dd8a1f8d80c40c0a9932aebcbfb9dc17fc4..84a46d6e7e476419e52ef54138965a856ab6c126 100644
GIT binary patch
delta 510
zcmV<a0RjH{1DFJmB!2;OQb$4nuFf3k0005fNkl<ZScUDCKS&!<9LGPAlvvQfLD4D3
zj6u3&$Ryo56fy}CkS-kxB1BXOLWc|v2bl^AT`~$?D(H~K!9|=dkijF|c=@xKEWt#g
zw!-URU&uc%?@qeiXS(-(_rAaH`~BX#10NqBA0HPOB}*idDSuI`x5eOmt=<-iWJ(w%
zOT4^#GBa+HkB)2g_E=IcCZ-~Hchl?&x!bjLRv0BqtfjO4s@ycYLRLvtJD`$$ITi=t
z$6=1g$0q=8zaQ~7{D!$uh~J;T01yfV+1fq;plVx`jp9^&<rY+Jt1lj&hlh=I?mK^I
zeEdXs{`sA)?SBKRwxudL-GJPEuXoosA({R8i%2emRy-Rr3DE1^u^fw|(h8*tw3>~6
zId`)<X2m9w%K-3hXA`qxvzyfcC>zB<tJzSI1t91YJUuyve<jy6O<DBf{FqMn`8m4e
zyw1@;bV-|fh$f+F>g!x3xV$P0fcGo0v6xx00r;?*aCfDtd<y_}_HwU^zuLh6K-oYd
znGy?&5dZ=+b3-vXURaDMUA;jZ51|vICcNUh1$w@~wP_B`U7IF)zTnA#rwZu#0^jz(
z4voFy>dMIe%Cj(t{Q9Z<fIJ%*H8P0X#6CWfzdD1uEwce>m;e9(07*qoM6N<$g1!py
Aod5s;

delta 480
zcmV<60U!RD1o{JzB!3BTNLh0L01m_e01m_fl`9S#00053Nkl<Zc%1E(u}eZx6vjWH
z!Ql-L!9W66v78$8PiP4O7ip-WDF-2t;4Mxr4?+kWYHFw<T7tl(KS77Kg0~9tAmQQg
z1~>D&b{`Kby;rRe-Uo8;J?Ff0e&^oHbp!vb2p|H803v|(0)J??+oN)&j{Ca?GMP+F
z+8xIk9UfJ2)vTdVD8!&4WdIhRUYn+g!C>$uP6t8>U^l-nipS$|(LKA}-pQkKx`*cV
zGu~c1!af`h#gFkXot6^BTmU9xF%~*MI}kP&W9PIH!Zb@kJZ+30O9?{x2-xMtB~Y_U
zNTpH&fOC#qyML}b_CJZZPXHy&1d!eL`@H}Hm~@-XX2r<jVMvPcs=J`H1O4|Nn211i
z`vF$9h;%v~_`BUM?8c**%eZ86OC|Mu0NK5+RKJ@Epn8*+`A+L0y1lW*7~X!l=CJ@p
z<Z>;YlzITiCsqLQlV4Zs^Isrt_U7bf`@RpuFajUf6j}W`ub>vdv}Dm`r43NEnrPS+
zBoc|h=6Rm5{|P`CBD`Ky$^i0(<D6$bU6ik-jQbUUaB>OqoljQ_9l@f-RtB(2MF1aw
W62GyjBTOIw0000<MNUMnLSTXqW!ZiJ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png
index 1e2476bae6675900dfcd8e332ecaaa30660b13b3..34994339c14cc543bdb743fd73d8cb1c9b9fff0e 100644
GIT binary patch
delta 597
zcmV-b0;>Jc1p5S#F@H5lL_t(|obB1aYZGA{$MJVdAP#MzLzBhCWDMeR;7#J@Alzc9
z6hsFHmkvdQA~<yDQ0OEmxO5a;6m;lc5Hcl@p@-a<<m#f!;bx@pIM^pd@zSLCz1Ro7
zuPOKIb5EY+`6k>Klu}A5rIb=iDW#NB7t!uS#`6O+h!bP?4S(Xqcz$5ooybhSI{&;h
z3lbsiPGqXps|<&y+}n6Wt=<5j-;4P8;Vs2tfjItxf3q>w{iO3I$sFMMfvMFSym__D
zaCi#9_m{6(TU+Ai!^Z#=iv_l}_vrT`y6vNh_ms{%&tjH~t$r_JYkLoXm1X$x;65jJ
z?y|D{`?wwK|9{GxB+~@gPm8lbTUXw_XZ7gQXxkpE)f;$zkh*@Q^Kv(clTnfK{J^Yl
z?wDq)Ymy`}Ns^dmt83ObcZ?n6`1$k5n?@na#n-B<Gp)b#&X>-chRCk~K(o~~05`7J
z|JWaX?g4Q7mN(PAr1R2<6hVNe&vq|#Y+iY3L?*!V1AkL0R{&U8TpI1SuS@01OvOq%
zZ<0(kAkFxoFJs;~u_XYoe{jfg7>>4&!;t-h!%LI*FJeW|ekDug3NM~NfwMR8?du7^
z%>US=^U{b-fc5v<%sNo%Jf)OUN-3q3Qc5XjNp+8%e7YjpJ$7yaq`SwWPle}2vU}{*
z1UT0{mQI#O_c)i%P+s!r9y?bAEvfFYQ#D|mRQK4)36Sg_J5>YHWa%C|`3<lny2s8I
jL8<PsvlC!x_c)_pj#avU(>3YC00000NkvXXu0mjfhsZhM

delta 554
zcmV+_0@eNd1kePKF@Fk4L_t(|obA~^OCv!T2Jk0hF=ZNsK}f%lDn-76P2fs7P{CB!
z90($$Nu!M*2ZD{2jfKcoK@t226S%7qCGA2Q7eb0H(v8)wu4XqTGq=gW^Q)5C<lTSo
zzQsNO5fKp)5fKp)5iLR~rEB$u_I+OifbaWyFc@g1lwO5;S%20{3)Jcjt(4M22;AQM
zLFe%WN-5oWe8JDXBM2dqlUYW+SxTk_b`MT80309wfDi)X@fep^Px$?78|88tlgR|<
z7aah=&2>B3U#T>G*NfE4s`VYl9RL8&{cdtl0MKsj005+vIKSxNx!+xCy*x%2pjL0_
zFdPCva!{V<L4QgK&+}62VK~HI^Hc-bcWlvmCX72Ed>tmAPtWdB+kzlS{VqPaBJ0hv
zZt~}U-G}5><_)F4>b~@T*RKkz_Z`MVFxKn!Gyqg8mDG9=1gKW4bMMD?y)0ISAOP$)
zTXU@!T`!B33s9>!^v34am-Q%$u(7$7+s;MQ%VRVHrhkc|Xr=3YX6+FGfTPxB>icLk
zTB&-|SQ{pJZTWG!FRLCA5fKp)5fKr&&Q^MC^_^f5Y^TT0y<3|%J)V^uJJ$h#-SpUc
zF7Q8nO^<hy)L2USVLg=|=eB@z9bh{>cB%swOONw8Hw0t0(qrcyftaoI*vSiEGd*@{
s225j`9wR&10Wlltv9m*v=`q>y2FWjeIfr7EwEzGB07*qoM6N<$f)yD7GXMYp

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png
index a6427aecd25fc84f2b3345ba6d1d32162a019dc1..8411b0b0cdb0a71ebc3f23d3e2e65e3826d3a736 100644
GIT binary patch
delta 606
zcmV-k0-^oY1cU{UF@HWuL_t(|obB1aYZGA{$MJVdAP#MzLzBhCWDMeR;7#J@Alzb6
z3Z)JXE***pMR4fQq0mWCaOo(xDCp3?AY@7*Ll3zzKkA~(;bx@pILL+Myi1<Di@iMZ
zeND-8m*+lt$UO=9fDl3mA%qY@2qA<J0-$~7Da&?Lf8eWNtbaf7m1R4sedej@ufBR|
z^Df0rR;^xVIK1S+!^hO>4FGywk53=pQ7jf148CIDZbZKRs%6Rh*MMa^s#b6C_Voe7
z;Uxe+UcF&sV})NkPXH(u3+(P4((8J3+NZfLLe{*?QIqz%9=m&o0IaRT&+SKC+`G@(
z>YwAmWQ!t8-hYV&2v#$gG;r<x2i8wNPh1e7R&QY0PHy|b-1GJa{%8}iY)5Tw?W<<1
zqkP|2zVEAMtD`oz_Ej*+`1yI5N8ZBtlN;6bME7&j^XF|Id1EJNwmJ&n*3J6Fxcj9G
zz}-96LVN=R(&mla1Oc8sKZw29v}1Wmn>TU+EZb3~a(@MYrR9~;c<{JXuH?G;g=NWG
zh#CwVpVS0N^2Xi*07u6soV)Jm`MK+IbbOL6-9MBjZ|p`Ed}K=H3NK$g9bMr2w+n#W
ze*uQ2%{%i=gzue2d*flI<rP8*A%qY@2qDCRGp#Y!q5W@(X^pWit+1vw#z{>5S9qLh
zjj^to3s+!TV?1}JHO5KJY=%s0jFU<f*0jc0hxR6jfsL^a?FBHcG1jHk4o5MqF^-ey
s7Qn#9c$P$)mT8T#j#PoAf&GvC1~Hhre|XKX>;M1&07*qoM6N<$f^?EHF#rGn

delta 559
zcmV+~0?_@01=R$QF@Fz9L_t(|obA~$Yui8=#__*Ph8w*kAOhY6o;>&~bTM=+g{06-
zT?&Oz@RB823ZW3llBr9EP&Ap8KtIA6+Q~`qD)3T)@!-MRb&9ZTOTLqns2ASfB%N&O
z(Q)?<dO-*wgb+dqA%qY@2mzqAHm!EYL{Ve_q9`)M;m~NUO@GzdRw<kJ)#5;_-7#8g
zqm<(6@*BOId$iW3cXQ9X{X>*e>BFAtWn65Ux3)O2_u<$8eEIwar4*CNg!7AEeERsB
zdcDqUHskcH2f*d`qZ&Z1wsf0k<C=Fd>(UAUxV!DAe*!q_z6Br%0#46*+}-w{=50#a
zByVN{TJ4TWl7CTpQ-ClG34(wy3^U_NGGhPWq|$Bh7<rdgK=OB#9-n;uk+~Mfaprdq
z53kaudAH_I{`7yQ8>Fbn{npoWd+EY4^5ZF&H!HV#4F&@P&}cL=<8d6*Y&NT_dO6DG
zU0DPH-XC<G#;aB~@5%{iwL4~eXLo6QI-Rn;vs<{_s(-La-mSa~^EdH{Yu?-~0C3nn
z&zz6PWA{YQs7&76;!w0~=Bw}j!neFa2qA<JLI@#*5PtBjV{D`Fo8SZAI>s)nzLojb
zF?M0K0>HnHv8}Ze;9JMomDLLHtz+zBZD+{0j<GAJO66O}*oJix1phk5HmoPWw~n!`
xwKZTB-zYl9MVz((_}4LB$Ek2h2Ufg1{{V`2epd)$o*n=I002ovPDHLkV1gQ@9ESh^

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json
index 4925be79c9..2120cbf60f 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey derivative made by brainfood1183 (github) for ss14, Further edited by skrybl(discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING-monkey.png
index 4db02b479644f7656c99f3e12ff2d19f3154a607..910ea84259f8ec885a74655c8b99bfd5adb0d80c 100644
GIT binary patch
delta 1261
zcmV<J1QPqfp#gvjkR*Qrb5ch_0Itp)=>Px(x=BPqRCt{2nn7qAM-+ztEyczrhf=(I
zu>{hg!m?FVY_#X1AmW1$rh$?i9101+J_v$MjoZ{dM6{R&`=Wz`aRafTCMjubFr~q@
zFUE#llMoYG&gNo+tjjJ45lELdhv`9@=~{A>osHJCFdr<^&J2I^&wKmk&1gq}Kp+qZ
z1OkCT@J@Qw0n)1u5W_Htv)nKYLhE|f0blhsO{>#+Te%xP;1QRVPRL3p06^0;Vi*R|
zG>rg&qs|v6^r{0S6pkVii6Eh-FqfTV`Uy3KNF;(#ILfX6p-b_KfpW!oMNyEMzK`_q
z1!V6$Ms_yM>MVb==+VT+`T!uy0hp$VU46ZxWgSD71K8EqVVeDr<p7Qj54iev8v%qG
z2mrQiWBeoF<KH%M`;&99ZJX6KI|{1(kc66IWzO%l_tozwrf4HvPXPe1tRnLJI>v7<
zpyTUnuwT6a`RWqJZ!RFeufwv6a5}2lSk^Jh<uXRo{Xl;;A^>1C-H&p)49hy^?o)Ep
zh|Yh@ETX$dm9n#GQn-~xa4HS@nI6qb`F)+WqkTWs*SH7e&_zN`VOL*gPc#&cN=JtW
zWaIG?Yj^&_5SEu_q{~BNtld+6&6RC#BR~Qm$x5e`-`7ccv|=;>YCQ7$I&rq+G1QHI
zLQP53_)vd1imSsvz%)%vOfDi6j^gsr7zu@=QYaji5^Bn|KGzhW{P_K~hWE|n=qL{W
z*wxorf|KO{e!BB5X0yLzI&+0hg`>j*{CfX3OOkHjdQvnYt*y+Xt*wof+qR8?!Rr7Z
zy-&!y)vry0s5;1tK5qn&?j99|LV;y|+qO|C6wrU&qr$H}fKxxArdYCbe$wpEtM4fS
z0AMaViC{2@LZN_>bml~Veno*(zZN?0clC8HeODWy8YF5w00e_UtgXz~I>I-25}X@c
zcSd)Ebf@QZLap(BL_n?nY0!EeeeP9Y@$NL%R_2-Us7Ar!-D&na!B1qR6U$382!*5U
zT3&ye@vP15fU$`zN~O|?vQnvpv5Bmw0eIn?sfC93Jb2m%P$$sqER6?%*RNmIU0(6B
z3Y;2lbZ(x(KA@@ko-*obYptJ#|JU>d0)apv5C{YUfk5zo$J5W@SUgGJ%u2bvO%USx
zEb_gOr265;;z`gq#ksxBW}isa6N@KFE|-5Jxm=DIhCyQSBq4<0EG~+sX^6#>h{cn{
zFbp;x$AfVVm&ao9BqCjXgdRmrXRg3BO<eqPg!T9Q*#_?zTq8*mc6N4fedId=01qF`
zK~WS;OfCY|1Cp07o=Ca9P1k*LpA1ps0bpWs5sISV;e$Cm8mvFA@{31<sXF8F?{R-Q
zR}^@9DQa2A*xp)&WgRmoble!m&&khyPX_0H`Ga)a7-q&h$KnM~4ydJAZ2sS3&PtQl
z0hRNAIdCF(Ol9s>I=lKsQwG%tszEg=)iFuDdCgM<Y;UcSNLSy9va^hWTCGS|AGWtv
zJxxC@2eh=dGvl4f5RNDE>1XGC%L8R}nLFj_GbgmPwsZB#<$&d-nYY%-a-eQtelV4}
zSLb{ujmCHy+$TeS|Me#tEj7=dZTPkuyLf3FFJC-q6k$?JYr8lk5eNhVfj}S-2;R*<
XoC0?hN}*KG00000NkvXXu0mjfy24`Q

literal 20673
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
AF8}}l

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png
index b5a12593874bedf992124bcba3c5bcca8923ddb9..65b575cac28f177d05c17adbda16caa69a4d6d19 100644
GIT binary patch
delta 1228
zcmV;-1T*`b1k?$T7=H)`00020X>r~F0004VQb$4nuFf3k000DzNkl<Zc%1E;QD{?F
z7{~u9Zk1sImrl!ssC{uM>nNm<y^K9{jBOAf>N<o%iw}-%O3V5X)F5FNjTU6f42lrU
zOJRMOpbueC*an7@hZF-dD~Z0udkbQOd1ew)Z(BHfxIH)brhhe_dzTvvJ3qMOo^$R!
z-*^7!yXQc@0|*2Hfj}S-2n4SryHue5K#<A`p~iYyA=DoT((F=!zWnW-X}`;g@#eCu
zkS#`?62aK-*>h2o{j=wy&e~_{J}FlzQ~T(#5X~+X=+R>#eO8{7tCY=>)Aq+ELi+Vz
z?7uPs{DB}n)PL8H%U6<m-R)a*_<p||QtA$_4Zefhx90S=%U6;()Yp%8iQo?esn6Gs
zSiE81=j%5;V=TwwN%(yH_PIZSN2LNzPR#%SJZ|8{*q2zXtYhVq&*5=v&zzi^!J|@v
zw@XVDiv_6a1_0pNPhnFVE34`TibZSoTMEEtzh18an|~rOcK`efypc&rsXKZdYp>U9
zZHWRl`_G7Ge`IuAZ+oFOE(U9VMrzzqz!d>c%PYubQ!W6Q4n>h)F2Ng_1OUAK-8aZD
zmoOdD7NT4><$79Pu{czI``z8UP^khpZ)mfA^F|nzs#b5u{;pPy?A!LZ0ZEd$JN<oO
z4wb5Qe}C`*|9h{)zRQY3>BSrcfcM|)+tQX_E&%{O`p|EwPb;ub^7_>XRCNO$H}u(O
z>ko?*#~es6<|rX#%avZtwSD_*Mphd3*nM-I)jqj*0e>J!_w{-K0Ise*rZ!gI*XwQD
z_O~4)qvJS!Li^^YLs8T3@e^UwBFRh3HJ}yEB7by}sp&AT{unj=+J!p;7}41T?&tHS
zy8HP&qO%FxPViuiK;xj92(TG}wjv-pn?U&VSEh2OP}hL3Pnl=DxoibXD<)Hy&4dxQ
z_d2->J7M3Jv)hH4qub98vo8<`1OkCTAP@)y0)asA|6*Wpn5GwVG`*NJ{SWW-;Rqu}
zTYs`bbbkg0hn>p{U~}+?eM5-F=Yh?Xm8=jtHW8w+coLaR#&HocnGB7^lNg%_QCT6B
zWu{~Cc^vi)!Kw(B{}yM&;`7Kam*8;&mo9{HrpJxF3wP~y$Iae_yExP1#-$5kc-&e_
zj!lRiYzgqZQp3aIJ)FOo&_(b@Cb3#sw}0&jFRPVxcq5bg;Ll%7;9>C|o>ywN`m-#6
zT|=F~j&HU<f$jL`i(osu>xd0o0+b&=005A`+j|hg4$KGUlU2A=V}ua;@u%bX?bqvi
z0>b5T0hsC7_O~6mY|2Gx!-b&_j!;4fl_ZHPQNk^NBuOrIKw>8o`(XyWgNGFXWPgRw
zk<oGFvMJlnIfWL98vZ~KvO?&=1AHQIuK}`B!kSvgXGgx(qk!GJy7qMRynxYOvp;KU
z9kNp5?~C`rfx%(gyZ>DPz#C0*!&2qZ*@WptSG!?n1dR5KtZT;zQGWaYfBpFfmk*W%
z0DzZ?fDWX{TcyX1g9p%l0bmdT21Oyzv>iH~rZ%R=rJjZm#%+*y@UVM6z$nC<-ERS}
qAwSQASX1kIot1$L1OkCT0Q?KkxvUrf>TsL@0000<MNUMnLSTZ`Qd$cD

delta 527
zcmV+q0`UFR37iCw7=Hu<00013M{Ml?000AXLP=Bz2ngHZPv8Im02@$DR7C&)05df_
z+1uh99VRn1JWNhgu(7w<+v4{2_;IEq<p2Nx19VbOQvd(}`gX+L0004=Nkl<ZNXPAz
zy>5dr5P&bWX)~5L=#U49WJ5Ye^0_cp!l-K{+R(8Q2s~D4Du46X1=7H|%Gjk+P6+8U
zpU#|r4&V}h88;e&gfarB3~vWxx@W>)s44T!Cn_fiA96z&G+J?A>n&lO5{6uroh$U?
ziH&^I>5H708xh+^NHg>1;ARG%@lEF>I}HRGd#D=4^dzXGfD<!SRchj4sI_fP%I2!6
zkgmhEZEZujEq_bOz-`yj3`|zFphD1>`AUUU-YY7YxNYaM0kS7dGQyzLu2A#B0ZL;e
zVOVJq(Z3Fikh!<tEA*-Y{)++bE|=mGb1cGed=Jmruy)_S!y#_Rfz&zg*kfY#kY<SS
zn7bP3spdK>561+@6loI~da8MZaZQD!z>Esa=-B?uFn`YB3ZvJ)u;~`zsEl=Vl_y*=
zjfpSRXo#>}^|M+ymNAaF{;qF7<_vu=*!jW^pd^iz0mQyg0Ic69Vb9l0lvHTMnr)Y)
zA0R66I4^Y|Bw|F$#K`ErA4~#QMrY{V_FN*J0#%ONGyPx@o^~7k@Bcl%0heB9;(I{?
RuK)l500>D%PDHLkV1m3q@xA~6

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png
index 9add6c81b8b4efd7264f177503fa73bc3ac0c439..180bd80e03dffbbf77f2408d74277fa27935d015 100644
GIT binary patch
delta 500
zcmV<Q0So^60fGdO7=H)`0001UdV2H#0004VQb$4nuFf3k0005JNkl<ZScUDBJxIeq
z6vuxRr3zXoh)z{Iinw&>ByJ8uCqV>paS%jMR49T&hYo>Gf`Us&!9_ubE)Fi@ltKqX
z$(VjD)}?5re!@BEm9*9N64(5u+`ZiY{qMb(fQN^Nhld07tbZvY(U>Tfs=~fsELBA$
z8WVcf6n~%oogOF2Ti3->wJoU|6J3$FyRX!QyzRnLT<BR-EG)$vRk^R!gshUPwofJb
zM0gT_<HH1RZ=V1>9vm?c=ws0D=Y3@r0KdPNjjbdA1<NF-XS(Vux1eB|4e`Jbye=>D
z^7KJ@Zl1u<_kTMZTS*F*sVdpsfV_RZ{@gGj=|4Rql-MMgxok2CP_I8T5uQY)6-pI&
zsFWM!+=*)#d5chD6M*6Eb&R~lPFw>Zr)PW*m9mN~0KJ`p7w0GNQ}SRis4RMYb;48a
z`+0n<^SQ1=V&~>ICjh3W!fi1lZvikn6LF-eJcIz-yKRYo#s6g>5{-$G(GUQ>p24P=
zT#t-~lm^dE#~J8Es|mL_Y5{<jN^@rzO?!8SftE_UGT^ELS}M){-dfYzEsiEu_E*k=
q9r^96{C-^<Xf<NTX<`o#56KtV_qn7!vW$rU0000<MNUMnLSTZ_+T~#Y

delta 234
zcmV<G02Tj&1o{Dx7=Hu<0001iRA<Kk000AXLP=Bz2ngHZPv8Im02NS7R7C&)02>`9
zGc`O+PE)Y4x7pj`_V)NpZJDzG0004WQchC<K<3zH0001lNkl<Z7#Y>UK@P$o5CzcR
zsU83<t_#F{#S7SIJpd`}Yr@?B2yT$h2~2zsf9B}XUm(2RA!G0z4Vlf^qS1Jl)j9eR
zUpKpOnf-){f*SIwbU;N{GF)^QP?06WMRyJjrJN#!Lr!^xK$$s0=oc;z2w_M`PuN-e
kob8Amd3AD-$T|Gd2T)%U)bG4iu>b%707*qoM6N<$g4o+#5C8xG

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png
index 05a43b4307e012fa5944170445020c381b1555bc..e12234c6f6dd1d52347360dc08c0ab150211971e 100644
GIT binary patch
delta 542
zcmV+(0^$9Z0;>d&7=H)`00020X>r~F0004VQb$4nuFf3k0005yNkl<Zc%1Foze@sP
z7zglgA=FSpLpoVHin!cx|3O1=QxH+KG_(YXO9TxK4M9^-(Bj_G(%@epO$H7*IF>fm
z^3s+OybbvtBAsRLbL9))&*XbQ9$#PYIga}RL_|bHL_|bHM1S-f_1l*A{6M!mN}Fx%
zj?$hV==yC-4?jEpdQm293wVB@v$;Gj&JNM-z5@VWPR}tvKZCc;EdapOR02DtBRt%<
z(5P33ey4Q3?@Zd9Y&_hzuv0n$03>ID*Ns&?E-fQD`?=pt_P^>4W3>S0-$HNF#`NVC
z=Bn4>*zC*Z@_+FBAoB8+t{1y@M}<A=`GH<p+tan1hE_^xrIfDSH1x{ao;H*0KmIT3
z{Y1j%<i&-#k^1ku<E88UgvdR>DDSSLSjdIrVj+j}?)uo&`-;c{cz&Q$=?nm1Vsa+j
zZa$~dnUQ)`y52BWEfA%D(&JdKpJ)plpHy(yY=+~zW`7gMCzY|O_Z91#h+!_tR62u$
z{cWK41D>BA0bt|@7U_CX#1_C9>`mK=O4lPIA|fIpA|fJklvH}`-1{}@^jP$@_+ODs
zkDXco=h9<oaiqtwL}PJ@BRzJi1qMl^$4)MQWP0pW3q-L=kDa^%42ksExd$ObDm`{~
g0Su<cL>E>*0CpvJRXPV#9{>OV07*qoM6N<$f<v7IQ~&?~

delta 262
zcmV+h0r~!`1eOAj7=Hu<00013M{Ml?000AXLP=Bz2ngHZPv8Im02okAR7C&)0NLB(
z8yzMyH9SmCQ?RkO+1ujw_V_kYS&;w$00MMUPE!B?c9YFG0001-Nkl<ZNXPAyK?;K~
z5Jgk%Nfcd&Owny=@E)R|`-08&iy)dm%xujjZ}kWt1HorZCV!KN*_0!<m|~@VVg^uG
zwPeu%--NAxqs5dT7rxGe;lS<31jgvr#d5<z_*rgn#}GEp40yU_dNBhYRMp3aFJp`I
zlx+U<GU-~EQ3{t@SC9*rTGs|z;Zp0`KrCEpT|p^4eh9hncyV9hf9Pu~p#+|H{r~^~
M07*qoM6N<$g7m;{`Tzg`

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png
index 6bd8bbd220dfa2dee1f9e8b6d563b26848e06b7c..8ccc800f415e9800553c2a499ae2130c9e25f970 100644
GIT binary patch
delta 552
zcmV+@0@wY&0<{E?7=H)`00020X>r~F0004VQb$4nuFf3k0005+Nkl<Zc%1FoKTE?v
z7zXgCQqVyQ9okM+I~H-tkZ<51WD-Oa7Y7$X=~4s-2M57PP;lw);^NRxAWjuJ*rB8S
zGwE`;sR-vF7ivtKTpHV+Jin>Ark5v2-y`G&h=_=Yh=_=Yh<^wGY7b3m*^X>?gj8eg
zj*yn^$l60w4*vD%Ma`S=4p_D$7YjvPT^!^6{SyH2dVYyaW)>gYI{<*`=_K|JPSAR4
zqF$^1nq!oP%{%2cY3r$py@L|~Kxz(n+ge9=WfiHp@9))QlVX^>KNdi(rkYflxxPWV
zdi&#o0I*mn!hf=zv6VyYdD|V~){td8a&4n5@9yhT2qA?K^6tJa*EY&hP11Y*IK+`R
z*?X`spVq2p-SguXM_%7OKq>8SVtJ|H9xpEyP}<+rOF2SO^7<}-WjivP%L4!sQ?u^4
z`kc+>$6EVd!{kl+4SMxXY66|S154oatb)fz!##d%G=Fe<Rv9kcABvK<?<S)DGTB@n
zM~A!a1zw)J05J9kAg`!-18>4xJCk<fUZ&+GA|fIpA|fK9iDp{IIE+y5%S`JS>lpZ2
zyq9Sm<FEo3z_gBW>`dzz>k4d*nbtAZ6?zX)OzRj23B3TOb&SIb)gAU@TF1B_?GiAp
qV;n?l!yz)QV;n}L!0f;h{TpA~4R=*RSFHR10000<MNUMnLSTZFPXVU@

delta 304
zcmV-00nh%m1iu217=Hu<00013M{Ml?000AXLP=Bz2ngHZPv8Im02okAR7C&)0NLB(
z8yzMyH9SmCQ?RkO+1ujw_V_kYS&;w$00MMUPE!B?c9YFG0002RNkl<ZNXPAzu@1r@
z5QeEVzCd5VfVOMH5nPSL7ceGWO`FiYroGp9(+kv_j4u4+cYj|32OL7=<orB?kav!5
zMmY9KoltP9hBg)m^#`2wDHh&To()dMM|DD_F*q5B1xno*+O!Ko9WHCai^>bmKB*I0
zn$X)sAhZCb(<LY^U}Xy*Xim;ovTcQ9h57-@j;TxN)c}l8nhvj)5v*=d@0nK)x<ReE
zF_2*y*e>LVyeVKiys?Ak>yZ9ZG?h`npLGR)yyz#pPAawGvdw}30000<MNUMnLSTZE
Czko{s

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
index cf80073506..340be8ddc5 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "By discord:Van#1931 based on janimaid.rsi taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "By discord:Van#1931 based on janimaid.rsi taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey derivative made by brainfood1183 (github) for ss14, Further edited by skrybl(discord)",
   "size": {
     "x": 32,
     "y": 32

From c35ef4ab6599f44e7656c0279419b9f23fcfef62 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 14 Jan 2026 20:51:19 +0100
Subject: [PATCH 312/360] Add a target station map to the LoneOp shuttle
 (#42376)

Initial commit
---
 .../Maps/Shuttles/ShuttleEvent/striker.yml    | 283 ++++++++++--------
 1 file changed, 159 insertions(+), 124 deletions(-)

diff --git a/Resources/Maps/Shuttles/ShuttleEvent/striker.yml b/Resources/Maps/Shuttles/ShuttleEvent/striker.yml
index ce518370f8..17890b271a 100644
--- a/Resources/Maps/Shuttles/ShuttleEvent/striker.yml
+++ b/Resources/Maps/Shuttles/ShuttleEvent/striker.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 270.1.0
+  forkId: ""
+  forkVersion: ""
+  time: 01/12/2026 10:23:32
+  entityCount: 295
+maps: []
+grids:
+- 325
+orphans:
+- 325
+nullspace: []
 tilemap:
   0: Space
   29: FloorDark
@@ -23,20 +34,20 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAAAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAADdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAHQAAAAABHQAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAAB
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHYAAAAAAwB2AAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAMAHQAAAAADAB0AAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGkAAAAAAABpAAAAAAAAHQAAAAABAB0AAAAAAQAdAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAQAdAAAAAAIAHQAAAAABAA==
+          version: 7
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHYAAAAAAgB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2AAAAAAEAeQAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAEAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAEAHQAAAAABAB0AAAAAAQB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADAB0AAAAAAgB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHkAAAAAAABUAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAeQAAAAAAAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         0,0:
           ind: 0,0
-          tiles: VAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: VAAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
@@ -48,6 +59,7 @@ entities:
       fixtures: {}
     - type: OccluderTree
     - type: Shuttle
+      dampingModifier: 0.25
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
@@ -172,18 +184,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -191,6 +193,8 @@ entities:
       shakeTimes: 10
     - type: SpreaderGrid
     - type: GridPathfinding
+    - type: ImplicitRoof
+    - type: ExplosionAirtightGrid
 - proto: AirCanister
   entities:
   - uid: 91
@@ -230,6 +234,8 @@ entities:
       currentReceiving: 15106.935
       currentSupply: 15107
       supplyRampPosition: 0.064453125
+    - type: Fixtures
+      fixtures: {}
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 6
@@ -635,98 +641,6 @@ entities:
     - type: Transform
       pos: 0.5,-6.5
       parent: 325
-- proto: CapacitorStockPart
-  entities:
-  - uid: 233
-    components:
-    - type: Transform
-      parent: 41
-    - type: Physics
-      canCollide: False
-  - uid: 234
-    components:
-    - type: Transform
-      parent: 41
-    - type: Physics
-      canCollide: False
-  - uid: 237
-    components:
-    - type: Transform
-      parent: 56
-    - type: Physics
-      canCollide: False
-  - uid: 238
-    components:
-    - type: Transform
-      parent: 56
-    - type: Physics
-      canCollide: False
-  - uid: 241
-    components:
-    - type: Transform
-      parent: 58
-    - type: Physics
-      canCollide: False
-  - uid: 242
-    components:
-    - type: Transform
-      parent: 58
-    - type: Physics
-      canCollide: False
-  - uid: 243
-    components:
-    - type: Transform
-      parent: 58
-    - type: Physics
-      canCollide: False
-  - uid: 254
-    components:
-    - type: Transform
-      parent: 95
-    - type: Physics
-      canCollide: False
-  - uid: 261
-    components:
-    - type: Transform
-      parent: 96
-    - type: Physics
-      canCollide: False
-  - uid: 268
-    components:
-    - type: Transform
-      parent: 97
-    - type: Physics
-      canCollide: False
-  - uid: 275
-    components:
-    - type: Transform
-      parent: 98
-    - type: Physics
-      canCollide: False
-  - uid: 282
-    components:
-    - type: Transform
-      parent: 99
-    - type: Physics
-      canCollide: False
-  - uid: 289
-    components:
-    - type: Transform
-      parent: 100
-    - type: Physics
-      canCollide: False
-  - uid: 296
-    components:
-    - type: Transform
-      parent: 101
-    - type: Physics
-      canCollide: False
-  - uid: 303
-    components:
-    - type: Transform
-      parent: 102
-    - type: Physics
-      canCollide: False
 - proto: Carpet
   entities:
   - uid: 74
@@ -1195,6 +1109,13 @@ entities:
       parent: 58
     - type: Physics
       canCollide: False
+- proto: HandheldStationMapNukeops
+  entities:
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 1.493886,-2.2168128
+      parent: 325
 - proto: MedkitCombatFilled
   entities:
   - uid: 19
@@ -1204,6 +1125,48 @@ entities:
       parent: 325
 - proto: MicroManipulatorStockPart
   entities:
+  - uid: 233
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+  - uid: 234
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+  - uid: 237
+    components:
+    - type: Transform
+      parent: 56
+    - type: Physics
+      canCollide: False
+  - uid: 238
+    components:
+    - type: Transform
+      parent: 56
+    - type: Physics
+      canCollide: False
+  - uid: 241
+    components:
+    - type: Transform
+      parent: 58
+    - type: Physics
+      canCollide: False
+  - uid: 242
+    components:
+    - type: Transform
+      parent: 58
+    - type: Physics
+      canCollide: False
+  - uid: 243
+    components:
+    - type: Transform
+      parent: 58
+    - type: Physics
+      canCollide: False
   - uid: 250
     components:
     - type: Transform
@@ -1228,6 +1191,12 @@ entities:
       parent: 95
     - type: Physics
       canCollide: False
+  - uid: 254
+    components:
+    - type: Transform
+      parent: 95
+    - type: Physics
+      canCollide: False
   - uid: 257
     components:
     - type: Transform
@@ -1252,6 +1221,12 @@ entities:
       parent: 96
     - type: Physics
       canCollide: False
+  - uid: 261
+    components:
+    - type: Transform
+      parent: 96
+    - type: Physics
+      canCollide: False
   - uid: 264
     components:
     - type: Transform
@@ -1276,6 +1251,12 @@ entities:
       parent: 97
     - type: Physics
       canCollide: False
+  - uid: 268
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
   - uid: 271
     components:
     - type: Transform
@@ -1300,6 +1281,12 @@ entities:
       parent: 98
     - type: Physics
       canCollide: False
+  - uid: 275
+    components:
+    - type: Transform
+      parent: 98
+    - type: Physics
+      canCollide: False
   - uid: 278
     components:
     - type: Transform
@@ -1324,6 +1311,12 @@ entities:
       parent: 99
     - type: Physics
       canCollide: False
+  - uid: 282
+    components:
+    - type: Transform
+      parent: 99
+    - type: Physics
+      canCollide: False
   - uid: 285
     components:
     - type: Transform
@@ -1348,6 +1341,12 @@ entities:
       parent: 100
     - type: Physics
       canCollide: False
+  - uid: 289
+    components:
+    - type: Transform
+      parent: 100
+    - type: Physics
+      canCollide: False
   - uid: 292
     components:
     - type: Transform
@@ -1372,6 +1371,12 @@ entities:
       parent: 101
     - type: Physics
       canCollide: False
+  - uid: 296
+    components:
+    - type: Transform
+      parent: 101
+    - type: Physics
+      canCollide: False
   - uid: 299
     components:
     - type: Transform
@@ -1396,6 +1401,12 @@ entities:
       parent: 102
     - type: Physics
       canCollide: False
+  - uid: 303
+    components:
+    - type: Transform
+      parent: 102
+    - type: Physics
+      canCollide: False
 - proto: Mirror
   entities:
   - uid: 321
@@ -1404,6 +1415,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-3.5
       parent: 325
+    - type: Fixtures
+      fixtures: {}
 - proto: NitrogenTankFilled
   entities:
   - uid: 105
@@ -1476,6 +1489,8 @@ entities:
     - type: Transform
       pos: 2.5,-2.5
       parent: 325
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandEnergySwords
   entities:
   - uid: 227
@@ -1483,6 +1498,8 @@ entities:
     - type: Transform
       pos: -2.5,-6.5
       parent: 325
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandNuclearDeviceInformational
   entities:
   - uid: 228
@@ -1490,6 +1507,8 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 325
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandSyndicateRecruitment
   entities:
   - uid: 229
@@ -1497,6 +1516,8 @@ entities:
     - type: Transform
       pos: 0.5,-3.5
       parent: 325
+    - type: Fixtures
+      fixtures: {}
 - proto: Poweredlight
   entities:
   - uid: 94
@@ -1706,25 +1727,37 @@ entities:
     - type: DeviceLinkSource
       linkedPorts:
         193:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         192:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         190:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         191:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         196:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         202:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         201:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         200:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         199:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         198:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSpace
   entities:
   - uid: 230
@@ -1732,6 +1765,8 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 325
+    - type: Fixtures
+      fixtures: {}
 - proto: SoapSyndie
   entities:
   - uid: 90

From c037990939752daabe44022fcb1346bd84b033db Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:22:28 -0300
Subject: [PATCH 313/360] Xenoborgs now drop pieces of pinpointer (#42295)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add sprites

* update sprite

* repaired sprite

* repaired pinpointer

* different id

* piece of pinpointer core

* borgs drop the piece

* end of file new line

* typo

Co-authored-by: āda <ss.adasts@gmail.com>

* make the tape darker

* four variations

* same variation in the crafting menu

---------

Co-authored-by: āda <ss.adasts@gmail.com>
---
 Resources/Locale/en-US/recipes/tags.ftl       |   1 +
 .../Mobs/Cyborgs/base_borg_chassis.yml        |   2 +-
 .../Entities/Mobs/Cyborgs/xenoborgs.yml       |   2 +-
 .../Entities/Objects/Devices/pinpointer.yml   |  47 ++++++++++++++++--
 .../Graphs/repaired_xenoborg_pinpointer.yml   |  34 +++++++++++++
 .../Recipes/Crafting/improvised.yml           |   8 +++
 Resources/Prototypes/tags.yml                 |   3 ++
 .../Objects/Devices/pinpointer.rsi/meta.json  |  20 +++++++-
 .../pinpointer-xenoborg-piece-1.png           | Bin 0 -> 410 bytes
 .../pinpointer-xenoborg-piece-2.png           | Bin 0 -> 316 bytes
 .../pinpointer-xenoborg-piece-3.png           | Bin 0 -> 315 bytes
 .../pinpointer-xenoborg-piece-4.png           | Bin 0 -> 374 bytes
 .../pinpointer-xenoborg-repaired.png          | Bin 0 -> 504 bytes
 .../pinpointer.rsi/pinpointer-xenoborg.png    | Bin 0 -> 353 bytes
 14 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml
 create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-1.png
 create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-2.png
 create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-3.png
 create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-4.png
 create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-repaired.png
 create mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg.png

diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 1b4ca5656d..8d739eef6f 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -73,6 +73,7 @@ construction-graph-tag-apron = an apron
 construction-graph-tag-utility-belt = a utility belt
 soil-construction-graph-any-mushroom = any mushroom
 construction-graph-tag-mop-basic = mop
+construction-graph-tag-core-pinpointer-piece = piece of core pinpointer
 
 # toys
 construction-graph-tag-rubber-ducky = a rubber ducky
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 7f1a7cc184..ade10ab5fd 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -561,7 +561,7 @@
           collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
-          PinpointerMothership: # drop a pinpointer to the mothership upon being destructed
+          PinpointerMothershipPiece: # drop a piece of core pinpointer upon being destructed (4 pieces to make a core pinpointer)
             min: 1
             max: 1
       - !type:EmptyContainersBehaviour
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
index ecd44279fd..eb0edc8f4c 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -122,7 +122,7 @@
           collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
-          PinpointerMothership: # drop a pinpointer to the mothership upon being destructed
+          PinpointerMothershipPiece: # drop a piece of core pinpointer upon being destructed (4 pieces to make a core pinpointer)
             min: 1
             max: 1
       - !type:EmptyContainersBehaviour
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index e6ab450c93..f71cb29b36 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -168,12 +168,11 @@
   parent: [ PinpointerBase, BaseXenoborgContraband ]
   id: PinpointerMothership
   name: core pinpointer
-  suffix: Mothership
   description: A handheld tracking device that leads to the direction of the Mothership core.
   components:
   - type: Sprite
     layers:
-    - state: pinpointer-station
+    - state: pinpointer-xenoborg
       map: ["enum.PinpointerLayers.Base"]
     - state: pinonnull
       map: ["enum.PinpointerLayers.Screen"]
@@ -194,7 +193,49 @@
         color: "#3a3a3a"
       - state: inhand-right-top
   - type: Icon
-    state: pinpointer-station
+    state: pinpointer-xenoborg
   - type: Pinpointer
     component: MothershipCore
     targetName: the Mothership
+
+- type: entity
+  parent: BaseItem
+  id: PinpointerMothershipPiece
+  name: piece of core pinpointer
+  description: A piece of a core pinpointer. You need four pieces to repair it.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/pinpointer.rsi
+    layers:
+    - state: pinpointer-xenoborg-piece-1
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        pinpointer-xenoborg-piece-1: ""
+        pinpointer-xenoborg-piece-2: ""
+        pinpointer-xenoborg-piece-3: ""
+        pinpointer-xenoborg-piece-4: ""
+  - type: Item
+  - type: Tag
+    tags:
+    - MothershipPinpointerPiece
+  - type: Construction
+    graph: RepairMothershipPinpointer
+    node: start
+
+- type: entity
+  parent: PinpointerMothership
+  id: PinpointerMothershipRepaired
+  name: repaired core pinpointer
+  description: A handheld tracking device that leads to the direction of the Mothership core. This one has seen better days.
+  components:
+  - type: Sprite
+    layers:
+    - state: pinpointer-xenoborg-repaired
+      map: ["enum.PinpointerLayers.Base"]
+  - type: Icon
+    state: pinpointer-xenoborg-repaired
+  - type: Construction
+    graph: RepairMothershipPinpointer
+    node: repairedPinpointer
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml
new file mode 100644
index 0000000000..beaf73dd6c
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/repaired_xenoborg_pinpointer.yml
@@ -0,0 +1,34 @@
+- type: constructionGraph
+  id: RepairMothershipPinpointer
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: repairedPinpointer
+      steps:
+      - tag: MothershipPinpointerPiece
+        name: construction-graph-tag-core-pinpointer-piece
+        icon:
+          sprite: Objects/Devices/pinpointer.rsi
+          state: pinpointer-xenoborg-piece-1
+        doAfter: 4
+      - tag: MothershipPinpointerPiece
+        name: construction-graph-tag-core-pinpointer-piece
+        icon:
+          sprite: Objects/Devices/pinpointer.rsi
+          state: pinpointer-xenoborg-piece-1
+        doAfter: 4
+      - tag: MothershipPinpointerPiece
+        name: construction-graph-tag-core-pinpointer-piece
+        icon:
+          sprite: Objects/Devices/pinpointer.rsi
+          state: pinpointer-xenoborg-piece-1
+        doAfter: 4
+      - tag: MothershipPinpointerPiece
+        name: construction-graph-tag-core-pinpointer-piece
+        icon:
+          sprite: Objects/Devices/pinpointer.rsi
+          state: pinpointer-xenoborg-piece-1
+        doAfter: 4
+  - node: repairedPinpointer
+    entity: PinpointerMothershipRepaired
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index d7e03c5257..357aa6c6ab 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -150,6 +150,14 @@
   category: construction-category-misc
   objectType: Item
 
+- type: construction
+  id: RepairMothershipPinpointer
+  graph: RepairMothershipPinpointer
+  startNode: start
+  targetNode: repairedPinpointer
+  category: construction-category-misc
+  objectType: Item
+
 - type: construction
   id: HardsuitGoliath
   graph: HardsuitGoliath
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index ae28f4350b..057d524224 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -978,6 +978,9 @@
 - type: Tag
   id: MothershipModule # Cyborg module category for evil xenoborg core
 
+- type: Tag
+  id: MothershipPinpointerPiece # ConstructionGraph: RepairMothershipPinpointer
+
 - type: Tag
   id: Mouse # CargoBounty: BountyMouse
 
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
index fe592577c4..785bc392a8 100644
--- a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). xenoborg by Samuka-C (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
     "states": [
         {
             "name": "pinonalert",
@@ -156,6 +156,24 @@
         {
             "name": "pinpointer-station"
         },
+        {
+            "name": "pinpointer-xenoborg"
+        },
+        {
+            "name": "pinpointer-xenoborg-piece-1"
+        },
+        {
+            "name": "pinpointer-xenoborg-piece-2"
+        },
+        {
+            "name": "pinpointer-xenoborg-piece-3"
+        },
+        {
+            "name": "pinpointer-xenoborg-piece-4"
+        },
+        {
+            "name": "pinpointer-xenoborg-repaired"
+        },
         {
             "name": "inhand-left-base",
             "directions": 4
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-1.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe3c864ff03e525c1ccac24d6f8bd3bcb64e1dc5
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$R7pfZR9J=WmCs7UKoG{il!m5TqG1tQ!6FOd$#?LSi=bB#^dUU?44(2X9;A@7
zPoM`Qg;sj1N@+ktHZ6`9Q-b}sDF&(R@3g~wWIkqQH-JW?`7a1Npg%Rhd1EC5rQf%*
zW(EvZp|ArQJI8bLNg@FN{r<D^Hvyo$Ou(2+mT`p8JcQV4&eX_wgzfSJ9)}00*LNw8
ziKPaj$TuSR5T$^I!;_hss#Qh1+rj1z!|On*)&^8Zz?e&xb&po-W-51fdI87Tn8Yt{
zA$q+h<qjw<VHEiW<kj4~j7Q+(JIHvXT36iwuX)6nOEKLp)U~^v+{K}?1A~uC1Cy67
zoXRI-f@7Je?41KJf%kj{lt#dqOX27I4iq|q^ctday->I62y(%BgVLSgHIF!Nkg$VE
zEbM@q&HdtjO1$O~zPp0Vf@b5wif2g+{yb|m8qHer1>iJ%QdsEt82|tP07*qoM6N<$
Ef;-T;#sB~S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-2.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1049c5afc09e9638f98e727b371f5dcb92b9f1c6
GIT binary patch
literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#_DMuRR9J=WlsyiDKoo?>p9+E`FGgu7Xz&<TB;Lql*mwgAV{Jl1<uRy;@dBuk
zfEu5LVrYORSz?U)b(@{c&YRsVpin4&4aW%is{x2CsR6n&&3-aKr-_)zVqG6pYWndO
z(Rm{5D=f5amq$ahRu}CLKsHCpK9VG;_3w)Y$cf`q<-U2_A-ae+&^Q19tT(IDz1eIE
zP4ie}dbIKgv$;_9tp!Ngho*T<`a<ZxXnY0Nd$sSlw?uTFbP@zYe$pE_K3)yT_63o}
zq%SzHm&jtr2tRAb2-&t>F6!h4c;9JmoF7tLOFgiR;$*E<txzZwf5#Iu*HuxsB|L5b
O0000<MNUMnLSTY9p@Z81

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-3.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e26c14f12a5ded378cebb3e06945e10c8fcc8156
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#^+`lQR9J=WlsyW<KoEsrL_s#n!Xjc5#72){A!)pT=dj8#(s%@0+cc>>Mym9p
zVw40$aBPf)_%o4!2=i65?Bns6nO#5-1mWLM%B5%Zw^X=7WBc^%oQHV4FCAk#WNe?5
za>>{}8PlO&GrFI9&4?VQUpR!t6*^9z+AWRMI>BNwf2o^{G~&a6?aLkkm!vjC-YJg0
zT6O?^ULsC^+<_vmqx1kcdC0Pm-GQ%`@Ew~?7XVPV#@MFQkN$;spxx5%4R<rdhk=zL
zWcjfJr0E{3Tdf=Fr7pPyP|79l7}z7g?K5HtPacjG6xszr5Cq|8Tmi1MQB&k3H&6fo
N002ovPDHLkV1kb1hqwR$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-4.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-piece-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..359aab7db4db84840e18e11871d8996ae324799b
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$FiAu~R9J=WlQB!fKp2Lf#Fm6hC6Epxv_qlz6I`9TWbNRR|KV@w)WtvH>QD-q
zUHk_XL8YQqq!4M2q%A$CR@8`>qTq1PbjSPh-Fx?a2L^+|VAuj7I;v>B4R#rG;Pq9}
zejVbo{_6pJJKP)+czuP_V{hkl6UMhgn$3e!AuJt}5FO=OAvisT!}AYXw;SQt1pAds
z9+!tCGs$>-rBxT8qGOUWwj?nvd!!&K^jzQG;5BrQeMh?mLUdG8Ju1{3w@T2CaNO$O
z1&}hf$WIEjJX;VfFUYe+=>S^23cS9`)Bu2b{qBqI*97VP8D8U<ho=eC=|p=5w2c6*
z-H{5~(YN~ZOG28ymI|OXgsf*^HNY!)=42)Tn9p<FavMs2!=ET~dxODXF#HSN0Lukp
UM%_H}7ytkO07*qoM6N<$f+u06s{jB1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-repaired.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg-repaired.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7431a6b38dd297594b5eb724e919f605837850f
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$vPnciR9J=WmCs57Q51*2A~XNg)DUW*L?Ete)1sYif?l9S1P0OGXKB%<MYL%V
zEqnx5(I%o*i<H2upk@kFan#Ac7S(8}GuKKans0UIoHOVCIQN`;!N%q<F*BN~_aasp
zSq=y%6^$MIk)mIq?*axy17$f-_jtxy>_^*a0HX28C;RiW4uGO$P4^fQ**p}A)P0ju
zTc2+NTwXuTe!W^_YUrGc{49R|blpsZkbn>J`QoSV<W>sx36?g-frigD;^OiugA{c0
zkkd_bb|nDd;BenqtA?%NUt3+rIpV+>jsXsahn=SRdeVe?wTAq1j9#r-#`bIqF0V4s
z)TEsdK7!NTYqB?rQT9$Gw^Hwoxk#m?pgx($3kf*dPE#p~N_}H_<A%GJ1q!7y(76gi
z0;2H<zDWu7u|OhW9V>a=Xtx<WLF?RIPk{){Q-DR~`aT6+S72o&W~@71!@N&{CkUEW
zZ1H_tz}M?|I^?HPQd;Z)&TtI%v22-BNPwmljq#JbZo@too8n|gX({zv=QkcCGrD>W
u+u6_d?g5zJ47B|(m%A6<!^XzufAR|3T8}j9Km6?g0000<MNUMnLSTZOW9el8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-xenoborg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d114b9f0623294ed5870bc10c677b206e8d73a14
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$8%ab#R9J=WmBDJlKoExiin`ILDN7LxdMJpezKsVF;?sF3eGo4`fkGhhR&5DU
zOv!En@n8#{HnY?q()~_>e9Zi0va^7}a8JCn*LfK(8P0p;qExr?r$kra<^dk4BImu_
zwmam)QVIaTcDqsbAO#o<MtS$iAvYIEis$MQtLPO{3T22YxhjAtI*`1E)qofHaQaPr
zhC=CT1pt7z_qp=@bTR|8YG6YbKn?XeQ~IU+gd$17vjs$w7P_UK0x$4Mp4JFtR=ite
zmgDha1URaFGXm{XK!M%U2(-Vzc<hoqFYsaafjCw#FRcJN>zEB)?7qGWJyL);K4ACr
z?6jJN{{DDw{Cgp((7Fw&?j>RPLGEEN82%?G7gA&*$zqi?00000NkvXXu0mjfxGb2A

literal 0
HcmV?d00001


From 914bf8ab1cb004421bc737f8ff12e0001ec19336 Mon Sep 17 00:00:00 2001
From: korczoczek <danielkorczok@gmail.com>
Date: Wed, 14 Jan 2026 22:12:30 +0100
Subject: [PATCH 314/360] Make lathes refund materials when recipe gets
 cancelled (#42416)

30 day free refund
---
 Content.Server/Lathe/LatheSystem.cs | 56 ++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 00c61705b2..1adba80b41 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -183,15 +183,8 @@ namespace Content.Server.Lathe
             if (!CanProduce(uid, recipe, quantity, component))
                 return false;
 
-            foreach (var (mat, amount) in recipe.Materials)
-            {
-                var adjustedAmount = recipe.ApplyMaterialDiscount
-                    ? (int)(-amount * component.MaterialUseMultiplier)
-                    : -amount;
-                adjustedAmount *= quantity;
-
-                _materialStorage.TryChangeMaterialAmount(uid, mat, adjustedAmount);
-            }
+            foreach (var (mat, amount) in GetAdjustedAmount(component, recipe))
+                _materialStorage.TryChangeMaterialAmount(uid, mat, -amount * quantity);
 
             if (component.Queue.Last is { } node && node.ValueRef.Recipe == recipe.ID)
                 node.ValueRef.ItemsRequested += quantity;
@@ -431,6 +424,48 @@ namespace Content.Server.Lathe
             return GetAvailableRecipes(uid, component).Contains(recipe.ID);
         }
 
+        /// <summary>
+        /// Iterator returning adjusted amount of material needed to
+        /// produce a given recipe
+        /// </summary>
+        private static IEnumerable<(ProtoId<MaterialPrototype> mat, int amount)> GetAdjustedAmount(LatheComponent lathe, LatheRecipePrototype recipe)
+        {
+            foreach (var (mat, amount) in recipe.Materials)
+            {
+                var adjustedAmount = recipe.ApplyMaterialDiscount
+                    ? (int)(amount * lathe.MaterialUseMultiplier)
+                    : amount;
+
+                yield return (mat, adjustedAmount);
+            }
+        }
+
+        /// <summary>
+        /// Refunds the material cost of the currently running recipe,
+        /// without cancelling production
+        /// </summary>
+        private void RefundCurrentRecipe(EntityUid uid, LatheComponent lathe)
+        {
+            _proto.Resolve(lathe.CurrentRecipe, out var recipe);
+
+            foreach (var (mat, amount) in GetAdjustedAmount(lathe, recipe!))
+                _materialStorage.TryChangeMaterialAmount(uid, mat, amount);
+        }
+
+        /// <summary>
+        /// Refunds the material cost of a given batch,
+        /// without deleting it
+        /// </summary>
+        private void RefundBatch(EntityUid uid, LatheComponent lathe, LatheRecipeBatch batch)
+        {
+            var delta = batch.ItemsRequested - batch.ItemsPrinted;
+
+            _proto.Resolve(batch.Recipe, out var recipe);
+
+            foreach (var (mat, amount) in GetAdjustedAmount(lathe, recipe!))
+                _materialStorage.TryChangeMaterialAmount(uid, mat, amount * delta);
+        }
+
         public void AbortProduction(EntityUid uid, LatheComponent? component = null)
         {
             if (!Resolve(uid, ref component))
@@ -453,6 +488,7 @@ namespace Content.Server.Lathe
                     }
                 }
 
+                RefundCurrentRecipe(uid, component);
                 component.CurrentRecipe = null;
             }
             RemCompDeferred<LatheProducingComponent>(uid);
@@ -506,6 +542,7 @@ namespace Content.Server.Lathe
                 LogImpact.Low,
                 $"{ToPrettyString(args.Actor):player} deleted a lathe job for ({batch.ItemsPrinted}/{batch.ItemsRequested}) {GetRecipeName(batch.Recipe)} at {ToPrettyString(uid):lathe}");
 
+            RefundBatch(uid, component, batch);
             component.Queue.Remove(node);
             UpdateUserInterfaceState(uid, component);
         }
@@ -564,6 +601,7 @@ namespace Content.Server.Lathe
                 LogImpact.Low,
                 $"{ToPrettyString(args.Actor):player} aborted printing {GetRecipeName(component.CurrentRecipe.Value)} at {ToPrettyString(uid):lathe}");
 
+            RefundCurrentRecipe(uid, component);
             component.CurrentRecipe = null;
             FinishProducing(uid, component);
         }

From a253b140a89d9de06b1143fe6f83314ca9d24244 Mon Sep 17 00:00:00 2001
From: TheFlyingSentry <170261226+TheFlyingSentry@users.noreply.github.com>
Date: Wed, 14 Jan 2026 16:19:59 -0500
Subject: [PATCH 315/360] Fixed Containment Generators not updating pointlight
 correctly (#42289)

oh my god i've been overcomplicating this you don't want to know...
---
 .../Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index 5c6d50ffd3..3c698e11b9 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -402,6 +402,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem
     private void ChangeOnLightVisualizer(Entity<ContainmentFieldGeneratorComponent> generator)
     {
         _visualizer.SetData(generator, ContainmentFieldGeneratorVisuals.OnLight, generator.Comp.IsConnected);
+        UpdateConnectionLights(generator);
     }
     #endregion
 

From 0ce577aae1f448fc7e78feb925b3738510de1004 Mon Sep 17 00:00:00 2001
From: Charlie Morley <cmorley191@gmail.com>
Date: Wed, 14 Jan 2026 13:38:19 -0800
Subject: [PATCH 316/360] allow shuttle to Scan for Objects while FTL is on
 cooldown (#42283)

* allow shuttle to Scan for Objects while FTL is on cooldown

* cleanup

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Content.Client/Shuttles/UI/MapScreen.xaml.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
index 72ad3c28b1..ff55c0b462 100644
--- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -153,7 +153,7 @@ public sealed partial class MapScreen : BoxContainer
                 break;
         }
 
-        if (IsFTLBlocked())
+        if (IsPingBlocked())
         {
             MapRebuildButton.Disabled = true;
             ClearMapObjects();
@@ -408,9 +408,21 @@ public sealed partial class MapScreen : BoxContainer
         }
     }
 
+    /// <summary>
+    /// Returns true if we shouldn't be able to select the Scan for Objects button.
+    /// </summary>
+    private bool IsPingBlocked()
+    {
+        return _state switch
+        {
+            FTLState.Available or FTLState.Cooldown => false,
+            _ => true,
+        };
+    }
+
     private void OnMapObjectPress(IMapObject mapObject)
     {
-        if (IsFTLBlocked())
+        if (IsPingBlocked())
             return;
 
         var coordinates = _shuttles.GetMapCoordinates(mapObject);
@@ -506,7 +518,7 @@ public sealed partial class MapScreen : BoxContainer
             BumpMapDequeue();
         }
 
-        if (!IsFTLBlocked() && _nextPing < curTime)
+        if (!IsPingBlocked() && _nextPing < curTime)
         {
             MapRebuildButton.Disabled = false;
         }

From a00010294204e53e66bbeecf4394e13e89535870 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:21:04 -0800
Subject: [PATCH 317/360] Atmos GasSpecificHeats in shared (#42136)

---
 Content.Benchmarks/HeatCapacityBenchmark.cs   |  83 ++++++
 .../EntitySystems/AtmosphereSystem.Gases.cs   |  35 +++
 .../Atmos/EntitySystems/AtmosphereSystem.cs   |   2 +-
 .../Tests/Atmos/AtmosTest.cs                  |   2 +
 .../Tests/Atmos/SharedGasSpecificHeatsTest.cs | 275 ++++++++++++++++++
 .../EntitySystems/AtmosphereSystem.CVars.cs   |   2 -
 .../EntitySystems/AtmosphereSystem.Gases.cs   |  40 +--
 .../SharedAtmosphereSystem.CVars.cs           |  20 ++
 .../SharedAtmosphereSystem.Gases.cs           |  77 +++++
 .../EntitySystems/SharedAtmosphereSystem.cs   |  21 +-
 Content.Shared/CCVar/CCVars.Atmos.cs          |   2 +-
 11 files changed, 503 insertions(+), 56 deletions(-)
 create mode 100644 Content.Benchmarks/HeatCapacityBenchmark.cs
 create mode 100644 Content.Client/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
 create mode 100644 Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs
 create mode 100644 Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.CVars.cs
 create mode 100644 Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.Gases.cs

diff --git a/Content.Benchmarks/HeatCapacityBenchmark.cs b/Content.Benchmarks/HeatCapacityBenchmark.cs
new file mode 100644
index 0000000000..cef5bc10c7
--- /dev/null
+++ b/Content.Benchmarks/HeatCapacityBenchmark.cs
@@ -0,0 +1,83 @@
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Content.IntegrationTests;
+using Content.IntegrationTests.Pair;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Robust.Shared;
+using Robust.Shared.Analyzers;
+using Robust.Shared.GameObjects;
+
+namespace Content.Benchmarks;
+
+[Virtual]
+[GcServer(true)]
+[MemoryDiagnoser]
+public class HeatCapacityBenchmark
+{
+    private TestPair _pair = default!;
+    private IEntityManager _sEntMan = default!;
+    private IEntityManager _cEntMan = default!;
+    private Client.Atmos.EntitySystems.AtmosphereSystem _cAtmos = default!;
+    private AtmosphereSystem _sAtmos = default!;
+    private GasMixture _mix;
+
+    [GlobalSetup]
+    public async Task SetupAsync()
+    {
+        ProgramShared.PathOffset = "../../../../";
+        PoolManager.Startup();
+        _pair = await PoolManager.GetServerClient();
+        await _pair.Connect();
+        _cEntMan = _pair.Client.ResolveDependency<IEntityManager>();
+        _sEntMan = _pair.Server.ResolveDependency<IEntityManager>();
+        _cAtmos = _cEntMan.System<Client.Atmos.EntitySystems.AtmosphereSystem>();
+        _sAtmos = _sEntMan.System<AtmosphereSystem>();
+
+        const float volume = 2500f;
+        const float temperature = 293.15f;
+
+        const float o2 = 12.3f;
+        const float n2 = 45.6f;
+        const float co2 = 0.42f;
+        const float plasma = 0.05f;
+
+        _mix = new GasMixture(volume) { Temperature = temperature };
+
+        _mix.AdjustMoles(Gas.Oxygen, o2);
+        _mix.AdjustMoles(Gas.Nitrogen, n2);
+        _mix.AdjustMoles(Gas.CarbonDioxide, co2);
+        _mix.AdjustMoles(Gas.Plasma, plasma);
+    }
+
+    [Benchmark]
+    public async Task ClientHeatCapacityBenchmark()
+    {
+        await _pair.Client.WaitPost(delegate
+        {
+            for (var i = 0; i < 10000; i++)
+            {
+                _cAtmos.GetHeatCapacity(_mix, applyScaling: true);
+            }
+        });
+    }
+
+    [Benchmark]
+    public async Task ServerHeatCapacityBenchmark()
+    {
+        await _pair.Server.WaitPost(delegate
+        {
+            for (var i = 0; i < 10000; i++)
+            {
+                _sAtmos.GetHeatCapacity(_mix, applyScaling: true);
+            }
+        });
+    }
+
+    [GlobalCleanup]
+    public async Task CleanupAsync()
+    {
+        await _pair.DisposeAsync();
+        PoolManager.Shutdown();
+    }
+}
diff --git a/Content.Client/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Client/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
new file mode 100644
index 0000000000..17b994e64f
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -0,0 +1,35 @@
+using System.Runtime.CompilerServices;
+using Content.Shared.Atmos;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+public sealed partial class AtmosphereSystem
+{
+    /*
+     Partial class for operations involving GasMixtures.
+
+     Any method that is overridden here is usually because the server-sided implementation contains
+     code that would escape sandbox. As such these methods are overridden here with a safe
+     implementation.
+     */
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    protected override float GetHeatCapacityCalculation(float[] moles, bool space)
+    {
+        // Little hack to make space gas mixtures have heat capacity, therefore allowing them to cool down rooms.
+        if (space && MathHelper.CloseTo(NumericsHelpers.HorizontalAdd(moles), 0f))
+        {
+            return Atmospherics.SpaceHeatCapacity;
+        }
+
+        // explicit stackalloc call is banned on client tragically.
+        // the JIT does not stackalloc this during runtime,
+        // though this isnt the hottest code path so it should be fine
+        // the gc can eat a little as a treat
+        var tmp = new float[moles.Length];
+        NumericsHelpers.Multiply(moles, GasSpecificHeats, tmp);
+        // Adjust heat capacity by speedup, because this is primarily what
+        // determines how quickly gases heat up/cool.
+        return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
+    }
+}
diff --git a/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
index 44759372f4..30567abbf7 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -5,7 +5,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Client.Atmos.EntitySystems;
 
-public sealed class AtmosphereSystem : SharedAtmosphereSystem
+public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
 {
     public override void Initialize()
     {
diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
index d3bdc91cda..a956d0cbab 100644
--- a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
@@ -18,6 +18,7 @@ namespace Content.IntegrationTests.Tests.Atmos;
 public abstract class AtmosTest : InteractionTest
 {
     protected AtmosphereSystem SAtmos = default!;
+    protected Content.Client.Atmos.EntitySystems.AtmosphereSystem CAtmos = default!;
     protected EntityLookupSystem LookupSystem = default!;
 
     protected Entity<GridAtmosphereComponent> RelevantAtmos;
@@ -38,6 +39,7 @@ public abstract class AtmosTest : InteractionTest
         await base.Setup();
 
         SAtmos = SEntMan.System<AtmosphereSystem>();
+        CAtmos = CEntMan.System<Content.Client.Atmos.EntitySystems.AtmosphereSystem>();
         LookupSystem = SEntMan.System<EntityLookupSystem>();
 
         SEntMan.TryGetComponent<GridAtmosphereComponent>(MapData.Grid, out var gridAtmosComp);
diff --git a/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs b/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs
new file mode 100644
index 0000000000..6c3bcbe6db
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs
@@ -0,0 +1,275 @@
+using Content.Client.Atmos.EntitySystems;
+using Content.IntegrationTests.Pair;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects;
+using Robust.UnitTesting;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+/// <summary>
+/// Tests for asserting that various gas specific heat operations agree with each other and do not deviate
+/// across client and server.
+/// </summary>
+[TestOf(nameof(SharedAtmosphereSystem))]
+public sealed class SharedGasSpecificHeatsTest
+{
+    private IConfigurationManager _sConfig;
+    private IConfigurationManager _cConfig;
+
+    private TestPair _pair = default!;
+
+    private RobustIntegrationTest.ServerIntegrationInstance Server => _pair.Server;
+    private RobustIntegrationTest.ClientIntegrationInstance Client => _pair.Client;
+
+    private IEntityManager _sEntMan = default!;
+    private Content.Server.Atmos.EntitySystems.AtmosphereSystem _sAtmos = default!;
+
+    private IEntityManager _cEntMan = default!;
+    private AtmosphereSystem _cAtmos = default!;
+
+    [SetUp]
+    public async Task SetUp()
+    {
+        var poolSettings = new PoolSettings
+        {
+            Connected = true,
+        };
+        _pair = await PoolManager.GetServerClient(poolSettings);
+
+        _sEntMan = Server.ResolveDependency<IEntityManager>();
+        _cEntMan = Client.ResolveDependency<IEntityManager>();
+
+        _sAtmos = _sEntMan.System<Content.Server.Atmos.EntitySystems.AtmosphereSystem>();
+        _cAtmos = _cEntMan.System<AtmosphereSystem>();
+    }
+
+    /// <summary>
+    /// Asserts that the cached gas specific heat arrays agree with each other.
+    /// </summary>
+    [Test]
+    public async Task GasSpecificHeats_Agree()
+    {
+        var serverSpecificHeats = Array.Empty<float>();
+        var clientSpecificHeats = Array.Empty<float>();
+        await Server.WaitPost(delegate
+        {
+            serverSpecificHeats = _sAtmos.GasSpecificHeats;
+        });
+
+        await Client.WaitPost(delegate
+        {
+            clientSpecificHeats = _cAtmos.GasSpecificHeats;
+        });
+
+        Assert.That(serverSpecificHeats,
+            Is.EqualTo(clientSpecificHeats),
+            "Server and client gas specific heat arrays do not agree.");
+    }
+
+    /// <summary>
+    /// Asserts that heat capacity calculations agree for the same gas mixture.
+    /// </summary>
+    [Test]
+    public async Task HeatCapacity_Agree()
+    {
+        const float volume = 2500f;
+        const float temperature = 293.15f;
+
+        const float o2 = 12.3f;
+        const float n2 = 45.6f;
+        const float co2 = 0.42f;
+        const float plasma = 0.05f;
+
+        var serverScaled = 0f;
+        var serverUnscaled = 0f;
+        var clientScaled = 0f;
+        var clientUnscaled = 0f;
+
+        await Server.WaitPost(delegate
+        {
+            var mix = new GasMixture(volume) { Temperature = temperature };
+            mix.AdjustMoles(Gas.Oxygen, o2);
+            mix.AdjustMoles(Gas.Nitrogen, n2);
+            mix.AdjustMoles(Gas.CarbonDioxide, co2);
+            mix.AdjustMoles(Gas.Plasma, plasma);
+
+            serverScaled = _sAtmos.GetHeatCapacity(mix, applyScaling: true);
+            serverUnscaled = _sAtmos.GetHeatCapacity(mix, applyScaling: false);
+        });
+
+        await Client.WaitPost(delegate
+        {
+            var mix = new GasMixture(volume) { Temperature = temperature };
+            mix.AdjustMoles(Gas.Oxygen, o2);
+            mix.AdjustMoles(Gas.Nitrogen, n2);
+            mix.AdjustMoles(Gas.CarbonDioxide, co2);
+            mix.AdjustMoles(Gas.Plasma, plasma);
+
+            clientScaled = _cAtmos.GetHeatCapacity(mix, applyScaling: true);
+            clientUnscaled = _cAtmos.GetHeatCapacity(mix, applyScaling: false);
+        });
+
+        // none of these should be exploding or nonzero.
+        // they could potentially agree at insane values and pass the test
+        // so check for if they're sane.
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(serverScaled,
+                Is.GreaterThan(0f),
+                "Heat capacity calculated on server with scaling is not greater than zero.");
+            Assert.That(serverUnscaled,
+                Is.GreaterThan(0f),
+                "Heat capacity calculated on server without scaling is not greater than zero.");
+            Assert.That(clientScaled,
+                Is.GreaterThan(0f),
+                "Heat capacity calculated on client with scaling is not greater than zero.");
+            Assert.That(clientUnscaled,
+                Is.GreaterThan(0f),
+                "Heat capacity calculated on client without scaling is not greater than zero.");
+
+            Assert.That(float.IsFinite(serverScaled),
+                Is.True,
+                "Heat capacity calculated on server with scaling is not finite.");
+            Assert.That(float.IsFinite(serverUnscaled),
+                Is.True,
+                "Heat capacity calculated on server without scaling is not finite.");
+            Assert.That(float.IsFinite(clientScaled),
+                Is.True,
+                "Heat capacity calculated on client with scaling is not finite.");
+            Assert.That(float.IsFinite(clientUnscaled),
+                Is.True,
+                "Heat capacity calculated on client without scaling is not finite.");
+        }
+
+        const float epsilon = 1e-4f;
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(serverScaled,
+                Is.EqualTo(clientScaled).Within(epsilon),
+                "Heat capacity calculated with scaling does not agree between client and server.");
+            Assert.That(serverUnscaled,
+                Is.EqualTo(clientUnscaled).Within(epsilon),
+                "Heat capacity calculated without scaling does not agree between client and server.");
+
+            Assert.That(serverUnscaled,
+                Is.EqualTo(serverScaled * _sAtmos.HeatScale).Within(epsilon),
+                "Heat capacity calculated on server without scaling does not equal scaled value multiplied by HeatScale.");
+            Assert.That(clientUnscaled,
+                Is.EqualTo(clientScaled * _cAtmos.HeatScale).Within(epsilon),
+                "Heat capacity calculated on client without scaling does not equal scaled value multiplied by HeatScale.");
+        }
+    }
+
+    /// <summary>
+    /// HeatScale CVAR is required for specific heat calculations.
+    /// Assert that they agree across client and server, and that changing the CVAR
+    /// replicates properly and updates the cached value.
+    /// Also assert that calculations using the updated HeatScale agree properly.
+    /// </summary>
+    [Test]
+    public async Task HeatScaleCVar_Replicates_Agree()
+    {
+        // ensure that replicated value changes by testing a new value
+        const float newHeatScale = 13f;
+
+        _sConfig = Server.ResolveDependency<IConfigurationManager>();
+        _cConfig = Client.ResolveDependency<IConfigurationManager>();
+
+        await Server.WaitPost(delegate
+        {
+            _sConfig.SetCVar(CCVars.AtmosHeatScale, newHeatScale);
+        });
+
+        await Server.WaitRunTicks(5);
+        await Client.WaitRunTicks(5);
+
+        // assert agreement between client and server
+        float serverCVar = 0;
+        float clientCVar = 0;
+        float serverHeatScale = 0;
+        float clientHeatScale = 0;
+
+        await Server.WaitPost(delegate
+        {
+            serverCVar = _sConfig.GetCVar(CCVars.AtmosHeatScale);
+            serverHeatScale = _sAtmos.HeatScale;
+        });
+
+        await Client.WaitPost(delegate
+        {
+            clientCVar = _cConfig.GetCVar(CCVars.AtmosHeatScale);
+            clientHeatScale = _cAtmos.HeatScale;
+        });
+
+        const float epsilon = 1e-4f;
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(serverCVar,
+                Is.EqualTo(newHeatScale).Within(epsilon),
+                "Server CVAR value for AtmosHeatScale does not equal the set value.");
+            Assert.That(clientCVar,
+                Is.EqualTo(newHeatScale).Within(epsilon),
+                "Client CVAR value for AtmosHeatScale does not equal the set value.");
+
+            Assert.That(serverHeatScale,
+                Is.EqualTo(newHeatScale).Within(epsilon),
+                "Server cached HeatScale does not equal the set CVAR value.");
+            Assert.That(clientHeatScale,
+                Is.EqualTo(newHeatScale).Within(epsilon),
+                "Client cached HeatScale does not equal the set CVAR value.");
+
+            Assert.That(serverHeatScale,
+                Is.EqualTo(clientHeatScale).Within(epsilon),
+                "Client and server cached HeatScale values do not agree.");
+        }
+
+        // verify that anything calculated using the shared HeatScale agrees properly
+        const float volume = 2500f;
+        const float temperature = 293.15f;
+
+        var sScaled = 0f;
+        var sUnscaled = 0f;
+        var cScaled = 0f;
+        var cUnscaled = 0f;
+
+        await Server.WaitPost(delegate
+        {
+            var mix = new GasMixture(volume) { Temperature = temperature };
+            mix.AdjustMoles(Gas.Oxygen, 10f);
+            mix.AdjustMoles(Gas.Nitrogen, 20f);
+
+            sScaled = _sAtmos.GetHeatCapacity(mix, applyScaling: true);
+            sUnscaled = _sAtmos.GetHeatCapacity(mix, applyScaling: false);
+        });
+
+        await Client.WaitPost(delegate
+        {
+            var mix = new GasMixture(volume) { Temperature = temperature };
+            mix.AdjustMoles(Gas.Oxygen, 10f);
+            mix.AdjustMoles(Gas.Nitrogen, 20f);
+
+            cScaled = _cAtmos.GetHeatCapacity(mix, applyScaling: true);
+            cUnscaled = _cAtmos.GetHeatCapacity(mix, applyScaling: false);
+        });
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(sScaled,
+                Is.GreaterThan(0f),
+                "Heat capacity calculated on server with scaling is not greater than zero after CVAR change.");
+            Assert.That(cScaled,
+                Is.GreaterThan(0f),
+                "Heat capacity calculated on client with scaling is not greater than zero after CVAR change.");
+
+            Assert.That(sUnscaled,
+                Is.EqualTo(sScaled * serverHeatScale).Within(epsilon),
+                "Heat capacity calculated on server without scaling does not equal scaled value multiplied by updated HeatScale.");
+            Assert.That(cUnscaled,
+                Is.EqualTo(cScaled * clientHeatScale).Within(epsilon),
+                "Heat capacity calculated on client without scaling does not equal scaled value multiplied by updated HeatScale.");
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
index f24f0ae171..11e7cde254 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
@@ -25,7 +25,6 @@ namespace Content.Server.Atmos.EntitySystems
         public float AtmosMaxProcessTime { get; private set; }
         public float AtmosTickRate { get; private set; }
         public float Speedup { get; private set; }
-        public float HeatScale { get; private set; }
         public bool DeltaPressureDamage { get; private set; }
         public int DeltaPressureParallelProcessPerIteration { get; private set; }
         public int DeltaPressureParallelBatchSize { get; private set; }
@@ -55,7 +54,6 @@ namespace Content.Server.Atmos.EntitySystems
             Subs.CVar(_cfg, CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
             Subs.CVar(_cfg, CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
             Subs.CVar(_cfg, CCVars.AtmosSpeedup, value => Speedup = value, true);
-            Subs.CVar(_cfg, CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
             Subs.CVar(_cfg, CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
             Subs.CVar(_cfg, CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
             Subs.CVar(_cfg, CCVars.DeltaPressureDamage, value => DeltaPressureDamage = value, true);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index 95d56c9ca6..4d5bdb3f80 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -13,53 +13,23 @@ namespace Content.Server.Atmos.EntitySystems
     {
         [Dependency] private readonly IPrototypeManager _protoMan = default!;
 
-        private GasReactionPrototype[] _gasReactions = Array.Empty<GasReactionPrototype>();
-        private float[] _gasSpecificHeats = new float[Atmospherics.TotalNumberOfGases];
+        private GasReactionPrototype[] _gasReactions = [];
 
         /// <summary>
         ///     List of gas reactions ordered by priority.
         /// </summary>
         public IEnumerable<GasReactionPrototype> GasReactions => _gasReactions;
 
-        /// <summary>
-        ///     Cached array of gas specific heats.
-        /// </summary>
-        public float[] GasSpecificHeats => _gasSpecificHeats;
-
-        private void InitializeGases()
+        public override void InitializeGases()
         {
+            base.InitializeGases();
+
             _gasReactions = _protoMan.EnumeratePrototypes<GasReactionPrototype>().ToArray();
             Array.Sort(_gasReactions, (a, b) => b.Priority.CompareTo(a.Priority));
-
-            Array.Resize(ref _gasSpecificHeats, MathHelper.NextMultipleOf(Atmospherics.TotalNumberOfGases, 4));
-
-            for (var i = 0; i < GasPrototypes.Length; i++)
-            {
-                _gasSpecificHeats[i] = GasPrototypes[i].SpecificHeat / HeatScale;
-            }
         }
 
-        /// <summary>
-        ///     Calculates the heat capacity for a gas mixture.
-        /// </summary>
-        /// <param name="mixture">The mixture whose heat capacity should be calculated</param>
-        /// <param name="applyScaling"> Whether the internal heat capacity scaling should be applied. This should not be
-        /// used outside of atmospheric related heat transfer.</param>
-        /// <returns></returns>
-        public float GetHeatCapacity(GasMixture mixture, bool applyScaling)
-        {
-            var scale = GetHeatCapacityCalculation(mixture.Moles, mixture.Immutable);
-
-            // By default GetHeatCapacityCalculation() has the heat-scale divisor pre-applied.
-            // So if we want the un-scaled heat capacity, we have to multiply by the scale.
-            return applyScaling ? scale : scale * HeatScale;
-        }
-
-        private float GetHeatCapacity(GasMixture mixture)
-            =>  GetHeatCapacityCalculation(mixture.Moles, mixture.Immutable);
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private float GetHeatCapacityCalculation(float[] moles, bool space)
+        protected override float GetHeatCapacityCalculation(float[] moles, bool space)
         {
             // Little hack to make space gas mixtures have heat capacity, therefore allowing them to cool down rooms.
             if (space && MathHelper.CloseTo(NumericsHelpers.HorizontalAdd(moles), 0f))
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.CVars.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.CVars.cs
new file mode 100644
index 0000000000..852af70219
--- /dev/null
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.CVars.cs
@@ -0,0 +1,20 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.CCVar;
+
+namespace Content.Shared.Atmos.EntitySystems;
+
+public abstract partial class SharedAtmosphereSystem
+{
+    /*
+     Partial class for storing shared configuration values.
+     */
+
+    public float HeatScale { get; private set; }
+
+    [SuppressMessage("ReSharper", "BadExpressionBracesLineBreaks")]
+    [SuppressMessage("ReSharper", "MultipleStatementsOnOneLine")]
+    private void InitializeCVars()
+    {
+        Subs.CVar(_cfg, CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
+    }
+}
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.Gases.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.Gases.cs
new file mode 100644
index 0000000000..956c1aa827
--- /dev/null
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.Gases.cs
@@ -0,0 +1,77 @@
+using System.Runtime.CompilerServices;
+using Content.Shared.Atmos.Prototypes;
+
+namespace Content.Shared.Atmos.EntitySystems;
+
+public abstract partial class SharedAtmosphereSystem
+{
+    /*
+     Partial class for operations involving GasMixtures.
+
+     Sometimes methods here are abstract because they need different client/server implementations
+     due to sandboxing.
+     */
+
+    /// <summary>
+    /// Cached array of gas specific heats.
+    /// </summary>
+    public float[] GasSpecificHeats => _gasSpecificHeats;
+    private float[] _gasSpecificHeats = new float[Atmospherics.TotalNumberOfGases];
+
+    public string?[] GasReagents = new string[Atmospherics.TotalNumberOfGases];
+    protected readonly GasPrototype[] GasPrototypes = new GasPrototype[Atmospherics.TotalNumberOfGases];
+
+    public virtual void InitializeGases()
+    {
+        foreach (var gas in Enum.GetValues<Gas>())
+        {
+            var idx = (int)gas;
+            // Log an error if the corresponding prototype isn't found
+            if (!_prototypeManager.TryIndex<GasPrototype>(gas.ToString(), out var gasPrototype))
+            {
+                Log.Error($"Failed to find corresponding {nameof(GasPrototype)} for gas ID {(int)gas} ({gas}) with expected ID \"{gas.ToString()}\". Is your prototype named correctly?");
+                continue;
+            }
+            GasPrototypes[idx] = gasPrototype;
+            GasReagents[idx] = gasPrototype.Reagent;
+        }
+
+        Array.Resize(ref _gasSpecificHeats, MathHelper.NextMultipleOf(Atmospherics.TotalNumberOfGases, 4));
+
+        for (var i = 0; i < GasPrototypes.Length; i++)
+        {
+            _gasSpecificHeats[i] = GasPrototypes[i].SpecificHeat / HeatScale;
+        }
+    }
+
+    /// <summary>
+    ///     Calculates the heat capacity for a gas mixture.
+    /// </summary>
+    /// <param name="mixture">The mixture whose heat capacity should be calculated</param>
+    /// <param name="applyScaling"> Whether the internal heat capacity scaling should be applied. This should not be
+    /// used outside of atmospheric related heat transfer.</param>
+    /// <returns></returns>
+    public float GetHeatCapacity(GasMixture mixture, bool applyScaling)
+    {
+        var scale = GetHeatCapacityCalculation(mixture.Moles, mixture.Immutable);
+
+        // By default GetHeatCapacityCalculation() has the heat-scale divisor pre-applied.
+        // So if we want the un-scaled heat capacity, we have to multiply by the scale.
+        return applyScaling ? scale : scale * HeatScale;
+    }
+
+    protected float GetHeatCapacity(GasMixture mixture)
+    {
+        return GetHeatCapacityCalculation(mixture.Moles, mixture.Immutable);
+    }
+
+    /// <summary>
+    /// Gets the heat capacity for a <see cref="GasMixture"/>.
+    /// </summary>
+    /// <param name="moles">The moles array of the <see cref="GasMixture"/></param>
+    /// <param name="space">Whether this <see cref="GasMixture"/> represents space,
+    /// and thus experiences space-specific mechanics (we cheat and make it a bit cooler).</param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    protected abstract float GetHeatCapacityCalculation(float[] moles, bool space);
+}
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
index 67d6dec8af..593c7728de 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Atmos.EntitySystems
@@ -9,13 +10,10 @@ namespace Content.Shared.Atmos.EntitySystems
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedInternalsSystem _internals = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         private EntityQuery<InternalsComponent> _internalsQuery;
 
-        public string?[] GasReagents = new string[Atmospherics.TotalNumberOfGases];
-
-        protected readonly GasPrototype[] GasPrototypes = new GasPrototype[Atmospherics.TotalNumberOfGases];
-
         public override void Initialize()
         {
             base.Initialize();
@@ -23,19 +21,8 @@ namespace Content.Shared.Atmos.EntitySystems
             _internalsQuery = GetEntityQuery<InternalsComponent>();
 
             InitializeBreathTool();
-
-            foreach (var gas in Enum.GetValues<Gas>())
-            {
-                var idx = (int)gas;
-                // Log an error if the corresponding prototype isn't found
-                if (!_prototypeManager.TryIndex<GasPrototype>(gas.ToString(), out var gasPrototype))
-                {
-                    Log.Error($"Failed to find corresponding {nameof(GasPrototype)} for gas ID {(int)gas} ({gas}) with expected ID \"{gas.ToString()}\". Is your prototype named correctly?");
-                    continue;
-                }
-                GasPrototypes[idx] = gasPrototype;
-                GasReagents[idx] = gasPrototype.Reagent;
-            }
+            InitializeGases();
+            InitializeCVars();
         }
 
         public GasPrototype GetGas(int gasId) => GasPrototypes[gasId];
diff --git a/Content.Shared/CCVar/CCVars.Atmos.cs b/Content.Shared/CCVar/CCVars.Atmos.cs
index 7ef40b7911..9b3ef5388f 100644
--- a/Content.Shared/CCVar/CCVars.Atmos.cs
+++ b/Content.Shared/CCVar/CCVars.Atmos.cs
@@ -142,7 +142,7 @@ public sealed partial class CCVars
     ///     gases heat up and cool down 64x faster than real life.
     /// </summary>
     public static readonly CVarDef<float> AtmosHeatScale =
-        CVarDef.Create("atmos.heat_scale", 8f, CVar.SERVERONLY);
+        CVarDef.Create("atmos.heat_scale", 8f, CVar.REPLICATED | CVar.SERVER);
 
     /// <summary>
     ///     Maximum explosion radius for explosions caused by bursting a gas tank ("max caps").

From 2a3fb8099849815f9f52f9c3edb147bdce6b6d9c Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:39:50 -0800
Subject: [PATCH 318/360] Fix TryAllReactionsTest reacting early and not
 checking priority (#42412)

---
 .../Tests/Chemistry/TryAllReactionsTest.cs               | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
index 6d860f0ac3..13d8bdc6d2 100644
--- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
@@ -50,11 +50,12 @@ namespace Content.IntegrationTests.Tests.Chemistry
                     beaker = entityManager.SpawnEntity("TestSolutionContainer", coordinates);
                     Assert.That(solutionContainerSystem
                         .TryGetSolution(beaker, "beaker", out solutionEnt, out solution));
+                    solutionEnt.Value.Comp.Solution.CanReact = false;
                     foreach (var (id, reactant) in reactionPrototype.Reactants)
                     {
 #pragma warning disable NUnit2045
                         Assert.That(solutionContainerSystem
-                            .TryAddReagent(solutionEnt.Value, id, reactant.Amount, out var quantity));
+                            .TryAddReagent(solutionEnt.Value, id, reactant.Amount, out var quantity, reactionPrototype.MinimumTemperature));
                         Assert.That(reactant.Amount, Is.EqualTo(quantity));
 #pragma warning restore NUnit2045
                     }
@@ -67,7 +68,7 @@ namespace Content.IntegrationTests.Tests.Chemistry
                     //Check if the reaction is the first to occur when heated
                     foreach (var possibleReaction in possibleReactions.OrderBy(r => r.MinimumTemperature))
                     {
-                        if (possibleReaction.MinimumTemperature < reactionPrototype.MinimumTemperature && possibleReaction.MixingCategories == reactionPrototype.MixingCategories)
+                        if (possibleReaction.Priority >= reactionPrototype.Priority && possibleReaction.MinimumTemperature < reactionPrototype.MinimumTemperature && possibleReaction.MixingCategories == reactionPrototype.MixingCategories)
                         {
                             Assert.Fail($"The {possibleReaction.ID} reaction may occur before {reactionPrototype.ID} when heated.");
                         }
@@ -76,14 +77,16 @@ namespace Content.IntegrationTests.Tests.Chemistry
                     //Check if the reaction is the first to occur when freezing
                     foreach (var possibleReaction in possibleReactions.OrderBy(r => r.MaximumTemperature))
                     {
-                        if (possibleReaction.MaximumTemperature > reactionPrototype.MaximumTemperature && possibleReaction.MixingCategories == reactionPrototype.MixingCategories)
+                        if (possibleReaction.Priority >= reactionPrototype.Priority && possibleReaction.MaximumTemperature > reactionPrototype.MaximumTemperature && possibleReaction.MixingCategories == reactionPrototype.MixingCategories)
                         {
                             Assert.Fail($"The {possibleReaction.ID} reaction may occur before {reactionPrototype.ID} when freezing.");
                         }
                     }
 
                     //Now safe set the temperature and mix the reagents
+                    solutionEnt.Value.Comp.Solution.CanReact = true;
                     solutionContainerSystem.SetTemperature(solutionEnt.Value, reactionPrototype.MinimumTemperature);
+                    solutionContainerSystem.UpdateChemicals(solutionEnt.Value);
 
                     if (reactionPrototype.MixingCategories != null)
                     {

From 88bba6790b32488f58cf997c66fcd9f27cfb1928 Mon Sep 17 00:00:00 2001
From: TriviaSolari <154280615+TriviaSolari@users.noreply.github.com>
Date: Wed, 14 Jan 2026 21:31:05 -0500
Subject: [PATCH 319/360] Reduce unnecessary `ComponentInit` work for airtight
 entities (#42390)

Refactor AirtightSystem to skip rotation checks for omnidirectional blocks on init

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Atmos/Components/AirtightComponent.cs          | 14 --------------
 .../Atmos/EntitySystems/AirtightSystem.cs          | 11 ++++++-----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs
index 29c1f18af3..731153be41 100644
--- a/Content.Server/Atmos/Components/AirtightComponent.cs
+++ b/Content.Server/Atmos/Components/AirtightComponent.cs
@@ -44,20 +44,6 @@ namespace Content.Server.Atmos.Components
         [DataField("rotateAirBlocked")]
         public bool RotateAirBlocked { get; set; } = true;
 
-        /// <summary>
-        /// Whether to fix the <see cref="CurrentAirBlockedDirection"/> on initialization
-        /// to the entity's current rotation.
-        /// </summary>
-        /// <remarks>This is an optimization routine for initializing airtight components.
-        /// If this entity doesn't have unique airtight directions
-        /// (ex. not all directions are blocked but some are), we can skip
-        /// a lot of event/transform business during initialization.
-        /// This field marks whether this is skipped or not.</remarks>
-        /// <example>If your entity only blocks air in one direction,
-        /// and that can depend on rotation, this needs to be set to true.</example>
-        [DataField]
-        public bool FixAirBlockedDirectionInitialize = true;
-
         /// <summary>
         /// If true, then the tile that this entity is on will have no air at all if all directions are blocked.
         /// </summary>
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 78f61c80a4..61cd8b280c 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -25,16 +25,17 @@ namespace Content.Server.Atmos.EntitySystems
 
         private void OnAirtightInit(Entity<AirtightComponent> airtight, ref ComponentInit args)
         {
-            // If this entity has unique airtight directions that are affected by rotation,
-            // we need to fix up the current airtight directions based on its rotation.
-            // Otherwise, we can skip all of that logic (stuff adds up when you're initing
-            // a morbillion walls).
-            if (!airtight.Comp.FixAirBlockedDirectionInitialize)
+            // If this entity blocks air in all directions (e.g. full tile walls, doors, and windows)
+            // we can skip some expensive logic.
+            if (airtight.Comp.InitialAirBlockedDirection == (int)AtmosDirection.All)
             {
+                airtight.Comp.CurrentAirBlockedDirection = airtight.Comp.InitialAirBlockedDirection;
                 UpdatePosition(airtight);
                 return;
             }
 
+            // Otherwise we need to determine its current blocked air directions based on rotation
+            // and check if it's still airtight.
             var xform = Transform(airtight);
             airtight.Comp.CurrentAirBlockedDirection =
                 (int) Rotate((AtmosDirection) airtight.Comp.InitialAirBlockedDirection, xform.LocalRotation);

From 6f0d647451b8274c111e7b101c696bc4ed8ddd26 Mon Sep 17 00:00:00 2001
From: War__Prophet <tripwiregamer@gmail.com>
Date: Wed, 14 Jan 2026 21:27:24 -0600
Subject: [PATCH 320/360] Put arrows on all the single-directional pipes
 (#42408)

k
---
 .../Piping/Atmospherics/pump.rsi/meta.json    |   2 +-
 .../Atmospherics/pump.rsi/pumpPassiveGate.png | Bin 938 -> 852 bytes
 .../Atmospherics/pump.rsi/pumpPressure.png    | Bin 1338 -> 758 bytes
 .../Atmospherics/pump.rsi/pumpPressureOn.png  | Bin 1932 -> 1279 bytes
 .../pump.rsi/pumpPressureRegulator.png        | Bin 743 -> 720 bytes
 .../pump.rsi/pumpPressureRegulatorOn.png      | Bin 742 -> 720 bytes
 .../Atmospherics/pump.rsi/pumpVolume.png      | Bin 694 -> 704 bytes
 .../pump.rsi/pumpVolumeBlocked.png            | Bin 5051 -> 1212 bytes
 .../Atmospherics/pump.rsi/pumpVolumeOn.png    | Bin 1952 -> 1620 bytes
 .../Atmospherics/pump_alt1.rsi/meta.json      |   2 +-
 .../pump_alt1.rsi/pumpPassiveGate.png         | Bin 943 -> 848 bytes
 .../pump_alt1.rsi/pumpPressure.png            | Bin 1344 -> 755 bytes
 .../pump_alt1.rsi/pumpPressureOn.png          | Bin 1947 -> 1286 bytes
 .../pump_alt1.rsi/pumpPressureRegulator.png   | Bin 618 -> 719 bytes
 .../pump_alt1.rsi/pumpPressureRegulatorOn.png | Bin 618 -> 719 bytes
 .../Atmospherics/pump_alt1.rsi/pumpVolume.png | Bin 697 -> 703 bytes
 .../pump_alt1.rsi/pumpVolumeBlocked.png       | Bin 967 -> 891 bytes
 .../pump_alt1.rsi/pumpVolumeOn.png            | Bin 1878 -> 1627 bytes
 .../Atmospherics/pump_alt2.rsi/meta.json      |   2 +-
 .../pump_alt2.rsi/pumpPassiveGate.png         | Bin 944 -> 847 bytes
 .../pump_alt2.rsi/pumpPressure.png            | Bin 1341 -> 761 bytes
 .../pump_alt2.rsi/pumpPressureOn.png          | Bin 1957 -> 1273 bytes
 .../pump_alt2.rsi/pumpPressureRegulator.png   | Bin 618 -> 721 bytes
 .../pump_alt2.rsi/pumpPressureRegulatorOn.png | Bin 618 -> 721 bytes
 .../Atmospherics/pump_alt2.rsi/pumpVolume.png | Bin 699 -> 701 bytes
 .../pump_alt2.rsi/pumpVolumeBlocked.png       | Bin 989 -> 898 bytes
 .../pump_alt2.rsi/pumpVolumeOn.png            | Bin 1873 -> 1618 bytes
 27 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
index 4dceb4af72..4a7e3543c0 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. pvalve taken from https://github.com/tgstation/tgstation/commit/584068b59e271c0108557902e8516c70d6ae56f2 and modified by ArtisticRoomba (GitHub)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. pvalve taken from https://github.com/tgstation/tgstation/commit/584068b59e271c0108557902e8516c70d6ae56f2 and modified by ArtisticRoomba (GitHub), pumpPassiveGate pumpPressure pumpPressureOn pumpPressureRegulator pumpPressureRegulatorOn pumpVolume pumpVolumeBlocked and pumpVolumeOn all modified slightly by war__prophet (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGate.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGate.png
index 411b0a039273c8400d6948ca81fb4e0da7272f32..79a1778fcf12495a10a88d82338a21142cb2c6d1 100644
GIT binary patch
literal 852
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1U2Ka=yzO=A7FDLiH-2A471|J_^1p~u5S=oyW3=0_;(sXs>;^MY$-P+dH
zCND4lfq`Myu3bGnJ))wb4C2Q{4E{3+&)>0Q2hb#e*K-7blz2&yU+{mdfZ>_LvpAp<
z&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%=xATcwqM9<GPM8Q<gP|q?a@0J}<
z&9>AC&ooa@Ed~xChm}E!k(GfF$npYWX($^M0ve3WU~wiO+mMlo0pzSGAkJ)O0gGn=
z*&vVr#321J8qHD$U>HtdXJ7%UFfcMUU|aw(6{Lf80mP&!KsE?40nK3os|>QV0J5OE
z3=IrGvOebzc&PSYUjVeN-_yl0B*Oje)SH`{40s$^n;kZuQ2YOX<#x}*m&`=0&(#*R
zJ&tHRWVlvs=h^sA)lConxj0U{|1;yDs6(L0f#XX3mRb#$cv7zjJm6ThbB(w0vIm^6
z7WHv5JWM_&9J00Yb0mkxRhy~V1>YIwukHKJFy)$++Kh#{w@=7PF}kp-9SMJacf)ax
zU&4+OkNAElG$qO?HHn>5p0Tf|A<x2$BmMz*RW8%h%M6*FD+Q1IXBRp6QEo=%*KhS{
znoM@W0+;TJANj|gw5z(wAo82X%Xb`0O71Ez-K}lm==EKtamu@S3Ocj+oPg3Ba^^qO
zSIqSE_{3~C{eh6e^au7V7Z+(9V2b{*a@jVMTc`C*5^q|yh!z|S=jboFd(bap8($)8
z%m-`R8Rwd8&fckAoA-^wYMxBV_R<bl2iE^<k8@UizQlW~IPSjga{dexU%$n5xw1)u
z0SCjgS$4FzyA`*+X;e0~OSzEsT3`?Rwg;b?CLXqZQ216rW~uIvJx4qCzHt)%qr6tO
piB-Ot-+Bobliop9hq^d}^Y!edt{npTE6;$U$<x)(Wt~$(69DspCu9Hs

delta 927
zcmV;Q17Q5r2C4^;8Gi-<0063Kaozv`00DDSM?wIu&K&6g00U%6L_t(|ob8%1Yui8+
z$Nw%Z32u0xlBGkfu7N0C10iVW7x0!4g3~F16t`<fe}!V=p;K)_aJKshHKmYMQihCm
zI%H_5!;uD?4%eZUIlGb)-8o8~+z*71?0fg#<LN!=-2n!J!GG|8$*Bw?BC*T)@VZU}
z&bgATse_1w2MGC|2M8h(abxZkje+qVAhsQ6=#0jgQ>KN-ssr~N2hV~4dyWGH!6bFM
zmZ)e`eFT*quo49L>Nr>l0(?{zq5u(zQmF(0SX*0z=Xp3eIRRr#WRi!7NQ{SjBf}g(
zM50_S3){AbM}N6oR-Qj~1aQuC6(VuL`EbI*9aVvDw+qX%v}B}qKp28=0c>t=!uNfY
zd_TJol$e>B(Uzf{1KRC2+U+&~z;#`1MQ*})nD_gA<nwtgnU7Qlc6u%Rvc93yYiTKv
zmQ&8b7y~ew2vBx_J-d$c@1J1Lu4^lih5`}7D$wuuwSVO)I{*Oa_q);STdoA-Ifg&^
zpe<9&0bvL-#&9Zq8)QMJ*TVdZ*V>PumIJ~NER{+q5NRor7JGIbPrEO*A3^0R0Q{ST
zvMhtH>tbVL1INe5@O@udj+O%^QHIjOInOc1#4hLf+-w2>n8u5kmIHL(!c-t4@r82~
zrCx@|xqnzCQhE_n&H=9LqF%3KXJ<!Mgc7xZ@$%<*5y;iDOu|GY#*eJ#4nM@U9Y?$$
zI6=OD?`cR4m~F=qjVW))q~@+a$Nvk6NL&EJ<3Sm3Fc=I5gTY`h7z_r3K^yHpzTAwM
z#+_oZ3de1Qi|W3davr%dG--#V>HLJcUbmeuQh&k7-a8;xrIlG3##rqANjX8@8*~#G
zV~Dds)+usfMDD%sIS$?g0g6Db!MXUcw1ir%hEA_FT$i&fYq(h=<Tlm|mIiaj5$aT_
zRPd_VjJ07)8k4v%GO`tJz~bT}0AT+4GCG%4bh}+#U0scw0iakcYM2_$!omUoM9$f{
ztbbzu`7(gNj!LpYCeZ;aL4cowt#Ba+2L}Lv^Rpw^b5&TDg?v6gat46I!$S>IqX}h3
z&1uh7aej6L0NCH(PqaZMHV4!=$CmVa0}z#%91uqqIUp(j#MvP0lvoAiO%H{HDiB8&
zRUoMX#n~YLZ|dr{%(TCQ7z_r3!C){L3>b#H;}64R$Brg>){p=I002ovPDHLkV1o62
Bs#E{~

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png
index eb35e1a42ead91135891251f06656cd50fe4f6b0..44bdd52f2cd70fc85a617f8cf90cf24b574d5c46 100644
GIT binary patch
literal 758
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0p1o(uwzO=A7FDLiH-2A47#yMG8K0dynK)<-SxE(uo^z`)j`goO>mnI~{
z88a}1hK5X=I;FU{XzSLkZEbBkckXOxXh=#*YHn@@8m4Tx<^qtCC<*cl{*N6noE6r4
z1ysXX;1OBOz`%DHgc*<LuSfxFbd4wp&QB{TPb^Ah2uRG#E79|F4N)-FGt{%p$-89-
zRI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<SQ^R(g@OhnGgzDn$TnnTVh{k*Q9zv8&H@(C
z0<u9M0f<5RVKkbh49pA+6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7EG>X6
zs4hbT1CXrG`2!xR{nr-&ZPWF1aSVxYe>=5%U9$p@gLyjptFCuT|NmdEeM%-kDX}Pj
zQ%iEmF|%~mr83Lr{+ZYCRGq8u>d8BMJw>iu_G5g0pEaQ_JccpjOs#;$??iV7rxR{D
z5)0ny#oZ8Ac+|!)<rVwWW0SQw{yIjnI>qGQW-6@zlgsLFna5qx<lASN;QZxzgYP8Y
zKCT<tWvq?-N7bSnUj%RM40F)T*=WHcHe3C{Y11}+54G(L=4U15HEe$?@lRk<`;=<F
zOPWne7epN64&EseKO@X9d}W6E5qAgQ|GpLZjH!o?s2>zEx$%J6ea}OK_j=2>?mk;y
zAgN&z#HGr{Dx`Yv<({PbXMcOAHnn%@6}+qB($zH55LnT#K6lks&aZ`>0jt-(WLj&K
sXmzM*>icI2-=lv_Qqo}Z74*5x-M1q0!u$`v)j)yh>FVdQ&MBb@0L$<D?f?J)

delta 1330
zcmV-21<m^Q1-c558Gi-<0063Kaozv`00DDSM?wIu&K&6g00i_&L_t(|ob8%TXd6cq
z$Nx{e3$+EC7>64B5RsI&hd4Hb=wK+VLV}e;TDDFr;}~=Z24DN3fJjJD2n{;eZLc-O
z2Z3$mFP0>S*tA3~g&cBd9c)Nqq7ol`YDg@Q9gtS92QypC5PxdVZnQ0(9~jAE_q{hW
zZ{F<ucQi=Q(b0i(=gwhtbQH&rAIIwIDmFGYWK2onr~i<bKx(y`m)kw#hkvOK2!*z9
za~ubb<9H4tNdKNPASi0J8VtjLuIrv{Nm&r7r)e5AP4gVYe$g}ypBD<;@%S;0ym*1{
z0g|=lDFZ|*Hh&t&alp)AX3w^yTENUO3?r~2$jtce)G7M?+BKRU9F!h?z(WR9Dish>
zAVrYq?>2j#f}T1cs41Xn8gyMpB9Y)A1^}jM^6tMz`fqP<hiRJJ_wh$;nkGjg5oufd
zUIk3kWXrMu02eM?!1D4k9z1ve+qSt>DtVfZd!<}1^M42LzlXQqc^Bq^gP5PU8Imi3
zbPliNa=3E#ET&Q^Srby2rpfVmFWzWsM&xh=t*wU;kM}}03#FeVjwO?I8PG_Ynwqha
z%b_?k>&7CBbO)^Da=4Pqc@999W631?`}?u9w1kHbA4=QtlmUZ-gSdC^9*V`HbO5rf
z<Z}4RhkpU^lmV9m%z*BT7m-LLaR2^&tgfy~+mY@7zXFhDX?z?@<KqAV$^gFtkj1Yl
z=&1(yQG{giYYKX*0e%!AS^Qdtr8;11YZFI5{RF3CF+3?2v9`7*9e^x;EyMeM5-gQU
zw6L&<ms^{7y7m;$p8bi1g+(;#F<5XcnZ(z3?tfrlWTcU9xAAi`B7>isF{!<PrfIM&
zi+=p6fJ>JyHFV?wARG=;Z*MQn&dyRgou-zSmc~kALXgPk^9^sjz%NBgsspOkDu8-r
zrqLLN0cQ5B2uZC1M1;@o-sO%*k8osT13!3BWo7;QrASHF03r%B1AqYE3^|U2Z(}j~
zEq{}txn#28z3{JiGbB{uAYP1!kv9w@I8}IOAVHyCjt1mkp-?Ck3WY+UQ2h7V^Im>G
z%IoWr$X`bcv=>SH`Sa)Qv6z2iYikn=3ybig)V?Z)c)S-)P0f3{-nQ*M#h?!j4Y~j9
zKKUuOn%Qg?U0q$6N~JI`GJ>g83Lj=NxPO(&z`A}N_SLI6f8z$`E?-9M%P-K^XJLNc
z=5#tu!bW0Zf&oA%NV~VO!teQ9jsZZN|I;)L*=&~k`Yg1z9ztRC8`qccEn*R|4UCMy
zwrva#57*fies}uTqtU4QgHTyRp%7}d8i>f<dv|tr)_wN$^xzhNXfz5NKzDaH=6?XZ
zb@V87UBj8vF=Vq@&gb()L^yE!Hi!r(PMiQUyJrkFO@re&2!%o*A{@MV6U>ZgGzw-$
ze}6xpIUPe=TN@&WBPi_fC47rmcE@<~<Vn<OH88W=CdYAHCChOf=#!I^0JbHrofw9J
zN~PldF0K=w6B82vfa&RJ06;#U2Y&$EEfnx_YZE{J@+&OMqM4Z)RI63IxxNk}a_@f?
zZR_h`W=u{_Lf3UzmPNL0bEQ&6vG_-wFX3CnvOC7Hu`w8i;kIRW`v8F2+uQ3#TF6X0
z&*7HK<$c$Ha5zk&r>oU!U9S_7n_(gw#CLHGGeg&P_j|cq-ggZMhr@0S5GxAyPBn>$
o)GDA*C=?2XLZMJ76#q;90#xyJNf2jGlmGw#07*qoM6N<$f@%M78UO$Q

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureOn.png
index bd880ff51fab98f6fec75234fc6d6c4b158af8ad..551a162fb1489e5d22bc8559f18a76f39e862faa 100644
GIT binary patch
literal 1279
zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgBeKf-aAPXNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%4+-!IapmLVi;Iifv13P1PY=U&*6ThD*Jm&=T;IrWJ#gpFoed2QNl8h~
z&COf4Zf$F83k?mKHg!sIagnc&S9y79LPA_npx-%J*_#>~=jG&Hn47<}umBqT!`9#^
zkdi40@(cct8!(7(dUPGAj<dicvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^Ah2uRG#
zE79|F4N)-FGt{%p$-89-RI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<SQ^R(g^C6vGgzDn
z$TnnTVh{k*Q9zv8&H@(C0<u9M0f<5RVKkbh48U-mz|Oz|RAFFbY{0kxVk$@n>jH>L
zQ-Ev`U;>)M1XdYjX#r$Gbr~8MfMk8nAMjA^zrKKhfmzMd#WAEJ?(M9XMXwBa-1gqS
zxv=E<-}|3$Ic^E;Iy*OO)(pwH_FHQ<{P38(g;VhPsfP_A77C(#9<9tl2N_+Nj%~kj
zaB+~w$}MNgZya9i<&o^Ov2p9R7juhU-|yA`CE#S4@HP6wbM=T#$Hm-2|FHN*=WN*P
zel`EwMAiC@t%0g3%YP*`zqMWU?~z8#r`ftat9J17ByT+UO)j*0&hu$^?D_pJKeP~)
zdh;Os>gAV~`|HH_>&1J${{G?nE7RG(tGUabUu4=h?|wqb?6-fl9{hISdGK4^U+sS_
z^DWK3*GvciyLD>mfm{B@SLd%-{XaNdo?rY!+=H`!vle};|9SND%avCW+55c=W%+|Y
zZYrqmU-e7>&QpsMU?<5vcow*R7nI4Cc6-YAi9m;byW!-W_m?eDbxGJ${~bWD$VF$I
zte?ZKeZT2y{mckunF(C%OAaxvEO5|5XKv!Kh!2WwkmT9Hawg$`Y62Ux9;2~D0p|?Q
zn*P>5kDmEnnEU5@K*nO{*VX2?9{(vhEB(*UHDk4}bd~+Cp7LAUmhmq>U$H(myV|&|
zhyT|0b=z+&zsS0<hpRU{Z$ta#n$3TiYYWw;gf8Pe#jp2x?k3+ihCh1x_s+hN%poaX
zZN8EHTV{cyhjR0mxs%Ig<!{};FP=qViSPOsdrBnb!@Vval><??A=LHAH<w>Hef^#A
z)xB^j7O$XsP>1<YYAsWm!2=<KX2$6V52|gF@hiwyDO!Elu1@Z3`J*G3Q<lEo!&CJ4
z%f+kKFL$S0_m_{Yjk&G5yYAPESC4P$-TZpl{r<hOlX~;*ycVDDH>t3cee+;Sev=WG
z>5or&AGA!|ZuWe4j=3H2)X0vfFjx4#^6SU9)b<@ebbj&o>n2rpw=RC&$9pT|%7fFp
zFMeNWdMj;@ymNlk>eyrL7r$&Py_LTAZS3pPh#yC_wePVrS~Q`#791TDZ|kq+04Hul
eI=^Hw|3Bj;)>G3K-|9LK$~~U0elF{r5}E+q)Dw9C

literal 1932
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

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png
index cb7322d040a142fea90a21196625b2591bc9d98a..04bd011c9b6a0ed9478604522135f23227d2c1da 100644
GIT binary patch
literal 720
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynKtEp}uk!NJgoHRCNJ>iDv13Pb
zb8}Bmk1+$oEucmQ2K^T&1A&xKNswRge{{g`X#aj8pe$#BM`SSr1K$x4W}K?cCk+&o
zC~=J_3C>R|DNig)We7;j%q!9Ja}7~2)iczy%*nfD2UN2yHNrE^(^HFq1IS@zkYZ$I
zU<9(ffLI#J2KiQlkr^z`1Y{dBGBF4M=_nx1Y-a(BX93wDz*El1@B$bpFdEHL2B6dg
zb_N!pN&_Qf1I7gqQ$aSeE`XRc1;_>gCZM@YV3k3Z7C;tMm!W|HNY?v<bcW{4-8X>2
zF7N5$7!u+BcIw-8%?dmY=IP5<bNu?JU(NkRO2g-viuq2?=j>Ux=S0|_%H4nBzp%>J
zsZGB>JlGts#rn7|aKfkOOb;GAE@hZ^DL}m;vyRhQg@HeQDT7|tQ44u)fvIAwiVeqR
zWH*_}bDN#+RJfe<*m{S~i91Oi>yBR2U9w*D3A5v`g)L8_dRTV)Z*|c*@kd9sMd5F(
zw}+$YTGp2rbQD=$-q2HwUXi!*tMQ8E+`A53V(n$M`Nqk|Vc}VDK!{Vo+$HLBb+`8q
zp}vSBrp-Rvo)r3+m$R+EnsK4(@~^cHD}6Ns+|K6JOIlP)XEZ+d;ne$B=&tgiDmQHV
z{@!x=Wr5b0m@Yd>zjxO?BFe5;sAut@p<yx$yUxM~+PfBT>%?w&Z!fONlJRG%h!rT<
NJYD@<);T3K0RVJr;|2f#

delta 711
zcmV;&0yzE91?L5j83+ad0063Kao&-h7k>hoNkl<Zc%1E;y>8nu6opR!WmUU*PmpG)
z;ZEL)wm~|lMg{}*kRh+pWb2q`$dJKfpzaOwgKnN`xRam22(oxh0ar)$4Vc1dO^T9B
z@P2?HT9!oe@Lq`KVS>m}0T4MV00LzOe39}R@WJ&t!3yAuU<D{M>L$So;ESLINPp9G
zHl0q_$~+@j0oeKXyYKMz;;NJgK?=amzkTx>TQ9beK6{Sy^UPTUYXMmKQ@@oB$7Sp9
zbUH|q1Uoys7z_sB_bhW0!6^b*A?fvc7>!044u@<2>g4<BY4IU14-TB46J!bycG?^O
zSDXYmIy?Ja$d4QOVK4t=X^Og#Xn*q&bxs0&o`>9{5vVZ*e5PQqDc}ny0eps_3qDgY
z$hUyc6m(93AG!LU<|9$&HMDA+1$cFMh;FxAOhm@xG3sQcZvoD>IP2n6^z!lolgXrL
zNFB34so&@GoFagYxW4%|TVGH3XQZ~ySAla1u+wG#iTw|hng@j5d7={`*MA#*t;((%
zjR4mhLmqV#jQ~WB3V_H_0T4MV03t^PK;)<Zh#VCFk)s0GT>Q7q5hhiw6;@Hdbp(hl
zMt@E$D*6I)e*WG2YO(ALG3t1-EjD;f0orABjA)wBH!wwzHN=0dBrUp*o!{T@U~_W|
z+3_(xo}3gNZM9kt_er^O0e@&n7UZ3kGAm`7ULox=I!1HTq;w?6Zm>q9fp)tMcCXoN
z7Qe~y&$12H0?>^m8%EhYPp^=6nJ>pk44C`-pSZofE6(-%{YS?mqil<{0J0xv&nU}z
zy2La}7kP!tE}|~FPOLcQyl*GkT7U;<mKzd`d^2;einoB6vdgr^1~e-HR&9k<QNK=v
t5IHIUB1Z*4<fs6M92EeOqXHmuegRlsQ2E=hOTPdB002ovPDHLkV1jNCMnV7p

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png
index 8a8f85cec726333833fb99eda1917e99076b58fd..5b66af599e6c964b60a560501030f11275d99c75 100644
GIT binary patch
literal 720
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynKtEp}uk!NJgoHRCNJ>iDv13Pb
zb8}Bmk1<f!e;yzq^S@6ANC}k$`33(+2Mmw)?-v5fau#?*7BevL9RXp+soH$fKtYKT
z*NBqf{Irtt#G+J&fW*wa5<NfH5Cu~`Lp{r!yjylaHQQ1nJkvZqwHP>n999M?Mpgz!
zAj=DgrJ-z)Z#5X1!QxCnwjm=Eg8-0@0^-be7O;30kPQMn<%|q3fPn&|(JW;EN=;yA
zU;(N$Ffuk^TmUf@WFzYWh)Gj`Y!F}qn#%-M8DwbzWI=Tq8W@0Ny+252XwKYy0~qY`
zo-U3d5$<oNzFpU>z~f+^zI-*uuYda0++U<Le2%G@@8o>Wo^^Xpg#D@9{U`nlt9+f>
z^!vku&GA~SkLv;_e0t9G;IZRUhIy9))EhGEIGt4(_~Vx{=w%(XkmnYdD#ohVaBN0)
zlZiaH+38M&%Sn%|cj%nBljO1P=r!FX>ouP+JN{bO@+7K<WvBmE7o8J-bW~du{>FNH
zIGV0yeR)Agk>%wLJ;mr1c`LsfuUO8#>%b+}URIlLoO~P>o&^VlI0ejIqCQu5d;bvX
zizs5+?6d7jp^tev+xn{+7pgA*TI;aVS2MuvY+k*jMWu8`<8vQQy^n?NDj%wH!?y45
zEtg*wXnl$4vXk_CcikhR?0SWI77rR4CbO{XEPSB7YXP@T?1uOD;+iZOf2N99fr8D`
L)z4*}Q$iB}5i8=`

delta 710
zcmV;%0y+KA1?B~i83+ad0063Kao&-h7k>hnNkl<Zc%1E;u}&K?9L7JYV?Da%0T3`W
zN~dh71%bp!lp#_xq!O=zcmtjRsTndx=?<brY?+ACDNhigE?Geed?rQ)g%bOGms<Y+
zq{z<Q<!pcV|LYuoP7paF03t^OK%h*4pSr#R9J<~oSOI(ytN>Y_x=FAC_#$Wl(tk9a
zP9~F;EcXaj01keCZwKcWzcPssqyQZJ*Du@H*xW+8_7UA~&shX(0oeFk=dy<5qV3me
zH6%%b-Q7L(`+e|xujeL$Qv|R<(rh*{91bxU4A=n_$<5iB`jAhpmh*jrOaa0{n-9Ph
zCjr_&x=$q@%Y&z5>DmVrg^o5KQGe$oK<j&5l`m2N#ifAH6bv>6eBmU3&k%IMX9@=S
z7Vw#Z&MEMx-Ny0bhh%vTEgNS6J|7*S(P*fN$Y?Y|ku3Esz}XgOU7U(uUS4249;=QN
zF$>h~`@El11h5moudb)7s|o*%6gK!ga83aZI_p2N|A9>NfY1j|WFqAHLw{eZvdcyy
z!1aeAKXns{07Q-mfXER65IG_MB1Z&3<cI)>91#GKBLdi5{IAUsCV8zD=Fz@&1ZZ1~
z{+za`=nLrMv+v$li}lVBqm4KFVuRNdpj}4Ch^7gB15*UOhWOq}(!A?9_<FsD_4N((
zPEPRc^i&PBQmM?Y=swqT7k_|;B%w2_>ui*DdWE#h=ormRlgyEzcY~EmB~+_bWr3E<
zWpz%Muj@8g3qUtkabVPq<Maw?m-%vxv;lK>caPiKzv@`0(|J*{FVA&LtOYRl<GilZ
zC8kk2&nsMX5p~{m+KOY&`*xzO1<*Oh4GE?vZ{}VeZvkz}F47kptTO~ywiT8~`!W$i
s<cI)>91#GKBLX0DL;ysN2!P0W0FR?iXT8=NJ^%m!07*qoM6N<$f?U)@DgXcg

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolume.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolume.png
index c01724ded376f9368c52d642b7e6b070faec58b2..3298bf4d8090f1048c51eee4683c82f379b657d3 100644
GIT binary patch
literal 704
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynK)<-SxE(uo^z`)j`goO>mnI~{
zg@%Sqn>wYqxF|L@7N|A9SGoa636%u-1^-6}43GBj7Xr$17I;J!GcfQS24TkI`72U@
zf)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7dX_nPx9oswwxvdRrg?g5F>nAmtPE0&
ztPG4mmKP99L)jqTYA`Z`#hHL?Lq;YB0U#X(#F_0ZVDT&<8w3)77^ELYqgl!T46h07
z3@ktu21dpPj0+&9f^@JhfS5D|$OZu>pgBxnl|hykKo(S&p@9KN*5~{I57qwb3xKxq
zd%8G=M7Y15dXuk3fyedktG?6!|GyDg$+dK1Vu{+!md^{0+?FxdxLGy%zi`FZiA{Sn
zGPek8uDCXvY5sifhI8!e7)(sW8fP8vW0<w<?JREQFNaSgsU2Y7A<z(XdCi?U+|#@p
z3z{Pur>h?nXSx1aK|?^TtG9&NUBNe0I&;--ro@dF512n3J;w5{i1#3??%exr+=~*K
z_Gh*wFzwH6f3RNQua|#)bHyYDP7}`$YZ9_|vh6ywAiz0%LU4m`z5BgrhrpgWtkV`K
zTOZi-R`2P>yW0eNjE^=fRddjB<nCr%wvg@3d)C&-g^#Od^fiTvyy!i@pei=tsoH_C
w=!c9|t{XSo+x_6p``^m%*`#to<>0P;41aPMs*Ii}@qmKK)78&qol`;+0Q=A50RR91

delta 681
zcmV;a0#^ON1-1o{8Gi-<0063Kaozv`00DDSM?wIu&K&6g00MAHL_t(|obB2%Z`wc@
z2H@8%3mFciR6?>8kW#hDfcOPfOO*(FDlQ{)^B>v{9{3w%X7CW5H;fXMMx9#;F{DGO
z!r-ZqzyppHs_SIhv{g84gG>1yiOuF-e+K(}{s2PACR36Q5P#OEd|s%kiqU9<y^D*`
z$8j&tP^%<_fDj_-7=$E=F&6nh5b7Gh7!$vLq6P_*;qagwxd^E+0~>|`0I1jN==b~R
z^?Kl(3(xaba#vxDiDyrr;L+nfuuK*wC*j9lxBvmpIXLG4fS@3&z!(#nRsjGM@&!z%
z-=S$0I8G;25q~1x2CLO-l-)y1r?=oZ9lU<?7R}}{(&??x-?g^$03e<du+{~L0~H|Y
z07;_)Bpo1WkqThjc3e3U6KW#l`x9td1<%W6d>ITd91i2oB_)m%u<$Ry^E}0II=J>H
zxEx;M>gpRDr-M~Zg9C<Pz_Kiurn$;te`1V@+RGP-J%0!#{V+BQlE}dSigvrb*#-C?
zguZZn+}RPTs$x7IM_QFlTIhLzq9{<5wLNY^2qA<JLI@#*Y%u8+jYSqfm$gK`j0{p6
z{n{2YkMB>G@}3~*43TYy;G9ckkbW~%DwWV^H0Ex1bo2_fn(;^9&gcDo0buU>;or7n
zjEP#!z<>7k12mh*b2FHxIcwjUN4fyTViCaIT^Y7*<KgZuQmOkmJSgMztSc<bg0AaI
zCX<m`L(FEgw>m(BZm?V~heEy}l_AI~L%IO1R%<rEUEX!Oxb`P_fBpfU=PA0b0{~pt
zl`4Siy0;48d7g55))hB5Qw#=Qr7{FrWo-O4U?Su10)!Ak2qA<JvXOoOrc4Kk?F?C{
P00000NkvXXu0mjfi$OJ*

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeBlocked.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeBlocked.png
index 797a3b987adc6c89f3e530cb728bf625a6a0f0ea..56fd57872347590832a7f4c77cc31aae0d49b65a 100644
GIT binary patch
literal 1212
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wF4y>n=+l913aCb6#|O#(=u~X85lIq
zPn~G#!R#o}YA@_Mk%e2iBO+&E*s?&u(*mx7JS`FjR~M8gCn@Z1yW7#bG(kI}!X&P>
zck4E>ZA}Ul4L5E@Xx{2r^FODBMX`zbaLt~X-)B@ZH#RqA?)+-F;mxGUQr+2?jW<U<
zHa^>usqEolem5zp$i(;T$3pM9QTdCsy8rhUq+K*!=qKDa({;JZ9tE2nQCeE}1p8)q
zSGoNN*>Qa$H`jgbyBeRnAI&+>I90On(#ph#9UG>tPFmb`R`s}$oWQ$N5!;@yFFQRa
zaL=+ET5D$5e-F{;(Y+Ns*=zdElM;_rJQgKxaGJ-Yx@gm_MLU+H*vB2d|M2(ZM@C1c
z9v3;zaXR9~KKZZg`*)Xa{#*NWNq~&hJe&7xrKPq%$iDp9j^FnEYmTP=g2eDYr`Zj@
z=>1A_eSNEaTB*hEH5tdu=Hxs4b`C5riRU`Sld}0kmC}6^=C#)^*o41(n?C=swTE}O
zaQKGZ?6#IC=dJ(vZrQ7Q|7;$AcmE^p_orw^FoU}nFjC9{d_r7bT3DQylY3!qep5r^
zoUAM#A74<QUtC<=jvYICdU||)yvoZ<6B6P=Lqn!bol;y}6dM~0)SBNb-2kM7N`m}?
z|DywjNBj2+0cAN0JR*x37`TN&n2}-D90{PHM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMM
zsh**pWlr8LJD{4L)CkWsPfsld4j_k>L5h);ff2|8xmg;@1|=^IMrN=$6Oe7l$iyH3
zq@#d1vz-Mjo&{usfTtuQ!wX<4gwbf0G63~YU}s<fsx&Y%Heg%;G4=m{ux5t%8xsR7
zE+5whCf_5TE{-7?&TnU2oYZ8%<0{&@h~vcn|7&tPbv(JRD_LyzJI8Fa_fqhIX%80O
zmlV!e^v_I8rd#;^-Ww4C->kWl{>^RpQS8EX;_z?HfP0rCk2^U`_b%Og=6l1Zd3j%B
zk9s{|+o8cwd3j5$a<Og&gCpms42Ed#MUQ<IJY@e@H=TdRD59cvN@T|3$_cYxF-=%L
zO-R#2CroI<Zs7~v3x$rHUd!}UFlvM4eX%3_xtynxrzq%It7!CJoX!!u>5ccSS_eI~
zhClNXiWj~zs8>>)qEN5tQ1e$Vr%x=!K0v^$L2l+x55}q&>m4`(A~&&VM(C_@I%#k~
zSLmG0oktg&eqOpDYO6m<-Ewj|$2uFEMS6EuOrA5@xUy}*qT>u(OMh$>{q&&g6ywC_
zF-mgsfyJNiYxX-IIP=7^X=3fWgYWh)nwoL&5%)2vDGYx?H!vxBT>U;@iPbuRse@BN
ztzia35{R*1mBaKX!*&mg&jqKYeORs(WWMzH+VIK5Q9!G5SGkQ%(b9eSa*jWR;tDkG
zw4E!p-p3HKsCoaNuS^P`T@OjhcyC`AefV+rtKcd6ALmvd`0&Bzj?%+3hjsG}MBg;Q
ctZ}$+&sZ_d`M3vj%3^TJaP@Op=akR{06hxpNdN!<

literal 5051
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

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeOn.png
index 46f58e2e65f2dfe8b09624fcc700cc9694702995..ee2fa989d3f98396b62637810a61b1d2749557f7 100644
GIT binary patch
literal 1620
zcmaJ>2~bmK5PmNtaw&?`13AXQq6o-gv=C4fh9e-RTnai6xdf$_06`!?2nYyPK&T?7
zL=!{^js=el1mz0tNK{TihK3431wjml<p>ERuYW*0j<wyHec$f>d;Poby$c=$mo;iz
z)F232<BE6m0yqSir=kR&#wVB~0ARA0ivv{Eq5BRf=y3bP_7HUclKN5*2Iz-8+<lxh
zG&G1rVr^}0PEJlhKmY>WBtQt1fItWjLROChgrFlwe6AK=A(LYcySv55pA8HodU+B$
z^z;NqMxFZlV^&u0tgS&l8>YS~0PR>Wf;aLX1i^dMxWGv@3V)0YK^ng+80M2ILV<B}
ztdn1?Hz_POJ}BlS<Pmf_GS-aX<g<0JnWY)-Ok}?u@TocJ=NjhfY7D6W1p{q?F%S$S
zH^4d{WyK_nV5Ma{3doi)3R(y7IN;M+=w*8ZkQEdNSP}mTzbFcUS>`K4Xy9S78*2fx
zR<bH0FszkKSAeV_6v%^G_VmJ81L<RwrG<s!)V-63H@wux0$a#(b+q?MAWjtjnDooR
zbxwU(PX)IfD&9VaAl)59xsyX`YOA9r7;9B+!;g{o8gzDq^b2vC`PWsR5YVAJP!B?s
zwqy8)Dh=A@z2p4O-jNNP8??&`_raCw(-iFbV`oh*xU|~2WUTSwCv@Ij{(RWC-L||i
zRuhGaeH5H#hFEv4r7mGf&c3G8d%7;^Z)Fd+<A-ZP(##G}QW-y6Z7b;Hn&opGNzMkF
z#JH<H{9@1k2_i9mm-;$s%h-ghZ)9dCmAp_lk?bto8|g4wM_`T8)EDj}>7~1q8#SkA
z?oeSn;nF7AMPU(ZCb}R9w5$aS=r%(QH1{^deyUBxjS#z_b?H@noq<0cyrTSrE0{^G
zztz#K7R$YvR6c`nKwML@6g_C$+4y~6b8!KFD)lmVRU3Y|OYUF9tbZ8dY%n@Gl{<I?
zTiTtW8%-7~lTu*C@qxfec}bFbQuJVsW8#UHaE&pUy$C_ykhDAzAAPoX^xm)z=Q`>9
zh-zE|-F)HgY)wyLNlMH{v2t!Zvau`4`&8l<xPd!Y&X$;uH(1)@{^|bos#*E9>G|+I
zs6<*<(jpnSk$UT83J13KJ(KBfnRc!ggKPRyhKp;QDZgB29#~#S(y>`w9~P&$5v8G)
z<l)(N21ohp`Y6NRt}<`f`~iLc7@VQHH1d`py-;Lc)+f!CvKx0;aPB5RBw^G3qLf>1
z0y}n*SQ@-oW>pnd!w~85?lv30E*>cEkSzS#Dt)6v$4Y(O$yL)bCeK8eUP^PdcJW6b
zhdO>Mn|1S=z;_?7{lrYihj~Lq>1HN*pfQ6!@toNTETS`%b1jpd+V#{l9rlbSEVz&=
zay%Gku+{dncMU8Km_y<ByY47e_zivIV;ZGqywMu7L7j2#Ck(;<F$&aS<Y|33pBb!G
z_=2fnKHHa<pSa&9Ro>rIvs+fZO&MA6sg|^twmlT}=}@yT%7ZE&A(AqFU%Jv<3zAmf
z6qoVh{qwZU#;m;AS;;HauT=<6^Y-w3MxM(4^a-rA^|fxFqJn+>mfPxvyp~ZBe4n>-
zx%-TsS6zcVy9rk2YZPZeR6(Ov*}0Ky$2cT*+dEF_4^rA=`75Ehq#&iK>DFi^;dbbF
zv#zxy!lace8NVGl9WdYfrhLG+xcY;@6Oq3h&04}Y5lb%D|Dg=OofT-xshNw(Yc(3P
zCH@%f$6+~8#`XSpxGT4y92BXUd^zD~DxrsVakv&&63Yz5;`2961oGq6DYa$D_LtpF
z@5hi0i&^OvzQ<!|BqM=a{E|L8LHe%^okTnPN6^0<RSZXnD5VXZCzn0V7ASsCu1*BU
JDu=*xe*>!+%;W$7

literal 1952
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
Oa}wp@<Nnw!B=c`meZ^$}

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
index d7a2ccb3b6..cc54f3cfd3 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba.",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba. pumpPassiveGate pumpPressure pumpPressureOn pumpPressureRegulator pumpPressureRegulatorOn pumpVolume pumpVolumeBlocked and pumpVolumeOn all modified slightly by war__prophet (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPassiveGate.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPassiveGate.png
index 0d205491ec793db23122047af8ef25f9c44ff8c5..808a2c45f2a4c79d2c250f41678bb1edc23e867a 100644
GIT binary patch
literal 848
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1U2Ka=yzO=A7FDLiH-2A471|J_^1p~u5S=oyW3=0_;(sXs>;^MY$-P+dH
zCND4lfq`Myu3bGnJ))wb4C2Q{4E{3+&)>0Q2hb#e*K-7blz2&yU+{mdfZ>_LvpAp<
z&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%=xATcwqM9<GPM8Q<gP|q?a@0J}<
z&9>AC&ooa@Ed~xChm}E!k(GfF$npYWX($^M0ve3WU~wiO+mMlo0pzSGAkJ)O0gGn=
z*&vVr#321J8qHD$U>HtdXJ7%UFfcMUU|aw(6{Lf80mP&!KsE?40nK3os|>QV0J5OE
z3=IrGvOebzc&PSYUjVeN+tbA{B*Ojel-HA*40zmFn;kZu@V)mxaJwgSZu=I6e>d(*
z_9e4w9p5tJy;=Rq{h~W=pX1#0=bZZ{hOR{nc4C!hJQ=5?X-sBoS6T6Flit}1j>rJ<
zQZEJ$`O{6S%<}DSGkKZ%A7v}#|8P%hANztW*EA3E<la{Mc7a1d(?E6KuBY5gZWrEj
z>=D|2ppmPs(1RoD#`=U`o0xt%-Ffie!R11Bu*Up6j%gK}n!fyR(CT>KI5YhHS3`BJ
z2gZ#1?<zN4`LB>u9{Iqu+u_2yNeUU^jSKF&9^`Y}JztRJtseKD3sXMajuorexYs>}
z^LTh!8b6cX!TBO8w>=tI&6HMfM@zkZDlluq4xf!oeH^VHJgzgpX*rtOC0gK8Qe_a?
zVsrLR?OXP07FmD3UBxpuacC&rtD3XGT>tI@o9AEe7X4~)yZprD)%4R-Tpa`#UgIj@
z?C*KTbCcP<%PZx=sZ_4_jlCRk3PN|8<*xfY)XH`FAg27Sh{N}TbChu_Yx}|3%yyzV
lJ6NVO>;&SUxd(0jGhABf+A(=X?<!CfdAj<!taD0e0ssv@BxV2r

delta 932
zcmV;V16%yi2CoN@8Gi-<0063Kaozv`00(qQO+^Rk0~-M$0I+&BZ~y=UV@X6oRCt{2
znn6n&K@`XTDJ@DW54L#eq1j#q*IWgWJ@gCYrijFz6f9}4J?1NvU=BSsK_uShBQ%tP
z*WLBtv9Sjal|}|D2|Y{?&4x+b*{ry;8l4|3%Wh`o&3n9kZ-3@Z0E59`c*Nw=9*~H{
zF6YDNIuSVMsmr;S5RvczA;0qgK}15;=RwgJDDMGc+i`}*Xp9-<KJiq?pnHyk7eRnM
z#{q&shX^H6-WK->YB9h{5a7GxU?m9fS%&}xL?lY35&&RrZ4I91;pF55j4_c(93mny
z?(U5YV*n9}a(}rjY}+1Q<#IVzeySe8InPyy#0BR=frUHD0^M#GmSs(Bm#P6m7km$3
zb8{2E@1x}V*}0&^%*;%pc3NUUyWK{+-39=-uB$`DHOAe%-|r)z&rj_4M8{-0y%zph
zKhWv5bPTWLlyfk~03`PSEe5b>*Kz*y3+&l-9m6Xr5Pu=e0{wnJQ6DV^008>?Vf0yZ
zCK!(~{Mn~O{j?b%bV0@#PNls;7Ib<o%)fe@=o8dtfY1d?r4kB6y2M0c&#vQn_jRIA
zP)im7t_Ptk)1d3R*x1;>@$oTy-;Zsp%>YT$P?~VgbBr;u%Q?O_n*abdVIii?07+J1
zX+uQf8-M30N_7s8bFoUKT!?9j0j}$!Uaw<kXGh2IN@@e;<?VP8$knn8!bBv-udHN;
z8?kN25g!Lekl#Oe8d3pf+i^r=3JNl*a@X7OdjS!N3t)IXD&-9ZgTY`h7;eI?ixl!o
zYZ{Nil@nH-^G7W$PdSe)d!=oVn=EU?xla18LVx50BMS?FSe44oGK?|h`?QQ8AABZ(
zF$R?m@|+?oLULhY&vEcB2v7ua4bH`{r6tsAHFSEdVbRgDtl>#eh>l{&(m=L~a88v<
z1#g;7r4CzCpV*4f$T|Oj#l=Mc!2HW)bS|stcDuN`x*E9yK(Sc7g{sjkEGz&(q|DA`
z6@T+DmjV1YRGbbnu?AQP0{kAF^M@Q98~^~$&yHZvRbg2c^7;J89RLmw4{xDrG~t+0
zGVQr4&d-hj0Q>v<u{y{oV?d2_Y)QX208vrI02NupfVlXh(m|e6Y!;ADbP6$9Kt&c=
zAT9%`bdcLkUEY?N_BDvXU@#aA27|$1FdY~S27|$H2mAx2Bgc-)InwU{0000<MNUMn
GLSTaJ#-*eH

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png
index 94e5322cfca0f5bb02ef4cbf62a5a3faeef7bfb7..7c39a8c648b1579bdffcc76658ca6daf1f406fb9 100644
GIT binary patch
literal 755
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0p1o(uwzO=A7FDLiH-2A47#yMG8K0dynK)<-SxE(uo^z`)j`goO>mnI~{
z88a}1hK5X=I;FU{XzSLkZEbBkckXOxXh=#*YHn@@8m4Tx<^qtCC<*cl{*N6noE6r4
z1ysXX;1OBOz`%DHgc*<LuSfxFbd4wp&QB{TPb^Ah2uRG#E79|F4N)-FGt{%p$-89-
zRI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<SQ^R(g@OhnGgzDn$TnnTVh{k*Q9zv8&H@(C
z0<u9M0f<5RVKkbh49pA+6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7EG>X6
zs4hbT1CXrG`2!xR{nr-&ZPW5}aSVxYe><gDs7ZmR;dIObvn}?u|IKq>2)$Y+@+`Ex
zX5O)#KTQL+y%hVjo#}hToP^nLD?~I;>~3Z1&*yBYS7%9hxRK+{@eL{rOG_4}@dSjm
zS4W5`JnCWSSt)(^;|wmje+sLZmi8^LY_y8Mw)VlQ+m(&e6+U#D76i|UVBYS*G=If`
zy=j3D>NS`Sa>?0+HYTu6d1Thzvj1jE<Mvo*AC9<m)yC^4&L^1G=eEz7ap<*ibSCdT
z1<pF33;CBA_kCtz*R5$UV9F9Mf0D=2cDTj+0}HEI#X&Lu8(;orn7?bUV`*=5(p?&`
zNaMnak3P=@U$1)aA<1qo8JiG)RYWRii$*|3zxLc^TR4A~aa?$I<|Wh8hX%5n5>)bd
p#rC&)Oj6*~@tnXiZNGTQU0%`d$P4>^NIQW-(9_k=Wt~$(696?e`z8PY

delta 1336
zcmV-81;_gH1;7fB8Gi-<0063Kaozv`00DDSM?wIu&K&6g00jC;L_t(|ob8%TXd6cq
z$Nx{e3v~pW7>64B5D}NQhkO`9bO@AICc(}jEnBCRhz&XfL$3XBz&NBhga#etw%3~C
zgTM~*7fX^uWLm72LJm2!HZ~+NRf!KiH7FLy4oIulgPE;mh=05byV{n{4}?B=n)hbr
z&6_uGR)NQKc6Q>@rArteAIGUvr?9@hj;*aNuhn>_KjfDowOY-urajf~`2d7MyG>e_
z1<SI$Zr*eKzIi}U)M_<ong&%>9mzYBa%lhnD2f6_QM_*cKomv6=lMK$K6{4aFJIz&
zfEvmB<^jSLn}3aESzu-`vm<%Wtz>3snig0PWM+KV(?h@Cx<xaCgAHdN@W}%zl?sR`
zkRV9(PoJGELEi=-s3o8%3RG1^JRavDCIGsw^Zr*e^>=i1K-YEd|M(-;b)6%TNJDu~
zcL813*)R+Mz`(!&R##WCva$lxG`UnN9k?F7pj<BV2Y>IshqvE(7y98NSXeL_4R!)w
z{B$jo!HtU-ad&vwkLF*CuIt>_*NZn=4k2<Zg0{A!=<Dl6BQNwk4*-A@$z+`eG?SK=
zLs-jXP?(*wZE1ur1F)9K;6^6n$N)b$kxU|yNMLz+8Bd-(X(;QP2Mi7l;?bi=C=?2Q
zsA$MqCVzvk98Q359xxi92XtS(ig-MZ$B!RleSN*5tS<xL#sEK9o}9$;<RpNAJiv_s
ze&A*a`W6G61|dIivjlyM0ZxOEAGq0uJs*Iboo#e|`U!esG5k>|U}Iy$YZV9LW*hc2
z6D*ZVl*=vR)y_7aZ#>6~7k?p_TST+cV8MxG5`SMme26RQbTifN;`T7&HEs`Mo}UF2
zMS)=$^y5!?T)%$3sWT4%;c%FGdwXeaZjMGqMyR#5wYeoRQIN=HvrX^3z)eNU^8u(<
zs{raNGtEZRG%&NHije2K01@G{r6uls`V_~vw(!FNRarmuyQxU|5(9`RP!9kCycx1A
z3xD6nV)WbC7|kb>O&^7S#m$hY3I}m9B4%FGwBV}3dkqN+c{v)8eu+dP`A^|EQE_v}
z=hyk)4;#qIdA(RH+IM~jv9q&{Ty7Bu9YftxEEc)1uNN&XhaAb9rs>EAb!ceF{<8nE
z7O{_}QYoB1eHwR%hjAsH#@*pzd^k3S`+s9&FmB(5dGjVN-?@YN(NV;{`~v;`1{M}f
z9vK-S(MEh~iUB~R$NTqaq4#no!vG*2Zcr2jsZ@&l`wg_U9Yucp8(WvqEo>3CT}h{5
znkKGYyH?k>(7RW+8jVKnAH)$d6bhkMtAU8@#Ny=1lXdUs&Yi=30MTd^CV=klZhy=J
zc&n=ms;c0^`502E6lb$pA|f1q@Bl=FGiT0#ne7KC6h(n$SqOzfAR-*OcMr^rXfz6D
zMk0~m3+H2KZ*NEBSOob!x`b|F%YGZro;{0Ntp;Yc`(#;`ou*rs1$BCQ8o+M;z86i?
zP^nbx--VobpPHHi0L;wH006StEPnuCDWAuyoo)R5%dapDgJx%EQLR?-=H@1d$o~K9
zXy4ofGh=#s8mg+oFbpzHlPi@f3WY!GbP3(Umi;zPOiV!2G`lbR`v(Bj(a}*i(;|o7
z`;bw&Ty`A;!r?H9k*-#&b)!y1wucFC5TAt%GecEX`*XQmb{zx4;jkS8#4+)FZ>mg0
uau<+DBoc{4B9TZW5{X12kw_%}Fa8EsxOGW<t@7Uh0000<MNUMnLSTY;ZD-v8

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureOn.png
index 117ff9c8fb72055eff67667f4c5db9c6070ade6d..be103d077fc53e096a72d289cf8e4d6b2db046ad 100644
GIT binary patch
literal 1286
zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgBeKf-aAPXNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%4+-!IapmLVi;Iifv13P1PY=U&*6ThD*Jm&=T;IrWJ#gpFoed2QNl8h~
z&COf4Zf$F83k?mKHg!sIagnc&S9y79LPA_npx-%J*_#>~=jG&Hn47<}umBqT!`9#^
zkdi40@(cct8!(7(dUPGAj<dicvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^Ah2uRG#
zE79|F4N)-FGt{%p$-89-RI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<SQ^R(g^C6vGgzDn
z$TnnTVh{k*Q9zv8&H@(C0<u9M0f<5RVKkbh48U-mz|Oz|RAFFbY{0kxVk$@n>jH>L
zQ-Ev`U;>)M1XdYjX#r$Gbr~8MfMk8nAMjA^zrKKhfmzqn#WAEJ?(M9XMXwcj+-@GM
zzEpDl_x|Us?zzrx7j6f(Pm-K#pK9Us_mM@Oug<x-hZ$EEIB3aC;9_6W#3sTik-X(g
z#M}u%nUU`<TuDxKl1g61yJl<X`#Gzt-q&7j7kI_E+rBA$J;TD6g2zrh(v~=u)!Zhh
z{rjS2(}&gW657H=LB(4go%^T$eYITRp*v8d`}u)QVbUgFA|fxpmO1qO`oUalneAT9
z)8ur8`IjI6^lO{kdSU;qUwvyAZrHbP>Hl?~&hNb3aQ?Zt#6y!W6$h?wuWD}F_d#s`
z;qyXoZR$N%fZgh)nDBo3%y;@%?*3o-x}%!+N9?;Yx%F@U#@BtUs9I5)@p7ZpMp^#o
zuiG{(Jbvoe{=(_6l~(ggRjql$XV#x)8VYjFP1&4;KIgwOnJ+eOTISB7Sk1oCNO9|`
z{fB_Q$*yV<`1jcA#!taF|4tuS_n;xfLP3<zqm?=6A&5D(nrp}Z$;FImMF&(9)YxN~
z5DcOCWJP<&?W+Gy)bqBQS@qPFt+su4zkL6b-3y$ebB`JPzAC!sa+yhSMD4-qw{F(6
zO+{)h)Rk;LTPqbSaB77?#Z$3ri?_Gq^KXW24+xv7sIh-XQ~4>rjmIBx+kKNu>Q@!1
zd1HG-Zl`}U_s1|#wwLPaZ@1;w+3t^H5y+n!bo9wm?H@aWW@&!Y08+Og)UK1y?0WS|
z>iNq4YrYdfcml~kNX)6P8w#T5H_VhN;GA)iaXJ#?#Mgr6wG%n6J<R`OcdPu-k;7?A
zXYb+p^sTai|NWBrllIoiJve-PYw)J+=b3AM>?rg429(jyU!Jml{tJ)A-?y7oSjoP5
zG)2D2NGtop%e#+4C3-fozMsCMY{MzhnutfY6#w-t>d$WfVZH8;T~)2$;^T{B@4h*{
zp!b|qP1W{amOXB_o4#kyIGeFm`^Sb^H~aj4FWSCYdM{u2zg3$a7Yj7_2OvcPJX(}0
oGTmWm`w$|TLzr{fZRY=H{L64^n%S<?X`oEx>FVdQ&MBb@04^{OiU0rr

literal 1947
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

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png
index ee53abca2921cb9356776e680a542928d1752b5a..a5468657a0301f0e062df9c7a3c0c48c06c75782 100644
GIT binary patch
literal 719
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynKtEp}uk!NJgoHRCNJ>iDv13Pb
zb8}Bmk1+$oEucmQ2K^T&1A&xKNswRge{{g`X#aj8pe$#BM`SSr1K(i~W;~w1A_XWY
zQQ{g=5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNYnUi<R4ya~ZYJ_K+r>7PJ2av<cAjQba
zzzAe{0kJfc4f3r9BQsc>3CK2NWMU8i(osO1+0FtM&jPYRAOVO$`e8Jhr3}FEn!wJ$
z0#spOWNg5=0Aeag2kQceNmGDq5MTnD!vt0tWN86pL3J4#7=UDb&L8kl?Z3VNXq%j;
zi(^QH``amjlbRKH9HO&V^>S4GKW*mlsx42X`|+Eyw(pIzj+nctPXDP8ul-}^TAza4
zyqYkLjOWcv2je*#`j;~8&~H;>EcyF5^#Y5)!`1g0_|ja?t!8pbj%Vd+IJYyIX<|6*
z<aB3+Xq)GpeB4izwN!NHU1|E^!)49#$UV>_>I%!r^|PEsPn@0PEZ*^UR<i4c`IA|a
zGM-&vP0D#5k(pSZuD-XKe?`-OwFi!l1rK=rgk(ObFdgBX7*;FQ>Z0?o!(DjC!q2MP
zQ|()fD|*f~ZJoSzHB+)$@&Sv>?VVQ&K3%%N^nIRCjL_po7lE(WdJ~nlU6)vP_U0v~
zyAF%1!nre#I(g)9i&=bNQ|IKXShAo)YXy_PXh`Gp*Q}rausm*I$++gQ2^7Q(p00i_
I>zopr0Ai-(5dZ)H

delta 604
zcmV-i0;B!U1?mKl8Gi-<0063Kaozv`00DDSM?wIu&K&6g00JaQL_t(|obA~$Z=*02
z2k?JR%x}$pQhHK}m@Zq@R%+*-kAZ=KFLE94b7b(4v2yoTYERv`r4gC(2~c&5*Pi5C
zN<>s3STacu-fzJHOExBtXB&VqHe{nicc2RfxGl;f;9FDOPk-HahcR{lL}c33>*YIu
zh|J~1d8<L_-2f1gIXgYU<md~+Q0yE8r)jXMF|BpyDVK<h5CWd(A&MfTX^QoF4W(3V
z`=0Ag2q6FfaU3JdGAx%%D5YFC)986V$Mbv+0PvHfv99w0_z3(Y*?Is?oQJ?~t>2yh
zO0>5SsJphe5P$gj_Ltjw0(%Sr+Yszs7O>U3EMOagy~_f&A=pV4SV@T=QUchWh7Qen
z2-r?UT(@6$t*(9NohqiH$G(p|&vA3JpPT<sh{%NBuT0w&SuYLx=GlLwlb4gtuI!-=
zek#luV~jC2SXNWvwky1@*8g3!Z@nc}?D<_wx!HeHN`Gz6zx_6@2cg()Dz#DD7aLC3
z0xK!uc^=MAPu@K(1KgGuNp-5~5s?W)fyrcom6QmA000mKL1o#7^#H_ij5v-f%K#8X
z5srNyZ9h-%Qhe$jkH?tJW&nWcbh<fKm2FsuK$c|yfX}6J`FxtD$nzX`_YY3q1zPLT
z-Ti}keO3L7mzO^PfW>05b-XT>ZCMXM@v-r$R4&f@Nm9ED+;(4}s-D(*^!V$^2qBzr
qvkyKCFvb{Tj4{R-V~jDzhUFhAMim4}f9H$<0000<MNUMnLSTXclp7=f

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png
index 8523dbcba383c16a4f4a8b2096cdbbdd8a021e68..a4baff26a2a58f4e5532a4fa2c04412c3bfca17b 100644
GIT binary patch
literal 719
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynKtEp}uk!NJgoHRCNJ>iDv13Pb
zb8}Bmk1<f!e;yzq^S@6ANC}k$`33(+2Mmw)?-v5fau#?*7BevL9R^{><M}I6fPxYw
zt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI*DcdAIC<YPO|Dc&2%JYB6vCIjjs)jI0cd
zK$aH}OGDWp-)b;2gT<MEY(qvS1_2-)1;m-{EMW00AR7b{fEc77Mx$BE01U4Q><lbG
z6$VDe28;_Jrh;^^E`XRc1;_>gCZIV?V3k3Z7C;tMm!W|HNY>~40T0#w>kELk$$7ds
zhD5l(of0^yS%JqPI(t<wN7et+W)82~@<h5HzbR|`-Z<-sxtr?rp9=BXKX$J5Dag&M
z3Dd}U-pq6`p0lBUDbo)9HYLWAzmHQdun0U{eV>6Z&E?!`CYR)RR<4F~JCm6vhO<si
zcUFkDdCtkl{X|(yMR(qnrXN0B)+~?Q13jXyu$){!%USfq*-6gg9dBnPyKb02nI$RX
z*#*|5oaYgliS_B~dz<-JH2qh5;OJQJfY(n*=7S2;5zdKWwNkAvIuASCg?B9cthznb
zzQwqr=Umg)$y--5C95SLu(;gbd8Odfr3*~o=Ly9KJ#KUn_<F53QEA(CiDhSRUShiI
zu(&FmJM*ZMM-I1`#RoQZPQHpI3p%t`F!_syG(LaL`uPvb;}({TYYv-0LCoOk>gTe~
HDWM4f|AXV^

delta 604
zcmV-i0;B!U1?mKl8Gi-<0063Kaozv`00DDSM?wIu&K&6g00JaQL_t(|obA~$Z<|0A
z2k^fm=GW1mz^N20Hg8c<sg<&|R|W<K`a$wtEcFJD)@4tmwCctb3s3$8DC*E#Q}sHu
zSR?_=Nr#=l`z@UDNp~E2JnjK7#)fQk=m~Ve09QqO1bk}hdw<mZbQog?Kt!fZzg|8A
zh{$|+|E|>{^lkx&$ef>@VsiWzVJLPkg3~nEG?>=9^OQ?OMhF4V^AJT5(lo_pvw>2o
zc6`tEB!mzEfH;nkWf@kh6_ir0hiP;-pW|*m2LSj<(%9Ge0=xu%l03QrO`L~-{`Kei
z`8P*<3xT@-_J0-v$(InolMulELclfzdzS@l^)3t8hG6fqfNcnNk_FaM;!;WgyVKC2
zIS&Eb7ZKOv*Zo&FzVk^Huc9Zuk37$@T<+)MUlbxT;pdO0?T)OM27U4D73t*RWK)$r
zw86g$GsYNWj1896t8m*LURV47F2=Vmi4`?J`E|LizkeyEw&(x<Hm(<;s5X_xsGW-q
zr+b05l<+(c=VzzS?v??r%A2G*RsD#_grUG>GQnC(1VI1*2!f!pZNqv2;y6Ye$CYgW
zh@uE5zK^z_r*|nnb&tnm%w{tHz;rs@9;@0mtV1BnvVV<>QoD3MO;hA~j_aFSC(i<{
z_2~NM)>S+_{KozLPXNGTv3PXEMX7DcdI8EG8=toQB&n?ex2+3Q_0w99zJ32;gb>cl
q?1Rq&j4{R-V~jDz7-NjFVfhO#2^2)|1;l9p0000<MNUMnLSTZy>>^A6

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolume.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolume.png
index 55708b37dd156ab289d241098d619a42bec299d7..38ebd6ac47d4610140b023b1820e485d547f7386 100644
GIT binary patch
literal 703
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynK)<-SxE(uo^z`)j`goO>mnI~{
zg@%Sqn>wYqxF|L@7N|A9SGoa636%u-1^-6}43GBj7Xr$17I;J!GcfQS24TkI`72U@
zf)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7dX_nPx9oswwxvdRrg?g5F>nAmtPE0&
ztPG4mmKP99L)jqTYA`Z`#hHL?Lq;YB0U#X(#F_0ZVDT&<8w3)77^ELYqgl!T46h07
z3@ktu21dpPj0+&9f^@JhfS5D|$OZu>pgBxnl|hykKo(S&p@9KN*5~{I57qwb3xKxq
zdAc};M7Y15a#N^Tfyedkq8$%D{kOlZ5SXmqaMfz9@f`NlJrxCtp3Ayz!ZzG3^P7-n
z+3UyE^>R_eM{ULnHx(I}dtDdABzrQ1E`4<>xnbGcX%S)%m@8Nol-g&Ul5M)E{eXLp
zNKU259rX|In-?_Xi!|P4nv}3Tl(j56R^&s{!~^UR-M(TQig+IiXjruua`Y*4M_lGn
z<c_$__pqY%aemol^B)ZwKa3B?ED_uFiLI4wS5ppCjxcwTIg_v9Cf|gnS#KB)-|7Ff
zRqmN!3G>m0;M@j-#-@u*wb4vvEj@=+j0<mmd(EQC<+FOri(@_-LDC6@VigT;!F#fA
s#{XfP{{N8YA_Xp<Kmpda<J`+$vPNVwRAo%ySPlv$Pgg&ebxsLQ08K92IsgCw

delta 684
zcmV;d0#p6J1-S)~8Gi-<0063Kaozv`00(qQO+^Rk1Q7!}1~)B&ga7~nZAnByRCt{2
z+C6XDKo|$`zuPQiIFM2a$x=W{)g}Yt6I3l#BJ8QSjLgk<Xghe|Ymk}2Lv-FSN>o~P
zZY9K!4y6i%r$&MsAX2EVlWEfz`zrY*4bM+vJNf>84ECKL0DnTrI@7Wakc5w=lGJq_
z)9DnuXJ?`3cqgq;X_8VxN||*GLbAjdQ~C|Weh*-b$zMNl&!LjxV85nRgpIf-wk!((
z&}y|X8jUa<4#7E>LWoqJIE*p*<nbdsc(@CeFW~q%eC}8a5a67Ha}EFq3X%rKm^6$!
z0H9ndW4ZhW!+)s5^ZI`+LSm1>Mx&9`p+n_zoAA6oUcP#bPUi@@+-B(bTe%JZ)GxrT
zEr2R2K-K}WMg_<^K-Ll~fa|(R9XeLAFN7A0ISiwYr?nbBkH?ryCUH-pMD+s1`VA05
zXr9-{<zkNW$vG}AzQXhRNNX7!uq+FX<G{A<G^hQ6F@GkT&!1(s5z2ZqwhEHT#5YB+
z*IVxb{4Wx@IepmPmb$KEHk(DhmCafr>i|vDplLVyya^$M5JHIZa_wJscS-I4lgOYn
z=;xkal*MA6$V-r*?G@GO32@GpGAO?it5&OMx7(594i8_T*|dIZN`BhglK>(&M}Hc}
z7?aJWg@3KBd+2nIA~V>wz3NRyQ7%BGQUMU&a&lc4_jh)%v2hm%`!$@L4y5BaFilg-
z=krP%q(Y%^?e8r?tGie%qFgE~WeBpWP%c2X+g(i%=FMP$%f%dT-@S(rLNiSh0O0$+
zQUQG5zg7Stgm!W|kXKhrjK^P;G6Y#wto=P;?IoWAgb+dqA%qY@2qA=!_3|AX>IaGF
SvuINQ0000<MNUMnLSTa6kvRqc

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolumeBlocked.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolumeBlocked.png
index bf41bf2adb4e4a87d6c6ae0026110b12b52a0543..f95686a5fcd66058d63da919e212afc579e5b1f5 100644
GIT binary patch
literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH
z=l+w(3gnvw_=LE=w6HiYC-=hK{HBJ+IayggKE9wpzqq)#9XodP^z``pc$JrzCM3j#
zhK5X=I;FU{C^j}0s5QS=x&cTDl?3?(|3?Q5kM{2u0?Kk0ctjR6Fz_7)VaDV6D^h@h
z5+$w?CBgY=CFO}lsSE*$nRz98ey$-3rh0~YmN|L1?0{;vrABzBd3tIwZ~!^13{s4&
z42(dQ7Z6KB*&yF)FfxP1nSg9VMkWRUARPt7ne8lK@hl)41QLK4q#s73S;_zmuL<l7
zEI<_oM#ct=3m~R~bg(Xfm^1~*1_36ZIZR-cL6#Ok7F3s^fdNR?=llT=)&A=XfVQ3T
zba4#HaDF@E_M|2Q0hhf7UE(4C{->LBE>_uUYqI9Zs;$p#R+#R6!m=jiQQogpI}Rks
zZ0k$def#xtucl?|bx!<P&vdceSwZk`PeP@Bdw35^k<GT{i*1=sS6jxfJ1@a~h((=M
z<^8VPdoSM+u<2N!_|u}%tLbBvxI)+K{b3*OSuJR)S;&xa?waGqD}pNe+k`Yum}_&K
zJj}bt%vtBewrHNy?mUjG-;3$U8?wA^WR1Msw!wy(ds8xd%Tvi?%1Qot|0d7<KfV44
z>y-7PYn~rf){XGs(P@Zwyw$?KC1_Eki}u8y=asfhRNpXL@+Z?l&*kbx{(p1g?=77u
z&1B%3`P5Kh`)Nlf_Zy<(?Rz9WDpxF#;STWjSzEKf`uL8Ue2qy@0vKlh>bl=psB`h9
zE5txS4F&eqt`bcr7e7>raVTUwDsUx^{YgBlw?osTn*VwM8`Sg`>}Ytz)WxkKFS;bQ
z%0XLomg^RyW*>#Qa=OeJEYp%FDa?KHwCegxPm5Q_KXFg<7i66sTQTwQ({H~RFNiVs
z{QS)BFw=k1yM)^<;+ExB`{QNjKMk&VW*tycCAfA<hS<eZJVlP8V5?b0!~;N#rJEMK
ZuV;wWa$cid_`(bn!=A2wF6*2UngGM$GeiIY

delta 956
zcmV;t14I1#2FC}G8Gi-<0082ccQ^n500(qQO+^Rk0~-M=I*geFNB{r>dr3q=RCt{2
z+`mg3VH^hV=USI^coVQ71WdrvDpmXoL{nN!rh3ij;8g#IwnGO0jW|1G2$#(ZO4HK0
z1#z%LQ_K($DwrD*LCf2vXOl*A7jy5u`SE<fK?r$X?;CTuyMHGK5E0R&GITFs9DPe9
zWIP_n#l;2YPfmJn;|F0aYLZAPA*Iy43?iCbLI_{)L4ogtZwq!DC$yct?tFI*uU@8b
za9Huoo(ekHG)(}&=H@1jkB@P5bOg(?WEdMkcfPxZwbd0oeKrpfjiFfVogL@^T$W|Q
zvMd0AyFtRFD}P@IA=Bw~06;R4#P#)Wq|@uL?ed*NQ1&r&V`D?rQ~OehMz!QdB9CC(
zWxRX;0r~tcB9TWuAJ5|eMf|=1IRMQ#0L?f6%{TzfH~`I*4WLvisd{Q(QjLbze7^!e
z5NoxXNT=8FB9+3AY8ACwE$E1$&Ug8J0S5XX;5d$9+ka(TwwgGto#Oob7i_y6+PN6r
z`7YBmQ79CU%jLq1{YMBPvu|EYzh?x;DPIU7|NjYl4L1wX5<DdN+U@V}Yuy04^JzpV
z**Sfkot5!;9F0c9vlTFo`TbCG9AFp*3`5`FtvjEHh=_=Ys23$iEB*B2C!LaJoQi&Y
zKW8^poPYmUl|K@%&i2lymsYD8_(d3%`AYr+R9IeK#?H=;=i|1w-y)keyGpU&7ZxOd
zd%q>B%2zf3Aw-~!<fWx00KF@JrBVq`=H@Up^$>sS;j&ODAd|@$(P(s_6LfBVug+<z
z(dav0$pG5=@qrCtZ*LEP_r>myl?pCfO?>+N1%Hm?7@15408p>j2O5Bz@71>GH($xl
zYHf7|&leYQc6Nqh(Hi*uc%1hEfexU(AKzXJ31Wkc>!+YV2_fXx)>cO&!2Mmzf<}O{
zW}L1sNQ@eGLp9?7G~)m?;{Y_{05szOG*dQ!QTc*|Zc5GtnWouss{p#&*xjsyh=_=Y
zh<}KPh=_=WQD3Ktb+^NG=d0j*k#6nK>rSvP%No2BI!yVhbX^g<t;a5eklCz>>FLMF
z=XX7yG?&ZW+`GA7y7R-<HGo(w*75Zsw`x8!GlOIz3BbFf?{?|$!%x0fM}Ls~uyqZf
zUaxm-0LO8RgTsovy1GWS`V)Y6N8jzz-!+Gye6I`sgXD*e`vA@ODTs)Oh=_=Yh=_=Y
eh=_=YNRdBdd>*~Xe)+Zl0000<MNUMnLSTZfNzCE^

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolumeOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpVolumeOn.png
index 6a5efbff379f9d39b8e8001a77acb2c23ae1467c..4f0b9cb4851efe440faa1e28692509e52b0ee930 100644
GIT binary patch
literal 1627
zcmeAS@N?(olHy`uVBq!ia0vp^4}kap2Q!e=il6@!NHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%_YUw0apmLVi;Iifv13P1Pfu)Y?0<$uehmK^D*iM4Kfv&x=M|7<U<eHj
znKpGwadDBak5_qlX+lC=P@vyAS=pN!8t3KYUYMJ|w6Fl0XEk3=2S`bl1o;L3#{n1^
zO}MrL6>%1LL>4nJ@ErzW#^d=bQh<UIC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL$I
zIeEA2fNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZppejDWCn{f0ojI(Obh}*Itqw0
z+gZTkSwJ=jBmgl;Ka57RlmQr)6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7
zEG>X6s4hbT1CXrG`2!xR{nr-&W1-K}#WAEJ?(OWCQI8FHTw^)zYW%+Tz5dd~N#4SS
zr-Ecu126nM_~UY5OrE#+8pXNcek@<$s87nkFe1C+Q&jw|oV+~qx7Is8MMdAbAbVkF
zqw@N#6LqT0X57BdyDu(Vn3qfV$J>m!Y~@VZgy}Ea->=`wdt<@*_r|sF-d>N(mfmns
z@p8YogJZ?o-X|N=o9*ml8CV}~HJkLk**qX(%Jo|wde3Wp9%`-My7cnPhaazOY*b&r
zZRzso)4#p0t=y}>w=DMksqH3Z@$XN5FWvRLpRLAvfAZ4DCtfq!+wC?lcoJRbvj0QA
zbY0D!6BX)ARX~)!tRcI8_Kg3%_h#I*U$wS_Bg6Ur*}msj&mBovJMr~%yG<MB-9KCR
zqU7q%#ZK$z|GqI{pXKYx>9?&nyaYPx8sl<l-i%z8;^)P+b-Nz+U2`jX_w!!GW6QO^
zCK?lFSKC?qVZ3n5<5?YZ@p=BU?l(?<jFR?zJ^kZM=BWLGx9>M@4Zq!E?-f}uA`+Kx
z{LjFre8bE3pUd)JzTP$G<k!m^=e$4CVJ~&zS3ri-mxgP{tAsCoQqHP1u$KL(^ms1E
z3lN&ta4lc>+CDe_jK6OAZ>3)_uC-q^^T(&@OSnR2e6?YJdHqiQtmT~ATov8z`b&?0
zvU#|-W=b^Ex2JIn{LNP;^nHK%aHmb+k0;ZWYSkYra|_4InTF1p7qP!~O6tE)!jGNR
zrR$FtU-)z5!m-B>lLHdB<gT+S51DbBdyCnwid~b_TVwPu+$zdXV7hO4M=&FoIq$%&
z^xo$zQPQzFvIj~IXkEDV;?c){M?w-C&hKJo1q$2Tljqc)aGLAFbJnQa4bl?-((iFy
zi(9bu;?eH9`L91St<Amib57G%@fEox?7e35FK_tf+xBgzDmbPf@dY8D>$B?AbFOr7
zWjek<sWCZV;sL`I9uFi!R0?>sge=%Zm&ILPKk@#G<IntR_vXx8A6xLMGPLpMt%ngE
zKX0|3de84V{r=mP%kSow*9foumv{Qt_v_i)&v$oy(pbL8GJf}iE1y>-Ej+)Fd;gcS
zsk~qVIc1u=So$21?K7x)-__A@uagkUWI3|Z0Id5d`vi#dkW6#Ba{A8A1D10aaF#Yl
z)+B%Z{WE5#m%sXp|Nr)XoU?DEl+pj-=k4+Hzo_oDvtROCdArD!sF_{2#NBW0J1yQ`
zbm02C?!W79i|=0hq4(<h=f(2*K!r9=>Qx)G8J~UW6|Jl3EVX0b9DgJyj#U~OMjU%f
zU0odB6GSG=k3wdk_!tzzZVNVEHA?5+ImKGHa^H0B_bSh`kA8bM>!)<#*+1*j|1Ceq
zzgeR^>QjyW^kaV7b$m>BYB9WQ#H5_J)kkSTIW80?_o3z=dvkGH@wCYHWKb#P>FVdQ
I&MBb@0E9@!YybcN

literal 1878
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

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
index d7a2ccb3b6..cc54f3cfd3 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba.",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba. pumpPassiveGate pumpPressure pumpPressureOn pumpPressureRegulator pumpPressureRegulatorOn pumpVolume pumpVolumeBlocked and pumpVolumeOn all modified slightly by war__prophet (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPassiveGate.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPassiveGate.png
index 668c62671209b3cb8c1d766b65b5df3f260f3bfd..b8440dca9bd3e1d5bf4afad3d597f91e47ea103a 100644
GIT binary patch
literal 847
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1U2Ka=yzO=A7FDLiH-2A471|J_^1p~u5S=oyW3=0_;(sXs>;^MY$-P+dH
zCND4lfq`Myu3bGnJ))wb4C2Q{4E{3+&)>0Q2hb#e*K-7blz2&yU+{mdfZ>_LvpAp<
z&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%=xATcwqM9<GPM8Q<gP|q?a@0J}<
z&9>AC&ooa@Ed~xChm}E!k(GfF$npYWX($^M0ve3WU~wiO+mMlo0pzSGAkJ)O0gGn=
z*&vVr#321J8qHD$U>HtdXJ7%UFfcMUU|aw(6{Lf80mP&!KsE?40nK3os|>QV0J5OE
z3=IrGvOebzc&PSYUjVeN%hSa%B*OjewA+)K40s$^nLRdkH2nF$Jg+!Y@|xO)Ut5f2
zjz@9ITu$nl{?z;5L<j4SD;8+1H~QVmv0#<fgUoqVhO8G_78>$O>Fm(;z1{MWdC`Kk
zQQiz4XSTZ>T+8b}>p8>oUAs?9rSN~aHG3cXgFWA;B{c4P-)qamWWcI;^!Nn(MvkWE
zeGa~Yjm(lgmoqr3Zk$i}XT)sfX#PTe0*k-A&{A{B9#y$>2mZ+gu>F#2*-@>zy>c?+
z+08GW&SSau{eaeYjezb}gHv-^-F6DO?d(oqUwo&Zv!|$^>8tzXi>Gb5uFQXHdr7Eo
z?bEsb>%HeR1vfx&&w-pmNtXj}XIrKCE6d+=VoZDcU1!3#w*rzcf3WcxWbaRJ-17cl
z|HFEwBL0opuR?8_9h(-*U#pX6y|OR9Zq`FdxqZ%+ny+_H`NA}J`2(Au$8Wt~+;D5V
zx8wt%S4~Nci;hkFcT8b%dG`M4whzAPa=ToyonZL2`sAeB+j9&LwQmn_$P0S)UCDwc
iZqLK@P3C?FH~nF-F>>t?zRsc#iXl%|KbLh*2~7Zh;4TCJ

delta 933
zcmV;W16usg2CxT^8Gi-<0063Kaozv`00(qQO+^Rk0~-M#HUHAU5&!@LWJyFpRCt{2
znm=nJM-;$+3JEsK@nD0SE6z%5@LKJGIkw0bP-kO|E|m=zl(Z@R6@svfRFN^p?&c#z
zguu1Zx^Nje#T7BpF<gvAib-)=F;;d*IjmX7y7|Gf?ChWShkv*4?an+11OkDNm`c$J
z5izf{o*W;EptUZ%exVQ%(*t9V^}vXTDY|E&=!}i;f!T}Wi8DG=PFVy#b)7tnW4=gJ
z4&xZov@D%~_fa@K=HnG~I$$$R`8AH&OjCZGw`2z*Vj7JG09#vI^m;umFE3F_nNsqQ
zh?wbc@06GWM1RCIn@v-z)h1iB+4LemHv+WQm6nKktMx?S>H}4Q;c!S4Mc$sD>wqi-
zzXf)8cj@>0H2VGWLeOGqY02yJojIV}?b7Xb0Z5X>t0EcGVLlp-s8*}q<bC2gIk-LJ
zujn@hw`blI$m2?Dlv05I2yi-}w!F>t?>|vn-u9}*G=HliWL01^8hMrFbO3<-{oUPT
z&y`?0$LP;~@F{M#1F{fQN^xcV8<fG|_KcNhUweH8XF4DY!A7IOs)#p5@~ACu^ZD>g
zudkr93c$aUP?=>gNfLH;cDT5>px^I%kulQ&zROS^TI-5Z%DmE=pO23LP@X=-W;(#<
zS6C4uVt;<onz}V#(bL+z5Sjajm@@|?Ny5?55&Qf5^OQN0_Sks)cf1ajc9}_7M9lP7
zmh9|DY%h+@_hTp6;|ov6nt<7hW7ApS37K3T`gi<)fryy5FxfsT;{$;}AP@)y0)apv
z5C{YUfj}S-@WZ_q8twV|$Jk8$!QJ9{3lvvc=YKX&%-bO!vN)3II;-P7SHaxnX)rIW
z<|P}YRN?r%oM5-l{uh)|6xm?wl-nO*FHaxFG2f&qb*OZ-Hh*kv&~CRG+@4KZSE4AI
z^b=<ISW@2@%Pu0*snu%n)$wtm4KJ;Goc#fJy2Zz=udf5J^7J`_cLxlILvC(v?(6~T
z^?&+3OwDI)Z4Dq-=HT4{D^H&T?;Yi`!N%!;%{1lDakqHJ>FFr|*Kb}^dvZV&MO3TR
zJ9~ih^YeR{nosu3Jejp82VB2-4Zz9CiPHv~!W_`nnwQr34wzO!4k)6G9N@}7MK;(v
zIjex(7r5%E0!5Tj1zZ)V$OikmM_0FP9v=HQNFWdhJUIUV;ibopv<$vC00000NkvXX
Hu0mjf;S$T!

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png
index a5961b099611f9aa0c5f31ff28177ccb84c6f6b0..4bc074a0b0b51a1eed26f0bd233de3a42e58e67c 100644
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0p1o(uwzO=A7FDLiH-2A47#yMG8K0dynK)<-SxE(uo^z`)j`goO>mnI~{
z88a}1hK5X=I;FU{XzSLkZEbBkckXOxXh=#*YHn@@8m4Tx<^qtCC<*cl{*N6noE6r4
z1ysXX;1OBOz`%DHgc*<LuSfxFbd4wp&QB{TPb^Ah2uRG#E79|F4N)-FGt{%p$-89-
zRI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<SQ^R(g@OhnGgzDn$TnnTVh{k*Q9zv8&H@(C
z0<u9M0f<5RVKkbh49pA+6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7EG>X6
zs4hbT1CXrG`2!xR{nr-&Z8Pw6aSVxYe><(WuUUbo!91P)Ro6TJ`~Q8{JEWGkEpmK6
z$@@o7-;HO{j)H!d{r*jK@VcXA5iXvmdqZo*^0`bC_X{)p*GpuKs4?b?Y26^+5VR|h
zlX=TsUAcLz9Ww+P4F4u9`j{)K@-HEo)$6W&W@FX9y6sKd<t{TB9xOZ};StM|tiU_z
zaR=9u<7b$Dx)!bpn@|xdyIM4$%Ouj~Q_5`CM<ub!97UEs3UwyeXRtm>ukO9jdS{=E
z8QV<}N5P1$1spoAADkbE1@PaGJmAQEU(t>!>QMS4YgPjpH9OAxEWBnv4hhOz?AUuq
zbxr6x*6oc>%1Z;1LKXx*o_x;w+uYl_Au=|hC5_qFgHJ4fvBF`Y?Y)v&*VL}0%P(l%
vyo`HG+u@QUtc`mNZ~PT8(rmihl=+K^{YvD8KeGP!K;h`=>gTe~DWM4fr;_`8

delta 1333
zcmV-51<LyQ1-%N88Gi-<0063Kaozv`00DDSM?wIu&K&6g00j3*L_t(|ob8)WNE}xj
z$G^Xw8K_y9Bp51s$P!E2LlTAH9s;FZNzfc@nVNPb3VR5G*Zwgeh7?0+*u&cPS}7hD
zR91})Ne(fzWLpY3<j@)vl1R72gQo`L!fIf5_SZvr(_L|A6@Pp)rF|b*_TSt2{@#1P
z_j@zH->iljw6wIKr>6(w<KsAe`ZQKoSFyRdS*!Vh<ClJ@UW0PEeBh${LAHL)0SJX&
zf8{t19LJGrM3DM*Js>E`<uVMzfUfIOb!r}6xSpnI&@@e|5xb#j8a~fvx#ih2oOt;X
z-vcB=r>+MGSAX;y$8o^SU}mX0HG9X*FbpHGAjr)4uCtSVzkZ!&2L`0fK2XO4ip3&`
zD3BmX^iQ8<F2TA35Y!UTG!440BOZ@)5EB5?G<oO4PyOcRW|*eQy&r$XrfG5{5|N^_
z>n>oLCR>&T0O;@U$MW(r9zT8z+qOBM&r4g6l@tmE{(s>8_we>R@4`HM1Pco`L&8qr
z>EA2qG_GE_fSKXpgVy!LG)?aA?!p@lhY&d)L1W`Fba!__h8KFCWt>bTsyx6?8X68^
zC7niYZr-&;2A%`3l1}4lIxW=zFHR;B=<Dml($W&1Jb5BTqpk-G3=H7m!-vS_a#9TN
zVkMo%SAUWxpsoju2Iv9pmoFn8kK@s!M_655m7?J}0Dc(Y#nR*?mL?|w1mppJ7~q8;
zOR#PXkR61)@M8(qjRCTQkQaVz!!-wBdwUD5pMHYQSPXyUa#&kilVX4uer&_Lo(bmj
zd0Je&k5}7Uc)s==FJAnG#l`#Z>oiz!GLgX7_kZr;QYz)A>}&kG7^#I{7h^TA1vE{A
zWm)v&Pgz{Ka>dt~2Y_%mOkG`FG(SI2BO@bp^ypE4Q(__^k;!Cy@4Uc|j8x45D3wY8
zsxvcwV;BaQS!zb8<}N@)`0T+0Zh86?CpI_ngQTpim%bkvDbE-{M1gt$5MX7<aU6Ub
zi+|B?V`FqHk??&K{uPxWkrfW2Fd}B&FpS``!j*;ug({8)q_0pY6bgkxp-?Ck3WY+U
zQ2a;PbGmy!#YtIJWEnQlUaGzu8yoJOqxIO{-ooPIeH?T#b7NzJySuy4&~Ru^?QPrM
zlMVXd;Gp|v=bs})Ha3||qOGkBGsDBUlz&QLW_TDMj*a2Y*chxEH(+18hKo0E;@0RW
zVqboN-d+m}3pS68jF31+d}@jTKonVaW_pG0#dMkhK-?m)X&RErB=`1OXly)&?D#jX
zme3Zq2-_~DQm}0sLqkJV#}>Mk+Iln^bw3b=$WSPRa=8p5a?{hNPMxZHK6~~o?tcJ?
zMx(F+w70k87J#=}TcPV3&Yz1RnM`sflOZC);k$Q1L^yNi44B!y4PVnVIF5r*C<G$H
zk=wVy%!o##U}p67_3`<0F*G$bA#yx|Y=xH47PjoPv7@5{<#HL!?DolV9JkoxI1cpb
z>1hD3t3Z_)hJj+S=zcERiRY=QDSrUK?CdN6Ad|@e03Kwsc(uKSpMUukmSxf0+#E`!
z65d>22NAiyuSL`PI+z*L)6>v(9hPO0ZQEQdmXOQ+S*0bkg)KX6oS2w^VHj>-cJ>bd
zsJXehYNkacrt+^Ug+gK9F(4cclNjkzsZ=%UMC5vy@CNZ(v|(oGy6(O%6fO$;jsf9t
r*o^_A$Xi)(AtJR4C=?2X;{VLwQYv*xeB&A$00000NkvXXu0mjfZE$!R

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureOn.png
index 114ed9a62796252ebdbfc41056895784309b6036..1ee4b657cbfaba650ef5e451f541b0009403d8aa 100644
GIT binary patch
literal 1273
zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgBeKf-aAPXNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%4+-!IapmLVi;Iifv13P1PY=U&*6ThD*Jm&=T;IrWJ#gpFoed2QNl8h~
z&COf4Zf$F83k?mKHg!sIagnc&S9y79LPA_npx-%J*_#>~=jG&Hn47<}umBqT!`9#^
zkdi40@(cct8!(7(dUPGAj<dicvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^Ah2uRG#
zE79|F4N)-FGt{%p$-89-RI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<SQ^R(g^C6vGgzDn
z$TnnTVh{k*Q9zv8&H@(C0<u9M0f<5RVKkbh48U-mz|Oz|RAFFbY{0kxVk$@n>jH>L
zQ-Ev`U;>)M1XdYjX#r$Gbr~8MfMk8nAMjA^zrKKhfmy-R#WAEJ?(M9bc}j)?u6u9q
zbv|+K|NrMZZm}NZuvVU`B)#(7>4@(SPAz4g+n87QPDan8l{@HRQ^*blQ5}tjEj1q2
z^Me$ZUfN`{aH0Rg3CCu<V#v<DYW;lGz3TX{iY-+K-}NValzd}ib4au2e1gPk=2<^Q
zgyNK~>nmD<HJ&Va_NpPxuC@M$-W^4mha$(WAJ`PeZt__(r()jipMPz3<hDN!le};)
zStHJG{nNj?e^o{ExBlh*Yr5`z{`30V*XJzP{89Jsz}4hgKfMp0U;nEi?cXo$f5+;*
zw|x4ew(t<^$^u8N>rH#-r|q&2EdRfJUG%)=5AuDZe|q2hUH|jw>z7N-7S8owd84m=
z?XQg+X8I@om%sCL*9owb{69RsxMmrY$@<LVO1$#f8ZK$Mg>z5k8?-uQh1R!0`Ts5W
z%j#Hm@1JqQFlGXm_!5Y<xR|GmMepoC;F&O~neTuKyKI9epB2MonGy!I1LvboX!Gl@
zH2Gxjy|9;W@%+14{lE9t$o~|LS-93LdB)#YT=z1qXIZY<_h4_?;<;y~xa>0Qcins@
z7sk1;hpRa}Z)5xAy3F_5yM6Shgr;$v(qH#r?k49s8-FzQZ*I3p=46#m=Pz`7mpD=2
z(g}sXPnO*M#$Ek>zNdmyRK<}eOSOOO2%e>RP6J5Yf>66o0*&r`7vFq$f44O}%8_Cp
zh52-wLfsm6gOiTzs6IRKw&?JBH>G~HEgyep{a5qblM}Y<<Y|TX?@RYosQ+d8_Al;u
zcYn3|hVS34;%e?#H}2hk{p0c5oNwOl?c4C{U(?asFB8O<{}GrHc(Y-3d3SiC!6~sl
z@sI8u)C&KQ*je5F!??@to$RCYJ3jt?^;tG-z5DK6H~Sr>=ko5T+WyP3$L)60_v{&G
zGq!5~*f8s6pWp9A+c!(^<um{HY@+ObHo+Qp#u-l*Fr&Kq$wz1FCU6S3(yy@l&%B)L
V)HI%Ki|?R(<LT<>vd$@?2>?rR7PkNZ

literal 1957
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
EKbax#)&Kwi

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png
index dcca92daaa14d4dea5b19ffad1c80ee6c8ddbda4..9ce4893d569c3fde443f7371e2e963d08fdb5456 100644
GIT binary patch
literal 721
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynKtEp}uk!NJgoHRCNJ>iDv13Pb
zb8}Bmk1+$oEucmQ2K^T&1A&xKNswRge{{g`X#aj8pe$#BM`SSr1K(i~W;~w1A_XWY
zQQ{g=5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNYnUi<R4ya~ZYJ_K+r>7PJ2av<cAjQba
zzzAe{0kJfc4f3r9BQsc>3CK2NWMU8i(osO1+0FtM&jPYRAOVO$`e8Jhr3}FEn!wJ$
z0#spOWNg5=0Aeag2kQceNmGDq5MTnD!vt0tWN86pL3J4#7=UDb&L8kl?Z3VNXq$qk
zi(^QH``c-^`&txu9MWa1twbIF|4-jOg)fqqRVi(<uLZxyt!FJ&&ByPZuouc`-P-j0
z!=#&?Q3rRJbA|l#V<@r>)^6CIv_j;7N&TfZg$9Q6!3=t7M^oZhI*u*lmT-6;Guz>8
zcf#isma6XZwF@E_=ubSkr6QX9RdSLR%d74~DN#I4XI4i!vHUt7^hi6v{<=_L!PMI<
zulzS3319GUoA(j1b>E6^+wSlYFKJxPz3aebR`<r7M=dOV9+M_CJXdhIBarDcU&KPt
zOXZO#=N+S;lfv(;u3(#gHF87Q<}gu-&63Q=X3q5IZdQ?J=KU~FQ&Cm%oD7R&{@qi{
zr+$<?w571m<iM5-hO1V!CcCx>S30^dsjGN;9QYhv(5aUp_U1Rg*M63anRlF@gTl?z
L)z4*}Q$iB}WUJ;d

delta 604
zcmV-i0;B!W1?mKl8Gi-<0063Kaozv`00DDSM?wIu&K&6g00JaQL_t(|obB2%Z<|0A
z2k^fu=C^vU<W>q6Q@uq=rF2fO3=B8$MVhgn!@~_8BeEw_Qgx$CEIj!Wps35OsdQa}
zg%!@tN!%HU_ggpv;=$p^Vc!E7V`DZs_6ZzffSaa00lxZ(@qf<8K^bGcAtK}R_=A21
z5Rv(E@!4x947LM^$ef>@V)o%9(o}fsgwA2`P%y2v_o0)Bj1U4*6d}tplx2zSc8j7Y
zdXFF3HV7dA08&a+RfY9>jiM;}jQwAa%OxI{O8`Ke=U!r1J75UnJm0$kK3G%Wx7M%L
ze<BK&0=8|zQh(sb%U5pi4g^erP$@XrQ6QATjsl@laIm95s1!Un3T%|ZcclRM8-|X}
zngXF-L~QYG+xm`gJy`Q9dJ@N|>l)YBVJ?19h{&YhE{*SBWP>*9i)SNn@SzssU)f_D
z{i`rzj4{R-V~jDz7-NhvHX=^5y>Fc-^fim@BffK)Tz^wJa;4O+ilZos-TIf$rteN@
zY8F~CtmopQ*O{S>Qi!4m=Vzy{?v?>=+EZ;dUHcJ{NmGH@Y=(_eNRk8qkR(ZG+l6xn
zNGTzu>}&%-mSs4JWAs(z+!Rbtr&BBz3jn};KHn|7+Af?^psFeW!24Fay}m3<)OC&9
zyZc_A1yx$>$?e^}d4B$jr>8#vfYoZXx4de#T{(9^Q?h#5YB%fSJh#>oy>)iEYd@{^
q<l*NpBZTO^SZnm70Aq}?G5ZHLpA`gw@bwP>0000<MNUMnLSTXt+#OB;

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png
index 3f5eabda34340178637d7c4efe5af6cb71a89292..4a75d1dbddd62b4c306c5bf2d1f92a8c1532e3ea 100644
GIT binary patch
literal 721
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynKtEp}uk!NJgoHRCNJ>iDv13Pb
zb8}Bmk1<f!e;yzq^S@6ANC}k$`33(+2Mmw)?-v5fau#?*7BevL9R^{><M}I6fPxYw
zt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI*DcdAIC<YPO|Dc&2%JYB6vCIjjs)jI0cd
zK$aH}OGDWp-)b;2gT<MEY(qvS1_2-)1;m-{EMW00AR7b{fEc77Mx$BE01U4Q><lbG
z6$VDe28;_Jrh;^^E`XRc1;_>gCZIV?V3k3Z7C;tMm!W|HNY>~40T0#w>kELkDR{a#
zhD5l(op!sgMS;g5UB=o<)baoS^zBplB6(Sr(kA;_@O#{P)>74c{N4$Bp^Vn8P0v3}
zy4e|ZaECcp$Ui@ZBHLi?hV4l!L=KqLUusimU^pMlpqF+uC61-z*fMSjhvzY~9nN+q
zd`@Ah>MmcqAaa5J#FJYpqPbrsCuy;~>OPbb#nW_Vb(9m!uj4_Fv;*v~3k4QTz0LB<
zfAf*>1^>2r9}!#kt?0Jx4j=K7#^v0*4qRq+Z_Ihr!s6#KX+pzu1&2EVnLhJHECjt&
z9(i)!G5R?v{LbnMw)s~hH<WD-6P4I3$$V_)On>fX6?taf5A!q?RTa<4usG)5J+*x5
zN6AB53j0hBY`I{#YE^5pYm0EDqYIO|il@hc&(Q^)dKqGGe)D_nXUUj($N4!Z+&o?V
KT-G@yGywnsLFNSj

delta 604
zcmV-i0;B!W1?mKl8Gi-<0063Kaozv`00DDSM?wIu&K&6g00JaQL_t(|obB2%Yui8+
z2k^gx=IiKB;1(jI&09zcDP&8o8Z_LXevo_@LvQeCE_(t=$fhYqp8N?!=+IkJdL3FB
zCDFM#(47T(zeQ)s=*efEp6q)7A!Nu#`@Vo(3~*JCN5F-T7=H&oPD%*r3}ejrJb$n6
z0gN&8<@B@HN$BkaFviTu@ew8;KOs%Iw@GL%gS&!ht-Y5{#+c!pBZ?wqS%#u0u-R;&
zl<GWwWIMn)2LK2mP?jZDs}+<|UB>>e$N3zO^Em(@&T}s@tP{`&ah|{U0(`Khfd2XW
z?fwr3!BW6>EPq%E<lj;NuTlWvQXo_c_O=Ry(%UK!Dg}F61wy6Z&ML5$5|>f}@K=WR
z&6)zC9z<;MZO6KfZ#`N4D0&#jsHzIfWtb1&D~vIdemyt7f06atpg%krfSotB5dX^V
z+u$FC2_b|KLI@#*5JCtcgpdJoTJ3%BI-##sWFPUJ+kfQh&Jp>2x$WXmN^ST5du_U&
zgt}*;5yN^dE;?NqT1$y2ig0p#^yb?#z*Tdp&8F>rj4_j@9FxfeYblW=2>>8TlGd>c
z=Lrx(KnT$~27oNfa2Utvs>!)-m>!SEn9XJYfa!F)-L{QgIHy2amVXCljd5dtQ52}E
z3fDKcomJcmwAQ2Rn_Khz{0mP{KL7xW#p1;lXN|EV=Lu-GtiB${d2a0`dhhCT+xxWE
qqr3YD!#VG~S!?iBfDl5+ko^HqVH8C0Mi1}+0000<MNUMnLSTZ@{u@>R

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolume.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolume.png
index 0e9f52f6e60b22634a688a0b2e1cc6fe30d3a44f..30a5916f5e4fb0d450ad477d0b045beacb731c20 100644
GIT binary patch
literal 701
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xzO=A7FDLiH-2A47#yMG8K0dynK)<-SxE(uo^z`)j`goO>mnI~{
zg@%Sqn>wYqxF|L@7N|A9SGoa636%u-1^-6}43GBj7Xr$17I;J!GcfQS24TkI`72U@
zf)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7dX_nPx9oswwxvdRrg?g5F>nAmtPE0&
ztPG4mmKP99L)jqTYA`Z`#hHL?Lq;YB0U#X(#F_0ZVDT&<8w3)77^ELYqgl!T46h07
z3@ktu21dpPj0+&9f^@JhfS5D|$OZu>pgBxnl|hykKo(S&p@9KN*5~{I57qwb3xKxq
zc)B=-M7Y15c9X9~fyedksvQeH{kOMn4J+YsU7Rw>(}Le?&)LFc?K9s0JQPIliB1VU
zyH>cIwYO4J;OAV1A2n^P2@BICGFoS_Tqs@jUWrZOn5IlVQ%yq$!<KpCvS;=t^m09s
zz9Z&QDYiu9$nS$o9o}j5o#6Elc)6<2BRsv)CW51eA#p=4Q{j%dhphgdY69wKwapqW
za^oMyKYY1c<u_aZ$tIl*DUM<hn;v*S5DREpKj*=PL*Wx*8@zwGRV-(im7Jn)!BMr1
zStoCO!0)Z6wkAYbu<0yiu;dU~!*V8>`_zoC!;3Z*TA$nJz{*-C?fl}Pn29Rujsmla
r2FKz*TW@>*;Ens=+MaSSyU|eo_f&@FOUw7K0fmvLtDnm{r-UW|_<7s8

delta 686
zcmV;f0#W_F1-k{18Gi-<0063Kaozv`00(qQO+^Rk1Q7!|J9b|G)BpeiZ%IT!RCt{2
z+c9t2Ko|z#*KHOu97w5zWGNt}YLfx+3#yhX5%yGEM&{-}v>iO~H^|K3A+k4&5|vh+
zTM03wL#e{xsgb|~jufivWSX>KUnR~);d>-Di+lMD=d<qvAb*5xG9~Q*QN9)mTvb(!
z$7AeYTu90KK*pP{3g;Z0^R#0Sk|xHO)Zf6;Ie;<7|9;5~vMj^VVMS^Yww4WS7zO~K
z(P&^W7@*(p!?tbi`+g!<4#pUN@%$N{JlzM&=5Tr{XY7Rq2-&s`+qMA!VL_6>7~`5&
z1ppKaMa*WupnqvqxNdjlMTor&)@rp?jwdXW*@o+O@%G(&v|1;~WVWS@v)1bXK>i6>
z`vS;D1xPzU+Nc0&2S{6N0UXCkB1dYLE`)+$3QeoxWu=1e!y!haQIfglWS@YA-vHnD
z71!<JI+)^ebcw60pK#qSl3E6b48wqBSujmA$zlIsjDPX^>sP7W2&H{9HV=}@!0V#Z
z>1=iZ?z_lI?aS^iS5+00$wb;y*|bHj0~AGpqTI{RO$Z@`5JCtcgb+dqA%tuq;fMbJ
zvqvav7g<IIp@VLBj>ZXssg$ksuz6CnU(mK~p$w6oqPLaHWi*@3*yE0m-=JPM{%LLf
zc5uJ}#D8wFEjo@d#_M$hJ3EiiYMsPpFimsb;TlJ{0Hsn1Ky>4x<2ZP{w}-8*hd4T{
z;OxA|Ez5$g>q<78720OY<#KoaBoQ`D=ks|K3q_#}VO9~s1!%Y1^8uoK==E?NO!4v4
zXZXIa=(-L7@H|hb0G{XFDS+?$%Gr63-`vbF94Gz|$`EE1vGH@j#$N>pA%twQ-!Q!g
UiATf782|tP07*qoM6N<$f>oYKP5=M^

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolumeBlocked.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolumeBlocked.png
index 0d267ff1784fdaf7a476d38abd2a3dd3f3d4c3b1..c8e5509c87ee89e7fe8d2f492ed0c6bdd8dc8a65 100644
GIT binary patch
literal 898
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH
z=l+w(3gnvw_=LE=w6HiYC-=hK{HBJ+IayggKE9wpzqq)#9XodP^z``pc$JrzCM3j#
zhK5X=I;FU{C^j}0s5QS=x&cTDl?3?(|3?Q5kM{2u0?Kk0ctjR6Fz_7)VaDV6D^h@h
z5+$w?CBgY=CFO}lsSE*$nRz98ey$-3rh0~YmN|L1?0{;vrABzBd3tIwZ~!^13{s4&
z42(dQ7Z6KB*&yF)FfxP1nSg9VMkWRUARPt7ne8lK@hl)41QLK4q#s73S;_zmuL<l7
zEI<_oM#ct=3m~R~bg(Xfm^1~*1_36ZIZR-cL6#Ok7F3s^fdNR?=llT=)&A=XfVN%q
zba4#HaDF@E=B7gm0xq#eQqx!b`G5Y@rGQ6gFHDqJ{iR6m%A(e0Pe$SJw8U8o3wgij
z9jw}Xbh-LH)fZ<DF-?6h$Z>Ceql3)D#~M23n}Q!HO!&Lc{>@jxh`c8iR{h5V6VxL_
zCe%piT~9ReZ;}=)QMs=6!L0Gxeom&=fA%Ufw)3rUh}V#twYfAP;uYg0@ohpJU(Rw(
zxbu%8)wqYLba(HD7-i0?J=q{?niAI)XXy<ws$5q#F$1YsrLwhI>r-?0pEO~7+RoxV
z^U;p0+?|4~SECsp7k^LCoV4JZL!t|#wbAOv2H9U<Ss1mw(-;^v*Q8BgIeMvp&DY^)
zI8*!swhNP*&oqj;3tcEp@cwe*#iWo=8VdEI5l;lt(s%yKO`Sbo!Ap+i&w0MzQ{(a&
zcg`uhG@JJq)9ms_o%8!c4#gikP*5`Y<uyeHuYX+%AAi}-U|IIu!JE&BJxWHO<5dQe
zmvF$WhD$6{)E1a9F6Gqlb*L0spi{g+m3=0&u5g9GiH1v;jLeu$AOFY{fAaLtu9uy<
zUt^1#o~rIi*t+p=`Eu_nh8Le1gXH8H=6w>1+wks9w+#E4_vbH*oc6AHCI^hj#%VGs
ld|P}T1a9B}dZ?_?u>AFY=fy$)<mEvT?dj_0vd$@?2>{n1I9~t&

delta 978
zcmV;@11<c52i*sd8Gi-<0082ccQ^n500(qQO+^Rk0~-M=FX2SsqW}N{kx4{BRCt{2
z-LX#-Q5*;G?<s@raBTt!NfX)xqc9Nu0;4q=u9KV{ndN^_hYtK3Ff()@uN&7utj1Xr
z!hnM{Fm#fH-atvfJQokC^zLZsyI-Z>Pr^b-zpw9iz3Xd#?|%S@h-h3{(gPS}U-NmL
z%jIx#a)P;o10!>F&%}e?6<TX(t)+)SMB~f0ZKLO)&<jhiVBhx>yJ$=22V;2oqKKW{
zhOz94uwd790RSs2E7;%P$KKu^lu|m0Ns!JD#_;Uv6Fho62RoC+)|Q#<o&^XfrJ$4o
z00a|~B&mGcwtuzbECB!t`2sF3e!+2;;Cc0-7a{g-=<@RNF!TD>$YexvQ>ipOua39x
z-eY}z1F2NnNDkKlF-#wTEPyZ;Ko|=kj0F(J0tkyOK&@6wVjQ80?Y3yXX`u_TPUjSk
zvxMixBEC19I668?a$Ms10n-Oy&sTu&`<Ca`an?D-;eXK~j*oxB^XiFx79*V>a9tPG
zY891ACCS*oY}?l5*RQncPXtFX-?nZ2?@!WWxEzQ`@QCD#+uq(5odD^4y5k}*YF}n%
zbS{@eyWKX{6)?*ANr+qrSe6CLl6&6L`9wrSL_|a;M6Pm@=#L+Fkt<>L#}kpTvHwEE
zu*hpb(0?D#BA63efUEuS<+95n7}B!<L4W*%R2qeR0h5zcaGWI;!GO@dpj0Xir4&4`
z4nSsu#yE)WjFZ|RF)r8}DvSjX#sUaq0feyt!XozxkCJ}YASSw~P36ZHU=%h;T-`Yz
zr_(td`i5$g`H=;1UAOC20g@IM7qPas7W;RrtAB4$F1y!mE%0rAUIQ5TizQR}JqzIb
zzNM7X04{G85d40S!4Jd2!UBNkjnlPS4G(8$F)?u;e{Qm&tJNw>rIMA&WNy{w801GS
zOpEPy-}#}h0LjVjWpi^AK>U`W4~+)SI;Z&f=`(!aw@RfF0HD=s-KqdVe%vX!-~5r9
z<bN;&oP&pY0GZ7HFA4zM-FHDmL_|bHL_|bHL_|bHL_|bHL^Nc5b#O^{he_v~aN|J+
zo40TJ|Fo1+L+{U&%s1s)cXY2lcH6dfx$I(catiC~8?g^ssZ_e!+WR4$pR{WQ$Y!%$
zH)#rP*fBjljY7TvAihUG=%pXTP4eS<^h<A(pR{WQXti2h6X5&4wX@sM=jRt_Hh%z!
z@6iu>=?8I>{J0+d+vF#W*8pLB7equvL_`991D#qB4chMyAOHXW07*qoM6N<$g2gh?
Ac>n+a

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolumeOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpVolumeOn.png
index 85e33e7b7bd66c19f5a8c4ff65f989939697a053..7482259fd383d754083ffa536c5ee36dbd0cb88c 100644
GIT binary patch
literal 1618
zcmeAS@N?(olHy`uVBq!ia0vp^4}kap2Q!e=il6@!NHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%_YUw0apmLVi;Iifv13P1Pfu)Y?0<$uehmK^D*iM4Kfv&x=M|7<U<eHj
znKpGwadDBak5_qlX+lC=P@vyAS=pN!8t3KYUYMJ|w6Fl0XEk3=2S`bl1o;L3#{n1^
zO}MrL6>%1LL>4nJ@ErzW#^d=bQh<UIC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL$I
zIeEA2fNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZppejDWCn{f0ojI(Obh}*Itqw0
z+gZTkSwJ=jBmgl;Ka57RlmQr)6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7
zEG>X6s4hbT1CXrG`2!xR{nr-&W1-d4#WAEJ?(OW`Ww#6jTwPx~IGtFV8T9YJxAkI6
zv#{)wSCW+at$!<CwUX|XIdpWY*uy=Adlr<!QGkJg(VQderklJeyT9-KCvAyuLT$3P
z3`bedRB?Ki8FO#>R?hw0J7S096Yf88C%rv_b{|-HNk2CJkha*2&)=u+`}VIm4#=)p
z@g<5?iB(_m<l{3;#rr}VJq~(%d@6j%G*Psg({tU|Vx6FesyxdtU;eyuLqlx8!Ja+)
zo<5KMRx4FE<(c$1=a_l<*Uz6dK3^aF;qM>e#hGV*?R#)My^?WrT}9WwL;Ee)RMk)3
z*eAXPh|WzHz4Pn1%WwXw)LHSXa>ev3w4c56IIYaz!=t|P>)P!)Th70qm2VaL#@a2d
z_I0lFucuqe=atGI*fV{?lCpzg?#x1y*4WOU{dp~4xr)loUp4-(EBp=};#GPQHJ@Ma
zFSCcorf=dIwRJ1%TK0zND|)`&{_z;=R{M^x@(1R)uc*;nTB{lHp>{=$p%4FtS4V5^
z@n>dQ1;38oc<uh{v_IyoTg_W%T@=4^?^^b;4<c9Z&B$%te=_1YcN7q%YpnQdxbSW9
z7oc%3w$@JDx8U2-S=-J($~U?u$#u>&cK7*<=Y#KU3iuvr;9Ggw^X~JBk*{vIo!Zyn
zv+729&z5hjDMG$^TR+RJ{K}dV^j5Z}QD5$z$OO;uJB{1cTg}r}n4GbxjPWY-H727@
zwd~rXCPl65s~EUXsLWdPRrMjq&Q-u@Y4F+gh;LfmS?fh_mA`miYHpcm=o|O-`JFlG
zhw>6?JQWVNJujaab-v~O7X^;<A2+>A|0A!Wb~L7K@|wHC52Ihqc${2O)jR#!{5@w4
zjZX`F%+#3^x8vGx_nx1})fOx-Jb!=vLEi>@`R10J0S7bTDGU$8jdi2;83oVA<Oxd-
z7<vRfkWkSq;F%<1!RE;&)7-MN$GG}8v)kX)8J6+V2Cphr9@M;jctiDhHuIzR^1CM4
z-?^OosjmLP?i0Uu+rEDKdHK8f>`u>Wau2L{K5@gP>lY3<*~`T_Okz5Y%>qv2+S|Mj
zS=T-$gp9R1ViUpcdBU$CiR?ZV);>q4n6|Cy%+Cv&)YQZ?9=R`m`n<SMB+l<beeLv(
zOXYjlS^l4GWB=!?r~RS+>&rh>Jegfm5^Q+rXt{gTz9+leD-KNme)sRfH@gqpeO!F;
z)90Q2<-Y{)&0EO)ccW{=v^tYRm#5!&mc8MZug~+?0v4HOu#G<VOPnhlUlT+<+)3dx
z9MQdRp0MSL)p@b3PVKcnYu1a!Y1+oW{#O3K=%3r4(?9Q?`Fa1z&qUF}rKa=WUp0!#
yJiOkqp}il|kOytvYlZbQWc4%V_KMrguV-%XZ7c4Sn0^gZIC;AIxvX<aXaWEQ<HfxI

literal 1873
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


From c47bbd3646bbccd5bd786d429b422092675d98cd Mon Sep 17 00:00:00 2001
From: SnappingOpossum <snappingopossum@outlook.com>
Date: Thu, 15 Jan 2026 15:27:16 +1100
Subject: [PATCH 321/360] Move artifact random spawners to entity table
 spawners. (#42422)

* Move artifact random spawners to entity tables

* That's a pretty big thing to miss

* This is embarassing

* Apply review
---
 .../Markers/Spawners/Random/artifacts.yml     | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
index 0135361044..faf230817b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
@@ -1,24 +1,31 @@
-- type: entity
+- type: entityTable
+  id: RandomArtifactTable
+  table: !type:GroupSelector
+    children:
+    - id: ComplexXenoArtifact
+      weight: 2
+    - id: ComplexXenoArtifactItem
+
+- type: entity
+  parent: MarkerBase
   id: RandomArtifactSpawner
   name: random artifact spawner
-  parent: MarkerBase
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
-          state: ano01
-    - type: RandomSpawner
-      prototypes:
-        - ComplexXenoArtifact
-        - ComplexXenoArtifact
-        - ComplexXenoArtifactItem
-      chance: 1
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+      state: ano01
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomArtifactTable
 
 - type: entity
   id: RandomArtifactSpawner20
   name: random artifact spawner [20]
   parent: RandomArtifactSpawner
   components:
-    - type: RandomSpawner
-      chance: 0.2
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomArtifactTable
+      prob: 0.2

From 5b5a2529ac507e1864052147cc5901cfe02591d9 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Wed, 14 Jan 2026 21:25:07 -0800
Subject: [PATCH 322/360] Increase TEG power generation by 75% (#42421)

increase TEG power by 75%
---
 .../Prototypes/Entities/Structures/Power/Generation/teg.yml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
index 0bf5011de2..aba7531ef5 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
@@ -63,6 +63,7 @@
     - type: AtmosDevice
     - type: TegGenerator
       thermalEfficiency: 0.1
+      powerFactor: 1.75
 
     - type: DeviceNetwork
       deviceNetId: AtmosDevices

From 14f151cc2129b5dab41d72af462515df2d7a6f55 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Thu, 15 Jan 2026 23:37:11 +1000
Subject: [PATCH 323/360] Cleanup warnings: CS0414 (#42429)

cleanup
---
 Content.Server/Maps/MapMigrationSystem.cs            | 4 ++--
 Content.Shared/Body/Systems/SharedBodySystem.Body.cs | 1 -
 Content.Shared/Mind/SharedMindSystem.cs              | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Maps/MapMigrationSystem.cs b/Content.Server/Maps/MapMigrationSystem.cs
index 77eff846d3..b6bdca0cf3 100644
--- a/Content.Server/Maps/MapMigrationSystem.cs
+++ b/Content.Server/Maps/MapMigrationSystem.cs
@@ -17,9 +17,9 @@ namespace Content.Server.Maps;
 /// </summary>
 public sealed class MapMigrationSystem : EntitySystem
 {
-#pragma warning disable CS0414
+#if DEBUG
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
-#pragma warning restore CS0414
+#endif
     [Dependency] private readonly IResourceManager _resMan = default!;
 
     private const string MigrationDir = "/Migrations/"; // DeltaV - dir instead of a single file
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index 102f1015d3..e3f4c1122f 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -40,7 +40,6 @@ public partial class SharedBodySystem
      */
 
     // [Dependency] private readonly InventorySystem _inventory = default!; // Shitmed - Declared in SharedBodySystem.cs
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly ItemSlotsSystem _slots = default!; // Shitmed Change
 
     private const float GibletLaunchImpulse = 8;
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 301a69c409..e9ef9eba88 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -31,12 +31,10 @@ namespace Content.Shared.Mind;
 public abstract partial class SharedMindSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
     [Dependency] private readonly SharedPlayerSystem _player = default!;
-    [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;

From cccb70bcbc890f71175d17cc7dbd61353d450f0b Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Thu, 15 Jan 2026 11:30:07 -0500
Subject: [PATCH 324/360] Make cancer mice actually hurt (#42298)

* Update animals.yml

* That was a bit too much
---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 8979c908f7..c4bb97af22 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2185,7 +2185,8 @@
     energy: 5
     netsync: false
   - type: RadiationSource
-    intensity: 0.3
+    intensity: 0.5
+    slope: 0.3
   - type: Bloodstream
     bloodReferenceSolution:
       reagents:

From 477a2948fe846a07520e7a25466f6e665040389f Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Thu, 15 Jan 2026 13:54:20 -0300
Subject: [PATCH 325/360] Make heavy xenoborg able to "swim" in space (#42415)

MovementAlwaysTouching
---
 Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
index eb0edc8f4c..84a7ac5938 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -90,6 +90,7 @@
   - type: MovementSpeedModifier # slower
     baseWalkSpeed : 1.2
     baseSprintSpeed : 2.2
+  - type: MovementAlwaysTouching # it flies in space by pure will power
   - type: FlashImmunity
   - type: MobThresholds # tankier
     thresholds:

From f38bfd163320a0f81e17c754a600d4bb040ad2b0 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Thu, 15 Jan 2026 18:17:00 +0100
Subject: [PATCH 326/360] Predict TransferAmountBoundUserInterface (#42358)

prediction!!!
---
 .../UI/TransferAmountBoundUserInterface.cs    | 48 +++++++-----------
 .../Chemistry/UI/TransferAmountWindow.xaml.cs | 49 +++++++++----------
 .../Components/SolutionTransferComponent.cs   | 31 +++++-------
 .../EntitySystems/SolutionTransferSystem.cs   |  2 +-
 .../Chemistry/SharedTransferAmount.cs         | 28 +++--------
 5 files changed, 64 insertions(+), 94 deletions(-)

diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
index 1bc1c0dba9..884a5db9da 100644
--- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -2,41 +2,31 @@ using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Chemistry.UI
+namespace Content.Client.Chemistry.UI;
+
+[UsedImplicitly]
+public sealed class TransferAmountBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
-    [UsedImplicitly]
-    public sealed class TransferAmountBoundUserInterface : BoundUserInterface
+    [ViewVariables]
+    private TransferAmountWindow? _window;
+
+    protected override void Open()
     {
-        private IEntityManager _entManager;
-        private EntityUid _owner;
-        [ViewVariables]
-        private TransferAmountWindow? _window;
+        base.Open();
+        _window = this.CreateWindow<TransferAmountWindow>();
 
-        public TransferAmountBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        if (EntMan.TryGetComponent<SolutionTransferComponent>(Owner, out var comp))
+            _window.SetBounds(comp.MinimumTransferAmount.Int(), comp.MaximumTransferAmount.Int());
+
+        _window.ApplyButton.OnPressed += _ =>
         {
-          _owner = owner;
-          _entManager = IoCManager.Resolve<IEntityManager>();
-        }
-
-        protected override void Open()
-        {
-            base.Open();
-            _window = this.CreateWindow<TransferAmountWindow>();
-
-            if (_entManager.TryGetComponent<SolutionTransferComponent>(_owner, out var comp))
-                _window.SetBounds(comp.MinimumTransferAmount.Int(), comp.MaximumTransferAmount.Int());
-
-            _window.ApplyButton.OnPressed += _ =>
+            if (int.TryParse(_window.AmountLineEdit.Text, out var i))
             {
-                if (int.TryParse(_window.AmountLineEdit.Text, out var i))
-                {
-                    SendMessage(new TransferAmountSetValueMessage(FixedPoint2.New(i)));
-                    _window.Close();
-                }
-            };
-        }
+                SendPredictedMessage(new TransferAmountSetValueMessage(FixedPoint2.New(i)));
+                _window.Close();
+            }
+        };
     }
 }
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 6bae044441..2d01098213 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -3,34 +3,33 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Chemistry.UI
+namespace Content.Client.Chemistry.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class TransferAmountWindow : DefaultWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class TransferAmountWindow : DefaultWindow
+    private int _max = Int32.MaxValue;
+    private int _min = 1;
+
+    public TransferAmountWindow()
     {
-        private int _max = Int32.MaxValue;
-        private int _min = 1;
+        RobustXamlLoader.Load(this);
+        AmountLineEdit.OnTextChanged += OnValueChanged;
+    }
 
-        public TransferAmountWindow()
-        {
-            RobustXamlLoader.Load(this);
-            AmountLineEdit.OnTextChanged += OnValueChanged;
-        }
+    public void SetBounds(int min, int max)
+    {
+        _min = min;
+        _max = max;
+        MinimumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-min", ("amount", _min));
+        MaximumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-max", ("amount", _max));
+    }
 
-        public void SetBounds(int min, int max)
-        {
-          _min = min;
-          _max = max;
-          MinimumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-min", ("amount", _min));
-          MaximumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-max", ("amount", _max));
-        }
-
-        private void OnValueChanged(LineEdit.LineEditEventArgs args)
-        {
-            if (!int.TryParse(AmountLineEdit.Text, out var amount)  || amount > _max || amount < _min)
-                ApplyButton.Disabled = true;
-            else 
-                ApplyButton.Disabled = false; 
-        }
+    private void OnValueChanged(LineEdit.LineEditEventArgs args)
+    {
+        if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount > _max || amount < _min)
+            ApplyButton.Disabled = true;
+        else
+            ApplyButton.Disabled = false;
     }
 }
diff --git a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs
index 2b862a83ac..149fe3f643 100644
--- a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs
@@ -12,43 +12,36 @@ public sealed partial class SolutionTransferComponent : Component
     /// <summary>
     ///     The amount of solution to be transferred from this solution when clicking on other solutions with it.
     /// </summary>
-    [DataField("transferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(5);
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(5);
 
     /// <summary>
     ///     The minimum amount of solution that can be transferred at once from this solution.
     /// </summary>
-    [DataField("minTransferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 MinimumTransferAmount { get; set; } = FixedPoint2.New(5);
+    [DataField("minTransferAmount"), AutoNetworkedField]
+    public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5);
 
     /// <summary>
     ///     The maximum amount of solution that can be transferred at once from this solution.
     /// </summary>
-    [DataField("maxTransferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(100);
+    [DataField("maxTransferAmount"), AutoNetworkedField]
+    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(100);
 
     /// <summary>
     ///     Can this entity take reagent from reagent tanks?
     /// </summary>
-    [DataField("canReceive")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool CanReceive { get; set; } = true;
+    [DataField, AutoNetworkedField]
+    public bool CanReceive = true;
 
     /// <summary>
     ///     Can this entity give reagent to other reagent containers?
     /// </summary>
-    [DataField("canSend")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool CanSend { get; set; } = true;
+    [DataField, AutoNetworkedField]
+    public bool CanSend = true;
 
     /// <summary>
     /// Whether you're allowed to change the transfer amount.
     /// </summary>
-    [DataField("canChangeTransferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool CanChangeTransferAmount { get; set; } = false;
+    [DataField, AutoNetworkedField]
+    public bool CanChangeTransferAmount = false;
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
index 4d78ab4647..8fe17368cc 100644
--- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -99,7 +99,7 @@ public sealed class SolutionTransferSystem : EntitySystem
         ent.Comp.TransferAmount = newTransferAmount;
 
         if (message.Actor is { Valid: true } user)
-            _popup.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), ent.Owner, user);
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), ent.Owner, user);
 
         Dirty(ent.Owner, ent.Comp);
     }
diff --git a/Content.Shared/Chemistry/SharedTransferAmount.cs b/Content.Shared/Chemistry/SharedTransferAmount.cs
index 1d95d2d687..c535f5d307 100644
--- a/Content.Shared/Chemistry/SharedTransferAmount.cs
+++ b/Content.Shared/Chemistry/SharedTransferAmount.cs
@@ -3,28 +3,16 @@ using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry
 {
+    /// <summary>
+    /// Send by the client when setting the transfer amount using the BUI.
+    /// </summary>
     [Serializable, NetSerializable]
-    public sealed class TransferAmountBoundInterfaceState : BoundUserInterfaceState
+    public sealed class TransferAmountSetValueMessage(FixedPoint2 value) : BoundUserInterfaceMessage
     {
-        public FixedPoint2 Max;
-        public FixedPoint2 Min;
-
-        public TransferAmountBoundInterfaceState(FixedPoint2 max, FixedPoint2 min)
-        {
-            Max = max;
-            Min = min;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TransferAmountSetValueMessage : BoundUserInterfaceMessage
-    {
-        public FixedPoint2 Value;
-
-        public TransferAmountSetValueMessage(FixedPoint2 value)
-        {
-            Value = value;
-        }
+        /// <summary>
+        /// The new transfer amount.
+        /// </summary>
+        public FixedPoint2 Value = value;
     }
 
     [Serializable, NetSerializable]

From 9ecb979e3badfdbc2d424a770228a4d226afac54 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Thu, 15 Jan 2026 18:43:32 +0100
Subject: [PATCH 327/360] Predict defibrillators and add an integration test
 for them (#41572)

* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction

* predict

* readd zapping interacting mobs
---
 Content.Client/Medical/DefibrillatorSystem.cs |   5 +
 .../Tests/Medical/DefibrillatorTest.cs        | 102 +++++++
 Content.Server/Medical/DefibrillatorSystem.cs | 247 +----------------
 .../Medical/DefibrillatorComponent.cs         |  55 ++--
 .../Medical/SharedDefibrillatorSystem.cs      | 249 ++++++++++++++++++
 5 files changed, 392 insertions(+), 266 deletions(-)
 create mode 100644 Content.Client/Medical/DefibrillatorSystem.cs
 create mode 100644 Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs
 create mode 100644 Content.Shared/Medical/SharedDefibrillatorSystem.cs

diff --git a/Content.Client/Medical/DefibrillatorSystem.cs b/Content.Client/Medical/DefibrillatorSystem.cs
new file mode 100644
index 0000000000..834bcbcc5b
--- /dev/null
+++ b/Content.Client/Medical/DefibrillatorSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Medical;
+
+namespace Content.Client.Medical;
+
+public sealed class DefibrillatorSystem : SharedDefibrillatorSystem;
diff --git a/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs b/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs
new file mode 100644
index 0000000000..9781bf5c80
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs
@@ -0,0 +1,102 @@
+#nullable enable
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Systems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Medical;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Medical;
+
+/// <summary>
+/// Tests for defibrilators.
+/// </summary>
+[TestOf(typeof(DefibrillatorComponent))]
+public sealed class DefibrillatorTest : InteractionTest
+{
+    // We need two hands to use a defbrillator.
+    protected override string PlayerPrototype => "MobHuman";
+
+    private static readonly EntProtoId DefibrillatorProtoId = "Defibrillator";
+    private static readonly EntProtoId TargetProtoId = "MobHuman";
+    private static readonly ProtoId<DamageTypePrototype> BluntDamageTypeId = "Blunt";
+
+    /// <summary>
+    /// Kills a target mob, heals them and then revives them with a defibrillator.
+    /// </summary>
+    [Test]
+    public async Task KillAndReviveTest()
+    {
+        var damageableSystem = SEntMan.System<DamageableSystem>();
+        var mobThresholdsSystem = SEntMan.System<MobThresholdSystem>();
+
+        // Don't let the player and target suffocate.
+        await AddAtmosphere();
+
+        await SpawnTarget(TargetProtoId);
+
+        var targetMobState = Comp<MobStateComponent>();
+        var targetDamageable = Comp<DamageableComponent>();
+
+        // Check that the target has no damage and is not crit or dead.
+        Assert.Multiple(() =>
+        {
+            Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Alive), "Target mob was not alive when spawned.");
+            Assert.That(targetDamageable.TotalDamage, Is.EqualTo(FixedPoint2.Zero), "Target mob was damaged when spawned.");
+        });
+
+        // Get the damage needed to kill or crit the target.
+        var critThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.Critical);
+        var deathThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.Dead);
+        var critDamage = new DamageSpecifier(ProtoMan.Index(BluntDamageTypeId), (critThreshold + deathThreshold) / 2);
+        var deathDamage = new DamageSpecifier(ProtoMan.Index(BluntDamageTypeId), deathThreshold);
+
+        // Kill the target by applying blunt damage.
+        await Server.WaitPost(() => damageableSystem.SetDamage((STarget.Value, targetDamageable), deathDamage));
+        await RunTicks(3);
+
+        // Check that the target is dead.
+        Assert.Multiple(() =>
+        {
+            Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Dead), "Target mob did not die from deadly damage amount.");
+            Assert.That(targetDamageable.TotalDamage, Is.EqualTo(deathThreshold), "Target mob had the wrong total damage amount after being killed.");
+        });
+
+        // Spawn a defib and activate it.
+        var defib = await PlaceInHands(DefibrillatorProtoId, enableToggleable: true);
+        var cooldown = Comp<DefibrillatorComponent>(defib).ZapDelay;
+
+        // Wait for the cooldown.
+        await RunSeconds((float)cooldown.TotalSeconds);
+
+        // ZAP!
+        await Interact();
+
+        // Check that the target is still dead since it is over the crit threshold.
+        // And it should have taken some extra damage.
+        Assert.Multiple(() =>
+        {
+            Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Dead), "Target mob was revived despite being over the death damage threshold.");
+            Assert.That(targetDamageable.TotalDamage, Is.GreaterThan(deathThreshold), "Target mob did not take damage from being defibrillated.");
+        });
+
+        // Set the damage halfway between the crit and death thresholds so that the target can be revived.
+        await Server.WaitPost(() => damageableSystem.SetDamage((STarget.Value, targetDamageable), critDamage));
+        await RunTicks(3);
+
+        // Check that the target is still dead.
+        Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Dead), "Target mob revived on its own.");
+
+        // ZAP!
+        await RunSeconds((float)cooldown.TotalSeconds);
+        await Interact();
+
+        // The target should be revived, but in crit.
+        Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Critical), "Target mob was not revived from being defibrillated.");
+    }
+}
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 8e974ed35a..34260fac43 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -1,258 +1,19 @@
-using Content.Server.Atmos.Rotting;
-using Content.Server.Chat.Systems;
-using Content.Server.DoAfter;
-using Content.Server.Electrocution;
 using Content.Server.EUI;
 using Content.Server.Ghost;
-using Content.Server.Popups;
-using Content.Shared.PowerCell;
-using Content.Shared.Traits.Assorted;
-using Content.Shared.Chat;
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Systems;
-using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
-using Content.Shared.Item.ItemToggle;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.PowerCell;
-using Content.Shared.Timing;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.Medical;
 
-/// <summary>
-/// This handles interactions and logic relating to <see cref="DefibrillatorComponent"/>
-/// </summary>
-public sealed class DefibrillatorSystem : EntitySystem
+public sealed class DefibrillatorSystem : SharedDefibrillatorSystem
 {
-    [Dependency] private readonly ChatSystem _chatManager = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly DoAfterSystem _doAfter = default!;
-    [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
-    [Dependency] private readonly EuiManager _euiManager = default!;
+    [Dependency] private readonly EuiManager _eui = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
-    [Dependency] private readonly ItemToggleSystem _toggle = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly PowerCellSystem _powerCell = default!;
-    [Dependency] private readonly RottingSystem _rotting = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
+    protected override void OpenReturnToBodyEui(Entity<MindComponent> mind, ICommonSession session)
     {
-        SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
-    }
-
-    private void OnAfterInteract(EntityUid uid, DefibrillatorComponent component, AfterInteractEvent args)
-    {
-        if (args.Handled || args.Target is not { } target)
-            return;
-
-        args.Handled = TryStartZap(uid, target, args.User, component);
-    }
-
-    private void OnDoAfter(EntityUid uid, DefibrillatorComponent component, DefibrillatorZapDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        if (args.Target is not { } target)
-            return;
-
-        if (!CanZap(uid, target, args.User, component))
-            return;
-
-        args.Handled = true;
-        Zap(uid, target, args.User, component);
-    }
-
-    /// <summary>
-    ///     Checks if you can actually defib a target.
-    /// </summary>
-    /// <param name="uid">Uid of the defib</param>
-    /// <param name="target">Uid of the target getting defibbed</param>
-    /// <param name="user">Uid of the entity using the defibrillator</param>
-    /// <param name="component">Defib component</param>
-    /// <param name="targetCanBeAlive">
-    ///     If true, the target can be alive. If false, the function will check if the target is alive and will return false if they are.
-    /// </param>
-    /// <returns>
-    ///     Returns true if the target is valid to be defibed, false otherwise.
-    /// </returns>
-    public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null, bool targetCanBeAlive = false)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (!_toggle.IsActivated(uid))
-        {
-            if (user != null)
-                _popup.PopupEntity(Loc.GetString("defibrillator-not-on"), uid, user.Value);
-            return false;
-        }
-
-        if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay), component.DelayId))
-            return false;
-
-        if (!TryComp<MobStateComponent>(target, out var mobState))
-            return false;
-
-        if (!_powerCell.HasActivatableCharge(uid, user: user))
-            return false;
-
-        if (!targetCanBeAlive && _mobState.IsAlive(target, mobState))
-            return false;
-
-        if (!targetCanBeAlive && !component.CanDefibCrit && _mobState.IsCritical(target, mobState))
-            return false;
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Tries to start defibrillating the target. If the target is valid, will start the defib do-after.
-    /// </summary>
-    /// <param name="uid">Uid of the defib</param>
-    /// <param name="target">Uid of the target getting defibbed</param>
-    /// <param name="user">Uid of the entity using the defibrillator</param>
-    /// <param name="component">Defib component</param>
-    /// <returns>
-    ///     Returns true if the defibrillation do-after started, otherwise false.
-    /// </returns>
-    public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (!CanZap(uid, target, user, component))
-            return false;
-
-        _audio.PlayPvs(component.ChargeSound, uid);
-        return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
-            uid, target, uid)
-        {
-            NeedHand = true,
-            BreakOnMove = !component.AllowDoAfterMovement
-        });
-    }
-
-    /// <summary>
-    ///     Tries to defibrillate the target with the given defibrillator.
-    /// </summary>
-    public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (!_powerCell.TryUseActivatableCharge(uid, user: user))
-            return;
-
-        var selfEvent = new SelfBeforeDefibrillatorZapsEvent(user, uid, target);
-        RaiseLocalEvent(user, selfEvent);
-
-        target = selfEvent.DefibTarget;
-
-        // Ensure thet new target is still valid.
-        if (selfEvent.Cancelled || !CanZap(uid, target, user, component, true))
-            return;
-
-        var targetEvent = new TargetBeforeDefibrillatorZapsEvent(user, uid, target);
-        RaiseLocalEvent(target, targetEvent);
-
-        target = targetEvent.DefibTarget;
-
-        if (targetEvent.Cancelled || !CanZap(uid, target, user, component, true))
-            return;
-
-        if (!TryComp<MobStateComponent>(target, out var mob) ||
-            !TryComp<MobThresholdsComponent>(target, out var thresholds))
-            return;
-
-        _audio.PlayPvs(component.ZapSound, uid);
-        _electrocution.TryDoElectrocution(target, null, component.ZapDamage, component.WritheDuration, true, ignoreInsulation: true);
-
-        var interacters = new HashSet<EntityUid>();
-        _interactionSystem.GetEntitiesInteractingWithTarget(target, interacters);
-        foreach (var other in interacters)
-        {
-            if (other == user)
-                continue;
-
-            // Anyone else still operating on the target gets zapped too
-            _electrocution.TryDoElectrocution(other, null, component.ZapDamage, component.WritheDuration, true);
-        }
-
-        if (!TryComp<UseDelayComponent>(uid, out var useDelay))
-            return;
-        _useDelay.SetLength((uid, useDelay), component.ZapDelay, component.DelayId);
-        _useDelay.TryResetDelay((uid, useDelay), id: component.DelayId);
-
-        ICommonSession? session = null;
-
-        var dead = true;
-        if (_rotting.IsRotten(target))
-        {
-            _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
-                InGameICChatType.Speak, true);
-        }
-        else if (TryComp<UnrevivableComponent>(target, out var unrevivable))
-        {
-            _chatManager.TrySendInGameICMessage(uid, Loc.GetString(unrevivable.ReasonMessage),
-                InGameICChatType.Speak, true);
-        }
-        else
-        {
-            if (_mobState.IsDead(target, mob))
-                _damageable.TryChangeDamage(target, component.ZapHeal, true, origin: uid, canSever: false); // DeltaV - Stop Defibs from Nuggetizing people.
-
-            if (_mobThreshold.TryGetThresholdForState(target, MobState.Dead, out var threshold) &&
-                TryComp<DamageableComponent>(target, out var damageableComponent) &&
-                damageableComponent.TotalDamage < threshold)
-            {
-                _mobState.ChangeMobState(target, MobState.Critical, mob, uid);
-                dead = false;
-            }
-
-            if (_mind.TryGetMind(target, out _, out var mind) &&
-                _player.TryGetSessionById(mind.UserId, out var playerSession))
-            {
-                session = playerSession;
-                // notify them they're being revived.
-                if (mind.CurrentEntity != target)
-                {
-                    _euiManager.OpenEui(new ReturnToBodyEui(mind, _mind, _player), session);
-                }
-            }
-            else
-            {
-                _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-no-mind"),
-                    InGameICChatType.Speak, true);
-            }
-        }
-
-        var sound = dead || session == null
-            ? component.FailureSound
-            : component.SuccessSound;
-        _audio.PlayPvs(sound, uid);
-
-        // if we don't have enough power left for another shot, turn it off
-        if (!_powerCell.HasActivatableCharge(uid))
-            _toggle.TryDeactivate(uid);
-
-        // TODO clean up this clown show above
-        var ev = new TargetDefibrillatedEvent(user, (uid, component));
-        RaiseLocalEvent(target, ref ev);
+        _eui.OpenEui(new ReturnToBodyEui(mind, _mind, _player), session);
     }
 }
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index f54348d771..61053cde11 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -1,86 +1,95 @@
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
+using Content.Shared.Item.ItemToggle.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Medical;
 
 /// <summary>
 /// This is used for defibrillators; a machine that shocks a dead
 /// person back into the world of the living.
-/// Uses <c>ItemToggleComponent</c>
+/// Uses <see cref="ItemToggleComponent"/>
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class DefibrillatorComponent : Component
 {
     /// <summary>
     /// How much damage is healed from getting zapped.
     /// </summary>
-    [DataField("zapHeal", required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true), AutoNetworkedField]
     public DamageSpecifier ZapHeal = default!;
 
     /// <summary>
     /// The electrical damage from getting zapped.
     /// </summary>
-    [DataField("zapDamage"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public int ZapDamage = 5;
 
     /// <summary>
     /// How long the victim will be electrocuted after getting zapped.
     /// </summary>
-    [DataField("writheDuration"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public TimeSpan WritheDuration = TimeSpan.FromSeconds(3);
 
     /// <summary>
-    ///     ID of the cooldown use delay.
+    /// ID of the cooldown use delay.
     /// </summary>
     [DataField]
     public string DelayId = "defib-delay";
 
     /// <summary>
-    ///     Cooldown after using the defibrillator.
+    /// Cooldown after using the defibrillator.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan ZapDelay = TimeSpan.FromSeconds(5);
 
     /// <summary>
-    /// How long the doafter for zapping someone takes
+    /// How long the doafter for zapping someone takes.
     /// </summary>
     /// <remarks>
     /// This is synced with the audio; do not change one but not the other.
     /// </remarks>
-    [DataField("doAfterDuration"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public TimeSpan DoAfterDuration = TimeSpan.FromSeconds(3);
 
-    [DataField]
+    /// <summary>
+    /// If false cancels the doafter when moving.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public bool AllowDoAfterMovement = true;
 
-    [DataField]
+    /// <summary>
+    /// Can the defibrilator be used on mobs in critical mobstate?
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public bool CanDefibCrit = true;
 
     /// <summary>
-    /// The sound when someone is zapped.
+    /// The sound to play when someone is zapped.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("zapSound")]
+    [DataField]
     public SoundSpecifier? ZapSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_zap.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("chargeSound")]
+    /// <summary>
+    /// The sound to play when starting the doafter.
+    /// </summary>
+    [DataField]
     public SoundSpecifier? ChargeSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_charge.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("failureSound")]
+    [DataField]
     public SoundSpecifier? FailureSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_failed.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("successSound")]
+    [DataField]
     public SoundSpecifier? SuccessSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_success.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("readySound")]
+    [DataField]
     public SoundSpecifier? ReadySound = new SoundPathSpecifier("/Audio/Items/Defib/defib_ready.ogg");
 }
 
+/// <summary>
+/// DoAfterEvent for defibrilator use windup.
+/// </summary>
 [Serializable, NetSerializable]
-public sealed partial class DefibrillatorZapDoAfterEvent : SimpleDoAfterEvent
-{
-
-}
+public sealed partial class DefibrillatorZapDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Medical/SharedDefibrillatorSystem.cs b/Content.Shared/Medical/SharedDefibrillatorSystem.cs
new file mode 100644
index 0000000000..ea5258a20c
--- /dev/null
+++ b/Content.Shared/Medical/SharedDefibrillatorSystem.cs
@@ -0,0 +1,249 @@
+using Content.Shared.Atmos.Rotting;
+using Content.Shared.Chat;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+using Content.Shared.DoAfter;
+using Content.Shared.Electrocution;
+using Content.Shared.Interaction;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Mind;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.PowerCell;
+using Content.Shared.Timing;
+using Content.Shared.Traits.Assorted;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Medical;
+
+/// <summary>
+/// This handles interactions and logic relating to <see cref="DefibrillatorComponent"/>
+/// </summary>
+public abstract class SharedDefibrillatorSystem : EntitySystem
+{
+    [Dependency] private readonly SharedChatSystem _chat = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
+    [Dependency] private readonly ISharedPlayerManager _player = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly SharedRottingSystem _rotting = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+
+    private readonly HashSet<EntityUid> _interacters = new();
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnAfterInteract(Entity<DefibrillatorComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || args.Target is not { } target)
+            return;
+
+        args.Handled = TryStartZap(ent.AsNullable(), target, args.User);
+    }
+
+    private void OnDoAfter(Entity<DefibrillatorComponent> ent, ref DefibrillatorZapDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled)
+            return;
+
+        if (args.Target is not { } target)
+            return;
+
+        if (!CanZap(ent.AsNullable(), target, args.User))
+            return;
+
+        args.Handled = true;
+        Zap(ent.AsNullable(), target, args.User);
+    }
+
+    /// <summary>
+    /// Checks if you can actually defib a target.
+    /// </summary>
+    /// <param name="ent">The defbrillator being used.</param>
+    /// <param name="target">Uid of the target getting defibbed.</param>
+    /// <param name="user">Uid of the entity using the defibrillator.</param>
+    /// <param name="targetCanBeAlive">
+    /// If true, the target can be alive. If false, the function will check if the target is alive and will return false if they are.
+    /// </param>
+    /// <returns>
+    /// Returns true if the target is valid to be defibed, false otherwise.
+    /// </returns>
+    public bool CanZap(Entity<DefibrillatorComponent?> ent, EntityUid target, EntityUid? user = null, bool targetCanBeAlive = false)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (!_toggle.IsActivated(ent.Owner))
+        {
+            _popup.PopupClient(Loc.GetString("defibrillator-not-on"), ent.Owner, user);
+            return false;
+        }
+
+        if (!TryComp<UseDelayComponent>(ent, out var useDelay) || _useDelay.IsDelayed((ent.Owner, useDelay), ent.Comp.DelayId))
+            return false;
+
+        if (!TryComp<MobStateComponent>(target, out var mobState))
+            return false;
+
+        if (!_powerCell.HasActivatableCharge(ent.Owner, user: user, predicted: true))
+            return false;
+
+        if (!targetCanBeAlive && _mobState.IsAlive(target, mobState))
+            return false;
+
+        if (!targetCanBeAlive && !ent.Comp.CanDefibCrit && _mobState.IsCritical(target, mobState))
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to start defibrillating the target. If the target is valid, will start the defib do-after.
+    /// </summary>
+    /// <param name="ent">The defbrillator being used.</param>
+    /// <param name="target">Uid of the target getting defibbed.</param>
+    /// <param name="user">Uid of the entity using the defibrillator.</param>
+    /// <returns>
+    /// Returns true if the defibrillation do-after started, otherwise false.
+    /// </returns>
+    public bool TryStartZap(Entity<DefibrillatorComponent?> ent, EntityUid target, EntityUid user)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (!CanZap(ent, target, user))
+            return false;
+
+        _audio.PlayPredicted(ent.Comp.ChargeSound, ent.Owner, user);
+        return _doAfter.TryStartDoAfter(
+            new DoAfterArgs(EntityManager, user, ent.Comp.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
+            ent.Owner, target, ent.Owner)
+            {
+                NeedHand = true,
+                BreakOnMove = !ent.Comp.AllowDoAfterMovement
+            });
+    }
+
+    /// <summary>
+    /// Tries to defibrillate the target with the given defibrillator.
+    /// </summary>
+    /// <param name="ent">The defbrillator being used.</param>
+    /// <param name="target">Uid of the target getting defibbed.</param>
+    /// <param name="user">Uid of the entity using the defibrillator.</param>
+    public void Zap(Entity<DefibrillatorComponent?> ent, EntityUid target, EntityUid user)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        if (!_powerCell.TryUseActivatableCharge(ent.Owner, user: user))
+            return;
+
+        var selfEvent = new SelfBeforeDefibrillatorZapsEvent(user, ent.Owner, target);
+        RaiseLocalEvent(user, selfEvent);
+
+        target = selfEvent.DefibTarget;
+
+        // Ensure thet new target is still valid.
+        if (selfEvent.Cancelled || !CanZap(ent, target, user, true))
+            return;
+
+        var targetEvent = new TargetBeforeDefibrillatorZapsEvent(user, ent.Owner, target);
+        RaiseLocalEvent(target, targetEvent);
+
+        target = targetEvent.DefibTarget;
+
+        if (targetEvent.Cancelled || !CanZap(ent, target, user, true))
+            return;
+
+        if (!TryComp<MobStateComponent>(target, out var targetMobState))
+            return;
+
+        _audio.PlayPredicted(ent.Comp.ZapSound, ent.Owner, user);
+        _electrocution.TryDoElectrocution(target, ent.Owner, ent.Comp.ZapDamage, ent.Comp.WritheDuration, true, ignoreInsulation: true);
+
+        _interactionSystem.GetEntitiesInteractingWithTarget(target, _interacters);
+        foreach (var other in _interacters)
+        {
+            if (other == user)
+                continue;
+
+            // Anyone else still operating on the target gets zapped too
+            _electrocution.TryDoElectrocution(other, null, ent.Comp.ZapDamage, ent.Comp.WritheDuration, true);
+        }
+
+        if (TryComp<UseDelayComponent>(ent, out var useDelay))
+        {
+            _useDelay.SetLength((ent.Owner, useDelay), ent.Comp.ZapDelay, id: ent.Comp.DelayId);
+            _useDelay.TryResetDelay((ent.Owner, useDelay), id: ent.Comp.DelayId);
+        }
+
+        var failedRevive = true;
+        if (_rotting.IsRotten(target))
+        {
+            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString("defibrillator-rotten"),
+                InGameICChatType.Speak, true);
+        }
+        else if (TryComp<UnrevivableComponent>(target, out var unrevivable))
+        {
+            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(unrevivable.ReasonMessage),
+                InGameICChatType.Speak, true);
+        }
+        else
+        {
+            if (_mobState.IsDead(target, targetMobState))
+                _damageable.TryChangeDamage(target, ent.Comp.ZapHeal, true, origin: user, canSever: false); // DeltaV - Stop Defibs from Nuggetizing people.
+
+            if (TryComp<MobThresholdsComponent>(target, out var targetThresholds) &&
+                TryComp<DamageableComponent>(target, out var targetDamageable) &&
+                _mobThreshold.TryGetThresholdForState(target, MobState.Dead, out var threshold, targetThresholds) &&
+                targetDamageable.TotalDamage < threshold)
+            {
+                _mobState.ChangeMobState(target, MobState.Critical, targetMobState, user);
+                failedRevive = false;
+            }
+
+            if (_mind.TryGetMind(target, out var mindUid, out var mindComp) &&
+                _player.TryGetSessionById(mindComp.UserId, out var playerSession))
+            {
+                // notify them they're being revived.
+                if (mindComp.CurrentEntity != target)
+                    OpenReturnToBodyEui((mindUid, mindComp), playerSession);
+            }
+            else
+            {
+                _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString("defibrillator-no-mind"),
+                    InGameICChatType.Speak, true);
+            }
+        }
+
+        var sound = failedRevive
+            ? ent.Comp.FailureSound
+            : ent.Comp.SuccessSound;
+        _audio.PlayPredicted(sound, ent.Owner, user);
+
+        // if we don't have enough power left for another shot, turn it off
+        if (!_powerCell.HasActivatableCharge(ent.Owner))
+            _toggle.TryDeactivate(ent.Owner);
+
+        var ev = new TargetDefibrillatedEvent(user, (ent.Owner, ent.Comp));
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    // TODO: SharedEuiManager so that we can just directly open the eui from shared.
+    protected virtual void OpenReturnToBodyEui(Entity<MindComponent> mind, ICommonSession session) { }
+}

From 036ed50b6ef67c2de18b0bdc5d1f618a218f1a1f Mon Sep 17 00:00:00 2001
From: Fruitsalad <949631+Fruitsalad@users.noreply.github.com>
Date: Thu, 15 Jan 2026 18:52:03 +0100
Subject: [PATCH 328/360] Cryo pod UI (#41850)

* Add CryoPodWindow (placeholder)

* Change HealthAnalyzerWindow: split off reusable HealthAnalyzerControl for cryo pod UI

* Improve CryoPodWindow: add health analyzer

* Improve CryoPodWindow: add eject button

This wasn't requested in the issue but I implemented it as practice with the UI system.

* Rewrote GasAnalyzerWindow, split off reusable gas mix viewer for cryo pod

* Change GasAnalyzerWindow: change back to three columns

With two rows you get a layouting bug when there's a lot of different gases, which looks somewhat bad. I didn't feel like fixing the layouting bug (it's an engine issue) so we're going back to three columns. That way you don't ever get two rows in practice.

* Change GasAnalyzerWindow: simplify by disabling Resizable

I added a lot of complexity to make resizable work nicely with a derived max & min size, but it's not necessary.

* Change GasAnalyzerWindow: file-wide namespace

* Change GasAnalyzerSystem: add GenerateGasMixEntry

* Split HealthAnalyzerUiState from HealthAnalyzerScannedUserMessage

* Rewrote CryoPodWindow, add atmos info

* Improve CryoPodWindow: add loading placeholder

* Improve CryoPodWindow: add internationalization support

* Fix GasAnalyzerControl: add missing translation

* Improve CryoPodWindow: add beaker info, high temperature warning

* Improve CryoPodWindow/System: inject button in window + necessary system changes

* Fix CryoPodWindow: Entering cryopod now closes window

This way you can't heal yourself with a cryopod.

* Change CryoPodWindow: add & update comments

* Change HealthAnalyzerComponent: remove `uiKey` property (no longer necessary)

* Tiny fixes

* Improve CryoPodUiMessage: replace string with enum

* Change GasAnalyzerWindow: simplify Measure code

* Change CryoPodComponent: rename Injecting to InjectionBuffer

* Change CryoPodBUI: tiny code simplification

* Fix HealthAnalyzerComponent: Removed stray import

* Improve CryoPodWindow: Prettier, concise atmos

* Improve CryoPodWindow: Chemicals bar chart

* Improve CryoPodWindow: Add Ruler to reagents

* Change CryoPodWindow: More horizontal layout

* Improve CryoPodWindow: Reduce height jiggling

The health analyzer's height changes a lot, which can be annoying with the buttons (for example when the oxygen damage label is popping in and out)

* Improve CryoPodWindow: Add setup checklist

This is mostly here to fill vertical space in the new horizontal layout.

* Improve CryoPodWindow: Eject beaker button

* Improve CryoPodWindow: Localization

* Improve CryoPodWindow: Add BeakerBarChart

An animated version of the chemicals chart

* Fix CryoPodSystem: Ejecting beaker no longer clears injection buffer

* Improve BeakerBarChart: Not animated on first frame

* Fix CryoPodWindow: Fix broken translation

* Improve CryoPodWindow: Reorder sections

* Fix BeakerBarChart: Tooltips now show up

* Change BeakerBarChart: Reorder functions

* Change CryoPodWindow: Reorder sections, change margins

* Change CryoPodWindow: Edit flavor text

* Revert changes to GasAnalyzerWindow

Since GasAnalyzerControl is no longer used in CryoPodWindow, these changes are no longer relevant to this PR.

* Tidy CryoPodWindow: Remove old workarounds

These are old layouting bug workarounds from the older version of CryoPodWindow that had a ScrollContainer in it. They're no longer necessary. Less ScrollContainers less problems.

* Tidy up: Remove unused imports

* Remove LabelledSplitBar

It was replaced by BeakerBarChart, which is a lot fancier.

* Tidy up: Tiny code style fix

* Change CryoPodSystem: Move code from server to shared

This is still without adding UI prediction

* move a ton of stuff to shared.

* one last thing

* Improve BeakerBarChart: Keep visual entry width when swapping beakers

* Improve BeakerBarChart: Respect beaker order of reagents

* Improve CryoPodWindow: Ensure space for injection buffer

 We need to keep space on the chart for the injection buffer after swapping to a full beaker.

* Improve CryoPodWindow: Prettier ejection error

* Improve CryoPodWindow: Add "Cooling patient" status

* BeakerBarChart: Fix UI scale bug

* BeakerBarChart: Fix bluespace beaker ugliness

* BeakerBarChart: Add more pod status strings

* HealthAnalyzerControl: Filewide namespace, sort imports

* Style fix: Replace `bool x = y` with `var x = y`

* CryoPodUiMessage: Split off separate class for inject

* SharedCryoPodSystem: Move message-related code into Subs.BuiEvents

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../UI/HealthAnalyzerBoundUserInterface.cs    |   8 +-
 .../UI/HealthAnalyzerControl.xaml             | 219 +++++++++
 .../UI/HealthAnalyzerControl.xaml.cs          | 441 ++++++++++++++++++
 .../UI/HealthAnalyzerWindow.xaml              | 245 +---------
 .../UI/HealthAnalyzerWindow.xaml.cs           | 438 +----------------
 .../Medical/Cryogenics/BeakerBarChart.cs      | 285 +++++++++++
 .../Cryogenics/CryoPodBoundUserInterface.cs   |  53 +++
 .../Medical/Cryogenics/CryoPodSystem.cs       |  10 +-
 .../Medical/Cryogenics/CryoPodWindow.xaml     | 232 +++++++++
 .../Medical/Cryogenics/CryoPodWindow.xaml.cs  | 260 +++++++++++
 .../Atmos/EntitySystems/GasAnalyzerSystem.cs  |  35 +-
 Content.Server/Medical/CryoPodSystem.cs       |  78 ++--
 .../Medical/HealthAnalyzerSystem.cs           |  48 +-
 .../Medical/Cryogenics/CryoPodComponent.cs    |  79 +++-
 .../Medical/Cryogenics/SharedCryoPodSystem.cs | 258 ++++++++--
 .../HealthAnalyzerScannedUserMessage.cs       |  20 +-
 .../medical/components/cryo-pod-component.ftl |  39 ++
 .../Structures/Machines/Medical/cryo_pod.yml  |  12 +-
 18 files changed, 1961 insertions(+), 799 deletions(-)
 create mode 100644 Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml
 create mode 100644 Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs
 create mode 100644 Content.Client/Medical/Cryogenics/BeakerBarChart.cs
 create mode 100644 Content.Client/Medical/Cryogenics/CryoPodBoundUserInterface.cs
 create mode 100644 Content.Client/Medical/Cryogenics/CryoPodWindow.xaml
 create mode 100644 Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs

diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index b054b7a14f..98e42ef886 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -21,9 +21,9 @@ namespace Content.Client.HealthAnalyzer.UI
             base.Open();
 
             _window = this.CreateWindow<HealthAnalyzerWindow>();
-            _window.OnBodyPartSelected += SendBodyPartMessage; // Shitmed Change
-            _window.OnTriageStatusChanged += SendTriageStatusMessage; // DeltaV - Medical Records
-            _window.OnClaimPatient += SendTriageClaimMessage; // DeltaV - Medical Records
+            _window.HealthAnalyzer.OnBodyPartSelected += SendBodyPartMessage; // Shitmed Change
+            _window.HealthAnalyzer.OnTriageStatusChanged += SendTriageStatusMessage; // DeltaV - Medical Records
+            _window.HealthAnalyzer.OnClaimPatient += SendTriageClaimMessage; // DeltaV - Medical Records
             _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
         }
 
@@ -48,7 +48,7 @@ namespace Content.Client.HealthAnalyzer.UI
                 return;
 
             if (_window != null)
-                _window.OnBodyPartSelected -= SendBodyPartMessage;
+                _window.HealthAnalyzer.OnBodyPartSelected -= SendBodyPartMessage;
 
             _window?.Dispose();
         }
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml
new file mode 100644
index 0000000000..2df80d0f40
--- /dev/null
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml
@@ -0,0 +1,219 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    VerticalExpand="True"
+    Orientation="Vertical">
+    <Label
+        Name="NoPatientDataText"
+        Text="{Loc health-analyzer-window-no-patient-data-text}" />
+
+    <!-- Shitmed Change Start -->
+    <Button Name="ReturnButton"
+            Text="{Loc 'health-analyzer-window-return-button-text'}"
+            Margin="0 0 0 10"
+            HorizontalExpand="False"/>
+    <!-- Shitmed Change End -->
+
+    <BoxContainer
+        Name="PatientDataContainer"
+        Margin="0 0 0 5"
+        Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal" Margin="0 0 0 5">
+            <PanelContainer>
+            <!-- Shitmed Change Start -->
+            <SpriteView OverrideDirection="South" Name="SpriteView" Access="Public" SetSize="96 96" />
+            <PanelContainer
+                    Name="PartView"
+                    SetSize="57 96"
+                    Margin="18 0 0 0"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Left">
+                    <PanelContainer
+                        SetSize="15 33"
+                        Margin="4 0 0 0"
+                        HorizontalAlignment="Left">
+                        <TextureButton
+                            Name="RightArmButton"
+                            MinSize="15 25"
+                            StyleClasses="TargetDollButtonRightArm"
+                            VerticalAlignment="Top">
+                        </TextureButton>
+                        <TextureButton
+                            Name="RightHandButton"
+                            MinSize="15 15"
+                            VerticalAlignment="Bottom"
+                            StyleClasses="TargetDollButtonRightHand">
+                        </TextureButton>
+                    </PanelContainer>
+                    <PanelContainer
+                        SetSize="43 75"
+                        Margin="0 0 0 0"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center">
+                        <TextureButton
+                            Name="HeadButton"
+                            MinSize="28 23"
+                            VerticalAlignment="Top"
+                            HorizontalAlignment="Center"
+                            StyleClasses="TargetDollButtonHead">
+                            <!--<PanelContainer
+                    SetSize="14 15"
+                    Margin="-1 9 0 0"
+                    HorizontalAlignment="Center">
+                    <TextureButton
+                        Name="EyesButton"
+                        MinSize="14 9"
+                        VerticalAlignment="Top"
+                        StyleClasses="TargetDollButtonEyes">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/eyes.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="14 9"/>
+                    </TextureButton>
+                    <TextureButton
+                        Name="MouthButton"
+                        SetSize="8 6"
+                        VerticalAlignment="Bottom"
+                        StyleClasses="TargetDollButtonMouth">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/mouth.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="8 6"/>
+                    </TextureButton>
+                </PanelContainer>-->
+                        </TextureButton>
+                        <TextureButton
+                            Name="ChestButton"
+                            SetSize="28 30"
+                            Margin="0 18 0 0"
+                            VerticalAlignment="Top"
+                            HorizontalAlignment="Center"
+                            StyleClasses="TargetDollButtonChest">
+                        </TextureButton>
+                        <PanelContainer
+                            MinSize="38 35"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Center">
+                            <TextureButton
+                                Name="GroinButton"
+                                MinSize="28 15"
+                                VerticalAlignment="Top"
+                                HorizontalAlignment="Center"
+                                StyleClasses="TargetDollButtonGroin">
+                            </TextureButton>
+                            <PanelContainer
+                                MinSize="20 30"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Right">
+                                <TextureButton
+                                    Name="LeftLegButton"
+                                    MinSize="15 28"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Left"
+                                    StyleClasses="TargetDollButtonLeftLeg">
+                                </TextureButton>
+                                <TextureButton
+                                    Name="LeftFootButton"
+                                    MinSize="20 10"
+                                    VerticalAlignment="Bottom"
+                                    StyleClasses="TargetDollButtonLeftFoot">
+                                </TextureButton>
+                            </PanelContainer>
+                            <PanelContainer
+                                MinSize="20 30"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Left">
+                                <TextureButton
+                                    Name="RightLegButton"
+                                    MinSize="15 28"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Right"
+                                    StyleClasses="TargetDollButtonRightLeg">
+                                </TextureButton>
+                                <TextureButton
+                                    Name="RightFootButton"
+                                    MinSize="20 10"
+                                    VerticalAlignment="Bottom"
+                                    HorizontalAlignment="Center"
+                                    StyleClasses="TargetDollButtonRightFoot">
+                                </TextureButton>
+                            </PanelContainer>
+                        </PanelContainer>
+                    </PanelContainer>
+                    <PanelContainer
+                        SetSize="15 33"
+                        Margin="0 0 4 0"
+                        HorizontalAlignment="Right">
+                        <TextureButton
+                            Name="LeftArmButton"
+                            MinSize="15 25"
+                            StyleClasses="TargetDollButtonLeftArm"
+                            VerticalAlignment="Top">
+                        </TextureButton>
+                        <TextureButton
+                            Name="LeftHandButton"
+                            MinSize="15 15"
+                            VerticalAlignment="Bottom"
+                            StyleClasses="TargetDollButtonLeftHand">
+                        </TextureButton>
+                    </PanelContainer>
+                </PanelContainer>
+            </PanelContainer>
+            <!-- Shitmed Change Start -->
+            <TextureRect Name="NoDataTex" Access="Public" SetSize="96 96" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/> <!-- DeltaV - Size changed to 96 96 to be consistent with shitmed -->
+            <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
+                <RichTextLabel Name="NameLabel" SetWidth="150" />
+                <Label Name="SpeciesLabel" VerticalAlignment="Top" StyleClasses="LabelSubText" />
+                <Label Name="PartNameLabel"
+                       VerticalAlignment="Bottom"
+                       StyleClasses="LabelSubText"/>
+            </BoxContainer>
+            <Label Margin="0 0 5 0" HorizontalExpand="True" HorizontalAlignment="Right" VerticalExpand="True"
+                   VerticalAlignment="Top" Name="ScanModeLabel"
+                   Text="{Loc 'health-analyzer-window-entity-unknown-text'}" />
+        </BoxContainer>
+
+        <PanelContainer StyleClasses="LowDivider" />
+
+        <!-- Begin DeltaV - Medical Records -->
+        <BoxContainer Name="TriageControls" Orientation="Vertical">
+            <BoxContainer Name="StatusBox"
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Center"
+                            Margin="0 8 0 0">
+            </BoxContainer>
+
+            <Button Name="ClaimButton"
+                    Text="{Loc 'health-analyzer-window-triage-claim'}"
+                    MinSize="60 0" />
+
+            <PanelContainer StyleClasses="LowDivider" Margin="0 8 0 0"/>
+        </BoxContainer>
+        <!-- End DeltaV - Medical Records -->
+
+        <GridContainer Margin="0 5 0 0" Columns="2">
+            <Label Text="{Loc 'health-analyzer-window-entity-status-text'}" />
+            <Label Name="StatusLabel" />
+            <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}" />
+            <Label Name="TemperatureLabel" />
+            <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}" />
+            <Label Name="BloodLabel" />
+            <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}" />
+            <Label Name="DamageLabel" />
+        </GridContainer>
+    </BoxContainer>
+
+    <PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />
+
+    <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Vertical" HorizontalAlignment="Center">
+
+    </BoxContainer>
+
+    <PanelContainer StyleClasses="LowDivider" />
+
+    <BoxContainer
+        Name="GroupsContainer"
+        Margin="0 5 0 5"
+        Orientation="Vertical">
+    </BoxContainer>
+
+</BoxContainer>
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs
new file mode 100644
index 0000000000..1368b6580d
--- /dev/null
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs
@@ -0,0 +1,441 @@
+using System.Linq;
+using System.Numerics;
+using Content.Shared.Atmos;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.IdentityManagement;
+using Content.Shared.MedicalScanner;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+namespace Content.Client.HealthAnalyzer.UI;
+
+using Content.Client._DV.Traits.Assorted; // DeltaV
+using Content.Shared._DV.Traits.Assorted; // DeltaV
+using Content.Shared._DV.Medical; // DeltaV - Uncloneable
+using Content.Shared._DV.MedicalRecords; // DeltaV - Medical Records
+using Content.Shared._Shitmed.Targeting; // Shitmed
+
+// Health analyzer UI is split from its window because it's used by both the
+// health analyzer item and the cryo pod UI.
+
+[GenerateTypedNameReferences]
+public sealed partial class HealthAnalyzerControl : BoxContainer
+{
+    private readonly IEntityManager _entityManager;
+    private readonly SpriteSystem _spriteSystem;
+    private readonly IPrototypeManager _prototypes;
+    private readonly IResourceCache _cache;
+
+    private readonly UnborgableSystem _unborgable; // DeltaV
+    private readonly RedshirtSystem _redshirt; // DeltaV
+    private readonly UncloneableSystem _uncloneable; // DeltaV
+
+    // Shitmed Change Start
+    public event Action<TargetBodyPart?, EntityUid>? OnBodyPartSelected;
+    private EntityUid _spriteViewEntity;
+
+    private readonly EntProtoId _bodyView = "AlertSpriteView";
+
+    private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
+    private EntityUid? _target;
+    // Shitmed Change End
+
+    // Begin DeltaV - Medical Records
+    private readonly ButtonGroup _triageStatusGroup = new();
+    private readonly Dictionary<TriageStatus, Button> _triageControls = new();
+
+    public event Action<TriageStatus>? OnTriageStatusChanged;
+    public event Action? OnClaimPatient;
+    // End DeltaV - Medical Records
+
+    public HealthAnalyzerControl()
+    {
+        RobustXamlLoader.Load(this);
+
+        var dependencies = IoCManager.Instance!;
+        _entityManager = dependencies.Resolve<IEntityManager>();
+        _spriteSystem = _entityManager.System<SpriteSystem>();
+        _prototypes = dependencies.Resolve<IPrototypeManager>();
+        _cache = dependencies.Resolve<IResourceCache>();
+
+        _unborgable = _entityManager.System<UnborgableSystem>(); // DeltaV
+        _redshirt = _entityManager.System<RedshirtSystem>(); // DeltaV
+        _uncloneable = _entityManager.System<UncloneableSystem>(); // DeltaV
+        // Shitmed Change Start
+        _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
+        {
+            { TargetBodyPart.Head, HeadButton },
+            { TargetBodyPart.Torso, ChestButton },
+            { TargetBodyPart.Groin, GroinButton },
+            { TargetBodyPart.LeftArm, LeftArmButton },
+            { TargetBodyPart.LeftHand, LeftHandButton },
+            { TargetBodyPart.RightArm, RightArmButton },
+            { TargetBodyPart.RightHand, RightHandButton },
+            { TargetBodyPart.LeftLeg, LeftLegButton },
+            { TargetBodyPart.LeftFoot, LeftFootButton },
+            { TargetBodyPart.RightLeg, RightLegButton },
+            { TargetBodyPart.RightFoot, RightFootButton },
+        };
+
+        foreach (var bodyPartButton in _bodyPartControls)
+        {
+            bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
+            bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key, bodyPartButton.Value);
+        }
+        ReturnButton.OnPressed += _ => ResetBodyPart();
+        // Shitmed Change End
+
+        // Begin DeltaV - Medical Records
+        foreach (var item in Enum.GetValues<TriageStatus>())
+        {
+            var btn = new Button();
+            var ftlKey = item.ToString();
+            btn.Group = _triageStatusGroup;
+            btn.Text = Loc.GetString($"health-analyzer-window-triage-status-{ftlKey}");
+            btn.ToolTip = Loc.GetString($"health-analyzer-window-triage-status-{ftlKey}.ToolTip");
+            btn.OnPressed += _ => OnTriageStatusChanged?.Invoke(item);
+            btn.AddStyleClass("ButtonSquare");
+            StatusBox.AddChild(btn);
+            _triageControls[item] = btn;
+        }
+        StatusBox.Children.First().AddStyleClass("OpenRight");
+        StatusBox.Children.First().RemoveStyleClass("ButtonSquare");
+        StatusBox.Children.Last().AddStyleClass("OpenLeft");
+        StatusBox.Children.Last().RemoveStyleClass("ButtonSquare");
+        ClaimButton.OnPressed += _ => OnClaimPatient?.Invoke();
+        // End DeltaV - Medical Records
+    }
+
+    public void Populate(HealthAnalyzerUiState state)
+    {
+        var target = _entityManager.GetEntity(state.TargetEntity);
+        // Begin Shitmed
+        _target = target;
+        EntityUid? part = state.Part != null ? _entityManager.GetEntity(state.Part.Value) : null;
+        var isPart = part != null;
+        // End Shitmed
+
+        if (target == null
+            || !_entityManager.TryGetComponent<DamageableComponent>(isPart ? part : target, out var damageable)) // Shitmed
+        {
+            NoPatientDataText.Visible = true;
+            return;
+        }
+
+        // Begin Shitmed
+        ReturnButton.Visible = isPart;
+        PartNameLabel.Visible = isPart;
+
+        if (part != null)
+            PartNameLabel.Text = _entityManager.HasComponent<MetaDataComponent>(part)
+                ? Identity.Name(part.Value, _entityManager)
+                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+        // End Shitmed
+
+        NoPatientDataText.Visible = false;
+
+        // Scan Mode
+
+        ScanModeLabel.Text = state.ScanMode.HasValue
+            ? state.ScanMode.Value
+                ? Loc.GetString("health-analyzer-window-scan-mode-active")
+                : Loc.GetString("health-analyzer-window-scan-mode-inactive")
+            : Loc.GetString("health-analyzer-window-entity-unknown-text");
+
+        ScanModeLabel.FontColorOverride = state.ScanMode.HasValue && state.ScanMode.Value ? Color.Green : Color.Red;
+
+        // Patient Information
+
+        SpriteView.SetEntity(SetupIcon(state.Body) ?? target.Value); // Shitmed Change
+        SpriteView.Visible = state.ScanMode.HasValue && state.ScanMode.Value;
+        PartView.Visible = SpriteView.Visible; // Shitmed Change
+        NoDataTex.Visible = !SpriteView.Visible;
+
+        var name = new FormattedMessage();
+        name.PushColor(Color.White);
+        name.AddText(_entityManager.HasComponent<MetaDataComponent>(target.Value)
+            ? Identity.Name(target.Value, _entityManager)
+            : Loc.GetString("health-analyzer-window-entity-unknown-text"));
+        NameLabel.SetMessage(name);
+
+        SpeciesLabel.Text =
+            _entityManager.TryGetComponent<HumanoidAppearanceComponent>(target.Value,
+                out var humanoidAppearanceComponent)
+                ? Loc.GetString(_prototypes.Index<SpeciesPrototype>(humanoidAppearanceComponent.Species).Name)
+                : Loc.GetString("health-analyzer-window-entity-unknown-species-text");
+
+        // Basic Diagnostic
+
+        TemperatureLabel.Text = !float.IsNaN(state.Temperature)
+            ? $"{state.Temperature - Atmospherics.T0C:F1} °C ({state.Temperature:F1} K)"
+            : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+
+        BloodLabel.Text = !float.IsNaN(state.BloodLevel)
+            ? $"{state.BloodLevel * 100:F1} %"
+            : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+
+        StatusLabel.Text =
+            _entityManager.TryGetComponent<MobStateComponent>(target.Value, out var mobStateComponent)
+                ? GetStatus(mobStateComponent.CurrentState)
+                : Loc.GetString("health-analyzer-window-entity-unknown-text");
+
+        // Total Damage
+
+        DamageLabel.Text = damageable.TotalDamage.ToString();
+
+        // Alerts
+        // DeltaV traits - This is going to be horrid if we just keep adding things like this.
+        var unborgable = _unborgable.IsUnborgable(target.Value);
+        var redshirt = _redshirt.IsRedshirt(target.Value) && mobStateComponent?.CurrentState == MobState.Dead; // DeltaV - Redshirt
+        var uncloneable = _uncloneable.IsUncloneable(target.Value) && mobStateComponent?.CurrentState == MobState.Dead; // DeltaV - Unclonable
+        // END DeltaV
+
+        var showAlerts = state.Unrevivable == true || state.Bleeding == true;
+
+        AlertsDivider.Visible = showAlerts;
+        AlertsContainer.Visible = showAlerts;
+
+        if (showAlerts)
+            AlertsContainer.RemoveAllChildren();
+
+        if (state.Unrevivable == true)
+            AlertsContainer.AddChild(new RichTextLabel
+            {
+                Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
+                Margin = new Thickness(0, 4),
+                MaxWidth = 300
+            });
+
+        if (state.Bleeding == true)
+            AlertsContainer.AddChild(new RichTextLabel
+            {
+                Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
+                Margin = new Thickness(0, 4),
+                MaxWidth = 300
+            });
+
+        if (unborgable) // DeltaV
+            AlertsContainer.AddChild(new RichTextLabel
+            {
+                Text = Loc.GetString("health-analyzer-window-entity-unborgable-text"),
+                Margin = new Thickness(0, 4),
+                MaxWidth = 300
+            });
+
+        if (redshirt) // DeltaV
+            AlertsContainer.AddChild(new RichTextLabel
+            {
+                Text = Loc.GetString("health-analyzer-window-entity-redshirt-text"),
+                Margin = new Thickness(0, 4),
+                MaxWidth = 300
+            });
+
+        if (uncloneable) // DeltaV - Uncloneable
+            AlertsContainer.AddChild(new RichTextLabel
+            {
+                Text = Loc.GetString("health-analyzer-window-entity-uncloneable-text"),
+                Margin = new Thickness(0, 4),
+                MaxWidth = 300
+            });
+
+        // Damage Groups
+
+        var damageSortedGroups =
+            damageable.DamagePerGroup.OrderByDescending(damage => damage.Value)
+                .ToDictionary(x => x.Key, x => x.Value);
+
+        IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
+
+        DrawDiagnosticGroups(damageSortedGroups, damagePerType);
+
+        // Begin DeltaV - Medical Records
+        if (state.MedicalRecord is not { } records)
+        {
+            TriageControls.Visible = false;
+            return;
+        }
+
+        TriageControls.Visible = true;
+        _triageControls[records.Status].Pressed = true;
+
+        // Update claim button based on claimed status
+        if (records.ClaimedName != null)
+        {
+            ClaimButton.Text = Loc.GetString("health-analyzer-window-triage-unclaim", ("claimedBy", records.ClaimedName));
+        }
+        else
+        {
+            ClaimButton.Text = Loc.GetString("health-analyzer-window-triage-claim");
+        }
+        // End DeltaV - Medical Records
+    }
+
+    private static string GetStatus(MobState mobState)
+    {
+        return mobState switch
+        {
+            MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"),
+            MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"),
+            MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"),
+            _ => Loc.GetString("health-analyzer-window-entity-unknown-text"),
+        };
+    }
+
+    private void DrawDiagnosticGroups(
+        Dictionary<string, FixedPoint2> groups,
+        IReadOnlyDictionary<string, FixedPoint2> damageDict)
+    {
+        GroupsContainer.RemoveAllChildren();
+
+        foreach (var (damageGroupId, damageAmount) in groups)
+        {
+            if (damageAmount == 0)
+                continue;
+
+            var groupTitleText = $"{Loc.GetString(
+                "health-analyzer-window-damage-group-text",
+                ("damageGroup", _prototypes.Index<DamageGroupPrototype>(damageGroupId).LocalizedName),
+                ("amount", damageAmount)
+            )}";
+
+            var groupContainer = new BoxContainer
+            {
+                Align = AlignMode.Begin,
+                Orientation = LayoutOrientation.Vertical,
+            };
+
+            groupContainer.AddChild(CreateDiagnosticGroupTitle(groupTitleText, damageGroupId));
+
+            GroupsContainer.AddChild(groupContainer);
+
+            // Show the damage for each type in that group.
+            var group = _prototypes.Index<DamageGroupPrototype>(damageGroupId);
+
+            foreach (var type in group.DamageTypes)
+            {
+                if (!damageDict.TryGetValue(type, out var typeAmount) || typeAmount <= 0)
+                    continue;
+
+                var damageString = Loc.GetString(
+                    "health-analyzer-window-damage-type-text",
+                    ("damageType", _prototypes.Index<DamageTypePrototype>(type).LocalizedName),
+                    ("amount", typeAmount)
+                );
+
+                groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, " · ")));
+            }
+        }
+    }
+
+    // Shitmed Change Start
+    public void SetActiveBodyPart(TargetBodyPart part, TextureButton button)
+    {
+        if (_target == null)
+            return;
+
+        // Bit of the ole shitcode until we have Groins in the prototypes.
+        OnBodyPartSelected?.Invoke(part == TargetBodyPart.Groin ? TargetBodyPart.Torso : part, _target.Value);
+    }
+
+    public void ResetBodyPart()
+    {
+        if (_target == null)
+            return;
+
+        OnBodyPartSelected?.Invoke(null, _target.Value);
+    }
+
+    public void SetActiveButtons(bool isHumanoid)
+    {
+        foreach (var button in _bodyPartControls)
+            button.Value.Visible = isHumanoid;
+    }
+
+    /// <summary>
+    /// Sets up the Body Doll using Alert Entity to use in Health Analyzer.
+    /// </summary>
+    private EntityUid? SetupIcon(Dictionary<TargetBodyPart, TargetIntegrity>? body)
+    {
+        if (body is null)
+            return null;
+
+        if (!_entityManager.Deleted(_spriteViewEntity))
+            _entityManager.QueueDeleteEntity(_spriteViewEntity);
+
+        _spriteViewEntity = _entityManager.Spawn(_bodyView);
+
+        if (!_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
+            return null;
+
+        int layer = 0;
+        foreach (var (bodyPart, integrity) in body)
+        {
+            // TODO: PartStatusUIController and make it use layers instead of TextureRects when EE refactors alerts.
+            string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
+            int enumValue = (int) integrity;
+            var rsi = new SpriteSpecifier.Rsi(new ResPath($"/Textures/_Shitmed/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
+            // Shitcode with love from Russia :)
+            if (!_spriteSystem.TryGetLayer(_spriteViewEntity, layer, out _, false))
+                _spriteSystem.AddTextureLayer(_spriteViewEntity, _spriteSystem.Frame0(rsi));
+            else
+                _spriteSystem.LayerSetTexture(_spriteViewEntity, layer, _spriteSystem.Frame0(rsi));
+            _spriteSystem.LayerSetScale(_spriteViewEntity, layer, new Vector2(3f, 3f));
+            layer++;
+        }
+        return _spriteViewEntity;
+    }
+    // Shitmed Change End
+
+    private Texture GetTexture(string texture)
+    {
+        var rsiPath = new ResPath("/Textures/Objects/Devices/health_analyzer.rsi");
+        var rsiSprite = new SpriteSpecifier.Rsi(rsiPath, texture);
+
+        var rsi = _cache.GetResource<RSIResource>(rsiSprite.RsiPath).RSI;
+        if (!rsi.TryGetState(rsiSprite.RsiState, out var state))
+        {
+            rsiSprite = new SpriteSpecifier.Rsi(rsiPath, "unknown");
+        }
+
+        return _spriteSystem.Frame0(rsiSprite);
+    }
+
+    private static Label CreateDiagnosticItemLabel(string text)
+    {
+        return new Label
+        {
+            Text = text,
+        };
+    }
+
+    private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
+    {
+        var rootContainer = new BoxContainer
+        {
+            Margin = new Thickness(0, 6, 0, 0),
+            VerticalAlignment = VAlignment.Bottom,
+            Orientation = LayoutOrientation.Horizontal,
+        };
+
+        rootContainer.AddChild(new TextureRect
+        {
+            SetSize = new Vector2(30, 30),
+            Texture = GetTexture(id.ToLower())
+        });
+
+        rootContainer.AddChild(CreateDiagnosticItemLabel(text));
+
+        return rootContainer;
+    }
+}
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
index 015d607265..fde542d64a 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
@@ -1,253 +1,16 @@
 <controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:ui="clr-namespace:Content.Client.HealthAnalyzer.UI"
     MaxHeight="525"
     MinWidth="350"> <!-- Shitmed Change -->
     <ScrollContainer
         Margin="5 5 5 5"
         ReturnMeasure="True"
         VerticalExpand="True">
-        <BoxContainer
-            Name="RootContainer"
-            VerticalExpand="True"
-            Orientation="Vertical">
-            <Label
-                Name="NoPatientDataText"
-                Text="{Loc health-analyzer-window-no-patient-data-text}"/>
-            <!-- Shitmed Change Start -->
-            <Button Name="ReturnButton"
-                    Text="{Loc 'health-analyzer-window-return-button-text'}"
-                    Margin="0 0 0 10"
-                    HorizontalExpand="False"/>
-            <!-- Shitmed Change End -->
-            <BoxContainer
-                Name="PatientDataContainer"
-                Margin="0 0 0 5"
-                Orientation="Vertical">
-                <!-- Shitmed Change Start -->
-                <BoxContainer Orientation="Horizontal"
-                              Margin="0 0 0 5">
-                    <PanelContainer>
-                        <SpriteView OverrideDirection="South"
-                                    Name="SpriteView"
-                                    Access="Public"
-                                    SetSize="96 96"/>
-                        <PanelContainer
-                            Name="PartView"
-                            SetSize="57 96"
-                            Margin="18 0 0 0"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Left">
-                            <PanelContainer
-                                SetSize="15 33"
-                                Margin="4 0 0 0"
-                                HorizontalAlignment="Left">
-                                <TextureButton
-                                    Name="RightArmButton"
-                                    MinSize="15 25"
-                                    StyleClasses="TargetDollButtonRightArm"
-                                    VerticalAlignment="Top">
-                                </TextureButton>
-                                <TextureButton
-                                    Name="RightHandButton"
-                                    MinSize="15 15"
-                                    VerticalAlignment="Bottom"
-                                    StyleClasses="TargetDollButtonRightHand">
-                                </TextureButton>
-                            </PanelContainer>
-                            <PanelContainer
-                                SetSize="43 75"
-                                Margin="0 0 0 0"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center">
-                                <TextureButton
-                                    Name="HeadButton"
-                                    MinSize="28 23"
-                                    VerticalAlignment="Top"
-                                    HorizontalAlignment="Center"
-                                    StyleClasses="TargetDollButtonHead">
-                                    <!--<PanelContainer
-                            SetSize="15 15"
-                            Margin="0 9 0 0"
-                            HorizontalAlignment="Center">
-                            <TextureButton
-                                Name="EyesButton"
-                                MinSize="15 9"
-                                VerticalAlignment="Top"
-                                StyleClasses="TargetDollButtonEyes">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/eyes.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="15 9"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="MouthButton"
-                                SetSize="9 6"
-                                VerticalAlignment="Bottom"
-                                StyleClasses="TargetDollButtonMouth">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/mouth.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="9 6"/>
-                            </TextureButton>
-                        </PanelContainer>-->
-                                </TextureButton>
-                                <TextureButton
-                                    Name="ChestButton"
-                                    SetSize="28 30"
-                                    Margin="0 18 0 0"
-                                    VerticalAlignment="Top"
-                                    HorizontalAlignment="Center"
-                                    StyleClasses="TargetDollButtonChest">
-                                </TextureButton>
-                                <PanelContainer
-                                    MinSize="38 35"
-                                    VerticalAlignment="Bottom"
-                                    HorizontalAlignment="Center">
-                                    <TextureButton
-                                        Name="GroinButton"
-                                        MinSize="28 15"
-                                        VerticalAlignment="Top"
-                                        HorizontalAlignment="Center"
-                                        StyleClasses="TargetDollButtonGroin">
-                                    </TextureButton>
-                                    <PanelContainer
-                                        MinSize="20 30"
-                                        VerticalAlignment="Bottom"
-                                        HorizontalAlignment="Right">
-                                        <TextureButton
-                                            Name="LeftLegButton"
-                                            MinSize="15 28"
-                                            VerticalAlignment="Top"
-                                            HorizontalAlignment="Left"
-                                            StyleClasses="TargetDollButtonLeftLeg">
-                                        </TextureButton>
-                                        <TextureButton
-                                            Name="LeftFootButton"
-                                            MinSize="20 10"
-                                            VerticalAlignment="Bottom"
-                                            StyleClasses="TargetDollButtonLeftFoot">
-                                        </TextureButton>
-                                    </PanelContainer>
-                                    <PanelContainer
-                                        MinSize="20 30"
-                                        VerticalAlignment="Bottom"
-                                        HorizontalAlignment="Left">
-                                        <TextureButton
-                                            Name="RightLegButton"
-                                            MinSize="15 28"
-                                            VerticalAlignment="Top"
-                                            HorizontalAlignment="Right"
-                                            StyleClasses="TargetDollButtonRightLeg">
-                                        </TextureButton>
-                                        <TextureButton
-                                            Name="RightFootButton"
-                                            MinSize="20 10"
-                                            VerticalAlignment="Bottom"
-                                            HorizontalAlignment="Center"
-                                            StyleClasses="TargetDollButtonRightFoot">
-                                        </TextureButton>
-                                    </PanelContainer>
-                                </PanelContainer>
-                            </PanelContainer>
-                            <PanelContainer
-                                SetSize="15 33"
-                                Margin="0 0 4 0"
-                                HorizontalAlignment="Right">
-                                <TextureButton
-                                    Name="LeftArmButton"
-                                    MinSize="15 25"
-                                    StyleClasses="TargetDollButtonLeftArm"
-                                    VerticalAlignment="Top">
-                                </TextureButton>
-                                <TextureButton
-                                    Name="LeftHandButton"
-                                    MinSize="15 15"
-                                    VerticalAlignment="Bottom"
-                                    StyleClasses="TargetDollButtonLeftHand">
-                                </TextureButton>
-                            </PanelContainer>
-                        </PanelContainer>
-                    </PanelContainer>
-                    <TextureRect Name="NoDataTex"
-                                 Access="Public"
-                                 SetSize="96 96"
-                                 Visible="false"
-                                 Stretch="KeepAspectCentered"
-                                 TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/> <!-- DeltaV - Size changed to 96 96 to be consistent with shitmed -->
-                    <BoxContainer Margin="5 0 0 0"
-                                  Orientation="Vertical"
-                                  VerticalAlignment="Top">
-                        <RichTextLabel Name="NameLabel"
-                                       SetWidth="150"/>
-                        <Label Name="SpeciesLabel"
-                               VerticalAlignment="Top"
-                               StyleClasses="LabelSubText"/>
-                        <Label Name="PartNameLabel"
-                               VerticalAlignment="Bottom"
-                               StyleClasses="LabelSubText"/>
-                    </BoxContainer>
-                    <Label Margin="0 0 5 0"
-                           HorizontalExpand="True"
-                           HorizontalAlignment="Right"
-                           VerticalExpand="True"
-                           VerticalAlignment="Top"
-                           Name="ScanModeLabel"
-                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}"/>
-                </BoxContainer>
 
-                <PanelContainer StyleClasses="LowDivider"/>
-
-                <!-- Begin DeltaV - Medical Records -->
-                <BoxContainer Name="TriageControls" Orientation="Vertical">
-                    <BoxContainer Name="StatusBox"
-                                  Orientation="Horizontal"
-                                  HorizontalAlignment="Center"
-                                  Margin="0 8 0 0">
-                    </BoxContainer>
-
-                    <Button Name="ClaimButton"
-                            Text="{Loc 'health-analyzer-window-triage-claim'}"
-                            MinSize="60 0" />
-
-                    <PanelContainer StyleClasses="LowDivider" Margin="0 8 0 0"/>
-                </BoxContainer>
-                <!-- End DeltaV - Medical Records -->
-
-                <GridContainer Margin="0 5 0 0"
-                               Columns="2">
-                    <Label Text="{Loc 'health-analyzer-window-entity-status-text'}"/>
-                    <Label Name="StatusLabel"/>
-                    <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}"/>
-                    <Label Name="TemperatureLabel"/>
-                    <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}"/>
-                    <Label Name="BloodLabel"/>
-                    <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}"/>
-                    <Label Name="DamageLabel"/>
-                </GridContainer>
-            </BoxContainer>
-
-            <PanelContainer Name="AlertsDivider"
-                            Visible="False"
-                            StyleClasses="LowDivider"/>
-
-            <BoxContainer Name="AlertsContainer"
-                          Visible="False"
-                          Margin="0 5"
-                          Orientation="Vertical"
-                          HorizontalAlignment="Center">
-
-            </BoxContainer>
-
-            <PanelContainer StyleClasses="LowDivider"/>
-            <!-- Shitmed Change End -->
-
-            <BoxContainer
-                Name="GroupsContainer"
-                Margin="0 5 0 5"
-                Orientation="Vertical">
-            </BoxContainer>
-
-        </BoxContainer>
+        <ui:HealthAnalyzerControl
+            Name="HealthAnalyzer"
+            Access="Public" /> <!-- DeltaV / Shitmed Change - Make Public-->
     </ScrollContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
index 74c73a9006..6c0ed360b0 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -1,440 +1,20 @@
-using System.Linq;
-using System.Numerics;
-using Content.Client._DV.Traits.Assorted; // DeltaV
-using Content.Shared._DV.Traits.Assorted; // DeltaV
-using Content.Shared._DV.Medical; // DeltaV - Uncloneable
-using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
-using Content.Shared._DV.MedicalRecords; // DeltaV - Medical Records
-using Content.Shared._Shitmed.Targeting; // Shitmed
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.IdentityManagement;
 using Content.Shared.MedicalScanner;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
+namespace Content.Client.HealthAnalyzer.UI;
 
-namespace Content.Client.HealthAnalyzer.UI
+[GenerateTypedNameReferences]
+public sealed partial class HealthAnalyzerWindow : FancyWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class HealthAnalyzerWindow : FancyWindow
+    public HealthAnalyzerWindow()
     {
-        private readonly IEntityManager _entityManager;
-        private readonly SpriteSystem _spriteSystem;
-        private readonly IPrototypeManager _prototypes;
-        private readonly IResourceCache _cache;
-        private readonly UnborgableSystem _unborgable; // DeltaV
-        private readonly RedshirtSystem _redshirt; // DeltaV
-        private readonly UncloneableSystem _uncloneable; // DeltaV
+        RobustXamlLoader.Load(this);
+    }
 
-        // Shitmed Change Start
-        public event Action<TargetBodyPart?, EntityUid>? OnBodyPartSelected;
-        private EntityUid _spriteViewEntity;
-
-        [ValidatePrototypeId<EntityPrototype>]
-        private readonly EntProtoId _bodyView = "AlertSpriteView";
-
-        private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
-        private EntityUid? _target;
-        // Shitmed Change End
-
-        // Begin DeltaV - Medical Records
-        private readonly ButtonGroup _triageStatusGroup = new();
-        private readonly Dictionary<TriageStatus, Button> _triageControls = new();
-
-        public event Action<TriageStatus>? OnTriageStatusChanged;
-        public event Action? OnClaimPatient;
-        // End DeltaV - Medical Records
-
-        public HealthAnalyzerWindow()
-        {
-            RobustXamlLoader.Load(this);
-
-            var dependencies = IoCManager.Instance!;
-            _entityManager = dependencies.Resolve<IEntityManager>();
-            _spriteSystem = _entityManager.System<SpriteSystem>();
-            _prototypes = dependencies.Resolve<IPrototypeManager>();
-            _cache = dependencies.Resolve<IResourceCache>();
-            _unborgable = _entityManager.System<UnborgableSystem>(); // DeltaV
-            _redshirt = _entityManager.System<RedshirtSystem>(); // DeltaV
-            _uncloneable = _entityManager.System<UncloneableSystem>(); // DeltaV
-            // Shitmed Change Start
-            _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
-            {
-                { TargetBodyPart.Head, HeadButton },
-                { TargetBodyPart.Torso, ChestButton },
-                { TargetBodyPart.Groin, GroinButton },
-                { TargetBodyPart.LeftArm, LeftArmButton },
-                { TargetBodyPart.LeftHand, LeftHandButton },
-                { TargetBodyPart.RightArm, RightArmButton },
-                { TargetBodyPart.RightHand, RightHandButton },
-                { TargetBodyPart.LeftLeg, LeftLegButton },
-                { TargetBodyPart.LeftFoot, LeftFootButton },
-                { TargetBodyPart.RightLeg, RightLegButton },
-                { TargetBodyPart.RightFoot, RightFootButton },
-            };
-
-            foreach (var bodyPartButton in _bodyPartControls)
-            {
-                bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
-                bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key, bodyPartButton.Value);
-            }
-            ReturnButton.OnPressed += _ => ResetBodyPart();
-            // Shitmed Change End
-
-            // Begin DeltaV - Medical Records
-            foreach (var item in Enum.GetValues<TriageStatus>())
-            {
-                var btn = new Button();
-                var ftlKey = item.ToString();
-                btn.Group = _triageStatusGroup;
-                btn.Text = Loc.GetString($"health-analyzer-window-triage-status-{ftlKey}");
-                btn.ToolTip = Loc.GetString($"health-analyzer-window-triage-status-{ftlKey}.ToolTip");
-                btn.OnPressed += _ => OnTriageStatusChanged?.Invoke(item);
-                btn.AddStyleClass("ButtonSquare");
-                StatusBox.AddChild(btn);
-                _triageControls[item] = btn;
-            }
-            StatusBox.Children.First().AddStyleClass("OpenRight");
-            StatusBox.Children.First().RemoveStyleClass("ButtonSquare");
-            StatusBox.Children.Last().AddStyleClass("OpenLeft");
-            StatusBox.Children.Last().RemoveStyleClass("ButtonSquare");
-            ClaimButton.OnPressed += _ => OnClaimPatient?.Invoke();
-            // End DeltaV - Medical Records
-        }
-
-        // Shitmed Change Start
-        public void SetActiveBodyPart(TargetBodyPart part, TextureButton button)
-        {
-            if (_target == null)
-                return;
-
-            // Bit of the ole shitcode until we have Groins in the prototypes.
-            OnBodyPartSelected?.Invoke(part == TargetBodyPart.Groin ? TargetBodyPart.Torso : part, _target.Value);
-        }
-
-        public void ResetBodyPart()
-        {
-            if (_target == null)
-                return;
-
-            OnBodyPartSelected?.Invoke(null, _target.Value);
-        }
-
-        public void SetActiveButtons(bool isHumanoid)
-        {
-            foreach (var button in _bodyPartControls)
-                button.Value.Visible = isHumanoid;
-        }
-
-        // Not all of this function got messed with, but it was spread enough to warrant being covered entirely by a Shitmed Change
-        public void Populate(HealthAnalyzerScannedUserMessage msg)
-        {
-            // Start-Shitmed
-            _target = _entityManager.GetEntity(msg.TargetEntity);
-            EntityUid? part = msg.Part != null ? _entityManager.GetEntity(msg.Part.Value) : null;
-            var isPart = part != null;
-
-            if (_target == null
-                || !_entityManager.TryGetComponent<DamageableComponent>(isPart ? part : _target, out var damageable))
-            {
-                NoPatientDataText.Visible = true;
-                return;
-            }
-
-            SetActiveButtons(_entityManager.HasComponent<TargetingComponent>(_target.Value));
-
-            ReturnButton.Visible = isPart;
-            PartNameLabel.Visible = isPart;
-
-            if (part != null)
-                PartNameLabel.Text = _entityManager.HasComponent<MetaDataComponent>(part)
-                    ? Identity.Name(part.Value, _entityManager)
-                    : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
-
-            NoPatientDataText.Visible = false;
-
-            // Scan Mode
-
-            ScanModeLabel.Text = msg.ScanMode.HasValue
-                ? msg.ScanMode.Value
-                    ? Loc.GetString("health-analyzer-window-scan-mode-active")
-                    : Loc.GetString("health-analyzer-window-scan-mode-inactive")
-                : Loc.GetString("health-analyzer-window-entity-unknown-text");
-
-            ScanModeLabel.FontColorOverride = msg.ScanMode.HasValue && msg.ScanMode.Value ? Color.Green : Color.Red;
-
-            // Patient Information
-
-            SpriteView.SetEntity(SetupIcon(msg.Body) ?? _target.Value);
-            SpriteView.Visible = msg.ScanMode.HasValue && msg.ScanMode.Value;
-            PartView.Visible = SpriteView.Visible;
-            NoDataTex.Visible = !SpriteView.Visible;
-
-            var name = new FormattedMessage();
-            name.PushColor(Color.White);
-            name.AddText(_entityManager.HasComponent<MetaDataComponent>(_target.Value)
-                ? Identity.Name(_target.Value, _entityManager)
-                : Loc.GetString("health-analyzer-window-entity-unknown-text"));
-            NameLabel.SetMessage(name);
-
-            SpeciesLabel.Text =
-                _entityManager.TryGetComponent<HumanoidAppearanceComponent>(_target.Value,
-                    out var humanoidAppearanceComponent)
-                    ? Loc.GetString(_prototypes.Index<SpeciesPrototype>(humanoidAppearanceComponent.Species).Name)
-                    : Loc.GetString("health-analyzer-window-entity-unknown-species-text");
-
-            // Basic Diagnostic
-
-            TemperatureLabel.Text = !float.IsNaN(msg.Temperature)
-                ? $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)"
-                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
-
-            BloodLabel.Text = !float.IsNaN(msg.BloodLevel)
-                ? $"{msg.BloodLevel * 100:F1} %"
-                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
-
-            StatusLabel.Text =
-                _entityManager.TryGetComponent<MobStateComponent>(_target.Value, out var mobStateComponent)
-                    ? GetStatus(mobStateComponent.CurrentState)
-                    : Loc.GetString("health-analyzer-window-entity-unknown-text");
-
-            // Total Damage
-
-            DamageLabel.Text = damageable.TotalDamage.ToString();
-
-            // Alerts
-            // DeltaV traits - This is going to be horrid if we just keep adding things like this.
-            var unborgable = _unborgable.IsUnborgable(_target.Value);
-            var redshirt = _redshirt.IsRedshirt(_target.Value) && mobStateComponent?.CurrentState == MobState.Dead; // DeltaV - Redshirt
-            var uncloneable = _uncloneable.IsUncloneable(_target.Value) && mobStateComponent?.CurrentState == MobState.Dead; // DeltaV - Unclonable
-            // END DeltaV
-
-            var showAlerts = msg.Unrevivable == true || msg.Bleeding == true || unborgable || redshirt || uncloneable; // DeltaV
-
-            AlertsDivider.Visible = showAlerts;
-            AlertsContainer.Visible = showAlerts;
-
-            if (showAlerts)
-                AlertsContainer.RemoveAllChildren();
-
-            if (msg.Unrevivable == true)
-                AlertsContainer.AddChild(new RichTextLabel
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
-                });
-
-            if (msg.Bleeding == true)
-                AlertsContainer.AddChild(new RichTextLabel
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
-                });
-
-            if (unborgable) // DeltaV
-                AlertsContainer.AddChild(new RichTextLabel
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-unborgable-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
-                });
-
-            if (redshirt) // DeltaV
-                AlertsContainer.AddChild(new RichTextLabel
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-redshirt-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
-                });
-
-            if (uncloneable) // DeltaV - Uncloneable
-                AlertsContainer.AddChild(new RichTextLabel
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-uncloneable-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
-                });
-
-            // Damage Groups
-
-            var damageSortedGroups =
-                damageable.DamagePerGroup.OrderByDescending(damage => damage.Value)
-                    .ToDictionary(x => x.Key, x => x.Value);
-
-            IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
-
-            DrawDiagnosticGroups(damageSortedGroups, damagePerType);
-
-            // Begin DeltaV - Medical Records
-            if (msg.MedicalRecord is not {} records)
-            {
-                TriageControls.Visible = false;
-                return;
-            }
-
-            TriageControls.Visible = true;
-            _triageControls[records.Status].Pressed = true;
-
-            // Update claim button based on claimed status
-            if (records.ClaimedName != null)
-            {
-                ClaimButton.Text = Loc.GetString("health-analyzer-window-triage-unclaim", ("claimedBy", records.ClaimedName));
-            }
-            else
-            {
-                ClaimButton.Text = Loc.GetString("health-analyzer-window-triage-claim");
-            }
-            // End DeltaV - Medical Records
-        }
-        // Shitmed Change End
-        private static string GetStatus(MobState mobState)
-        {
-            return mobState switch
-            {
-                MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"),
-                MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"),
-                MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"),
-                _ => Loc.GetString("health-analyzer-window-entity-unknown-text"),
-            };
-        }
-
-        private void DrawDiagnosticGroups(
-            Dictionary<string, FixedPoint2> groups,
-            IReadOnlyDictionary<string, FixedPoint2> damageDict)
-        {
-            GroupsContainer.RemoveAllChildren();
-
-            foreach (var (damageGroupId, damageAmount) in groups)
-            {
-                if (damageAmount == 0)
-                    continue;
-
-                var groupTitleText = $"{Loc.GetString(
-                    "health-analyzer-window-damage-group-text",
-                    ("damageGroup", _prototypes.Index<DamageGroupPrototype>(damageGroupId).LocalizedName),
-                    ("amount", damageAmount)
-                )}";
-
-                var groupContainer = new BoxContainer
-                {
-                    Align = BoxContainer.AlignMode.Begin,
-                    Orientation = BoxContainer.LayoutOrientation.Vertical,
-                };
-
-                groupContainer.AddChild(CreateDiagnosticGroupTitle(groupTitleText, damageGroupId));
-
-                GroupsContainer.AddChild(groupContainer);
-
-                // Show the damage for each type in that group.
-                var group = _prototypes.Index<DamageGroupPrototype>(damageGroupId);
-
-                foreach (var type in group.DamageTypes)
-                {
-                    if (!damageDict.TryGetValue(type, out var typeAmount) || typeAmount <= 0)
-                        continue;
-
-                    var damageString = Loc.GetString(
-                        "health-analyzer-window-damage-type-text",
-                        ("damageType", _prototypes.Index<DamageTypePrototype>(type).LocalizedName),
-                        ("amount", typeAmount)
-                    );
-
-                    groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, " · ")));
-                }
-            }
-        }
-
-        private Texture GetTexture(string texture)
-        {
-            var rsiPath = new ResPath("/Textures/Objects/Devices/health_analyzer.rsi");
-            var rsiSprite = new SpriteSpecifier.Rsi(rsiPath, texture);
-
-            var rsi = _cache.GetResource<RSIResource>(rsiSprite.RsiPath).RSI;
-            if (!rsi.TryGetState(rsiSprite.RsiState, out var state))
-            {
-                rsiSprite = new SpriteSpecifier.Rsi(rsiPath, "unknown");
-            }
-
-            return _spriteSystem.Frame0(rsiSprite);
-        }
-
-        private static Label CreateDiagnosticItemLabel(string text)
-        {
-            return new Label
-            {
-                Text = text,
-            };
-        }
-
-        private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
-        {
-            var rootContainer = new BoxContainer
-            {
-                Margin = new Thickness(0, 6, 0, 0),
-                VerticalAlignment = VAlignment.Bottom,
-                Orientation = BoxContainer.LayoutOrientation.Horizontal,
-            };
-
-            rootContainer.AddChild(new TextureRect
-            {
-                SetSize = new Vector2(30, 30),
-                Texture = GetTexture(id.ToLower())
-            });
-
-            rootContainer.AddChild(CreateDiagnosticItemLabel(text));
-
-            return rootContainer;
-        }
-
-        // Shitmed Change Start
-        /// <summary>
-        /// Sets up the Body Doll using Alert Entity to use in Health Analyzer.
-        /// </summary>
-        private EntityUid? SetupIcon(Dictionary<TargetBodyPart, TargetIntegrity>? body)
-        {
-            if (body is null)
-                return null;
-
-            if (!_entityManager.Deleted(_spriteViewEntity))
-                _entityManager.QueueDeleteEntity(_spriteViewEntity);
-
-            _spriteViewEntity = _entityManager.Spawn(_bodyView);
-
-            if (!_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
-                return null;
-
-            int layer = 0;
-            foreach (var (bodyPart, integrity) in body)
-            {
-                // TODO: PartStatusUIController and make it use layers instead of TextureRects when EE refactors alerts.
-                string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
-                int enumValue = (int) integrity;
-                var rsi = new SpriteSpecifier.Rsi(new ResPath($"/Textures/_Shitmed/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
-                // Shitcode with love from Russia :)
-                if (!_spriteSystem.TryGetLayer(_spriteViewEntity, layer, out _, false))
-                    _spriteSystem.AddTextureLayer(_spriteViewEntity, _spriteSystem.Frame0(rsi));
-                else
-                    _spriteSystem.LayerSetTexture(_spriteViewEntity, layer, _spriteSystem.Frame0(rsi));
-                _spriteSystem.LayerSetScale(_spriteViewEntity, layer, new Vector2(3f, 3f));
-                layer++;
-            }
-            return _spriteViewEntity;
-        }
-        // Shitmed Change End
+    public void Populate(HealthAnalyzerScannedUserMessage msg)
+    {
+        HealthAnalyzer.Populate(msg.State);
     }
 }
diff --git a/Content.Client/Medical/Cryogenics/BeakerBarChart.cs b/Content.Client/Medical/Cryogenics/BeakerBarChart.cs
new file mode 100644
index 0000000000..25301b5268
--- /dev/null
+++ b/Content.Client/Medical/Cryogenics/BeakerBarChart.cs
@@ -0,0 +1,285 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+// ReSharper disable CompareOfFloatsByEqualityOperator
+
+namespace Content.Client.Medical.Cryogenics;
+
+
+public sealed class BeakerBarChart : Control
+{
+    private sealed class Entry
+    {
+        public float WidthFraction;  // This entry's width as a fraction of the chart's total width (between 0 and 1)
+        public float TargetAmount;
+        public string Uid; // This UID is used to track entries between frames, for animation.
+        public string? Tooltip;
+        public Color Color;
+        public Label Label;
+
+        public Entry(string uid, Label label)
+        {
+            Uid = uid;
+            Label = label;
+        }
+    }
+
+    public float Capacity = 50;
+
+    public Color NotchColor = new(1, 1, 1, 0.25f);
+    public Color BackgroundColor = new(0.1f, 0.1f, 0.1f);
+
+    public int MediumNotchInterval = 5;
+    public int BigNotchInterval = 10;
+
+    // When we have a very large beaker (i.e. bluespace beaker) we might need to increase the distance between notches.
+    // The distance between notches is increased by ScaleMultiplier when the distance between notches is less than
+    // MinSmallNotchScreenDistance in UI units.
+    public int MinSmallNotchScreenDistance = 2;
+    public int ScaleMultiplier = 10;
+
+    public float SmallNotchHeight = 0.1f;
+    public float MediumNotchHeight = 0.25f;
+    public float BigNotchHeight = 1f;
+
+    // We don't animate new entries until this control has been drawn at least once.
+    private bool _hasBeenDrawn = false;
+
+    // This is used to keep the segments of the chart in the same order as the SetEntry calls.
+    // For example: In update 1 we might get cryox, alox, bic (in that order), and in update 2 we get alox, cryox, bic.
+    // To keep the order of the entries the same as the order of the SetEntry calls, we let the old cryox entry
+    // disappear and create a new cryox entry behind the alox entry.
+    private int _nextUpdateableEntry = 0;
+
+    private readonly List<Entry> _entries = new();
+
+
+    public BeakerBarChart()
+    {
+        MouseFilter = MouseFilterMode.Pass;
+        TooltipSupplier = SupplyTooltip;
+    }
+
+    public void Clear()
+    {
+        foreach (var entry in _entries)
+        {
+            entry.TargetAmount = 0;
+        }
+
+        _nextUpdateableEntry = 0;
+    }
+
+    /// <summary>
+    /// Either adds a new entry to the chart if the UID doesn't appear yet, or updates the amount of an existing entry.
+    /// </summary>
+    public void SetEntry(
+        string uid,
+        string label,
+        float amount,
+        Color color,
+        Color? textColor = null,
+        string? tooltip = null)
+    {
+        // If we can find an old entry we're allowed to update, update that one.
+        if (TryFindUpdateableEntry(uid, out var index))
+        {
+            _entries[index].TargetAmount = amount;
+            _entries[index].Tooltip = tooltip;
+            _entries[index].Label.Text = label;
+            _nextUpdateableEntry = index + 1;
+            return;
+        }
+
+        // Otherwise create a new entry.
+        if (amount <= 0)
+            return;
+
+        // If no text color is provided, use either white or black depending on how dark the background is.
+        textColor ??= (color.R + color.G + color.B < 1.5f ? Color.White : Color.Black);
+
+        var childLabel = new Label
+        {
+            Text = label,
+            ClipText = true,
+            FontColorOverride = textColor,
+            Margin = new Thickness(4, 0, 0, 0)
+        };
+        AddChild(childLabel);
+
+        _entries.Insert(
+            _nextUpdateableEntry,
+            new Entry(uid, childLabel)
+            {
+                WidthFraction = (_hasBeenDrawn ? 0 : amount / Capacity),
+                TargetAmount = amount,
+                Tooltip = tooltip,
+                Color = color
+            }
+        );
+
+        _nextUpdateableEntry += 1;
+    }
+
+    private bool TryFindUpdateableEntry(string uid, out int index)
+    {
+        for (int i = _nextUpdateableEntry; i < _entries.Count; i++)
+        {
+            if (_entries[i].Uid == uid)
+            {
+                index = i;
+                return true;
+            }
+        }
+
+        index = -1;
+        return false;
+    }
+
+    private IEnumerable<(Entry, float xMin, float xMax)> EntryRanges(float? pixelWidth = null)
+    {
+        float chartWidth = pixelWidth ?? PixelWidth;
+        var xStart = 0f;
+
+        foreach (var entry in _entries)
+        {
+            var entryWidth = entry.WidthFraction * chartWidth;
+            var xEnd = MathF.Min(xStart + entryWidth, chartWidth);
+
+            yield return (entry, xStart, xEnd);
+
+            xStart = xEnd;
+        }
+    }
+
+    private bool TryFindEntry(float x, [NotNullWhen(true)] out Entry? entry)
+    {
+        foreach (var (currentEntry, xMin, xMax) in EntryRanges())
+        {
+            if (xMin <= x && x < xMax)
+            {
+                entry = currentEntry;
+                return true;
+            }
+        }
+
+        entry = null;
+        return false;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        // Tween the amounts to their target amounts.
+        const float tweenInverseHalfLife = 8;  // Half life of tween is 1/n
+        var hasChanged = false;
+
+        foreach (var entry in _entries)
+        {
+            var targetWidthFraction = entry.TargetAmount / Capacity;
+
+            if (entry.WidthFraction == targetWidthFraction)
+                continue;
+
+            // Tween with lerp abuse interpolation
+            entry.WidthFraction = MathHelper.Lerp(
+                entry.WidthFraction,
+                targetWidthFraction,
+                MathHelper.Clamp01(tweenInverseHalfLife * args.DeltaSeconds)
+            );
+            hasChanged = true;
+
+            if (MathF.Abs(entry.WidthFraction - targetWidthFraction) < 0.0001f)
+                entry.WidthFraction = targetWidthFraction;
+        }
+
+        if (!hasChanged)
+            return;
+
+        InvalidateArrange();
+
+        // Remove old entries whose animations have finished.
+        foreach (var entry in _entries)
+        {
+            if (entry.WidthFraction == 0 && entry.TargetAmount == 0)
+                RemoveChild(entry.Label);
+        }
+
+        _entries.RemoveAll(entry => entry.WidthFraction == 0 && entry.TargetAmount == 0);
+    }
+
+    protected override void MouseMove(GUIMouseMoveEventArgs args)
+    {
+        HideTooltip();
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        handle.DrawRect(PixelSizeBox, BackgroundColor);
+
+        // Draw the entry backgrounds
+        foreach (var (entry, xMin, xMax) in EntryRanges())
+        {
+            if (xMin != xMax)
+                handle.DrawRect(new(xMin, 0, xMax, PixelHeight), entry.Color);
+        }
+
+        // Draw notches
+        var unitWidth = PixelWidth / Capacity;
+        var unitsPerNotch = 1;
+
+        while (unitWidth < MinSmallNotchScreenDistance)
+        {
+            // This is here for 1000u bluespace beakers. If the distance between small notches is so small that it would
+            // be very ugly, we reduce the amount of notches by ScaleMultiplier (currently a factor of 10).
+            // (I could use an analytical algorithm here, but it would be more difficult to read with pretty much no
+            //  performance benefit, since it loops zero times normally and one time for the bluespace beaker)
+            unitWidth *= ScaleMultiplier;
+            unitsPerNotch *= ScaleMultiplier;
+        }
+
+        for (int i = 0; i <= Capacity / unitsPerNotch; i++)
+        {
+            var x = i * unitWidth;
+            var height = (i % BigNotchInterval    == 0 ? BigNotchHeight :
+                          i % MediumNotchInterval == 0 ? MediumNotchHeight :
+                                                         SmallNotchHeight) * PixelHeight;
+            var start = new Vector2(x, PixelHeight);
+            var end = new Vector2(x, PixelHeight - height);
+            handle.DrawLine(start, end, NotchColor);
+        }
+
+        _hasBeenDrawn = true;
+    }
+
+    protected override Vector2 ArrangeOverride(Vector2 finalSize)
+    {
+        foreach (var (entry, xMin, xMax) in EntryRanges(finalSize.X))
+        {
+            entry.Label.Arrange(new((int)xMin, 0, (int)xMax, (int)finalSize.Y));
+        }
+
+        return finalSize;
+    }
+
+    private Control? SupplyTooltip(Control sender)
+    {
+        var globalMousePos = UserInterfaceManager.MousePositionScaled.Position;
+        var mousePos = globalMousePos - GlobalPosition;
+
+        if (!TryFindEntry(mousePos.X, out var entry) || entry.Tooltip == null)
+            return null;
+
+        var msg = new FormattedMessage();
+        msg.AddText(entry.Tooltip);
+
+        var tooltip = new Tooltip();
+        tooltip.SetMessage(msg);
+        return tooltip;
+    }
+}
diff --git a/Content.Client/Medical/Cryogenics/CryoPodBoundUserInterface.cs b/Content.Client/Medical/Cryogenics/CryoPodBoundUserInterface.cs
new file mode 100644
index 0000000000..5e64cea720
--- /dev/null
+++ b/Content.Client/Medical/Cryogenics/CryoPodBoundUserInterface.cs
@@ -0,0 +1,53 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Medical.Cryogenics;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+namespace Content.Client.Medical.Cryogenics;
+
+[UsedImplicitly]
+public sealed class CryoPodBoundUserInterface : BoundUserInterface
+{
+    private CryoPodWindow? _window;
+
+    public CryoPodBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+        _window = this.CreateWindowCenteredLeft<CryoPodWindow>();
+        _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+        _window.OnEjectPatientPressed += EjectPatientPressed;
+        _window.OnEjectBeakerPressed += EjectBeakerPressed;
+        _window.OnInjectPressed += InjectPressed;
+    }
+
+    private void EjectPatientPressed()
+    {
+        var isLocked =
+            EntMan.TryGetComponent<CryoPodComponent>(Owner, out var cryoComp)
+            && cryoComp.Locked;
+
+        _window?.SetEjectErrorVisible(isLocked);
+        SendMessage(new CryoPodSimpleUiMessage(CryoPodSimpleUiMessage.MessageType.EjectPatient));
+    }
+
+    private void EjectBeakerPressed()
+    {
+        SendMessage(new CryoPodSimpleUiMessage(CryoPodSimpleUiMessage.MessageType.EjectBeaker));
+    }
+
+    private void InjectPressed(FixedPoint2 transferAmount)
+    {
+        SendMessage(new CryoPodInjectUiMessage(transferAmount));
+    }
+
+    protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+    {
+        if (_window != null && message is CryoPodUserMessage cryoMsg)
+        {
+            _window.Populate(cryoMsg);
+        }
+    }
+}
diff --git a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
index c1cbfc573e..63c95a63d8 100644
--- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
@@ -6,7 +6,6 @@ namespace Content.Client.Medical.Cryogenics;
 
 public sealed class CryoPodSystem : SharedCryoPodSystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
@@ -46,8 +45,8 @@ public sealed class CryoPodSystem : SharedCryoPodSystem
             return;
         }
 
-        if (!_appearance.TryGetData<bool>(uid, CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
-            || !_appearance.TryGetData<bool>(uid, CryoPodVisuals.IsOn, out var isOn, args.Component))
+        if (!Appearance.TryGetData<bool>(uid, CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
+            || !Appearance.TryGetData<bool>(uid, CryoPodVisuals.IsOn, out var isOn, args.Component))
         {
             return;
         }
@@ -64,6 +63,11 @@ public sealed class CryoPodSystem : SharedCryoPodSystem
             _sprite.LayerSetVisible((uid, args.Sprite), CryoPodVisualLayers.Cover, true);
         }
     }
+
+    protected override void UpdateUi(Entity<CryoPodComponent> cryoPod)
+    {
+        // Atmos and health scanner aren't predicted currently...
+    }
 }
 
 public enum CryoPodVisualLayers : byte
diff --git a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml
new file mode 100644
index 0000000000..9bea37d582
--- /dev/null
+++ b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml
@@ -0,0 +1,232 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+               xmlns:health="clr-namespace:Content.Client.HealthAnalyzer.UI"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+               xmlns:cryogenics="clr-namespace:Content.Client.Medical.Cryogenics"
+               MinSize="250 300"
+               Resizable="False">
+
+    <Label Name="LoadingPlaceHolder"
+           Text="{Loc 'cryo-pod-window-loading'}"
+           Align="Center"
+           HorizontalExpand="True"
+           VerticalExpand="True"/>
+
+    <BoxContainer Name="Sections"
+                  Orientation="Horizontal"
+                  Visible="False"
+                  Margin="10"
+                  SeparationOverride="16">
+        <BoxContainer Name="CryoSection"
+                      VerticalExpand="True"
+                      Orientation="Vertical"
+                      MinWidth="250"
+                      MaxWidth="250">
+
+            <!-- Flavor text -->
+            <BoxContainer Orientation="Horizontal"
+                          SeparationOverride="10"
+                          Margin="8 0 0 8">
+                <TextureRect StyleClasses="NTLogoDark"
+                             VerticalExpand="True"
+                             Stretch="KeepAspectCentered"
+                             SetSize="32 32"/>
+                <BoxContainer Orientation="Vertical"
+                              SeparationOverride="-4">
+                    <Label Text="{Loc 'cryo-pod-window-product-name'}"
+                           StyleClasses="FontLarge"/>
+                    <Label Text="{Loc 'cryo-pod-window-product-subtitle'}"
+                           StyleClasses="LabelSubText"/>
+
+                </BoxContainer>
+            </BoxContainer>
+
+            <!-- Atmos info -->
+            <BoxContainer Orientation="Horizontal"
+                          SeparationOverride="20"
+                          Margin="0 0 0 4">
+                <!-- Pressure -->
+                <BoxContainer Orientation="Vertical">
+                    <Label Text="{Loc 'gas-analyzer-window-pressure-text'}"
+                           StyleClasses="LabelSubText"/>
+                    <Label Name="Pressure"/>
+                </BoxContainer>
+
+                <!-- Temperature -->
+                <BoxContainer Orientation="Vertical">
+                    <Label Text="{Loc 'gas-analyzer-window-temperature-text'}"
+                           StyleClasses="LabelSubText"/>
+                    <Label Name="Temperature"/>
+                </BoxContainer>
+            </BoxContainer>
+
+            <!-- Gas mix -->
+            <Control Margin="0 0 0 22">
+                <controls:SplitBar Name="GasMixChart"
+                                   MinHeight="8"
+                                   MaxHeight="8"/>
+            </Control>
+
+            <!-- Warnings & status -->
+            <BoxContainer Orientation="Vertical"
+                          HorizontalExpand="True"
+                          VerticalExpand="True"
+                          Align="Center"
+                          Margin="0 0 0 14"
+                          SeparationOverride="20">
+
+                <!-- Ejection error (if the pod is locked) -->
+                <PanelContainer Name="EjectError"
+                                Visible="False"
+                                HorizontalExpand="True">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat BorderThickness="1" BorderColor="orange"/>
+                    </PanelContainer.PanelOverride>
+
+                    <BoxContainer Orientation="Vertical"
+                                  Margin="6">
+                        <Label Text="{Loc 'cryo-pod-window-error-header'}"
+                               FontColorOverride="orange"
+                               Align="Center"/>
+                        <RichTextLabel Text="{Loc 'cryo-pod-window-eject-error'}"/>
+                    </BoxContainer>
+                </PanelContainer>
+
+                <!-- Pressure warning -->
+                <PanelContainer Name="LowPressureWarning"
+                                Visible="False"
+                                HorizontalExpand="True">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat BorderThickness="1" BorderColor="orange"/>
+                    </PanelContainer.PanelOverride>
+
+                    <BoxContainer Orientation="Vertical"
+                                  Margin="6">
+                        <Label Text="{Loc 'cryo-pod-window-warning-header'}"
+                               FontColorOverride="orange"
+                               Align="Center"/>
+                        <RichTextLabel Text="{Loc 'cryo-pod-window-low-pressure-warning'}"/>
+                    </BoxContainer>
+                </PanelContainer>
+
+                <!-- Temperature warning -->
+                <PanelContainer Name="HighTemperatureWarning"
+                                Visible="False"
+                                HorizontalExpand="True">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat BorderThickness="1" BorderColor="orange"/>
+                    </PanelContainer.PanelOverride>
+
+                    <BoxContainer Orientation="Vertical"
+                                  Margin="6">
+                        <Label Text="{Loc 'cryo-pod-window-warning-header'}"
+                               FontColorOverride="orange"
+                               Align="Center"/>
+                        <!-- Note: This placeholder text should never be visible. -->
+                        <RichTextLabel Name="HighTemperatureWarningText"
+                                       Text="Temperature too high."/>
+                    </BoxContainer>
+                </PanelContainer>
+
+                <!-- Status checklist -->
+                <BoxContainer Orientation="Vertical">
+
+                    <BoxContainer Orientation="Horizontal"
+                                  SeparationOverride="8">
+                        <Label Text="{Loc 'cryo-pod-window-status'}"/>
+                        <Label Name="StatusLabel"
+                               Text="{Loc 'cryo-pod-window-status-not-ready'}"
+                               FontColorOverride="Orange"/>
+                    </BoxContainer>
+
+                    <GridContainer Columns="2"
+                                   HSeparationOverride="0"
+                                   VSeparationOverride="6"
+                                   Margin="6 3 0 0">
+                        <Label Text="⋄"
+                               StyleClasses="LabelSubText"/>
+                        <Label Name="PressureCheck"
+                               Text="{Loc 'cryo-pod-window-checklist-pressure'}"
+                               StyleClasses="LabelSubText"/>
+                        <Label Text="⋄"
+                               StyleClasses="LabelSubText"/>
+                        <Label Name="ChemicalsCheck"
+                               Text="{Loc 'cryo-pod-window-checklist-chemicals'}"
+                               StyleClasses="LabelSubText"
+                               FontColorOverride="Orange"/>
+                        <Label Text="⋄"
+                               StyleClasses="LabelSubText"/>
+                        <Label Name="TemperatureCheck"
+                               Text="{Loc 'cryo-pod-window-checklist-temperature'}"
+                               StyleClasses="LabelSubText"/>
+                    </GridContainer>
+
+                </BoxContainer>
+
+            </BoxContainer>
+
+            <!-- Reagents -->
+            <Control HorizontalExpand="True"
+                     MinHeight="30">
+                <Label Name="NoBeakerText"
+                       Text="{Loc 'cryo-pod-window-chems-no-beaker'}"
+                       FontColorOverride="Gray"
+                       VerticalExpand="True"
+                       VAlign="Center"/>
+                <cryogenics:BeakerBarChart Name="ChemicalsChart"
+                                  HorizontalExpand="True"
+                                  VerticalExpand="True"/>
+            </Control>
+
+            <!-- Buttons -->
+            <BoxContainer Orientation="Vertical"
+                          Margin="-2 2 -2 0">
+                <BoxContainer Orientation="Horizontal">
+                    <Button Name="Inject1"
+                            Text="{Loc 'cryo-pod-window-inject-1u'}"
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenBoth"/>
+                    <Button Name="Inject5"
+                            Text="{Loc 'cryo-pod-window-inject-5u'}"
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenBoth"/>
+                    <Button Name="Inject10"
+                            Text="{Loc 'cryo-pod-window-inject-10u'}"
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenBoth"/>
+                    <Button Name="Inject20"
+                            Text="{Loc 'cryo-pod-window-inject-20u'}"
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenBoth"/>
+                    <Button Name="EjectBeakerButton"
+                            Text="{Loc 'cryo-pod-window-eject-beaker'}"
+                            Disabled="True"
+                            StyleClasses="OpenBoth"/>
+                </BoxContainer>
+                <Button Name="EjectPatientButton"
+                        Text="{Loc 'cryo-pod-window-eject-patient'}"
+                        Disabled="True"
+                        HorizontalExpand="True"
+                        StyleClasses="OpenRight"/>
+            </BoxContainer>
+
+        </BoxContainer>
+        <BoxContainer Name="HealthSection"
+                      VerticalExpand="True"
+                      Orientation="Vertical">
+
+            <health:HealthAnalyzerControl Name="HealthAnalyzer"/>
+
+            <!-- This label is used to deal with a stray hline at the end of the health analyzer UI -->
+            <Label Name="NoDamageText"
+                   Text="{Loc 'cryo-pod-window-health-no-damage'}"
+                   FontColorOverride="DeepSkyBlue"/>
+            <Control VerticalExpand="True"/>
+
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs
new file mode 100644
index 0000000000..ad5ab9d9ea
--- /dev/null
+++ b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs
@@ -0,0 +1,260 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Damage.Components;
+using Content.Shared.EntityConditions.Conditions;
+using Content.Shared.FixedPoint;
+using Content.Shared.Medical.Cryogenics;
+using Content.Shared.Temperature;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+namespace Content.Client.Medical.Cryogenics;
+
+[GenerateTypedNameReferences]
+public sealed partial class CryoPodWindow : FancyWindow
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public event Action? OnEjectPatientPressed;
+    public event Action? OnEjectBeakerPressed;
+    public event Action<FixedPoint2>? OnInjectPressed;
+
+    public CryoPodWindow()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+        EjectPatientButton.OnPressed += _ => OnEjectPatientPressed?.Invoke();
+        EjectBeakerButton.OnPressed += _ => OnEjectBeakerPressed?.Invoke();
+        Inject1.OnPressed += _ => OnInjectPressed?.Invoke(1);
+        Inject5.OnPressed += _ => OnInjectPressed?.Invoke(5);
+        Inject10.OnPressed += _ => OnInjectPressed?.Invoke(10);
+        Inject20.OnPressed += _ => OnInjectPressed?.Invoke(20);
+    }
+
+    public void Populate(CryoPodUserMessage msg)
+    {
+        // Loading screen
+        if (LoadingPlaceHolder.Visible)
+        {
+            LoadingPlaceHolder.Visible = false;
+            Sections.Visible = true;
+        }
+
+        // Atmosphere
+        var hasCorrectPressure = (msg.GasMix.Pressure > Atmospherics.WarningLowPressure);
+        var hasGas = (msg.GasMix.Pressure > Atmospherics.GasMinMoles);
+        var showsPressureWarning = !hasCorrectPressure;
+        LowPressureWarning.Visible = showsPressureWarning;
+        Pressure.Text = Loc.GetString("gas-analyzer-window-pressure-val-text",
+                                      ("pressure", $"{msg.GasMix.Pressure:0.00}"));
+        Temperature.Text = Loc.GetString("generic-not-available-shorthand");
+
+        if (hasGas)
+        {
+            var celsius = TemperatureHelpers.KelvinToCelsius(msg.GasMix.Temperature);
+            Temperature.Text = Loc.GetString("gas-analyzer-window-temperature-val-text",
+                                             ("tempK", $"{msg.GasMix.Temperature:0.0}"),
+                                             ("tempC", $"{celsius:0.0}"));
+        }
+
+        // Gas mix segmented bar chart
+        GasMixChart.Clear();
+        GasMixChart.Visible = hasGas;
+
+        if (msg.GasMix.Gases != null)
+        {
+            var totalGasAmount = msg.GasMix.Gases.Sum(gas => gas.Amount);
+
+            foreach (var gas in msg.GasMix.Gases)
+            {
+                var color = Color.FromHex($"#{gas.Color}", Color.White);
+                var percent = gas.Amount / totalGasAmount * 100;
+                var localizedName = Loc.GetString(gas.Name);
+                var tooltip = Loc.GetString("gas-analyzer-window-molarity-percentage-text",
+                                            ("gasName", localizedName),
+                                            ("amount", $"{gas.Amount:0.##}"),
+                                            ("percentage", $"{percent:0.#}"));
+                GasMixChart.AddEntry(gas.Amount, color, tooltip: tooltip);
+            }
+        }
+
+        // Health analyzer
+        var maybePatient = _entityManager.GetEntity(msg.Health.TargetEntity);
+        var hasPatient = msg.Health.TargetEntity.HasValue;
+        var hasDamage = (hasPatient
+             && _entityManager.TryGetComponent(maybePatient, out DamageableComponent? damageable)
+             && damageable.TotalDamage > 0);
+
+        NoDamageText.Visible = (hasPatient && !hasDamage);
+        HealthSection.Visible = hasPatient;
+        EjectPatientButton.Disabled = !hasPatient;
+
+        if (hasPatient)
+            HealthAnalyzer.Populate(msg.Health);
+
+        // Reagents
+        float? lowestTempRequirement = null;
+        ReagentId? lowestTempReagent = null;
+        var totalBeakerCapacity = msg.BeakerCapacity ?? 0;
+        var availableQuantity = new FixedPoint2();
+        var injectingQuantity =
+            msg.Injecting?.Aggregate(new FixedPoint2(), (sum, r) => sum + r.Quantity)
+            ?? new FixedPoint2(); // Either the sum of the reagent quantities in `msg.Injecting` or zero.
+        var hasBeaker = (msg.Beaker != null);
+
+        ChemicalsChart.Clear();
+        ChemicalsChart.Capacity = (totalBeakerCapacity < 1 ? 50 : (int)totalBeakerCapacity);
+
+        var chartMaxChemsQuantity = ChemicalsChart.Capacity - injectingQuantity; // Ensure space for injection buffer
+
+        if (hasBeaker)
+        {
+            foreach (var (reagent, quantity) in msg.Beaker!)
+            {
+                availableQuantity += quantity;
+
+                // Make sure we don't add too many chemicals to the chart, so that there's still enough space to
+                // visualize the injection buffer.
+                var chemsQuantityOvershoot = FixedPoint2.Max(0, availableQuantity - chartMaxChemsQuantity);
+                var chartQuantity = FixedPoint2.Max(0, quantity - chemsQuantityOvershoot);
+
+                var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
+                ChemicalsChart.SetEntry(
+                    reagent.Prototype,
+                    reagentProto.LocalizedName,
+                    (float)chartQuantity,
+                    reagentProto.SubstanceColor,
+                    tooltip: $"{quantity}u {reagentProto.LocalizedName}"
+                );
+
+                var temp = TryFindMaxTemperatureRequirement(reagent);
+                if (lowestTempRequirement == null
+                    || temp < lowestTempRequirement)
+                {
+                    lowestTempRequirement = temp;
+                    lowestTempReagent = reagent;
+                }
+            }
+        }
+
+        if (injectingQuantity != 0)
+        {
+            var injectingText = (injectingQuantity > 1 ? $"{injectingQuantity}u" : "");
+            ChemicalsChart.SetEntry(
+                "injecting",
+                injectingText,
+                (float)injectingQuantity,
+                Color.MediumSpringGreen,
+                tooltip: Loc.GetString("cryo-pod-window-chems-injecting-tooltip",
+                                       ("quantity", injectingQuantity))
+            );
+        }
+
+        var isBeakerEmpty = (injectingQuantity + availableQuantity == 0);
+        var isChemicalsChartVisible = (hasBeaker || injectingQuantity != 0);
+        NoBeakerText.Visible = !isChemicalsChartVisible;
+        ChemicalsChart.Visible = isChemicalsChartVisible;
+        Inject1.Disabled = (!hasPatient || availableQuantity < 0.1f);
+        Inject5.Disabled = (!hasPatient || availableQuantity <= 1);
+        Inject10.Disabled = (!hasPatient || availableQuantity <= 5);
+        Inject20.Disabled = (!hasPatient || availableQuantity <= 10);
+        EjectBeakerButton.Disabled = !hasBeaker;
+
+        // Temperature warning
+        var hasCorrectTemperature = (lowestTempRequirement == null || lowestTempRequirement > msg.GasMix.Temperature);
+        var showsTemperatureWarning = (!showsPressureWarning && !hasCorrectTemperature);
+
+        HighTemperatureWarning.Visible = showsTemperatureWarning;
+
+        if (showsTemperatureWarning)
+        {
+            var reagentName = _prototypeManager.Index<ReagentPrototype>(lowestTempReagent!.Value.Prototype)
+                                               .LocalizedName;
+            HighTemperatureWarningText.Text = Loc.GetString("cryo-pod-window-high-temperature-warning",
+                ("reagent", reagentName),
+                ("temperature", lowestTempRequirement!));
+        }
+
+        // Status checklist
+        const float fallbackTemperatureRequirement = 213;
+        var hasTemperatureCheck = (hasGas && hasCorrectTemperature
+                && (lowestTempRequirement != null || msg.GasMix.Temperature < fallbackTemperatureRequirement));
+        var hasChemicals = (hasBeaker && !isBeakerEmpty);
+
+        UpdateChecklistItem(PressureCheck, Loc.GetString("cryo-pod-window-checklist-pressure"), hasCorrectPressure);
+        UpdateChecklistItem(ChemicalsCheck, Loc.GetString("cryo-pod-window-checklist-chemicals"), hasChemicals);
+        UpdateChecklistItem(TemperatureCheck, Loc.GetString("cryo-pod-window-checklist-temperature"), hasTemperatureCheck);
+
+        var isReady = (hasCorrectPressure && hasChemicals && hasTemperatureCheck);
+        var isCooling = (lowestTempRequirement != null && hasPatient
+                          && msg.Health.Temperature > lowestTempRequirement);
+        var isInjecting = (injectingQuantity > 0);
+        StatusLabel.Text = (!isReady    ? Loc.GetString("cryo-pod-window-status-not-ready") :
+                            isCooling   ? Loc.GetString("cryo-pod-window-status-cooling") :
+                            isInjecting ? Loc.GetString("cryo-pod-window-status-injecting") :
+                            hasPatient  ? Loc.GetString("cryo-pod-window-status-ready-to-inject") :
+                                          Loc.GetString("cryo-pod-window-status-ready-for-patient"));
+        StatusLabel.FontColorOverride = (isReady ? Color.DeepSkyBlue : Color.Orange);
+    }
+
+    private void UpdateChecklistItem(Label label, string text, bool isOkay)
+    {
+        label.Text = (isOkay ? text : Loc.GetString("cryo-pod-window-checklist-fail", ("item", text)));
+        label.FontColorOverride = (isOkay ? null : Color.Orange);
+    }
+
+    private float? TryFindMaxTemperatureRequirement(ReagentId reagent)
+    {
+        var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
+        if (reagentProto.Metabolisms == null)
+            return null;
+
+        float? result = null;
+
+        foreach (var (_, metabolism) in reagentProto.Metabolisms)
+        {
+            foreach (var effect in metabolism.Effects)
+            {
+                if (effect.Conditions == null)
+                    continue;
+
+                foreach (var condition in effect.Conditions)
+                {
+                    // If there are multiple temperature conditions in the same reagent (which could hypothetically
+                    // happen, although it currently doesn't), we return the lowest max temperature.
+                    if (condition is TemperatureCondition tempCondition
+                        && float.IsFinite(tempCondition.Max)
+                        && (result == null || tempCondition.Max < result))
+                    {
+                        result = tempCondition.Max;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    public void SetEjectErrorVisible(bool isVisible)
+    {
+        EjectError.Visible = isVisible;
+    }
+
+    protected override Vector2 MeasureOverride(Vector2 availableSize)
+    {
+        const float antiJiggleSlackSpace = 80;
+        var oldSize = DesiredSize;
+        var newSize = base.MeasureOverride(availableSize);
+
+        // Reduce how often the height of the window jiggles
+        if (newSize.Y < oldSize.Y && newSize.Y + antiJiggleSlackSpace > oldSize.Y)
+            newSize.Y = oldSize.Y;
+
+        return newSize;
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
index 3cbe6575bf..a3fe2400d0 100644
--- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
@@ -1,12 +1,10 @@
 using System.Linq;
 using Content.Server.Atmos.Components;
-using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Popups;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.NodeContainer;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -159,16 +157,8 @@ public sealed class GasAnalyzerSystem : EntitySystem
 
         // Fetch the environmental atmosphere around the scanner. This must be the first entry
         var tileMixture = _atmo.GetContainingMixture(uid, true);
-        if (tileMixture != null)
-        {
-            gasMixList.Add(new GasMixEntry(Loc.GetString("gas-analyzer-window-environment-tab-label"), tileMixture.Volume, tileMixture.Pressure, tileMixture.Temperature,
-                GenerateGasEntryArray(tileMixture)));
-        }
-        else
-        {
-            // No gases were found
-            gasMixList.Add(new GasMixEntry(Loc.GetString("gas-analyzer-window-environment-tab-label"), 0f, 0f, 0f));
-        }
+        var tileMixtureName = Loc.GetString("gas-analyzer-window-environment-tab-label");
+        gasMixList.Add(GenerateGasMixEntry(tileMixtureName, tileMixture));
 
         var deviceFlipped = false;
         if (component.Target != null)
@@ -192,7 +182,7 @@ public sealed class GasAnalyzerSystem : EntitySystem
                 {
                     if (mixes.Item2 != null)
                     {
-                        gasMixList.Add(new GasMixEntry(mixes.Item1, mixes.Item2.Volume, mixes.Item2.Pressure, mixes.Item2.Temperature, GenerateGasEntryArray(mixes.Item2)));
+                        gasMixList.Add(GenerateGasMixEntry(mixes.Item1, mixes.Item2));
                         validTarget = true;
                     }
                 }
@@ -215,7 +205,7 @@ public sealed class GasAnalyzerSystem : EntitySystem
                             var pipeAir = pipeNode.Air.Clone();
                             pipeAir.Multiply(pipeNode.Volume / pipeNode.Air.Volume);
                             pipeAir.Volume = pipeNode.Volume;
-                            gasMixList.Add(new GasMixEntry(pair.Key, pipeAir.Volume, pipeAir.Pressure, pipeAir.Temperature, GenerateGasEntryArray(pipeAir)));
+                            gasMixList.Add(GenerateGasMixEntry(pair.Key, pipeAir));
                             validTarget = true;
                         }
                     }
@@ -242,6 +232,23 @@ public sealed class GasAnalyzerSystem : EntitySystem
         return true;
     }
 
+    /// <summary>
+    /// Generates a GasMixEntry for a given GasMixture
+    /// </summary>
+    public GasMixEntry GenerateGasMixEntry(string name, GasMixture? mixture)
+    {
+        if (mixture == null)
+            return new GasMixEntry(name, 0, 0, 0);
+
+        return new GasMixEntry(
+            name,
+            mixture.Volume,
+            mixture.Pressure,
+            mixture.Temperature,
+            GenerateGasEntryArray(mixture)
+        );
+    }
+
     /// <summary>
     /// Generates a GasEntry array for a given GasMixture
     /// </summary>
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 44d38aac46..e54f80bca9 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -6,62 +6,61 @@ using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
-using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Medical.Cryogenics;
-using Content.Shared.MedicalScanner;
-using Content.Shared.Temperature.Components;
-using Content.Shared.UserInterface;
-using Robust.Shared.Containers;
-
 namespace Content.Server.Medical;
 
 public sealed partial class CryoPodSystem : SharedCryoPodSystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
     [Dependency] private readonly GasCanisterSystem _gasCanisterSystem = default!;
+    [Dependency] private readonly GasAnalyzerSystem _gasAnalyzerSystem = default!;
+    [Dependency] private readonly HealthAnalyzerSystem _healthAnalyzerSystem = default!;
     [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
-    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryoPodComponent, AfterActivatableUIOpenEvent>(OnActivateUI);
         SubscribeLocalEvent<CryoPodComponent, AtmosDeviceUpdateEvent>(OnCryoPodUpdateAtmosphere);
         SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
-        SubscribeLocalEvent<CryoPodComponent, EntRemovedFromContainerMessage>(OnEjected);
     }
 
-    private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableUIOpenEvent args)
+    public override void Update(float frameTime)
     {
-        if (!entity.Comp.BodyContainer.ContainedEntity.HasValue)
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ActiveCryoPodComponent, CryoPodComponent>();
+
+        while (query.MoveNext(out var uid, out _, out var cryoPod))
+        {
+            if (Timing.CurTime < cryoPod.NextUiUpdateTime)
+                continue;
+
+            cryoPod.NextUiUpdateTime += cryoPod.UiUpdateInterval;
+            Dirty(uid, cryoPod);
+            UpdateUi((uid, cryoPod));
+        }
+    }
+
+    protected override void UpdateUi(Entity<CryoPodComponent> entity)
+    {
+        if (!UI.IsUiOpen(entity.Owner, CryoPodUiKey.Key)
+            || !TryComp(entity, out CryoPodAirComponent? air))
             return;
 
-        TryComp<TemperatureComponent>(entity.Comp.BodyContainer.ContainedEntity, out var temp);
-        TryComp<BloodstreamComponent>(entity.Comp.BodyContainer.ContainedEntity, out var bloodstream);
+        var patient = entity.Comp.BodyContainer.ContainedEntity;
+        var gasMix = _gasAnalyzerSystem.GenerateGasMixEntry("Cryo pod", air.Air);
+        var (beakerCapacity, beaker) = GetBeakerInfo(entity);
+        var injecting = GetInjectingReagents(entity);
+        var health = _healthAnalyzerSystem.GetHealthAnalyzerUiState(patient);
+        health.ScanMode = true;
 
-        if (TryComp<HealthAnalyzerComponent>(entity, out var healthAnalyzer))
-        {
-            healthAnalyzer.ScannedEntity = entity.Comp.BodyContainer.ContainedEntity;
-        }
-
-        // TODO: This should be a state my dude
-        _uiSystem.ServerSendUiMessage(
+        UI.ServerSendUiMessage(
             entity.Owner,
-            HealthAnalyzerUiKey.Key,
-            new HealthAnalyzerScannedUserMessage(GetNetEntity(entity.Comp.BodyContainer.ContainedEntity),
-            temp?.CurrentTemperature ?? 0,
-            (bloodstream != null && _solutionContainerSystem.ResolveSolution(entity.Comp.BodyContainer.ContainedEntity.Value,
-                bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
-                ? bloodSolution.FillFraction
-                : 0,
-            null,
-            null,
-            null,
-            null // Shitmed Change
-        ));
+            CryoPodUiKey.Key,
+            new CryoPodUserMessage(gasMix, health, beakerCapacity, beaker, injecting)
+        );
     }
 
     private void OnCryoPodUpdateAtmosphere(Entity<CryoPodComponent> entity, ref AtmosDeviceUpdateEvent args)
@@ -97,15 +96,4 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
             args.GasMixtures.Add((entity.Comp.PortName, portAirLocal));
         }
     }
-
-    private void OnEjected(Entity<CryoPodComponent> cryoPod, ref EntRemovedFromContainerMessage args)
-    {
-        if (TryComp<HealthAnalyzerComponent>(cryoPod.Owner, out var healthAnalyzer))
-        {
-            healthAnalyzer.ScannedEntity = null;
-        }
-
-        // if body is ejected - no need to display health-analyzer
-        _uiSystem.CloseUi(cryoPod.Owner, HealthAnalyzerUiKey.Key);
-    }
 }
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 3d19708139..cf00b105ea 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -280,49 +280,69 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     /// <param name="part">Shitmed Change: The body part being scanned, if any</param>
     public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode, EntityUid? part = null)
     {
-        if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
+        if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key)
+            || !HasComp<DamageableComponent>(target))
             return;
 
-        if (!HasComp<DamageableComponent>(target))
-            return;
+        var uiState = GetHealthAnalyzerUiState(target, part); // Shitmed Change
+        uiState.ScanMode = scanMode;
 
+        _uiSystem.ServerSendUiMessage(
+            healthAnalyzer,
+            HealthAnalyzerUiKey.Key,
+            new HealthAnalyzerScannedUserMessage(uiState)
+        );
+    }
+
+    /// <summary>
+    /// Creates a HealthAnalyzerState based on the current state of an entity.
+    /// </summary>
+    /// <param name="target">The entity being scanned</param>
+    /// <param name="part">Shitmed Change: The body part being scanned, if any</param>
+    /// <returns></returns>
+    public HealthAnalyzerUiState GetHealthAnalyzerUiState(EntityUid? target, EntityUid? part = null)
+    {
+        if (!target.HasValue || !HasComp<DamageableComponent>(target))
+            return new HealthAnalyzerUiState();
+
+        var entity = target.Value;
         var bodyTemperature = float.NaN;
 
-        if (TryComp<TemperatureComponent>(target, out var temp))
+        if (TryComp<TemperatureComponent>(entity, out var temp))
             bodyTemperature = temp.CurrentTemperature;
 
         var bloodAmount = float.NaN;
         var bleeding = false;
         var unrevivable = false;
 
-        if (TryComp<BloodstreamComponent>(target, out var bloodstream) &&
-            _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName,
+        if (TryComp<BloodstreamComponent>(entity, out var bloodstream) &&
+            _solutionContainerSystem.ResolveSolution(entity, bloodstream.BloodSolutionName,
                 ref bloodstream.BloodSolution, out var bloodSolution))
         {
-            bloodAmount = _bloodstreamSystem.GetBloodLevel(target);
+            bloodAmount = _bloodstreamSystem.GetBloodLevel(entity);
             bleeding = bloodstream.BleedAmount > 0;
         }
 
-        if (TryComp<UnrevivableComponent>(target, out var unrevivableComp) && unrevivableComp.Analyzable)
+        if (TryComp<UnrevivableComponent>(entity, out var unrevivableComp) && unrevivableComp.Analyzable)
             unrevivable = true;
 
         // Shitmed Change Start
         Dictionary<TargetBodyPart, TargetIntegrity>? body = null;
         if (HasComp<TargetingComponent>(target))
-            body = _bodySystem.GetBodyPartStatus(target);
+            body = _bodySystem.GetBodyPartStatus(entity);
         // Shitmed Change End
 
-        _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
-            GetNetEntity(target),
+        return new HealthAnalyzerUiState(
+            GetNetEntity(entity),
             bodyTemperature,
             bloodAmount,
-            scanMode,
+            null,
             bleeding,
             unrevivable,
             // Shitmed Change
             body,
-            _medicalRecords.GetMedicalRecords(target), // DeltaV - Medical Records
+            _medicalRecords.GetMedicalRecords(entity), // DeltaV - Medical Records
             part != null ? GetNetEntity(part) : null
-        ));
+        );
     }
 }
diff --git a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
index c06ad31175..b4a133570c 100644
--- a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
@@ -1,11 +1,13 @@
+using Content.Shared.Atmos.Components;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Content.Shared.MedicalScanner;
 using Content.Shared.Tools;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
 namespace Content.Shared.Medical.Cryogenics;
 
 /// <summary>
@@ -21,6 +23,11 @@ public sealed partial class CryoPodComponent : Component
     /// </summary>
     public const string BodyContainerName = "scanner-body";
 
+    /// <summary>
+    /// The name of the solution container for the injection chamber.
+    /// </summary>
+    public const string InjectionBufferSolutionName = "injectionBuffer";
+
     /// <summary>
     /// Specifies the name of the atmospherics port to draw gas from.
     /// </summary>
@@ -38,7 +45,7 @@ public sealed partial class CryoPodComponent : Component
     /// (injection interval)
     /// </summary>
     [DataField]
-    public TimeSpan BeakerTransferTime = TimeSpan.FromSeconds(1);
+    public TimeSpan BeakerTransferTime = TimeSpan.FromSeconds(2);
 
     /// <summary>
     /// The timestamp for the next injection.
@@ -47,6 +54,20 @@ public sealed partial class CryoPodComponent : Component
     [AutoNetworkedField, AutoPausedField]
     public TimeSpan NextInjectionTime = TimeSpan.Zero;
 
+
+    /// <summary>
+    /// How often the UI is updated.
+    /// </summary>
+    [DataField]
+    public TimeSpan UiUpdateInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The timestamp for the next UI update.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUiUpdateTime = TimeSpan.Zero;
+
     /// <summary>
     /// How many units to transfer per injection from the beaker to the mob?
     /// </summary>
@@ -102,3 +123,57 @@ public enum CryoPodVisuals : byte
     ContainsEntity,
     IsOn
 }
+
+[Serializable, NetSerializable]
+public enum CryoPodUiKey : byte
+{
+    Key
+}
+
+[Serializable, NetSerializable]
+public sealed class CryoPodUserMessage : BoundUserInterfaceMessage
+{
+    public GasAnalyzerComponent.GasMixEntry GasMix;
+    public HealthAnalyzerUiState Health;
+    public FixedPoint2? BeakerCapacity;
+    public List<ReagentQuantity>? Beaker;
+    public List<ReagentQuantity>? Injecting;
+
+    public CryoPodUserMessage(
+        GasAnalyzerComponent.GasMixEntry gasMix,
+        HealthAnalyzerUiState health,
+        FixedPoint2? beakerCapacity,
+        List<ReagentQuantity>? beaker,
+        List<ReagentQuantity>? injecting)
+    {
+        GasMix = gasMix;
+        Health = health;
+        BeakerCapacity = beakerCapacity;
+        Beaker = beaker;
+        Injecting = injecting;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class CryoPodSimpleUiMessage : BoundUserInterfaceMessage
+{
+    public enum MessageType { EjectPatient, EjectBeaker }
+
+    public readonly MessageType Type;
+
+    public CryoPodSimpleUiMessage(MessageType type)
+    {
+        Type = type;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class CryoPodInjectUiMessage : BoundUserInterfaceMessage
+{
+    public readonly FixedPoint2 Quantity;
+
+    public CryoPodInjectUiMessage(FixedPoint2 quantity)
+    {
+        Quantity = quantity;
+    }
+}
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index cf819bfea4..e8e3a2984a 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
@@ -5,6 +6,7 @@ using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
@@ -12,6 +14,8 @@ using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
+using Content.Shared.FixedPoint;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
@@ -26,34 +30,35 @@ using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
-
 namespace Content.Shared.Medical.Cryogenics;
 
 public abstract partial class SharedCryoPodSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly StandingStateSystem _standingState = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
+    [Dependency] private readonly ClimbSystem _climb = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedPointLightSystem _light = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly ClimbSystem _climb = default!;
-    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
-    [Dependency] private readonly SharedToolSystem _tool = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ReactiveSystem _reactive = default!;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedToolSystem _tool = default!;
+    [Dependency] protected readonly SharedUserInterfaceSystem UI = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
 
     private EntityQuery<BloodstreamComponent> _bloodstreamQuery;
     private EntityQuery<ItemSlotsComponent> _itemSlotsQuery;
     private EntityQuery<FitsInDispenserComponent> _dispenserQuery;
     private EntityQuery<SolutionContainerManagerComponent> _solutionContainerQuery;
 
+
     public override void Initialize()
     {
         base.Initialize();
@@ -69,6 +74,8 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
         SubscribeLocalEvent<CryoPodComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<CryoPodComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
+        SubscribeLocalEvent<CryoPodComponent, EntRemovedFromContainerMessage>(OnEjected);
+        SubscribeLocalEvent<CryoPodComponent, EntInsertedIntoContainerMessage>(OnBodyInserted);
 
         _bloodstreamQuery = GetEntityQuery<BloodstreamComponent>();
         _itemSlotsQuery = GetEntityQuery<ItemSlotsComponent>();
@@ -76,13 +83,20 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
         _solutionContainerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
 
         InitializeInsideCryoPod();
+
+        Subs.BuiEvents<CryoPodComponent>(CryoPodUiKey.Key, subs =>
+        {
+            subs.Event<BoundUIOpenedEvent>(OnBoundUiOpened);
+            subs.Event<CryoPodSimpleUiMessage>(OnSimpleUiMessage);
+            subs.Event<CryoPodInjectUiMessage>(OnInjectUiMessage);
+        });
     }
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var curTime = _timing.CurTime;
+        var curTime = Timing.CurTime;
         var query = EntityQueryEnumerator<ActiveCryoPodComponent, CryoPodComponent>();
 
         while (query.MoveNext(out var uid, out _, out var cryoPod))
@@ -92,29 +106,35 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
 
             cryoPod.NextInjectionTime += cryoPod.BeakerTransferTime;
             Dirty(uid, cryoPod);
+            UpdateInjection((uid, cryoPod));
+        }
+    }
 
-            if (!_itemSlotsQuery.TryComp(uid, out var itemSlotsComponent))
-                continue;
+    private void UpdateInjection(Entity<CryoPodComponent> entity)
+    {
+        var patient = entity.Comp.BodyContainer.ContainedEntity;
 
-            var container = _itemSlots.GetItemOrNull(uid, cryoPod.SolutionContainerName, itemSlotsComponent);
-            var patient = cryoPod.BodyContainer.ContainedEntity;
-            if (container != null
-                && container.Value.Valid
-                && patient != null
-                && _dispenserQuery.TryComp(container, out var fitsInDispenserComponent)
-                && _solutionContainerQuery.TryComp(container, out var solutionContainerManagerComponent)
-                && _solutionContainer.TryGetFitsInDispenser((container.Value, fitsInDispenserComponent, solutionContainerManagerComponent),
-                    out var containerSolution, out _)
-                && _bloodstreamQuery.TryComp(patient, out var bloodstream))
-            {
-                // DeltaV - Cryotubes Inject Evenly
-                var solutionToInject = cryoPod.InjectEvenly ? _solutionContainer.SplitSolutionReagentsEvenly(containerSolution.Value, cryoPod.BeakerTransferAmount)
-                    : _solutionContainer.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
-                // END DeltaV
+        if (patient == null
+            || !_solutionContainerQuery.TryComp(entity, out var podSolutionManager)
+            || !_solutionContainer.TryGetSolution(
+                    (entity.Owner, podSolutionManager),
+                    CryoPodComponent.InjectionBufferSolutionName,
+                    out var injectingSolution,
+                    out _)
+            || !_bloodstreamQuery.TryComp(patient, out var bloodstream))
+        {
+            return;
+        }
 
-                _bloodstream.TryAddToBloodstream((patient.Value, bloodstream), solutionToInject);
-                _reactive.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
-            }
+        // DeltaV - Cryotubes Inject Evenly
+        var solutionToInject = entity.Comp.InjectEvenly ? _solutionContainer.SplitSolutionReagentsEvenly(injectingSolution.Value, entity.Comp.BeakerTransferAmount)
+            : _solutionContainer.SplitSolution(injectingSolution.Value, entity.Comp.BeakerTransferAmount);
+        // END DeltaV
+
+        if (solutionToInject.Volume > 0)
+        {
+            _bloodstream.TryAddToBloodstream((patient.Value, bloodstream), solutionToInject);
+            _reactive.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
         }
     }
 
@@ -152,7 +172,7 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
             return;
 
         var containedEntity = ent.Comp.BodyContainer.ContainedEntity;
-        if (containedEntity == null || containedEntity == args.User || !HasComp<ActiveCryoPodComponent>(ent))
+        if (containedEntity == args.User)
             args.Cancel();
     }
 
@@ -183,13 +203,13 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
         if (args.Powered)
         {
             EnsureComp<ActiveCryoPodComponent>(ent);
-            ent.Comp.NextInjectionTime = _timing.CurTime + ent.Comp.BeakerTransferTime;
+            ent.Comp.NextInjectionTime = Timing.CurTime + ent.Comp.BeakerTransferTime;
             Dirty(ent);
         }
         else
         {
             RemComp<ActiveCryoPodComponent>(ent);
-            _ui.CloseUi(ent.Owner, HealthAnalyzerUiKey.Key);
+            UI.CloseUi(ent.Owner, HealthAnalyzerUiKey.Key);
         }
 
         UpdateAppearance(ent.Owner, ent.Comp);
@@ -240,8 +260,8 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
         if (!Resolve(uid, ref appearance))
             return;
 
-        _appearance.SetData(uid, CryoPodVisuals.ContainsEntity, cryoPod.BodyContainer?.ContainedEntity == null, appearance);
-        _appearance.SetData(uid, CryoPodVisuals.IsOn, cryoPodEnabled, appearance);
+        Appearance.SetData(uid, CryoPodVisuals.ContainsEntity, cryoPod.BodyContainer?.ContainedEntity == null, appearance);
+        Appearance.SetData(uid, CryoPodVisuals.IsOn, cryoPodEnabled, appearance);
     }
 
     public bool InsertBody(EntityUid uid, EntityUid target, CryoPodComponent cryoPodComponent)
@@ -309,6 +329,115 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
         return contained;
     }
 
+    public void TryEjectBeaker(Entity<CryoPodComponent> cryoPod, EntityUid? user)
+    {
+        if (_itemSlots.TryEject(cryoPod.Owner, cryoPod.Comp.SolutionContainerName, user, out var beaker)
+            && user != null)
+        {
+            // Eject the beaker to the user's hands if possible.
+            _hands.PickupOrDrop(user.Value, beaker.Value);
+        }
+    }
+
+    /// <summary>
+    /// Transfers reagents from the cryopod beaker into the injection buffer.
+    /// </summary>
+    /// <param name="cryoPod">The cryopod entity</param>
+    /// <param name="transferAmount">
+    /// The amount of reagents that will be transferred.
+    /// If less reagents are available, however much is available will be transferred.
+    /// </param>
+    public void TryInject(Entity<CryoPodComponent> cryoPod, FixedPoint2 transferAmount)
+    {
+        var patient = cryoPod.Comp.BodyContainer.ContainedEntity;
+        if (patient == null)
+            return; // Refuse to inject if there is no patient.
+
+        var beaker = _itemSlots.GetItemOrNull(cryoPod, cryoPod.Comp.SolutionContainerName);
+
+        if (beaker == null
+            || !beaker.Value.Valid
+            || !_dispenserQuery.TryComp(beaker, out var fitsInDispenserComponent)
+            || !_solutionContainerQuery.TryComp(beaker, out var beakerSolutionManager)
+            || !_solutionContainerQuery.TryComp(cryoPod, out var podSolutionManager)
+            || !_solutionContainer.TryGetFitsInDispenser(
+                    (beaker.Value, fitsInDispenserComponent, beakerSolutionManager),
+                    out var beakerSolution,
+                    out _)
+            || !_solutionContainer.TryGetSolution(
+                    (cryoPod.Owner, podSolutionManager),
+                    CryoPodComponent.InjectionBufferSolutionName,
+                    out var injectionSolutionComp,
+                    out var injectionSolution))
+        {
+            return;
+        }
+
+        if (injectionSolution.AvailableVolume == 0)
+            return;
+
+        var amountToTransfer = FixedPoint2.Min(transferAmount, injectionSolution.AvailableVolume);
+        var solution = _solutionContainer.SplitSolution(beakerSolution.Value, amountToTransfer);
+        _solutionContainer.TryAddSolution(injectionSolutionComp.Value, solution);
+    }
+
+    public void ClearInjectionBuffer(Entity<CryoPodComponent> cryoPod)
+    {
+        if (_solutionContainerQuery.TryComp(cryoPod, out var podSolutionManager)
+            && _solutionContainer.TryGetSolution(
+                    (cryoPod.Owner, podSolutionManager),
+                    CryoPodComponent.InjectionBufferSolutionName,
+                    out var injectingSolution,
+                    out _))
+        {
+            _solutionContainer.RemoveAllSolution(injectingSolution.Value);
+        }
+    }
+
+    protected (FixedPoint2? capacity, List<ReagentQuantity>? reagents) GetBeakerInfo(Entity<CryoPodComponent> entity)
+    {
+        if (!_itemSlotsQuery.TryComp(entity, out var itemSlotsComponent))
+            return (null, null);
+
+        var beaker = _itemSlots.GetItemOrNull(
+            entity.Owner,
+            entity.Comp.SolutionContainerName,
+            itemSlotsComponent
+        );
+
+        if (beaker == null
+            || !beaker.Value.Valid
+            || !_dispenserQuery.TryComp(beaker, out var fitsInDispenserComponent)
+            || !_solutionContainerQuery.TryComp(beaker, out var solutionContainerManagerComponent)
+            || !_solutionContainer.TryGetFitsInDispenser(
+                    (beaker.Value, fitsInDispenserComponent, solutionContainerManagerComponent),
+                    out var containerSolution,
+                    out _))
+            return (null, null);
+
+        var capacity = containerSolution.Value.Comp.Solution.MaxVolume;
+        var reagents = containerSolution.Value.Comp.Solution.Contents
+            .Select(reagent => new ReagentQuantity(reagent.Reagent, reagent.Quantity))
+            .ToList();
+
+        return (capacity, reagents);
+    }
+
+    protected List<ReagentQuantity>? GetInjectingReagents(Entity<CryoPodComponent> entity)
+    {
+        if (!_solutionContainerQuery.TryComp(entity, out var solutionManager)
+            || !_solutionContainer.TryGetSolution(
+                    (entity.Owner, solutionManager),
+                    CryoPodComponent.InjectionBufferSolutionName,
+                    out var injectingSolution,
+                    out _))
+            return null;
+
+        return injectingSolution.Value.Comp.Solution.Contents
+            .Select(reagent => new ReagentQuantity(reagent.Reagent, reagent.Quantity))
+            .ToList();
+    }
+
     protected void AddAlternativeVerbs(EntityUid uid, CryoPodComponent cryoPodComponent, GetVerbsEvent<AlternativeVerb> args)
     {
         if (!args.CanAccess || !args.CanInteract)
@@ -344,6 +473,55 @@ public abstract partial class SharedCryoPodSystem : EntitySystem
         args.Handled = true;
     }
 
+    private void OnSimpleUiMessage(Entity<CryoPodComponent> cryoPod, ref CryoPodSimpleUiMessage msg)
+    {
+        switch (msg.Type)
+        {
+            case CryoPodSimpleUiMessage.MessageType.EjectPatient:
+                TryEjectBody(cryoPod.Owner, msg.Actor, cryoPod.Comp);
+                break;
+            case CryoPodSimpleUiMessage.MessageType.EjectBeaker:
+                TryEjectBeaker(cryoPod, msg.Actor);
+                break;
+        }
+
+        UpdateUi(cryoPod);
+    }
+
+    private void OnInjectUiMessage(Entity<CryoPodComponent> cryoPod, ref CryoPodInjectUiMessage msg)
+    {
+        TryInject(cryoPod, msg.Quantity);
+        UpdateUi(cryoPod);
+    }
+
+    private void OnBoundUiOpened(Entity<CryoPodComponent> cryoPod, ref BoundUIOpenedEvent args)
+    {
+        UpdateUi(cryoPod);
+    }
+
+    private void OnEjected(Entity<CryoPodComponent> cryoPod, ref EntRemovedFromContainerMessage args)
+    {
+        if (args.Container.ID == CryoPodComponent.BodyContainerName)
+        {
+            ClearInjectionBuffer(cryoPod);
+        }
+
+        UpdateUi(cryoPod);
+    }
+
+    private void OnBodyInserted(Entity<CryoPodComponent> cryoPod, ref EntInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID == CryoPodComponent.BodyContainerName)
+        {
+            UI.CloseUi(cryoPod.Owner, CryoPodUiKey.Key, args.Entity);
+            ClearInjectionBuffer(cryoPod);
+        }
+
+        UpdateUi(cryoPod);
+    }
+
+    protected abstract void UpdateUi(Entity<CryoPodComponent> cryoPod);
+
     [Serializable, NetSerializable]
     public sealed partial class CryoPodPryFinished : SimpleDoAfterEvent;
 
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
index 1926cf21dd..9673b3cf0d 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
@@ -5,10 +5,24 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.MedicalScanner;
 
 /// <summary>
-///     On interacting with an entity retrieves the entity UID for use with getting the current damage of the mob.
+/// On interacting with an entity retrieves the entity UID for use with getting the current damage of the mob.
 /// </summary>
 [Serializable, NetSerializable]
 public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
+{
+    public HealthAnalyzerUiState State;
+
+    public HealthAnalyzerScannedUserMessage(HealthAnalyzerUiState state)
+    {
+        State = state;
+    }
+}
+
+/// <summary>
+/// Contains the current state of a health analyzer control. Used for the health analyzer and cryo pod.
+/// </summary>
+[Serializable, NetSerializable]
+public struct HealthAnalyzerUiState
 {
     public readonly NetEntity? TargetEntity;
     public float Temperature;
@@ -20,7 +34,9 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
     public NetEntity? Part; // Shitmed Change
     public MedicalRecord? MedicalRecord; // DeltaV - Medical Records
 
-    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, MedicalRecord? medicalRecord = null, NetEntity? part = null) // Shitmed Change // DeltaV - Medical Records
+    public HealthAnalyzerUiState() {}
+
+    public HealthAnalyzerUiState(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, MedicalRecord? medicalRecord = null, NetEntity? part = null) // Shitmed Change // DeltaV - Medical Records
     {
         TargetEntity = targetEntity;
         Temperature = temperature;
diff --git a/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl b/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl
index 53ee8301de..077bc26663 100644
--- a/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl
+++ b/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl
@@ -5,3 +5,42 @@ cryo-pod-examine = There's {INDEFINITE($beaker)} {$beaker} in here.
 cryo-pod-empty-beaker = It is empty!
 # Shown when a normal ejection through the eject verb is attempted on a locked pod.
 cryo-pod-locked = The ejection mechanism is unresponsive!
+
+cryo-pod-window-product-name = Nanotrasen CRPX-229
+cryo-pod-window-product-subtitle = Cryogenic Restoration Pod
+cryo-pod-window-loading = Loading
+cryo-pod-window-atmos-pressure = Pressure
+cryo-pod-window-atmos-temperature = Temperature
+cryo-pod-window-status = Pod status:
+cryo-pod-window-status-ready-for-patient = Ready for patient
+cryo-pod-window-status-ready-to-inject = Ready to inject
+cryo-pod-window-status-injecting = Injecting...
+cryo-pod-window-status-not-ready = NOT READY
+cryo-pod-window-status-cooling = Cooling patient...
+cryo-pod-window-checklist-pressure = Pressurized
+cryo-pod-window-checklist-chemicals = Chemicals available
+cryo-pod-window-checklist-temperature = Cryogenic temperature
+cryo-pod-window-checklist-fail = {$item} — NO
+
+cryo-pod-window-warning-header = WARNING
+cryo-pod-window-low-pressure-warning = Dangerously low pressure. Gas pressure must be approximately 100 kPa for safe operation.
+cryo-pod-window-high-temperature-warning = Temperature too high. {CAPITALIZE($reagent)} requires a temperature below {$temperature} K.
+
+cryo-pod-window-error-header = ERROR
+# Shown when the eject button is pressed on a locked pod.
+cryo-pod-window-eject-error = Ejection mechanism failed. Contact a Nanotrasen-certified engineer for support.
+
+cryo-pod-window-chems-no-beaker = No beaker inserted
+cryo-pod-window-chems-empty-beaker = Beaker is empty
+cryo-pod-window-chems-injecting-tooltip = Injecting {$quantity}u
+cryo-pod-window-inject-1u = 1u
+cryo-pod-window-inject-5u = 5u
+cryo-pod-window-inject-10u = 10u
+cryo-pod-window-inject-20u = 20u
+# The eject beaker button has very little horizontal space, which is why it only says "eject"
+cryo-pod-window-eject-beaker = Eject
+cryo-pod-window-eject-patient = Eject patient
+
+cryo-pod-window-health-no-damage = No damage detected
+
+
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index b863ade2b2..d3afcb699d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -87,16 +87,14 @@
         whitelist:
           components:
             - FitsInDispenser
-  - type: HealthAnalyzer
-    scanDelay: 0
   - type: UserInterface
     interfaces:
-      enum.HealthAnalyzerUiKey.Key:
-        type: HealthAnalyzerBoundUserInterface
+      enum.CryoPodUiKey.Key:
+        type: CryoPodBoundUserInterface
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: ActivatableUI
-    key: enum.HealthAnalyzerUiKey.Key
+    key: enum.CryoPodUiKey.Key
     requiresComplex: false
   - type: ActivatableUIRequiresPower
   - type: PointLight
@@ -107,6 +105,10 @@
   - type: EmptyOnMachineDeconstruct
     containers:
       - scanner-body
+  - type: SolutionContainerManager
+    solutions:
+      injectionBuffer:
+        maxVol: 50
   - type: CryoPod
     beakerTransferAmount: 0.5 # DeltaV - Inject Evenly
     injectEvenly: true # DeltaV - Inject Evenly

From bf45a27ec772cbedb83ea1fdcf7aec69114c6bbd Mon Sep 17 00:00:00 2001
From: rumaks <me@rumaks.xyz>
Date: Thu, 15 Jan 2026 17:52:24 +0000
Subject: [PATCH 329/360] Make chemicals not react inside pills (and stomachs)
 (#41457)

no reactions in pills
---
 .../Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
index 5bcd34883a..9d48e2f994 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
@@ -657,6 +657,7 @@
     solutions:
       food:
         maxVol: 20
+        canReact: false
   - type: ExplosionResistance
     damageCoefficient: 0.025 # survives conventional explosives but not minibombs and nukes
   - type: Damageable

From 1bb91b2efa34e3fb9b4dee8156d07bd8b5c2af03 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Thu, 15 Jan 2026 18:53:30 +0100
Subject: [PATCH 330/360] Add integration test for drains (#41190)

* drain test

* fix linter fail
---
 .../Tests/Chemistry/DrainTest.cs              | 124 ++++++++++++++++++
 .../Interaction/InteractionTest.Helpers.cs    |  44 ++++++-
 .../Tests/Interaction/InteractionTest.cs      |   3 +
 .../Tests/Strip/StrippableTest.cs             |  37 ++----
 4 files changed, 175 insertions(+), 33 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Chemistry/DrainTest.cs

diff --git a/Content.IntegrationTests/Tests/Chemistry/DrainTest.cs b/Content.IntegrationTests/Tests/Chemistry/DrainTest.cs
new file mode 100644
index 0000000000..55f405f039
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Chemistry/DrainTest.cs
@@ -0,0 +1,124 @@
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Nutrition.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Chemistry;
+
+public sealed class DrainTest : InteractionTest
+{
+    private static readonly EntProtoId PizzaPrototype = "FoodPizzaMargherita";
+    private static readonly EntProtoId DrainPrototype = "FloorDrain";
+    private static readonly EntProtoId BucketPrototype = "Bucket";
+    private static readonly ProtoId<ReagentPrototype> BloodReagent = "Blood";
+    private static readonly ProtoId<ReagentPrototype> WaterReagent = "Water";
+    private static readonly FixedPoint2 WaterVolume = 50; // 50u
+    private static readonly FixedPoint2 PuddleVolume = 30; // 30u
+
+    [TestPrototypes]
+    private static readonly string Prototypes = @$"
+- type: entity
+  parent: Puddle
+  id: PuddleBloodTest
+  suffix: Blood (30u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: {BloodReagent}
+          Quantity: {PuddleVolume}
+";
+
+
+    /// <summary>
+    /// Tests that drag drop interactions with drains are working as intended.
+    /// </summary>
+    [Test]
+    public async Task DragDropOntoDrainTest()
+    {
+        var solutionContainerSys = SEntMan.System<SharedSolutionContainerSystem>();
+
+        // Spawn a drain one tile away.
+        var drain = await Spawn(DrainPrototype);
+
+        // Spawn a bucket at the player's coordinates.
+        var bucket = await Spawn(BucketPrototype, PlayerCoords);
+
+        // Add water to the bucket.
+        Assert.That(solutionContainerSys.TryGetDrainableSolution(ToServer(bucket), out var solutionEnt, out var solution), "Bucket had no drainable solution.");
+        await Server.WaitAssertion(() =>
+        {
+            Assert.That(solutionContainerSys.TryAddReagent(solutionEnt.Value, WaterReagent, WaterVolume), "Could not add water to the bucket.");
+        });
+
+        // Check that the bucket was filled.
+        Assert.That(solutionContainerSys.TryGetDrainableSolution(ToServer(bucket), out solutionEnt, out solution), "Bucket had no drainable solution after filling it.");
+        Assert.That(solution.Volume, Is.EqualTo(WaterVolume));
+
+        // Drag drop the bucket onto the drain.
+        await DragDrop(bucket, drain);
+
+        // Check that the bucket is empty.
+        Assert.That(solutionContainerSys.TryGetDrainableSolution(ToServer(bucket), out solutionEnt, out solution), "Bucket had no drainable solution after draining it.");
+        Assert.That(solution.Volume, Is.EqualTo(FixedPoint2.Zero), "Bucket was not empty after draining it.");
+
+        await Delete(bucket);
+
+        // Spawn a pizza at the player's coordinates.
+        var pizza = await Spawn(PizzaPrototype, PlayerCoords);
+
+        // Check that the pizza is not empty.
+        var edibleSolutionId = Comp<EdibleComponent>(pizza).Solution;
+        Assert.That(solutionContainerSys.TryGetSolution(ToServer(pizza), edibleSolutionId, out solutionEnt, out solution), "Pizza had no edible solution.");
+        var pizzaVolume = solution.Volume;
+        Assert.That(pizzaVolume, Is.GreaterThan(FixedPoint2.Zero), "Pizza had no reagents inside its edible solution.");
+
+        // Drag drop the pizza onto the drain.
+        // Yes, this was a bug that existed before.
+        await DragDrop(pizza, drain);
+
+        // Check that the pizza did not get deleted or had its reagents drained.
+        AssertExists(pizza);
+        Assert.That(solutionContainerSys.TryGetSolution(ToServer(pizza), edibleSolutionId, out solutionEnt, out solution), "Pizza had no edible solution.");
+        Assert.That(solution.Volume, Is.EqualTo(pizzaVolume), "Pizza lost reagents when drag dropped onto a drain.");
+    }
+
+    /// <summary>
+    /// Tests that drains make puddles next to them disappear.
+    /// </summary>
+    [Test]
+    public async Task DrainPuddleTest()
+    {
+        var solutionContainerSys = SEntMan.System<SharedSolutionContainerSystem>();
+
+        // Spawn a puddle at the player coordinates;
+        var puddle = await Spawn("PuddleBloodTest", PlayerCoords);
+
+        // Make sure the reagent chosen for this test does not evaporate on its own.
+        // If you are a fork that made more reagents evaporate, just change BloodReagent ProtoId above to something else.
+        Assert.That(HasComp<EvaporationComponent>(puddle), Is.False, "The chosen reagent is evaporating on its own and we cannot use it for the drain test.");
+
+        var puddleSolutionId = Comp<PuddleComponent>(puddle).SolutionName;
+        Assert.That(solutionContainerSys.TryGetSolution(ToServer(puddle), puddleSolutionId, out _, out var solution), "Puddle had no solution.");
+        Assert.That(solution.Volume, Is.EqualTo(PuddleVolume), "Puddle had the wrong amount of reagents after spawning.");
+
+        // Wait a few seconds and check that the puddle did not disappear on its own.
+        await RunSeconds(10);
+        Assert.That(solutionContainerSys.TryGetSolution(ToServer(puddle), puddleSolutionId, out _, out solution), "Puddle had no solution.");
+        Assert.That(solution.Volume, Is.EqualTo(PuddleVolume), "Puddle had the wrong amount of reagents after spawning.");
+
+        // Spawn a drain one tile away.
+        await Spawn(DrainPrototype);
+
+        // Wait a few seconds.
+        await RunSeconds(10);
+
+        // Make sure the puddle was deleted by the drain.
+        AssertDeleted(puddle);
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index 6279449ba7..0f85397901 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -91,16 +91,18 @@ public abstract partial class InteractionTest
     }
 
     /// <summary>
-    /// Spawn an entity at the target coordinates and set it as the target.
+    /// Spawn an entity at the given coordinates and set it as the target.
+    /// If no coordinates are given it will default to <see cref="TargetCoords"/>
     /// </summary>
     [MemberNotNull(nameof(Target), nameof(STarget), nameof(CTarget))]
 #pragma warning disable CS8774 // Member must have a non-null value when exiting.
-    protected async Task<NetEntity> SpawnTarget(string prototype)
+    protected async Task<NetEntity> SpawnTarget(string prototype, NetCoordinates? coords = null)
     {
+        coords ??= TargetCoords;
         Target = NetEntity.Invalid;
         await Server.WaitPost(() =>
         {
-            Target = SEntMan.GetNetEntity(SEntMan.SpawnAtPosition(prototype, SEntMan.GetCoordinates(TargetCoords)));
+            Target = SEntMan.GetNetEntity(SEntMan.SpawnAtPosition(prototype, SEntMan.GetCoordinates(coords.Value)));
         });
 
         await RunTicks(5);
@@ -110,14 +112,16 @@ public abstract partial class InteractionTest
 #pragma warning restore CS8774 // Member must have a non-null value when exiting.
 
     /// <summary>
-    /// Spawn an entity entity at the target coordinates without setting it as the target.
+    /// Spawn an entity entity at the given coordinates without setting it as the target.
+    /// If no coordinates are given it will default to <see cref="TargetCoords"/>
     /// </summary>
-    protected async Task<NetEntity> Spawn(string prototype)
+    protected async Task<NetEntity> Spawn(string prototype, NetCoordinates? coords = null)
     {
+        coords ??= TargetCoords;
         var entity = NetEntity.Invalid;
         await Server.WaitPost(() =>
         {
-            entity = SEntMan.GetNetEntity(SEntMan.SpawnAtPosition(prototype, SEntMan.GetCoordinates(TargetCoords)));
+            entity = SEntMan.GetNetEntity(SEntMan.SpawnAtPosition(prototype, SEntMan.GetCoordinates(coords.Value)));
         });
 
         await RunTicks(5);
@@ -407,6 +411,33 @@ public abstract partial class InteractionTest
         }
     }
 
+    /// <summary>
+    /// Simulates a drag and drop mouse interaction from one entity to another.
+    /// </summary>
+    protected async Task DragDrop(NetEntity source, NetEntity target)
+    {
+        // ScreenCoordinates diff needs to be larger than DragDropSystem.Deadzone for the drag drop to initiate
+        var screenX = CDragDropSys.Deadzone + 1f;
+
+        // Start drag
+        await SetKey(EngineKeyFunctions.Use,
+            BoundKeyState.Down,
+            NetPosition(source),
+            source,
+            screenCoordinates: new ScreenCoordinates(screenX, 0f, WindowId.Main));
+
+        await RunTicks(3);
+
+        // End drag
+        await SetKey(EngineKeyFunctions.Use,
+            BoundKeyState.Up,
+            NetPosition(target),
+            target,
+            screenCoordinates: new ScreenCoordinates(0f, 0f, WindowId.Main));
+
+        await RunTicks(3);
+    }
+
     /// <summary>
     /// Throw the currently held entity. Defaults to targeting the current <see cref="TargetCoords"/>
     /// </summary>
@@ -1607,6 +1638,7 @@ public abstract partial class InteractionTest
 
     protected EntityCoordinates Position(NetEntity uid) => Position(ToServer(uid));
     protected EntityCoordinates Position(EntityUid uid) => Xform(uid).Coordinates;
+    protected NetCoordinates NetPosition(NetEntity uid) => FromServer(Position(uid));
 
     #endregion
 }
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 245aeab9ee..62a03b0abe 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -3,6 +3,7 @@ using System.Numerics;
 using Content.Client.Construction;
 using Content.Client.Examine;
 using Content.Client.Gameplay;
+using Content.Client.Interaction;
 using Content.IntegrationTests.Pair;
 using Content.Server.Hands.Systems;
 using Content.Server.Stack;
@@ -134,6 +135,7 @@ public abstract partial class InteractionTest
     protected InteractionTestSystem CTestSystem = default!;
     protected ISawmill CLogger = default!;
     protected SharedUserInterfaceSystem CUiSys = default!;
+    protected DragDropSystem CDragDropSys = default!;
 
     // player components
     protected HandsComponent? Hands;
@@ -208,6 +210,7 @@ public abstract partial class InteractionTest
         CConSys = CEntMan.System<ConstructionSystem>();
         ExamineSys = CEntMan.System<ExamineSystem>();
         CUiSys = CEntMan.System<SharedUserInterfaceSystem>();
+        CDragDropSys = CEntMan.System<DragDropSystem>();
 
         // Setup map.
         if (TestMapPath == null)
diff --git a/Content.IntegrationTests/Tests/Strip/StrippableTest.cs b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
index f65bab1f81..d2ae3bd7ec 100644
--- a/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
+++ b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
@@ -1,8 +1,6 @@
-using Content.Client.Interaction;
-using Content.IntegrationTests.Tests.Interaction;
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Strip.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Input;
-using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.Strip;
 
@@ -10,37 +8,22 @@ public sealed class StrippableTest : InteractionTest
 {
     protected override string PlayerPrototype => "MobHuman";
 
+    /// <summary>
+    /// Tests that the stripping UI is opened when drag dropping from another mob onto the player.
+    /// </summary>
     [Test]
     public async Task DragDropOpensStrip()
     {
-        // Spawn one tile away
-        TargetCoords = SEntMan.GetNetCoordinates(new EntityCoordinates(MapData.MapUid, 1, 0));
         await SpawnTarget("MobHuman");
 
         var userInterface = Comp<UserInterfaceComponent>(Target);
-        Assert.That(userInterface.Actors.Count == 0);
+        Assert.That(userInterface.Actors, Is.Empty);
 
-        // screenCoordinates diff needs to be larger than DragDropSystem._deadzone
-        var screenX = CEntMan.System<DragDropSystem>().Deadzone + 1f;
+        await DragDrop(Target.Value, Player);
 
-        // Start drag
-        await SetKey(EngineKeyFunctions.Use,
-            BoundKeyState.Down,
-            TargetCoords,
-            Target,
-            screenCoordinates: new ScreenCoordinates(screenX, 0f, WindowId.Main));
+        Assert.That(userInterface.Actors, Is.Not.Empty);
 
-        await RunTicks(5);
-
-        // End drag
-        await SetKey(EngineKeyFunctions.Use,
-            BoundKeyState.Up,
-            PlayerCoords,
-            Player,
-            screenCoordinates: new ScreenCoordinates(0f, 0f, WindowId.Main));
-
-        await RunTicks(5);
-
-        Assert.That(userInterface.Actors.Count > 0);
+        Assert.That(CUiSys.IsUiOpen(CTarget.Value, StrippingUiKey.Key));
+        Assert.That(SUiSys.IsUiOpen(STarget.Value, StrippingUiKey.Key));
     }
 }

From f55bd218462f91c4b8d2298a8f004cda985b9167 Mon Sep 17 00:00:00 2001
From: Orsoniks <orsoniksstuff@gmail.com>
Date: Thu, 15 Jan 2026 19:26:28 +0100
Subject: [PATCH 331/360] Improved Health Examination Coloring (#38231)

* better colors

* fix worst offenders of contrast

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
---
 .../health-examinable-carbon.ftl              | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl b/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl
index b4c98a62a8..1495c75868 100644
--- a/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl
+++ b/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl
@@ -1,62 +1,62 @@
 health-examinable-carbon-none = There are no obvious wounds to be seen.
 
-health-examinable-carbon-Slash-8 = [color=yellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a superficial cut.[/color]
-health-examinable-carbon-Slash-15 = [color=yellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some small cuts.[/color]
-health-examinable-carbon-Slash-30 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a few sizeable gashes.[/color]
-health-examinable-carbon-Slash-50 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } deep gashes across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Slash-75 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } jagged, deep lacerations running across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Slash-100 = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } body looks bloody and mauled.[/color]
-health-examinable-carbon-Slash-200 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } body is completely torn to shreds![/color]
+health-examinable-carbon-Slash-8 = [color=#EFEFEF]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a superficial cut.[/color]
+health-examinable-carbon-Slash-15 = [color=#CED2D1]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some small cuts.[/color]
+health-examinable-carbon-Slash-30 = [color=#AEB5B5]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a few sizeable gashes.[/color]
+health-examinable-carbon-Slash-50 = [color=#99A2A1]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } deep gashes across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Slash-75 = [color=#798685]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } jagged, deep lacerations running across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Slash-100 = [color=#647372]{ CAPITALIZE(POSS-ADJ($target)) } body looks bloody and mauled.[/color]
+health-examinable-carbon-Slash-200 = [color=#485B59]{ CAPITALIZE(POSS-ADJ($target)) } body is completely torn to shreds![/color]
 
-health-examinable-carbon-Blunt-8 = [color=yellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a mild bruise.[/color]
-health-examinable-carbon-Blunt-15 = [color=yellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some bruises.[/color]
-health-examinable-carbon-Blunt-30 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BE($target) } beaten up.[/color]
-health-examinable-carbon-Blunt-50 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BE($target) } badly beaten up.[/color]
-health-examinable-carbon-Blunt-75 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major blunt trauma across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Blunt-100 = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } body is disfigured and extensively beaten.[/color]
-health-examinable-carbon-Blunt-200 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } body is absolutely smashed to a pulp![/color]
+health-examinable-carbon-Blunt-8 = [color=#FFA8A8]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a mild bruise.[/color]
+health-examinable-carbon-Blunt-15 = [color=#FF8787]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some bruises.[/color]
+health-examinable-carbon-Blunt-30 = [color=#FF6868]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BE($target) } beaten up.[/color]
+health-examinable-carbon-Blunt-50 = [color=#FF5555]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BE($target) } badly beaten up.[/color]
+health-examinable-carbon-Blunt-75 = [color=#FF3636]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major blunt trauma across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Blunt-100 = [color=#FF2121]{ CAPITALIZE(POSS-ADJ($target)) } body is disfigured and extensively beaten.[/color]
+health-examinable-carbon-Blunt-200 = [color=#FF0000]{ CAPITALIZE(POSS-ADJ($target)) } body is absolutely smashed to a pulp![/color]
 
-health-examinable-carbon-Piercing-8 = [color=yellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a minor puncture wound.[/color]
-health-examinable-carbon-Piercing-15 = [color=yellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some puncture wounds.[/color]
-health-examinable-carbon-Piercing-30 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } multiple deep puncture wounds.[/color]
-health-examinable-carbon-Piercing-50 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major deep punctures across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Piercing-75 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } extensive, deep ragged tears across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Piercing-100 = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } body is completely covered in massive, gaping holes.[/color]
-health-examinable-carbon-Piercing-200 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } body looks torn apart![/color]
+health-examinable-carbon-Piercing-8 = [color=#E1E0C2]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a minor puncture wound.[/color]
+health-examinable-carbon-Piercing-15 = [color=#DED9A7]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some puncture wounds.[/color]
+health-examinable-carbon-Piercing-30 = [color=#D9D38A]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } multiple deep puncture wounds.[/color]
+health-examinable-carbon-Piercing-50 = [color=#D6D177]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major deep punctures across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Piercing-75 = [color=#D3CA5B]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } extensive, deep ragged tears across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Piercing-100 = [color=#D1C848]{ CAPITALIZE(POSS-ADJ($target)) } body is completely covered in massive, gaping holes.[/color]
+health-examinable-carbon-Piercing-200 = [color=#d6c800]{ CAPITALIZE(POSS-ADJ($target)) } body looks torn apart![/color]
 
-health-examinable-carbon-Asphyxiation-30 = [color=lightblue]{ CAPITALIZE(POSS-ADJ($target)) } lips are turning blue.[/color]
-health-examinable-carbon-Asphyxiation-75 = [color=lightblue]{ CAPITALIZE(POSS-ADJ($target)) } face is turning blue.[/color]
+health-examinable-carbon-Asphyxiation-30 = [color=#7DBACE]{ CAPITALIZE(POSS-ADJ($target)) } lips are turning blue.[/color]
+health-examinable-carbon-Asphyxiation-75 = [color=#189FCC]{ CAPITALIZE(POSS-ADJ($target)) } face is turning blue.[/color]
 
-health-examinable-carbon-Heat-8 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a superficial burn.[/color]
-health-examinable-carbon-Heat-15 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a few first-degree burns.[/color]
-health-examinable-carbon-Heat-30 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some second-degree burns.[/color]
-health-examinable-carbon-Heat-50 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BE($target) } covered in second-degree burns.[/color]
-health-examinable-carbon-Heat-75 = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } body is covered in severe third-degree burns.[/color]
-health-examinable-carbon-Heat-100 = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } body is extensively covered in fourth-degree burns.[/color]
-health-examinable-carbon-Heat-200 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } body is completely burnt to a crisp![/color]
+health-examinable-carbon-Heat-8 = [color=#C8917A]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a superficial burn.[/color]
+health-examinable-carbon-Heat-15 = [color=#D38664]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } a few first-degree burns.[/color]
+health-examinable-carbon-Heat-30 = [color=#DF7B50]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } some second-degree burns.[/color]
+health-examinable-carbon-Heat-50 = [color=#E87441]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BE($target) } covered in second-degree burns.[/color]
+health-examinable-carbon-Heat-75 = [color=#F4682D]{ CAPITALIZE(POSS-ADJ($target)) } body is covered in severe third-degree burns.[/color]
+health-examinable-carbon-Heat-100 = [color=#FC611E]{ CAPITALIZE(POSS-ADJ($target)) } body is extensively covered in fourth-degree burns.[/color]
+health-examinable-carbon-Heat-200 = [color=#CF5825]{ CAPITALIZE(POSS-ADJ($target)) } body is completely burnt to a crisp![/color]
 
-health-examinable-carbon-Shock-15 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } mild charring on { POSS-ADJ($target) } skin.[/color]
-health-examinable-carbon-Shock-30 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } charring across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Shock-50 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } serious charring across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Shock-75 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } massive, charred wounds across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Shock-100 = [color=lightgoldenrodyellow]{ CAPITALIZE(POSS-ADJ($target)) } body has extreme electrical burns across it![/color]
-health-examinable-carbon-Shock-200 = [color=lightgoldenrodyellow]{ CAPITALIZE(POSS-ADJ($target)) } body is completely fried![/color]
+health-examinable-carbon-Shock-15 = [color=#F0EBC0]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } mild charring on { POSS-ADJ($target) } skin.[/color]
+health-examinable-carbon-Shock-30 = [color=#F3E892]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } charring across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Shock-50 = [color=#F6E669]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } serious charring across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Shock-75 = [color=#F8E550]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } massive, charred wounds across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Shock-100 = [color=#FBE329]{ CAPITALIZE(POSS-ADJ($target)) } body has extreme electrical burns across it![/color]
+health-examinable-carbon-Shock-200 = [color=#FFA100]{ CAPITALIZE(POSS-ADJ($target)) } body is completely fried![/color]
 
-health-examinable-carbon-Cold-8 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } mild frostbite at the tips of { POSS-ADJ($target) } extremities.[/color]
-health-examinable-carbon-Cold-15 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } first-degree frostbite at the ends of { POSS-ADJ($target) } extremities.[/color]
-health-examinable-carbon-Cold-30 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } second-degree frostbite on { POSS-ADJ($target) } extremities.[/color]
-health-examinable-carbon-Cold-50 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major third-degree frostbite on { POSS-ADJ($target) } extremities.[/color]
-health-examinable-carbon-Cold-75 = [color=lightblue]{ CAPITALIZE(POSS-ADJ($target)) } limbs are dark, cold and necrotic.[/color]
-health-examinable-carbon-Cold-100 = [color=lightblue]{ CAPITALIZE(POSS-ADJ($target)) } body is covered in extensive fourth-degree frostbite.[/color]
-health-examinable-carbon-Cold-200 = [color=lightblue]{ CAPITALIZE(POSS-ADJ($target)) } body is frozen rock solid![/color]
+health-examinable-carbon-Cold-8 = [color=#C6FDFA]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } mild frostbite at the tips of { POSS-ADJ($target) } extremities.[/color]
+health-examinable-carbon-Cold-15 = [color=#B1D9ED]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } first-degree frostbite at the ends of { POSS-ADJ($target) } extremities.[/color]
+health-examinable-carbon-Cold-30 = [color=#9CB4DD]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } second-degree frostbite on { POSS-ADJ($target) } extremities.[/color]
+health-examinable-carbon-Cold-50 = [color=#8E9AD3]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major third-degree frostbite on { POSS-ADJ($target) } extremities.[/color]
+health-examinable-carbon-Cold-75 = [color=#7673C4]{ CAPITALIZE(POSS-ADJ($target)) } limbs are dark, cold and necrotic.[/color]
+health-examinable-carbon-Cold-100 = [color=#695BBB]{ CAPITALIZE(POSS-ADJ($target)) } body is covered in extensive fourth-degree frostbite.[/color]
+health-examinable-carbon-Cold-200 = [color=#5B4CB4]{ CAPITALIZE(POSS-ADJ($target)) } body is frozen rock solid![/color]
 
-health-examinable-carbon-Caustic-8 = [color=yellowgreen]{ CAPITALIZE(POSS-ADJ($target)) } skin looks slightly discolored.[/color]
-health-examinable-carbon-Caustic-15 = [color=yellowgreen]{ CAPITALIZE(POSS-ADJ($target)) } skin looks irritated and bleached.[/color]
-health-examinable-carbon-Caustic-30 = [color=yellowgreen]{ CAPITALIZE(POSS-ADJ($target)) } skin is inflamed and beginning to shed.[/color]
-health-examinable-carbon-Caustic-50 = [color=yellowgreen]{ CAPITALIZE(POSS-ADJ($target)) } skin is burnt and peeling off in large chunks.[/color]
-health-examinable-carbon-Caustic-75 = [color=yellowgreen]{ CAPITALIZE(POSS-ADJ($target)) } skin is severely burnt and is sloughing off.[/color]
-health-examinable-carbon-Caustic-100 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } extreme chemical burns across { POSS-ADJ($target) } body.[/color]
-health-examinable-carbon-Caustic-200 = [color=yellowgreen]Most of { POSS-ADJ($target) } body is completely melted![/color]
+health-examinable-carbon-Caustic-8 = [color=#F0C5E8]{ CAPITALIZE(POSS-ADJ($target)) } skin looks slightly discolored.[/color]
+health-examinable-carbon-Caustic-15 = [color=#FAAFDD]{ CAPITALIZE(POSS-ADJ($target)) } skin looks irritated and bleached.[/color]
+health-examinable-carbon-Caustic-30 = [color=#FF9CD2]{ CAPITALIZE(POSS-ADJ($target)) } skin is inflamed and beginning to shed.[/color]
+health-examinable-carbon-Caustic-50 = [color=#FF8ECB]{ CAPITALIZE(POSS-ADJ($target)) } skin is burnt and peeling off in large chunks.[/color]
+health-examinable-carbon-Caustic-75 = [color=#FF7CC0]{ CAPITALIZE(POSS-ADJ($target)) } skin is severely burnt and is sloughing off.[/color]
+health-examinable-carbon-Caustic-100 = [color=#FF6FBA]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } extreme chemical burns across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Caustic-200 = [color=#FF5993]Most of { POSS-ADJ($target) } body is completely melted![/color]
 
-health-examinable-carbon-Radiation-50 = [color=orange]{ CAPITALIZE(POSS-ADJ($target)) } skin has formed large blisters.[/color]
-health-examinable-carbon-Radiation-100 = [color=orange]{ CAPITALIZE(POSS-ADJ($target)) } skin is covered in lesions and is peeling off in chunks.[/color]
+health-examinable-carbon-Radiation-50 = [color=#C6834B]{ CAPITALIZE(POSS-ADJ($target)) } skin has formed large blisters.[/color]
+health-examinable-carbon-Radiation-100 = [color=#E26804]{ CAPITALIZE(POSS-ADJ($target)) } skin is covered in lesions and is peeling off in chunks.[/color]

From 7467e96e993fa0c66309aa219c1b30c0ac577c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Thu, 15 Jan 2026 12:32:37 -0600
Subject: [PATCH 332/360] Rebase vials to DrinkBase, closeable vials, mini
 vials (#36132)

* .rsi

* mini vial

* try stop TryStopNukeOpsFromConstantlyFailing from failing

* slight sprite change

* mail and lathe recipe

* real test fail

* resolve arbitrage

* cleanup

* always forgetting something

* always forgetting something

* drink no more

* remove integrated vial

* initial port

* Rename the rsi states

* Rename the rsi states

* up to standards

* finish

* testfail

* minor touchup

* arby

* op

* mix meta

* small changes to the vials

* commit

* commit

* style nit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
---
 Resources/Migrations/migration.yml            |   3 +
 .../Catalog/Cargo/cargo_medical.yml           |   2 +-
 .../Catalog/Fills/Boxes/medical.yml           |  11 +-
 .../Catalog/Fills/Boxes/syndicate.yml         |   2 +-
 .../Specific/Chemistry/chemistry-vials.yml    | 184 +++++++++---------
 .../Specific/Robotics/borg_modules.yml        |   4 +-
 .../Machines/Medical/chemistry_machines.yml   |   1 +
 .../Recipes/Lathes/Packs/medical.yml          |   3 +-
 .../Prototypes/Recipes/Lathes/chemistry.yml   |  12 +-
 .../vial.rsi/{vial-1-1.png => fill-1.png}     | Bin
 .../vial.rsi/{vial-1-2.png => fill-2.png}     | Bin
 .../vial.rsi/{vial-1-3.png => fill-3.png}     | Bin
 .../vial.rsi/{vial-1-4.png => fill-4.png}     | Bin
 .../vial.rsi/{vial-1-5.png => fill-5.png}     | Bin
 .../vial.rsi/{vial-1-6.png => fill-6.png}     | Bin
 .../vial.rsi/{vial-1.png => icon_empty.png}   | Bin
 .../Specific/Chemistry/vial.rsi/icon_open.png | Bin 0 -> 557 bytes
 .../Specific/Chemistry/vial.rsi/meta.json     | 147 +++++++-------
 .../Chemistry/vial_mini.rsi/fill-1.png        | Bin 0 -> 108 bytes
 .../Chemistry/vial_mini.rsi/fill-2.png        | Bin 0 -> 126 bytes
 .../Chemistry/vial_mini.rsi/fill-3.png        | Bin 0 -> 136 bytes
 .../Chemistry/vial_mini.rsi/fill-4.png        | Bin 0 -> 146 bytes
 .../Chemistry/vial_mini.rsi/fill-5.png        | Bin 0 -> 140 bytes
 .../Chemistry/vial_mini.rsi/icon_empty.png    | Bin 0 -> 464 bytes
 .../Chemistry/vial_mini.rsi/icon_open.png     | Bin 0 -> 472 bytes
 .../vial_mini.rsi/inhand-left-fill-1.png      | Bin 0 -> 122 bytes
 .../vial_mini.rsi/inhand-left-fill-2.png      | Bin 0 -> 130 bytes
 .../vial_mini.rsi/inhand-left-fill-3.png      | Bin 0 -> 138 bytes
 .../vial_mini.rsi/inhand-left-fill-4.png      | Bin 0 -> 142 bytes
 .../Chemistry/vial_mini.rsi/inhand-left.png   | Bin 0 -> 1172 bytes
 .../vial_mini.rsi/inhand-right-fill-1.png     | Bin 0 -> 126 bytes
 .../vial_mini.rsi/inhand-right-fill-2.png     | Bin 0 -> 134 bytes
 .../vial_mini.rsi/inhand-right-fill-3.png     | Bin 0 -> 142 bytes
 .../vial_mini.rsi/inhand-right-fill-4.png     | Bin 0 -> 144 bytes
 .../Chemistry/vial_mini.rsi/inhand-right.png  | Bin 0 -> 1178 bytes
 .../Chemistry/vial_mini.rsi/meta.json         |  72 +++++++
 36 files changed, 270 insertions(+), 171 deletions(-)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1-4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1-5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1-6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Specific/Chemistry/vial.rsi/{vial-1.png => icon_empty.png} (100%)
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_open.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_empty.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_open.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/meta.json

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 6b80aa694b..149b5453f5 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -675,6 +675,9 @@ SimpleXenoArtifactItem: ComplexXenoArtifactItem
 MediumXenoArtifactItem: ComplexXenoArtifactItem
 VariedXenoArtifactItem: ComplexXenoArtifactItem
 
+# 2025-09-12
+BaseChemistryEmptyVial: ChemistryEmptyVial
+
 # 2025-10-6
 BibleTanakh: null
 BibleSatanic: null
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 1addf523e4..3df5a4364e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -24,7 +24,7 @@
     sprite: Objects/Specific/Chemistry/vial.rsi
     state: vial
   product: CrateChemistryVials
-  cost: 1000
+  cost: 1100
   category: cargoproduct-category-name-medical
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index bd57110a7e..0bbe4ac2f7 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -122,12 +122,15 @@
   components:
   - type: Storage
     grid:
-    - 0,0,2,1
+    - 0,0,3,1
   - type: EntityTableContainerFill
     containers:
-      storagebase:
-        id: BaseChemistryEmptyVial
-        amount: 6
+      storagebase: !type:AllSelector
+        children:
+        - id: ChemistryEmptyVial
+          amount: 3
+        - id: ChemistryEmptyVialSmall
+        rolls: 2 # group the small vials on the right column
   - type: Sprite
     layers:
       - state: box
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 7fcfbf2110..4382e69ff9 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -33,7 +33,7 @@
         - id: SyringeStimulants
         - id: VestineChemistryVial
           amount: 2
-        - id: BaseChemistryEmptyVial
+        - id: ChemistryEmptyVial
 
 - type: entity # DeltaV - upstream removed this i think?
   id: Observationskit
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml
index dc32a017c3..a88e5799d1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml
@@ -1,171 +1,179 @@
-# TODO: Have a seperate lid state that can be popped on and off (not as a seperate item) that changes whether the vial can be spilled or not.
-
 - type: entity
-  name: vial
-  parent: BaseItem
-  id: BaseChemistryEmptyVial
-  description: A small vial.
+  abstract: true
+  parent: [ DrinkBaseMaterialGlass, DrinkBase, DrinkBaseOpenable, DrinkBaseEmptyTrash, DrinkVisualsAll ]
+  id: BaseChemistryVial
   components:
+  - type: Item
+    size: Tiny
+  - type: Openable
+    sound:
+      collection: bottleCloseSounds # using closed here for the quieter sound
+    closeable: true
+    closeSound:
+      collection: bottleCloseSounds
+  - type: FitsInDispenser
+    solution: drink
+  - type: ExaminableSolution
+    exactVolume: true # It's a chemistry tool
   - type: Tag
     tags:
     - Trash
-    - CentrifugeCompatible
+    - CentrifugeCompatible # unique feature of vials
     - Vial # Delta V - vial gaming in belts
-  - type: PhysicalComposition
-    materialComposition:
-      Glass: 25
-  - type: FitsInDispenser
-    solution: beaker
-  - type: SpaceGarbage
+
+## Entities
+
+- type: entity
+  parent: BaseChemistryVial
+  id: ChemistryEmptyVial
+  name: vial
+  description: A small vial.
+  components:
+  - type: Item
+    sprite: Objects/Specific/Chemistry/vial.rsi
   - type: Sprite
     sprite: Objects/Specific/Chemistry/vial.rsi
-    layers:
-      - state: vial-1
-      - state: vial-1-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 6
-    fillBaseName: vial-1-
     inHandsMaxFillLevels: 4
-    inHandsFillBaseName: -fill-
-  - type: Edible
-    edible: Drink
-    solution: beaker
-    destroyOnEmpty: false
-    utensil: None
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         maxVol: 30
-  - type: MixableSolution
-    solution: beaker
-  - type: RefillableSolution
-    solution: beaker
-  - type: DrainableSolution
-    solution: beaker
-  - type: ExaminableSolution
-    solution: beaker
-    exactVolume: true
-  - type: DrawableSolution
-    solution: beaker
   - type: SolutionTransfer
     maxTransferAmount: 30
-    canChangeTransferAmount: true
-  - type: SolutionItemStatus
-    solution: beaker
-  - type: UserInterface
-    interfaces:
-      enum.TransferAmountUiKey.Key:
-        type: TransferAmountBoundUserInterface
-  - type: Item
-    size: Tiny
-    sprite: Objects/Specific/Chemistry/vial.rsi
-    shape:
-    - 0,0,0,0
-  - type: MeleeWeapon
-    soundNoDamage:
-      path: "/Audio/Effects/Fluids/splat.ogg"
-    damage:
-      types:
-        Blunt: 0
-  - type: TrashOnSolutionEmpty
-    solution: beaker
   - type: StaticPrice
     price: 100
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 5
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 2
-  - type: Damageable
-    damageContainer: Inorganic
   - type: Destructible
     thresholds:
+    - trigger: &DamageTrigger100
+        !type:DamageTrigger
+        damage: 100
+      behaviors: &OverkillBehavior
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 15
+        damage: 15 # stronger than base
       behaviors:
-      - !type:PlaySoundBehavior
+      - &SoundGlassBreak !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
-          params:
-            volume: -4
       - !type:SpillBehavior { }
       - !type:SpawnEntitiesBehavior
         spawn:
-          ShardGlass:
+          ShardGlass: # less glass than base
             min: 0
             max: 1
         transferForensics: true
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Spillable
-    solution: beaker
-  - type: DnaSubstanceTrace
 
 - type: entity
+  parent: BaseChemistryVial
+  id: ChemistryEmptyVialSmall
+  name: mini vial
+  description: A smaller vial.
+  components:
+  - type: Item
+    sprite: Objects/Specific/Chemistry/vial_mini.rsi
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/vial_mini.rsi
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    inHandsMaxFillLevels: 4
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 10
+  - type: SolutionTransfer
+    maxTransferAmount: 10
+  - type: StaticPrice
+    price: 50
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 10
+  - type: Destructible
+    thresholds:
+    - trigger: *DamageTrigger100
+      behaviors: *OverkillBehavior
+    - trigger:
+        !type:DamageTrigger
+        damage: 5 # smaller so weaker
+      behaviors: # remove glass shard spawn
+      - *SoundGlassBreak
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+## Reagent filled
+
+- type: entity
+  parent: ChemistryEmptyVial
   id: VestineChemistryVial
-  parent: BaseChemistryEmptyVial
   suffix: vestine
   components:
   - type: Label
     currentLabel: reagent-name-vestine
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         maxVol: 30
         reagents:
         - ReagentId: Vestine
           Quantity: 30
-  # - type: Tag # Delta V - removed empty tag array so it inherits tags from the parent
-  #   tags: []
+  - type: Tag
+    tags: &TagVial # Remove trash tag when we have a filled solution
+    - CentrifugeCompatible
+    - Vial # Delta V - vial gaming in belts
 
 - type: entity
+  parent: ChemistryEmptyVialSmall
   id: RadiumChemistryVial
-  parent: BaseChemistryEmptyVial
   suffix: radium
   components:
   - type: Label
     currentLabel: reagent-name-radium
   - type: SolutionContainerManager
     solutions:
-      beaker:
-        maxVol: 5
+      drink:
+        maxVol: 10
         reagents:
           - ReagentId: Radium
             Quantity: 5
+  - type: Tag
+    tags: *TagVial
 
 - type: entity
+  parent: ChemistryEmptyVialSmall
   id: ChlorineChemistryVial
-  parent: BaseChemistryEmptyVial
   suffix: chlorine
   components:
   - type: Label
     currentLabel: reagent-name-chlorine
   - type: SolutionContainerManager
     solutions:
-      beaker:
-        maxVol: 5
+      drink:
+        maxVol: 10
         reagents:
           - ReagentId: Chlorine
             Quantity: 5
+  - type: Tag
+    tags: *TagVial
 
 - type: entity
+  parent: ChemistryEmptyVialSmall
   id: PlasmaChemistryVial
-  parent: BaseChemistryEmptyVial
   suffix: plasma
   components:
   - type: Label
     currentLabel: reagent-name-plasma
   - type: SolutionContainerManager
     solutions:
-      beaker:
+      drink:
         maxVol: 10
         reagents:
           - ReagentId: Plasma
             Quantity: 10
+  - type: Tag
+    tags: *TagVial
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 793b3c8d9f..64530974ca 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1072,10 +1072,10 @@
     - item: SprayBottle
     - item: GasAnalyzer
     - item: BorgDropper
-    - item: BaseChemistryEmptyVial
+    - item: ChemistryEmptyVial
       hand:
         emptyLabel: borg-slot-small-containers-empty
-        emptyRepresentative: BaseChemistryEmptyVial
+        emptyRepresentative: ChemistryEmptyVial
         whitelist:
           components:
           - FitsInDispenser
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
index 9a237937c5..65a84c86aa 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -77,6 +77,7 @@
   - type: Machine
     board: ElectrolysisUnitMachineCircuitboard
 
+# TODO centrifuge should spill the vial if the lid is off
 - type: entity
   id: MachineCentrifuge
   parent: BaseTabletopChemicalMachine
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 1c1a9575d7..0d596bcc72 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -18,7 +18,8 @@
   - Syringe
   - PillCanister
   - HandLabeler
-  - BaseChemistryEmptyVial
+  - ChemistryEmptyVial
+  - ChemistryEmptyVialSmall
   - Dropper
 
 - type: latheRecipePack
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index 93ae4bd90e..c05424e299 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -93,13 +93,21 @@
 #     Steel: 250
 
 - type: latheRecipe
-  id: BaseChemistryEmptyVial
-  result: BaseChemistryEmptyVial
+  id: ChemistryEmptyVial
+  result: ChemistryEmptyVial
   completetime: 2
   materials:
     Glass: 100
     # Wood: 20 # DeltaV - Why wood? Because of the cork? That's dumb.
 
+- type: latheRecipe
+  id: ChemistryEmptyVialSmall
+  result: ChemistryEmptyVialSmall
+  completetime: 2
+  materials:
+    Glass: 50
+    Wood: 20
+
 - type: latheRecipe
   id: ClothingEyesGlassesChemical
   result: ClothingEyesGlassesChemical
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_empty.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png
rename to Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_empty.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_open.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c596d3b1aef0fdc6f1f934f42e3055cc5aa8841c
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005>Nkl<ZScUDD
zy^GXf5XPTp61Q0EEd(1^5ZQom#T7QPwS5%)6Ar}E50D!<jw@^wEv~TD!eHr%g^hx!
zi(r%J`hkteiO6+=lFV3SQBU`TytolzpYny7`DNyL=M6B|Tyy<nMS*ctRaxrw1W6)A
zQT$b?KTB1n9S?`Y7yz55YZjm?2cK+yAt^Vmt)2ydhvQ9Ly?ABK+<m;Uz6*diNjddv
zc2u4dgk4`>IS179JCf}6lc!IeA=s#J7(kX)FS?()Czj5y#GQ_@)3N*cJ6>M9w7UC4
z)tx;+4Poy59v8*2IUG;>TZV@14+2nC_75%4O8em-B0`e1FaiMiU_d}B5rF_On}Ddc
z15nH1lfrIBIxD1UP_D*7Nl`fY`}Ivjs)qpR^0K=lqSS_?h&x@fwgA#&nUJWqpOVNj
zYX#tAQV^iI;U^EkpxSs12Lbf*fxG|e0e9qiI{;ah8sXbK05GUH0K`oLRKdqz;SZj_
zhloHXCPa4A0v^L=9XNh;Sl+wUuLwkLU<IHojc_<{VfG_9ytv2%`}a*+52qQW&R|H}
z@PNCM_3RCRyLeUFw7oPNfJdVdUcP<{0H7J+W&I!sB=j+AWWv&248X>#yYZW6qt9>>
vaE$Nl>EN~oEuwI#3eq&%=^t^f|3=>c6w|}Pmh(f_00000NkvXXu0mjfaTfvA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json
index d7ccba364f..dda7bef533 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json
@@ -1,75 +1,78 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser, taken inspiration by /tg/'s vials",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "vial"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser, taken inspiration by /tg/'s vials. icon_open edit by iaada(GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-1",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-2",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-3",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-4",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-1",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-2",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-3",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-4",
-      "directions": 4
-    },
-    {
-      "name": "vial-1"
-    },
-    {
-      "name": "vial-1-1"
-    },
-    {
-      "name": "vial-1-2"
-    },
-    {
-      "name": "vial-1-3"
-    },
-    {
-      "name": "vial-1-4"
-    },
-    {
-      "name": "vial-1-5"
-    },
-    {
-      "name": "vial-1-6"
-    }
-  ]
+    "states": [
+        {
+            "name": "vial"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-4",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-4",
+            "directions": 4
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..40ecc308515f3f4577e9691e74bc31c73e18bdc1
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzV^0^ykcif|XAK1z40sM7;Cb3_
z5V58xW7-$L{ioMWQt`aBeiFlkmXqfyd3Wzl_@e81>mk!oZo!sK-fNZswKI6S`njxg
HN@xNAh)N{(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..260d0998036483413b5567ebbb1a885324ca598a
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzS5Ftmkcif|7Yw-$IB+l=?0)k9
zzwrM}%e*9+iUgRfr?zH4jGCn4DQ~?@@xpf*!N=CmP1dZ++{J#uAw6w>zWwj_>?)qS
ZW4cy~tPo7>c>y$#!PC{xWt~$(697-ZE1CcR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f5cc1b21a26b46444549597590530a4ad6d819
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdze@_?3kcif|mp1YqaNuBeVE_B?
zH{<RHA}3is2=%VtK2e83P*5=PTS@aD28J_h?iTMl*zv;c{R*u~OLiAux*VrqtX}^7
kpZtyJgum=AE>EV3KfSKHM_Qmh6lgSqr>mdKI;Vst0J&{4k^lez

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecd0e15bf1a9da57bba233abdd7cba4c8ab603ca
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNKY5Xkcif|mo{=S7;-RQ2z&Sc
zzyIIqPnPu^Z`8e^nExt4i{-e0pkSuiYDb2cd}HnZpF^5wM)uBgoW$_r-JkjY!txZ9
u%D%m0c9>Ml8&k-<mUqkjhK`OopO_ld3@&JYo|6i+gu&C*&t;ucLK6VR-8O#!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-5.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5184983bc2bd4bc39c49496da0e28584ea014781
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU{4pvkcif|mmRqd7;v~;<k<WF
z@0Hy>cc;AbI>_SmvOe40v4n@=K-x9lu+Y1{XKvN@<rygLx@h|9(Yvp4f8X4ep77-{
oug9%w=9!kp<#O>13=vORH2>Q@+_3bLGSGMiPgg&ebxsLQ02nMbBme*a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_empty.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d9687db26d86ef42f10185b8ab021057da4ced1
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004(Nkl<ZScUDD
zv1$}i6o$Y5%m@owsasgsXpz7c7839cY%HC9h!6~jR;Cz1B-&-mJVLe=wUQx06xS^T
zXT?U4U|7?nN{ldjkA*3M-Mt}dF<*br|8dT}hYKw&E&rG-@tn%Cw8d`M==E$enIsD+
z`b1gU?YFO*TnaZ97C_RQ(a66a(5b3w26#-lJT`p(-Sp@5+cpOJ*vW85JKJAv_wvm{
zsLn*yix#MBp$lQ~e6*t6JOh;HzV&H`!Rp%M*l<W0K~ZG$hZld`xxf6t%zV}~Hh404
zbZ$4C9go)=PIUwT!(s4Si}vj0Yb5dI!+RWOd}S{%jtd8{XaVr6*RIc2mkT|;+h^(C
z5<;Taiw;i}!2QqBxl`Bi<4hG0p2>c<TV@VQ3QrdBql*?okeRv5jp0W4YXUm9L7OHB
z$Khd87vf*R5u1~#1DGKoP}E`=Uni*p0Inc_Srep$b#h_>g&@2!3@|M98K$WhMK-s8
z{s5Q2`TXKi2g;;N*wWIH`YDC7G`d}*-xpPtv;$iH3w{A$Z;b15=Ho#C0000<MNUMn
GLSTXpP1L#o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_open.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..82bfa70f16123dfbca6d638d46fe0f2434c138b7
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004>Nkl<ZScUDD
zziSjh6vsc`w@Zq%K8URr3RhT2iWGsX?Tz4{5D-g^AZ!RBg-wDMDQvayY9n@mfQW}6
z$X+~uAVEkjMM!56cIR1a3Y93#plGq5a@qIhGw;0_23lHL{xMl%oQk5bg>KjA^=vd6
z{ZXmkQxtaE=YGGR1By)-7f=*-@ztc36dpfZSp;}7p77w_{ng-Z<IN2NJSOF-yZI$$
zDa7%kjpaMg^l$FMG&gSDye(8k<w_D54C;5C!_M`EyUUs7U^(043G1tCD`yVs&fgbk
zB!atsh;y9R=Z*rA<xdj;KY!_R4Upv)0E9%Z7rl6@0Pa5zuRCQKeFBmNglDp*+%j`e
z(&EVie$wj@g3QcaZVaA;lw5ht&)2T>tGzF~+4tM6svsPPC6O?MQ3A6wGkQB^z7N{o
z*#p3u8V0VGVi3E0Yzy37Iw?QkZeCYGiob!=1YQn@y#M$a0EHmDG7K;*^%zFApmMhW
zY<_s2e|j_gic8>(pPilJX^}L9EiEmnkJ9FC*zFqg^I~f&=?-Z5FZc#lnT)lb8dtFZ
O0000<MNUMnLSTXt<kfTl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c4633339101734b2db29e85660724da26e80f2b
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Ogvp2Ln`LH
zz2(Tuz`$|D;7_;R2L}B~VFyIkfDB=Hpy64c!31Iff&CAlF$t**Y8SZQq(-K01&MjO
L`njxgN@xNA;~O7h

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b4a2159245e7105274dd9d1c3f9ee59336eec64
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&=~YLn`LH
zz2zv#puoejQTk7|UWZ1lfeKUDK{cQ}gF|@eTk%<*o75J8ctCI<^lttEc_5?Ss_#Dc
UhZ(E)d;<x4y85}Sb4q9e0RKrO4*&oF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9652fb9fcc460cc818db2c73b977bd2643d7b99d
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Ts&PILn`LH
zy|s~-!GMR!;L87eziO8&ie0q~%-SkI1q>I$Ld%`fCe4vwIC+geNB{^LICt%D{QCLF
eFD3?tgq7^SK5>8HKQUPyB<1Pq=d#Wzp$P!L=qY;u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5973326b8897781716fcd42c18abcc5a294abb44
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUm?-Ln`LH
zy>*b2L4k+)z=MCr;o$-<T@~gI96z^l0#z_PUzN3Q!c3LNZZEufF2sUFfS`eQc|G&}
e_;y~fNXABnYzgik`Fax7AW2VGKbLh*2~7Zk(kS@=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a82b48c905c7f4b56893407f644809641220ba0
GIT binary patch
literal 1172
zcmZ`(O=#3W6wYc})}<|q)S~qeBE49W$wnzn$cAm*{sg+EtSxNu(lnWEL$gVm%(5xP
zvU<^aQ4m2->eWL%DCk+Fc(NiML_vBI1O+c1L@mxF>2|kl2WIBY%lEza=9`&pOizt>
zrOu=%it17)as@nRNl$j*@rk+e1y2dTFg`+UzCHU5FS=n-E#>pnd2A<fC++>^yLde2
zPR#ij@S60*y@BpNiaP3<GeuO)PfEH|<}|}ufLu^^LzWy!*epY&(Lvd=eJRK=Awt47
zaRY`9A!s?n6!X*cCC7vGAjfk&qoin>mOY~+6>?)S9j`LX5<;#7K($)ssuwuNTLfuQ
z6ag;)L0~b0^;d1A1+49#i-PRM$w6QDOc$AsO_R9Vf>S{mh9QaSEvnPd>v`OYXN6e|
z9Y70~p^bcy=F*@Q51FO?3T;1@0}BJl7fj<@(o`4e7qL>K0j?+BA1+i6^ZLjD4FDkU
z{1D3vtRRB={&4xSp-ad_77T@}?<Z7n*h0--f+rGKCQ(+hG<z|_1grr|TE#+)V%kfZ
zZLk(BAsIx#<^YkmIj#&^lpvFhOLGP2J645AuZV+ks78}>{|q8Ru@#}wd5|!@<RAxM
zDbLhZ8$r+Y@bwDw330l^5eH-K=bp7qr0fMa;BH_w9FH{Yp{nC8&xA+Oq~oEeI8vl(
z!!3=TK&U@{14>E;_4lNtHa={%<45*b%?-~4i65WR-8H(i{oU3TQCy>*?)+Qq?K-()
ztMuw5|MRo_s_jHa;z(QaIGwFgvGFLoBi(*Mf9*{(&w4(t&)zz<z24jZ>;8!c?A2t}
zS=&8b`@KDJqnT7^$HvV!yM4vo%FrKYezo?UrS9}Rf4G;RMqTS~SN?XU+?NAmJozK2
Mqf@!fk@@TY0oZ?9n*aa+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7891d4ba53b1d818f59c83eb5f86d27a040441eb
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|EIeHtLn`LH
zy}6N>!GMFs@LT+^%?zxvj+@kX{96T-XJC->+;rEVbfqYm!@yAY{4g`afk^(C%iLcd
SRYyJq346NwxvX<aXaWGuFC+T^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..388c3cb8202ea7e01493c3efc241c8d1da0bd9fb
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%~c)B=-RLpsM
z>mV<K00WET#rpHh8HMDOW~@x$z5&wC&@fNM@~%Pl(yi}!7(slX2>YEcJUu^{85kb;
Y^PYXp{Zoal_zXzG)78&qol`;+0P>S2asU7T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..147ad5acc5143b79afcaaf7694d1a66ff57d5507
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUm?-Ln`LH
zy>*b2L4k+GapV7a$;@591UP4|OxT%!NeZZh!N=9*Po72T<y-M>DFJmL5fCUd`pdIs
fihcidc_61t%2|y2ulw!vCm<<LS3j3^P6<r_i)ksY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e991ee77e3bf3bc57312d40991e472c34a6c1d
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ygXeTLn`LH
zy>*b2L4k+GapV7a$;@28CP>U#nXohek`z!0L$RRXP2SypQNPbl;NqDe3lai?4|}}q
hnYHi7xATI9mPqU|<6%6!>skUx($m$?Wt~$(69ByNDRck;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f835ece480cc136987698860cf10e98fbecd4df
GIT binary patch
literal 1178
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F;Kw~5N4dJ%_q&kz+99W5>XQ2>tmIipR1RclAn~SSCLx)
z)@4&+1!U%?mLw`v<mTiRTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1v5PZJp&~>
zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw
zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj>
z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o
zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA<EXhd)2OQi#;1G1oDM1wlsRso?
zP9`X1t#T6c(ruM0bW>8(5=(PRl<YF|G7|GrbaPVEN^JBY3Q-M!h@zTnqmRW2HXx5%
zMFyo7=jW7yg5J*3%my49D1wMMfM|%orU6+HT|+=den~zsNfl)#d*+p-78Mi$lNZ=N
zBdB$_RiK-Nusbv_v&0T&0Gcq8E~MzOax5w-&o9aj0Y?Q&IO0?VH3<@?NU0Q(1;F7C
z%ma2@Hu~`VWXIKc<rph4lP&jjaSW+oe0$T7uR(!_HQ>?OIdg0q!aw}m+&!<MrA<Jp
zrtijq_swgU{@@T$aA;s)WMY9aL>ph*+&i_t<n+Wf(b>P!_eXm#zwWxpjM?XXRsaJ-
zb3(2+igLI<2;+bg(?rXfYuk1&J3P_y&m@M(*<DXwRWVL%-gNDsoWkp)CtTsW6E+-R
YKT^k4aC~bysPtj*boFyt=akR{0L7YVtpET3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/meta.json
new file mode 100644
index 0000000000..5d77a9c56d
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/meta.json
@@ -0,0 +1,72 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser, taken inspiration by /tg/'s vials. Edited and shrunk by iaada(GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-4",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-4",
+             "directions": 4
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}

From 45bff60c3d54a8c309ab0f282814a1b935c8bb06 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 8 Feb 2026 21:15:02 +0100
Subject: [PATCH 333/360] Downstream fixes for #36132 (Vials)

---
 .../Entities/Markers/Spawners/Random/randomitems.yml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
index 630522170c..e654b3428b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
@@ -191,7 +191,7 @@
           - id: ChemistryEmptyBottle04
         - id: Beaker
         - id: LargeBeaker
-        - id: BaseChemistryEmptyVial
+        - id: ChemistryEmptyVial
         - id: Syringe
         - id: Dropper
         - id: Jug

From 0bf253f9959e491776b11ee73a999fd03f8e22a6 Mon Sep 17 00:00:00 2001
From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Thu, 15 Jan 2026 14:20:00 -0500
Subject: [PATCH 334/360] Add attribution to Tippy.rsi (#42346)

Update meta.json
---
 Resources/Textures/Tips/tippy.rsi/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/Tips/tippy.rsi/meta.json b/Resources/Textures/Tips/tippy.rsi/meta.json
index 68942d731c..9ea90cce18 100644
--- a/Resources/Textures/Tips/tippy.rsi/meta.json
+++ b/Resources/Textures/Tips/tippy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "",
+  "copyright": "Sourced from TG Station at https://github.com/tgstation/tgstation/commit/ab6f97bc7570b74fb04d0dc6c964eb9bcffc4352.",
     "size": {
         "x": 32,
         "y": 32

From 63975c4c49dc492002b7f5fcadaae6fb89160eda Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Thu, 15 Jan 2026 20:45:20 +0100
Subject: [PATCH 335/360] Add Paper Centrifuge (#42040)

* init

* sound

* sprite, half functional construction

* proper recipe

* oops

* loop sound

* inhands

* review

* review squared
---
 .../Reaction/ReactionMixerComponent.cs        |  20 +++++-
 .../Chemistry/Reaction/ReactionMixerSystem.cs |  63 ++++++++++++++++--
 .../Audio/Items/Medical/attributions.yml      |   5 ++
 .../Audio/Items/Medical/paper_centrifuge.ogg  | Bin 0 -> 50386 bytes
 .../chemistry/components/mixing-component.ftl |   1 +
 Resources/Locale/en-US/recipes/tags.ftl       |   4 ++
 .../Consumable/Drinks/drinks_special.yml      |   2 +-
 .../Specific/Chemistry/paper_centrifuge.yml   |  60 +++++++++++++++++
 .../Prototypes/Recipes/Construction/tools.yml |   8 +++
 .../Graphs/improvised/paper_centrifuge.yml    |  39 +++++++++++
 .../Chemistry/paper_centrifuge.rsi/fill-1.png | Bin 0 -> 120 bytes
 .../Chemistry/paper_centrifuge.rsi/fill-2.png | Bin 0 -> 127 bytes
 .../Chemistry/paper_centrifuge.rsi/fill-3.png | Bin 0 -> 129 bytes
 .../Chemistry/paper_centrifuge.rsi/fill-4.png | Bin 0 -> 129 bytes
 .../Chemistry/paper_centrifuge.rsi/icon.png   | Bin 0 -> 825 bytes
 .../paper_centrifuge.rsi/inhand-left.png      | Bin 0 -> 297 bytes
 .../paper_centrifuge.rsi/inhand-right.png     | Bin 0 -> 297 bytes
 .../Chemistry/paper_centrifuge.rsi/meta.json  |  34 ++++++++++
 18 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Audio/Items/Medical/paper_centrifuge.ogg
 create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Chemistry/paper_centrifuge.yml
 create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/paper_centrifuge.yml
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/meta.json

diff --git a/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs b/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
index 25fda25607..247b203e21 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -20,17 +21,34 @@ public sealed partial class ReactionMixerComponent : Component
     [DataField, AutoNetworkedField]
     public LocId MixMessage = "default-mixing-success";
 
+    /// <summary>
+    /// The sound to play when mixing.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? MixingSound;
+
     /// <summary>
     /// Defines if interacting is enough to mix with this component.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public bool MixOnInteract = true;
+    public ReactionMixerType MixerType = ReactionMixerType.Machine;
 
     /// <summary>
     /// How long it takes to mix with this.
     /// </summary>
     [DataField, AutoNetworkedField]
     public TimeSpan TimeToMix = TimeSpan.Zero;
+
+    // Used to cancel the played sound.
+    public EntityUid? AudioStream;
+}
+
+[Serializable, NetSerializable]
+public enum ReactionMixerType
+{
+    None, // Mixing is handled by its own system.
+    Machine, // Mixing is handled via interaction.
+    Handheld // Mixing is handled via using in hand
 }
 
 [ByRefEvent]
diff --git a/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs b/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs
index 4bc878a42f..030c8b890c 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs
@@ -4,7 +4,10 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 
 namespace Content.Shared.Chemistry.Reaction;
 
@@ -13,24 +16,64 @@ public sealed partial class ReactionMixerSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly INetManager _net = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<ReactionMixerComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(IngestionSystem)]);
         SubscribeLocalEvent<ReactionMixerComponent, ShakeEvent>(OnShake);
         SubscribeLocalEvent<ReactionMixerComponent, ReactionMixDoAfterEvent>(OnDoAfter);
     }
 
+    private void OnUseInHand(Entity<ReactionMixerComponent> ent, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (ent.Comp.MixerType != ReactionMixerType.Handheld)
+            return;
+
+        args.Handled = true;
+
+        if (!CanMix(ent.AsNullable(), ent))
+            return;
+
+        if (_net.IsServer) // Cannot cancel predicted audio.
+            ent.Comp.AudioStream = _audio.PlayPvs(ent.Comp.MixingSound, ent)?.Entity;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            ent.Comp.TimeToMix,
+            new ReactionMixDoAfterEvent(),
+            ent,
+            ent,
+            ent)
+        {
+            NeedHand = true,
+            BreakOnDamage = true,
+            BreakOnDropItem = true,
+            BreakOnHandChange = true,
+            BreakOnMove = true
+        };
+
+        _doAfter.TryStartDoAfter(doAfterArgs);
+    }
+
     private void OnAfterInteract(Entity<ReactionMixerComponent> ent, ref AfterInteractEvent args)
     {
-        if (!args.Target.HasValue || !args.CanReach || !ent.Comp.MixOnInteract)
+        if (!args.Target.HasValue || !args.CanReach || ent.Comp.MixerType != ReactionMixerType.Machine)
             return;
 
         if (!CanMix(ent.AsNullable(), args.Target.Value))
             return;
 
+        if (_net.IsServer) // Cannot cancel predicted audio.
+            ent.Comp.AudioStream = _audio.PlayPvs(ent.Comp.MixingSound, ent)?.Entity;
+
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.TimeToMix, new ReactionMixDoAfterEvent(), ent, args.Target.Value, ent);
 
         _doAfter.TryStartDoAfter(doAfterArgs);
@@ -39,6 +82,11 @@ public sealed partial class ReactionMixerSystem : EntitySystem
 
     private void OnDoAfter(Entity<ReactionMixerComponent> ent, ref ReactionMixDoAfterEvent args)
     {
+        ent.Comp.AudioStream = _audio.Stop(ent.Comp.AudioStream);
+
+        if (args.Cancelled)
+            return;
+
         if (args.Target == null)
             return;
 
@@ -46,8 +94,7 @@ public sealed partial class ReactionMixerSystem : EntitySystem
             return;
 
         _popup.PopupClient(
-            Loc.GetString(
-                ent.Comp.MixMessage,
+            Loc.GetString(ent.Comp.MixMessage,
                 ("mixed", Identity.Entity(args.Target.Value, EntityManager)),
                 ("mixer", Identity.Entity(ent.Owner, EntityManager))),
             args.User,
@@ -69,14 +116,18 @@ public sealed partial class ReactionMixerSystem : EntitySystem
         if (!Resolve(ent, ref ent.Comp, false)) // The used entity needs the component to be able to mix a solution
             return false;
 
+        if (!_solutionContainer.TryGetMixableSolution(target, out _, out var mixableSolution))
+            return false;
+
+        // Can't mix nothing.
+        if (mixableSolution.Volume <= 0)
+            return false;
+
         var mixAttemptEvent = new MixingAttemptEvent(ent);
         RaiseLocalEvent(ent, ref mixAttemptEvent);
         if (mixAttemptEvent.Cancelled)
             return false;
 
-        if (!_solutionContainer.TryGetMixableSolution(target, out _, out _))
-            return false;
-
         return true;
     }
 
diff --git a/Resources/Audio/Items/Medical/attributions.yml b/Resources/Audio/Items/Medical/attributions.yml
index a52ea18817..caf152c90d 100644
--- a/Resources/Audio/Items/Medical/attributions.yml
+++ b/Resources/Audio/Items/Medical/attributions.yml
@@ -3,6 +3,11 @@
   copyright: "Taken from FM Synthesis on freesound.org"
   source: "https://freesound.org/people/FreqMan/sounds/32683/"
 
+- files: ["paper_centrifuge.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Taken from temawas on freesound. Cut, converted to .ogg"
+  source: "https://freesound.org/people/temawas/sounds/179248/"
+
 - files: ["jet_injector.ogg"]
   license: "CC-BY-3.0"
   copyright: "Orginal audio by EminYILDIRIM -- https://freesound.org/s/548009/ -- License: Attribution 4.0, 2imitk -- https://freesound.org/s/279044/ -- License: Attribution 3.0 and brunoboselli -- https://freesound.org/s/457294/ -- License: Creative Commons 0 --  https://freesound.org/s/460586/ -- License: Attribution NonCommercial 4.0, modified by Princess-Cheeseballs (GitHub)"
diff --git a/Resources/Audio/Items/Medical/paper_centrifuge.ogg b/Resources/Audio/Items/Medical/paper_centrifuge.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..829512fbfdfb633901bf635b9d75d2bf32309882
GIT binary patch
literal 50386
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%0A{Yb2}ZOazd
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

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/chemistry/components/mixing-component.ftl b/Resources/Locale/en-US/chemistry/components/mixing-component.ftl
index c434246fab..b6ca5226da 100644
--- a/Resources/Locale/en-US/chemistry/components/mixing-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/mixing-component.ftl
@@ -14,4 +14,5 @@ mixing-verb-shake = shake
 default-mixing-success = You mix the {$mixed} with the {$mixer}
 bible-mixing-success = You bless the {$mixed} with the {$mixer}
 spoon-mixing-success = You stir the {$mixed} with the {$mixer}
+handheld-centrifuge-success = You seperate chemicals in the {$mixed}
 
diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 8d739eef6f..db636df773 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -73,6 +73,7 @@ construction-graph-tag-apron = an apron
 construction-graph-tag-utility-belt = a utility belt
 soil-construction-graph-any-mushroom = any mushroom
 construction-graph-tag-mop-basic = mop
+construction-graph-tag-paper = office paper
 construction-graph-tag-core-pinpointer-piece = piece of core pinpointer
 
 # toys
@@ -153,3 +154,6 @@ construction-graph-tag-spationaut-hardsuit = spationaut hardsuit
 
 # clothing
 construction-graph-tag-backpack = backpack
+
+# chemistry
+construction-graph-tag-centrifuge-compatible = centrifugable container
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 3a64df7ca0..6453d8acba 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -131,7 +131,7 @@
       Steel: 50
   - type: Shakeable
   - type: ReactionMixer
-    mixOnInteract: false
+    mixerType: None
     reactionTypes:
     - Shake
   - type: NFShaker # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/paper_centrifuge.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/paper_centrifuge.yml
new file mode 100644
index 0000000000..aaeeb17bf8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/paper_centrifuge.yml
@@ -0,0 +1,60 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseHandheldMixer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      mixer:
+        maxVol: 10
+  - type: MixableSolution
+    solution: mixer
+  - type: RefillableSolution
+    solution: mixer
+  - type: DrainableSolution
+    solution: mixer
+  - type: ExaminableSolution
+    solution: mixer
+    exactVolume: true
+  - type: DrawableSolution
+    solution: mixer
+  - type: InjectableSolution
+    solution: mixer
+  - type: Spillable
+    solution: mixer
+  - type: SolutionTransfer
+  - type: SolutionItemStatus
+    solution: mixer
+  - type: Appearance
+  - type: DnaSubstanceTrace
+  - type: ReactionMixer
+
+- type: entity
+  parent: BaseHandheldMixer
+  id: HandheldMixerPaperCentrifuge
+  name: paper centrifuge
+  description: A small portable makeshift centrifuge. Works by rotating the paper sheets when its cords are pulled.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/paper_centrifuge.rsi
+    layers:
+    - state: icon
+    - state: fill-1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: fill-
+  - type: Construction
+    graph: MakeshiftCentrifuge
+    node: makeshiftCentrifuge
+  - type: ReactionMixer
+    reactionTypes:
+    - Centrifuge
+    mixerType: Handheld
+    mixMessage: handheld-centrifuge-success
+    timeToMix: 10
+    mixingSound: !type:SoundPathSpecifier
+      path: /Audio/Items/Medical/paper_centrifuge.ogg
+      params:
+        loop: true
diff --git a/Resources/Prototypes/Recipes/Construction/tools.yml b/Resources/Prototypes/Recipes/Construction/tools.yml
index ed83abfc1a..6b89f3687a 100644
--- a/Resources/Prototypes/Recipes/Construction/tools.yml
+++ b/Resources/Prototypes/Recipes/Construction/tools.yml
@@ -45,3 +45,11 @@
   targetNode: random_gate
   category: construction-category-tools
   objectType: Item
+
+- type: construction
+  id: MakeshiftCentrifuge
+  graph: MakeshiftCentrifuge
+  startNode: start
+  targetNode: makeshiftCentrifuge
+  category: construction-category-tools
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/paper_centrifuge.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/paper_centrifuge.yml
new file mode 100644
index 0000000000..46c040f881
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/paper_centrifuge.yml
@@ -0,0 +1,39 @@
+# Mortar
+- type: constructionGraph
+  id: MakeshiftCentrifuge
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: makeshiftCentrifuge
+          steps:
+            - material: MetalRod
+              amount: 2
+            - material: Cable
+              amount: 15
+              doAfter: 2
+            - tag: CentrifugeCompatible
+              icon:
+                sprite: Objects/Specific/Chemistry/vial.rsi
+                state: vial
+              name: construction-graph-tag-centrifuge-compatible
+              doAfter: 2
+            - tag: CentrifugeCompatible
+              icon:
+                sprite: Objects/Specific/Chemistry/vial.rsi
+                state: vial
+              name: construction-graph-tag-centrifuge-compatible
+              doAfter: 2
+            - tag: Paper
+              icon:
+                sprite: Objects/Misc/bureaucracy.rsi
+                state: paper
+              name: construction-graph-tag-paper
+            - tag: Paper
+              icon:
+                sprite: Objects/Misc/bureaucracy.rsi
+                state: paper
+              name: construction-graph-tag-paper
+
+    - node: makeshiftCentrifuge
+      entity: HandheldMixerPaperCentrifuge
diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d32accae695d95346652504bd7a9f20d116944d3
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jLm<p3s^QfD6x8x`
zaSVxQeS67Kkime1#qf`{t!P8H-))zJcH6iZ@~&xn&VTnHS&iiZCv)B_{#>QqKih%2
O7(8A5T-G@yGywoqO(5g|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..108a3e79b31dc2d6a1a8fc0c85bdc89e697e8bff
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jLm<p3s^QfD6g2d7
zaSVxQeS6uFm%)I8#WCo=TcG1>MmrN@CcWP~IT*}Vs~fN0T(~Uh8k<A6G}DJx?ovPg
V(pew&JO^rK@O1TaS?83{1OOZ0BG~`{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee4a1f0e4e12eaa27baed34e37af8f859722d46f
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jLm<p3s^QfD6g2j9
zaSVxQeS5``m%)I8#WCo=TcG1>MmrN@CcWRgI2z8rI(g<*&YYDJjM>Z!jtX)z{5Zr~
Xy@|i}JoAT7K<x~ku6{1-oD!M<xfUg?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4f4b6cbc4e729131203d333da43889d5a86dea
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jLm<p3s^QfD6g2j9
zaSVxQeS761CxZfy^T9{|y3@K|@rknRlvdcYK7^6y%fuz>(yzmM7#KgasEd4XWjMfA
X_k_RE<H&y#pmqjNS3j3^P6<r_`1K|0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/icon.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff66cd104890e7b2ce581ebfc4f76eddeefd139b
GIT binary patch
literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ic
z000ic0Tn1pfB*mj>q$gGR9J=WRxNB4K^UFg`@e8^4K)}P21zlMm@^nq2$Gft(-4y4
z&tlGB1*Az02?2w|ohCsMf<cf9nzR)qDYy6kH|+b;w@ml8v%4T_?j@7iotvBY-Z$Sj
zJ4!9F#1+FyGr7@d=p^%+&1T|tvuTK5?Cd06SEm(XB|knolGf|>^l&)TgTX+L$7B8I
z{yk}U$2fjR<NTx%izV;(`_e!PGLU$lr?>V$>4z`h3OVQSc{Ca&65-m&5%Nm4sxq03
z(poEjap}>r*}uEz3zIQmI-RQdd@k>`l@-}Gn}|yV5V>4V7IYj(8s1&kl|~ecMKznv
zL};m0l6gsyeYU+V>V6y?$UwW@cIf{4>Z&-wf><0R5QAqpB}fiY_}z@owMvD_tD}<A
zeZ99A41(PJaWa_*5yM_66r{&E2u)C+zxOf+?`Uz+ux<gv4M%j09%I;df}%iPE|;Z8
zqj(#v=YSbzhyV#h0dV%}@f}~xU2%@+V7^}gk_RBhcErIdfcx*4ow#Q9gAm{t=0F^?
zpTaS2CTpyK8*gsvlP8D4ropXW_p(SnpO-QO5lPYC`fyu)sehJ|Lp6|`m19N`2q*mo
zc_4=fzGD%Dldd6x<J{Zt55B3j_PY9gc6Nab<cySwaMCZt$BY0H4epW6aE=8b29d$o
z^Y>rXR_miW-ux*dAb<xEg~uhKb%S`ozzr9qd$YVcosRTf&kITq$%vj&`zHZRD72{B
zH-!=u$p5BFLgM_ylGCtSs|5*X5`>eB!1f?gI0t}Vr>Cm5yL;)UIrdvXHvmsLI5tCz
z=nxQw$`N<jMSo_JivX4dP_Ng6XDEhp?|grGDx!}&;rLC6bDs$2g#_Pu->rP>aUbA?
z#7{yQgFDWRx(m=fOw(-am5lj-=kS%Rwf|1~UbibP824Qp|Ft5~ozPgwTGUU~hFVkW
z>ZEzNKpZ}0QwfL=VnsO7fGBd{|8K1+5&jk|apm{}_4;agZiqFN00000NkvXXu0mjf
DA})fQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ae3bcfebf2268cda739f7e75b5e9991baeb61de
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5he4R}c>anMpx|v!
z7srr_Id5+r<ZUt#X?U0=(=_RY$zJP5zQ-C8;+I=Cx%%>}aJY2W-r)LQuITW&qSd`R
zV=5C+Cj$dV%IjOQ`sUC3R~C0}<ju|K;e3^mv3q5ZeZ9brzn}hc&CqR}`DU4k-m1OQ
z*7ZB%I-g9PzckF@gM`5`{-&VLnn^W0FQQNBfQ<qX8>FOHI@}diik+5JSTFit`>oX+
z|8?F~JKx0q(Gg1y-q#Ruap{%&#tHuAS0l8emhC&-dd(}Izq$JC&x!xae>~^vxFtW~
j@PF~y%$tFR9f-1J%w@dh&FuR8ILL5MS3j3^P6<r_n^SVo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ae3bcfebf2268cda739f7e75b5e9991baeb61de
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5he4R}c>anMpx|v!
z7srr_Id5+r<ZUt#X?U0=(=_RY$zJP5zQ-C8;+I=Cx%%>}aJY2W-r)LQuITW&qSd`R
zV=5C+Cj$dV%IjOQ`sUC3R~C0}<ju|K;e3^mv3q5ZeZ9brzn}hc&CqR}`DU4k-m1OQ
z*7ZB%I-g9PzckF@gM`5`{-&VLnn^W0FQQNBfQ<qX8>FOHI@}diik+5JSTFit`>oX+
z|8?F~JKx0q(Gg1y-q#Ruap{%&#tHuAS0l8emhC&-dd(}Izq$JC&x!xae>~^vxFtW~
j@PF~y%$tFR9f-1J%w@dh&FuR8ILL5MS3j3^P6<r_n^SVo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/meta.json
new file mode 100644
index 0000000000..a839622821
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chemistry/paper_centrifuge.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites created by DispenserG0inUp(Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

From 693e29c0f21920ac8f2a61bd6bba3e3e68bd1c41 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 9 Feb 2026 18:29:19 +0100
Subject: [PATCH 336/360] Remove downstream construction-graph-tag-paper

---
 Resources/Locale/en-US/_DV/recipes/tags.ftl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl
index 655aac054f..1a84e799a3 100644
--- a/Resources/Locale/en-US/_DV/recipes/tags.ftl
+++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl
@@ -30,7 +30,6 @@ construction-graph-tag-modular-breech = modular breech
 construction-graph-tag-modular-trigger = modular trigger
 construction-graph-tag-bayonet = Bayonet
 construction-graph-tag-half-pipe = half pipe
-construction-graph-tag-paper = Paper
 
 # Fish labeler
 construction-graph-tag-hand-labeler = hand labeler

From 83b2bae7243ef0735d2c173515079bda859cac98 Mon Sep 17 00:00:00 2001
From: Velken <8467292+Velken@users.noreply.github.com>
Date: Thu, 15 Jan 2026 17:22:54 -0300
Subject: [PATCH 337/360] Fix RCD light spam, bypass of indestructible tiles
 and some plating fixes (#42432)

* No more light spam, and some plating fixes

* fixed test
---
 .../Tests/Construction/RCDTest.cs             |  8 +--
 .../Interaction/InteractionTest.Constants.cs  |  1 +
 Content.Shared/RCD/RCDPrototype.cs            |  6 ++
 Content.Shared/RCD/Systems/RCDSystem.cs       | 60 ++++++++++++++++---
 .../en-US/rcd/components/rcd-component.ftl    |  1 +
 Resources/Prototypes/RCD/rcd.yml              |  6 +-
 Resources/Prototypes/Tiles/floors.yml         | 13 +---
 Resources/Prototypes/Tiles/plating.yml        | 28 +++++++++
 8 files changed, 100 insertions(+), 23 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Construction/RCDTest.cs b/Content.IntegrationTests/Tests/Construction/RCDTest.cs
index f20a0cb434..770f004517 100644
--- a/Content.IntegrationTests/Tests/Construction/RCDTest.cs
+++ b/Content.IntegrationTests/Tests/Construction/RCDTest.cs
@@ -38,9 +38,9 @@ public sealed class RCDTest : InteractionTest
         pEast = Transform.WithEntityId(pEast, MapData.Grid);
         pWest = Transform.WithEntityId(pWest, MapData.Grid);
 
-        await SetTile(Plating, SEntMan.GetNetCoordinates(pNorth), MapData.Grid);
-        await SetTile(Plating, SEntMan.GetNetCoordinates(pSouth), MapData.Grid);
-        await SetTile(Plating, SEntMan.GetNetCoordinates(pEast), MapData.Grid);
+        await SetTile(PlatingRCD, SEntMan.GetNetCoordinates(pNorth), MapData.Grid);
+        await SetTile(PlatingRCD, SEntMan.GetNetCoordinates(pSouth), MapData.Grid);
+        await SetTile(PlatingRCD, SEntMan.GetNetCoordinates(pEast), MapData.Grid);
         await SetTile(Lattice, SEntMan.GetNetCoordinates(pWest), MapData.Grid);
 
         Assert.That(ProtoMan.TryIndex(RCDSettingWall, out var settingWall), $"RCDPrototype not found: {RCDSettingWall}.");
@@ -194,7 +194,7 @@ public sealed class RCDTest : InteractionTest
         // Deconstruct the steel tile.
         await Interact(null, pEast);
         await RunSeconds(settingDeconstructTile.Delay + 1); // wait for the deconstruction to finish
-        await AssertTile(Plating, FromServer(pEast));
+        await AssertTile(PlatingRCD, FromServer(pEast));
 
         // Check that the cost of the deconstruction was subtracted from the current charges.
         newCharges = sCharges.GetCurrentCharges(ToServer(rcd));
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
index 3cfb5a5dba..1aac18f3a4 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
@@ -11,6 +11,7 @@ public abstract partial class InteractionTest
     protected const string Floor = "FloorSteel";
     protected const string FloorItem = "FloorTileItemSteel";
     protected const string Plating = "Plating";
+    protected const string PlatingRCD = "PlatingRCD";
     protected const string Lattice = "Lattice";
     protected const string PlatingBrass = "PlatingBrass";
 
diff --git a/Content.Shared/RCD/RCDPrototype.cs b/Content.Shared/RCD/RCDPrototype.cs
index 2be5e1c776..c4ac7148f7 100644
--- a/Content.Shared/RCD/RCDPrototype.cs
+++ b/Content.Shared/RCD/RCDPrototype.cs
@@ -44,6 +44,12 @@ public sealed partial class RCDPrototype : IPrototype
     [DataField, ViewVariables(VVAccess.ReadOnly)]
     public string? Prototype { get; private set; }
 
+    /// <summary>
+    /// If true, allows placing the entity once per direction (North, West, South and East)
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public bool AllowMultiDirection { get; private set; }
+
     /// <summary>
     /// Number of charges consumed when the operation is completed
     /// </summary>
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 8b3ae16a1f..2f1f058a1b 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -146,7 +146,7 @@ public sealed class RCDSystem : EntitySystem
         var tile = _mapSystem.GetTileRef(gridUid.Value, mapGrid, location);
         var position = _mapSystem.TileIndicesFor(gridUid.Value, mapGrid, location);
 
-        if (!IsRCDOperationStillValid(uid, component, gridUid.Value, mapGrid, tile, position, args.Target, args.User))
+        if (!IsRCDOperationStillValid(uid, component, gridUid.Value, mapGrid, tile, position, component.ConstructionDirection, args.Target, args.User))
             return;
 
         if (!_net.IsServer)
@@ -254,7 +254,7 @@ public sealed class RCDSystem : EntitySystem
         var tile = _mapSystem.GetTileRef(gridUid.Value, mapGrid, location);
         var position = _mapSystem.TileIndicesFor(gridUid.Value, mapGrid, location);
 
-        if (!IsRCDOperationStillValid(uid, component, gridUid.Value, mapGrid, tile, position, args.Event.Target, args.Event.User))
+        if (!IsRCDOperationStillValid(uid, component, gridUid.Value, mapGrid, tile, position, args.Event.Direction, args.Event.Target, args.Event.User))
             args.Cancel();
     }
 
@@ -284,7 +284,7 @@ public sealed class RCDSystem : EntitySystem
         var position = _mapSystem.TileIndicesFor(gridUid.Value, mapGrid, location);
 
         // Ensure the RCD operation is still valid
-        if (!IsRCDOperationStillValid(uid, component, gridUid.Value, mapGrid, tile, position, args.Target, args.User))
+        if (!IsRCDOperationStillValid(uid, component, gridUid.Value, mapGrid, tile, position, args.Direction, args.Target, args.User))
             return;
 
         // Finalize the operation (this should handle prediction properly)
@@ -319,6 +319,11 @@ public sealed class RCDSystem : EntitySystem
     #region Entity construction/deconstruction rule checks
 
     public bool IsRCDOperationStillValid(EntityUid uid, RCDComponent component, EntityUid gridUid, MapGridComponent mapGrid, TileRef tile, Vector2i position, EntityUid? target, EntityUid user, bool popMsgs = true)
+    {
+        return IsRCDOperationStillValid(uid, component, gridUid, mapGrid, tile, position, component.ConstructionDirection, target, user, popMsgs);
+    }
+
+    public bool IsRCDOperationStillValid(EntityUid uid, RCDComponent component, EntityUid gridUid, MapGridComponent mapGrid, TileRef tile, Vector2i position, Direction direction, EntityUid? target, EntityUid user, bool popMsgs = true)
     {
         var prototype = _protoManager.Index(component.ProtoId);
 
@@ -355,7 +360,7 @@ public sealed class RCDSystem : EntitySystem
         {
             case RcdMode.ConstructTile:
             case RcdMode.ConstructObject:
-                return IsConstructionLocationValid(uid, component, gridUid, mapGrid, tile, position, user, popMsgs);
+                return IsConstructionLocationValid(uid, component, gridUid, mapGrid, tile, position, direction, user, popMsgs);
             case RcdMode.Deconstruct:
                 return IsDeconstructionStillValid(uid, tile, target, user, popMsgs);
         }
@@ -363,7 +368,7 @@ public sealed class RCDSystem : EntitySystem
         return false;
     }
 
-    private bool IsConstructionLocationValid(EntityUid uid, RCDComponent component, EntityUid gridUid, MapGridComponent mapGrid, TileRef tile, Vector2i position, EntityUid user, bool popMsgs = true)
+    private bool IsConstructionLocationValid(EntityUid uid, RCDComponent component, EntityUid gridUid, MapGridComponent mapGrid, TileRef tile, Vector2i position, Direction direction, EntityUid user, bool popMsgs = true)
     {
         var prototype = _protoManager.Index(component.ProtoId);
 
@@ -406,8 +411,24 @@ public sealed class RCDSystem : EntitySystem
                 return false;
             }
 
+            var tileDef = _turf.GetContentTileDefinition(tile);
+
+            // Check rule: Respect baseTurf and baseWhitelist
+            if (prototype.Prototype != null && _tileDefMan.TryGetDefinition(prototype.Prototype, out var replacementDef))
+            {
+                var replacementContentDef = (ContentTileDefinition) replacementDef;
+
+                if (replacementContentDef.BaseTurf != tileDef.ID && !replacementContentDef.BaseWhitelist.Contains(tileDef.ID))
+                {
+                    if (popMsgs)
+                        _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-empty-tile-message"), uid, user);
+
+                    return false;
+                }
+            }
+
             // Check rule: Tiles can't be identical
-            if (_turf.GetContentTileDefinition(tile).ID == prototype.Prototype)
+            if (tileDef.ID == prototype.Prototype)
             {
                 if (popMsgs)
                     _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-identical-tile"), uid, user);
@@ -430,6 +451,28 @@ public sealed class RCDSystem : EntitySystem
 
         foreach (var ent in _intersectingEntities)
         {
+            // If the entity is the exact same prototype as what we are trying to build, then block it.
+            // This is to prevent spamming objects on the same tile (e.g. lights)
+            if (prototype.Prototype != null && MetaData(ent).EntityPrototype?.ID == prototype.Prototype)
+            {
+                var isIdentical = true;
+
+                if (prototype.AllowMultiDirection)
+                {
+                    var entDirection = Transform(ent).LocalRotation.GetCardinalDir();
+                    if (entDirection != direction)
+                        isIdentical = false;
+                }
+
+                if (isIdentical)
+                {
+                    if (popMsgs)
+                        _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-identical-entity"), uid, user);
+
+                    return false;
+                }
+            }
+
             if (isWindow && HasComp<SharedCanBuildWindowOnTopComponent>(ent))
                 continue;
 
@@ -534,7 +577,10 @@ public sealed class RCDSystem : EntitySystem
         switch (prototype.Mode)
         {
             case RcdMode.ConstructTile:
-                _mapSystem.SetTile(gridUid, mapGrid, position, new Tile(_tileDefMan[prototype.Prototype].TileId));
+                if (!_tileDefMan.TryGetDefinition(prototype.Prototype, out var tileDef))
+                    return;
+
+                _tile.ReplaceTile(tile, (ContentTileDefinition) tileDef, gridUid, mapGrid);
                 _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {gridUid} {position} to {prototype.Prototype}");
                 break;
 
diff --git a/Resources/Locale/en-US/rcd/components/rcd-component.ftl b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
index 9741bde388..17fda9111e 100644
--- a/Resources/Locale/en-US/rcd/components/rcd-component.ftl
+++ b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
@@ -29,6 +29,7 @@ rcd-component-must-build-on-subfloor-message = You can only build that on expose
 rcd-component-cannot-build-on-subfloor-message = You can't build that on exposed subfloor!
 rcd-component-cannot-build-on-occupied-tile-message = You can't build here, the space is already occupied!
 rcd-component-cannot-build-identical-tile = That tile already exists there!
+rcd-component-cannot-build-identical-entity = That already exists there!
 
 
 ### Category names
diff --git a/Resources/Prototypes/RCD/rcd.yml b/Resources/Prototypes/RCD/rcd.yml
index bbfc02581b..77650766f3 100644
--- a/Resources/Prototypes/RCD/rcd.yml
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -37,7 +37,7 @@
   category: WallsAndFlooring
   sprite: /Textures/Interface/Radial/RCD/plating.png
   mode: ConstructTile
-  prototype: Plating
+  prototype: PlatingRCD
   cost: 1
   delay: 1
   collisionMask: InteractImpassable
@@ -128,6 +128,7 @@
     - IsWindow
   rotation: User
   fx: EffectRCDConstruct1
+  allowMultiDirection: true
 
 - type: rcd
   id: ReinforcedWindow
@@ -157,6 +158,7 @@
     - IsWindow
   rotation: User
   fx: EffectRCDConstruct2
+  allowMultiDirection: true
 
 # Airlocks
 - type: rcd
@@ -208,6 +210,7 @@
   collisionBounds: "-0.23,-0.49,0.23,-0.36"
   rotation: User
   fx: EffectRCDConstruct1
+  allowMultiDirection: true
 
 - type: rcd
   id: BulbLight
@@ -221,6 +224,7 @@
   collisionBounds: "-0.23,-0.49,0.23,-0.36"
   rotation: User
   fx: EffectRCDConstruct1
+  allowMultiDirection: true
 
 # Electrical
 - type: rcd
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index dfd6426eaf..4abcdf8a14 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -22,6 +22,8 @@
   - FloorPlanetGrass
   - FloorSnow
   - FloorDirt
+  - PlatingRCD
+  - FloorHullReinforced
 
 - type: tile
   id: FloorSteel
@@ -1607,17 +1609,6 @@
     collection: FootstepHull
   itemDrop: FloorTileItemSteel #probably should not be normally obtainable, but the game shits itself and dies when you try to put null here
 
-- type: tile
-  id: FloorHullReinforced
-  parent: BaseStationTile
-  name: tiles-hull-reinforced
-  sprite: /Textures/Tiles/hull_reinforced.png
-  footstepSounds:
-    collection: FootstepHull
-  itemDrop: FloorTileItemSteel
-  heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0
-  indestructible: true
-
 - type: tile
   id: FloorReinforcedHardened
   parent: BaseStationTile
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 0b71e17c2c..3584a398ff 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -17,6 +17,34 @@
   name: tiles-plating
   sprite: /Textures/_DV/Tiles/plating.png #Delta V - Resprite Tile
 
+- type: tile
+  id: PlatingRCD
+  parent: Plating
+  baseWhitelist:
+    - TrainLattice
+    - FloorPlanetDirt
+    - FloorDesert
+    - FloorLowDesert
+    - FloorPlanetGrass
+    - FloorSnow
+    - FloorDirt
+    - FloorAsteroidIronsand
+    - FloorAsteroidSand
+    - FloorAsteroidSandBorderless
+    - FloorAsteroidIronsandBorderless
+    - FloorAsteroidSandRedBorderless
+
+- type: tile
+  id: FloorHullReinforced
+  parent: BasePlating
+  name: tiles-hull-reinforced
+  sprite: /Textures/Tiles/hull_reinforced.png
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemSteel
+  heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0
+  indestructible: true
+
 - type: tile
   id: PlatingDamaged
   parent: BasePlating

From d4da14de280ca0e8c65cd3ecfa878892f752a1e3 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Fri, 16 Jan 2026 07:21:55 +1000
Subject: [PATCH 338/360] Camera map (#39684)

* Camera map

* I hope this helps

* Review 1

* Review 2

* Review 3

* Review 4

* Review 5

* Colorblind mode support

* Review 6

* Change design

* Map wire

* Logic fix

* Fix a terrible mistake

* Fix

* Fix 2

* Small rename

* More fix

* Better removal

* And another fix

* Will it work?

* It is literally pointless

* some small things
---
 .../UI/SurveillanceCameraMonitorBoundUi.cs    |  10 +-
 .../UI/SurveillanceCameraMonitorWindow.xaml   |  84 +++++++---
 .../SurveillanceCameraMonitorWindow.xaml.cs   |  47 +++++-
 .../UI/SurveillanceCameraNavMapControl.cs     | 130 +++++++++++++++
 .../CameraMapVisibilityWireAction.cs          |  38 +++++
 .../Systems/SurveillanceCameraMapSystem.cs    | 148 ++++++++++++++++++
 .../SurveillanceCameraMonitorSystem.cs        |  19 ++-
 .../Systems/SurveillanceCameraSystem.cs       |   4 +-
 .../SurveillanceCameraMapComponent.cs         |  64 ++++++++
 .../SharedSurveillanceCameraMonitorSystem.cs  |   4 +-
 .../surveillance-camera-ui.ftl                |   7 +
 Resources/Prototypes/Wires/layouts.yml        |   1 +
 12 files changed, 519 insertions(+), 37 deletions(-)
 create mode 100644 Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs
 create mode 100644 Content.Server/SurveillanceCamera/CameraMapVisibilityWireAction.cs
 create mode 100644 Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs
 create mode 100644 Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs

diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
index e3646c00cc..561744cf62 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
@@ -34,11 +34,17 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter
         _window.SubnetRefresh += OnSubnetRefresh;
         _window.CameraSwitchTimer += OnCameraSwitchTimer;
         _window.CameraDisconnect += OnCameraDisconnect;
+
+        var xform = EntMan.GetComponent<TransformComponent>(Owner);
+        var gridUid = xform.GridUid ?? xform.MapUid;
+
+        if (gridUid is not null)
+            _window?.SetMap(gridUid.Value);
     }
 
-    private void OnCameraSelected(string address)
+    private void OnCameraSelected(string address, string? subnet)
     {
-        SendMessage(new SurveillanceCameraMonitorSwitchMessage(address));
+        SendMessage(new SurveillanceCameraMonitorSwitchMessage(address, subnet));
     }
 
     private void OnSubnetRequest(string subnet)
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml
index 8f996b8171..855a20b17c 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml
@@ -1,25 +1,71 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:viewport="clr-namespace:Content.Client.Viewport"
+               xmlns:local="clr-namespace:Content.Client.SurveillanceCamera.UI"
                Title="{Loc 'surveillance-camera-monitor-ui-window'}">
-    <BoxContainer Orientation="Horizontal">
-        <BoxContainer Orientation="Vertical" MinWidth="350" VerticalExpand="True">
-            <!-- lazy -->
-            <OptionButton Name="SubnetSelector" />
-            <Button Name="SubnetRefreshButton" Text="{Loc 'surveillance-camera-monitor-ui-refresh-subnets'}" />
-            <ScrollContainer VerticalExpand="True">
-                <ItemList Name="SubnetList" />
-            </ScrollContainer>
-            <Button Name="CameraRefreshButton" Text="{Loc 'surveillance-camera-monitor-ui-refresh-cameras'}" />
-            <Button Name="CameraDisconnectButton" Text="{Loc 'surveillance-camera-monitor-ui-disconnect'}" />
-            <Label Name="CameraStatus" />
+    <BoxContainer>
+        <!-- Panel with tabs -->
+        <BoxContainer Orientation="Vertical" MinWidth="350">
+            <TabContainer Name="ViewModeTabs" VerticalExpand="True">
+                <!-- Camera list tab -->
+                <BoxContainer Name="{Loc 'surveillance-camera-monitor-ui-tab-list'}" Orientation="Vertical">
+                    <OptionButton Name="SubnetSelector"/>
+                    <Button Name="SubnetRefreshButton" Text="{Loc 'surveillance-camera-monitor-ui-refresh-subnets'}"/>
+                    <ScrollContainer VerticalExpand="True">
+                        <ItemList Name="SubnetList"/>
+                    </ScrollContainer>
+                    <Button Name="CameraRefreshButton" Text="{Loc 'surveillance-camera-monitor-ui-refresh-cameras'}"/>
+                </BoxContainer>
+
+                <!-- Map view tab -->
+                <BoxContainer Name="{Loc 'surveillance-camera-monitor-ui-tab-map'}" Orientation="Vertical" VerticalExpand="True">
+                    <local:SurveillanceCameraNavMapControl Name="CameraMap"
+                                                           VerticalExpand="True"
+                                                           HorizontalExpand="True"
+                                                           MinSize="350 350"/>
+
+                    <!-- Map legend -->
+                    <BoxContainer Name="LegendContainer" Margin="0 10">
+                        <TextureRect Stretch="KeepAspectCentered"
+                                     TexturePath="/Textures/Interface/NavMap/beveled_triangle.png"
+                                     Modulate="#FF00FF"
+                                     SetSize="20 20"
+                                     Margin="10 0 5 0"/>
+                        <Label Text="{Loc 'surveillance-camera-monitor-ui-legend-active'}"/>
+
+                        <TextureRect Stretch="KeepAspectCentered"
+                                     TexturePath="/Textures/Interface/NavMap/beveled_triangle.png"
+                                     SetSize="20 20"
+                                     Modulate="#fbff19ff"
+                                     Margin="10 0 5 0"/>
+                        <Label Text="{Loc 'surveillance-camera-monitor-ui-legend-selected'}"/>
+
+                        <TextureRect Stretch="KeepAspectCentered"
+                                     TexturePath="/Textures/Interface/NavMap/beveled_circle.png"
+                                     SetSize="20 20"
+                                     Modulate="#a09f9fff"
+                                     Margin="10 0 5 0"/>
+                        <Label Text="{Loc 'surveillance-camera-monitor-ui-legend-inactive'}"/>
+
+                        <TextureRect Stretch="KeepAspectCentered"
+                                     TexturePath="/Textures/Interface/NavMap/beveled_square.png"
+                                     SetSize="20 20"
+                                     Modulate="#fa1f1fff"
+                                     Margin="10 0 5 0"/>
+                        <Label Text="{Loc 'surveillance-camera-monitor-ui-legend-invalid'}"/>
+                    </BoxContainer>
+                    <Button Name="SubnetRefreshButtonMap" Text="{Loc 'surveillance-camera-monitor-ui-refresh-subnets'}"/>
+                </BoxContainer>
+            </TabContainer>
+            <Button Name="CameraDisconnectButton" Text="{Loc 'surveillance-camera-monitor-ui-disconnect'}"/>
+        </BoxContainer>
+
+        <!-- Right panel with camera view -->
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+            <Label Name="CameraStatus"/>
+            <Control VerticalExpand="True" Margin="5" Name="CameraViewBox">
+                <viewport:ScalingViewport Name="CameraView" MinSize="500 500" MouseFilter="Ignore"/>
+                <TextureRect MinSize="500 500" Name="CameraViewBackground" />
+            </Control>
         </BoxContainer>
-        <Control VerticalExpand="True" HorizontalExpand="True" Margin="5 5 5 5" Name="CameraViewBox">
-            <viewport:ScalingViewport Name="CameraView"
-                                      VerticalExpand="True"
-                                      HorizontalExpand="True"
-                                      MinSize="500 500"
-                                      MouseFilter="Ignore" />
-            <TextureRect VerticalExpand="True" HorizontalExpand="True" MinSize="500 500" Name="CameraViewBackground" />
-        </Control>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
index ac82fbff59..aa71958289 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -3,6 +3,7 @@ using Content.Client.Resources;
 using Content.Client.Viewport;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.SurveillanceCamera;
+using Content.Shared.SurveillanceCamera.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -21,8 +22,15 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
 
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+
+    /// <summary>
+    /// Triggered when a camera is selected.
+    /// First parameter contains the camera's address.
+    /// Second optional parameter contains a subnet - if possible, the monitor will switch to this subnet.
+    /// </summary>
+    public event Action<string, string?>? CameraSelected;
 
-    public event Action<string>? CameraSelected;
     public event Action<string>? SubnetOpened;
     public event Action? CameraRefresh;
     public event Action? SubnetRefresh;
@@ -33,6 +41,7 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
     private bool _isSwitching;
     private readonly FixedEye _defaultEye = new();
     private readonly Dictionary<string, int> _subnetMap = new();
+    private EntityUid? _mapUid;
 
     private string? SelectedSubnet
     {
@@ -68,11 +77,15 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
         SubnetSelector.OnItemSelected += args =>
         {
             // piss
-            SubnetOpened!((string) args.Button.GetItemMetadata(args.Id)!);
+            SubnetOpened?.Invoke((string) args.Button.GetItemMetadata(args.Id)!);
         };
-        SubnetRefreshButton.OnPressed += _ => SubnetRefresh!();
-        CameraRefreshButton.OnPressed += _ => CameraRefresh!();
-        CameraDisconnectButton.OnPressed += _ => CameraDisconnect!();
+        SubnetRefreshButton.OnPressed += _ => SubnetRefresh?.Invoke();
+        SubnetRefreshButtonMap.OnPressed += _ => SubnetRefresh?.Invoke();
+        CameraRefreshButton.OnPressed += _ => CameraRefresh?.Invoke();
+        CameraDisconnectButton.OnPressed += _ => CameraDisconnect?.Invoke();
+
+        CameraMap.EnableCameraSelection = true;
+        CameraMap.CameraSelected += OnCameraMapSelected;
     }
 
 
@@ -80,6 +93,9 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
     // pass it here so that the UI can change its view.
     public void UpdateState(IEye? eye, HashSet<string> subnets, string activeAddress, string activeSubnet, Dictionary<string, string> cameras)
     {
+        CameraMap.SetActiveCameraAddress(activeAddress);
+        CameraMap.SetAvailableSubnets(subnets);
+
         _currentAddress = activeAddress;
         SetCameraView(eye);
 
@@ -189,6 +205,25 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
 
     private void OnSubnetListSelect(ItemList.ItemListSelectedEventArgs args)
     {
-        CameraSelected!((string) SubnetList[args.ItemIndex].Metadata!);
+        CameraSelected!((string) SubnetList[args.ItemIndex].Metadata!, null);
+    }
+
+    public void SetMap(EntityUid mapUid)
+    {
+        CameraMap.MapUid = _mapUid = mapUid;
+    }
+
+    private void OnCameraMapSelected(NetEntity netEntity)
+    {
+        if (_mapUid is null || !_entityManager.TryGetComponent<SurveillanceCameraMapComponent>(_mapUid.Value, out var mapComp))
+            return;
+
+        if (!mapComp.Cameras.TryGetValue(netEntity, out var marker) || !marker.Active)
+            return;
+
+        if (!string.IsNullOrEmpty(marker.Address))
+            CameraSelected?.Invoke(marker.Address, marker.Subnet);
+        else
+            _entityManager.RaisePredictiveEvent(new RequestCameraMarkerUpdateMessage(netEntity));
     }
 }
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs
new file mode 100644
index 0000000000..7370566f81
--- /dev/null
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs
@@ -0,0 +1,130 @@
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Map;
+using Content.Client.Pinpointer.UI;
+using Content.Client.Resources;
+using Content.Shared.SurveillanceCamera.Components;
+
+namespace Content.Client.SurveillanceCamera.UI;
+
+public sealed class SurveillanceCameraNavMapControl : NavMapControl
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    private static readonly Color CameraActiveColor = Color.FromHex("#FF00FF");
+    private static readonly Color CameraInactiveColor = Color.FromHex("#a09f9fff");
+    private static readonly Color CameraSelectedColor = Color.FromHex("#fbff19ff");
+    private static readonly Color CameraInvalidColor = Color.FromHex("#fa1f1fff");
+
+    private readonly Texture _activeTexture;
+    private readonly Texture _inactiveTexture;
+    private readonly Texture _selectedTexture;
+    private readonly Texture _invalidTexture;
+
+    private string _activeCameraAddress = string.Empty;
+    private HashSet<string> _availableSubnets = new();
+    private (Dictionary<NetEntity, CameraMarker> Cameras, string ActiveAddress, HashSet<string> AvailableSubnets) _lastState;
+
+    public bool EnableCameraSelection { get; set; }
+
+    public event Action<NetEntity>? CameraSelected;
+
+
+    public SurveillanceCameraNavMapControl()
+    {
+        IoCManager.InjectDependencies(this);
+
+        _activeTexture = _resourceCache.GetTexture("/Textures/Interface/NavMap/beveled_triangle.png");
+        _selectedTexture = _activeTexture;
+        _inactiveTexture = _resourceCache.GetTexture("/Textures/Interface/NavMap/beveled_circle.png");
+        _invalidTexture = _resourceCache.GetTexture("/Textures/Interface/NavMap/beveled_square.png");
+
+        TrackedEntitySelectedAction += entity =>
+        {
+            if (entity.HasValue)
+                CameraSelected?.Invoke(entity.Value);
+        };
+    }
+
+    public void SetActiveCameraAddress(string address)
+    {
+        if (_activeCameraAddress == address)
+            return;
+
+        _activeCameraAddress = address;
+        ForceNavMapUpdate();
+    }
+
+    public void SetAvailableSubnets(HashSet<string> subnets)
+    {
+        if (_availableSubnets.SetEquals(subnets))
+            return;
+
+        _availableSubnets = subnets;
+        ForceNavMapUpdate();
+    }
+
+    protected override void UpdateNavMap()
+    {
+        base.UpdateNavMap();
+
+        if (MapUid is null || !_entityManager.TryGetComponent<SurveillanceCameraMapComponent>(MapUid, out var mapComp))
+            return;
+
+        var currentState = (mapComp.Cameras, _activeCameraAddress, _availableSubnets);
+        if (_lastState.Equals(currentState))
+            return;
+
+        _lastState = currentState;
+        UpdateCameraMarkers(mapComp);
+    }
+
+    private void UpdateCameraMarkers(SurveillanceCameraMapComponent mapComp)
+    {
+        TrackedEntities.Clear();
+
+        if (MapUid is null)
+            return;
+
+        foreach (var (netEntity, marker) in mapComp.Cameras)
+        {
+            if (!marker.Visible || !_availableSubnets.Contains(marker.Subnet))
+                continue;
+
+            var coords = new EntityCoordinates(MapUid.Value, marker.Position);
+
+            Texture texture;
+            Color color;
+
+            if (string.IsNullOrEmpty(marker.Address))
+            {
+                color = CameraInvalidColor;
+                texture = _invalidTexture;
+            }
+            else if (marker.Address == _activeCameraAddress)
+            {
+                color = CameraSelectedColor;
+                texture = _selectedTexture;
+            }
+            else if (marker.Active)
+            {
+                color = CameraActiveColor;
+                texture = _activeTexture;
+            }
+            else
+            {
+                color = CameraInactiveColor;
+                texture = _inactiveTexture;
+            }
+
+            TrackedEntities[netEntity] = new NavMapBlip(
+                coords,
+                texture,
+                color,
+                false,
+                EnableCameraSelection
+            );
+        }
+    }
+}
diff --git a/Content.Server/SurveillanceCamera/CameraMapVisibilityWireAction.cs b/Content.Server/SurveillanceCamera/CameraMapVisibilityWireAction.cs
new file mode 100644
index 0000000000..a673cf383f
--- /dev/null
+++ b/Content.Server/SurveillanceCamera/CameraMapVisibilityWireAction.cs
@@ -0,0 +1,38 @@
+using Content.Server.Wires;
+using Content.Shared.SurveillanceCamera.Components;
+using Content.Shared.Wires;
+
+namespace Content.Server.SurveillanceCamera;
+
+public sealed partial class CameraMapVisibilityWireAction : ComponentWireAction<SurveillanceCameraComponent>
+{
+    private SurveillanceCameraMapSystem _cameraMapSystem => EntityManager.System<SurveillanceCameraMapSystem>();
+
+    public override string Name { get; set; } = "wire-name-camera-map";
+    public override Color Color { get; set; } = Color.Teal;
+    public override object StatusKey => "OnMapVisibility";
+
+    public override StatusLightState? GetLightState(Wire wire, SurveillanceCameraComponent component)
+    {
+        return _cameraMapSystem.IsCameraVisible(wire.Owner)
+            ? StatusLightState.On
+            : StatusLightState.Off;
+    }
+
+    public override bool Cut(EntityUid user, Wire wire, SurveillanceCameraComponent component)
+    {
+        _cameraMapSystem.SetCameraVisibility(wire.Owner, false);
+        return true;
+    }
+
+    public override bool Mend(EntityUid user, Wire wire, SurveillanceCameraComponent component)
+    {
+        _cameraMapSystem.SetCameraVisibility(wire.Owner, true);
+        return true;
+    }
+
+    public override void Pulse(EntityUid user, Wire wire, SurveillanceCameraComponent component)
+    {
+
+    }
+}
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs
new file mode 100644
index 0000000000..efc9e2569f
--- /dev/null
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs
@@ -0,0 +1,148 @@
+using System.Numerics;
+using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.SurveillanceCamera.Components;
+
+namespace Content.Server.SurveillanceCamera;
+
+public sealed class SurveillanceCameraMapSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<SurveillanceCameraComponent, MoveEvent>(OnCameraMoved);
+        SubscribeLocalEvent<SurveillanceCameraComponent, EntityUnpausedEvent>(OnCameraUnpaused);
+
+        SubscribeNetworkEvent<RequestCameraMarkerUpdateMessage>(OnRequestCameraMarkerUpdate);
+    }
+
+    private void OnCameraUnpaused(EntityUid uid, SurveillanceCameraComponent comp, ref EntityUnpausedEvent args)
+    {
+        if (Terminating(uid))
+            return;
+
+        UpdateCameraMarker((uid, comp));
+    }
+
+    private void OnCameraMoved(EntityUid uid, SurveillanceCameraComponent comp, ref MoveEvent args)
+    {
+        if (Terminating(uid))
+            return;
+
+        var oldGridUid = _transform.GetGrid(args.OldPosition);
+        var newGridUid = _transform.GetGrid(args.NewPosition);
+
+        if (oldGridUid != newGridUid && oldGridUid is not null && !Terminating(oldGridUid.Value))
+        {
+            if (TryComp<SurveillanceCameraMapComponent>(oldGridUid, out var oldMapComp))
+            {
+                var netEntity = GetNetEntity(uid);
+                if (oldMapComp.Cameras.Remove(netEntity))
+                    Dirty(oldGridUid.Value, oldMapComp);
+            }
+        }
+
+        if (newGridUid is not null && !Terminating(newGridUid.Value))
+            UpdateCameraMarker((uid, comp));
+    }
+
+    private void OnRequestCameraMarkerUpdate(RequestCameraMarkerUpdateMessage args)
+    {
+        var cameraEntity = GetEntity(args.CameraEntity);
+
+        if (TryComp<SurveillanceCameraComponent>(cameraEntity, out var comp)
+            && HasComp<DeviceNetworkComponent>(cameraEntity))
+            UpdateCameraMarker((cameraEntity, comp));
+    }
+
+    /// <summary>
+    /// Updates camera data in the SurveillanceCameraMapComponent for the specified camera entity.
+    /// </summary>
+    public void UpdateCameraMarker(Entity<SurveillanceCameraComponent> camera)
+    {
+        var (uid, comp) = camera;
+
+        if (Terminating(uid))
+            return;
+
+        if (!TryComp(uid, out TransformComponent? xform) || !TryComp(uid, out DeviceNetworkComponent? deviceNet))
+            return;
+
+        var gridUid = xform.GridUid ?? xform.MapUid;
+        if (gridUid is null)
+            return;
+
+        var netEntity = GetNetEntity(uid);
+
+        var mapComp = EnsureComp<SurveillanceCameraMapComponent>(gridUid.Value);
+        var worldPos = _transform.GetWorldPosition(xform);
+        var gridMatrix = _transform.GetInvWorldMatrix(Transform(gridUid.Value));
+        var localPos = Vector2.Transform(worldPos, gridMatrix);
+
+        var address = deviceNet.Address;
+        var subnet = deviceNet.ReceiveFrequencyId ?? string.Empty;
+        var powered = CompOrNull<ApcPowerReceiverComponent>(uid)?.Powered ?? true;
+        var active = comp.Active && powered;
+
+        bool exists = mapComp.Cameras.TryGetValue(netEntity, out var existing);
+
+        if (exists &&
+            existing.Position.Equals(localPos) &&
+            existing.Active == active &&
+            existing.Address == address &&
+            existing.Subnet == subnet)
+        {
+            return;
+        }
+
+        var visible = exists ? existing.Visible : true;
+
+        mapComp.Cameras[netEntity] = new CameraMarker
+        {
+            Position = localPos,
+            Active = active,
+            Address = address,
+            Subnet = subnet,
+            Visible = visible
+        };
+        Dirty(gridUid.Value, mapComp);
+    }
+
+    /// <summary>
+    /// Sets the visibility state of a camera on the camera map.
+    /// </summary>
+    public void SetCameraVisibility(EntityUid cameraUid, bool visible)
+    {
+        if (!TryComp(cameraUid, out TransformComponent? xform))
+            return;
+
+        var gridUid = xform.GridUid ?? xform.MapUid;
+        if (gridUid == null || !TryComp<SurveillanceCameraMapComponent>(gridUid.Value, out var mapComp))
+            return;
+
+        var netEntity = GetNetEntity(cameraUid);
+        if (mapComp.Cameras.TryGetValue(netEntity, out var marker))
+        {
+            marker.Visible = visible;
+            mapComp.Cameras[netEntity] = marker;
+            Dirty(gridUid.Value, mapComp);
+        }
+    }
+
+    /// <summary>
+    /// Checks if a camera is currently visible on the camera map.
+    /// </summary>
+    public bool IsCameraVisible(EntityUid cameraUid)
+    {
+        if (!TryComp(cameraUid, out TransformComponent? xform))
+            return false;
+
+        var gridUid = xform.GridUid ?? xform.MapUid;
+        if (gridUid == null || !TryComp<SurveillanceCameraMapComponent>(gridUid, out var mapComp))
+            return false;
+
+        var netEntity = GetNetEntity(cameraUid);
+        return mapComp.Cameras.TryGetValue(netEntity, out var marker) && marker.Visible;
+    }
+}
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index 4f59654bb9..8a68e74855 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -185,7 +185,7 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
         // there would be a null check here, but honestly
         // whichever one is the "latest" switch message gets to
         // do the switch
-        TrySwitchCameraByAddress(uid, message.Address, component);
+        TrySwitchCameraByAddress(uid, message.Address, message.CameraSubnet, component);
     }
 
     private void OnPowerChanged(EntityUid uid, SurveillanceCameraMonitorComponent component, ref PowerChangedEvent args)
@@ -426,15 +426,18 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
         UpdateUserInterface(uid, monitor);
     }
 
-    private void TrySwitchCameraByAddress(EntityUid uid, string address,
-        SurveillanceCameraMonitorComponent? monitor = null)
+    private void TrySwitchCameraByAddress(EntityUid uid, string address, string? cameraSubnet = null, SurveillanceCameraMonitorComponent? monitor = null)
     {
-        if (!Resolve(uid, ref monitor)
-            || string.IsNullOrEmpty(monitor.ActiveSubnet)
-            || !monitor.KnownSubnets.TryGetValue(monitor.ActiveSubnet, out var subnetAddress))
-        {
+        if (!Resolve(uid, ref monitor))
+            return;
+
+        if (cameraSubnet != null && cameraSubnet != monitor.ActiveSubnet)
+            SetActiveSubnet(uid, cameraSubnet, monitor);
+
+        var activeSubnet = monitor.ActiveSubnet;
+
+        if (string.IsNullOrEmpty(activeSubnet) || !monitor.KnownSubnets.TryGetValue(activeSubnet, out var subnetAddress))
             return;
-        }
 
         var payload = new NetworkPayload()
         {
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 06fba6638d..cdd032c79c 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -21,7 +21,7 @@ public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
     [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-
+    [Dependency] private readonly SurveillanceCameraMapSystem _cameraMapSystem = default!;
 
     // Pings a surveillance camera subnet. All cameras will always respond
     // with a data message if they are on the same subnet.
@@ -270,6 +270,8 @@ public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
         }
 
         UpdateVisuals(camera, component);
+
+        _cameraMapSystem.UpdateCameraMarker((camera, component));
     }
 
     public void AddActiveViewer(EntityUid camera, EntityUid player, EntityUid? monitor = null, SurveillanceCameraComponent? component = null, ActorComponent? actor = null)
diff --git a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs
new file mode 100644
index 0000000000..86e199e2e9
--- /dev/null
+++ b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs
@@ -0,0 +1,64 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SurveillanceCamera.Components;
+
+/// <summary>
+/// Stores surveillance camera data for the camera map.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SurveillanceCameraMapComponent : Component
+{
+    /// <summary>
+    /// Dictionary of cameras on on the current grid.
+    /// </summary>
+    [AutoNetworkedField]
+    public Dictionary<NetEntity, CameraMarker> Cameras = new();
+}
+
+/// <summary>
+/// Represents a camera marker on the camera map.
+/// </summary>
+[Serializable, NetSerializable, DataDefinition]
+public partial struct CameraMarker
+{
+    /// <summary>
+    /// Position of the camera in local map coordinates.
+    /// </summary>
+    [DataField]
+    public Vector2 Position;
+
+    /// <summary>
+    /// Whether the camera is active.
+    /// </summary>
+    [DataField]
+    public bool Active;
+
+    /// <summary>
+    /// Network address of the camera.
+    /// </summary>
+    [DataField]
+    public string Address;
+
+    /// <summary>
+    /// Subnet the camera is connected to.
+    /// </summary>
+    [DataField]
+    public string Subnet;
+
+    /// <summary>
+    /// Should the camera be displayed on the camera map.
+    /// </summary>
+    [DataField]
+    public bool Visible = true;
+}
+
+/// <summary>
+/// Network event for requesting camera marker updates.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class RequestCameraMarkerUpdateMessage(NetEntity cameraEntity) : EntityEventArgs
+{
+    public NetEntity CameraEntity { get; } = cameraEntity;
+}
diff --git a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
index aa03e7aee9..1a71d32575 100644
--- a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
+++ b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
@@ -39,10 +39,12 @@ public sealed class SurveillanceCameraMonitorUiState : BoundUserInterfaceState
 public sealed class SurveillanceCameraMonitorSwitchMessage : BoundUserInterfaceMessage
 {
     public string Address { get; }
+    public string? CameraSubnet { get; }
 
-    public SurveillanceCameraMonitorSwitchMessage(string address)
+    public SurveillanceCameraMonitorSwitchMessage(string address, string? cameraSubnet = null)
     {
         Address = address;
+        CameraSubnet = cameraSubnet;
     }
 }
 
diff --git a/Resources/Locale/en-US/surveillance-camera/surveillance-camera-ui.ftl b/Resources/Locale/en-US/surveillance-camera/surveillance-camera-ui.ftl
index 9cb32b6eaf..79cdd6487f 100644
--- a/Resources/Locale/en-US/surveillance-camera/surveillance-camera-ui.ftl
+++ b/Resources/Locale/en-US/surveillance-camera/surveillance-camera-ui.ftl
@@ -7,7 +7,14 @@ surveillance-camera-monitor-ui-status-connecting = Connecting:
 surveillance-camera-monitor-ui-status-connected = Connected:
 surveillance-camera-monitor-ui-status-disconnected = Disconnected
 surveillance-camera-monitor-ui-no-subnets = No Subnets
+surveillance-camera-monitor-ui-tab-list = List
+surveillance-camera-monitor-ui-tab-map = Map
+surveillance-camera-monitor-ui-legend-active = Active
+surveillance-camera-monitor-ui-legend-inactive = Inactive
+surveillance-camera-monitor-ui-legend-selected = Selected
+surveillance-camera-monitor-ui-legend-invalid = Invalid
 
 surveillance-camera-setup = Setup
 surveillance-camera-setup-ui-set = Set
 
+wire-name-camera-map = MAP
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 8162433d8d..a333d37ffe 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -111,6 +111,7 @@
   wires:
   - !type:PowerWireAction
   - !type:AiVisionWireAction
+  - !type:CameraMapVisibilityWireAction
 
 - type: wireLayout
   id: CryoPod

From 86d91c8cba920639dd76c97475cd3d53e1f1f535 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Fri, 16 Jan 2026 01:19:42 +0100
Subject: [PATCH 339/360] Add Mortar and Handheld Juicer (#42019)

* init

* API

* testing

* review

* return

* good enough, fix later

TODO:
Proper prototype
DoAfter
Sounds

* "proper" prototype

TODO
DoAfter
Sprite

* proper protos, mortar sprite

* juicer sprites

TODO:
Juicer sounds
Makeshift crafting recipes
Add regular to vendors

* sprite tweak

* juicing sound, cleanup, construction

* vendors

* line end

* attribution newline

* small balance tweak

* Let it be known id never webedit

* meta

* item size

* review

* handhelds

* partial review

* cache solution, looping

* graph

* review

* popup

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
---
 .../EntitySystems/ReagentGrinderSystem.cs     |   1 -
 .../EntitySystems/HandheldGrinderSystem.cs    | 151 ++++++++++++++++
 .../Components/HandheldGrinderComponent.cs    |  54 ++++++
 .../Components/ReagentGrinderComponent.cs     |   1 -
 .../SharedReagentGrinderSystem.cs             |   1 -
 .../Audio/Items/Culinary/attributions.yml     |   9 +
 .../Audio/Items/Culinary/juicer_juicing.ogg   | Bin 0 -> 45810 bytes
 .../Audio/Items/Culinary/mortar_grinding.ogg  | Bin 0 -> 62722 bytes
 .../kitchen/components/handheld-grinder.ftl   |   6 +
 .../Inventories/dinnerware.yml                |   2 +
 .../VendingMachines/Inventories/nutri.yml     |   2 +
 .../Objects/Specific/Kitchen/equipment.yml    | 170 ++++++++++++++++++
 .../Prototypes/Recipes/Construction/tools.yml |  14 ++
 .../Graphs/improvised/handheld_grinders.yml   |  80 +++++++++
 .../Kitchen/handheld_juicer.rsi/cap.png       | Bin 0 -> 229 bytes
 .../Kitchen/handheld_juicer.rsi/fill-1.png    | Bin 0 -> 124 bytes
 .../Kitchen/handheld_juicer.rsi/fill-2.png    | Bin 0 -> 145 bytes
 .../Kitchen/handheld_juicer.rsi/fill-3.png    | Bin 0 -> 158 bytes
 .../Kitchen/handheld_juicer.rsi/fill-4.png    | Bin 0 -> 164 bytes
 .../Kitchen/handheld_juicer.rsi/icon.png      | Bin 0 -> 411 bytes
 .../handheld_juicer.rsi/inhand-left.png       | Bin 0 -> 294 bytes
 .../handheld_juicer.rsi/inhand-right.png      | Bin 0 -> 292 bytes
 .../handheld_juicer.rsi/juicer_base.png       | Bin 0 -> 318 bytes
 .../makeshift-inhand-left.png                 | Bin 0 -> 313 bytes
 .../makeshift-inhand-right.png                | Bin 0 -> 310 bytes
 .../handheld_juicer.rsi/makeshift_base.png    | Bin 0 -> 328 bytes
 .../handheld_juicer.rsi/makeshift_icon.png    | Bin 0 -> 421 bytes
 .../Kitchen/handheld_juicer.rsi/meta.json     |  54 ++++++
 .../Kitchen/mortar_and_pestle.rsi/fill-1.png  | Bin 0 -> 124 bytes
 .../Kitchen/mortar_and_pestle.rsi/fill-2.png  | Bin 0 -> 145 bytes
 .../Kitchen/mortar_and_pestle.rsi/fill-3.png  | Bin 0 -> 157 bytes
 .../Kitchen/mortar_and_pestle.rsi/fill-4.png  | Bin 0 -> 169 bytes
 .../Kitchen/mortar_and_pestle.rsi/icon.png    | Bin 0 -> 392 bytes
 .../mortar_and_pestle.rsi/inhand-left.png     | Bin 0 -> 283 bytes
 .../mortar_and_pestle.rsi/inhand-right.png    | Bin 0 -> 278 bytes
 .../makeshift-inhand-left.png                 | Bin 0 -> 302 bytes
 .../makeshift-inhand-right.png                | Bin 0 -> 297 bytes
 .../mortar_and_pestle.rsi/makeshift_base.png  | Bin 0 -> 353 bytes
 .../mortar_and_pestle.rsi/makeshift_icon.png  | Bin 0 -> 414 bytes
 .../Kitchen/mortar_and_pestle.rsi/meta.json   |  54 ++++++
 .../mortar_and_pestle.rsi/mortar_base.png     | Bin 0 -> 363 bytes
 .../Kitchen/mortar_and_pestle.rsi/pestle.png  | Bin 0 -> 251 bytes
 42 files changed, 596 insertions(+), 3 deletions(-)
 create mode 100644 Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs
 create mode 100644 Content.Shared/Kitchen/Components/HandheldGrinderComponent.cs
 create mode 100644 Resources/Audio/Items/Culinary/attributions.yml
 create mode 100644 Resources/Audio/Items/Culinary/juicer_juicing.ogg
 create mode 100644 Resources/Audio/Items/Culinary/mortar_grinding.ogg
 create mode 100644 Resources/Locale/en-US/kitchen/components/handheld-grinder.ftl
 create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Kitchen/equipment.yml
 create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/handheld_grinders.yml
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/cap.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/juicer_base.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_base.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_base.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/mortar_base.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/pestle.png

diff --git a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 5eebd4a0fb..0aaa8ba8d8 100644
--- a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -5,4 +5,3 @@ namespace Content.Client.Kitchen.EntitySystems;
 
 [UsedImplicitly]
 public sealed class ReagentGrinderSystem : SharedReagentGrinderSystem;
-
diff --git a/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs b/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs
new file mode 100644
index 0000000000..30e61c8501
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs
@@ -0,0 +1,151 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Destructible;
+using Content.Shared.DoAfter;
+using Content.Shared.Fluids;
+using Content.Shared.Interaction;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Popups;
+using Content.Shared.Stacks;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+internal sealed class HandheldGrinderSystem : EntitySystem
+{
+    [Dependency] private readonly SharedReagentGrinderSystem _reagentGrinder = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+    [Dependency] private readonly SharedStackSystem _stackSystem = default!;
+    [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedPuddleSystem _puddle = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HandheldGrinderComponent, EntRemovedFromContainerMessage>(OnGrinderRemoved);
+        SubscribeLocalEvent<HandheldGrinderComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<HandheldGrinderComponent, HandheldGrinderDoAfterEvent>(OnHandheldDoAfter);
+    }
+
+    // prevent the infamous UdderSystem debug assert, see https://github.com/space-wizards/space-station-14/pull/35314
+    // TODO: find a better solution than copy pasting this into every shared system that caches solution entities
+    private void OnGrinderRemoved(Entity<HandheldGrinderComponent> entity, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and set it to null
+        if (args.Entity != entity.Comp.GrinderSolution?.Owner)
+            return;
+
+        entity.Comp.GrinderSolution = null;
+    }
+
+    private void OnInteractUsing(Entity<HandheldGrinderComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        var item = args.Used;
+
+        if (!CanGrinderBeUsed(ent, item, out var reason))
+        {
+            _popup.PopupClient(reason, ent, args.User);
+            return;
+        }
+
+        if (_reagentGrinder.GetGrinderSolution(item, ent.Comp.Program) is null)
+            return;
+
+        if (!_solution.ResolveSolution(ent.Owner, ent.Comp.SolutionName, ref ent.Comp.GrinderSolution))
+            return;
+
+        if (_net.IsServer) // Cannot cancel predicted audio.
+            ent.Comp.AudioStream = _audio.PlayPvs(ent.Comp.Sound, ent)?.Entity;
+
+        var doAfter = new DoAfterArgs(EntityManager, args.User, ent.Comp.DoAfterDuration, new HandheldGrinderDoAfterEvent(), ent, ent, item)
+        {
+            NeedHand = true,
+            BreakOnDamage = true,
+            BreakOnDropItem = true,
+            BreakOnHandChange = true,
+            BreakOnMove = true
+        };
+
+        _doAfter.TryStartDoAfter(doAfter);
+    }
+
+    private void OnHandheldDoAfter(Entity<HandheldGrinderComponent> ent, ref HandheldGrinderDoAfterEvent args)
+    {
+        ent.Comp.AudioStream = _audio.Stop(ent.Comp.AudioStream);
+
+        if (args.Cancelled)
+            return;
+
+        if (args.Used is not { } item)
+            return;
+
+        if (!CanGrinderBeUsed(ent, item, out var reason))
+        {
+            _popup.PopupClient(reason, ent, args.User);
+            return;
+        }
+
+        if (_reagentGrinder.GetGrinderSolution(item, ent.Comp.Program) is not { } obtainedSolution)
+            return;
+
+        if (!_solution.ResolveSolution(ent.Owner, ent.Comp.SolutionName, ref ent.Comp.GrinderSolution, out var solution))
+            return;
+
+        _solution.TryMixAndOverflow(ent.Comp.GrinderSolution.Value, obtainedSolution, solution.MaxVolume, out var overflow);
+
+        if (overflow != null)
+            _puddle.TrySpillAt(ent, overflow, out _);
+
+        if (TryComp<StackComponent>(item, out var stack))
+            _stackSystem.ReduceCount((item, stack), 1);
+        else
+            _destructibleSystem.DestroyEntity(item);
+
+        _popup.PopupClient(Loc.GetString(ent.Comp.FinishedPopup, ("item", item)), ent, args.User);
+    }
+
+    /// <summary>
+    /// Checks whether the respective handheld grinder can currently be used.
+    /// </summary>
+    /// <param name="ent">The grinder entity.</param>
+    /// <param name="item">The item it is being used on.</param>
+    /// <param name="reason">Reason the grinder cannot be used. Null if the function returns true.</param>
+    /// <returns>True if the grinder can be used, otherwise false.</returns>
+    public bool CanGrinderBeUsed(Entity<HandheldGrinderComponent> ent, EntityUid item, [NotNullWhen(false)] out string? reason)
+    {
+        reason = null;
+        if (ent.Comp.Program == GrinderProgram.Grind && !_reagentGrinder.CanGrind(item))
+        {
+            reason = Loc.GetString("handheld-grinder-cannot-grind", ("item", item));
+            return false;
+        }
+
+        if (ent.Comp.Program == GrinderProgram.Juice && !_reagentGrinder.CanJuice(item))
+        {
+            reason = Loc.GetString("handheld-grinder-cannot-juice", ("item", item));
+            return false;
+        }
+
+        return true;
+    }
+}
+
+/// <summary>
+/// DoAfter used to indicate the handheld grinder is in use.
+/// After it ends, the GrinderProgram from <see cref="HandheldGrinderComponent"/> is used on the contents.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class HandheldGrinderDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Kitchen/Components/HandheldGrinderComponent.cs b/Content.Shared/Kitchen/Components/HandheldGrinderComponent.cs
new file mode 100644
index 0000000000..c32d11ddb8
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/HandheldGrinderComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Chemistry.Components;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Kitchen.Components;
+
+/// <summary>
+/// Indicates this entity is a handheld grinder.
+/// Entities with <see cref="ExtractableComponent"/> can be used on handheld grinders to extract their solutions.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class HandheldGrinderComponent : Component
+{
+    /// <summary>
+    /// The length of the doAfter.
+    /// After it ends, the respective GrinderProgram is used on the contents.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DoAfterDuration = TimeSpan.FromSeconds(4f);
+
+    /// <summary>
+    /// Popup to use after the current item is done processing.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId FinishedPopup = "handheld-grinder-default";
+
+    /// <summary>
+    /// The sound to play when the doAfter starts.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/Culinary/mortar_grinding.ogg", AudioParams.Default.WithLoop(true));
+
+    /// <summary>
+    /// The grinder program to use.
+    /// Decides whether this one will Juice or Grind the objects.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public GrinderProgram Program = GrinderProgram.Grind;
+
+    /// <summary>
+    /// The solution into which the output reagents will go.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string SolutionName = "grinderOutput";
+
+    /// <summary>
+    /// Cached solution from the grinder.
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? GrinderSolution;
+
+    // Used to cancel the sound.
+    public EntityUid? AudioStream;
+}
diff --git a/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
index 6b8eb6f4ac..d884198a4c 100644
--- a/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
+++ b/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
@@ -51,4 +51,3 @@ public sealed partial class ActiveReagentGrinderComponent : Component
     [ViewVariables]
     public GrinderProgram Program;
 }
-
diff --git a/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
index b54fd1d49e..524a7a19ea 100644
--- a/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
+++ b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
@@ -65,4 +65,3 @@ public abstract class SharedReagentGrinderSystem : EntitySystem
         return ent.Comp.JuiceSolution is not null;
     }
 }
-
diff --git a/Resources/Audio/Items/Culinary/attributions.yml b/Resources/Audio/Items/Culinary/attributions.yml
new file mode 100644
index 0000000000..c5c1c727c0
--- /dev/null
+++ b/Resources/Audio/Items/Culinary/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["mortar_grinding.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from freesound, cleaned up and sped up. Coverted to .ogg"
+  source: "https://freesound.org/people/OlyveBone/sounds/486995/"
+
+- files: ["juicer_juicing.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from freesound. Converted to .ogg"
+  source: "https://freesound.org/people/Edo333/sounds/272208/"
diff --git a/Resources/Audio/Items/Culinary/juicer_juicing.ogg b/Resources/Audio/Items/Culinary/juicer_juicing.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..82a9cd38f4665ad4105dd9f4da02f5cb8c4236de
GIT binary patch
literal 45810
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
E{pF|@jsO4v

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Items/Culinary/mortar_grinding.ogg b/Resources/Audio/Items/Culinary/mortar_grinding.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b6b3a1ee39ecb1ea570f8259df81c593e3c51001
GIT binary patch
literal 62722
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

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/kitchen/components/handheld-grinder.ftl b/Resources/Locale/en-US/kitchen/components/handheld-grinder.ftl
new file mode 100644
index 0000000000..6ab76c2998
--- /dev/null
+++ b/Resources/Locale/en-US/kitchen/components/handheld-grinder.ftl
@@ -0,0 +1,6 @@
+handheld-grinder-cannot-juice = You cannot juice {THE($item)}!
+handheld-grinder-cannot-grind = You cannot grind {THE($item)}!
+
+handheld-grinder-default = You finished processing {THE($item)}.
+handheld-grinder-juiced = You finished juicing {THE($item)}.
+handheld-grinder-grinded = You finished grinding {THE($item)}.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
index d6e84d18de..02df1f4151 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -29,6 +29,8 @@
     DrinkMugRed: 2
     LunchboxGeneric: 10 # DeltaV - Adds Lunchbox
     Skimmer: 2 # DeltaV - Adds skimmer
+    MortarAndPestle: 1
+    HandheldJuicer: 1
   contrabandInventory:
     CandyBowl: 1
     BarSpoon: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
index 9b68de41e4..04f371e425 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -17,6 +17,8 @@
     Bucket: 3
     BoxMouthSwab: 1
     BoxAgrichem: 1
+    MortarAndPestle: 1
+    HandheldJuicer: 1
     #TO DO:
     #plant analyzer
   contrabandInventory:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/equipment.yml
new file mode 100644
index 0000000000..fa1a96a81c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/equipment.yml
@@ -0,0 +1,170 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseHandheldGrinder
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      grinderOutput:
+        maxVol: 20
+  - type: SolutionTransfer
+  - type: DrawableSolution
+    solution: grinderOutput
+  - type: RefillableSolution
+    solution: grinderOutput
+  - type: DrainableSolution
+    solution: grinderOutput
+  - type: Edible
+    edible: Drink
+    solution: grinderOutput
+    destroyOnEmpty: false
+    utensil: Spoon
+  - type: MixableSolution
+    solution: grinderOutput
+  - type: ExaminableSolution
+    solution: grinderOutput
+    exactVolume: true
+  - type: SolutionItemStatus
+    solution: grinderOutput
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: fill-
+  - type: DnaSubstanceTrace
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Spillable
+    solution: grinderOutput
+  - type: Appearance
+  - type: HandheldGrinder
+
+# Mortars
+- type: entity
+  parent: BaseHandheldGrinder
+  id: MortarAndPestle
+  name: mortar and pestle
+  description: Used for grinding small amounts of objects.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/mortar_and_pestle.rsi
+    layers:
+    - state: icon
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
+  - type: HandheldGrinder
+    finishedPopup: handheld-grinder-grinded
+
+- type: entity
+  parent: MortarAndPestle
+  id: MortarAndPestleMakeshift
+  name: makeshift mortar and pestle
+  description: Used for grinding small amounts of objects. Inferior version made out of wood.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/mortar_and_pestle.rsi
+    layers:
+    - state: makeshift_icon
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: makeshift-inhand-left
+      right:
+      - state: makeshift-inhand-right
+  - type: HandheldGrinder
+    doAfterDuration: 6
+  - type: Construction
+    graph: MakeshiftMortarAndPestle
+    node: mortarAndPestle
+
+# Juicers
+- type: entity
+  parent: BaseHandheldGrinder
+  id: HandheldJuicer
+  name: handheld juicer
+  description: Used for juicing small amounts of objects.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/handheld_juicer.rsi
+    layers:
+    - state: juicer_base
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
+    - state: cap
+  - type: HandheldGrinder
+    finishedPopup: handheld-grinder-juiced
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Items/Culinary/juicer_juicing.ogg # Pasta mixing sound. Close enough.
+      params:
+        loop: true
+    program: Juice
+
+- type: entity
+  parent: HandheldJuicer
+  id: HandheldJuicerMakeshift
+  name: makeshift juicer
+  description: Used for juicing small amounts of objects. Inferior version made out of wood.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/handheld_juicer.rsi
+    layers:
+    - state: makeshift_base
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
+    - state: cap
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: makeshift-inhand-left
+      right:
+      - state: makeshift-inhand-right
+  - type: HandheldGrinder
+    doAfterDuration: 6
+  - type: Construction
+    graph: MakeshiftJuicer
+    node: juicer
+
+# Construction
+- type: entity
+  name: incomplete mortar and pestle
+  parent: BaseItem
+  id: IncompleteMortarAndPestle
+  description: A few planks of wood stuck together.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/mortar_and_pestle.rsi
+    state: makeshift_base
+  - type: Item
+    size: Normal
+    inhandVisuals:
+      left:
+      - state: makeshift-inhand-left
+      right:
+      - state: makeshift-inhand-right
+  - type: Construction
+    graph: MakeshiftMortarAndPestle
+    node: incompleteMortarAndPestle
+
+- type: entity
+  name: incomplete handheld juicer
+  parent: BaseItem
+  id: IncompleteHandheldJuicer
+  description: A some wood and plastic stuck together.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/handheld_juicer.rsi
+    state: makeshift_base
+  - type: Item
+    size: Normal
+    inhandVisuals:
+      left:
+      - state: makeshift-inhand-left
+      right:
+      - state: makeshift-inhand-right
+  - type: Construction
+    graph: MakeshiftJuicer
+    node: incompleteJuicer
diff --git a/Resources/Prototypes/Recipes/Construction/tools.yml b/Resources/Prototypes/Recipes/Construction/tools.yml
index 6b89f3687a..bff07cddf1 100644
--- a/Resources/Prototypes/Recipes/Construction/tools.yml
+++ b/Resources/Prototypes/Recipes/Construction/tools.yml
@@ -46,6 +46,20 @@
   category: construction-category-tools
   objectType: Item
 
+- type: construction
+  id: MakeshiftMortarAndPestle
+  graph: MakeshiftMortarAndPestle
+  startNode: start
+  targetNode: mortarAndPestle
+  category: construction-category-tools
+  objectType: Item
+
+- type: construction
+  id: MakeshiftJuicer
+  graph: MakeshiftJuicer
+  startNode: start
+  targetNode: juicer
+
 - type: construction
   id: MakeshiftCentrifuge
   graph: MakeshiftCentrifuge
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/handheld_grinders.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/handheld_grinders.yml
new file mode 100644
index 0000000000..c4b335645d
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/handheld_grinders.yml
@@ -0,0 +1,80 @@
+
+# Mortar
+- type: constructionGraph
+  id: MakeshiftMortarAndPestle
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: incompleteMortarAndPestle
+      steps:
+        - material: WoodPlank
+          amount: 5
+          doAfter: 4
+
+  - node: incompleteMortarAndPestle
+    entity: IncompleteMortarAndPestle
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialWoodPlank1
+        amount: 5
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Prying
+        doAfter: 1
+    - to: mortarAndPestle
+      completed:
+      - !type:AdminLog
+        message: "Construction"
+        impact: High
+      steps:
+      - tool: Slicing
+        doAfter: 4
+
+  - node: mortarAndPestle
+    entity: MortarAndPestleMakeshift
+
+# Juicer
+- type: constructionGraph
+  id: MakeshiftJuicer
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: incompleteJuicer
+      steps:
+      - material: WoodPlank
+        amount: 4
+        doAfter: 2
+      - material: Plastic
+        amount: 2
+        doAfter: 2
+
+  - node: incompleteJuicer
+    entity: IncompleteHandheldJuicer
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialWoodPlank1
+        amount: 4
+      - !type:SpawnPrototype
+        prototype: SheetPlastic1
+        amount: 2
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Prying
+        doAfter: 1
+    - to: juicer
+      completed:
+      - !type:AdminLog
+        message: "Construction"
+        impact: High
+      steps:
+      - tool: Slicing
+        doAfter: 4
+
+  - node: juicer
+    entity: HandheldJuicerMakeshift
diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/cap.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/cap.png
new file mode 100644
index 0000000000000000000000000000000000000000..042021ac395af2fb2df29f59468e342b193220cd
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP;k1Z
zi(^Pc>)Xi(Iaw5WTpuqIx8A^Fz2X1l^xGHsM2uV{3KAucoi*C<LEa-t<sZM45(7g(
zP<E>CfA7n8qGmr@I%U1@3LcB+89fVkI;A^oxHie~StYY&`n$d7=gfTmPmp<eKu;mp
zY2g-u6V?CA>cn?z&j~VG-C=X^C;yUt^St*Zr=9L_k#vkSV$J^hd{MZXoh#5y41Yw~
X*H$IiI4%6Y3&izw^>bP0l+XkKo(@!o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cd73cc7b898fa208a6628dc70e6eb76fe1a7f3e
GIT binary patch
literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*Bg)
z#W5tJ_3gQZf(!}*EF0hNw`6mcyne`d3j@>S8C#=S89pSOx$61r%Xe;uf?VeQ|6E)2
T%J!cG>SXYA^>bP0l+XkKV0R^U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e0287aab3f07521a182b7c6144f42fa05496b1
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP|(@a
z#W5tJH90|ob#a17Pg9@)m)k)GW;ZXB`THy0+V|wHSnoP5G9|MqQb%8#QM~%c4^~$`
eNhGxmj0|Fm+{_!<R6BvjF?hQAxvX<aXaWG#6DFAe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cca57fbd759aa901c0bf8c5900591700287c647
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP%yyL
z#W5tJH90|ob#a17Pg9@)mz!0BO8DcS-Pivu?v{L&Juye_q?Ci$>C;{hrquuV!RpDU
usLhhF&%KP}M3R7lx`^9B4Y=L~3=HwiLM(HW#MT1MX7F_Nb6Mw<&;$VL?Jk1=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-4.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c3d1e43879fb446036ec149b7a488d21f642394
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP%zBX
z#W5tJH90|ob#a17Pg9@)7n_8^q}3n)9L@fJ@hH#NtsZ9mDZB>VPg7M5p2*qNIc{?H
zC}KEKlp~g0%(1agL7QtsE0g6udAN4Bg9{iK^cP98UbDPu3bcX2)78&qol`;+04ZWI
As{jB1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/icon.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d46d6eb14a1f24def0332490e0cd2cb02977e2f
GIT binary patch
literal 411
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|TS4
zr;B4qL~C+_1nc4iksc<lgRifz{~x?)ey7mc{Cj&Cqw8K?Qr#r$IFUIbGE(y2pP$a1
zf={d!OpGMoWQ&Q3vAMaqS<DYP;MBKNAz;q@Qy+eR&o}t}|Ns94yAICD@q26Zlnv8_
zWSJ^mP5;O5t6|;7;gX$|)uhYj+PGwi3bVMlIP)eO4_m`$k4jW`F$N~uC0LnmZb|(1
zMQ#Ig-QQoVV$7CIGo&T<)&6Fi&fb{1dYggItL%f)LKe;setv$Qz{7mJFTO#VZ_)br
z{e07%x68ORUlC^JI3}!f&+*_I1#M=r&6`XZI-4I!Hn&CodGJwq13Sl3)<r^G95*a~
z{sY-=-6Fsc$>YV|{w-H6!|vkF2Y-KmPmoG6IH9<M!9y<6R?(q^qoHBlLSCChE-tP`
z7Az@-o0d*LFRyqiXOc|AX~QK^R$OieH9(;kz{oKB;nFugx;?vrq0Qjw>gTe~DWM4f
DLHwEU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b4f036603151c7e310c41d720279fc7e123e6da
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1FJQ
zi(^Q|oVT|&a<(`Kv?kiFV=&yT=Y2zJ%^|6tp4?+hK4(*`Kg?)lJZxRl{o=2DPQoXN
zwBs4eHGq17z%S~0>Hb}9@q5<kJ&68nlb*R|3u9QyWs{{w#^#<I6<bQIOJkS6-}hd1
zXYTEHp`j;>`&EPuc$_7Zb++YtyQj`trnA$1Q~ZJMt;y!omBk@u0?8l2U9l~<->^UV
z6vkc_yZyKKy1i1XKhModbh_7&8hNREoz?Z9dWS6fChdvNEw+fCW01c5%`{$v<FYMt
fgxMJw8kYZJV4M<uCQs;G0?15HS3j3^P6<r_;vH}D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ef90e271f758277c7f7b44703c32263699d814e
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1F_k
zi(^Q|oVT|w@-{1ov?ksvVPa2|bW31cUclyFAUXX(<B<)Gx@u~*8ygvvzWo;x_We>N
zaQ~es6HqS$!-EFHw6${=wxqvh*m?Hzp1QuGqo+g8shd4k{&H;J`|XELZ_2s;*n-Wz
zdfEFq=PV6<FQ1>Y{=%W(hn%~viOe>B!K|?~EdIjoPmlJ76+sLHnz_Jo?Rnlid3Fk6
zMa&ofGhT~QT&i=e=Soz5edP7hB#E{)?>+U(p51A9AN2g)FE#Po<<DOgGrLb>`Yn6&
gd~}Qr(1d?Cr3-Zut<ATc`3rKSr>mdKI;Vst0GYFPt^fc4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/juicer_base.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/juicer_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9cf206e7297db44e51e5a65ba0e75c4e058564f
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1FAN
zi(^PcYjT1F>*55Fo~A&90}T^ndKXSS`Tye4F#Y-7n<`Z@9kzXWdOBR<)1ya8D%Nco
z>`z3m{@GvfP-)Kpe}AiaOq-gT3br*i+8ti9Pps+L;}C{T0yFtH%gjEyL&m8`c}9V!
zP5nQao<xNM*QJks;+MY%w2WaT^GbC#0Uo7@J>FhkMj9thH5~n=?t5(IJ_CJmANz_w
zEN>W{G8<o*Bs_oeTYkz32R=m>2eD?MmkVoWbIv;Nw1zq1Ait4><<`Z_5$_b#);2JB
z-VC^Yfo-0FBPZ`oMTPE(x_fK>ag=UWv^zc_>!k+NcaE$KLbI}5I35Ka0s5W6)78&q
Iol`;+0IBqQ(f|Me

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-left.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f4e166c8c17f3918c14572c3c25028690a72a16
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1G><
zi(^Q|oVT|&avpLJIrh=zh*{LKLLT!Cn+ll^a$dTX+TtTnz$~q8F0gvGLrzdcM%3&R
zvNB6TKFKQn`hQR~(@ySv+^Xt87NAiK3>N}JLw)a?)+ApkXPj?zj3sl;7RGHSOnj45
z(=sL{eLj2X?ztMX!uz)$X`DQJtvhX&%BMSKCt05S4*s*|^^0#6I~NDZoO3L?owC0{
z|C(HNv0@P;*jOOZV88T+tHhZ)2aV*?gqdrl{!hw|@4fnSURI*hJ%-}FyTxNm*F7&6
z)O+eT$$UjF-+6t%h}h*h6L>e=vgS}!=L4Fs{}pejSNJ2}#A}B^hI+dCxvX<aXaWE;
C&3bzP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-right.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6f479cfc1559e515725c7e7f2b135c41a15ceb0
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1FGP
zi(^Q|oVT|O`I-zwj(yDP*)9HoLw0ZD<Zg3=k1R5c$^}fq`41jF;gzv$@^0rl^{Q#w
zl1}brOLPPN{udJRc<^!RroHMcK$C#BaW4(AEoqZj=FHBqR_FAu+9TR>%Zn^xjs0Ts
zZBk}0`|$Q(&brT!kN&)ASNp6cWU7YW_4StN>ssF)itXZCneDfne?o5fR?Uo_%8zbZ
zmW*ICfy9J4SDv%g<=HLJe$Te(C-atTPF|90C1<|Bb~b)n%$cM6EZA%N%QxCRXY-kE
zRdW6M?iqLIZamMs<s(;4*^zn6cT@n4__JAjiCCiFETtEVL8f}T`njxgN@xNAG!%O?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_base.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..909645742144d1bf9d46fb8a5b2b516a09728df7
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1F+h
zi(^PcYjT1F>*55Fo~A&90}T^ndU-#t`)_ze?48<8n@J`L(N$mX1@lzqs%B1-b>714
zFs=T_kBJXo-qug}_xroN!4(cJu7=FaL^(Fby1GR&jll=^Fy&8CxL5bh&ab=Bl0`(R
zMdo0O_oGYA*AsY{J?pk<OuJwClau){gNLlg-Z=`=j>m;~7Bw*#7kIqT>@f21I^A&8
zX!o>7A@+N9q<rk_f3-Zk_&c7(x#5KgLlK8YT<1s86G;J8GdDaGar_+FQOcn6vG&Ia
z2ET+I3@4IOzP2!U-ZZ!p#y!s<QB(G2Qi^xD{64q4IUVN>mqb}{xgFF1c{PBMVWNKa
VmsT&HS-?<W@O1TaS?83{1OO?reJ}t3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_icon.png b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cba23775665b0c382081910dbd63f877d07fd08a
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}S4l)cR9J;$U>F6XU=)l33c>5wum4k`pNSI9Z{EBCTYl-%C9)ks
zkpoy+SsDKP`9p~j<U61t-WBX?78Vu;Mn*<BpH#p?j-?>rk=e}f`}c1!`~Uy{U_OWm
zSG#aGBQa(Y9ReWBKYaWMw&?1;rwp2!nqZ4TQ6MQP$-u?M1r`U%gVYflA~-`}UV%4?
z0a_8YV7ewHh@oZ9I)nkhD1fDd;_i9q^8X2i1kMn+^x!oZ!@&E)^Wlbr=<C<7!{vZk
zk>T67Zz%F0^>Tu2`0NG)g7H)kU<M8eJq1w)Nog6dn4oPULxisj!-~y&Fldm)An^R@
z6NX3ce-TUzL?slMLj?HwiSiZ5Vo*Amu;COz^NG#{Pv3q4(;q%EFn}C_3xF&}R!;~J
z9ReT_YO4iLn9{;LC=LNxjBM%Z!`Fy1n<NL|atx`Kj)GAz3P!;w7*qfNS{0k{j9do_
P00000NkvXXu0mjfDRHZ+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/meta.json b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/meta.json
new file mode 100644
index 0000000000..d02803a851
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/meta.json
@@ -0,0 +1,54 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by TheShuEd (Github), edited into a juicer and inhands by ScarKy0(GitHub)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "makeshift_icon"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "juicer_base"
+        },
+        {
+            "name": "cap"
+        },
+        {
+            "name": "makeshift_base"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "makeshift-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "makeshift-inhand-left",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cd73cc7b898fa208a6628dc70e6eb76fe1a7f3e
GIT binary patch
literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*Bg)
z#W5tJ_3gQZf(!}*EF0hNw`6mcyne`d3j@>S8C#=S89pSOx$61r%Xe;uf?VeQ|6E)2
T%J!cG>SXYA^>bP0l+XkKV0R^U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e0287aab3f07521a182b7c6144f42fa05496b1
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP|(@a
z#W5tJH90|ob#a17Pg9@)m)k)GW;ZXB`THy0+V|wHSnoP5G9|MqQb%8#QM~%c4^~$`
eNhGxmj0|Fm+{_!<R6BvjF?hQAxvX<aXaWG#6DFAe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..26332bc8b850d61b9983703c95acb3a8daae10d4
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP|)Ag
z#W5tJH90|ob#a17Pg9@)mmA~E2Y-%c|96}bR4j3FV?<mS)AB!ukLyeDeBIh%Ha&&?
vfDGfJiLy+aBv?E))<E?f)R16pW@2Cve=72peOFWs&}arvS3j3^P6<r_#9A)j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-4.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..9560456a5648a99aec25934af957300b556b5a2f
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP%zrl
z#W5tJH90|ob#a17Pg9@)SDTha{l{DN0?V$*h!yFuUHr63$l@vQ*R2wrru`YM28RnH
zdwAsR>JB=rQT8Ze*yQYBvMJeNS`&ljK6$tqZU+}IF!-*O*|m9PzAVrh22WQ%mvv4F
FO#lW1GrIr)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/icon.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6040513c15d0162e1643041b65e9efb197dc0edf
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}I!Q!9R9J;$U>F6XU=$26V5F77p^?e|VeHk*=i;=7iB^_dnwc_4
zN=gz`OLYgpEPwF$3B&W}&lz66e1%s%Rigl#<%jld#%l-J4nU4$7$DVhk{y6-DRR(?
zi;KbIn-t4Ifao-kS5)&KWH1cBfBzngL6*Y+a-4(I6Jst>t^^r&;lf2Q8)PXm5EK-I
zI|Ak~kQfLU80a%h>TAJk2hkxA;OmWI`G*hh!5Acl94atJg47cOScp*s3R)0IjEe!&
z{gWo6I0Ttpn3oG?!xAGQKy)IsbMpNUOKb|VGC0+NECvBklo68<i3$N+mf!-!_#6gE
z%7(B|00C^pEX-n3vLQ(!083;bN8s`$a$+O~kX#b#8rp#KH*)qvxA^k;BSf1^c2Nv-
m2r?kW;!!XPM!_f;GyniJoV~HrGRh|a0000<MNUMnLSTYR#+5Sw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d288cb461d4799f52cc2af6ff18aa119160a83d
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1Gm$
zi(^Q|oVT}bbG8@=v_9OC!#L?$P?KqdYu1LAEox;8dIV-X|9WQE^#9C?{>KY@_W1-c
z0kttOR0L|K?%&;Z+to}_>-S2InaeWITWT-5H|e#lh~n*SOG{(Vf3-Qk$^2>YVh^bc
zQPNc#Pc<zrvh`&4(Z8nm^!uw~MzASBqQU<2#dN_OtDNMwFMh9>rC=%l;HHRq(S(=h
zc_KDvuRT1~=4Q!`&F$Me*I8W;?mOko-J5i~Ugmi5UY*lR(|?>|llafyajy_)&<|I3
X)k{g0Z#FOmg3R`G^>bP0l+XkKUKen9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7766c9c66f7ab03fb8028d03f9ffe086e50b7be4
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1FDO
zi(^Q|oVT}pxehA`v?WGYIrl%1wCQvIkoAc7lApr~wIi9Y<ZI<Q@+LhDew<|jGLM1b
zLDSYU>A8tBMAg=x{c&N>o4xnDmrwEGaQvF9uex}}$)8umrY*93{$98&X!hr&ni@+o
zdJ0e76~8qnlw0BXsx{BfOcr1LgavF8kT|euN$s~vx8o9vkMCuCey1#__P<wY`41mX
z)#TIF%xj}QUH#6yZpyY2?MrWSH*#z*_pbAmOy6%_@GR`X<D2n?pMXaENYB6VBW35&
Ts0N@185lfW{an^LB{Ts5){t^3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-left.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e61052618997d9bfae825e8eb2f65eebc189cb8
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1F4L
zi(^Q|oVU03^EL$t94|CDCKh?X@Xmo#$9R3_GzdyGa{AmkaO@PX%wg6k*Vu|x^mj(p
zssH;~Cp0PiuSFmG*}Xc<KvNhPDgw7gmL*>|*mXk9CDmV4@oU*t-BUA_Ug_?<=OS2?
zfBQ{U^_SPRTc_>SoG<Nqso`10$>5Ernidz?dNTWHUDJE|{Z%m|*dQR$VE_4Ix?qk~
zPV(CqzgNssu#|srQ^dSz!prkK5u3};YRXSipUtQK?St9H(C1aB0xL5X2Il-e-@PdQ
rdi&=E=|4`fN&M&UxK{`?>4&TT9<!u;5!0<%Aj3Uf{an^LB{Ts5h>v)!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-right.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..26ebdd02ffec38ed43023deb8dfa842163f70640
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1G^=
zi(^Q|oVT|&@*Xk}XiaQ>akGtgMaGQ=Q6nd}1SS<TkMnFj2bm^JQ~TgB?UKtjPnp|~
z{x3P<TU6!u=+!w1pb0?Gp0)qwz3^8OnHir~8t-UHi)p!2v#M<VqwT*hUwQ6*VRP|D
z$)oDejkav)vb*)|dyDbMvpcyoHMFX7)<xFUa-Mzpm8oRio7-n9KL>gFK}-aaBHcS1
zPrN$3?e+G3%OBm9l}mEY?6oxikXyA*ef?`&`3Fh2FKt|LTRK@U@yqo~>sOk7-`S|R
lnCbiZy3X0`3=9YCs~L@*Qn%e%6L1M+q^GN&%Q~loCIAbcel7q2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_base.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d376b46ebd063b77c0754bd5b421285b049449c
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|TS5
zr;B4qL~C+_1nc4ik)EbNg98l{V|sZ%uKRCzMC_f~O`Az33ei<x?*;Qz=Bj2+l6Bs~
z{7kgs|NXjec60v!`^(N_+SJ5Uux<H9CFe^mYgx{!pJF^QEqSxVbmxvj7GXm^hDH_p
zXpz(J_xx#TOk`NXw`88g0jHit?(gdvPpb1A{kSioF70~InpX~eGvdT})9mYiv8>{^
zSFqw0VVUt){K50|3BoDK6Q)c%xRNi$kRzt*!>q(ZZNWf$v{(uvo45rY7fUE;N*{7!
zWN}bzJpG7Y-d^ZwwSa;q%e;MmnU*>B9eC<J;i*CC5r#?L>jI*63lddy&m3mp<}K+C
tm*3~MWoL@`QG<2`<{%w8NB}r8GaOSc`^2eXeHa*K44$rjF6*2UngFm_g75$U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_icon.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca2e2632de67910166b47131b410501d682b2ab
GIT binary patch
literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}P)S5VR9J;$U>F6XU=$26V5F774e_r3;p~OGaoWQ~E6dGwlo;d$
z*$Aqox&vUAKY#j!;nDkF3?Dvz#H*gFQGm_z2^&t~wS#O2AjdHbkZL)}4nVf_>b<9M
zacw1Oczly$IY|zfSK$4B``P<&{`>bIz_g9AHkbxE06EU}6hs-4CTyin2q0Syvls>h
z1qHw%00N*;0m<vA$Pn!aqH{r#pDl{zcV2!1V~`lgVwmM1aOKVu26t;iqReF>MiD4z
z85o{06vz95`I%iyQ5>Rz#GYOj4Q9g<BOyR^8Yl=b`!B%H4~}a|X&IdAKo*0*r3bHx
zN{B>-04_^#0b+a(10-cbSSWx1wqh1$F)7)Qq!4)e_6wK>IRck2L6*bR5d%mr2}5nQ
zz=e^tFb@MPG|(+xefS#D=8|0$!yJMPNU?YnjDk@x3I+`T0IxT-*u9z+8vp<R07*qo
IM6N<$f*W+7Y5)KL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/meta.json b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/meta.json
new file mode 100644
index 0000000000..0a9173cdbf
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/meta.json
@@ -0,0 +1,54 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by TheShuEd (Github) | Small tweaks to fill states, makeshift and inhands by ScarKy0 (Github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "makeshift_icon"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "mortar_base"
+        },
+        {
+            "name": "makeshift_base"
+        },
+        {
+            "name": "pestle"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "makeshift-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "makeshift-inhand-left",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/mortar_base.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/mortar_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c128df3680097592c7cfc3da7ab3f8d92a2a769
GIT binary patch
literal 363
zcmV-x0hIoUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$B}qg<R9J=Wl(9<0KoEvM#TQ7EWkJCg5YJvLY>&V-7J>+3?Sa;o)(UsEwS}d<
zh1i?J7dW_suxU1L5DVE5&8;_k%~|XRfow7}|3AylLL?H2MApp4s);A3m-X*&&rgrR
z^@0-GqQ;b+|4OC7X2b@DH@9`3Pnxy0wiA;iN%P+8?K8T+TUuXape?>g*k?pyVpC!O
zV375Hh*y>EJPvCugRC#AyCn%KiUNR(^D_V*M&pHXRb{yzUI8$j&6~Wx5TAjg<E&OH
zMQhFO&bBvhI-3KK=M&yuUzXMv?SN0jhoo~y&=|U10MJ@{g^eji-9z9GxI?H^>h02)
zQZy-!;G1jj;IM}8QEOj3ZQ;+4cX8d7uVQDUO^9$L5{dj9z5qSdb}~q2*q;CZ002ov
JPDHLkV1oY0pwj>V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/pestle.png b/Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/pestle.png
new file mode 100644
index 0000000000000000000000000000000000000000..96a7f164fc5013dd3bb18a17e564863be1ebf448
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}TRmMILn2y}
z6C_v{Cy4Yk1sYspRNl(N)$8+*KY4we-Smv&nJZFvE}f~_ykv>W$tuk<hBKeo`{x_j
z)c>3F@agGrm6yvkxHd%AW!z7jbVlVg<Axv0t`u#ONqGL`cYI6?kKFw!5$6s#BuQN`
z-SSgkPmk?+aF*pszJ!E?26dwuPv76)uYNs`jg8G{k;C;1&-O1^puh|Shkt*6FR3@*
v-f8Qm78UmwQn&u7uPFk%j?0ZPk%58#UPyc0ge*>=2N*nE{an^LB{Ts5dxT-<

literal 0
HcmV?d00001


From fa439ba3848645b98b7071f4f8938803cbc4b166 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 6 Jun 2024 20:55:35 -0400
Subject: [PATCH 340/360] Flatpacker fixes (#28417)

---
 .../Construction/UI/FlatpackCreatorMenu.xaml  |  2 +-
 .../UI/FlatpackCreatorMenu.xaml.cs            | 38 ++++---------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
index eec5c229cb..322e4e66a9 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
@@ -8,7 +8,7 @@
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True" Margin="10">
         <BoxContainer SizeFlagsStretchRatio="2" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
             <BoxContainer Orientation="Vertical">
-                <SpriteView Name="MachineSprite" Scale="4 4" HorizontalAlignment="Center" VerticalExpand="True" MinSize="128 128"/>
+                <EntityPrototypeView Name="MachineSprite" Scale="4 4" HorizontalAlignment="Center" VerticalExpand="True" MinSize="128 128"/>
                 <RichTextLabel Name="MachineNameLabel" HorizontalAlignment="Center" StyleClasses="LabelKeyText"/>
             </BoxContainer>
             <Control MinHeight="10"/>
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index 427193ba06..8ee8df48fd 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -24,14 +24,12 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
     private readonly ItemSlotsSystem _itemSlots;
     private readonly FlatpackSystem _flatpack;
     private readonly MaterialStorageSystem _materialStorage;
-    private readonly SpriteSystem _spriteSystem;
 
     private EntityUid _owner;
 
     public static readonly EntProtoId NoBoardEffectId = "FlatpackerNoBoardEffect";
 
     private EntityUid? _currentBoard = EntityUid.Invalid;
-    private EntityUid? _machinePreview;
 
     public event Action? PackButtonPressed;
 
@@ -43,7 +41,6 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
         _itemSlots = _entityManager.System<ItemSlotsSystem>();
         _flatpack = _entityManager.System<FlatpackSystem>();
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
-        _spriteSystem = _entityManager.System<SpriteSystem>();
 
         PackButton.OnPressed += _ => PackButtonPressed?.Invoke();
 
@@ -60,17 +57,10 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
     {
         base.FrameUpdate(args);
 
-        if (_machinePreview is not { } && _entityManager.Deleted(_machinePreview))
-        {
-            _machinePreview = null;
-            MachineSprite.SetEntity(_machinePreview);
-        }
-
         if (!_entityManager.TryGetComponent<FlatpackCreatorComponent>(_owner, out var flatpacker) ||
             !_itemSlots.TryGetSlot(_owner, flatpacker.SlotId, out var itemSlot))
             return;
 
-        MachineBoardComponent? machineBoardComp = null;
         if (flatpacker.Packing)
         {
             PackButton.Disabled = true;
@@ -78,7 +68,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
         else if (_currentBoard != null)
         {
             Dictionary<string, int> cost;
-            if (_entityManager.TryGetComponent(_currentBoard, out machineBoardComp))
+            if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var machineBoardComp))
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
             else
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), null);
@@ -89,9 +79,6 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
         if (_currentBoard == itemSlot.Item)
             return;
 
-        if (_machinePreview != null)
-            _entityManager.DeleteEntity(_machinePreview);
-
         _currentBoard = itemSlot.Item;
         CostHeaderLabel.Visible = _currentBoard != null;
         InsertLabel.Visible = _currentBoard == null;
@@ -101,10 +88,10 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
             string? prototype = null;
             Dictionary<string, int>? cost = null;
 
-            if (machineBoardComp != null || _entityManager.TryGetComponent(_currentBoard, out machineBoardComp))
+            if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var newMachineBoardComp))
             {
-                prototype = machineBoardComp.Prototype;
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
+                prototype = newMachineBoardComp.Prototype;
+                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, newMachineBoardComp));
             }
             else if (_entityManager.TryGetComponent<ComputerBoardComponent>(_currentBoard, out var computerBoard))
             {
@@ -115,21 +102,18 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
             if (prototype is not null && cost is not null)
             {
                 var proto = _prototypeManager.Index<EntityPrototype>(prototype);
-                _machinePreview = _entityManager.Spawn(proto.ID);
-                _spriteSystem.ForceUpdate(_machinePreview.Value);
+                MachineSprite.SetPrototype(prototype);
                 MachineNameLabel.SetMessage(proto.Name);
                 CostLabel.SetMarkup(GetCostString(cost));
             }
         }
         else
         {
-            _machinePreview = _entityManager.Spawn(NoBoardEffectId);
+            MachineSprite.SetPrototype(NoBoardEffectId);
             CostLabel.SetMessage(Loc.GetString("flatpacker-ui-no-board-label"));
             MachineNameLabel.SetMessage(" ");
             PackButton.Disabled = true;
         }
-
-        MachineSprite.SetEntity(_machinePreview);
     }
 
     private string GetCostString(Dictionary<string, int> costs)
@@ -151,7 +135,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
                 ("amount", amountText),
                 ("material", Loc.GetString(matProto.Name)));
 
-            msg.AddMarkup(text);
+            msg.TryAddMarkup(text, out _);
 
             if (i != orderedCosts.Length - 1)
                 msg.PushNewline();
@@ -159,12 +143,4 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
 
         return msg.ToMarkup();
     }
-
-    public override void Close()
-    {
-        base.Close();
-
-        _entityManager.DeleteEntity(_machinePreview);
-        _machinePreview = null;
-    }
 }

From edd857a7a2297d1d68e5871bf48c0bc4f5d5384a Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 15 Jan 2026 19:22:24 -0500
Subject: [PATCH 341/360] Fix flatpacker exploit ignoring board costs (#42445)

Fix flatpacks ignoring costs and board requirements
---
 .../UI/FlatpackCreatorMenu.xaml.cs            | 55 ++++++++-----------
 Content.Server/Construction/FlatpackSystem.cs | 32 ++---------
 .../Construction/MachinePartSystem.cs         | 19 +++++--
 .../Construction/SharedFlatpackSystem.cs      | 33 +++++++++--
 .../construction/components/flatpack.ftl      |  2 +
 5 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index 8ee8df48fd..7db15596bd 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -1,13 +1,11 @@
 using System.Linq;
 using Content.Client.Materials;
-using Content.Client.Materials.UI;
 using Content.Client.Message;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Construction.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Materials;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -61,57 +59,48 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
             !_itemSlots.TryGetSlot(_owner, flatpacker.SlotId, out var itemSlot))
             return;
 
+        var flatpackerEnt = (_owner, flatpacker);
+
         if (flatpacker.Packing)
         {
             PackButton.Disabled = true;
         }
         else if (_currentBoard != null)
         {
-            Dictionary<string, int> cost;
-            if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var machineBoardComp))
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
-            else
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), null);
-
-            PackButton.Disabled = !_materialStorage.CanChangeMaterialAmount(_owner, cost);
+            PackButton.Disabled = !_flatpack.TryGetFlatpackCreationCost(flatpackerEnt, _currentBoard.Value, out var curCost)
+                || !_materialStorage.CanChangeMaterialAmount(_owner, curCost);
         }
 
         if (_currentBoard == itemSlot.Item)
             return;
 
         _currentBoard = itemSlot.Item;
-        CostHeaderLabel.Visible = _currentBoard != null;
+        CostHeaderLabel.Visible = false;
         InsertLabel.Visible = _currentBoard == null;
 
-        if (_currentBoard is not null)
+        if (_currentBoard is null)
         {
-            string? prototype = null;
-            Dictionary<string, int>? cost = null;
+            MachineSprite.SetPrototype(NoBoardEffectId);
+            CostLabel.SetMessage(Loc.GetString("flatpacker-ui-no-board-label"));
+            MachineNameLabel.SetMessage(string.Empty);
+            PackButton.Disabled = true;
+            return;
+        }
 
-            if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var newMachineBoardComp))
-            {
-                prototype = newMachineBoardComp.Prototype;
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, newMachineBoardComp));
-            }
-            else if (_entityManager.TryGetComponent<ComputerBoardComponent>(_currentBoard, out var computerBoard))
-            {
-                prototype = computerBoard.Prototype;
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), null);
-            }
-
-            if (prototype is not null && cost is not null)
-            {
-                var proto = _prototypeManager.Index<EntityPrototype>(prototype);
-                MachineSprite.SetPrototype(prototype);
-                MachineNameLabel.SetMessage(proto.Name);
-                CostLabel.SetMarkup(GetCostString(cost));
-            }
+        if (_flatpack.TryGetFlatpackResultPrototype(_currentBoard.Value, out var prototype) &&
+            _flatpack.TryGetFlatpackCreationCost(flatpackerEnt, _currentBoard.Value, out var cost))
+        {
+            var proto = _prototypeManager.Index<EntityPrototype>(prototype);
+            MachineSprite.SetPrototype(prototype);
+            MachineNameLabel.SetMessage(proto.Name);
+            CostLabel.SetMarkup(GetCostString(cost));
+            CostHeaderLabel.Visible = true;
         }
         else
         {
             MachineSprite.SetPrototype(NoBoardEffectId);
-            CostLabel.SetMessage(Loc.GetString("flatpacker-ui-no-board-label"));
-            MachineNameLabel.SetMessage(" ");
+            CostLabel.SetMarkup(Loc.GetString("flatpacker-ui-board-invalid-label"));
+            MachineNameLabel.SetMessage(string.Empty);
             PackButton.Disabled = true;
         }
     }
diff --git a/Content.Server/Construction/FlatpackSystem.cs b/Content.Server/Construction/FlatpackSystem.cs
index 11303e7f2e..baa123a928 100644
--- a/Content.Server/Construction/FlatpackSystem.cs
+++ b/Content.Server/Construction/FlatpackSystem.cs
@@ -1,11 +1,9 @@
 using Content.Server.Audio;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Power;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Construction;
@@ -35,16 +33,8 @@ public sealed class FlatpackSystem : SharedFlatpackSystem
         if (!_itemSlots.TryGetSlot(uid, comp.SlotId, out var itemSlot) || itemSlot.Item is not { } board)
             return;
 
-        Dictionary<string, int> cost;
-        if (TryComp<MachineBoardComponent>(board, out var machine))
-            cost = GetFlatpackCreationCost(ent, (board, machine));
-        else if (TryComp<ComputerBoardComponent>(board, out var computer) && computer.Prototype != null)
-            cost = GetFlatpackCreationCost(ent, null);
-        else
-        {
-            Log.Error($"Encountered invalid flatpack board while packing: {ToPrettyString(board)}");
+        if (!TryGetFlatpackCreationCost(ent, board, out var cost))
             return;
-        }
 
         if (!MaterialStorage.CanChangeMaterialAmount(uid, cost))
             return;
@@ -80,29 +70,15 @@ public sealed class FlatpackSystem : SharedFlatpackSystem
         if (!_itemSlots.TryGetSlot(uid, comp.SlotId, out var itemSlot) || itemSlot.Item is not { } board)
             return;
 
-        Dictionary<string, int> cost;
-        EntProtoId proto;
-        if (TryComp<MachineBoardComponent>(board, out var machine))
-        {
-            cost = GetFlatpackCreationCost(ent, (board, machine));
-            proto = machine.Prototype;
-        }
-        else if (TryComp<ComputerBoardComponent>(board, out var computer) && computer.Prototype != null)
-        {
-            cost = GetFlatpackCreationCost(ent, null);
-            proto = computer.Prototype;
-        }
-        else
-        {
-            Log.Error($"Encountered invalid flatpack board while packing: {ToPrettyString(board)}");
+        if (!TryGetFlatpackCreationCost(ent, board, out var cost) ||
+            !TryGetFlatpackResultPrototype(board, out var proto))
             return;
-        }
 
         if (!MaterialStorage.TryChangeMaterialAmount((ent, null), cost))
             return;
 
         var flatpack = Spawn(comp.BaseFlatpackPrototype, Transform(ent).Coordinates);
-        SetupFlatpack(flatpack, proto, board);
+        SetupFlatpack(flatpack, proto.Value, board);
         Del(board);
     }
 
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 7ac9fde94c..4783c2a332 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -58,11 +58,11 @@ namespace Content.Shared.Construction
             }
         }
 
-        public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardComponent> entity, int coefficient = 1)
+        public bool TryGetMachineBoardMaterialCost(Entity<MachineBoardComponent> entity, out Dictionary<string, int> materials, int coefficient = 1)
         {
             var (_, comp) = entity;
 
-            var materials = new Dictionary<string, int>();
+            materials = new Dictionary<string, int>();
 
             foreach (var (stackId, amount) in comp.StackRequirements)
             {
@@ -89,9 +89,14 @@ namespace Content.Shared.Construction
                         materials[mat] += matAmount * amount * coefficient;
                     }
                 }
+                else
+                {
+                    // The item has no material cost, so we cannot get the full cost.
+                    return false;
+                }
             }
 
-            var genericPartInfo = comp.ComponentRequirements.Values.Concat(comp.ComponentRequirements.Values);
+            var genericPartInfo = comp.ComponentRequirements.Values.Concat(comp.TagRequirements.Values);
             foreach (var info in genericPartInfo)
             {
                 var amount = info.Amount;
@@ -118,9 +123,15 @@ namespace Content.Shared.Construction
                         materials[mat] += matAmount * amount * coefficient;
                     }
                 }
+                else
+                {
+                    // The item has no material cost, so we cannot get the full cost.
+                    return false;
+                }
             }
 
-            return materials;
+            // We were able to construct all elements of the recipe.
+            return true;
         }
     }
 }
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index a83948b167..f6a56d9ae4 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Construction.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
@@ -125,14 +126,34 @@ public abstract class SharedFlatpackSystem : EntitySystem
         Appearance.SetData(ent, FlatpackVisuals.Machine, MetaData(board).EntityPrototype?.ID ?? string.Empty);
     }
 
-    /// <param name="machineBoard">The machine board to pack. If null, this implies we are packing a computer board</param>
-    public Dictionary<string, int> GetFlatpackCreationCost(Entity<FlatpackCreatorComponent> entity, Entity<MachineBoardComponent>? machineBoard)
+    /// <summary>
+    /// Returns the prototype from a board that the flatpacker will create.
+    /// </summary>
+    public bool TryGetFlatpackResultPrototype(EntityUid board, [NotNullWhen(true)] out EntProtoId? prototype)
     {
-        Dictionary<string, int> cost = new();
+        prototype = null;
+
+        if (TryComp<MachineBoardComponent>(board, out var machine))
+            prototype = machine.Prototype;
+        else if (TryComp<ComputerBoardComponent>(board, out var computer))
+            prototype = computer.Prototype;
+        return prototype is not null;
+    }
+
+    /// <summary>
+    /// Tries to get the cost to produce an item, fails if unable to produce it.
+    /// </summary>
+    /// <param name="entity">The flatpacking machine</param>
+    /// <param name="machineBoard">The machine board to pack. If null, this implies we are packing a computer board</param>
+    /// <param name="cost">Cost to produce</param>
+    public bool TryGetFlatpackCreationCost(Entity<FlatpackCreatorComponent> entity, EntityUid machineBoard, out Dictionary<string, int> cost)
+    {
+        cost = new();
         Dictionary<ProtoId<MaterialPrototype>, int> baseCost;
-        if (machineBoard is not null)
+        if (TryComp<MachineBoardComponent>(machineBoard, out var machineBoardComp))
         {
-            cost = MachinePart.GetMachineBoardMaterialCost(machineBoard.Value, -1);
+            if (!MachinePart.TryGetMachineBoardMaterialCost((machineBoard, machineBoardComp), out cost, -1))
+                return false;
             baseCost = entity.Comp.BaseMachineCost;
         }
         else
@@ -144,6 +165,6 @@ public abstract class SharedFlatpackSystem : EntitySystem
             cost[mat] -= amount;
         }
 
-        return cost;
+        return true;
     }
 }
diff --git a/Resources/Locale/en-US/construction/components/flatpack.ftl b/Resources/Locale/en-US/construction/components/flatpack.ftl
index 0957d92f3e..a47cea782c 100644
--- a/Resources/Locale/en-US/construction/components/flatpack.ftl
+++ b/Resources/Locale/en-US/construction/components/flatpack.ftl
@@ -8,5 +8,7 @@ flatpacker-ui-title = Flatpacker 1001
 flatpacker-ui-materials-label = Materials
 flatpacker-ui-cost-label = Packing Cost
 flatpacker-ui-no-board-label = No board present!
+flatpacker-ui-board-invalid-label = [color=red]Invalid board!
+    Unable to print![/color]
 flatpacker-ui-insert-board = Insert a board to begin.
 flatpacker-ui-pack-button = Pack

From 695ea81c05e487e14ba69287ed2902647d2a0a8a Mon Sep 17 00:00:00 2001
From: pathetic meowmeow <uhhadd@gmail.com>
Date: Thu, 15 Jan 2026 20:53:25 -0500
Subject: [PATCH 342/360] Fix core pinpointer pieces having a 5-pointer recipe
 (#42446)

---
 Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index f71cb29b36..dab46a418b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -220,9 +220,6 @@
   - type: Tag
     tags:
     - MothershipPinpointerPiece
-  - type: Construction
-    graph: RepairMothershipPinpointer
-    node: start
 
 - type: entity
   parent: PinpointerMothership

From a1ded7d6e0926a5c2e109d1911d451bbb54cd125 Mon Sep 17 00:00:00 2001
From: neomoth <admin@neomoth.dev>
Date: Fri, 16 Jan 2026 03:25:15 -0500
Subject: [PATCH 343/360] Fix Zombie Resistance Probability (#42451)

free merge
---
 Content.Server/Zombies/ZombieSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index b840e7203e..542c065e4b 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -262,7 +262,7 @@ namespace Content.Server.Zombies
                     _damageable.TryChangeDamage(args.User, entity.Comp.HealingOnBite, true, false);
 
                     // If we cannot infect the living target, the zed will just heal itself.
-                    if (HasComp<ZombieImmuneComponent>(uid) || cannotSpread || _random.Prob(GetZombieInfectionChance(uid, entity.Comp)))
+                    if (HasComp<ZombieImmuneComponent>(uid) || cannotSpread || !_random.Prob(GetZombieInfectionChance(uid, entity.Comp)))
                         continue;
 
                     EnsureComp<PendingZombieComponent>(uid);

From 66258005cb434c9ccaae3cb41d5933eb96ec28c5 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Fri, 16 Jan 2026 14:04:01 -0300
Subject: [PATCH 344/360] Adds more starting materials for the mothership
 (#42448)

* more mats

* update the guidebook

* missed a word
---
 Resources/Maps/Shuttles/mothership.yml        | 156 ++++++++++++++----
 .../Guidebook/Antagonist/Xenoborgs.xml        |   6 +-
 2 files changed, 132 insertions(+), 30 deletions(-)

diff --git a/Resources/Maps/Shuttles/mothership.yml b/Resources/Maps/Shuttles/mothership.yml
index 9803b1fbfe..9092ffb9e6 100644
--- a/Resources/Maps/Shuttles/mothership.yml
+++ b/Resources/Maps/Shuttles/mothership.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 268.0.0
+  engineVersion: 270.1.0
   forkId: ""
   forkVersion: ""
-  time: 12/20/2025 12:50:17
-  entityCount: 581
+  time: 01/16/2026 03:06:16
+  entityCount: 591
 maps: []
 grids:
 - 1
@@ -160,6 +160,8 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: ExplosionAirtightGrid
+    - type: TileHistory
+      chunkHistory: {}
 - proto: AirlockGlassShuttleXenoborgLocked
   entities:
   - uid: 107
@@ -1473,6 +1475,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+      storage: 425
 - proto: CableHV
   entities:
   - uid: 139
@@ -1534,6 +1537,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+      storage: 425
 - proto: CableMV
   entities:
   - uid: 149
@@ -1910,6 +1914,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+      storage: 425
 - proto: CableTerminal
   entities:
   - uid: 138
@@ -2041,14 +2046,24 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 339
-          - 341
-          - 343
-          - 342
-          - 345
-          - 344
+          - 455
+          - 453
+          - 370
           - 340
           - 346
+          - 341
+          - 344
+          - 342
+          - 456
+          - 586
+          - 587
+          - 588
+          - 589
+          - 345
+          - 343
+          - 339
+          - 590
+          - 591
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -2473,32 +2488,23 @@ entities:
       parent: 1
 - proto: SheetGlass
   entities:
-  - uid: 341
+  - uid: 586
     components:
     - type: Transform
       parent: 425
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+      storage: 425
+  - uid: 589
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
 - proto: SheetPlasteel
-  entities:
-  - uid: 342
-    components:
-    - type: Transform
-      parent: 425
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: SheetPlastic
-  entities:
-  - uid: 344
-    components:
-    - type: Transform
-      parent: 425
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: SheetSteel
   entities:
   - uid: 340
     components:
@@ -2507,6 +2513,35 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+      storage: 425
+  - uid: 342
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+- proto: SheetPlastic
+  entities:
+  - uid: 341
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 344
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+- proto: SheetSteel
+  entities:
   - uid: 346
     components:
     - type: Transform
@@ -2514,6 +2549,71 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+      storage: 425
+  - uid: 370
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 453
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 455
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 456
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 587
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 588
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 590
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
+  - uid: 591
+    components:
+    - type: Transform
+      parent: 425
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 425
 - proto: SignalButton
   entities:
   - uid: 584
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml b/Resources/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml
index 2c698251be..6cf0894e28 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml
@@ -128,8 +128,10 @@
     <GuideEntityEmbed Entity="XenoborgModuleSuperCloakDevice" Caption="cloaking device xenoborg module"/>
   </Box>
 
-  ## Preparation
-  Before launching an attack, each xenoborg will need to aid the mothership in collection materials to create empty xenoborgs. Before FTLing near the station, make sure the IFF is off. This can be done in any way but will require teamwork to ensure speed. The safest way to collect materials is from space debris, where scrap and refined materials can be harvested and given to the Mothership Core. Once enough materials are collected, the Xenoborgs then must try to collect sentient brains without being detected. The longer the threat is unknown, the more dangerous the xenoborgs become.
+  ## Preparation and Tactics
+  Before FTLing near the station, make sure the IFF is off.
+  Before launching an attack, xenoborgs should discuss strategy and decide which targets to strike first.
+  Xenoborgs should try to collect sentient brains without being detected. The longer the threat is unknown, the more dangerous the xenoborgs become.
 
   ## Mothership and Xenoborg lawsets
   The Mothership and Xenoborgs have unique laws that define their purpose to self replicate and protect the Mothership.

From d3086de6d6e9017704d8bcacf9b54bf3b9298711 Mon Sep 17 00:00:00 2001
From: Velken <8467292+Velken@users.noreply.github.com>
Date: Fri, 16 Jan 2026 19:08:52 -0300
Subject: [PATCH 345/360] Admin Anomaly Scanner (#42443)

* admin anom scanner

* improvement

* green

* sprite
---
 .../Anomaly/AnomalyScannerSystem.cs           |  18 ++---
 Content.Server/Anomaly/AnomalySystem.cs       |  67 ++++++++++++++----
 .../Components/AnomalyScannerComponent.cs     |   6 ++
 Resources/Locale/en-US/anomaly/anomaly.ftl    |   3 +-
 .../Objects/Specific/Research/anomaly.yml     |  12 ++++
 .../adminanomalyscanner.rsi/decaying.png      | Bin 0 -> 603 bytes
 .../adminanomalyscanner.rsi/growing.png       | Bin 0 -> 211 bytes
 .../Research/adminanomalyscanner.rsi/icon.png | Bin 0 -> 582 bytes
 .../adminanomalyscanner.rsi/inhand-left.png   | Bin 0 -> 638 bytes
 .../adminanomalyscanner.rsi/inhand-right.png  | Bin 0 -> 659 bytes
 .../adminanomalyscanner.rsi/meta.json         |  61 ++++++++++++++++
 .../adminanomalyscanner.rsi/severity_mask.png | Bin 0 -> 195 bytes
 .../adminanomalyscanner.rsi/supercritical.png | Bin 0 -> 501 bytes
 .../adminanomalyscanner.rsi/timer_1.png       | Bin 0 -> 149 bytes
 .../adminanomalyscanner.rsi/timer_2.png       | Bin 0 -> 157 bytes
 .../adminanomalyscanner.rsi/timer_3.png       | Bin 0 -> 158 bytes
 .../adminanomalyscanner.rsi/timer_4.png       | Bin 0 -> 158 bytes
 .../adminanomalyscanner.rsi/timer_5.png       | Bin 0 -> 160 bytes
 18 files changed, 143 insertions(+), 24 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/decaying.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/growing.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/severity_mask.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/supercritical.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_1.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_2.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_3.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_4.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_5.png

diff --git a/Content.Server/Anomaly/AnomalyScannerSystem.cs b/Content.Server/Anomaly/AnomalyScannerSystem.cs
index ba657cf056..b8bc3b6036 100644
--- a/Content.Server/Anomaly/AnomalyScannerSystem.cs
+++ b/Content.Server/Anomaly/AnomalyScannerSystem.cs
@@ -41,12 +41,12 @@ public sealed class AnomalyScannerSystem : SharedAnomalyScannerSystem
 
         Appearance.SetData(scanner, AnomalyScannerVisuals.HasAnomaly, true, appearanceComp);
 
-        var stability = _secretData.IsSecret(anomaly, AnomalySecretData.Stability, secretDataComp)
+        var stability = _secretData.IsSecret(anomaly, AnomalySecretData.Stability, secretDataComp) && !scannerComp.IgnoreSecret
             ? AnomalyStabilityVisuals.Stable
             : _anomaly.GetStabilityVisualOrStable((anomaly, anomalyComp));
         Appearance.SetData(scanner, AnomalyScannerVisuals.AnomalyStability, stability, appearanceComp);
 
-        var severity = _secretData.IsSecret(anomaly, AnomalySecretData.Severity, secretDataComp)
+        var severity = _secretData.IsSecret(anomaly, AnomalySecretData.Severity, secretDataComp) && !scannerComp.IgnoreSecret
             ? 0
             : anomalyComp.Severity;
         Appearance.SetData(scanner, AnomalyScannerVisuals.AnomalySeverity, severity, appearanceComp);
@@ -109,13 +109,14 @@ public sealed class AnomalyScannerSystem : SharedAnomalyScannerSystem
 
     private void OnScannerAnomalySeverityChanged(ref AnomalySeverityChangedEvent args)
     {
-        var severity = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Severity) ? 0 : args.Severity;
         var query = EntityQueryEnumerator<AnomalyScannerComponent>();
         while (query.MoveNext(out var uid, out var component))
         {
             if (component.ScannedAnomaly != args.Anomaly)
                 continue;
 
+            var severity = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Severity) && !component.IgnoreSecret ? 0 : args.Severity;
+
             UpdateScannerUi(uid, component);
             Appearance.SetData(uid, AnomalyScannerVisuals.AnomalySeverity, severity);
         }
@@ -123,15 +124,16 @@ public sealed class AnomalyScannerSystem : SharedAnomalyScannerSystem
 
     private void OnScannerAnomalyStabilityChanged(ref AnomalyStabilityChangedEvent args)
     {
-        var stability = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Stability)
-            ? AnomalyStabilityVisuals.Stable
-            : _anomaly.GetStabilityVisualOrStable(args.Anomaly);
         var query = EntityQueryEnumerator<AnomalyScannerComponent>();
         while (query.MoveNext(out var uid, out var component))
         {
             if (component.ScannedAnomaly != args.Anomaly)
                 continue;
 
+            var stability = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Stability) && !component.IgnoreSecret
+                ? AnomalyStabilityVisuals.Stable
+                : _anomaly.GetStabilityVisualOrStable(args.Anomaly);
+
             UpdateScannerUi(uid, component);
             Appearance.SetData(uid, AnomalyScannerVisuals.AnomalyStability, stability);
         }
@@ -154,12 +156,12 @@ public sealed class AnomalyScannerSystem : SharedAnomalyScannerSystem
             TryComp<AppearanceComponent>(uid, out var appearanceComp);
             TryComp<SecretDataAnomalyComponent>(args.Anomaly, out var secretDataComp);
 
-            var severity = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Severity, secretDataComp)
+            var severity = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Severity, secretDataComp) && !component.IgnoreSecret
                 ? 0
                 : anomalyComp.Severity;
             Appearance.SetData(uid, AnomalyScannerVisuals.AnomalySeverity, severity, appearanceComp);
 
-            var stability = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Stability, secretDataComp)
+            var stability = _secretData.IsSecret(args.Anomaly, AnomalySecretData.Stability, secretDataComp) && !component.IgnoreSecret
                 ? AnomalyStabilityVisuals.Stable
                 : _anomaly.GetStabilityVisualOrStable((args.Anomaly, anomalyComp));
             Appearance.SetData(uid, AnomalyScannerVisuals.AnomalyStability, stability, appearanceComp);
diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index 3f0aba7b93..7a39544178 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -238,14 +238,19 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         TryComp<SecretDataAnomalyComponent>(anomaly, out var secret);
 
         //Severity
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-severity-percentage-unknown"));
         else
-            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
+        {
+            var text = Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P")));
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity))
+                text += " " + Loc.GetString("anomaly-secret-admin");
+            msg.AddMarkupOrThrow(text);
+        }
         msg.PushNewline();
 
         //Stability
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-stability-unknown"));
         else
         {
@@ -256,15 +261,24 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
                 stateLoc = Loc.GetString("anomaly-scanner-stability-high");
             else
                 stateLoc = Loc.GetString("anomaly-scanner-stability-medium");
+
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability))
+                stateLoc += " " + Loc.GetString("anomaly-secret-admin");
+
             msg.AddMarkupOrThrow(stateLoc);
         }
         msg.PushNewline();
 
         //Point output
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output-unknown"));
         else
-            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp))));
+        {
+            var text = Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp)));
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint))
+                text += " " + Loc.GetString("anomaly-secret-admin");
+            msg.AddMarkupOrThrow(text);
+        }
         msg.PushNewline();
         msg.PushNewline();
 
@@ -273,40 +287,63 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         msg.PushNewline();
 
         //Danger
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-danger-unknown"));
         else
-            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType))));
+        {
+            var text = Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType)));
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger))
+                text += " " + Loc.GetString("anomaly-secret-admin");
+            msg.AddMarkupOrThrow(text);
+        }
         msg.PushNewline();
 
         //Unstable
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleUnstable))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleUnstable) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-unstable-unknown"));
         else
-            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
+        {
+            var text = Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType)));
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleUnstable))
+                text += " " + Loc.GetString("anomaly-secret-admin");
+            msg.AddMarkupOrThrow(text);
+        }
         msg.PushNewline();
 
         //Containment
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-containment-unknown"));
         else
-            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
+        {
+            var text = Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType)));
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment))
+                text += " " + Loc.GetString("anomaly-secret-admin");
+            msg.AddMarkupOrThrow(text);
+        }
         msg.PushNewline();
 
         //Transformation
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-transformation-unknown"));
         else
-            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType))));
+        {
+            var text = Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType)));
+            if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation))
+                text += " " + Loc.GetString("anomaly-secret-admin");
+            msg.AddMarkupOrThrow(text);
+        }
 
 
         //Behavior
         msg.PushNewline();
         msg.PushNewline();
-        msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-title"));
+        var behaviorTitle = Loc.GetString("anomaly-behavior-title");
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior) && component.IgnoreSecret)
+            behaviorTitle += " " + Loc.GetString("anomaly-secret-admin");
+        msg.AddMarkupOrThrow(behaviorTitle);
         msg.PushNewline();
 
-        if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior))
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior) && !component.IgnoreSecret)
             msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-unknown"));
         else
         {
diff --git a/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs b/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs
index c49743f630..842445b704 100644
--- a/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs
@@ -29,4 +29,10 @@ public sealed partial class AnomalyScannerComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier? CompleteSound = new SoundPathSpecifier("/Audio/Items/beep.ogg");
+
+    /// <summary>
+    /// Whether to ignore the secret data on the anomaly.
+    /// </summary>
+    [DataField]
+    public bool IgnoreSecret;
 }
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index 77608da435..cb6841ca4b 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -79,7 +79,7 @@ anomaly-generator-flavor-right = v1.1
 
 anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
 
-anomaly-behavior-title = behavior deviation analysis:
+anomaly-behavior-title = Behavior Deviation Analysis:
 anomaly-behavior-point = [color=gold]Anomaly produces {$mod}% of the points[/color]
 
 anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
@@ -97,3 +97,4 @@ anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Pa
 anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
 anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
 anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
+anomaly-secret-admin = [color=red](ERROR)[/color]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index b2eae73ddf..b9fccd35f0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -69,6 +69,18 @@
   - type: Item
     storedRotation: -90
 
+- type: entity
+  parent: AnomalyScanner
+  id: AnomalyScannerAdmin
+  name: admin anomaly scanner
+  description: A hand-held scanner built to collect information on various anomalous objects. This one seems to have a few extra features.
+  suffix: Admin
+  components:
+  - type: AnomalyScanner
+    ignoreSecret: true
+  - type: Sprite
+    sprite: Objects/Specific/Research/adminanomalyscanner.rsi
+
 - type: entity
   id: AnomalyLocatorUnpowered
   parent: BaseItem
diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/decaying.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/decaying.png
new file mode 100644
index 0000000000000000000000000000000000000000..7335e13cb0c0d2c733a99bcd21689d574011c3de
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zP;zf(X>4Tx04R}tkv&MmKpe$izo<xyLpz8FW~fdUL`58>ibb$c+6t{Ym|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jf7n~Gbq{ROvg%&X$9QWhhy~o`<z}u=Z#qdu6ifZba
zWJ1UnR)ydz0`Mb@2u4I^XsPUC4zA<t9v;5l#d((dxj#o(E*cE*2*h(t(@o+H;+aiT
z<GfECWff5-J|`a6>4L<MT$dbv<6O4c%QK^TE;COYB^Js(EcGy}=nC;PaZFZJ%J=3S
zmN{>6R%#8_xhH>NsHm=FxlVH!Nh~3SGz3U!po$ty#A#JYF_5ACgo}U3_NU1uk*f+u
zjs?`AK(zhffAG6oqck<?B!v<{;Ki~&MuFfi&~94R_pxQQPXOODaHV$r^%gMuNqV!Z
z#g2f1ZQ$a%t4Vvn<qk0Tq=~v{OFo+3QVDoJqi-qzkz1gD&FQVPkJASrM_n!700)P_
zSedfdUEbZ-+uOfqI{p0sN|kb#^kDb_0001zNkl<Zc%1FpF$w}P5CzbQxAUBOJDY8+
z$HHAVog@T<<UI(a34fR(%}fLU006*ud7Rtzp3CKDo&{u1DdLkI1DbGYeNf6?MV|Lx
z8=2kQfZY3C%KQF!ZeuEGaAZf!$zS^q00000004k>%%087&Oc}KlZwa~*o3a}c)cU=
p@46Nw>K%a@^ZA<n0001>#|vtrY0YC{Alv`|002ovPDHLkV1f(j5KaI9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/growing.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/growing.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c9eeba747a681da8e605d26e8c1cfd22e93cc3a
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|dOcknLn`LH
zy=BPPY{0`BaQXJvIR(4*Vy$*_YupsjoV4_rEoUd|&&i72^(;W;2X@-b`?~XK$>+`7
z6HFD2@@-m<U*(@x`{`rc!t)<ipJtzMvCc;M(bvlRBB?sgSN~ML2kHTV8SY>6)>YNL
zW)o>WvEmK;m%9!15oh^CRg`Y^?Mt%1f0-Ys#;t}i)j0Oz5#2CGkQPr@KbLh*2~7Yw
Ck57;Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/icon.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f2e97776fe69e1b7db632c0b4d93648634ebae6
GIT binary patch
literal 582
zcmV-M0=fN(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%07*naR9J=Wl(B0QaTLctmsBNO?M;PRXvyHx&~QRa>tX^*N(KWFEG3&11t*7s
z&_BST;N)fzf|J3a7|@{#3e6<J2#2wY9g2dD*DROj%+lmsa!0SZyZ$=VrT1O#e(&Dz
zz0bY(cn~U7sPm$G%a1KDd*pv5&n(>X{C4I5LCMb?U|Llz!)T%FP3JtVs;*WH1qF!Z
zk^_BP8qE&)z24t+-aBu<Np`Zjrb%^81F%x*8`L#TI)2v|AeKv7-T8?DyE>xsY3l<w
z(+ke?RqHzd(MFqCE@{~iw%%;4OMvGP4iGtHS4XW2*(thX!$ccxmj2HBxw>Q+Efi(M
zIlnAE_02(01+E;*@a`wg+mmGXrpPS%57G%hR=)zL15gwN!!TU7)zycmO1`%C{6wF?
zA@qWhAEcQ{R092K+bPT!TS75~0KU}Tb9eC$05gdS&t@;uF{_k%c?yv-F?kMv;=y?T
zMg<%3$Ij=#*uHz<c=?a2crZ>(o}&;cQ|jgEm{mGvRpej90rrMW{@hQ{9UFGpYuhOb
zk+K7^eEBy3rC#3UBdWj_L>p~SduHPi07WMImg~X^g#iwC_9Zs$<sn1AEwf)Q2?hQb
z&_W>q2Ld22Te{w4W#x%bPyqFsimo>UXNjOqcvKVdxaS%b(XZWIp&X$?g*w0b2fAXa
U0?UDZ*Z=?k07*qoM6N<$f`Ew$3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd106f67fce69d9f505de4f12649a366aba7cf3
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%I7vi7RCt{2+OcaBVHgJRC#eW04N^2%y7V7NxI#;_*a#kXgu+c3t{{ZtrVhdF
zD0G&Bbn8?^f(V5a9E3s%4V~<uoqE{GEeJttBuGP??B~#4h*pr^y{Cmdza>L1@AtkB
zA6ec5h=_=Yh=_=Yh$3@6U;XbMt|~26$n|`s&*%UEty)x?ofiv3v-3);7840qB!F=E
zdioGs^@ei#1z>st5>1CeI{kt~tCz$MARPWy`4tW-Z_!)WglQS)4Y#`SJDi??lP$rt
zjQF+w;D$tzdioFtnKo*tQy71<jON}xzJB|R?>p~PacevM0!+(5Z(&oS)k{PIczkye
z_g|iWHuv_i{iPu?JOI3?t)~De6UzWzOO%x7dcNAKH<au7qJMtBpOHjeF|OyUoUUK*
zCjW(z4Z-z%b?vWd(ndZ2A|fIpA|fIpBBGI$)OIL|bHv^c2x--#a<V1Z<w~L<*yV~^
zGgo4-;Kc(7x4Cz2-xI$H;nqpB^XlOP3#%WV0T-d)e6kqnEYSd5&sX6p+q4Wg+0r0{
zI4iSo>vS9hshqAWCtJd5^XcIGACu!4`_zjRxM%?SjE;@YF1$?pmk@Hgu8xBs6?J`f
zu_6Zm%*|RbEd$RVtply@V0g5;kyi4e0R%?@md@r;JDq};X=9_a3)3<%H){=^86M^;
zhJSZ*(g6UhnJXB3_c8MD03h-b!?5A^g_h3d5gY}PhyL3cNz@h*UiBoGrCh`k5m9_U
Y0b1?e@FeQ@aR2}S07*qoM6N<$f)?o@zyJUM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdac73f3982c906f78644a9e7968c057056f0c24
GIT binary patch
literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%O-V#SRCt{2+OcaIQ5*;G?`bJqQA%i~Axr)Nk0&(5C9zOZByf|%1qwlKa*%Ek
z$Xo)&ty3sPLLuPLPJ#r*DIFT89A@ek0@4OcC=s2~*CFu;g{Wtq^k}}H@$TL8{eJiE
zJox<pA|fIpA|fIpqFd$cqWsruP%SWSfNmO6FC-)Yh?www67)hs>ZURA8b>BTFC-)u
z=V0~Y*sJWzN}%QYBv}18aDC$@89#aloSehz$B{}W(OccYmyNG@l>OxEB&5<wSdk2{
zI5*MwkqH=7+uF}xKhUT*5jx1De6avK+(9MKQng;?daFBENx0q#<2)EQp!)fvrkjRD
z9Y`UMm2M5MpRS>Sri%3{7dptJQEy_mT+)<Iteb|+*+scm*_VFZ{+RVYRa6LH2R~C$
zA?|13H|6Z&{oMihPrn3-h=_=Yh=_=Yh{y{srD#9?&e;BdQS?GWZl^Y3W;bS<1T(uK
ztw;vLJ_VJgO2ET6Yi`rT*0=X~`6BJ!A=MQm-8AHr$Im=fe7*3T0NpfX@OuxJ^C9=x
zR^u(KNCr_M<gw#ucdZ}|lc<}9v?3X|KOvP)Dlg8AEsy_gP;G0vX~-ae%lQz3ho|`P
zs^p$Ob{qhhsysamZns?0qC&`}NZJkF4tKE9tzkX3>~-3arg{Vh)wYI{a|91hv7Ook
z0Gyq5-SgAd=5JoN^!zILcikH7a0lg!1+4#GhI8ahGxe?R+(eMGi&De{oFhkhQ^IiW
tN}%Niue|X=g;^F&hwl>>W{HSMy+1PQ+PQN)gb4ru002ovPDHLkV1k6DHHH8H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/meta.json b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/meta.json
new file mode 100644
index 0000000000..66fa65a74f
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/meta.json
@@ -0,0 +1,61 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified from anomalyscanner.rsi (at commit d0352e734d97f3762f2e9082ea61bd2f83101874) by Samuka-C (github)",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "growing",
+      "delays": [
+        [ 0.2, 0.2, 0.2 ]
+      ]
+    },
+    {
+      "name": "decaying",
+      "delays": [
+        [ 0.2, 0.2, 0.2 ]
+      ]
+    },
+    {
+      "name": "severity_mask",
+      "delays": [
+        [ 0.25, 0.25, 0.25, 0.25 ]
+      ]
+    },
+    {
+      "name": "timer_1"
+    },
+    {
+      "name": "timer_2"
+    },
+    {
+      "name": "timer_3"
+    },
+    {
+      "name": "timer_4"
+    },
+    {
+      "name": "timer_5"
+    },
+    {
+      "name": "supercritical",
+      "delays": [
+        [ 0.125, 0.125, 0.125, 0.125 ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/severity_mask.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/severity_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d0ae9a3aec38d0a62c97ed155ecb337ec712c93
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|YCT;XLn`LH
zz2(T&pdi3{;myDDZBrE*C8mX)sh*t`ST9s!yg3(Sf=T9sxi%kfpZ@$^x^)h7+TRZz
z->yV`I{I2aOColqm4fNK@SMi5vYqd_>Ooe4bO=1GZdU%xxc=L-{S##C>=wM+|Gny~
l@syj*?wbzJXJlXyxWf3SMuU-0rHBut-qY33Wt~$(697t|NM!&3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/supercritical.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/supercritical.png
new file mode 100644
index 0000000000000000000000000000000000000000..fedb3ba03b76fc8d8390d1b34979462ece53725a
GIT binary patch
literal 501
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk
zJ@f8s-z|Y^wxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X(
z#F_0ZVDT&<8w3)77^ELYqgl$p%)l^#oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>U
ztTM>b0?2~uGBhv%$*Q`~>s@TJ^(c_J#M8wwq$2L^O-H^a0}+;hlDB{TU&&<$ZBV$>
zRdeyl-Y4v7rb{(fmw~kL{!09H`f;tId*rLCQ<<~oeEzJvGH21W?_0{hFXNS%v+k$r
z?B^ctW&Ou>-j-E9`S(fu#-gZs#U01q{RZg<0{I_}yLWCqXJme}#&({U+Owb1eNl&R
zt(z{K`ewx%MYp$yyJePsd+5x!IV{R=%ErZ;fbsWW>bl*GOI7z8pR@XF3o^sg)z4*}
HQ$iB}?%j)l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_1.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..47b483bf5dc49cd1cc0e7997d8383bd29bec0151
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}{+=$5ArY;~
z2@<S}6GVEN0u8v_4r(aK{%L<`w_Ec+`x!>=g<q1+tBP1Qb;|g1Yi^t<#n<7UwEy3)
pMlU}_xdV$67F;@@0nyB~iizRAnpl*XizLWs22WQ%mvv4FO#s}6E&Tuh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_2.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a138747772a9bbaadae12a4ae1517ca00fd9b1f
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R};hrvzArY;~
z2@<S}6GVEN0u8v_4r(aK{%L<`w_Ec+`w_<AC5kf|8z25pI<G2X+0-fHYw54KaS|8b
v45i+JBd^!XuXrw{#Aw6Cro{`>y+DhBVS%rdYCg9J$O;BeS3j3^P6<r_Q;jcK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_3.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd1ebf7da4c04581de1e482408be6651fe11f13b
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}5uPrNArY-_
zFD(>oFc4t9D9e?c^ip-}f=i4dlj;m4z9<^pm~bZH+fV!Lj~phctc;!F!m#n2Y8_{V
zd(P>5qK37SQ(1O?oAZ|E#Me#+i*?05p3V2`9VVGv;oWpzYD!J#%AY_x7(8A5T-G@y
GGywn>Z#gpn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_4.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3c79e9ab29bff7b630d91efcd92d9c3f71e0937
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}5uPrNArY;~
z2@<S}6GVEN0u8v_4r(aK{%L<`w_Ef7%e>!HOgf$#RBe1N)FpG!WmVgpNFJWxOBx#|
zIk6v*VPsyvziz>_=nl3I8WIysz<PlOHQZug(ETFCbNZjM0?-ZyPgg&ebxsLQ06*0;
AasU7T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_5.png b/Resources/Textures/Objects/Specific/Research/adminanomalyscanner.rsi/timer_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..943f391907c21e9bda74d11e82bb4a543fd00d63
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}QJyZ2ArY;~
z2@<S}6GVEN0u8v_4r(aK{%L<`w_Ec+`w>RrWex_+%!mIUo#(Al#3H;?in~Z-<1{CB
zktYTQJ~NmS_y7CVXr-sfc%Zp{!KDKl5ObJTF)=(+luF2IxETSog~8L+&t;ucLK6VX
C0Wrz|

literal 0
HcmV?d00001


From f068aa237dd58dd7b0f7f597fda1577abdb725db Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 9 Feb 2026 18:27:04 +0100
Subject: [PATCH 346/360] Remove extra chatsan-shrugs

---
 Resources/Locale/en-US/_DV/chat/sanitizer-replacements.ftl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Locale/en-US/_DV/chat/sanitizer-replacements.ftl b/Resources/Locale/en-US/_DV/chat/sanitizer-replacements.ftl
index b09d460942..547d6c16ea 100644
--- a/Resources/Locale/en-US/_DV/chat/sanitizer-replacements.ftl
+++ b/Resources/Locale/en-US/_DV/chat/sanitizer-replacements.ftl
@@ -1,2 +1 @@
 chatsan-smiles-mischievously = grins mischievously
-chatsan-shrugs = shrugs

From 28101bfba08b485dc964fbb9748cc9caaed4a049 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 9 Feb 2026 18:57:42 +0100
Subject: [PATCH 347/360] Use entMan system for resolving StatusEffects

---
 Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs b/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
index 670b443de2..ef9d5ccf4c 100644
--- a/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
+++ b/Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
@@ -774,7 +774,7 @@ public sealed partial class TraitSystemTest
             LogMan = IoCManager.Resolve<ILogManager>(),
             JobId = jobId,
             SpeciesId = speciesId,
-            StatusEffects = IoCManager.Resolve<StatusEffectsSystem>(),
+            StatusEffects = entMan.System<StatusEffectsSystem>(),
         };
     }
 
@@ -792,7 +792,7 @@ public sealed partial class TraitSystemTest
             CompFactory = factory,
             LogMan = IoCManager.Resolve<ILogManager>(),
             Transform = entMan.GetComponent<TransformComponent>(player),
-            StatusEffects = IoCManager.Resolve<StatusEffectsSystem>(),
+            StatusEffects = entMan.System<StatusEffectsSystem>(),
         };
     }
 

From d9ddb0abc2891e11e8443e0790a0cf14293cf2c9 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 10 Feb 2026 19:37:28 +0100
Subject: [PATCH 348/360] Enable cancellation of gibbing due to parts

---
 .../Body/Systems/SharedBodySystem.Body.cs           | 12 ++++++++++++
 Content.Shared/Gibbing/GibbingSystem.cs             | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index e3f4c1122f..9179ebdfb7 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -59,6 +59,7 @@ public partial class SharedBodySystem
         SubscribeLocalEvent<BodyComponent, IsEquippingAttemptEvent>(OnBeingEquippedAttempt); // Shitmed Change
 
         SubscribeLocalEvent<BodyComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BodyPartComponent, BeforeGibbedEvent>(OnPartBeforeGibbed); // Shitmed Change
         SubscribeLocalEvent<BodyPartComponent, BeingGibbedEvent>(OnPartBeingGibbed); // Shitmed Change
     }
 
@@ -327,6 +328,17 @@ public partial class SharedBodySystem
     }
 
     // Shitmed Change Start
+    private void OnPartBeforeGibbed(Entity<BodyPartComponent> part, ref BeforeGibbedEvent args)
+    {
+        // Double check this is a root part, if it is then we can't gib it directly so cancel the whole
+        // gib event.
+        if (part.Comp.Body is { } bodyEnt)
+        {
+            if (IsPartRoot(bodyEnt, part, part: part) || !part.Comp.CanSever)
+                args.Cancel();
+        }
+    }
+
     private void OnPartBeingGibbed(Entity<BodyPartComponent> part, ref BeingGibbedEvent args)
     {
         if (part.Comp.Body is { } bodyEnt)
diff --git a/Content.Shared/Gibbing/GibbingSystem.cs b/Content.Shared/Gibbing/GibbingSystem.cs
index 08c8fc268e..77be017286 100644
--- a/Content.Shared/Gibbing/GibbingSystem.cs
+++ b/Content.Shared/Gibbing/GibbingSystem.cs
@@ -34,6 +34,14 @@ public sealed class GibbingSystem : EntitySystem
         if (!_net.IsServer)
             return new();
 
+        // Shitmed Start
+        var beforeGibbed = new BeforeGibbedEvent();
+        RaiseLocalEvent(ent, ref beforeGibbed);
+
+        if (beforeGibbed.Cancelled)
+            return new();
+        // Shitmed End
+
         if (!_destructible.DestroyEntity(ent))
             return new();
 
@@ -69,6 +77,11 @@ public sealed class GibbingSystem : EntitySystem
     }
 }
 
+// Shitmed Start
+[ByRefEvent]
+public sealed class BeforeGibbedEvent() : CancellableEntityEventArgs;
+// Shitmed End
+
 /// <summary>
 /// Raised on an entity when it is being gibbed.
 /// </summary>

From 2180745797161088ba7831b0ce0d89365ed98688 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Mon, 16 Feb 2026 21:12:20 +0100
Subject: [PATCH 349/360] Make ActiveInputMover a purely Runtime component

---
 Content.Shared/Movement/Components/ActiveInputMoverComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs b/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
index 24a0d9eacd..efe82f5125 100644
--- a/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Movement.Components;
 /// </remarks>
 /// <seealso cref="InputMoverComponent"/>
 /// <seealso cref="SharedMoverController.UpdateMoverStatus"/>
-[RegisterComponent, Access(typeof(SharedMoverController))]
+[RegisterComponent, Access(typeof(SharedMoverController)), UnsavedComponent] // DeltaV - Make Unsaved
 public sealed partial class ActiveInputMoverComponent : Component
 {
     /// <summary>

From 46c0d794e16b3dce04d2e3aa9edac5c3d1112df7 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 17 Feb 2026 20:07:55 +0100
Subject: [PATCH 350/360] Fix up some missing localisation strings

---
 .../Locale/en-US/_DV/chemistry/bottles.ftl    |  1 +
 .../en-US/_DV/devices/tape-recorder.ftl       |  1 +
 .../Locale/en-US/_DV/medical/healing.ftl      | 10 ++++
 Resources/Locale/en-US/_DV/paper/misc.ftl     |  9 ++++
 .../en-US/_Funkystation/medical/healing.ftl   |  6 +++
 .../en-US/_NF/respawn/respawn-system.ftl      |  2 +
 .../Consumable/Drinks/drinks_bottles.yml      |  2 +-
 .../Objects/Devices/tape_recorder.yml         |  2 +-
 .../_DV/Entities/Objects/Misc/paper.yml       | 10 +---
 .../Objects/Specific/Medical/healing.yml      | 48 +++++++++----------
 .../Objects/Specific/chemistry-bottles.yml    |  2 +-
 .../Objects/Specific/Medical/healing.yml      |  8 ++--
 12 files changed, 62 insertions(+), 39 deletions(-)
 create mode 100644 Resources/Locale/en-US/_DV/chemistry/bottles.ftl
 create mode 100644 Resources/Locale/en-US/_DV/devices/tape-recorder.ftl
 create mode 100644 Resources/Locale/en-US/_DV/medical/healing.ftl
 create mode 100644 Resources/Locale/en-US/_DV/paper/misc.ftl
 create mode 100644 Resources/Locale/en-US/_Funkystation/medical/healing.ftl

diff --git a/Resources/Locale/en-US/_DV/chemistry/bottles.ftl b/Resources/Locale/en-US/_DV/chemistry/bottles.ftl
new file mode 100644
index 0000000000..059744430b
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/chemistry/bottles.ftl
@@ -0,0 +1 @@
+chemistry-bottle-firebugs-friend = Firebug's Friend
diff --git a/Resources/Locale/en-US/_DV/devices/tape-recorder.ftl b/Resources/Locale/en-US/_DV/devices/tape-recorder.ftl
new file mode 100644
index 0000000000..5c501dc647
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/devices/tape-recorder.ftl
@@ -0,0 +1 @@
+cassette-tape-garry-smosh = Interview with Garry Smosh
diff --git a/Resources/Locale/en-US/_DV/medical/healing.ftl b/Resources/Locale/en-US/_DV/medical/healing.ftl
new file mode 100644
index 0000000000..1d268df2fc
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/medical/healing.ftl
@@ -0,0 +1,10 @@
+pill-agonolexyne-5u = agonolexyne 5u
+pill-stubantazine-10u = stubantazine 10u
+pill-tranquinase-10u = tranquinase 10u
+pill-tricordrazine-10u = tricordrazine 10u
+pill-soretizone-10u = soretizone 10u
+pill-serenitol-10u = serenitol 10u
+pill-equilibrazine-5u = equilibrazine 5u
+pill-neurozenium-10u = neurozenium 10u
+pill-blissifylovene-5u = blissifylovene 5u
+pill-calmafluxine-10u = calmafluxine 10u
diff --git a/Resources/Locale/en-US/_DV/paper/misc.ftl b/Resources/Locale/en-US/_DV/paper/misc.ftl
new file mode 100644
index 0000000000..e309da0c81
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/paper/misc.ftl
@@ -0,0 +1,9 @@
+paper-fake-nuke-codes = [color=red]TOP SECRET![/color]
+    nuclear fission explosive (NT-XXXXXX) code: XXXXXX
+
+paper-briefcase-uplink-instructions = This DNA-Secure and extra-spacious briefcase is an uplink to one of our surplus warehouses.
+
+    Use them as incentives to join for potential recruits, or to reward yourself for a job well done.
+
+    You have been given an initial budget of 50"TC", spend it wisely.
+    To insert more, make sure the briefcase is locked before inserting the TC.
diff --git a/Resources/Locale/en-US/_Funkystation/medical/healing.ftl b/Resources/Locale/en-US/_Funkystation/medical/healing.ftl
new file mode 100644
index 0000000000..9b590cb964
--- /dev/null
+++ b/Resources/Locale/en-US/_Funkystation/medical/healing.ftl
@@ -0,0 +1,6 @@
+# DeltaV - Added strings to silence localisation warning
+pill-granibitulari-15u = granibitulari 15u
+pill-granibitulari-20u = granibitulari 20u
+
+syringe-revivopine = revivopine
+syringe-convermol = convermol
diff --git a/Resources/Locale/en-US/_NF/respawn/respawn-system.ftl b/Resources/Locale/en-US/_NF/respawn/respawn-system.ftl
index 7fbaf9ee81..4574b35165 100644
--- a/Resources/Locale/en-US/_NF/respawn/respawn-system.ftl
+++ b/Resources/Locale/en-US/_NF/respawn/respawn-system.ftl
@@ -1,6 +1,8 @@
 ## UI
 ghost-respawn-rules-window-title = Ghost Respawn Rules
 ghost-respawn-rules-window-confirm-button = I understand, respawn me
+# DeltaV - Added missing ghost-gui-respawn string
+ghost-gui-respawn = Respawn
 ghost-gui-respawn-button-denied = Respawn ({$time}s)
 ghost-gui-respawn-button-allowed = Respawn
 # DeltaV - we have our own rules for respawning
diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 0b512a51d1..0b6267578f 100644
--- a/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -11,7 +11,7 @@
         - ReagentId: Jaegermister
           Quantity: 100
   - type: Label
-    currentLabel: jaegermister
+    currentLabel: reagent-name-jaegermister # DeltaV - Label localisation
   - type: Sprite
     sprite: _DEN/Objects/Consumable/Drinks/jaegermisterbottle.rsi
   - type: Sealable
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml
index b0cf129b67..039bafc4ed 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml
@@ -114,7 +114,7 @@
   id: CassetteTapeInterview
   components:
   - type: Label
-    currentLabel: Interview with Garry Smosh
+    currentLabel: cassette-tape-garry-smosh
   - type: TapeCassette
     recordedData:
       - timestamp: 2
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml
index 7b03f2ebb9..d29204113c 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml
@@ -494,11 +494,7 @@
     stampedBy:
     - stampedColor: "#850000FF"
       stampedName: Syndicate
-    content: |2
-      This DNA-Secure and extra-spacious briefcase is an uplink to one of our surplus warehouses.
-      Use them as incentives to join for potential recruits, or to reward yourself for a job well done.
-      You have been given an initial budget of 50"TC", spend it wisely.
-      To insert more, make sure the briefcase is locked before inserting the TC.
+    content: paper-briefcase-uplink-instructions
 
 - type: entity
   parent: BoxFolderRed
@@ -526,9 +522,7 @@
   name: nuclear authentication codes
   components:
   - type: Paper
-    content: |2
-      [color=red]TOP SECRET![/color]
-      nuclear fission explosive (NT-XXXXXX) code: XXXXXX
+    content: paper-fake-nuke-codes
 
 - type: entity
   parent: [BoxFolderClipboardEmpty, BaseGrandTheftContraband]
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml
index 2e1f4900ac..221da186d0 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml
@@ -1,14 +1,14 @@
 - type: entity
   parent: Pill
   id: PillSoretizone
-  suffix: Soretizone 10u
+  suffix: pill-soretizone-10u
   components:
   - type: Pill
     pillType: 14
   - type: Sprite
     state: pill15
   - type: Label
-    currentLabel: soretizone 10u
+    currentLabel: pill-soretizone-10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -20,10 +20,10 @@
 - type: entity
   parent: PillCanister
   id: PillCanisterSoretizone
-  suffix: Soretizone 10u, 5
+  suffix: pill-soretizone-10u, 5
   components:
   - type: Label
-    currentLabel: soretizone 10u
+    currentLabel: pill-soretizone-10u
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -33,14 +33,14 @@
 - type: entity
   parent: Pill
   id: PillSerenitol
-  suffix: Serenitol 10u
+  suffix: pill-serenitol-10u
   components:
   - type: Sprite
     state: pill10
   - type: Pill
     pillType: 9
   - type: Label
-    currentLabel: serenitol 10u
+    currentLabel: pill-serenitol-10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -52,10 +52,10 @@
 - type: entity
   parent: PillCanister
   id: PillCanisterSerenitol
-  suffix: Serenitol 10u, 5
+  suffix: pill-serenitol-10u, 5
   components:
   - type: Label
-    currentLabel: serenitol 10u
+    currentLabel: pill-serenitol-10u
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -65,14 +65,14 @@
 - type: entity
   parent: Pill
   id: PillNeurozenium
-  suffix: Neurozenium 10u
+  suffix: pill-neurozenium-10u
   components:
   - type: Sprite
     state: pill8
   - type: Pill
     pillType: 7
   - type: Label
-    currentLabel: neurozenium 10u
+    currentLabel: pill-neurozenium-10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -84,10 +84,10 @@
 - type: entity
   parent: PillCanister
   id: PillCanisterNeurozenium
-  suffix: Neurozenium 10u, 5
+  suffix: pill-neurozenium-10u, 5
   components:
   - type: Label
-    currentLabel: neurozenium 10u
+    currentLabel: pill-neurozenium-10u
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -136,7 +136,7 @@
   - type: Pill
     pillType: 6
   - type: Label
-    currentLabel: blissifylovene 5u
+    currentLabel: pill-blissifylovene-5u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -151,7 +151,7 @@
   suffix: Blissifylovene 5u, 5
   components:
   - type: Label
-    currentLabel: blissifylovene 5u
+    currentLabel: pill-blissifylovene-5u
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -168,7 +168,7 @@
   - type: Pill
     pillType: 14
   - type: Label
-    currentLabel: calmafluxine 10u
+    currentLabel: pill-calmafluxine-10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -183,7 +183,7 @@
   suffix: Calmafluxine 10u, 5
   components:
   - type: Label
-    currentLabel: calmafluxine 10u
+    currentLabel: pill-calmafluxine-10u
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -193,14 +193,14 @@
 - type: entity
   parent: Pill
   id: PillTranquinase
-  suffix: Tranquinase 10u
+  suffix: pill-tranquinase-10u
   components:
   - type: Sprite
     state: pill16
   - type: Pill
     pillType: 15
   - type: Label
-    currentLabel: tranquinase 10u
+    currentLabel: pill-stubantazine-10
   - type: SolutionContainerManager
     solutions:
       food:
@@ -212,10 +212,10 @@
 - type: entity
   parent: PillCanister
   id: PillCanisterTranquinase
-  suffix: Tranquinase 10u, 5
+  suffix: pill-tranquinase-10u, 5
   components:
   - type: Label
-    currentLabel: tranquinase 10u
+    currentLabel: pill-stubantazine-10
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -232,7 +232,7 @@
   - type: Pill
     pillType: 2
   - type: Label
-    currentLabel: stubantazine 10u
+    currentLabel: pill-stubantazine-10
   - type: SolutionContainerManager
     solutions:
       food:
@@ -247,7 +247,7 @@
   suffix: Stubantazine 10u, 5
   components:
   - type: Label
-    currentLabel: stubantazine 10u
+    currentLabel: pill-stubantazine-10
   - type: EntityTableContainerFill
     containers:
       storagebase:
@@ -264,7 +264,7 @@
   - type: Pill
     pillType: 19
   - type: Label
-    currentLabel: agonolexyne 5u
+    currentLabel: pill-agonolexyne-5u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -279,7 +279,7 @@
   suffix: Agonolexyne 5u, 5
   components:
   - type: Label
-    currentLabel: agonolexyne 5u
+    currentLabel: pill-agonolexyne-5u
   - type: EntityTableContainerFill
     containers:
       storagebase:
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml
index 889a5cc829..df81911199 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml
@@ -34,7 +34,7 @@
   suffix: firebug's friend
   components:
   - type: Label
-    currentLabel: Firebug's Friend
+    currentLabel: chemistry-bottle-firebugs-friend
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml
index 8fb8efb99e..79113f1bd1 100644
--- a/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/_Funkystation/Objects/Specific/Medical/healing.yml
@@ -4,7 +4,7 @@
   id: SyringeConvermol
   components:
   - type: Label
-    currentLabel: convermol
+    currentLabel: syringe-convermol # DeltaV - Label localisation
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -19,7 +19,7 @@
   id: SyringeRevivopine
   components:
   - type: Label
-    currentLabel: revivopine
+    currentLabel: syringe-revivopine # DeltaV - Label localisation
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -39,7 +39,7 @@
   - type: Sprite
     state: pill3
   - type: Label
-    currentLabel: granibitulari 20u
+    currentLabel: pill-granibitulari-20u # DeltaV - Label localisation
   - type: SolutionContainerManager
     solutions:
       food:
@@ -55,7 +55,7 @@
   suffix: Granibitulari 15u
   components:
   - type: Label
-    currentLabel: granibitulari 15u
+    currentLabel: pill-granibitulari-15u  # DeltaV - Label localisation
   - type: EntityTableContainerFill
     containers:
       storagebase:

From 8aecbaf7f165885606e588ac5442f610c864066a Mon Sep 17 00:00:00 2001
From: Centronias <charlie.t.santos@gmail.com>
Date: Tue, 17 Feb 2026 10:15:10 -0800
Subject: [PATCH 351/360] Add missing test pair cleanup to
 SharedGasSpecificHeatsTest (#42763)

* add SharedGasSpecificHeatsTest testpair cleanup

and make it nonparallel because sometimes the basic tests blast through so fast that the pairs are reused before they're read (or something? I honestly don't know, but making it non-parallel fixed issues I was seeing)

* Apply suggestion from @Centronias
---
 .../Tests/Atmos/SharedGasSpecificHeatsTest.cs             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs b/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs
index 6c3bcbe6db..ac80f4a105 100644
--- a/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/SharedGasSpecificHeatsTest.cs
@@ -13,7 +13,7 @@ namespace Content.IntegrationTests.Tests.Atmos;
 /// Tests for asserting that various gas specific heat operations agree with each other and do not deviate
 /// across client and server.
 /// </summary>
-[TestOf(nameof(SharedAtmosphereSystem))]
+[TestOf(nameof(SharedAtmosphereSystem)), FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
 public sealed class SharedGasSpecificHeatsTest
 {
     private IConfigurationManager _sConfig;
@@ -46,6 +46,12 @@ public sealed class SharedGasSpecificHeatsTest
         _cAtmos = _cEntMan.System<AtmosphereSystem>();
     }
 
+    [TearDown]
+    public async Task TearDown()
+    {
+        await _pair.CleanReturnAsync();
+    }
+
     /// <summary>
     /// Asserts that the cached gas specific heat arrays agree with each other.
     /// </summary>

From 669255629b1bc960bdd6aacfdd4d4ac79386fed3 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 21 Feb 2026 21:25:15 +0100
Subject: [PATCH 352/360] Fix some integration test pair mismanagement (#42958
 - Early merge)

---
 .../Tests/Chemistry/ReagentDataTest.cs                     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Chemistry/ReagentDataTest.cs b/Content.IntegrationTests/Tests/Chemistry/ReagentDataTest.cs
index f488734655..b038458662 100644
--- a/Content.IntegrationTests/Tests/Chemistry/ReagentDataTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/ReagentDataTest.cs
@@ -11,10 +11,9 @@ namespace Content.IntegrationTests.Tests.Chemistry;
 public sealed class ReagentDataTest : InteractionTest
 {
     [Test]
-    public async Task ReagentDataIsSerializable()
+    public void ReagentDataIsSerializable()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var reflection = pair.Server.ResolveDependency<IReflectionManager>();
+        var reflection = Pair.Server.ResolveDependency<IReflectionManager>();
 
         Assert.Multiple(() =>
         {
@@ -24,7 +23,5 @@ public sealed class ReagentDataTest : InteractionTest
                 Assert.That(instance.HasCustomAttribute<SerializableAttribute>(), $"{instance} must have the serializable attribute.");
             }
         });
-
-        await pair.CleanReturnAsync();
     }
 }

From 104d2d53da9662dd6558598f32de9ede9bb2019c Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sun, 22 Feb 2026 16:13:24 +0100
Subject: [PATCH 353/360] Fix species name missing for kistune yaml

---
 Resources/Prototypes/_DV/Species/kitsune.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_DV/Species/kitsune.yml b/Resources/Prototypes/_DV/Species/kitsune.yml
index 0508712f47..ed261e7642 100644
--- a/Resources/Prototypes/_DV/Species/kitsune.yml
+++ b/Resources/Prototypes/_DV/Species/kitsune.yml
@@ -1,6 +1,6 @@
 - type: species
   id: Kitsune
-  name: Kitsune
+  name: species-name-kitsune
   roundStart: true
   prototype: MobKitsune
   sprites: MobHumanSprites

From ae1c3e33b668730b01a529fd5fc0a34c15c01d27 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 3 Mar 2026 16:33:50 +0100
Subject: [PATCH 354/360] Add missing string to silence console warnings

---
 Resources/Locale/en-US/_DV/replays/replays.ftl | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Resources/Locale/en-US/_DV/replays/replays.ftl

diff --git a/Resources/Locale/en-US/_DV/replays/replays.ftl b/Resources/Locale/en-US/_DV/replays/replays.ftl
new file mode 100644
index 0000000000..23400302d5
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/replays/replays.ftl
@@ -0,0 +1,3 @@
+# Silence warnings about missing strings for this one command every time you type in the console.
+# Should be replaced by upstream at somepoint
+cmd-replay-toggle-screenshot-mode-desc = Toggles screenshot mode

From 72ab0bb9d5026a3c919e7f297401676f9c79f724 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Thu, 2 Apr 2026 15:10:12 +0200
Subject: [PATCH 355/360] Fixup blood

---
 Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml
index b4a3484923..e9f014a9e3 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml
@@ -39,12 +39,11 @@
       - id: SheetSteel10
         amount: 1
   - type: Bloodstream
-    bloodReagents:
+    bloodReferenceSolution:
       reagents:
       - ReagentId: Oil
-        Quantity: 1
+        Quantity: 1000
     bleedReductionAmount: 0.1
-    bloodMaxVolume: 1000
     maxBleedAmount: 10.75
     bloodlossDamage:
       types:

From cb82b10dbaddd6daade0310b829c9bb3e258380c Mon Sep 17 00:00:00 2001
From: Tobias Berger <toby@tobot.dev>
Date: Mon, 6 Apr 2026 22:52:35 +0200
Subject: [PATCH 356/360] Fix bionic voice mask implant icon

---
 .../Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml
index d6f0b23fe3..ec94f83ad5 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml
@@ -6,7 +6,7 @@
   description: This implant lets its user adjust their voice to whoever they can think of.
   components:
   - type: SubdermalImplant
-    implantAction: ActionChangeVoiceMask
+    implantAction: ActionChangeVoiceMaskImplant
   - type: VoiceMask
   - type: UserInterface
     interfaces:

From 3c719120d16d8fc266162928c3f63875014511b4 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 7 Apr 2026 20:13:26 +0200
Subject: [PATCH 357/360] Add hitscan names for #41763

---
 .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml    | 5 +++++
 .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 66ad2db1f7..0bb86baa26 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -1,6 +1,7 @@
 - type: entity
   parent: BasicHitscan
   id: WispLash
+  name: wisp lash
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicVisuals
@@ -22,6 +23,7 @@
 - type: entity
   parent: BasicHitscan
   id: ColdLaser
+  name: cold laser
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicVisuals
@@ -44,6 +46,7 @@
 - type: entity
   parent: BasicHitscan
   id: BeamLaser
+  name: beam laser
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicVisuals
@@ -64,6 +67,7 @@
 - type: entity
   parent: BasicHitscan
   id: BeamDev
+  name: devastator beam
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicVisuals
@@ -85,6 +89,7 @@
 - type: entity
   parent: BasicHitscan
   id: GamblagatorLaser
+  name: gamblagator laser
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicVisuals
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index b7ebfec1c4..2e3d426ee7 100644
--- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -1,6 +1,7 @@
 - type: entity
   parent: BasicHitscan
   id: EmergencyRedLaser
+  name: emergency red laser # DeltaV - Add name for hitscans
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -11,6 +12,7 @@
 - type: entity
   parent: BasicHitscan
   id: EchionLaser
+  name: echion laser # DeltaV - Add name for hitscans
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicVisuals
@@ -26,4 +28,4 @@
   - type: HitscanBasicDamage
     damage:
       types:
-        Heat: 18
\ No newline at end of file
+        Heat: 18

From 68e2f4469019b638007d376ee24a560e7c002c4a Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 7 Apr 2026 21:34:51 +0200
Subject: [PATCH 358/360] Update name for BoxShellSoulbreaker to be in line
 with upstream

---
 .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index d535ac07eb..34ed18191f 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BoxShotgunSlug
   id: BoxShellSoulbreaker
-  name: shell box (soulbreaker)
+  name: ammunition box (.50 soulbreaker)
   description: A box full of anti-psionic soulbreaker cartridges, designed for riot shotguns.
   components:
   - type: BallisticAmmoProvider

From 074fb1775a2649c32db7404eb70bac6580eea817 Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Tue, 7 Apr 2026 21:37:33 +0200
Subject: [PATCH 359/360] Replace WeldingHealable for IPCs with upstream

---
 Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml
index 685b352ab2..11c35dd129 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml
@@ -108,7 +108,11 @@
 #     layoutId: IPC
   - type: EmitBuzzWhileDamaged
   - type: CanHostGuardian
-  - type: WeldingHealable
+  - type: Repairable # DeltaV - Replace welding healable with upstream version
+    damageValue: -10 # 10 seconds to repair from crit
+    doAfterDelay: 1
+    fuelCost: 0.5
+    allowSelfRepair: true # DeltaV - was false
   - type: Fiber # DeltaV - IPCs leave fibers instead of prints
     fiberMaterial: fibers-steel
   - type: CombatMode # DeltaV - let IPCs disarm

From 1ef385d3fe4e57331fc1b52e19e78d82fb698e4f Mon Sep 17 00:00:00 2001
From: BarryNorfolk <barrynorfolkman@protonmail.com>
Date: Sat, 11 Apr 2026 19:22:06 +0200
Subject: [PATCH 360/360] Update upstream changelogs

---
 Resources/Changelog/Admin.yml     |   69 +-
 Resources/Changelog/Changelog.yml | 2785 ++++++++++++++---------------
 2 files changed, 1459 insertions(+), 1395 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 0c3a0e4122..78900318fa 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,6 +1,4 @@
 AdminOnly: true
-Name: Admin
-Order: 6
 Entries:
 - author: DrSmugleaf
   changes:
@@ -1534,3 +1532,70 @@ Entries:
   id: 186
   time: '2025-11-21T21:53:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41273
+- author: ScarKy0
+  changes:
+  - message: The killsign can now be customized to use any sprite via it's component.
+    type: Add
+  - message: Hidden Kill Sign smite. Visible to everyone but the person you apply
+      it to.
+    type: Add
+  id: 187
+  time: '2025-12-14T02:16:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41845
+- author: AshBats
+  changes:
+  - message: The admin log now shows APC power toggle interactions.
+    type: Add
+  id: 188
+  time: '2025-12-14T03:27:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41839
+- author: Hitlinemoss
+  changes:
+  - message: Added a debug wizard's grimoire, for debugging purposes. Contains 99999
+      WizCoin and has ownerOnly set to false. You can use this for admeme purposes
+      but probably shouldn't unless you want to risk everyone on the station having
+      every spell.
+    type: Add
+  id: 189
+  time: '2025-12-18T19:33:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41900
+- author: ScarKy0
+  changes:
+  - message: Station AI Radial actions are now logged. Search for "Station AI Radial"
+      in the logs menu under Actions.
+    type: Add
+  id: 190
+  time: '2025-12-20T18:23:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41911
+- author: eoineoineoin
+  changes:
+  - message: Fix bug where scrollbars were missing from player list
+    type: Fix
+  id: 191
+  time: '2025-12-22T16:54:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40525
+- author: ScarKy0
+  changes:
+  - message: Msg toolshed command. Used for sending messages to the target entities,
+      via popups, chat, tippy or as a subtle message.
+    type: Add
+  id: 192
+  time: '2026-01-05T21:13:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41936
+- author: mikeysaurus
+  changes:
+  - message: Admins can now vvwrite FTLCooldownOverride to override the FTL Cooldown's
+      timer.
+    type: Add
+  id: 193
+  time: '2026-01-09T06:58:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42209
+- author: Kowlin
+  changes:
+  - message: The super door remote can now set overcharge on airlocks.
+    type: Tweak
+  id: 194
+  time: '2026-01-13T01:02:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42370
+Name: Admin
+Order: 3
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 23a7287006..0240286d56 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,1392 +1,4 @@
-Order: 2
-Entries:
-- author: beck-thompson
-  changes:
-  - message: The escape menu ui has been updated slightly.
-    type: Tweak
-  id: 8741
-  time: '2025-07-05T09:28:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38650
-- author: EmoGarbage404
-  changes:
-  - message: Fixed people asphyxiating if left on a stasis bed.
-    type: Fix
-  id: 8742
-  time: '2025-07-06T00:59:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38762
-- author: slarticodefast
-  changes:
-  - message: You can now catch basketballs, footballs and beach balls that are thrown
-      at you!
-    type: Add
-  id: 8743
-  time: '2025-07-06T16:54:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37702
-- author: ArtisticRoomba
-  changes:
-  - message: The Go Go Hat now correctly retrieves and deposits items again.
-    type: Fix
-  id: 8744
-  time: '2025-07-06T23:42:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38810
-- author: maland1
-  changes:
-  - message: Reduced the size of the go go hat inventory
-    type: Tweak
-  id: 8745
-  time: '2025-07-06T23:50:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38808
-- author: AsnDen
-  changes:
-  - message: Golden PAI was added. It is extremely rare and expensive. This PAI can
-      be found in maint lockers
-    type: Add
-  id: 8746
-  time: '2025-07-07T05:07:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38549
-- author: Smugman
-  changes:
-  - message: Many new lighters can now be found in both Maints loot and the Syndicate
-      Uplink.
-    type: Add
-  id: 8747
-  time: '2025-07-07T18:53:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35514
-- author: Jopaglazik, Golub
-  changes:
-  - message: Added Jump Boots In T1 "Salvage Equipment" technology.
-    type: Add
-  id: 8748
-  time: '2025-07-07T19:19:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36862
-- author: slarticodefast, EmoGarbage404
-  changes:
-  - message: 'Added a new science gadget: The H.A.R.M.P.A.C.K., a backpack that gives
-      you two extra hands when worn. Unlocked with a T2 arsenal research and printable
-      at the protolathe and secfab.'
-    type: Fix
-  id: 8749
-  time: '2025-07-07T21:43:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38824
-- author: kosticia
-  changes:
-  - message: Added new reagent for artifact researching - artifact glue! Use it on
-      the artefact with active node for repair its durability.
-    type: Add
-  id: 8750
-  time: '2025-07-08T01:45:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38670
-- author: maland1
-  changes:
-  - message: Updated contraband tags on pulse weapons, temp gun, portable particle
-      decelerator, tesla gun and makeshift laser pistol to be more consistent with
-      their intended owners and legality
-    type: Tweak
-  id: 8751
-  time: '2025-07-08T11:55:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38698
-- author: TrixxedHeart
-  changes:
-  - message: Vox can now have heterochromia in the overlays category under markings.
-    type: Add
-  id: 8752
-  time: '2025-07-08T23:22:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38595
-- author: Quantum-cross
-  changes:
-  - message: Fix lingering ghost entities after taking ghost roles.
-    type: Fix
-  id: 8753
-  time: '2025-07-09T11:07:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38788
-- author: Sparlight
-  changes:
-  - message: Dragons no longer destroy non-humanoid mobs upon eating them.
-    type: Tweak
-  id: 8754
-  time: '2025-07-09T12:43:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38087
-- author: Crude Oil
-  changes:
-  - message: Parrots now parrot nearby speech, sometimes even using the radio if they
-      have one equipped
-    type: Add
-  - message: Polly the Parrot, CE's pet parrot, may be found on some maps parroting
-      things into an engineering headset.
-    type: Add
-  id: 8755
-  time: '2025-07-09T19:04:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38243
-- author: slarticodefast
-  changes:
-  - message: Added VV buttons to the solution editor.
-    type: Add
-  id: 8756
-  time: '2025-07-10T06:31:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38889
-- author: Toby222
-  changes:
-  - message: pAIs can emote like borgs now
-    type: Add
-  id: 8757
-  time: '2025-07-10T07:56:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38425
-- author: Quantum-cross, slarticodefast
-  changes:
-  - message: The flash effect is now replaced with a reduced motion variant if the
-      accessibility setting is enabled in the game options.
-    type: Add
-  id: 8758
-  time: '2025-07-10T09:30:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37824
-- author: K-Dynamic
-  changes:
-  - message: Minigun now has inhand sprites.
-    type: Add
-  - message: Miniguns and other HMGs now require two hands to pick up and slows you
-      by 20%.
-    type: Tweak
-  id: 8759
-  time: '2025-07-10T12:42:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35344
-- author: ScarKy0
-  changes:
-  - message: SecTech vendor now starts with a few bolas.
-    type: Add
-  id: 8760
-  time: '2025-07-10T14:47:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38902
-- author: Hitlinemoss
-  changes:
-  - message: The station AI can now pick kobold/monkey holograms as customization
-      options.
-    type: Add
-  id: 8761
-  time: '2025-07-10T17:11:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38888
-- author: slarticodefast
-  changes:
-  - message: Fixed clones not getting the thieving skill.
-    type: Fix
-  id: 8762
-  time: '2025-07-10T21:37:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38914
-- author: Ertanic and whatston3
-  changes:
-  - message: The spray painter can now paint gas canisters, crates, lockers, and floor
-      decals.
-    type: Add
-  - message: The spray painter now consumes compressed paint, available from the YouTool
-      or printable in the autolathe.
-    type: Tweak
-  id: 8763
-  time: '2025-07-11T00:36:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37341
-- author: Princess-Cheeseballs
-  changes:
-  - message: Added Stamina and Stun animations
-    type: Add
-  id: 8764
-  time: '2025-07-11T12:13:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37196
-- author: Centronias
-  changes:
-  - message: Muzzles now prevent wearers from screaming and suppress sounds on audio
-      emotes.
-    type: Tweak
-  id: 8765
-  time: '2025-07-11T17:18:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32588
-- author: TiniestShark
-  changes:
-  - message: Added inhand sprites to all bottled drinks.
-    type: Add
-  id: 8766
-  time: '2025-07-12T14:28:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38937
-- author: Velken
-  changes:
-  - message: Ian and McGriff are more fashionable by letting them wear hats and glasses.
-    type: Add
-  id: 8767
-  time: '2025-07-13T16:11:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38634
-- author: Toast_Enjoyer, huaqas
-  changes:
-  - message: The Purchaseable Scurret now comes in a livestock crate instead of a
-      plastic one. Wawa!
-    type: Fix
-  id: 8768
-  time: '2025-07-13T16:48:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38951
-- author: lzk228
-  changes:
-  - message: Changed ocarina's size from Normal to Small
-    type: Tweak
-  id: 8769
-  time: '2025-07-13T19:31:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38971
-- author: ToastEnjoyer
-  changes:
-  - message: The nukeop war declarator is now syndicate contraband.
-    type: Tweak
-  id: 8770
-  time: '2025-07-13T20:50:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38972
-- author: Flareguy
-  changes:
-  - message: Added several new vox customization options, including additional tails,
-      hairstyles, and tattoos.
-    type: Add
-  - message: Added eyeshadow markings. They're available on every species except for
-      Moth and Arachnid.
-    type: Add
-  id: 8771
-  time: '2025-07-14T02:49:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38906
-- author: Trosling
-  changes:
-  - message: Moved Bible/Holy Book choice to loadout options for chaplain.
-    type: Tweak
-  - message: Implemented new holy book sprites, as well as one existing one (space
-      quran).
-    type: Add
-  id: 8772
-  time: '2025-07-15T00:49:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38986
-- author: RedBookcase
-  changes:
-  - message: The Kardashev-Mosin's bayonet can now be used while the weapon is wielded.
-      Tally ho!
-    type: Add
-  id: 8773
-  time: '2025-07-15T00:49:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38295
-- author: SlamBamActionman
-  changes:
-  - message: Throwable item hitboxes have been updated to better reflect their sprites.
-    type: Tweak
-  id: 8774
-  time: '2025-07-15T00:51:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38985
-- author: Velken
-  changes:
-  - message: Moproaches have been added to the game.
-    type: Add
-  - message: Moproaches can sometimes appear from the station's sewage system.
-    type: Add
-  id: 8775
-  time: '2025-07-15T02:47:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38700
-- author: nabegator
-  changes:
-  - message: You can now put remote signallers into utility belts.
-    type: Tweak
-  id: 8776
-  time: '2025-07-16T00:43:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35212
-- author: ArtisticRoomba
-  changes:
-  - message: Firelocks will now properly drop fast enough to prevent the spacing of
-      an entire atmos volume.
-    type: Fix
-  - message: Only the necessary firelocks required to stop a spacing will drop when
-      a spacing is triggered, instead of all firelocks in a spaced volume.
-    type: Fix
-  id: 8777
-  time: '2025-07-16T03:18:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38918
-- author: ScarKy0
-  changes:
-  - message: Wizard's Mjollnir can no longer stun when thrown off-cooldown.
-    type: Fix
-  id: 8778
-  time: '2025-07-16T20:27:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39018
-- author: SlamBamActionman
-  changes:
-  - message: Grilles under diagonal windows no longer electrocute you.
-    type: Fix
-  id: 8779
-  time: '2025-07-17T13:33:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39032
-- author: qwerltaz
-  changes:
-  - message: NPC spiders now spin webs sometimes!
-    type: Add
-  id: 8780
-  time: '2025-07-17T16:34:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38319
-- author: Quantum-cross
-  changes:
-  - message: Anomalies make anomalous noises if you let them go supercritical
-    type: Add
-  id: 8781
-  time: '2025-07-17T17:01:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36425
-- author: ScarKy0
-  changes:
-  - message: There have been major tweaks to the contraband and emag vendor tables.
-      Mainly emagged inventories now only contain syndie flavor items(clothing and
-      similiar), while the rest has either been moved to the contraband inventory
-      or removed.
-    type: Tweak
-  id: 8782
-  time: '2025-07-17T21:36:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36839
-- author: ScarKy0
-  changes:
-  - message: Added the acolyte armor to the chaplain's uplink.
-    type: Add
-  - message: Syndicate bundles are now correctly marked as syndicate contraband.
-    type: Fix
-  id: 8783
-  time: '2025-07-17T22:00:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36843
-- author: SeaWyrm
-  changes:
-  - message: Four varieties of marble tile can now be produced at Cutter lathes.
-    type: Add
-  id: 8784
-  time: '2025-07-17T23:44:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38007
-- author: august-sun
-  changes:
-  - message: Added Estoc magazines to the syndicate ammo bundle.
-    type: Add
-  id: 8785
-  time: '2025-07-18T10:35:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38413
-- author: Kowlin
-  changes:
-  - message: The access configurator can now set GenPop enter and leave accesses on
-      doors and turnstiles.
-    type: Tweak
-  id: 8786
-  time: '2025-07-18T10:53:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39043
-- author: Quantum-cross
-  changes:
-  - message: The bartender's mailing unit on plasma is properly configured.
-    type: Fix
-  id: 8787
-  time: '2025-07-18T10:54:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38098
-- author: Quantum-cross
-  changes:
-  - message: Unwarmed honk pockets no longer contain omnizine
-    type: Fix
-  - message: Honk pockets make you honk
-    type: Fix
-  id: 8788
-  time: '2025-07-18T11:03:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38152
-- author: TeenSarlacc
-  changes:
-  - message: Lowered Double Barrel shotgun spread to 60%.
-    type: Tweak
-  - message: Increased Sawn Off shotgun spread to 140%.
-    type: Tweak
-  id: 8789
-  time: '2025-07-18T11:41:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37731
-- author: notquitehadouken
-  changes:
-  - message: Mass scanner now shows any grid's distance from the current grid/entity
-      in tiles instead of from the top left corner of the UI in pixels
-    type: Fix
-  id: 8790
-  time: '2025-07-18T15:33:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39041
-- author: Pyrovi
-  changes:
-  - message: Changed some outdated info in the guidebook
-    type: Tweak
-  id: 8791
-  time: '2025-07-19T01:41:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38987
-- author: TiniestShark
-  changes:
-  - message: Adds a new slot for the Golden Plunger on the Janitor Trolley.
-    type: Add
-  - message: Holo and Magicarp plushies now show up in the mop bucket properly.
-    type: Tweak
-  id: 8792
-  time: '2025-07-19T15:33:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38494
-- author: Boaz1111
-  changes:
-  - message: More atmos devices can now be constructed on layers from the construction
-      menu.
-    type: Add
-  id: 8793
-  time: '2025-07-19T22:04:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38672
-- author: IgorAnt028
-  changes:
-  - message: The color of the pipe in a hand now matches the real color of the pipe
-    type: Fix
-  id: 8794
-  time: '2025-07-19T22:10:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30645
-- author: Princess-Cheeseballs
-  changes:
-  - message: Added crawling!
-    type: Add
-  id: 8795
-  time: '2025-07-19T23:54:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36881
-- author: Princess-Cheeseballs
-  changes:
-  - message: Turrets and NPCs can now shoot downed targets.
-    type: Tweak
-  id: 8796
-  time: '2025-07-20T21:23:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39085
-- author: sowelipililimute
-  changes:
-  - message: SmartFridges are now implemented. You can store large amounts of chemicals
-      and plants within them for people to take.
-    type: Add
-  id: 8797
-  time: '2025-07-21T03:21:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38648
-- author: ArtisticRoomba
-  changes:
-  - message: China-lake fragmentation grenades now spew fragmentation in all directions
-      upon impact. They now do reduced explosion damage.
-    type: Tweak
-  - message: China-lake blast grenades no longer cause spacing.
-    type: Tweak
-  id: 8798
-  time: '2025-07-22T15:05:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39106
-- author: perryprog
-  changes:
-  - message: Void applause should now function as expected again.
-    type: Fix
-  id: 8799
-  time: '2025-07-22T19:34:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38731
-- author: treytipton
-  changes:
-  - message: Made NukeOps elimination announcement less wordy.
-    type: Tweak
-  id: 8800
-  time: '2025-07-23T02:58:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39158
-- author: lzk228
-  changes:
-  - message: The customvote command results now show the title the command had.
-    type: Tweak
-  id: 8801
-  time: '2025-07-23T14:15:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39137
-- author: FairlySadPanda
-  changes:
-  - message: Almost every instrument has been updated to a new soundfont (GeneralUser-GS),
-      unifying all operating systems and massively improving the sound of certain
-      instruments.
-    type: Add
-  id: 8802
-  time: '2025-07-23T15:51:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39142
-- author: slarticodefast
-  changes:
-  - message: Enabled the "showrot", "showvel" and "showangvel" commands for debug
-      permissions.
-    type: Tweak
-  - message: Fixed the "showplayervelocity" command permissions.
-    type: Tweak
-  id: 8803
-  time: '2025-07-23T18:06:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39167
-- author: Lokachop
-  changes:
-  - message: The engineering & chief engineer's hardsuit now properly glow in the
-      dark
-    type: Fix
-  id: 8804
-  time: '2025-07-24T03:04:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39153
-- author: K-Dynamic
-  changes:
-  - message: Cold slowdowns are now less impactful.
-    type: Tweak
-  id: 8805
-  time: '2025-07-24T09:44:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36316
-- author: B-Kirill
-  changes:
-  - message: The AI eye now has a postscript with the name of AI itself.
-    type: Add
-  id: 8806
-  time: '2025-07-24T11:24:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39177
-- author: SlamBamActionman
-  changes:
-  - message: Potassium-water explosion damage scaling has been tweaked to be less
-      potent.
-    type: Tweak
-  id: 8807
-  time: '2025-07-25T16:04:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37924
-- author: SlamBamActionman
-  changes:
-  - message: Chemistry foam and smoke reactions now trigger after regular mix reactions.
-    type: Tweak
-  - message: Foam, smoke and explosion reactions no longer transfer the reagents'
-      energies to the container.
-    type: Tweak
-  id: 8808
-  time: '2025-07-25T16:33:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37915
-- author: Quantum-cross
-  changes:
-  - message: Fixed pinpointer arrow not being centered properly.
-    type: Fix
-  id: 8809
-  time: '2025-07-25T19:46:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38657
-- author: PJB3005
-  changes:
-  - message: Made most plushie sounds quieter, and made plushies slower to use.
-    type: Tweak
-  id: 8811
-  time: '2025-07-28T07:11:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39250
-- author: EmoGarbage404
-  changes:
-  - message: Fixed being unable to fold certain clothing while worn.
-    type: Fix
-  id: 8812
-  time: '2025-07-28T10:19:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39257
-- author: lzk228
-  changes:
-  - message: Janibelt can hold the golden plunger now.
-    type: Fix
-  id: 8813
-  time: '2025-07-28T12:59:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39213
-- author: SuperGDPWYL
-  changes:
-  - message: The Warden now starts with a network configurator in their locker.
-    type: Add
-  id: 8814
-  time: '2025-07-28T16:09:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39254
-- author: TrixxedHeart
-  changes:
-  - message: Several strange sprite issues with Vox have been fixed, most notably
-      jumpsuits and many neck items overlapping the face, as well as a layering issue
-      where their tank would appear over their hair.
-    type: Fix
-  id: 8815
-  time: '2025-07-28T21:28:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39219
-- author: K-Dynamic
-  changes:
-  - message: Quartermaster job and ID icons are now based on Cargo Technicians.
-    type: Tweak
-  id: 8816
-  time: '2025-07-29T07:34:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39259
-- author: Alkheemist
-  changes:
-  - message: Protected Grids can now again have their hull and tiles repaired (Evac,
-      ATS, etc)
-    type: Fix
-  - message: Protected Grids can no longer be expanded outside of their original size.
-    type: Fix
-  id: 8817
-  time: '2025-07-29T12:01:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39271
-- author: Admiral-Obvious-001
-  changes:
-  - message: Several advanced chemicals now act slower, but with raised OD thresholds
-      and lowered OD damage. The healing per unit remains largely the same.
-    type: Tweak
-  - message: Bicaradine no longer makes razorium when mixed with advanced brute chems.
-      Advanced brute chems still mix and create razorium when combined.
-    type: Tweak
-  id: 8818
-  time: '2025-07-29T18:52:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38811
-- author: aada
-  changes:
-  - message: Lipolicide now continues to poison at 0 hunger.
-    type: Fix
-  - message: Tricordrazine now also heals at exactly 50 damage instead of needing
-      to be below 50. Similar thresholds on other reagents tweaked the same.
-    type: Tweak
-  id: 8819
-  time: '2025-07-30T06:44:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36289
-- author: Disp-Dev
-  changes:
-  - message: A new recipe has been added, moth-edible cotton cakes.
-    type: Add
-  id: 8820
-  time: '2025-07-30T22:51:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39222
-- author: spanky-spanky
-  changes:
-  - message: The wizard now spawns in a den instead of a shuttle.
-    type: Tweak
-  id: 8821
-  time: '2025-07-31T04:08:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37701
-- author: perryprog
-  changes:
-  - message: Fixed board game areas sometimes overlapping with those of other board
-      games.
-    type: Fix
-  id: 8822
-  time: '2025-08-01T21:48:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39327
-- author: Krosus
-  changes:
-  - message: Fixed crash when loading saved character profiles
-    type: Fix
-  id: 8823
-  time: '2025-08-02T15:14:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39333
-- author: FairlySadPanda
-  changes:
-  - message: A new cake, berry delight, that is made with a cake base, berries and
-      milk.
-    type: Add
-  id: 8824
-  time: '2025-08-02T18:35:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38881
-- author: DrSmugleaf
-  changes:
-  - message: Fixed rotate verbs being delayed when used, and your right click UI bounce
-      when they appear after a short delay.
-    type: Fix
-  id: 8825
-  time: '2025-08-03T00:34:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38165
-- author: alexalexmax
-  changes:
-  - message: Updated the syndicate throwing knives uplink entry to include the fact
-      that they ignore armor.
-    type: Tweak
-  id: 8826
-  time: '2025-08-04T19:19:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39374
-- author: TrixxedHeart
-  changes:
-  - message: Added canes to the trinkets loadout tab.
-    type: Add
-  - message: Added offset canes for roleplay flair. They can be crafted in the medical
-      lathe.
-    type: Add
-  id: 8827
-  time: '2025-08-04T23:39:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39272
-- author: qwerltaz
-  changes:
-  - message: The air alarm window scrubber controller now has buttons to select and
-      deselect all gases.
-    type: Add
-  id: 8828
-  time: '2025-08-05T00:34:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39296
-- author: perryprog
-  changes:
-  - message: Players no longer have the ability to cycle a timer in the verb menu
-      on a cyborg.
-    type: Fix
-  id: 8829
-  time: '2025-08-05T03:26:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39388
-- author: Luxeator
-  changes:
-  - message: Fixed error upon exploding buckled mobs (and other near instantaneous
-      changes)
-    type: Fix
-  id: 8830
-  time: '2025-08-05T23:15:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39410
-- author: ScarKy0, beck-thompson
-  changes:
-  - message: Various canines will now sometimes clumsily spill things they drink.
-    type: Add
-  id: 8831
-  time: '2025-08-06T13:00:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38852
-- author: aada
-  changes:
-  - message: You can examine fuel tanks to see how much they're filled.
-    type: Add
-  id: 8832
-  time: '2025-08-06T16:11:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39362
-- author: Tao7891
-  changes:
-  - message: Craftable cardboard structures and equipment.
-    type: Add
-  id: 8833
-  time: '2025-08-06T16:58:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37363
-- author: slarticodefast
-  changes:
-  - message: Fixed inventory sprites flickering when hovering over the slot with an
-      item.
-    type: Fix
-  id: 8834
-  time: '2025-08-06T20:14:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39379
-- author: Thinbug0
-  changes:
-  - message: New onion mutation, Bloonions! floating balloon-like onions.
-    type: Add
-  id: 8835
-  time: '2025-08-07T01:51:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33375
-- author: Kittygyat
-  changes:
-  - message: Made baseball bats 1x4 instead of 2x2
-    type: Tweak
-  - message: New baseball bat inventory icon sprites
-    type: Add
-  id: 8836
-  time: '2025-08-07T03:03:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38392
-- author: lolman360
-  changes:
-  - message: Fixed certain items (like pickaxes) failing to insert into containers
-      that have enough space to store them, sometimes.
-    type: Fix
-  id: 8837
-  time: '2025-08-07T16:01:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38896
-- author: chromiumboy
-  changes:
-  - message: The station AI will receive chat notifications when its sentry turrets
-      start firing upon hostile targets.
-    type: Add
-  id: 8838
-  time: '2025-08-08T18:56:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35277
-- author: K-Dynamic
-  changes:
-  - message: Captain and Head of Personnel starts with administration glasses and
-      hud respectively.
-    type: Add
-  id: 8839
-  time: '2025-08-08T19:00:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35531
-- author: perryprog
-  changes:
-  - message: The emote radial menu now shows the correct icons for its subcategories.
-    type: Fix
-  id: 8840
-  time: '2025-08-08T19:27:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39481
-- author: Flareguy
-  changes:
-  - message: Updated moth displacement maps to fix missing pixels, among other various
-      issues.
-    type: Fix
-  id: 8841
-  time: '2025-08-09T21:52:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39174
-- author: Princess-Cheeseballs
-  changes:
-  - message: Mobs such as borgs, dragons, etc can no longer crawl.
-    type: Tweak
-  id: 8842
-  time: '2025-08-10T17:49:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39084
-- author: beck-thompson
-  changes:
-  - message: Various syndicate items can now be "locked" with your voice to hide their
-      true identity. The items are, all chameleon clothing, voice masks, no slips,
-      agent IDs, cane swords, and e daggers.
-    type: Add
-  - message: e dagger now has a slightly longer activation cool down (1s -> 1.5s).
-    type: Tweak
-  - message: Voice triggered items now properly display the trigger text when examined.
-    type: Fix
-  id: 8843
-  time: '2025-08-10T18:10:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39310
-- author: jessicamaybe
-  changes:
-  - message: 'Added a rare Hamlet variant: Fragile Hamlet'
-    type: Add
-  id: 8844
-  time: '2025-08-10T22:20:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39531
-- author: perryprog
-  changes:
-  - message: "Diona\_nymphs that reform inside of a locker will no longer be invisible."
-    type: Fix
-  id: 8845
-  time: '2025-08-11T11:00:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39505
-- author: Samuka
-  changes:
-  - message: The Robotics Console now correctly displays the brain installed information
-      if the borg has a empty MMI
-    type: Fix
-  - message: The Robotics Console now shows the borg physical integrity
-    type: Tweak
-  - message: Changed the colors for the battery display in the robotics console so
-      it easier to read the percentage
-    type: Tweak
-  id: 8846
-  time: '2025-08-11T18:57:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38023
-- author: metalgearsloth
-  changes:
-  - message: Inserting lights now plays an insert animation.
-    type: Add
-  id: 8847
-  time: '2025-08-11T21:06:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36541
-- author: sowelipililimute
-  changes:
-  - message: Borg modules can now have hands!
-    type: Add
-  - message: The generic cables module can now throw and mix and match cables in its
-      slots
-    type: Tweak
-  - message: The engineering construction module can now hold any material in its
-      materials slots, any floor tile in its floor tile slots, and now has slots for
-      holding any circuitboard and flatpack
-    type: Tweak
-  - message: The janitor custodial module can now throw its soap and pick up new and
-      better varieties of soap
-    type: Tweak
-  - message: The janitor advanced cleaning module can now throw and pick up beakers
-      in its slot
-    type: Tweak
-  - message: The medical topicals module can now hold any type of topicals in its
-      topicals slots
-    type: Tweak
-  - message: The medical chemical module can now drop and pick up its vials, and hold
-      other small containers
-    type: Tweak
-  - message: The medical advanced chemical module can now drop and pick up its beakers,
-      and hold other larger containers
-    type: Tweak
-  - message: The science artifact module can drop and pick up its vial, and hold other
-      small containers
-    type: Tweak
-  - message: The service service module can now drop and pick up its shaker, and pick
-      up other drink containers. It also has a spoon now.l containers
-    type: Tweak
-  - message: The science anomaly module can now throw its reinforced and reinforced
-      plasma glass
-    type: Tweak
-  - message: The service service module now has a book bag, and two slots for books
-      and paper
-    type: Tweak
-  - message: The service service module can now drop and pick up its shaker, and pick
-      up other drink containers. It also has a spoon now.
-    type: Tweak
-  - message: The service musique module can now drop and pick up instruments.
-    type: Tweak
-  id: 8848
-  time: '2025-08-12T22:21:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38668
-- author: perryprog
-  changes:
-  - message: Fixed lights sometimes not emitting light when spawning them or when
-      they enter PVS.
-    type: Fix
-  id: 8849
-  time: '2025-08-12T23:00:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39585
-- author: Nox38
-  changes:
-  - message: Resized every firearm.
-    type: Tweak
-  id: 8850
-  time: '2025-08-13T17:13:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36473
-- author: slarticodefast
-  changes:
-  - message: Fixed light bulb color.
-    type: Fix
-  id: 8851
-  time: '2025-08-13T22:45:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39623
-- author: Bhijn and Myr
-  changes:
-  - message: Those within the SS13 and SS14 community who have passed are now explicitly
-      memorialized within the game's credits, accessible within the lobby. May their
-      names and legacies live on.
-    type: Add
-  id: 8852
-  time: '2025-08-14T01:21:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39621
-- author: rumaks-xyz, SlamBamActionman
-  changes:
-  - message: Advanced Brute chemicals, Insuzine, Ultravasculine and Sigynate have
-      had changes to their healing, metabolism rates and behaviors.
-    type: Tweak
-  - message: Bicardine and Advanced Brute Chemicals once again create Razorium when
-      mixed.
-    type: Tweak
-  id: 8853
-  time: '2025-08-14T17:32:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39472
-- author: ScholarNZL
-  changes:
-  - message: Added IC visibility of "animal organs", e.g "animal lungs" etc, to facilitate
-      recipe creation.
-    type: Tweak
-  id: 8854
-  time: '2025-08-15T04:21:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39228
-- author: FlipBrooke
-  changes:
-  - message: Banana peels and their variants can now be worn as headgear
-    type: Add
-  - message: Banana peels will correctly render when selected using chameleon headgear
-    type: Fix
-  - message: Banana peels will no longer render as headgear when off a player's head
-    type: Fix
-  - message: Banana peels as headgear now correctly displays in the change log
-    type: Fix
-  id: 8855
-  time: '2025-08-15T05:56:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39457
-- author: CoolioDudio
-  changes:
-  - message: Added baby and cube hair
-    type: Add
-  id: 8856
-  time: '2025-08-16T01:50:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39680
-- author: CaramelOrdnance
-  changes:
-  - message: Lye reagent
-    type: Add
-  - message: Recipes for all soap bars
-    type: Add
-  id: 8857
-  time: '2025-08-16T06:59:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39303
-- author: youtissoum
-  changes:
-  - message: The usage delay of the bananium horn is now 3 seconds.
-    type: Tweak
-  id: 8858
-  time: '2025-08-16T23:04:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39674
-- author: august-sun
-  changes:
-  - message: Pacifists can now use the practice disabler, practice laser rifle, disabler,
-      and disabler SMG.
-    type: Tweak
-  id: 8859
-  time: '2025-08-17T19:25:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37164
-- author: Velcroboy
-  changes:
-  - message: Changed hamster crates are now able to be placed on top of tables.
-    type: Tweak
-  id: 8860
-  time: '2025-08-17T19:30:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37953
-- author: psykana
-  changes:
-  - message: Ninja now spawns breathing from his gas tank instead of jetpack
-    type: Fix
-  id: 8861
-  time: '2025-08-18T00:25:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35067
-- author: ScarKy0
-  changes:
-  - message: Jump boots can no longer be used when knocked down.
-    type: Fix
-  id: 8862
-  time: '2025-08-18T12:22:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39710
-- author: SlamBamActionman
-  changes:
-  - message: Stamina resistance has been removed from cardboard armor and gorillas.
-    type: Tweak
-  id: 8863
-  time: '2025-08-18T14:33:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39727
-- author: SlamBamActionman
-  changes:
-  - message: Aiming with the Hristov is now working correctly when using the Separated
-      Chat HUD mode.
-    type: Fix
-  - message: Cursor targetting with the Hristov now correctly selects the target underneath
-      the cursor.
-    type: Fix
-  id: 8864
-  time: '2025-08-18T18:22:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35087
-- author: Zokkie
-  changes:
-  - message: Lone Operative is now assigned the Solo Antagonist role ingame instead
-      of the Team Antagonist role.
-    type: Fix
-  id: 8865
-  time: '2025-08-18T18:57:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36521
-- author: beck-thompson, slarticodefast
-  changes:
-  - message: Fixed rebinding keys crashing the client.
-    type: Fix
-  id: 8866
-  time: '2025-08-18T18:58:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39732
-- author: Princess-Cheeseballs
-  changes:
-  - message: Being a Lightweight drunk no longer extends your bloodloss
-    type: Fix
-  id: 8867
-  time: '2025-08-18T20:26:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38678
-- author: SlamBamActionman
-  changes:
-  - message: Auto-injector/medipen pop-ups now show the correct identity when injecting
-      someone else.
-    type: Fix
-  id: 8868
-  time: '2025-08-18T20:42:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39735
-- author: Winkarst-cpu
-  changes:
-  - message: Meat spikes got an overhaul.
-    type: Tweak
-  id: 8869
-  time: '2025-08-19T17:56:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38723
-- author: Princess-Cheeseballs
-  changes:
-  - message: You can no longer crawl while weightless.
-    type: Fix
-  id: 8870
-  time: '2025-08-19T19:18:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39099
-- author: Nox38
-  changes:
-  - message: Buffed the Librarian cane sword's damage and price to be more competitive.
-      Damage 15 -> 17 slash, TC cost 5 -> 3
-    type: Tweak
-  id: 8871
-  time: '2025-08-19T20:31:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39586
-- author: Princess-Cheeseballs
-  changes:
-  - message: Speed boots no longer affect crawling speed.
-    type: Remove
-  - message: Moon boots don't work unless you're standing
-    type: Tweak
-  id: 8872
-  time: '2025-08-20T11:08:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39648
-- author: Kowlin
-  changes:
-  - message: Fixed Syndicate tricky grenades not playing sounds on explosion.
-    type: Fix
-  id: 8873
-  time: '2025-08-20T23:34:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39792
-- author: TrixxedHeart
-  changes:
-  - message: Added the Impaired Mobility disability trait which reduces movement speed
-      unless using a mobility aid such as a cane and increases stand-up time.
-    type: Add
-  id: 8874
-  time: '2025-08-21T00:43:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39398
-- author: TheFlyingSentry
-  changes:
-  - message: 'Added a new trait: Hemophilia!'
-    type: Add
-  id: 8875
-  time: '2025-08-21T01:02:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38224
-- author: DinnerCalzone
-  changes:
-  - message: Fixed more grenades not playing sounds on explosion.
-    type: Fix
-  id: 8876
-  time: '2025-08-22T10:04:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39815
-- author: Alkheemist
-  changes:
-  - message: Added stencil lettering decals to the spraypainter.
-    type: Add
-  id: 8877
-  time: '2025-08-22T10:11:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39701
-- author: Kittygyat
-  changes:
-  - message: Made moths less susceptible to flames and heat. (4x Fire Damage -> 2x
-      Fire damage) (1.3x heat -> 1.2x heat).
-    type: Tweak
-  id: 8878
-  time: '2025-08-22T22:08:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39672
-- author: JimmyToor
-  changes:
-  - message: Fixed only being able to vape with a blocked mouth.
-    type: Fix
-  id: 8879
-  time: '2025-08-22T22:26:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39834
-- author: _miket, RedBookcase
-  changes:
-  - message: Added new Derelict Cyborg ghost roles, including the Derelict Engineer,
-      Janitor, Salvage, Medical, and Assault Cyborg!
-    type: Add
-  id: 8880
-  time: '2025-08-23T20:32:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38159
-- author: FungiFellow
-  changes:
-  - message: Added the Inflatable Module for borgs.
-    type: Add
-  id: 8881
-  time: '2025-08-23T22:15:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35100
-- author: whatston3
-  changes:
-  - message: Lathes now batch items into jobs, which can be moved around in priority
-      or deleted.
-    type: Add
-  id: 8882
-  time: '2025-08-24T15:02:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38624
-- author: Princess-Cheeseballs
-  changes:
-  - message: Topicals now correctly scale their self heal time with the damage you
-      have taken.
-    type: Fix
-  id: 8883
-  time: '2025-08-25T18:05:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39883
-- author: ToastEnjoyer
-  changes:
-  - message: Pacifists can no longer use the laser rifle
-    type: Fix
-  id: 8884
-  time: '2025-08-26T00:44:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39891
-- author: GR1231
-  changes:
-  - message: hats on Smile the slime should be correctly displaced
-    type: Fix
-  id: 8885
-  time: '2025-08-26T00:48:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39824
-- author: perryprog
-  changes:
-  - message: Items and borgs can no longer become stuck in mechs.
-    type: Fix
-  id: 8886
-  time: '2025-08-26T10:29:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37942
-- author: beck-thompson
-  changes:
-  - message: You can now select no lock when locking syndicate items
-    type: Tweak
-  id: 8887
-  time: '2025-08-26T14:18:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39532
-- author: slarticodefast
-  changes:
-  - message: Removed the dynamic game mode from player votes.
-    type: Tweak
-  id: 8888
-  time: '2025-08-26T19:42:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39902
-- author: FungiFellow
-  changes:
-  - message: Engiborg can no longer pickup AI lawboards
-    type: Fix
-  id: 8889
-  time: '2025-08-26T20:59:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39730
-- author: beck-thompson
-  changes:
-  - message: Locked chameleon storage items can now still be used as storage even
-      when locked.
-    type: Fix
-  id: 8890
-  time: '2025-08-26T21:50:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39784
-- author: StormyDragon
-  changes:
-  - message: Modular Grenades with a chemical payload now correctly wait out their
-      delay before activating.
-    type: Tweak
-  id: 8891
-  time: '2025-08-26T22:26:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39905
-- author: ToastEnjoyer
-  changes:
-  - message: Wizards can no longer teleport to the arrivals terminal
-    type: Fix
-  id: 8892
-  time: '2025-08-26T23:43:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39901
-- author: Hitlinemoss
-  changes:
-  - message: Clipboards can now be printed by autolathes.
-    type: Add
-  - message: Plastic clipboards have been added for aspiring paperwork enthusiasts.
-      They can be printed by autolathes or dispensed from the Head of Personnel's
-      PTech machine.
-    type: Add
-  - message: Bureaucracy crates no longer have their folders/clipboards contain paper.
-      The amount of paper in the crate itself has been increased to compensate.
-    type: Tweak
-  - message: Filing cabinets can now contain green folders.
-    type: Fix
-  - message: Roles that spawn with a clipboard always have that clipboard contain
-      exactly three sheets of paper, rather than a random quantity.
-    type: Fix
-  - message: CentComm Officials now spawn with a proper CentComm clipboard instead
-      of a generic black folder.
-    type: Tweak
-  id: 8893
-  time: '2025-08-27T07:07:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37705
-- author: slarticodefast
-  changes:
-  - message: Syndicate stealth items now have a selection of tool locks you can choose
-      from to hide their activation from others.
-    type: Add
-  id: 8894
-  time: '2025-08-27T14:45:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39900
-- author: chromiumboy
-  changes:
-  - message: Many station structures and fixtures, such as walls and airlocks, can
-      now be re-anchored to the floor if they happen to be dislodged by an explosion
-      or other shenanigans
-    type: Tweak
-  id: 8895
-  time: '2025-08-27T15:04:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39542
-- author: PavlockBlaine03
-  changes:
-  - message: Fixed bug where items would not drop if a dispenser was deconstructed.
-    type: Fix
-  id: 8896
-  time: '2025-08-27T21:06:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39676
-- author: Winkarst-cpu
-  changes:
-  - message: Living beings are now vomiting from being irradiated. Also, irradiated
-      players will see a popup about tasting something metallic.
-    type: Add
-  id: 8897
-  time: '2025-08-27T21:56:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39805
-- author: aada
-  changes:
-  - message: Fixed audio mispredict when quick inserting.
-    type: Fix
-  id: 8898
-  time: '2025-08-28T16:54:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39930
-- author: Hitlinemoss
-  changes:
-  - message: Descriptions for cardboard weapons have been adjusted.
-    type: Tweak
-  id: 8899
-  time: '2025-08-28T17:14:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39927
-- author: FungiFellow
-  changes:
-  - message: Sentience Event no longer targets Zombified creatures
-    type: Fix
-  id: 8900
-  time: '2025-08-29T11:48:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39950
-- author: Dutch-VanDerLinde
-  changes:
-  - message: The forensic scanner no longer leaks fingerprints or glove prints onto
-      the scanning object if you use the right-click scan verb.
-    type: Fix
-  id: 8901
-  time: '2025-08-30T14:00:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39964
-- author: FairlySadPanda
-  changes:
-  - message: 'Scurrets can wear a few items on their backs: pet bags, mail bags and
-      spears'
-    type: Add
-  - message: Corgis can now wear mail bags.
-    type: Add
-  id: 8902
-  time: '2025-08-30T14:42:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38774
-- author: Kowlin
-  changes:
-  - message: Derelict cyborgs can no longer duplicate their ghost role.
-    type: Fix
-  id: 8903
-  time: '2025-08-30T17:17:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39992
-- author: aada
-  changes:
-  - message: Clown bags are squeakier.
-    type: Add
-  id: 8904
-  time: '2025-08-30T18:10:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39931
-- author: AndrewFenriz
-  changes:
-  - message: when assembling mech, parts now cannot be removed with a crowbar
-    type: Remove
-  id: 8905
-  time: '2025-08-31T12:54:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39027
-- author: quasr-9
-  changes:
-  - message: Moths can now properly remove knives and other items from military boots.
-    type: Fix
-  id: 8906
-  time: '2025-09-01T15:07:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40049
-- author: slarticodefast
-  changes:
-  - message: Dropper and mini-syringe transfer amounts can now be set to more options.
-    type: Tweak
-  id: 8907
-  time: '2025-09-01T15:24:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39976
-- author: IProduceWidgets
-  changes:
-  - message: there are now civilian versions of nanomed vendors.
-    type: Add
-  - message: nanomed inventories have been increased some.
-    type: Tweak
-  id: 8908
-  time: '2025-09-01T23:39:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39718
-- author: M4rchy-S
-  changes:
-  - message: dead mobs will no longer vomit from radiation damage
-    type: Fix
-  id: 8909
-  time: '2025-09-02T00:07:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40020
-- author: SolidSyn
-  changes:
-  - message: Detectives noir-tech glasses are now contraband, but now include a noir
-      secHUD!
-    type: Tweak
-  id: 8910
-  time: '2025-09-02T13:32:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39859
+Entries:
 - author: FungiFellow
   changes:
   - message: Sentience Event can no longer target Corgis, Smile or Mothroaches
@@ -3910,10 +2522,1397 @@ Entries:
   id: 9240
   time: '2025-12-01T05:47:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41489
+- author: Spessmann
+  changes:
+  - message: Added a new station, Snowball, a round and icy lowpop station.
+    type: Add
+  - message: Removed Amber station.
+    type: Remove
+  id: 9242
+  time: '2025-12-02T07:25:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40300
+- author: Samuka
+  changes:
+  - message: Game no longer sends the xenoborg shuttle call announcement over and
+      over
+    type: Fix
+  id: 9243
+  time: '2025-12-02T14:41:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41437
+- author: imatsoup
+  changes:
+  - message: When a Rat King is spawned, the default orders for their army is now
+      set to Follow instead of Loose.
+    type: Tweak
+  id: 9244
+  time: '2025-12-03T03:37:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41680
+- author: Hitlinemoss
+  changes:
+  - message: Medipens now have slightly clearer descriptions.
+    type: Tweak
+  id: 9245
+  time: '2025-12-03T17:52:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41682
+- author: jckspjf
+  changes:
+  - message: Changed the wording on Pun Pun's jacket to make more sense in English.
+    type: Tweak
+  id: 9246
+  time: '2025-12-04T01:19:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41695
+- author: Hitlinemoss
+  changes:
+  - message: Light crates' descriptions now accurately reflect the number of lights
+      they contain.
+    type: Fix
+  id: 9247
+  time: '2025-12-04T08:07:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41697
+- author: Minerva
+  changes:
+  - message: Spesos now fit in envelopes.
+    type: Tweak
+  id: 9248
+  time: '2025-12-04T17:07:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41700
+- author: SlamBamActionman
+  changes:
+  - message: Ephedrine, Desoxyephedrine and Hyperzine have had their stats reworked,
+      with Desoxyephedrine now giving a higher max stamina and Hyperzine lasting much
+      longer, among other changes.
+    type: Tweak
+  id: 9249
+  time: '2025-12-04T18:05:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41693
+- author: SlamBamActionman
+  changes:
+  - message: Changed Exo Botany's layout to have more trays and better functionality.
+    type: Tweak
+  - message: Fixed various decals and minor bugs with Exo.
+    type: Fix
+  id: 9250
+  time: '2025-12-04T19:44:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41598
+- author: ScarKy0
+  changes:
+  - message: Added Warfarin and Hemorrhinol, reagents that interact with blood clotting
+      and bleeding speed. Read about them in the guidebook!
+    type: Add
+  id: 9251
+  time: '2025-12-05T00:54:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41685
+- author: MissKay1994
+  changes:
+  - message: The explorer mask is now correctly worn by vox
+    type: Fix
+  id: 9252
+  time: '2025-12-05T10:46:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41405
+- author: alexalexmax
+  changes:
+  - message: Recharging spray painters no longer lose the ability to paint airlocks
+      after running out of charges once
+    type: Fix
+  id: 9253
+  time: '2025-12-05T11:00:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41725
+- author: Hitlinemoss
+  changes:
+  - message: Several figurines have received new voice lines.
+    type: Add
+  id: 9254
+  time: '2025-12-05T12:36:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41723
+- author: PJB3005
+  changes:
+  - message: Fixed shuttle FTL screen for people with UI scale above 100%
+    type: Fix
+  id: 9255
+  time: '2025-12-05T15:05:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40933
+- author: SlamBamActionman
+  changes:
+  - message: Added Impedrezene, Fresium, Heartbreaker, Benzene, Tear Gas, Bleach,
+      Mannitol, Lipolicide, Wine, Beer, Coffee and Space Glue to random plant reagent
+      mutations.
+    type: Add
+  - message: Removed Nocturine, Lexorin and Hyperzine from random plant reagent mutations.
+    type: Remove
+  - message: Lowered Chemical Synthesis Kit uplink cost from 4 TC to 3 TC.
+    type: Tweak
+  - message: Lowered Nocturine Bottle's uplink cost from 6 TC to 4 TC.
+    type: Tweak
+  - message: Lowered the hypopen refill delay from 1.25s to 0.75s.
+    type: Tweak
+  id: 9256
+  time: '2025-12-05T17:14:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41716
+- author: Princess-Cheeseballs
+  changes:
+  - message: Vestine can now be used to mutate plants into producing syndicate chems.
+    type: Add
+  id: 9257
+  time: '2025-12-05T17:33:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41731
+- author: Samuka
+  changes:
+  - message: Mothership core won't explode when destroyed (until bug is fixed)
+    type: Tweak
+  id: 9258
+  time: '2025-12-06T18:26:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41743
+- author: august-sun
+  changes:
+  - message: Added the sticky grappling hand, a clown version of the grappling gun.
+    type: Add
+  id: 9259
+  time: '2025-12-06T20:52:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37551
+- author: Beck
+  changes:
+  - message: The voice mask can no longer be purchased in the uplink.
+    type: Remove
+  - message: You can now purchase a voice mask implanter for 2 TC in the uplink!
+    type: Add
+  - message: The thief communicator kit now comes with a voice implanter rather than
+      voice mask!
+    type: Tweak
+  id: 9260
+  time: '2025-12-07T02:48:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41551
+- author: SlamBamActionman
+  changes:
+  - message: Removed the Zookeeper and Boxer jobs.
+    type: Remove
+  id: 9261
+  time: '2025-12-07T03:19:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41741
+- author: Hitlinemoss
+  changes:
+  - message: The hyperzine injector/microinjector now accurately list their new, longer
+      durations.
+    type: Fix
+  id: 9262
+  time: '2025-12-07T11:56:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41755
+- author: Velken
+  changes:
+  - message: Snap Pops can now crafted into a more dangerous version by adding extra
+      gunpowder.
+    type: Add
+  id: 9263
+  time: '2025-12-07T13:38:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38654
+- author: Princess-Cheeseballs
+  changes:
+  - message: Security IDs once again work at the HoP computer
+    type: Fix
+  id: 9264
+  time: '2025-12-07T16:27:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41739
+- author: metalgearsloth
+  changes:
+  - message: Increased bullet speeds from 25m/s to 40m/s by default.
+    type: Tweak
+  id: 9265
+  time: '2025-12-07T16:47:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34971
+- author: Samuka
+  changes:
+  - message: Xenoborg lights are now brighter
+    type: Tweak
+  id: 9266
+  time: '2025-12-07T18:04:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41580
+- author: Hitlinemoss
+  changes:
+  - message: Station-specific jobs no longer list which maps they're available on
+      in their descriptions. The actual list of maps they are available on remains
+      the same.
+    type: Tweak
+  id: 9267
+  time: '2025-12-07T20:39:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41748
+- author: Princess-Cheeseballs
+  changes:
+  - message: Bible has been restored to its normal healing rate.
+    type: Fix
+  id: 9268
+  time: '2025-12-08T01:23:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41777
+- author: UpAndLeaves
+  changes:
+  - message: New players no longer have a chance of being Dionae, Vox, Slime People,
+      or Vulpkanin when joining for the first time. They can still manually select
+      these species.
+    type: Tweak
+  id: 9269
+  time: '2025-12-08T01:49:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41678
+- author: kleinerstation13
+  changes:
+  - message: The Hushpup, a 10 TC silenced shotgun, is now available via the uplink
+      for traitors and nukies.
+    type: Add
+  id: 9270
+  time: '2025-12-08T20:20:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41512
+- author: TiniestShark
+  changes:
+  - message: Gas canisters can now have paper labels attached to them.
+    type: Add
+  id: 9271
+  time: '2025-12-09T09:45:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41737
+- author: ArtisticRoomba
+  changes:
+  - message: The syndicate jaws of life can now pry open bolted doors.
+    type: Tweak
+  - message: The authentication disruptor can now disrupt bolted doors.
+    type: Fix
+  id: 9272
+  time: '2025-12-09T13:03:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41138
+- author: alexalexmax
+  changes:
+  - message: Fixed monkeys(and other mobs) being immune to eye damage when welding
+    type: Fix
+  id: 9273
+  time: '2025-12-09T13:17:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41788
+- author: K-Dynamic
+  changes:
+  - message: Chefs now start with chef shoes instead of black shoes.
+    type: Tweak
+  id: 9274
+  time: '2025-12-10T02:40:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41814
+- author: slarticodefast
+  changes:
+  - message: Fixed rigged power cells immediately exploding when inserted into a device
+      even if it's toggled off.
+    type: Fix
+  id: 9275
+  time: '2025-12-10T10:40:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41813
+- author: jckspjf
+  changes:
+  - message: Escape objectives now properly specify escape via the shuttle rather
+      than escape pods.
+    type: Tweak
+  id: 9276
+  time: '2025-12-10T10:55:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41809
+- author: kontakt
+  changes:
+  - message: Paramedic Void Suit now uses the correct speed reduction when worn again.
+    type: Fix
+  id: 9277
+  time: '2025-12-10T19:04:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41820
+- author: cloudyias
+  changes:
+  - message: Diona are now less harmed by rooting in blood
+    type: Add
+  id: 9278
+  time: '2025-12-12T02:13:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41642
+- author: Princess-Cheeseballs
+  changes:
+  - message: You can no longer detonate or disable borgs with the robotics console.
+    type: Remove
+  id: 9279
+  time: '2025-12-12T10:36:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41834
+- author: alexalexmax
+  changes:
+  - message: The scram implanter now teleports you within a 100 tile radius, as originally
+      intended, and will not teleport you into open space.
+    type: Fix
+  id: 9280
+  time: '2025-12-12T11:27:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41808
+- author: kontakt
+  changes:
+  - message: Potassium Iodide is now sometimes available in radiation lockers.
+    type: Add
+  id: 9281
+  time: '2025-12-12T17:58:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41576
+- author: K-Dynamic
+  changes:
+  - message: Soda Dispenser, Booze Dispenser, and ChemDispenser have had their prices
+      reduced.
+    type: Tweak
+  id: 9282
+  time: '2025-12-13T02:46:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41756
+- author: Absotively
+  changes:
+  - message: Hand labelers can now remove labels via the verb menu whether or not
+      they have a label set.
+    type: Tweak
+  id: 9283
+  time: '2025-12-13T19:13:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40330
+- author: NoreUhh
+  changes:
+  - message: Vulpkanin hair no longer clips through hoods and hardsuits.
+    type: Fix
+  id: 9284
+  time: '2025-12-14T00:55:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41827
+- author: ScarKy0
+  changes:
+  - message: Cyborgs no longer lose access when they run out of power.
+    type: Tweak
+  id: 9285
+  time: '2025-12-14T00:55:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41844
+- author: aada
+  changes:
+  - message: Five cargo bounties have had their worth reduced so you can't make a
+      profit buying crates for them.
+    type: Fix
+  id: 9286
+  time: '2025-12-14T01:39:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41846
+- author: Mehnix
+  changes:
+  - message: Bananas, Mimanas, Corn, Gatfruit, Capfruit, Bungo, and Cherries can now
+      be butchered to get their waste product in addition to being eaten.
+    type: Add
+  id: 9287
+  time: '2025-12-14T02:30:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36786
+- author: Borsh
+  changes:
+  - message: Added random gate
+    type: Add
+  id: 9288
+  time: '2025-12-14T19:27:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41627
+- author: Hitlinemoss
+  changes:
+  - message: All shotgun shells (and associated ammo boxes / magazines) now have proper
+      descriptions.
+    type: Fix
+  - message: Machine pistol magazines are now considered Security contraband.
+    type: Fix
+  - message: Practice machine pistol magazines are no longer loaded with real bullets.
+    type: Fix
+  id: 9289
+  time: '2025-12-14T20:27:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41841
+- author: Hitlinemoss
+  changes:
+  - message: Skeletons are now vulnerable to Holy damage from sources such as the
+      space bible or holy water.
+    type: Add
+  id: 9290
+  time: '2025-12-14T20:41:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41757
+- author: Red_Spy
+  changes:
+  - message: The chamber is now empty by default for weapons with a removable magazine.
+    type: Tweak
+  id: 9291
+  time: '2025-12-14T20:55:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41791
+- author: aada
+  changes:
+  - message: Maintenance closets have more toys in them.
+    type: Tweak
+  - message: The toy box crate now has random contents.
+    type: Tweak
+  - message: The roller skate bounty now only requires 1 pair of roller skates but
+      gives less money
+    type: Tweak
+  - message: The syndicate balloon, syndicate tricky bomb, foam rifle, and golden
+      bike horn all had their value reduced
+    type: Tweak
+  id: 9292
+  time: '2025-12-14T20:56:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41840
+- author: jckspjf
+  changes:
+  - message: Added Pun Pun's jumpsuit into Bardrobes.
+    type: Add
+  id: 9293
+  time: '2025-12-15T01:33:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41705
+- author: ScarKy0
+  changes:
+  - message: Removed roundstart tools module from the Medical, Service and Janitor
+      cyborgs. The module can still be printed at the exosuit fab.
+    type: Remove
+  id: 9294
+  time: '2025-12-15T01:50:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41823
+- author: Meara1179
+  changes:
+  - message: Added crowbar to the Medical Borg's Rescue module.
+    type: Add
+  id: 9296
+  time: '2025-12-15T03:59:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41861
+- author: Samuka
+  changes:
+  - message: Repairing borgs now takes multiple mini doafters instead of one big one
+    type: Tweak
+  id: 9297
+  time: '2025-12-15T12:27:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41638
+- author: JesterX666
+  changes:
+  - message: Explosions with heat now ignite inflammable gas mixes in the atmosphere
+    type: Fix
+  id: 9298
+  time: '2025-12-15T23:39:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41262
+- author: SlamBamActionman
+  changes:
+  - message: Exo has been updated to the holiday version.
+    type: Tweak
+  id: 9299
+  time: '2025-12-16T01:07:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41715
+- author: Princess-Cheeseballs
+  changes:
+  - message: New cryo chem, arcryox.
+    type: Add
+  - message: Cryo chems now use EvenHeal making cryoxadone more like omnizine.
+    type: Tweak
+  id: 9300
+  time: '2025-12-16T01:20:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41696
+- author: Samuka
+  changes:
+  - message: Added the door control module for the engi xenoborg
+    type: Add
+  - message: The xenoborg door remote can now eletrify doors
+    type: Tweak
+  - message: Engi xenoborg can now see if doors are eletrified
+    type: Tweak
+  id: 9301
+  time: '2025-12-16T01:37:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41546
+- author: imatsoup
+  changes:
+  - message: Vupkanin now have audio for when they Weh, Hew, and Honk under the effects
+      of the chems that make you do those things.
+    type: Fix
+  id: 9302
+  time: '2025-12-16T01:50:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41610
+- author: Hitlinemoss
+  changes:
+  - message: Station AI is now rolled before most non-Command/non-Security roles.
+    type: Tweak
+  id: 9303
+  time: '2025-12-16T02:12:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41663
+- author: captainkawaii666
+  changes:
+  - message: A foolbox with various pranking items for clowns
+    type: Add
+  - message: Crayon boxes are now slightly smaller
+    type: Tweak
+  id: 9304
+  time: '2025-12-16T03:32:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41473
+- author: Pangogie
+  changes:
+  - message: Killer tomatoes now have a 3x3 grid size.
+    type: Tweak
+  id: 9305
+  time: '2025-12-16T07:23:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35866
+- author: alexalexmax
+  changes:
+  - message: Getting stunned or killed while buckled/crawling will drop any held items.
+    type: Tweak
+  id: 9306
+  time: '2025-12-16T18:45:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41566
+- author: slarticodefast
+  changes:
+  - message: Fixed the station AI's battery alert not updating.
+    type: Fix
+  id: 9307
+  time: '2025-12-16T19:00:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41879
+- author: kontakt
+  changes:
+  - message: Flammable items no longer have bonus mass.
+    type: Fix
+  id: 9308
+  time: '2025-12-17T08:37:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41803
+- author: nkokic
+  changes:
+  - message: Bloodstream and Chemstream have been merged. Injected chemicals can now
+      react with your blood.
+    type: Tweak
+  id: 9309
+  time: '2025-12-17T19:33:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35071
+- author: Centronias
+  changes:
+  - message: Borgs with rechargable ballistic weapons (e.g. Syndicate Assault Borgs)
+      no longer lose their entire magazine upon being EMP'd. The EMP still disables
+      the ammo recharge for its effective duration.
+    type: Tweak
+  id: 9310
+  time: '2025-12-17T23:04:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38537
+- author: NoreUhh
+  changes:
+  - message: Fixed Vulpkanin stomachs being smaller than other species.
+    type: Fix
+  id: 9311
+  time: '2025-12-18T00:53:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41893
+- author: Samuka
+  changes:
+  - message: Renamed some xenoborg modules
+    type: Tweak
+  id: 9312
+  time: '2025-12-18T02:29:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41625
+- author: PJB3005
+  changes:
+  - message: Fix loadout names not being exported/imported
+    type: Fix
+  id: 9313
+  time: '2025-12-18T09:25:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41891
+- author: Hitlinemoss
+  changes:
+  - message: The wizard's grimoire now has a proper description.
+    type: Tweak
+  id: 9314
+  time: '2025-12-18T19:33:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41900
+- author: SlamBamActionman
+  changes:
+  - message: Hyperzine now provides a 1.5x max stamina modifier for its duration.
+    type: Tweak
+  id: 9315
+  time: '2025-12-18T19:53:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41902
+- author: Unkn0wnGh0st333
+  changes:
+  - message: Syndicate Wall Lockers and Secure Crates have been added! Mappers Rejoice!
+    type: Add
+  - message: Armory lockers have changed name to Blood-Red Lockers and locked variants
+      are now actually locked behind syndicate access.
+    type: Tweak
+  id: 9316
+  time: '2025-12-18T20:55:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33251
+- author: Empoleon4444
+  changes:
+  - message: Changed Ghost Role Raffles to be shorter overall
+    type: Tweak
+  id: 9317
+  time: '2025-12-18T21:08:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33157
+- author: Hitlinemoss
+  changes:
+  - message: Small cardboard boxes have been added (2x2 instead of 3x3), and can be
+      made in the crafting menu for 1 cardboard each.
+    type: Add
+  - message: Cardboard boxes now require 2 cardboard to make (from 1).
+    type: Tweak
+  - message: The names and descriptions of stamp boxes and circuit totes have been
+      adjusted.
+    type: Tweak
+  id: 9319
+  time: '2025-12-19T07:04:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41335
+- author: SirWarock
+  changes:
+  - message: Shields are now examinable for their damage - You'll see how much dawg
+      it got left in it on a glance!
+    type: Add
+  - message: Shields are now repairable with a welder - Some shields are excluded,
+      notably the Energy Shield.
+    type: Add
+  id: 9320
+  time: '2025-12-20T01:50:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41326
+- author: chromiumboy
+  changes:
+  - message: Station AI cores constructed with a positronic brain that is actively
+      seeking a mind will open a ghost role to become its AI.
+    type: Tweak
+  id: 9321
+  time: '2025-12-20T14:34:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40607
+- author: korczoczek
+  changes:
+  - message: Added opened sprite variants to olive oil, mayo and flour, cornmeal,
+      rice, sugar bags
+    type: Tweak
+  id: 9322
+  time: '2025-12-20T18:37:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41923
+- author: SirWarock
+  changes:
+  - message: Hyposprays and Hypopens now start in their dynamic mode. It functions
+      exactly as the previous Inject/Draw mode.
+    type: Tweak
+  - message: The Gorlex Hypospray is now syndicate contraband.
+    type: Tweak
+  - message: Injectors now inject twice as quick into targets that are lying down
+      for any reason, most notably being buckled on a medical bed or being critical.
+      Before, only critical patients had this luxury.
+    type: Tweak
+  - message: Clumsy now affects syringes when you're self-injecting.
+    type: Tweak
+  id: 9323
+  time: '2025-12-21T00:10:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41833
+- author: SirWarock
+  changes:
+  - message: Medical Cyborg Hyposprays now finally have a fillsprite!
+    type: Add
+  - message: Fixed Gorlex Hyposprays not showing their fill sprites!
+    type: Fix
+  - message: Bluespace syringes are now slightly faster when injecting large amounts,
+      usually twice as fast as normal syringes.
+    type: Tweak
+  id: 9324
+  time: '2025-12-21T20:33:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41932
+- author: MilonPL
+  changes:
+  - message: Fixed beaker solutions duplicating whenever it's thrown.
+    type: Fix
+  id: 9326
+  time: '2025-12-22T08:12:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33231
+- author: JohnJJohn
+  changes:
+  - message: Cable items, such as wire coils can now be destroyed.
+    type: Tweak
+  id: 9327
+  time: '2025-12-22T17:11:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41279
+- author: whatston3, Crude Oil
+  changes:
+  - message: FTL Arrival visualization displays properly again when arriving at a
+      dock
+    type: Fix
+  id: 9328
+  time: '2025-12-22T21:15:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41951
+- author: ArtisticRoomba
+  changes:
+  - message: Devices that collect atmospheric data or reference the grid's atmosphere
+      will now properly reference the new atmosphere if the grid's atmosphere is ever
+      rebuilt or changed significantly.
+    type: Fix
+  id: 9329
+  time: '2025-12-23T08:12:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41585
+- author: imatsoup
+  changes:
+  - message: The donk co. microwave is now considered Syndicate contraband.
+    type: Tweak
+  - message: The donk co. microwave circuitboard is now considered Syndicate contraband.
+    type: Tweak
+  id: 9330
+  time: '2025-12-23T10:01:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41960
+- author: SirWarock
+  changes:
+  - message: Added Jet Injectors, an hypodermic alternative to Syringes!
+    type: Add
+  - message: Jet Injectors now spawn in Medical Doctor Lockers, as well as being stocked
+      in the NanoMed Plus!
+    type: Add
+  - message: Added Advanced Jet Injectors, with a bigger storage and faster injection
+      times than the base one!
+    type: Add
+  id: 9331
+  time: '2025-12-25T19:57:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40076
+- author: TheFlyingSentry
+  changes:
+  - message: Fixed Xeno air alarms not showing state changes.
+    type: Fix
+  id: 9332
+  time: '2025-12-25T23:34:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41590
+- author: alexalexmax
+  changes:
+  - message: Voice masks and voice mask implants can have their effects toggled from
+      within the voice mask menu.
+    type: Add
+  - message: Voice masks and voice mask implanters now hide any accents you have,
+      including innate accents and conditional ones.
+    type: Tweak
+  id: 9333
+  time: '2025-12-26T03:00:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41965
+- author: Nox38
+  changes:
+  - message: Overhauled ERT starting equipment.
+    type: Tweak
+  - message: Added several new loadouts for ERT!
+    type: Add
+  id: 9334
+  time: '2025-12-26T21:47:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38481
+- author: SonarZeBat
+  changes:
+  - message: Xenoborgs gamemode minimum players changed from 40 to 30.
+    type: Tweak
+  id: 9335
+  time: '2025-12-27T14:14:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42111
+- author: EchoOfNothing
+  changes:
+  - message: IFF controls are now merged into a single control.
+    type: Tweak
+  - message: Syndicate IFF console now has IFF turned off by default.
+    type: Tweak
+  id: 9336
+  time: '2025-12-27T14:32:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42104
+- author: B_Kirill
+  changes:
+  - message: Broken vending machines now properly block and close their UI.
+    type: Fix
+  id: 9337
+  time: '2025-12-28T01:10:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42110
+- author: SnappingOpossum
+  changes:
+  - message: Happy Honk Big Bite may now contain crayon boxes.
+    type: Add
+  id: 9338
+  time: '2025-12-28T06:36:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42077
+- author: Ilya246
+  changes:
+  - message: Large grid shuttle collisions should now be somewhat less laggy.
+    type: Fix
+  id: 9339
+  time: '2025-12-28T07:30:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40984
+- author: PAFFhassoocks
+  changes:
+  - message: Ninjas no longer spawn with a survival box, and instead have the items
+      directly in their bags, excluding the emergency tank.
+    type: Tweak
+  id: 9340
+  time: '2025-12-29T10:42:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42102
+- author: GeneralGaws
+  changes:
+  - message: The Decoy Syndicate Bomb in the Traitor uplink now has a purchase timer,
+      same as the regular Syndicate Bomb.
+    type: Tweak
+  id: 9341
+  time: '2025-12-29T10:59:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42114
+- author: 0-Anon
+  changes:
+  - message: Rat creatures will now restore bloodlevel when exposed to ammonia gas.
+    type: Tweak
+  id: 9342
+  time: '2025-12-29T22:49:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42167
+- author: OnyxTheBrave
+  changes:
+  - message: The Chemmaster 4000 can now switch between making pills from the internal
+      buffer or from an inserted beaker.
+    type: Tweak
+  id: 9343
+  time: '2025-12-30T21:52:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40121
+- author: jessicamaybe
+  changes:
+  - message: Moved borg module remove button to the left side
+    type: Tweak
+  id: 9344
+  time: '2025-12-30T23:26:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42119
+- author: TheFotY
+  changes:
+  - message: Paper can now be extinguished (e.g. fire extinguisher)
+    type: Fix
+  id: 9345
+  time: '2025-12-31T00:23:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42142
+- author: YoungThugSS14
+  changes:
+  - message: Ninjas now spawn with a custom satchel.
+    type: Add
+  id: 9346
+  time: '2025-12-31T01:37:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42112
+- author: kontakt
+  changes:
+  - message: Fixed broken FTL links for implanters and medibot.
+    type: Fix
+  id: 9347
+  time: '2025-12-31T01:52:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42181
+- author: Princess-Cheeseballs
+  changes:
+  - message: You can now spill the contents out of hyposprays and jet injectors
+    type: Tweak
+  id: 9348
+  time: '2026-01-01T05:42:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42158
+- author: Samuka
+  changes:
+  - message: xenoborg thrusters can't be toggled off
+    type: Tweak
+  - message: xenoborg thrusters can't unwrenched
+    type: Tweak
+  - message: xenoborg thrusters can't be rotated while anchored
+    type: Tweak
+  id: 9349
+  time: '2026-01-01T21:36:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42201
+- author: Ian321
+  changes:
+  - message: The clustersoap now visually changes when eaten.
+    type: Fix
+  - message: Soaplets now leave red residue behind.
+    type: Fix
+  - message: Soaplets now contain less soap.
+    type: Tweak
+  id: 9350
+  time: '2026-01-03T01:33:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34165
+- author: K-Dynamic
+  changes:
+  - message: Intercoms have new appearance.
+    type: Tweak
+  id: 9351
+  time: '2026-01-03T07:01:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41962
+- author: SeaWyrm
+  changes:
+  - message: Red sand astro-tiles are now researchable as part of the astro-tile research
+      option
+    type: Add
+  - message: Iron-red concrete tiles can now be created at Cutters
+    type: Add
+  id: 9352
+  time: '2026-01-03T07:15:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39793
 - author: TheShuEd
   changes:
-  - message: Santa anomaly & santa anomaly infections is back!
+  - message: Melee weapon attack animations now looks way cooler!
+    type: Tweak
+  id: 9353
+  time: '2026-01-03T21:43:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41425
+- author: TheFlyingSentry
+  changes:
+  - message: Other Dragon rifts now remain intact when one is destroyed.
+    type: Tweak
+  id: 9354
+  time: '2026-01-05T00:42:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42234
+- author: ThatGuyUSA
+  changes:
+  - message: There are more IDs and icons that can be used for a variety of roles.
     type: Add
-  id: 9241
-  time: '2025-12-01T11:01:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/41654
+  id: 9355
+  time: '2026-01-06T10:41:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42200
+- author: 0-Anon
+  changes:
+  - message: Guaranteed a bottle of Crazy Glue and Crazy Lube in the toy box.
+    type: Tweak
+  id: 9356
+  time: '2026-01-07T01:32:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42146
+- author: ScarKy0
+  changes:
+  - message: The Chameleon Projector now requires a battery to operate. It spawns
+      with a medium powercell, giving it a starting battery life of 3 minutes.
+    type: Add
+  - message: Lowered the price of the Chameleon Projector to 3TC.
+    type: Tweak
+  id: 9357
+  time: '2026-01-07T06:05:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42271
+- author: Samuka
+  changes:
+  - message: The xenoborg camera monitor now shows the names of each xenoborg.
+    type: Tweak
+  id: 9358
+  time: '2026-01-07T16:38:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42205
+- author: SomegnihT
+  changes:
+  - message: Vox now properly say they turn into fried chicken upon getting enough
+      heat damage
+    type: Fix
+  id: 9359
+  time: '2026-01-07T19:37:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42280
+- author: aada
+  changes:
+  - message: Toy swords now deal a very small amount of stamina damage for proper
+      sword fights.
+    type: Tweak
+  id: 9360
+  time: '2026-01-07T22:03:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42184
+- author: kontakt
+  changes:
+  - message: The Ninja's spider clan charge must now be planted on a wall or window.
+    type: Tweak
+  id: 9361
+  time: '2026-01-07T22:19:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41208
+- author: Princess-Cheeseballs
+  changes:
+  - message: Audio will now play properly when toggling internals.
+    type: Fix
+  id: 9362
+  time: '2026-01-08T11:03:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42304
+- author: aada
+  changes:
+  - message: The handheld health analyzer no longer requires a battery.
+    type: Tweak
+  id: 9363
+  time: '2026-01-08T19:38:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42292
+- author: perryprog
+  changes:
+  - message: The go go hat can now only retrieve and store items when worn.
+    type: Fix
+  id: 9364
+  time: '2026-01-08T19:38:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39189
+- author: LevitatingTree
+  changes:
+  - message: Saying ":?" now lets you shrug like "idk" used to.
+    type: Add
+  id: 9365
+  time: '2026-01-08T19:52:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41236
+- author: B_Kirill, ScarKy0
+  changes:
+  - message: Added a bonfire with stake that sets the attached entities on fire.
+    type: Add
+  - message: A bonfire and a bonfire with stake can now be constructed.
+    type: Add
+  id: 9366
+  time: '2026-01-09T04:14:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42211
+- author: mikeysaurus
+  changes:
+  - message: All non-arrivals shuttles are defaulted to have a 60 second cooldown
+      before they can FTL again.
+    type: Tweak
+  id: 9367
+  time: '2026-01-09T06:58:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42209
+- author: perryprog
+  changes:
+  - message: Added a button to the smart fridge UI to remove empty entries.
+    type: Add
+  id: 9368
+  time: '2026-01-09T15:02:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39195
+- author: B_Kirill
+  changes:
+  - message: Projectiles like bullets, rockets and fireballs no longer slow down during
+      flight.
+    type: Fix
+  id: 9369
+  time: '2026-01-09T18:45:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42320
+- author: Hitlinemoss
+  changes:
+  - message: Cabbage placed on taco shells no longer turns into a carrot.
+    type: Fix
+  id: 9370
+  time: '2026-01-09T23:24:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42326
+- author: Solid_Syn, BeckT
+  changes:
+  - message: Clowns now have the ability to toggle the wig on their mask!
+    type: Tweak
+  id: 9371
+  time: '2026-01-10T17:01:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42208
+- author: BarryNorfolk
+  changes:
+  - message: Network configurators now properly show colours between objects again.
+    type: Fix
+  id: 9372
+  time: '2026-01-10T20:09:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42335
+- author: ScarKy0
+  changes:
+  - message: Examining the state of dead entities is now predicted.
+    type: Fix
+  id: 9373
+  time: '2026-01-10T23:16:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42253
+- author: ScarKy0
+  changes:
+  - message: Janitor Cyborg's modules now feature a wirebrush.
+    type: Tweak
+  - message: The spray in the advanced cleaning module now self refills with space
+      cleaner, but has been halved in volume.
+    type: Tweak
+  id: 9374
+  time: '2026-01-11T04:19:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42330
+- author: SlamBamActionman
+  changes:
+  - message: Added an admin log for whenever a player connects/disconnects.
+    type: Add
+  id: 9375
+  time: '2026-01-11T21:46:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42363
+- author: Velken
+  changes:
+  - message: Fixed description for "help osay" command
+    type: Fix
+  id: 9376
+  time: '2026-01-12T03:04:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42368
+- author: Princess-Cheeseballs
+  changes:
+  - message: Borg hypo was moved to its own module
+    type: Tweak
+  - message: Roundstart chem module has been improved to be more like the advanced
+      chem module
+    type: Tweak
+  id: 9377
+  time: '2026-01-12T21:10:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42123
+- author: chaisftw
+  changes:
+  - message: Spray bottles now have fill level sprites.
+    type: Add
+  id: 9378
+  time: '2026-01-12T22:14:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42155
+- author: PicklOH
+  changes:
+  - message: Changed the destruction category of Space Law to be more accurate and
+      include Silicons.
+    type: Tweak
+  id: 9379
+  time: '2026-01-12T22:30:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42317
+- author: Quantum-cross
+  changes:
+  - message: Now you can be a late join antagonist even if you're arriving via the
+      arrivals shuttle!
+    type: Tweak
+  id: 9380
+  time: '2026-01-12T22:30:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39837
+- author: Princess-Cheeseballs
+  changes:
+  - message: Botany's chemical mutation table now takes rarity into account when selecting
+      chemicals. This means Omnizine is no longer the most common chemical to roll.
+    type: Fix
+  - message: Vestine chemical mutation table has been adjusted to be less powerful.
+      Vestine is now poisonous to plants.
+    type: Tweak
+  - message: Stellibinin now reduces plant toxicity at 50% the effectiveness of Dylovene.
+    type: Add
+  id: 9381
+  time: '2026-01-13T07:42:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42302
+- author: ScarKy0
+  changes:
+  - message: Hyperzine Injector cost has been lowered to 2TC from 4TC.
+    type: Tweak
+  - message: Hyperzine Microinjector Kit cost has been lowered to 5TC from 12TC.
+    type: Tweak
+  id: 9382
+  time: '2026-01-13T07:57:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42383
+- author: SlamBamActionman
+  changes:
+  - message: Added the Corpsman Medicine Bundle, a duffelbag of basic healing reagents.
+      It is available after 20 minutes for free via the new Syndicate Delivery Console
+      on the Nukie planet.
+    type: Add
+  - message: Added new handheld maps on the Nukie planet that shows the target station.
+    type: Add
+  id: 9383
+  time: '2026-01-13T08:12:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42337
+- author: ScarKy0
+  changes:
+  - message: The Smuggler's Satchel now costs 1TC instead of 2TC.
+    type: Tweak
+  id: 9384
+  time: '2026-01-13T10:16:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42381
+- author: alexalexmax
+  changes:
+  - message: The ninja headset is now immune to EMPs.
+    type: Tweak
+  id: 9385
+  time: '2026-01-13T13:44:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42334
+- author: Velken, Murphyneko
+  changes:
+  - message: Station tiles and floors can now be placed on planets, asteroids and
+      different platings.
+    type: Tweak
+  id: 9386
+  time: '2026-01-13T14:05:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38898
+- author: ScarKy0
+  changes:
+  - message: The throwing knives bundle now comes with 8 knives instead of 4.
+    type: Tweak
+  - message: Throwing knives now take half the time (1.5s) to unembed from a target.
+    type: Tweak
+  id: 9387
+  time: '2026-01-13T17:04:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42391
+- author: ScarKy0
+  changes:
+  - message: Scram implant no longer brings the person pulling you along.
+    type: Fix
+  id: 9388
+  time: '2026-01-13T17:18:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42393
+- author: ScarKy0
+  changes:
+  - message: Vipers now start with a high capacity magazine.
+    type: Tweak
+  - message: The uplink now has a high capacity magazine instead of the regular one.
+    type: Tweak
+  - message: High capacity magazines now hold 1 less bullet (15 total).
+    type: Tweak
+  id: 9389
+  time: '2026-01-13T18:30:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42392
+- author: SirWarock
+  changes:
+  - message: Cyborg Chassis can now be pried open when the cyborg is in critical state!
+    type: Add
+  - message: Cyborg Chassis' maintenance panel now needs to be opened with a screwdriver
+      again.
+    type: Tweak
+  id: 9390
+  time: '2026-01-13T22:21:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42319
+- author: SapphicOverload
+  changes:
+  - message: Fixed tritium fires consuming either 18 times more oxygen and making
+      10 times more water vapor than intended or consuming no oxygen at all, depending
+      on whether there is more or less oxygen than tritium respectively.
+    type: Fix
+  id: 9391
+  time: '2026-01-13T22:35:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41870
+- author: ArtisticRoomba
+  changes:
+  - message: The frezon production conversion rate has been increased. Tritium combines
+      with oxygen to make frezon at a 1:50 ratio instead of a 1:8 ratio. This means
+      you'll be making more frezon for less tritium inputted in a standard frezon
+      setup.
+    type: Tweak
+  id: 9392
+  time: '2026-01-13T23:41:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42400
+- author: ArtisticRoomba
+  changes:
+  - message: The tritiumfire reaction now properly limits the amount of tritium burned
+      by the limiting gas in the mix instead of limiting by which gas is in excess.
+    type: Fix
+  id: 9393
+  time: '2026-01-14T05:21:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42407
+- author: skrybl
+  changes:
+  - message: Changed the sprite for the janitorial maid uniform.
+    type: Tweak
+  id: 9394
+  time: '2026-01-14T15:03:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38335
+- author: SlamBamActionman
+  changes:
+  - message: Added a target station map inside the LoneOp's Striker shuttle.
+    type: Add
+  id: 9395
+  time: '2026-01-14T20:04:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42376
+- author: Samuka
+  changes:
+  - message: Xenoborgs no longer drop core pinpointers.
+    type: Remove
+  - message: Xenoborgs now drop core pinpointer pieces. With 4 you can craft a repaired
+      core pinpointer!
+    type: Add
+  id: 9396
+  time: '2026-01-14T20:36:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42295
+- author: korczoczek
+  changes:
+  - message: Lathes will now return materials when a recipe gets cancelled
+    type: Fix
+  - message: Lathes will no longer void materials if unpowered in the middle of producing
+      a recipe
+    type: Fix
+  id: 9397
+  time: '2026-01-14T21:26:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42416
+- author: TheFlyingSentry
+  changes:
+  - message: Containment units no longer contribute to light pollution
+    type: Fix
+  id: 9398
+  time: '2026-01-14T21:40:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42289
+- author: TriviaSolari
+  changes:
+  - message: Entities that are airtight on all sides (such as full-tile walls, airlocks,
+      and windows) now skip rotational checks for airtightness when initialized.
+    type: Tweak
+  id: 9399
+  time: '2026-01-15T02:46:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42390
+- author: ArtisticRoomba
+  changes:
+  - message: The TEG now produces 75% more power. This is to counteract tritium fires
+      no longer producing 10x the amount of heat they used to output, due to a bug.
+    type: Tweak
+  id: 9400
+  time: '2026-01-15T05:40:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42421
+- author: kontakt
+  changes:
+  - message: Cancer mice are now significantly more radioactive.
+    type: Tweak
+  id: 9401
+  time: '2026-01-15T16:46:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42298
+- author: Samuka
+  changes:
+  - message: The heavy xenoborg can now slowly move in space like the scout and stealth
+      xenoborgs.
+    type: Tweak
+  id: 9402
+  time: '2026-01-15T17:10:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42415
+- author: rumaks-xyz
+  changes:
+  - message: Chemical reactions no longer occur inside pills
+    type: Tweak
+  id: 9403
+  time: '2026-01-15T18:08:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41457
+- author: Fruitsalad
+  changes:
+  - message: Added a new user interface for cryo pods
+    type: Add
+  id: 9404
+  time: '2026-01-15T18:08:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41850
+- author: Orsoniks
+  changes:
+  - message: Health examine colours now reflect the medicines used to heal that type
+      of damage.
+    type: Tweak
+  id: 9405
+  time: '2026-01-15T18:42:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38231
+- author: aada
+  changes:
+  - message: New tiny and cute vials that hold 10 units.
+    type: Add
+  - message: Vials can now be closed to avoid spilling.
+    type: Tweak
+  id: 9406
+  time: '2026-01-15T19:00:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36132
+- author: ScarKy0
+  changes:
+  - message: Added the Paper Centrifuge! A craftable, makeshift centrifudge primarly
+      usable in maintenance chemistry.
+    type: Add
+  id: 9407
+  time: '2026-01-15T20:01:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42040
+- author: Velken
+  changes:
+  - message: RCD can no longer spam lights in the same spot.
+    type: Fix
+  - message: RCD can no longer be used to destroy indestructible tiles.
+    type: Fix
+  id: 9408
+  time: '2026-01-15T20:39:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42432
+- author: B_Kirill
+  changes:
+  - message: Added camera map. Cutting MAP wire hides camera from map while keeping
+      it accessible in camera list.
+    type: Add
+  id: 9409
+  time: '2026-01-15T21:37:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39684
+- author: ScarKy0
+  changes:
+  - message: Added Makeshift and Regular Mortar&Pestle! It can be found in the nutrimax
+      and dinnerware vendors or crafted. It works slower and can only process 1 item
+      at a time.
+    type: Add
+  - message: Added Makeshift and Regular Handheld Juicer! It can be found in the nutrimax
+      and dinnerware vendors or crafted. It works slower and can only process 1 item
+      at a time.
+    type: Add
+  id: 9410
+  time: '2026-01-16T00:35:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42019
+- author: EmoGarbage404
+  changes:
+  - message: Fixed flatpackers ignoring material costs for certain machine board requirements
+      and being able to print unlatheable items for flatpacks.
+    type: Fix
+  id: 9411
+  time: '2026-01-16T00:52:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42445
+- author: sowelipililimute
+  changes:
+  - message: Using a core pinpointer piece on another piece no longer causes you to
+      start an unintended construction recipe.
+    type: Fix
+  id: 9412
+  time: '2026-01-16T02:09:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42446
+- author: neomoth
+  changes:
+  - message: Fix zombie resistance, instead of making you more likely to be infected,
+      it now properly makes you less likely to be infected.
+    type: Fix
+  id: 9413
+  time: '2026-01-16T08:40:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42451
+- author: Samuka
+  changes:
+  - message: The mothership now starts with more materials so there is less need to
+      salvage for them.
+    type: Tweak
+  - message: Xenoborgs guidebook entry got updated in regards to preparation and tactics.
+    type: Tweak
+  id: 9414
+  time: '2026-01-16T17:19:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42448