Merge branch 'master' of github.com:space-wizards/space-station-14 into replace-sounds-with-sound-specifier

Content.Server/Climbing/ClimbSystem.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Climbing.Components;
+using Content.Shared.Climbing;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -8,7 +9,7 @@ using Robust.Shared.GameObjects;
 namespace Content.Server.Climbing
 {
     [UsedImplicitly]
-    internal sealed class ClimbSystem : EntitySystem
+    internal sealed class ClimbSystem : SharedClimbSystem
     {
         private readonly HashSet<ClimbingComponent> _activeClimbers = new();
 

Content.Server/Climbing/Components/ClimbingComponent.cs

@@ -41,7 +41,7 @@ namespace Content.Server.Climbing.Components
             }
         }
 
-        protected override bool OwnerIsTransitioning
+        public override bool OwnerIsTransitioning
         {
             get => base.OwnerIsTransitioning;
             set