Retractable items system + Arm Blade action (#38150)

2026-10-01 00:27:59 +00:00 · 2025-08-07 18:41:36 +02:00
parent 9f857e1496
commit 7fed6632fb
12 changed files with 242 additions and 5 deletions
@@ -216,7 +216,10 @@ namespace Content.Shared.Interaction
        /// </summary>
        private void OnRemoveAttempt(EntityUid uid, UnremoveableComponent item, ContainerGettingRemovedAttemptEvent args)
        {
-            args.Cancel();
+            // don't prevent the server state for the container from being applied to the client correctly
+            // otherwise this will cause an error if the client predicts adding UnremoveableComponent
+            if (!_gameTiming.ApplyingState)
+                args.Cancel();
        }

        /// <summary>