From e1e99e16c7e239813f2c9ff046871736e52ef6a4 Mon Sep 17 00:00:00 2001
From: Arendian <137322659+Arendian@users.noreply.github.com>
Date: Mon, 8 Jan 2024 00:32:46 +0100
Subject: [PATCH] Fix duplicate popups in ripley (#23692)

Fix duplicate popups on switching selected equipment
---
 Content.Shared/Mech/EntitySystems/SharedMechSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index b4cd625824..7e44dea507 100644
--- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
+++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
@@ -191,7 +191,7 @@ public abstract class SharedMechSystem : EntitySystem
             ? Loc.GetString("mech-equipment-select-popup", ("item", component.CurrentSelectedEquipment))
             : Loc.GetString("mech-equipment-select-none-popup");
 
-        if (_timing.IsFirstTimePredicted)
+        if (_net.IsServer)
             _popup.PopupEntity(popupString, uid);
 
         Dirty(component);