(1762f02b3) Merge branch 'dev' into human-ai

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

@@ -71,8 +71,10 @@ namespace Barotrauma.Items.Components
             var targetItem = inputContainer.Inventory.Items.LastOrDefault(i => i != null);
             if (targetItem == null) { return; }
 
-            progressState = Math.Min(progressTimer / targetItem.Prefab.DeconstructTime, 1.0f);
-            if (progressTimer > targetItem.Prefab.DeconstructTime)
+            float deconstructTime = targetItem.Prefab.DeconstructItems.Any() ? targetItem.Prefab.DeconstructTime : 1.0f;
+
+            progressState = Math.Min(progressTimer / deconstructTime, 1.0f);
+            if (progressTimer > deconstructTime)
             {
                 foreach (DeconstructItem deconstructProduct in targetItem.Prefab.DeconstructItems)
                 {
@@ -100,10 +102,13 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
-                inputContainer.Inventory.RemoveItem(targetItem);
-                Entity.Spawner.AddToRemoveQueue(targetItem);
-                MoveInputQueue();
-                PutItemsToLinkedContainer();
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
 
                 if (inputContainer.Inventory.Items.Any(i => i != null))
                 {

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

@@ -473,6 +473,8 @@ namespace Barotrauma.Items.Components
         {
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return false; }
 
+            IsActive = true;
+
             float degreeOfSuccess = DegreeOfSuccess(character);
 
             //characters with insufficient skill levels don't refuel the reactor

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

@@ -328,6 +328,19 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        public override void OnItemLoaded()
+        {
+            sonar = item.GetComponent<Sonar>();
+        }
+
+        public override bool Select(Character character)
+        {
+            if (!CanBeSelected) return false;
+
+            user = character;
+            return true;
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
             networkUpdateTimer -= deltaTime;