(10a11fd09) Rename a variable.

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -74,6 +74,21 @@ namespace Barotrauma
             }
         }
 
+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 
@@ -95,6 +110,13 @@ namespace Barotrauma
             {
                 character.SelectedConstruction = null;
             }
+            if (!character.IsClimbing)
+            {
+                character.SelectedConstruction = null;
+            }
+
+            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
+                (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
 
             bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
                 (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs

@@ -131,18 +131,18 @@ namespace Barotrauma
 
         protected virtual void FindTargets()
         {
-            foreach (T item in GetList())
+            foreach (T target in GetList())
             {
                 if (objectiveManager.CurrentOrder != this)
                 {
                     // Battery or pump states cannot be reported and therefore we must ignore them -> the bots always know if they require attention.
                     bool ignore = this is AIObjectiveChargeBatteries || this is AIObjectivePumpWater;
-                    if (!ignore && !ReportedTargets.Contains(item)) { continue; }
+                    if (!ignore && !ReportedTargets.Contains(target)) { continue; }
                 }
-                if (!Filter(item)) { continue; }
-                if (!ignoreList.Contains(item))
+                if (!Filter(target)) { continue; }
+                if (!ignoreList.Contains(target))
                 {
-                    targets.Add(item);
+                    targets.Add(target);
                 }
             }
         }

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -772,6 +772,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -212,6 +212,33 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
+        struct ObstacleDebugInfo
+        {
+            public Vector2 Point1;
+            public Vector2 Point2;
+
+            public Vector2? Intersection;
+
+            public float Dot;
+
+            public Vector2 AvoidStrength;
+
+            public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength)
+            {
+                Point1 = edge.Point1;
+                Point2 = edge.Point2;
+                Intersection = intersection;
+                Dot = dot;
+                AvoidStrength = avoidStrength;
+            }
+        }
+
         //edge point 1, edge point 2, avoid strength
         private List<ObstacleDebugInfo> debugDrawObstacles = new List<ObstacleDebugInfo>();
 

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1452,6 +1452,10 @@ namespace Barotrauma
             {
                 ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
             }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
             ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
 
             if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -588,6 +588,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get