Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2025-06-17 15:45:16 -03:00
parent 8af2267c53 fd34473640
commit 2368640841
298 changed files with 7347 additions and 2422 deletions
@@ -347,7 +347,10 @@ namespace Barotrauma
            useItemTimer = 0.05f;
            StartUsingItem();

-            if (!allowMovement)
+            //make the character move towards the item they're using...
+            if (!allowMovement && 
+                //...except if they've selected an item that controls the character's direction (e.g. a periscope)
+                character.SelectedSecondaryItem?.GetComponent<Controller>() is not { Direction: Direction.Left or Direction.Right })
            {
                TargetMovement = Vector2.Zero;
                TargetDir = handWorldPos.X > character.WorldPosition.X ? Direction.Right : Direction.Left;