Merge branch 'staging' into stable

diff --cc Content.Shared/Standing/StandingStateSystem.cs
index 5f5d98af8afa6c898705b4fba420db8ac8c2266e,7f3b8c9aacc0b38e6783c3d9dc22ae3d3fa25150..5553ef5b91a81dbd9c25147ddaa6219bfaaa58dc
--- 1/Content.Shared/Standing/StandingStateSystem.cs
--- 2/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@@ -64,18 -57,18 +57,27 @@@ public sealed class StandingStateSyste
      private void OnTileFriction(Entity<StandingStateComponent> entity, ref TileFrictionEvent args)
      {
          if (!entity.Comp.Standing)
-             args.Modifier *= entity.Comp.FrictionModifier;
+             args.Modifier *= entity.Comp.DownFrictionMod;
+     }
+ 
+     private void OnEndClimb(Entity<StandingStateComponent> entity, ref EndClimbEvent args)
+     {
+         if (entity.Comp.Standing)
+             return;
+ 
+         // Currently only Climbing also edits fixtures layers like this so this is fine for now.
+         ChangeLayers(entity);
      }
  
 +    private void OnEndClimb(Entity<StandingStateComponent> entity, ref EndClimbEvent args)
 +    {
 +        if (entity.Comp.Standing)
 +            return;
 +
 +        // Currently only Climbing also edits fixtures layers like this so this is fine for now.
 +        ChangeLayers(entity);
 +    }
 +
      public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
      {
          if (!Resolve(uid, ref standingState, false))