Merge remote-tracking branch 'upstream/master' into spawnflipped

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -2188,7 +2188,11 @@ public void Control(float deltaTime, Camera cam)
                 ((!IsClimbing && AnimController.OnGround) || (IsClimbing && IsKeyDown(InputType.Aim))) && 
                 !AnimController.InWater)
             {
-                if (AnimController is not FishAnimController)
+                if (!FollowCursor)
+                {
+                    AnimController.TargetDir = Direction.Right;
+                }
+                else
                 {
                     if (CursorPosition.X < AnimController.Collider.Position.X - cursorFollowMargin)
                     {
@@ -2199,10 +2203,6 @@ public void Control(float deltaTime, Camera cam)
                         AnimController.TargetDir = Direction.Right;
                     }
                 }
-                if (AnimController is HumanoidAnimController && dontFollowCursor) // For character editor
-                {
-                    AnimController.TargetDir = Direction.Right;
-                }
             }
 
             if (GameMain.NetworkMember != null)
@@ -5994,25 +5994,6 @@ public void StopClimbing()
             AnimController.StopClimbing();
             ReleaseSecondaryItem();
         }
-
-        public void TryFlipCharacter()
-        {
-            if (AnimController is FishAnimController fishAnimController)
-            {
-                if (fishAnimController.CurrentFishAnimation.Flip)
-                {
-                    fishAnimController.Flip();
-                }
-            }
-            else
-            {
-                AnimController.TargetDir = (AnimController.TargetDir == Direction.Left) ? Direction.Right : Direction.Left;
-                if (!CanMove)
-                {
-                    AnimController.Flip();
-                }
-            }
-        }
     }
 
     class ActiveTeamChange