From 868fea19fbb9530b9759510ebf0a9ebd3731f012 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:44:26 +0000
Subject: [PATCH] ignore prediction on guns disabled popup (#15138)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index fdae26dcc1..99739eff55 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -211,7 +211,8 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         if (TagSystem.HasTag(user, "GunsDisabled"))
         {
-            Popup(Loc.GetString("gun-disabled"), user, user);
+            if (Timing.IsFirstTimePredicted)
+                Popup(Loc.GetString("gun-disabled"), user, user);
             return;
         }
 
-- 
2.51.2