Merge remote-tracking branch 'upstream/master'

2024-06-28 11:45:35 +03:00
parent a92082f0b3 c28f5648d0
commit 8de3924481
346 changed files with 1792 additions and 213 deletions
--- a/Content.Client/_White/Animations/FlipOnHitSystem.cs
+++ b/Content.Client/_White/Animations/FlipOnHitSystem.cs
@@ -32,6 +32,9 @@ public sealed class FlipOnHitSystem : SharedFlipOnHitSystem
        if (!_timing.IsFirstTimePredicted)
            return;

+        if (TerminatingOrDeleted(user))
+            return;
+
        if (_animationSystem.HasRunningAnimation(user, EmoteAnimationSystem.AnimationKey))
        {
            EnsureComp<FlippingComponent>(user);