5202af9...3ea33fb

Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs

@@ -24,9 +24,6 @@ namespace Barotrauma.Items.Components
         private bool createdNewGap;
         private bool autoOrientGap;
 
-        private bool createdNewGap;
-        private bool autoOrientGap;
-
         private bool isStuck;
         private float resetPredictionTimer;
 

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

@@ -252,10 +252,6 @@ namespace Barotrauma.Items.Components
         }
     
 
-        partial void FixStructureProjSpecific(Character user, float deltaTime, Structure targetStructure, int sectionIndex);
-        partial void FixCharacterProjSpecific(Character user, float deltaTime, Character targetCharacter);
-        partial void FixItemProjSpecific(Character user, float deltaTime, Item targetItem, float prevCondition);
-
         partial void FixStructureProjSpecific(Character user, float deltaTime, Structure targetStructure, int sectionIndex);
         partial void FixCharacterProjSpecific(Character user, float deltaTime, Character targetCharacter);
         partial void FixItemProjSpecific(Character user, float deltaTime, Item targetItem, float prevCondition);

Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs

@@ -187,6 +187,24 @@ namespace Barotrauma.Items.Components
             return base.Select(character);
         }
 
+        public override bool Select(Character character)
+        {
+            if (item.Container != null) { return false; }
+
+            if (AutoInteractWithContained)
+            {
+                foreach (Item contained in Inventory.Items)
+                {
+                    if (contained == null) continue;
+                    if (contained.TryInteract(character))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return base.Select(character);
+        }
+
         public override bool Pick(Character picker)
         {
             if (AutoInteractWithContained)

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

@@ -105,6 +105,8 @@ namespace Barotrauma.Items.Components
                     progressTimer = 0.0f;
                 }
             }
+
+            voltage -= deltaTime * 10.0f;
         }
 
         private void PutItemsToLinkedContainer()
@@ -162,8 +164,6 @@ namespace Barotrauma.Items.Components
 
             if (!IsActive) { progressState = 0.0f; }
 
-            if (!IsActive) { progressState = 0.0f; }
-
 #if CLIENT
             if (!IsActive)
             {

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

@@ -493,7 +493,6 @@ namespace Barotrauma.Items.Components
                         AutoTemp = false;
                         unsentChanges = true;
                         UpdateAutoTemp(2.0f + degreeOfSuccess * 5.0f, 1.0f);
-
                     }
 #if CLIENT
                     onOffSwitch.BarScroll = 0.0f;
@@ -505,6 +504,11 @@ namespace Barotrauma.Items.Components
 #if CLIENT
                     onOffSwitch.BarScroll = 1.0f;
 #endif
+                    if (AutoTemp || !shutDown || targetFissionRate > 0.0f || targetTurbineOutput > 0.0f)
+                    {
+                        unsentChanges = true;
+                    }
+
                     AutoTemp = false;
                     shutDown = true;
                     targetFissionRate = 0.0f;

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

@@ -32,11 +32,6 @@ namespace Barotrauma.Items.Components
         //a list of powered devices connected directly to this item
         private readonly List<Pair<Powered, Connection>> directlyConnected = new List<Pair<Powered, Connection>>(10);
 
-        //charge indicator description
-        protected Vector2 indicatorPosition, indicatorSize;
-
-        protected bool isHorizontal;
-
         public float CurrPowerOutput
         {
             get;

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

@@ -178,9 +178,6 @@ namespace Barotrauma.Items.Components
                 //items in a bad condition are more sensitive to overvoltage
                 float maxOverVoltage = MathHelper.Lerp(Math.Min(OverloadVoltage, 1.0f), OverloadVoltage, item.Condition / item.Prefab.Health);
 
-                //items in a bad condition are more sensitive to overvoltage
-                float maxOverVoltage = MathHelper.Lerp(Math.Min(OverloadVoltage, 1.0f), OverloadVoltage, item.Condition / 100.0f);
-
                 //if the item can't be fixed, don't allow it to break
                 if (!item.Repairables.Any() || !CanBeOverloaded) continue;