From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sun, 17 Aug 2025 20:53:52 +0000 (+0200)
Subject: Merge branch 'staging' into stable
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7abb022b6409be6762bed7ac5c4a01f5bfcdbc2a;p=space-station-14.git

Merge branch 'staging' into stable
---

7abb022b6409be6762bed7ac5c4a01f5bfcdbc2a
diff --cc Content.Shared/Standing/StandingStateSystem.cs
index 5f5d98af8a,7f3b8c9aac..5553ef5b91
--- a/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))