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

Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs

@@ -122,10 +122,12 @@ namespace Barotrauma.Items.Components
                         foreach (Item subItem in containedSubItems)
                         {
                             projectile = subItem.GetComponent<Projectile>();
-
                             //apply OnUse statuseffects to the container in case it has to react to it somehow
                             //(play a sound, spawn more projectiles, reduce condition...)
-                            subItem.GetComponent<ItemContainer>()?.Item.ApplyStatusEffects(ActionType.OnUse, deltaTime);
+                            if (subItem.Condition > 0.0f)
+                            {
+                                subItem.GetComponent<ItemContainer>()?.Item.ApplyStatusEffects(ActionType.OnUse, deltaTime);
+                            }
                             if (projectile != null) break;
                         }
                     }

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;

Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs

@@ -201,7 +201,7 @@ namespace Barotrauma.Items.Components
                     if (sparkSounds.Count > 0)
                     {
                         var sparkSound = sparkSounds[Rand.Int(sparkSounds.Count)];
-                        SoundPlayer.PlaySound(sparkSound.Sound, sparkSound.Volume, sparkSound.Range, pt.item.WorldPosition, pt.item.CurrentHull);
+                        SoundPlayer.PlaySound(sparkSound.Sound, pt.item.WorldPosition, sparkSound.Volume, sparkSound.Range,  pt.item.CurrentHull);
                     }
 
                     Vector2 baseVel = Rand.Vector(300.0f);

Barotrauma/BarotraumaShared/Source/Items/Components/Power/Powered.cs

@@ -103,7 +103,7 @@ namespace Barotrauma.Items.Components
                 ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
                 if (!powerOnSoundPlayed && powerOnSound != null)
                 {
-                    SoundPlayer.PlaySound(powerOnSound.Sound, powerOnSound.Volume, powerOnSound.Range, item.WorldPosition, item.CurrentHull);                    
+                    SoundPlayer.PlaySound(powerOnSound.Sound, item.WorldPosition, powerOnSound.Volume, powerOnSound.Range, item.CurrentHull);                    
                     powerOnSoundPlayed = true;
                 }
             }

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs

@@ -219,7 +219,7 @@ namespace Barotrauma.Items.Components
                 if (voltage > 0.1f && sparkSounds.Count > 0) 
                 {
                     var sparkSound = sparkSounds[Rand.Int(sparkSounds.Count)];
-                    SoundPlayer.PlaySound(sparkSound.Sound, sparkSound.Volume, sparkSound.Range, item.WorldPosition, item.CurrentHull);
+                    SoundPlayer.PlaySound(sparkSound.Sound, item.WorldPosition, sparkSound.Volume, sparkSound.Range, item.CurrentHull);
                 }
 #endif
                 lightBrightness = 0.0f;