Let Shuttle Console Open Attempts Be Predicted on the Client

Content.Client/Shuttles/Systems/ShuttleConsoleLockSystem.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Access.Components;
+using Content.Shared.UserInterface;
 
 namespace Content.Client.Shuttles.Systems;
 
@@ -17,4 +18,17 @@ public override bool TryUnlock(EntityUid console, EntityUid idCard, ShuttleConso
         // Prediction only
         return false;
     }
-} 
+
+    /// <summary>
+    /// Client extension of OnUIOpenAttempt. Prevents UI flashing open on client.
+    /// </summary>
+    protected override void OnUIOpenAttempt(EntityUid uid,
+        ShuttleConsoleLockComponent component,
+        ActivatableUIOpenAttemptEvent args)
+    {
+        base.OnUIOpenAttempt(uid, component, args);
+
+        if(Timing.IsFirstTimePredicted && args.Cancelled)
+            Popup.PopupEntity(Loc.GetString("shuttle-console-locked"), uid, args.User);
+    }
+}

Content.Server/Shuttles/Systems/ShuttleConsoleLockSystem.cs

@@ -5,7 +5,6 @@
 using Content.Shared._NF.Shipyard.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Hands.Systems;
-using Content.Shared.UserInterface;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
@@ -36,7 +35,6 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<ShuttleConsoleLockComponent, ComponentInit>(OnShuttleConsoleLockInit);
         SubscribeLocalEvent<ShuttleConsoleLockComponent, GetVerbsEvent<AlternativeVerb>>(AddUnlockVerb);
-        SubscribeLocalEvent<ShuttleConsoleLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<PdaComponent, AfterInteractEvent>(OnPdaAfterInteract);
         SubscribeLocalEvent<ShuttleConsoleLockComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
         SubscribeLocalEvent<ShuttleDeedComponent, ComponentInit>(OnShuttleDeedInit);
@@ -535,20 +533,6 @@ private bool TryLockWithVoucher(EntityUid console, EntityUid voucher, ShuttleCon
         return true;
     }
 
-    /// <summary>
-    /// Prevents using the console UI if it's locked
-    /// </summary>
-    private void OnUIOpenAttempt(EntityUid uid,
-        ShuttleConsoleLockComponent component,
-        ActivatableUIOpenAttemptEvent args)
-    {
-        if (GetEffectiveLockState(uid, component))
-        {
-            Popup.PopupEntity(Loc.GetString("shuttle-console-locked"), uid, args.User);
-            args.Cancel();
-        }
-    }
-
     /// <summary>
     /// Finds all ID cards accessible to a user (in hands or worn)
     /// </summary>

Content.Shared/Shuttles/Systems/SharedShuttleConsoleLockSystem.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Shuttles.Components;
 using Content.Shared._NF.Shipyard.Components;
+using Content.Shared.UserInterface;
 using Content.Shared.Popups;
 using Robust.Shared.Timing;
 using Content.Shared.Examine;
@@ -22,6 +23,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<ShuttleConsoleLockComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<ShuttleConsoleLockComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<ShuttleConsoleLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
     }
 
     private void OnStartup(EntityUid uid, ShuttleConsoleLockComponent component, ComponentStartup args)
@@ -58,6 +60,17 @@ public bool GetEffectiveLockState(EntityUid console, ShuttleConsoleLockComponent
         return component.Locked;
     }
 
+    /// <summary>
+    /// Prevents using the console UI if it's locked
+    /// </summary>
+    protected virtual void OnUIOpenAttempt(EntityUid uid,
+        ShuttleConsoleLockComponent component,
+        ActivatableUIOpenAttemptEvent args)
+    {
+        if (GetEffectiveLockState(uid, component))
+            args.Cancel();
+    }
+
     protected void UpdateAppearance(EntityUid uid, ShuttleConsoleLockComponent? component = null)
     {
         if (!Resolve(uid, ref component))