[Fix] Mass Bug Fix

Content.Client/Arcade/BlockGameMenu.cs

@@ -375,7 +375,7 @@ private Control SetupGameGrid(Texture panelTex)
             {
                 PanelOverride = back,
                 HorizontalExpand = true,
-                SizeFlagsStretchRatio = 60
+                SizeFlagsStretchRatio = 34.25f
             };
             var backgroundPanel = new PanelContainer
             {

Content.Client/Buckle/BuckleSystem.cs

@@ -15,9 +15,41 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<BuckleComponent, ComponentHandleState>(OnHandleState);
         SubscribeLocalEvent<BuckleComponent, AppearanceChangeEvent>(OnAppearanceChange);
         SubscribeLocalEvent<StrapComponent, MoveEvent>(OnStrapMoveEvent);
+        SubscribeLocalEvent<BuckleComponent, BuckledEvent>(OnBuckledEvent);
+        SubscribeLocalEvent<BuckleComponent, UnbuckledEvent>(OnUnbuckledEvent);
+    }
+
+     /// <summary>
+    /// Is the strap entity already rotated north? Lower the draw depth of the buckled entity.
+    /// </summary>
+    private void OnBuckledEvent(Entity<BuckleComponent> ent, ref BuckledEvent args)
+    {
+        if (!TryComp<SpriteComponent>(args.Strap, out var strapSprite) ||
+            !TryComp<SpriteComponent>(ent.Owner, out var buckledSprite))
+            return;
+
+        if (Transform(args.Strap.Owner).LocalRotation.GetCardinalDir() == Direction.North)
+        {
+            ent.Comp.OriginalDrawDepth ??= buckledSprite.DrawDepth;
+            buckledSprite.DrawDepth = strapSprite.DrawDepth - 1;
+        }
+    }
+
+    /// <summary>
+    /// Was the draw depth of the buckled entity lowered? Reset it upon unbuckling.
+    /// </summary>
+    private void OnUnbuckledEvent(Entity<BuckleComponent> ent, ref UnbuckledEvent args)
+    {
+        if (!TryComp<SpriteComponent>(ent.Owner, out var buckledSprite))
+            return;
+
+        if (ent.Comp.OriginalDrawDepth.HasValue)
+        {
+            buckledSprite.DrawDepth = ent.Comp.OriginalDrawDepth.Value;
+            ent.Comp.OriginalDrawDepth = null;
+        }
     }
 
     private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveEvent args)
@@ -57,21 +89,6 @@ private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveE
         }
     }
 
-    private void OnHandleState(Entity<BuckleComponent> ent, ref ComponentHandleState args)
-    {
-        if (args.Current is not BuckleState state)
-            return;
-
-        ent.Comp.DontCollide = state.DontCollide;
-        ent.Comp.BuckleTime = state.BuckleTime;
-        var strapUid = EnsureEntity<BuckleComponent>(state.BuckledTo, ent);
-
-        SetBuckledTo(ent, strapUid == null ? null : new (strapUid.Value, null));
-
-        var (uid, component) = ent;
-
-    }
-
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
         if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals)

Content.Client/Jittering/JitteringSystem.cs

@@ -48,6 +48,9 @@ private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, A
             if(args.Key != _jitterAnimationKey)
                 return;
 
+            if (!args.Finished)
+                return;
+
             if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)
                 && TryComp(uid, out SpriteComponent? sprite))
                 _animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);

Content.Client/Light/EntitySystems/LightBehaviorSystem.cs

@@ -19,6 +19,9 @@ public override void Initialize()
 
     private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent component, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         var container = component.Animations.FirstOrDefault(x => x.FullKey == args.Key);
 
         if (container == null)

Content.Client/Light/EntitySystems/RotatingLightSystem.cs

@@ -69,6 +69,9 @@ private void OnAfterAutoHandleState(EntityUid uid, RotatingLightComponent comp,
 
     private void OnAnimationComplete(EntityUid uid, RotatingLightComponent comp, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         PlayAnimation(uid, comp);
     }
 

Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs

@@ -20,9 +20,9 @@ public SalvageMagnetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
     protected override void Open()
     {
         base.Open();
-        _window = new OfferingWindow();
+
+        _window = this.CreateWindow<OfferingWindow>(); // WD EDIT
         _window.Title = Loc.GetString("salvage-magnet-window-title");
-        _window.OnClose += Close;
         _window.OpenCenteredLeft();
     }
 

Content.Client/_White/Animations/WaddleAnimationSystem.cs

@@ -19,10 +19,7 @@ public sealed class WaddleAnimationSystem : SharedWaddleAnimationSystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<WaddleAnimationComponent, AnimationCompletedEvent>(OnAnimationCompleted);
-
         SubscribeAllEvent<StartedWaddlingEvent>(ev => PlayAnimation(GetEntity(ev.User)));
-        SubscribeAllEvent<StoppedWaddlingEvent>(ev => StopAnimation(GetEntity(ev.User)));
     }
 
     protected override void PlayAnimation(EntityUid uid)
@@ -40,7 +37,6 @@ protected override void PlayAnimation(EntityUid uid)
         var len = mover.Sprinting ? component.AnimationLength * component.RunAnimationLengthMultiplier : component.AnimationLength;
 
         component.LastStep = !component.LastStep;
-        component.IsCurrentlyWaddling = true;
 
         var animation = new Animation()
         {
@@ -54,9 +50,9 @@ protected override void PlayAnimation(EntityUid uid)
                     InterpolationMode = AnimationInterpolationMode.Linear,
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), 0),
-                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(tumbleIntensity), len/3),
-                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), len/3),
+                        new(Angle.FromDegrees(0), 0),
+                        new(Angle.FromDegrees(tumbleIntensity), len/3),
+                        new(Angle.FromDegrees(0), len/3),
                     }
                 },
                 new AnimationTrackComponentProperty()
@@ -66,35 +62,14 @@ protected override void PlayAnimation(EntityUid uid)
                     InterpolationMode = AnimationInterpolationMode.Linear,
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(new Vector2(), 0),
-                        new AnimationTrackProperty.KeyFrame(component.HopIntensity, len/3),
-                        new AnimationTrackProperty.KeyFrame(new Vector2(), len/3),
+                        new(new Vector2(), 0),
+                        new(component.HopIntensity, len/3),
+                        new(new Vector2(), len/3),
                     }
                 }
             }
         };
 
         _animation.Play(uid, animation, component.KeyName);
     }
-
-    protected override void StopAnimation(EntityUid uid)
-    {
-        if (!TryComp<WaddleAnimationComponent>(uid, out var component)
-            || !TryComp<SpriteComponent>(uid, out var sprite))
-            return;
-
-        _animation.Stop(uid, component.KeyName);
-
-        sprite.Offset = new Vector2();
-        sprite.Rotation = Angle.FromDegrees(0);
-        component.IsCurrentlyWaddling = false;
-    }
-
-    private void OnAnimationCompleted(EntityUid uid, WaddleAnimationComponent component, AnimationCompletedEvent args)
-    {
-        if (args.Key != component.KeyName)
-            return;
-
-        PlayAnimation(uid);
-    }
 }

Content.Server/Arcade/BlockGame/BlockGame.Ui.cs

@@ -157,7 +157,7 @@ private void InputTick(float frameTime)
     /// <param name="message">The message to broadcase to all players/spectators.</param>
     private void SendMessage(BoundUserInterfaceMessage message)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message);
     }
 
     /// <summary>
@@ -167,7 +167,7 @@ private void SendMessage(BoundUserInterfaceMessage message)
     /// <param name="actor">The target recipient.</param>
     private void SendMessage(BoundUserInterfaceMessage message, EntityUid actor)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message, actor);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message, actor);
     }
 
     /// <summary>

Content.Server/Construction/Components/WelderRefinableComponent.cs

@@ -18,7 +18,7 @@ public sealed partial class WelderRefinableComponent : Component
     public float RefineTime = 2f;
 
     [DataField]
-    public float RefineFuel;
+    public float RefineFuel = 1f; // WD EDIT
 
     [DataField]
     public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";

Content.Server/Disposal/Tube/DisposalTubeSystem.cs

@@ -340,14 +340,15 @@ private void UpdateAnchored(EntityUid uid, DisposalTubeComponent component, bool
         {
             if (!Resolve(target, ref targetTube))
                 return null;
+
             var oppositeDirection = nextDirection.GetOpposite();
 
             var xform = Transform(target);
             if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
                 return null;
 
             var position = xform.Coordinates;
-            var entities = _mapSystem.GetInDir(target, grid, position, nextDirection);
+            var entities = _mapSystem.GetInDir((EntityUid) xform.GridUid, grid, position, nextDirection);
 
             foreach (var entity in entities)
             {

Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs

@@ -88,11 +88,13 @@ public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null,
 
             if (!Resolve(uid, ref holder, ref holderTransform))
                 return;
+
             if (holder.IsExitingDisposals)
             {
                 Log.Error("Tried exiting disposals twice. This should never happen.");
                 return;
             }
+
             holder.IsExitingDisposals = true;
 
             // Check for a disposal unit to throw them into and then eject them from it.
@@ -164,11 +166,13 @@ public bool EnterTube(EntityUid holderUid, EntityUid toUid, DisposalHolderCompon
         {
             if (!Resolve(holderUid, ref holder, ref holderTransform))
                 return false;
+
             if (holder.IsExitingDisposals)
             {
                 Log.Error("Tried entering tube after exiting disposals. This should never happen.");
                 return false;
             }
+
             if (!Resolve(toUid, ref to, ref toTransform))
             {
                 ExitDisposals(holderUid, holder, holderTransform);
@@ -193,6 +197,7 @@ public bool EnterTube(EntityUid holderUid, EntityUid toUid, DisposalHolderCompon
                 holder.PreviousTube = holder.CurrentTube;
                 holder.PreviousDirection = holder.CurrentDirection;
             }
+
             holder.CurrentTube = toUid;
             var ev = new GetDisposalsNextDirectionEvent(holder);
             RaiseLocalEvent(toUid, ref ev);
@@ -212,9 +217,7 @@ public bool EnterTube(EntityUid holderUid, EntityUid toUid, DisposalHolderCompon
             if (holder.CurrentDirection != holder.PreviousDirection)
             {
                 foreach (var ent in holder.Container.ContainedEntities)
-                {
                     _damageable.TryChangeDamage(ent, to.DamageOnTurn);
-                }
                 _audio.PlayPvs(to.ClangSound, toUid);
             }
 
@@ -225,9 +228,7 @@ public override void Update(float frameTime)
         {
             var query = EntityQueryEnumerator<DisposalHolderComponent>();
             while (query.MoveNext(out var uid, out var holder))
-            {
                 UpdateComp(uid, holder, frameTime);
-            }
         }
 
         private void UpdateComp(EntityUid uid, DisposalHolderComponent holder, float frameTime)
@@ -236,9 +237,7 @@ private void UpdateComp(EntityUid uid, DisposalHolderComponent holder, float fra
             {
                 var time = frameTime;
                 if (time > holder.TimeLeft)
-                {
                     time = holder.TimeLeft;
-                }
 
                 holder.TimeLeft -= time;
                 frameTime -= time;
@@ -268,17 +267,15 @@ private void UpdateComp(EntityUid uid, DisposalHolderComponent holder, float fra
 
                 // Find next tube
                 var nextTube = _disposalTubeSystem.NextTubeFor(currentTube, holder.CurrentDirection);
-                if (!EntityManager.EntityExists(nextTube))
+                if (!EntityManager.EntityExists(nextTube)) 
                 {
                     ExitDisposals(uid, holder);
                     break;
                 }
 
                 // Perform remainder of entry process
                 if (!EnterTube(uid, nextTube!.Value, holder))
-                {
                     break;
-                }
             }
         }
     }

Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs

@@ -516,7 +516,7 @@ public bool TryFlush(EntityUid uid, SharedDisposalUnitComponent component)
             return false;
 
         var coords = xform.Coordinates;
-        var entry = _sharedMapSystem.GetLocal(uid, grid, coords)
+        var entry = _sharedMapSystem.GetLocal((EntityUid) xform.GridUid, grid, coords)
             .FirstOrDefault(HasComp<DisposalEntryComponent>);
 
         if (entry == default || component is not DisposalUnitComponent sDisposals)