(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -442,7 +442,8 @@ namespace Barotrauma
                 if (draggingItemToWorld)
                 {
                     if (item.OwnInventory == null || 
-                        !item.OwnInventory.CanBePut(CharacterInventory.draggingItem))
+                        !item.OwnInventory.CanBePut(CharacterInventory.draggingItem) ||
+                        !CanAccessInventory(item.OwnInventory))
                     {
                         continue;
                     }

Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs

@@ -139,7 +139,7 @@ namespace Barotrauma
                 foreach (Item item in Item.ItemList)
                 {
                     if (!item.Repairables.Any(r => item.Condition < r.ShowRepairUIThreshold)) { continue; }
-                    if (!Submarine.VisibleEntities.Contains(item)) { continue; }
+                    if (Submarine.VisibleEntities != null && !Submarine.VisibleEntities.Contains(item)) { continue; }
 
                     Vector2 diff = item.WorldPosition - character.WorldPosition;
                     if (Submarine.CheckVisibility(character.SimPosition, character.SimPosition + ConvertUnits.ToSimUnits(diff)) == null)
@@ -216,7 +216,7 @@ namespace Barotrauma
                             Color.LightGreen, Color.Black, 2, GUI.SmallFont);
                         textPos.Y += offset.Y;
                     }
-                    if (character.FocusedCharacter.CharacterHealth.UseHealthWindow)
+                    if (character.FocusedCharacter.CharacterHealth.UseHealthWindow && character.CanInteractWith(character.FocusedCharacter, 160f, false))
                     {
                         GUI.DrawString(spriteBatch, textPos, GetCachedHudText("HealHint", GameMain.Config.KeyBind(InputType.Health).ToString()),
                             Color.LightGreen, Color.Black, 2, GUI.SmallFont);

Barotrauma/BarotraumaClient/Source/Characters/Limb.cs

@@ -449,12 +449,11 @@ namespace Barotrauma
             {
                 float depth = ActiveSprite.Depth - 0.0000015f;
 
-                // TODO: enable when the damage overlay textures have been remade.
-                //DamagedSprite.Draw(spriteBatch,
-                //    new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
-                //    color * Math.Min(damageOverlayStrength, 1.0f), ActiveSprite.Origin,
-                //    -body.DrawRotation,
-                //    1.0f, spriteEffect, depth);
+                DamagedSprite.Draw(spriteBatch,
+                    new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
+                    color * Math.Min(damageOverlayStrength, 1.0f), ActiveSprite.Origin,
+                    -body.DrawRotation,
+                    1.0f, spriteEffect, depth);
             }
 
             if (GameMain.DebugDraw)