Fix weapon cooldown serialization while mapping (#15123)

2023-04-06 11:37:50 +12:00
parent c851a9af23
commit 29ad3e50ac
7 changed files with 38 additions and 32 deletions
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -152,7 +152,8 @@ public abstract partial class SharedGunSystem
    {
        // Reset shotting for cycling
        if (Resolve(uid, ref gunComp, false) &&
-            gunComp is { FireRate: > 0f })
+            gunComp is { FireRate: > 0f } &&
+            !Paused(uid))
        {
            gunComp.NextFire = Timing.CurTime + TimeSpan.FromSeconds(1 / gunComp.FireRate);
        }