Unstable v0.1300.0.0 (February 19th 2021)

Barotrauma/BarotraumaClient/ClientSource/Items/CharacterInventory.cs

@@ -94,8 +94,8 @@ namespace Barotrauma
             get { return personalSlotArea; }
         }
 
-        private GUIImage[] indicators = new GUIImage[5];
-        private int[] indicatorIndexes = new int[5];
+        private readonly GUIImage[] indicators = new GUIImage[5];
+        private readonly int[] indicatorIndices = new int[5];
         private Vector2 indicatorSpriteSize;
         private GUILayoutGroup indicatorGroup;
 
@@ -117,11 +117,11 @@ namespace Barotrauma
             indicators[3] = new GUIImage(new RectTransform(Point.Zero, indicatorGroup.RectTransform), "EquipmentIndicatorHeadwear");
             indicators[4] = new GUIImage(new RectTransform(Point.Zero, indicatorGroup.RectTransform), "EquipmentIndicatorHeadphones");
 
-            indicatorIndexes[0] = FindLimbSlot(InvSlotType.OuterClothes);
-            indicatorIndexes[1] = FindLimbSlot(InvSlotType.Card);
-            indicatorIndexes[2] = FindLimbSlot(InvSlotType.InnerClothes);
-            indicatorIndexes[3] = FindLimbSlot(InvSlotType.Head);
-            indicatorIndexes[4] = FindLimbSlot(InvSlotType.Headset);
+            indicatorIndices[0] = FindLimbSlot(InvSlotType.OuterClothes);
+            indicatorIndices[1] = FindLimbSlot(InvSlotType.Card);
+            indicatorIndices[2] = FindLimbSlot(InvSlotType.InnerClothes);
+            indicatorIndices[3] = FindLimbSlot(InvSlotType.Head);
+            indicatorIndices[4] = FindLimbSlot(InvSlotType.Headset);
 
             for (int i = 0; i < indicators.Length; i++)
             {
@@ -143,7 +143,7 @@ namespace Barotrauma
 
         protected override ItemInventory GetActiveEquippedSubInventory(int slotIndex)
         {
-            var item = Items[slotIndex];
+            Item item = slots[slotIndex].FirstOrDefault();
             if (item == null) { return null; }
 
             var container = item.GetComponent<ItemContainer>();
@@ -162,38 +162,35 @@ namespace Barotrauma
 
         public override void RemoveItem(Item item)
         {
-            if (!Items.Contains(item)) { return; }
+            if (!Contains(item)) { return; }
             base.RemoveItem(item);
             CreateSlots();
         }
 
         public override void CreateSlots()
         {
-            if (slots == null) { slots = new InventorySlot[capacity]; }
+            if (visualSlots == null) { visualSlots = new VisualSlot[capacity]; }
 
             float multiplier = !GUI.IsFourByThree() ? UIScale : UIScale * 0.925f;
             
             for (int i = 0; i < capacity; i++)
             {
-                InventorySlot prevSlot = slots[i];
+                VisualSlot prevSlot = visualSlots[i];
                 
                 Sprite slotSprite = SlotSpriteSmall;
                 Rectangle slotRect = new Rectangle(
-                    (int)(SlotPositions[i].X), 
-                    (int)(SlotPositions[i].Y),
+                    (int)SlotPositions[i].X, 
+                    (int)SlotPositions[i].Y,
                     (int)(slotSprite.size.X * multiplier), (int)(slotSprite.size.Y * multiplier));
-
-                if (Items[i] != null)
+             
+                ItemContainer itemContainer = slots[i].FirstOrDefault()?.GetComponent<ItemContainer>();
+                if (itemContainer != null)
                 {
-                    ItemContainer itemContainer = Items[i].GetComponent<ItemContainer>();
-                    if (itemContainer != null)
-                    {
-                        if (itemContainer.InventoryTopSprite != null) slotRect.Width = Math.Max(slotRect.Width, (int)(itemContainer.InventoryTopSprite.size.X * UIScale));
-                        if (itemContainer.InventoryBottomSprite != null) slotRect.Width = Math.Max(slotRect.Width, (int)(itemContainer.InventoryBottomSprite.size.X * UIScale));
-                    }
-                }
+                    if (itemContainer.InventoryTopSprite != null) slotRect.Width = Math.Max(slotRect.Width, (int)(itemContainer.InventoryTopSprite.size.X * UIScale));
+                    if (itemContainer.InventoryBottomSprite != null) slotRect.Width = Math.Max(slotRect.Width, (int)(itemContainer.InventoryBottomSprite.size.X * UIScale));
+                }                
 
-                slots[i] = new InventorySlot(slotRect)
+                visualSlots[i] = new VisualSlot(slotRect)
                 {
                     SubInventoryDir = Math.Sign(GameMain.GraphicsHeight / 2 - slotRect.Center.Y),
                     Disabled = false,
@@ -202,13 +199,13 @@ namespace Barotrauma
                 };
                 if (prevSlot != null)
                 {
-                    slots[i].DrawOffset = prevSlot.DrawOffset;
-                    slots[i].Color = prevSlot.Color;
+                    visualSlots[i].DrawOffset = prevSlot.DrawOffset;
+                    visualSlots[i].Color = prevSlot.Color;
+                    prevSlot.MoveBorderHighlight(visualSlots[i]);
                 }
-
                 if (selectedSlot?.ParentInventory == this && selectedSlot.SlotIndex == i)
                 {
-                    selectedSlot = new SlotReference(this, slots[i], i, selectedSlot.IsSubSlot, selectedSlot.Inventory);
+                    selectedSlot = new SlotReference(this, visualSlots[i], i, selectedSlot.IsSubSlot, selectedSlot.Inventory);
                 }
             }
 
@@ -217,9 +214,9 @@ namespace Barotrauma
             highlightedSubInventorySlots.RemoveWhere(s => s.Inventory.OpenState <= 0.0f);
             foreach (var subSlot in highlightedSubInventorySlots)
             {
-                if (subSlot.ParentInventory == this && subSlot.SlotIndex > 0 && subSlot.SlotIndex < slots.Length)
+                if (subSlot.ParentInventory == this && subSlot.SlotIndex > 0 && subSlot.SlotIndex < visualSlots.Length)
                 {
-                    subSlot.Slot = slots[subSlot.SlotIndex];
+                    subSlot.Slot = visualSlots[subSlot.SlotIndex];
                 }
             }
 
@@ -235,10 +232,10 @@ namespace Barotrauma
                 if (HideSlot(i)) continue;
                 if (frame == Rectangle.Empty)
                 {
-                    frame = slots[i].Rect;
+                    frame = visualSlots[i].Rect;
                     continue;
                 }
-                frame = Rectangle.Union(frame, slots[i].Rect);
+                frame = Rectangle.Union(frame, visualSlots[i].Rect);
             }
             frame.Inflate(10, 30);
             frame.Location -= new Point(0, 25);
@@ -247,26 +244,25 @@ namespace Barotrauma
 
         protected override bool HideSlot(int i)
         {
-            if (slots[i].Disabled || (hideEmptySlot[i] && Items[i] == null)) return true;
+            if (visualSlots[i].Disabled || (slots[i].HideIfEmpty && slots[i].Empty())) { return true; }
 
             if (layout == Layout.Default)
             {
-                if (PersonalSlots.HasFlag(SlotTypes[i]) && !personalSlotArea.Contains(slots[i].Rect.Center + slots[i].DrawOffset.ToPoint())) return true;
+                if (PersonalSlots.HasFlag(SlotTypes[i]) && !personalSlotArea.Contains(visualSlots[i].Rect.Center + visualSlots[i].DrawOffset.ToPoint())) { return true; }
             }
 
+            Item item = slots[i].FirstOrDefault();
+
             //no need to draw the right hand slot if the item is in both hands
-            if (Items[i] != null && SlotTypes[i] == InvSlotType.RightHand && IsInLimbSlot(Items[i], InvSlotType.LeftHand))
+            if (item != null && SlotTypes[i] == InvSlotType.RightHand && IsInLimbSlot(item, InvSlotType.LeftHand))
             {
                 return true;
             }
 
-            //don't show the equip slot if the item is also in the default inventory
-            if (SlotTypes[i] != InvSlotType.Any && Items[i] != null)
+            //don't show the limb-specific slot if the item is also in an Any slot
+            if (item != null && SlotTypes[i] != InvSlotType.Any)
             {
-                for (int j = 0; j < capacity; j++)
-                {
-                    if (SlotTypes[j] == InvSlotType.Any && Items[j] == Items[i]) return true;
-                }
+                if (IsInLimbSlot(item, InvSlotType.Any)) { return true; }
             }
 
             return false;
@@ -308,7 +304,8 @@ namespace Barotrauma
             SlotSize = !isFourByThree ? (SlotSpriteSmall.size * UIScale).ToPoint() : (SlotSpriteSmall.size * UIScale * .925f).ToPoint();
             int bottomOffset = SlotSize.Y + Spacing * 2 + ContainedIndicatorHeight;
 
-            if (slots == null) { CreateSlots(); }
+            if (visualSlots == null) { CreateSlots(); }
+            if (visualSlots.None()) { return; }
 
             hideButton.Visible = false;
 
@@ -359,7 +356,7 @@ namespace Barotrauma
                     {
                         int x = HUDLayoutSettings.InventoryAreaLower.Right;
                         int personalSlotX = HUDLayoutSettings.InventoryAreaLower.Right - SlotSize.X - Spacing;
-                        for (int i = 0; i < slots.Length; i++)
+                        for (int i = 0; i < visualSlots.Length; i++)
                         {
                             if (HideSlot(i)) continue;
                             if (PersonalSlots.HasFlag(SlotTypes[i]))
@@ -380,12 +377,12 @@ namespace Barotrauma
                             if (PersonalSlots.HasFlag(SlotTypes[i]))
                             {
                                 SlotPositions[i] = new Vector2(personalSlotX, personalSlotY);
-                                personalSlotX -= slots[i].Rect.Width + Spacing;
+                                personalSlotX -= visualSlots[i].Rect.Width + Spacing;
                             }
                             else
                             {
                                 SlotPositions[i] = new Vector2(x, GameMain.GraphicsHeight - bottomOffset);
-                                x += slots[i].Rect.Width + Spacing;
+                                x += visualSlots[i].Rect.Width + Spacing;
                             }
                         }
 
@@ -393,7 +390,7 @@ namespace Barotrauma
                         for (int i = 0; i < SlotPositions.Length; i++)
                         {
                             if (!HideSlot(i)) continue;
-                            x -= slots[i].Rect.Width + Spacing;
+                            x -= visualSlots[i].Rect.Width + Spacing;
                             SlotPositions[i] = new Vector2(x, GameMain.GraphicsHeight - bottomOffset);
                         }
                     }
@@ -410,19 +407,19 @@ namespace Barotrauma
                             if (PersonalSlots.HasFlag(SlotTypes[i]))
                             {
                                 SlotPositions[i] = new Vector2(personalSlotX, personalSlotY);
-                                personalSlotX += slots[i].Rect.Width + Spacing;
+                                personalSlotX += visualSlots[i].Rect.Width + Spacing;
                             }
                             else
                             {
                                 SlotPositions[i] = new Vector2(x, GameMain.GraphicsHeight - bottomOffset);
-                                x += slots[i].Rect.Width + Spacing;
+                                x += visualSlots[i].Rect.Width + Spacing;
                             }
                         }
                         for (int i = 0; i < SlotPositions.Length; i++)
                         {
                             if (!HideSlot(i)) continue;
                             SlotPositions[i] = new Vector2(x, GameMain.GraphicsHeight - bottomOffset);
-                            x += slots[i].Rect.Width + Spacing;
+                            x += visualSlots[i].Rect.Width + Spacing;
                         }
                     }
                     break;
@@ -438,10 +435,10 @@ namespace Barotrauma
                             if (SlotTypes[i] == InvSlotType.Card || SlotTypes[i] == InvSlotType.Headset || SlotTypes[i] == InvSlotType.InnerClothes)
                             {
                                 SlotPositions[i] = new Vector2(x, y);
-                                x += slots[i].Rect.Width + Spacing;
+                                x += visualSlots[i].Rect.Width + Spacing;
                             }
                         }
-                        y += slots[0].Rect.Height + Spacing + ContainedIndicatorHeight + slots[0].EquipButtonRect.Height;
+                        y += visualSlots[0].Rect.Height + Spacing + ContainedIndicatorHeight + visualSlots[0].EquipButtonRect.Height;
                         x = startX;
                         int n = 0;
                         for (int i = 0; i < SlotPositions.Length; i++)
@@ -450,12 +447,12 @@ namespace Barotrauma
                             if (SlotTypes[i] != InvSlotType.Card && SlotTypes[i] != InvSlotType.Headset && SlotTypes[i] != InvSlotType.InnerClothes)
                             {
                                 SlotPositions[i] = new Vector2(x, y);
-                                x += slots[i].Rect.Width + Spacing;
+                                x += visualSlots[i].Rect.Width + Spacing;
                                 n++;
                                 if (n >= columns)
                                 {
                                     x = startX;
-                                    y += slots[i].Rect.Height + Spacing + ContainedIndicatorHeight + slots[i].EquipButtonRect.Height;
+                                    y += visualSlots[i].Rect.Height + Spacing + ContainedIndicatorHeight + visualSlots[i].EquipButtonRect.Height;
                                     n = 0;
                                 }
                             }
@@ -467,7 +464,7 @@ namespace Barotrauma
             CreateSlots();
             if (layout == Layout.Default)
             {
-                HUDLayoutSettings.InventoryTopY = slots[0].EquipButtonRect.Y - (int)(15 * GUI.Scale);
+                HUDLayoutSettings.InventoryTopY = visualSlots[0].EquipButtonRect.Y - (int)(15 * GUI.Scale);
             }
 
         }
@@ -484,7 +481,8 @@ namespace Barotrauma
 
         public override void Update(float deltaTime, Camera cam, bool isSubInventory = false)
         {
-            if (!AccessibleWhenAlive && !character.IsDead)
+            // Need to update the infiltrator's inventory because they use id cards to access the sub. TODO: We don't probably need to update everything.
+            if (!AccessibleWhenAlive && !character.IsDead && (character.Params.AI == null || !character.Params.AI.Infiltrate))
             {
                 syncItemsDelay = Math.Max(syncItemsDelay - deltaTime, 0.0f);
                 return;
@@ -493,7 +491,7 @@ namespace Barotrauma
             base.Update(deltaTime, cam);
 
             bool hoverOnInventory = GUI.MouseOn == null &&
-                ((selectedSlot != null && selectedSlot.IsSubSlot) || (draggingItem != null && (draggingSlot == null || !draggingSlot.MouseOn())));
+                ((selectedSlot != null && selectedSlot.IsSubSlot) || (DraggingItems.Any() && (DraggingSlot == null || !DraggingSlot.MouseOn())));
             if (CharacterHealth.OpenHealthWindow != null) hoverOnInventory = true;
             
             if (layout == Layout.Default && (Screen.Selected != GameMain.SubEditorScreen || Screen.Selected is SubEditorScreen editor && editor.WiringMode))
@@ -508,16 +506,16 @@ namespace Barotrauma
                         Math.Max(hidePersonalSlotsState -  deltaTime * 5.0f, 0.0f);
 
                     bool personalSlotsMoving = hidePersonalSlotsState > 0 && hidePersonalSlotsState < 1f;
-                    for (int i = 0; i < slots.Length; i++)
+                    for (int i = 0; i < visualSlots.Length; i++)
                     {
                         if (!PersonalSlots.HasFlag(SlotTypes[i])) { continue; }
                         if (HidePersonalSlots)
                         {
-                            if (selectedSlot?.Slot == slots[i]) { selectedSlot = null; }
-                            highlightedSubInventorySlots.RemoveWhere(s => s.Slot == slots[i]);
+                            if (selectedSlot?.Slot == visualSlots[i]) { selectedSlot = null; }
+                            highlightedSubInventorySlots.RemoveWhere(s => s.Slot == visualSlots[i]);
                         }
-                        slots[i].IsMoving = personalSlotsMoving;
-                        slots[i].DrawOffset = Vector2.Lerp(Vector2.Zero, new Vector2(personalSlotArea.Width, 0.0f), hidePersonalSlotsState);
+                        visualSlots[i].IsMoving = personalSlotsMoving;
+                        visualSlots[i].DrawOffset = Vector2.Lerp(Vector2.Zero, new Vector2(personalSlotArea.Width, 0.0f), hidePersonalSlotsState);
                     }
                 }
             }
@@ -530,13 +528,15 @@ namespace Barotrauma
             //force personal slots open if an item is running out of battery/fuel/oxygen/etc
             if (hidePersonalSlots)
             {
-                for (int i = 0; i < slots.Length; i++)
+                for (int i = 0; i < visualSlots.Length; i++)
                 {
-                    if (Items[i]?.OwnInventory != null && Items[i].OwnInventory.Capacity == 1 && PersonalSlots.HasFlag(SlotTypes[i]))
+                    var item = slots[i].FirstOrDefault();
+                    if (item?.OwnInventory != null && item.OwnInventory.Capacity == 1 && PersonalSlots.HasFlag(SlotTypes[i]))
                     {
-                        if (Items[i].OwnInventory.Items[0] != null &&
-                            Items[i].OwnInventory.Items[0].Condition > 0.0f &&
-                            Items[i].OwnInventory.Items[0].Condition / Items[i].OwnInventory.Items[0].MaxCondition < 0.15f)
+                        var containedItem = item.OwnInventory.AllItems.FirstOrDefault();
+                        if (containedItem != null &&
+                            containedItem.Condition > 0.0f &&
+                            containedItem.Condition / containedItem.MaxCondition < 0.15f)
                         {
                             hidePersonalSlots = false;
                         }
@@ -547,7 +547,7 @@ namespace Barotrauma
             List<SlotReference> hideSubInventories = new List<SlotReference>();
             highlightedSubInventorySlots.RemoveWhere(s => 
                 s.ParentInventory == this &&
-                ((s.SlotIndex < 0 || s.SlotIndex >= Items.Length || Items[s.SlotIndex] == null) || (Character.Controlled != null && !Character.Controlled.CanAccessInventory(s.Inventory))));
+                ((s.SlotIndex < 0 || s.SlotIndex >= slots.Length || slots[s.SlotIndex] == null) || (Character.Controlled != null && !Character.Controlled.CanAccessInventory(s.Inventory))));
             foreach (var highlightedSubInventorySlot in highlightedSubInventorySlots)
             {
                 if (highlightedSubInventorySlot.ParentInventory == this)
@@ -558,7 +558,7 @@ namespace Barotrauma
                 if (!highlightedSubInventorySlot.Inventory.IsInventoryHoverAvailable(character, null)) continue;
 
                 Rectangle hoverArea = GetSubInventoryHoverArea(highlightedSubInventorySlot);
-                if (highlightedSubInventorySlot.Inventory?.slots == null || (!hoverArea.Contains(PlayerInput.MousePosition)))
+                if (highlightedSubInventorySlot.Inventory?.visualSlots == null || (!hoverArea.Contains(PlayerInput.MousePosition)))
                 {
                     hideSubInventories.Add(highlightedSubInventorySlot);
                 }
@@ -585,19 +585,19 @@ namespace Barotrauma
             // In sub editor we cannot hover over the slot because they are not rendered so we override it here
             if (Screen.Selected is SubEditorScreen subEditor && !subEditor.WiringMode)
             {
-                for (int i = 0; i < slots.Length; i++)
+                for (int i = 0; i < visualSlots.Length; i++)
                 {
                     var subInventory = GetSubInventory(i);
                     if (subInventory != null)
                     {
-                        ShowSubInventory(new SlotReference(this, slots[i], i, false, Items[i].GetComponent<ItemContainer>().Inventory), deltaTime, cam, hideSubInventories, true);
+                        ShowSubInventory(new SlotReference(this, visualSlots[i], i, false, subInventory), deltaTime, cam, hideSubInventories, true);
                     }
                 }
             }
                        
             foreach (var subInventorySlot in hideSubInventories)
             {
-                if (subInventorySlot.Inventory == null) continue;
+                if (subInventorySlot.Inventory == null) { continue; }
                 subInventorySlot.Inventory.HideTimer -= deltaTime;
                 if (subInventorySlot.Inventory.HideTimer < 0.25f)
                 {
@@ -614,10 +614,10 @@ namespace Barotrauma
 
                 for (int i = 0; i < capacity; i++)
                 {
-                    var item = Items[i];
+                    var item = slots[i].FirstOrDefault();
                     if (item != null)
                     {
-                        if (HideSlot(i)) continue;
+                        if (HideSlot(i)) { continue; }
                         if (character.HasEquippedItem(item)) // Keep a subinventory display open permanently when the container is equipped
                         {
                             var itemContainer = item.GetComponent<ItemContainer>();
@@ -626,24 +626,32 @@ namespace Barotrauma
                                 character.CanAccessInventory(itemContainer.Inventory) &&
                                 !highlightedSubInventorySlots.Any(s => s.Inventory == itemContainer.Inventory))
                             {
-                                ShowSubInventory(new SlotReference(this, slots[i], i, false, itemContainer.Inventory), deltaTime, cam, hideSubInventories, true);
+                                ShowSubInventory(new SlotReference(this, visualSlots[i], i, false, itemContainer.Inventory), deltaTime, cam, hideSubInventories, true);
                             }
                         }
                     }
                 }
             }
 
-            if (doubleClickedItem != null)
+            if (doubleClickedItems.Any())
             {
-                QuickUseItem(doubleClickedItem, true, true, true);
+                var quickUseAction = GetQuickUseAction(doubleClickedItems.First(), true, true, true);
+                foreach (Item doubleClickedItem in doubleClickedItems)
+                {
+                    QuickUseItem(doubleClickedItem, true, true, true, quickUseAction, playSound: doubleClickedItem == doubleClickedItems.First());
+                    if (quickUseAction == QuickUseAction.Equip || quickUseAction == QuickUseAction.UseTreatment || !IsInLimbSlot(doubleClickedItem, InvSlotType.Any))
+                    {
+                        break;
+                    }
+                }
             }
 
             for (int i = 0; i < capacity; i++)
             {
-                var item = Items[i];
+                var item = slots[i].FirstOrDefault();
                 if (item != null)
                 {
-                    var slot = slots[i];
+                    var slot = visualSlots[i];
                     if (item.AllowedSlots.Any(a => a != InvSlotType.Any))
                     {
                         HandleButtonEquipStates(item, slot, deltaTime);
@@ -652,10 +660,10 @@ namespace Barotrauma
             }
 
             //cancel dragging if too far away from the container of the dragged item
-            if (draggingItem != null)
+            if (DraggingItems.Any())
             {
-                var rootContainer = draggingItem.GetRootContainer();
-                var rootInventory = draggingItem.ParentInventory;
+                var rootContainer = DraggingItems.First().GetRootContainer();
+                var rootInventory = DraggingItems.First().ParentInventory;
 
                 if (rootContainer != null)
                 {
@@ -673,27 +681,39 @@ namespace Barotrauma
                         Character.Controlled.SelectedConstruction != null &&
                         rootContainer.linkedTo.Contains(Character.Controlled.SelectedConstruction)))
                     {
-                        draggingItem = null;
+                        DraggingItems.Clear();
                     }
                 }
             }
-
-            doubleClickedItem = null;
+            doubleClickedItems.Clear();
         }
 
         public void UpdateSlotInput()
         {
             for (int i = 0; i < capacity; i++)
             {
-                if (Items[i] != null && Items[i] != draggingItem && Character.Controlled?.Inventory == this &&
-                    GUI.KeyboardDispatcher.Subscriber == null && !CrewManager.IsCommandInterfaceOpen && PlayerInput.InventoryKeyHit(slots[i].InventoryKeyIndex))
+                var firstItem = slots[i].FirstOrDefault();
+                if (firstItem != null && !DraggingItems.Contains(firstItem) && Character.Controlled?.Inventory == this &&
+                    GUI.KeyboardDispatcher.Subscriber == null && !CrewManager.IsCommandInterfaceOpen && PlayerInput.InventoryKeyHit(visualSlots[i].InventoryKeyIndex))
                 {
-                    QuickUseItem(Items[i], true, false, true);
+#if LINUX
+                    // some window managers on Linux use windows key + number to change workspaces or perform other actions
+                    if (PlayerInput.KeyDown(Keys.RightWindows) || PlayerInput.KeyDown(Keys.LeftWindows)) { continue; }
+#endif
+                    var quickUseAction = GetQuickUseAction(firstItem, true, false, true);
+                    foreach (Item itemToUse in slots[i].Items.ToList())
+                    {
+                        QuickUseItem(itemToUse, true, true, true, quickUseAction, playSound: itemToUse == firstItem);
+                        if (quickUseAction == QuickUseAction.Equip || quickUseAction == QuickUseAction.UseTreatment)
+                        {
+                            break;
+                        }
+                    }
                 }
             }
         }
 
-        private void HandleButtonEquipStates(Item item, InventorySlot slot, float deltaTime)
+        private void HandleButtonEquipStates(Item item, VisualSlot slot, float deltaTime)
         {
             slot.EquipButtonState = slot.EquipButtonRect.Contains(PlayerInput.MousePosition) ?
                         GUIComponent.ComponentState.Hover : GUIComponent.ComponentState.None;
@@ -713,7 +733,7 @@ namespace Barotrauma
             if (quickUseAction != QuickUseAction.Drop)
             {
                 slot.QuickUseButtonToolTip = quickUseAction == QuickUseAction.None ?
-                "" : TextManager.GetWithVariable("QuickUseAction." + quickUseAction.ToString(), "[equippeditem]", character.SelectedItems.FirstOrDefault(i => i != null)?.Name);
+                    "" : TextManager.GetWithVariable("QuickUseAction." + quickUseAction.ToString(), "[equippeditem]", item?.Name);
                 if (PlayerInput.PrimaryMouseButtonDown()) { slot.EquipButtonState = GUIComponent.ComponentState.Pressed; }
                 if (PlayerInput.PrimaryMouseButtonClicked())
                 {
@@ -726,8 +746,8 @@ namespace Barotrauma
         {
             for (int i = 0; i < indicators.Length; i++)
             {
-                if (indicatorIndexes[i] < 0) { continue; }
-                Item item = Items[indicatorIndexes[i]];
+                if (indicatorIndices[i] < 0) { continue; }
+                Item item = slots[indicatorIndices[i]].FirstOrDefault();
                 if (item != null)
                 {
                     Wearable wearable = item.GetComponent<Wearable>();
@@ -795,12 +815,12 @@ namespace Barotrauma
         public void AssignQuickUseNumKeys()
         {
             int keyBindIndex = 0;
-            for (int i = 0; i < slots.Length; i++)
+            for (int i = 0; i < visualSlots.Length; i++)
             {
                 if (HideSlot(i)) continue;
                 if (SlotTypes[i] == InvSlotType.Any)
                 {
-                    slots[i].InventoryKeyIndex = keyBindIndex;
+                    visualSlots[i].InventoryKeyIndex = keyBindIndex;
                     keyBindIndex++;
                 }
             }
@@ -824,7 +844,7 @@ namespace Barotrauma
                 {
                     if (item.Container == null || character.Inventory.FindIndex(item.Container) == -1) // Not a subinventory in the character's inventory
                     {
-                        if (character.SelectedItems.Any(i => i?.OwnInventory != null && i.OwnInventory.CanBePut(item)))
+                        if (character.HeldItems.Any(i => i.OwnInventory != null && i.OwnInventory.CanBePut(item)))
                         {
                             return QuickUseAction.PutToEquippedItem;
                         }
@@ -875,7 +895,7 @@ namespace Barotrauma
                 {
                     return QuickUseAction.TakeFromCharacter;
                 }
-                else if (character.SelectedItems.Any(i => i?.OwnInventory != null && i.OwnInventory.CanBePut(item)) && allowInventorySwap)
+                else if (character.HeldItems.Any(i => i.OwnInventory != null && i.OwnInventory.CanBePut(item)) && allowInventorySwap)
                 {
                     return QuickUseAction.PutToEquippedItem;
                 }
@@ -901,23 +921,20 @@ namespace Barotrauma
             return QuickUseAction.None;
         }
 
-        private void QuickUseItem(Item item, bool allowEquip, bool allowInventorySwap, bool allowApplyTreatment)
+        private void QuickUseItem(Item item, bool allowEquip, bool allowInventorySwap, bool allowApplyTreatment, QuickUseAction? action = null, bool playSound = true)
         {
             if (Screen.Selected is SubEditorScreen editor && !editor.WiringMode && !Submarine.Unloading)
             {
                 // Find the slot the item was contained in and flash it
-                if (item.ParentInventory?.slots != null)
+                if (item.ParentInventory?.visualSlots != null)
                 {
-                    var invSlots = item.ParentInventory.slots;
-                    var invItems = item.ParentInventory.Items;
+                    var invSlots = item.ParentInventory.visualSlots;
                     for (int i = 0; i < invSlots.Length; i++)
                     {
-                        if (i < 0 || invSlots.Length <= i || i < 0 || invItems.Length <= i) { break; }
+                        if (i < 0 || invSlots.Length <= i || i < 0 || item.ParentInventory.Capacity <= i) { break; }
                         
                         var slot = invSlots[i];
-                        var slotItem = invItems[i];
-                        
-                        if (slotItem == item)
+                        if (item.ParentInventory.GetItemAt(i) == item)
                         {
                             slot.ShowBorderHighlight(GUI.Style.Red, 0.1f, 0.4f);
                             SoundPlayer.PlayUISound(GUISoundType.PickItem);
@@ -931,8 +948,8 @@ namespace Barotrauma
                 item.Remove();
                 return;
             }
-            
-            var quickUseAction = GetQuickUseAction(item, allowEquip, allowInventorySwap, allowApplyTreatment);
+
+            QuickUseAction quickUseAction = action ?? GetQuickUseAction(item, allowEquip, allowInventorySwap, allowApplyTreatment);
             bool success = false;
             switch (quickUseAction)
             {
@@ -963,7 +980,7 @@ namespace Barotrauma
                         //attempt to put in a free slot first
                         for (int i = capacity - 1; i >= 0; i--)
                         {
-                            if (Items[i] != null) { continue; }
+                            if (!slots[i].Empty()) { continue; }
                             if (SlotTypes[i] == InvSlotType.Any || !item.AllowedSlots.Any(a => a.HasFlag(SlotTypes[i]))) { continue; }
                             success = TryPutItem(item, i, true, false, Character.Controlled, true);
                             if (success) { break; }
@@ -975,9 +992,10 @@ namespace Barotrauma
                             {
                                 if (SlotTypes[i] == InvSlotType.Any || !item.AllowedSlots.Any(a => a.HasFlag(SlotTypes[i]))) { continue; }
                                 // something else already equipped in a hand slot, attempt to unequip it so items aren't unnecessarily swapped to it
-                                if (Items[i] != null && Items[i].AllowedSlots.Contains(InvSlotType.Any) && (SlotTypes[i] == InvSlotType.LeftHand || SlotTypes[i] == InvSlotType.RightHand))
+                                if (!slots[i].Empty() && slots[i].First().AllowedSlots.Contains(InvSlotType.Any) && 
+                                    (SlotTypes[i] == InvSlotType.LeftHand || SlotTypes[i] == InvSlotType.RightHand))
                                 {
-                                    TryPutItem(Items[i], Character.Controlled, new List<InvSlotType>() { InvSlotType.Any }, true);
+                                    TryPutItem(slots[i].First(), Character.Controlled, new List<InvSlotType>() { InvSlotType.Any }, true);
                                 }
                                 success = TryPutItem(item, i, true, false, Character.Controlled, true);
                                 if (success) { break; }
@@ -1040,15 +1058,15 @@ namespace Barotrauma
                     }
                     break;
                 case QuickUseAction.PutToEquippedItem:
-                    for (int i = 0; i < character.SelectedItems.Length; i++)
+                    foreach (Item heldItem in character.HeldItems)
                     {
-                        if (character.SelectedItems[i]?.OwnInventory != null && 
-                            character.SelectedItems[i].OwnInventory.TryPutItem(item, Character.Controlled))
+                        if (heldItem.OwnInventory != null &&
+                            heldItem.OwnInventory.TryPutItem(item, Character.Controlled))
                         {
                             success = true;
                             for (int j = 0; j < capacity; j++)
                             {
-                                if (Items[j] == character.SelectedItems[i]) slots[j].ShowBorderHighlight(GUI.Style.Green, 0.1f, 0.4f);
+                                if (slots[j].Contains(heldItem)) { visualSlots[j].ShowBorderHighlight(GUI.Style.Green, 0.1f, 0.4f); }
                             }
                             break;
                         }
@@ -1060,18 +1078,21 @@ namespace Barotrauma
             {
                 for (int i = 0; i < capacity; i++)
                 {
-                    if (Items[i] == item) slots[i].ShowBorderHighlight(GUI.Style.Green, 0.1f, 0.4f);
+                    if (slots[i].Contains(item)) { visualSlots[i].ShowBorderHighlight(GUI.Style.Green, 0.1f, 0.4f); }
                 }
             }
 
-            draggingItem = null;
-            SoundPlayer.PlayUISound(success ? GUISoundType.PickItem : GUISoundType.PickItemFail);
+            DraggingItems.Clear();
+            if (playSound)
+            {
+                SoundPlayer.PlayUISound(success ? GUISoundType.PickItem : GUISoundType.PickItemFail);
+            }
         }
         
         public void DrawOwn(SpriteBatch spriteBatch)
         {
             if (!AccessibleWhenAlive && !character.IsDead) { return; }
-            if (slots == null) { CreateSlots(); }
+            if (visualSlots == null) { CreateSlots(); }
             if (GameMain.GraphicsWidth != screenResolution.X ||
                 GameMain.GraphicsHeight != screenResolution.Y ||
                 prevUIScale != UIScale ||
@@ -1096,12 +1117,10 @@ namespace Barotrauma
             {
                 if (HideSlot(i)) { continue; }
 
-                Rectangle interactRect = slots[i].InteractRect;
-                interactRect.Location += slots[i].DrawOffset.ToPoint();
-
                 //don't draw the item if it's being dragged out of the slot
-                bool drawItem = draggingItem == null || draggingItem != Items[i] || interactRect.Contains(PlayerInput.MousePosition);
-                DrawSlot(spriteBatch, this, slots[i], Items[i], i, drawItem, SlotTypes[i]);
+                bool drawItem = !DraggingItems.Any() || !slots[i].Items.All(it => DraggingItems.Contains(it)) || visualSlots[i].MouseOn();
+
+                DrawSlot(spriteBatch, this, visualSlots[i], slots[i].FirstOrDefault(), i, drawItem, SlotTypes[i]);
             }
 
             if (hideButton != null && hideButton.Visible && !Locked)
@@ -1109,48 +1128,48 @@ namespace Barotrauma
                 hideButton.DrawManually(spriteBatch, alsoChildren: true);
             }
             
-            InventorySlot highlightedQuickUseSlot = null;
+            VisualSlot highlightedQuickUseSlot = null;
             Rectangle inventoryArea = Rectangle.Empty;
 
             for (int i = 0; i < capacity; i++)
             {
                 if (HideSlot(i)) { continue; }
 
-                inventoryArea = inventoryArea == Rectangle.Empty ? slots[i].InteractRect : Rectangle.Union(inventoryArea, slots[i].InteractRect);
+                inventoryArea = inventoryArea == Rectangle.Empty ? visualSlots[i].InteractRect : Rectangle.Union(inventoryArea, visualSlots[i].InteractRect);
 
-                if (Items[i] == null || 
-                    (draggingItem == Items[i] && !slots[i].InteractRect.Contains(PlayerInput.MousePosition)) || 
-                    !Items[i].AllowedSlots.Any(a => a != InvSlotType.Any))
+                if (slots[i].Empty() || 
+                    (DraggingItems.Any(it => slots[i].Contains(it)) && !visualSlots[i].InteractRect.Contains(PlayerInput.MousePosition)) || 
+                    !slots[i].First().AllowedSlots.Any(a => a != InvSlotType.Any))
                 {
                     //draw limb icons on empty slots
                     if (LimbSlotIcons.ContainsKey(SlotTypes[i]))
                     {
                         var icon = LimbSlotIcons[SlotTypes[i]];
-                        icon.Draw(spriteBatch, slots[i].Rect.Center.ToVector2() + slots[i].DrawOffset, GUI.Style.EquipmentSlotIconColor, origin: icon.size / 2, scale: slots[i].Rect.Width / icon.size.X);
+                        icon.Draw(spriteBatch, visualSlots[i].Rect.Center.ToVector2() + visualSlots[i].DrawOffset, GUI.Style.EquipmentSlotIconColor, origin: icon.size / 2, scale: visualSlots[i].Rect.Width / icon.size.X);
                     }
                     continue;
                 }
-                if (draggingItem == Items[i] && !slots[i].IsHighlighted) { continue; }
+                if (DraggingItems.Any(it => slots[i].Contains(it)) && !visualSlots[i].IsHighlighted) { continue; }
                 
                 //draw hand icons if the item is equipped in a hand slot
-                if (IsInLimbSlot(Items[i], InvSlotType.LeftHand))
+                if (IsInLimbSlot(slots[i].First(), InvSlotType.LeftHand))
                 {
                     var icon = LimbSlotIcons[InvSlotType.LeftHand];
-                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.X, slots[i].Rect.Bottom) + slots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.35f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
+                    icon.Draw(spriteBatch, new Vector2(visualSlots[i].Rect.X, visualSlots[i].Rect.Bottom) + visualSlots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.35f, icon.size.Y * 0.75f), scale: visualSlots[i].Rect.Width / icon.size.X * 0.7f);
                 }
-                if (IsInLimbSlot(Items[i], InvSlotType.RightHand))
+                if (IsInLimbSlot(slots[i].First(), InvSlotType.RightHand))
                 {
                     var icon = LimbSlotIcons[InvSlotType.RightHand];
-                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.Right, slots[i].Rect.Bottom) + slots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.65f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
+                    icon.Draw(spriteBatch, new Vector2(visualSlots[i].Rect.Right, visualSlots[i].Rect.Bottom) + visualSlots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.65f, icon.size.Y * 0.75f), scale: visualSlots[i].Rect.Width / icon.size.X * 0.7f);
                 }
 
-                GUIComponent.ComponentState state = slots[i].EquipButtonState;
+                GUIComponent.ComponentState state = visualSlots[i].EquipButtonState;
                 if (state == GUIComponent.ComponentState.Hover)
                 {       
-                    highlightedQuickUseSlot = slots[i];
+                    highlightedQuickUseSlot = visualSlots[i];
                 }
 
-                if (!Items[i].AllowedSlots.Any(a => a == InvSlotType.Any))
+                if (!slots[i].First().AllowedSlots.Any(a => a == InvSlotType.Any))
                 {
                     continue;
                 }
@@ -1161,20 +1180,20 @@ namespace Barotrauma
                     color *= 0.5f; 
                 }
 
-                if (character.HasEquippedItem(Items[i]))
+                if (character.HasEquippedItem(slots[i].First()))
                 {
                     switch (state)
                     {
                         case GUIComponent.ComponentState.None:
-                            EquippedIndicator.Draw(spriteBatch, slots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
+                            EquippedIndicator.Draw(spriteBatch, visualSlots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
                             break;
                         case GUIComponent.ComponentState.Hover:
-                            EquippedHoverIndicator.Draw(spriteBatch, slots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
+                            EquippedHoverIndicator.Draw(spriteBatch, visualSlots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
                             break;
                         case GUIComponent.ComponentState.Pressed:
                         case GUIComponent.ComponentState.Selected:
                         case GUIComponent.ComponentState.HoverSelected:
-                            EquippedClickedIndicator.Draw(spriteBatch, slots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
+                            EquippedClickedIndicator.Draw(spriteBatch, visualSlots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
                             break;
                     }
                 }
@@ -1183,15 +1202,15 @@ namespace Barotrauma
                     switch (state)
                     {
                         case GUIComponent.ComponentState.None:
-                            UnequippedIndicator.Draw(spriteBatch, slots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
+                            UnequippedIndicator.Draw(spriteBatch, visualSlots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
                             break;
                         case GUIComponent.ComponentState.Hover:
-                            UnequippedHoverIndicator.Draw(spriteBatch, slots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
+                            UnequippedHoverIndicator.Draw(spriteBatch, visualSlots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
                             break;
                         case GUIComponent.ComponentState.Pressed:
                         case GUIComponent.ComponentState.Selected:
                         case GUIComponent.ComponentState.HoverSelected:
-                            UnequippedClickedIndicator.Draw(spriteBatch, slots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
+                            UnequippedClickedIndicator.Draw(spriteBatch, visualSlots[i].EquipButtonRect.Center.ToVector2(), color, EquippedIndicator.Origin, 0, UIScale * IndicatorScaleAdjustment);
                             break;
                     }
                 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Growable.cs

@@ -86,12 +86,12 @@ namespace Barotrauma.Items.Components
 
             float scale = VineScale * vine.VineStep;
 
-            if (VineAtlas != null)
+            if (VineAtlas != null && VineAtlas.Loaded)
             {
                 spriteBatch.Draw(VineAtlas.Texture, pos + vine.offset, vineSprite.SourceRect, color, 0f, vineSprite.AbsoluteOrigin, scale, SpriteEffects.None, layer3);
             }
 
-            if (DecayAtlas != null)
+            if (DecayAtlas != null && DecayAtlas.Loaded)
             {
                 spriteBatch.Draw(DecayAtlas.Texture, pos, vineSprite.SourceRect, vine.HealthColor, 0f, vineSprite.AbsoluteOrigin, scale, SpriteEffects.None, layer2);
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/Holdable.cs

@@ -2,9 +2,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Items.Components
 {
@@ -17,7 +14,11 @@ namespace Barotrauma.Items.Components
 
         public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1)
         {
-            if (!IsActive || picker == null || !CanBeAttached(picker) || !picker.IsKeyDown(InputType.Aim) || picker != Character.Controlled) { return; }
+            if (!IsActive || picker == null || !CanBeAttached(picker) || !picker.IsKeyDown(InputType.Aim) || picker != Character.Controlled)
+            {
+                Drawable = false;
+                return;
+            }
 
             Vector2 gridPos = picker.Position;
             Vector2 roundedGridPos = new Vector2(
@@ -46,7 +47,7 @@ namespace Barotrauma.Items.Components
                 attachPos += item.Submarine.Position;
             }
 
-            Submarine.DrawGrid(spriteBatch, 14, gridPos, roundedGridPos, alpha: 0.7f);
+            Submarine.DrawGrid(spriteBatch, 14, gridPos, roundedGridPos, alpha: 0.4f);
 
             item.Sprite.Draw(
                 spriteBatch,

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/Sprayer.cs

@@ -55,13 +55,8 @@ namespace Barotrauma.Items.Components
         {
             if (character == null || !character.IsKeyDown(InputType.Aim)) return;
 
-#if DEBUG
             if (PlayerInput.KeyHit(InputType.PreviousFireMode))
-#else
-            if (PlayerInput.MouseWheelDownClicked())
-#endif
             {
-
                 if (spraySetting > 0)
                 {
                     spraySetting--;
@@ -74,11 +69,7 @@ namespace Barotrauma.Items.Components
                 targetSections.Clear();
             }
 
-#if DEBUG
             if (PlayerInput.KeyHit(InputType.NextFireMode))
-#else
-            if (PlayerInput.MouseWheelUpClicked())
-#endif
             {
                 if (spraySetting < 2)
                 {
@@ -139,7 +130,7 @@ namespace Barotrauma.Items.Components
                 if (body.UserData is Item item)
                 {
                     var door = item.GetComponent<Door>();
-                    if (door != null && door.IsOpen || door.IsBroken) continue;
+                    if (door != null && door.CanBeTraversed) { continue; }
                 }
 
                 targetHull = null;
@@ -248,7 +239,7 @@ namespace Barotrauma.Items.Components
         {
             if (targetSections.Count == 0) { return; }
 
-            Item liquidItem = liquidContainer?.Inventory.Items[0];
+            Item liquidItem = liquidContainer?.Inventory.FirstOrDefault();
             if (liquidItem == null) { return; }
 
             bool isCleaning = false;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs

@@ -15,7 +15,8 @@ namespace Barotrauma.Items.Components
         Random,
         CharacterSpecific,
         ItemSpecific,
-        All
+        All,
+        Manual
     }
 
     class ItemSound
@@ -259,6 +260,7 @@ namespace Barotrauma.Items.Components
                     loopingSoundChannel = null;
                     loopingSound = null;
                 }
+
                 if (loopingSoundChannel == null || !loopingSoundChannel.IsPlaying)
                 {
                     loopingSoundChannel = loopingSound.RoundSound.Sound.Play(
@@ -271,6 +273,21 @@ namespace Barotrauma.Items.Components
                     loopingSoundChannel.Near = loopingSound.Range * 0.4f;
                     loopingSoundChannel.Far = loopingSound.Range;
                 }
+
+                // Looping sound with manual selection mode should be changed if value of ManuallySelectedSound has changed
+                // Otherwise the sound won't change until the sound condition (such as being active) is disabled and re-enabled
+                if (loopingSoundChannel != null && loopingSoundChannel.IsPlaying && soundSelectionModes[type] == SoundSelectionMode.Manual)
+                {
+                    var playingIndex = sounds[type].IndexOf(loopingSound);
+                    var shouldBePlayingIndex = Math.Clamp(ManuallySelectedSound, 0, sounds[type].Count);
+                    if (playingIndex != shouldBePlayingIndex)
+                    {
+                        loopingSoundChannel.FadeOutAndDispose();
+                        loopingSoundChannel = null;
+                        loopingSound = null;
+                    }
+                }
+
                 return;
             }
 
@@ -295,6 +312,10 @@ namespace Barotrauma.Items.Components
                     }
                     return;
                 }
+                else if (soundSelectionMode == SoundSelectionMode.Manual)
+                {
+                    index = Math.Clamp(ManuallySelectedSound, 0, matchingSounds.Count);
+                }
                 else
                 {
                     index = Rand.Int(matchingSounds.Count);
@@ -335,7 +356,7 @@ namespace Barotrauma.Items.Components
             {
                 float volume = GetSoundVolume(itemSound);
                 if (volume <= 0.0001f) { return; }
-                var channel = SoundPlayer.PlaySound(itemSound.RoundSound.Sound, position, volume, itemSound.Range, itemSound.RoundSound.GetRandomFrequencyMultiplier(), item.CurrentHull);
+                var channel = SoundPlayer.PlaySound(itemSound.RoundSound.Sound, position, volume, itemSound.Range, itemSound.RoundSound.GetRandomFrequencyMultiplier(), item.CurrentHull, ignoreMuffling: itemSound.RoundSound.IgnoreMuffling);
                 if (channel != null) { playingOneshotSoundChannels.Add(channel); }
             }
         }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Xml.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -32,6 +33,12 @@ namespace Barotrauma.Items.Components
             private set;
         }
 
+        public Sprite ContainedStateIndicatorEmpty
+        {
+            get;
+            private set;
+        }
+
 #if DEBUG
         [Editable]
 #endif
@@ -55,6 +62,11 @@ namespace Barotrauma.Items.Components
         [Serialize(null, false, description: "An optional text displayed above the item's inventory.")]
         public string UILabel { get; set; }
 
+        public GUIComponentStyle IndicatorStyle { get; set; }
+
+        [Serialize(null, false)]
+        public string ContainedStateIndicatorStyle { get; set; }
+
         [Serialize(true, false, description: "Should an indicator displaying the state of the contained items be displayed on this item's inventory slot. "+
             "If this item can only contain one item, the indicator will display the condition of the contained item, otherwise it will indicate how full the item is.")]
         public bool ShowContainedStateIndicator { get; set; }
@@ -98,6 +110,26 @@ namespace Barotrauma.Items.Components
                     case "containedstateindicator":
                         ContainedStateIndicator = new Sprite(subElement);
                         break;
+                    case "containedstateindicatorempty":
+                        ContainedStateIndicatorEmpty = new Sprite(subElement);
+                        break;
+                }
+            }
+
+            if (string.IsNullOrEmpty(ContainedStateIndicatorStyle))
+            {
+                //if neither a style or a custom sprite is defined, use default style
+                if (ContainedStateIndicator == null)
+                {
+                    IndicatorStyle = GUI.Style.GetComponentStyle("ContainedStateIndicator.Default");
+                }
+            }
+            else
+            {
+                IndicatorStyle = GUI.Style.GetComponentStyle("ContainedStateIndicator." + ContainedStateIndicatorStyle);
+                if (ContainedStateIndicator != null || ContainedStateIndicatorEmpty != null)
+                {
+                    DebugConsole.AddWarning($"Item \"{item.Name}\" defines both a contained state indicator style and a custom indicator sprite. Will use the custom sprite...");
                 }
             }
             if (GuiFrame == null)
@@ -147,6 +179,23 @@ namespace Barotrauma.Items.Components
             {
                 CanBeFocused = false
             };
+
+            // Expand the frame vertically if it's too small to fit the text
+            if (label != null && label.RectTransform.RelativeSize.Y > 0.5f)
+            {
+                int newHeight = (int)(GuiFrame.Rect.Height + (2 * (label.RectTransform.RelativeSize.Y - 0.5f) * content.Rect.Height));
+                if (newHeight > GuiFrame.RectTransform.MaxSize.Y)
+                {
+                    Point newMaxSize = GuiFrame.RectTransform.MaxSize;
+                    newMaxSize.Y = newHeight;
+                    GuiFrame.RectTransform.MaxSize = newMaxSize;
+                }
+                GuiFrame.RectTransform.Resize(new Point(GuiFrame.Rect.Width, newHeight));
+                content.RectTransform.Resize(GuiFrame.Rect.Size - GUIStyle.ItemFrameMargin);
+                label.CalculateHeightFromText();
+                guiCustomComponent.RectTransform.Resize(new Vector2(1.0f, Math.Max(1.0f - label.RectTransform.RelativeSize.Y, minInventoryAreaSize)));
+            }
+
             Inventory.RectTransform = guiCustomComponent.RectTransform;
         }
 
@@ -173,15 +222,9 @@ namespace Barotrauma.Items.Components
             }
 
             //if holding 2 different "always open" items in different hands, don't force them to stay open
-            if (character.SelectedItems[0] != null &&
-                character.SelectedItems[1] != null &&
-                character.SelectedItems[0] != character.SelectedItems[1])
+            if (character.HeldItems.Count() > 1 && character.HeldItems.All(it => it.GetComponent<ItemContainer>()?.KeepOpenWhenEquipped ?? false))
             {
-                if ((character.SelectedItems[0].GetComponent<ItemContainer>()?.KeepOpenWhenEquipped ?? false) &&
-                    (character.SelectedItems[1].GetComponent<ItemContainer>()?.KeepOpenWhenEquipped ?? false))
-                {
-                    return false;
-                }
+                return false;
             }
 
             return true;
@@ -257,13 +300,11 @@ namespace Barotrauma.Items.Components
                 spriteEffects |= MathUtils.NearlyEqual(ItemRotation % 180, 90.0f) ? SpriteEffects.FlipHorizontally : SpriteEffects.FlipVertically;
             }
 
-            bool isWiringMode = SubEditorScreen.IsWiringMode();
+            bool isWiringMode = SubEditorScreen.TransparentWiringMode && SubEditorScreen.IsWiringMode();
 
             int i = 0;
-            foreach (Item containedItem in Inventory.Items)
+            foreach (Item containedItem in Inventory.AllItems)
             {
-                if (containedItem == null) continue;
-
                 if (AutoInteractWithContained)
                 {
                     containedItem.IsHighlighted = item.IsHighlighted;
@@ -313,7 +354,7 @@ namespace Barotrauma.Items.Components
 
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
-            if (item.NonInteractable) { return; }
+            if (!item.IsInteractable(character)) { return; }
             if (Inventory.RectTransform != null)
             {
                 guiCustomComponent.RectTransform.Parent = Inventory.RectTransform;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemLabel.cs

@@ -21,11 +21,17 @@ namespace Barotrauma.Items.Components
 
         private float[] charWidths;
 
+        private Vector4 padding;
+
         [Serialize("0,0,0,0", true, description: "The amount of padding around the text in pixels (left,top,right,bottom).")]
         public Vector4 Padding
         {
-            get { return TextBlock.Padding; }
-            set { TextBlock.Padding = value; }
+            get { return padding; }
+            set 
+            {
+                padding = value;
+                TextBlock.Padding = value * item.Scale; 
+            }
         }
 
         private string text;
@@ -41,15 +47,22 @@ namespace Barotrauma.Items.Components
                 {
                     textBlock = null;
                 }
-                
+
                 text = value;
-                DisplayText = TextManager.Get(text, returnNull: true) ?? value;
-                TextBlock.Text = DisplayText;
-                if (Screen.Selected == GameMain.SubEditorScreen && Scrollable)
-                {
-                    TextBlock.Text = ToolBox.LimitString(DisplayText, textBlock.Font, item.Rect.Width);
-                }
-                SetScrollingText();
+                SetDisplayText(value);
+            }
+        }
+
+        private bool ignoreLocalization;
+
+        [Editable, Serialize(false, true, "Whether or not to skip localization and always display the raw value.")]
+        public bool IgnoreLocalization
+        {
+            get => ignoreLocalization;
+            set
+            {
+                ignoreLocalization = value;
+                SetDisplayText(Text);
             }
         }
 
@@ -107,13 +120,7 @@ namespace Barotrauma.Items.Components
             {
                 if (textBlock == null)
                 {
-                    textBlock = new GUITextBlock(new RectTransform(item.Rect.Size), "",
-                        textColor: textColor, font: GUI.UnscaledSmallFont, textAlignment: scrollable ? Alignment.CenterLeft : Alignment.Center, wrap: true, style: null)
-                    {
-                        TextDepth = item.SpriteDepth - 0.00001f,
-                        RoundToNearestPixel = false,
-                        TextScale = TextScale
-                    };
+                    RecreateTextBlock();
                 }
                 return textBlock;
             }
@@ -126,7 +133,7 @@ namespace Barotrauma.Items.Components
 
         private void SetScrollingText()
         {
-            if (!scrollable) return;
+            if (!scrollable) { return; }
 
             float totalWidth = textBlock.Font.MeasureString(DisplayText).X;
             float textAreaWidth = Math.Max(textBlock.Rect.Width - textBlock.Padding.X - textBlock.Padding.Z, 0);
@@ -143,6 +150,7 @@ namespace Barotrauma.Items.Components
                 //whole text can fit in the textblock, no need to scroll
                 needsScrolling = false;
                 scrollingText = DisplayText;
+                scrollPadding = 0;
                 scrollAmount = 0.0f;
                 scrollIndex = 0;
                 return;
@@ -161,16 +169,40 @@ namespace Barotrauma.Items.Components
             scrollIndex = MathHelper.Clamp(scrollIndex, 0, DisplayText.Length);
         }
 
+        private void SetDisplayText(string value)
+        {
+            DisplayText = IgnoreLocalization ? value : TextManager.Get(value, returnNull: true) ?? value;
+            TextBlock.Text = DisplayText;
+            if (Screen.Selected == GameMain.SubEditorScreen && Scrollable)
+            {
+                TextBlock.Text = ToolBox.LimitString(DisplayText, TextBlock.Font, item.Rect.Width);
+            }
+
+            SetScrollingText();
+        }
+
+        private void RecreateTextBlock()
+        {
+            textBlock = new GUITextBlock(new RectTransform(item.Rect.Size), "",
+                textColor: textColor, font: GUI.UnscaledSmallFont, textAlignment: scrollable ? Alignment.CenterLeft : Alignment.Center, wrap: !scrollable, style: null)
+            {
+                TextDepth = item.SpriteDepth - 0.00001f,
+                RoundToNearestPixel = false,
+                TextScale = TextScale,
+                Padding = padding * item.Scale
+            };
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
-            if (!scrollable) return;
+            if (!scrollable) { return; }
 
             if (scrollingText == null)
             {
                 SetScrollingText();
             }
 
-            if (!needsScrolling) return;
+            if (!needsScrolling) { return; }
 
             scrollAmount -= deltaTime * ScrollSpeed;
 
@@ -204,11 +236,33 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            TextBlock.Text = sb.ToString();            
+            TextBlock.Text = sb.ToString();
         }
-                
+
+        public override void OnScaleChanged()
+        {
+            RecreateTextBlock();
+            SetDisplayText(Text);
+            prevScale = item.Scale;
+            prevRect = item.Rect;
+        }
+
+        private float prevScale;
+        private Rectangle prevRect;
+
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
+            if (editing)
+            {
+                if (!MathUtils.NearlyEqual(prevScale, item.Scale) || prevRect != item.Rect)
+                {
+                    RecreateTextBlock();
+                    SetDisplayText(Text);
+                    prevScale = item.Scale;
+                    prevRect = item.Rect;
+                }
+            }
+
             var drawPos = new Vector2(
                 item.DrawPosition.X - item.Rect.Width / 2.0f,
                 -(item.DrawPosition.Y + item.Rect.Height / 2.0f));
@@ -223,7 +277,7 @@ namespace Barotrauma.Items.Components
             }
 
             textBlock.TextDepth = item.SpriteDepth - 0.0001f;
-            textBlock.TextOffset = drawPos - textBlock.Rect.Location.ToVector2() + new Vector2(scrollAmount + scrollPadding, 0.0f);
+            textBlock.TextOffset = drawPos - textBlock.Rect.Location.ToVector2() + (editing ? Vector2.Zero : new Vector2(scrollAmount + scrollPadding, 0.0f));
             textBlock.DrawManually(spriteBatch);
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/LightComponent.cs

@@ -38,12 +38,6 @@ namespace Barotrauma.Items.Components
             light.Color = LightColor.Multiply(brightness);
         }
 
-        public override void OnItemLoaded()
-        {
-            base.OnItemLoaded();
-            SetLightSourceState(IsActive, lightBrightness);
-        }
-
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
             if (light.LightSprite != null && (item.body == null || item.body.Enabled) && lightBrightness > 0.0f && IsOn)
@@ -51,7 +45,7 @@ namespace Barotrauma.Items.Components
                 Vector2 origin = light.LightSprite.Origin;
                 if ((light.LightSpriteEffect & SpriteEffects.FlipHorizontally) == SpriteEffects.FlipHorizontally) { origin.X = light.LightSprite.SourceRect.Width - origin.X; }
                 if ((light.LightSpriteEffect & SpriteEffects.FlipVertically) == SpriteEffects.FlipVertically) { origin.Y = light.LightSprite.SourceRect.Height - origin.Y; }
-                light.LightSprite.Draw(spriteBatch, new Vector2(item.DrawPosition.X, -item.DrawPosition.Y), lightColor * lightBrightness, origin, -light.Rotation, item.Scale, light.LightSpriteEffect, item.SpriteDepth - 0.0001f);
+                light.LightSprite.Draw(spriteBatch, new Vector2(item.DrawPosition.X, -item.DrawPosition.Y), lightColor * lightBrightness, origin, -light.Rotation, item.Scale, light.LightSpriteEffect, itemDepth - 0.0001f);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Deconstructor.cs

@@ -95,11 +95,11 @@ namespace Barotrauma.Items.Components
             // TODO, This works fine as of now but if GUI.PreventElementOverlap ever gets fixed this block of code may become obsolete or detrimental.
             // Only do this if there's only one linked component. If you link more containers then may
             // GUI.PreventElementOverlap have mercy on your HUD layout
-            if (GuiFrame != null && item.linkedTo.Count(entity => entity is Item item && item.DisplaySideBySideWhenLinked) == 1)
+            if (GuiFrame != null && item.linkedTo.Count(entity => entity is Item { DisplaySideBySideWhenLinked: true }) == 1)
             {
                 foreach (MapEntity linkedTo in item.linkedTo)
                 {
-                    if (!(linkedTo is Item linkedItem) || !linkedItem.DisplaySideBySideWhenLinked) { continue; }
+                    if (!(linkedTo is Item { DisplaySideBySideWhenLinked: true } linkedItem)) { continue; }
                     if (!linkedItem.Components.Any()) { continue; }
                 
                     var itemContainer = linkedItem.GetComponent<ItemContainer>();
@@ -108,8 +108,8 @@ namespace Barotrauma.Items.Components
                     // how much spacing do we want between the components
                     var padding = (int) (8 * GUI.Scale);
                     // Move the linked container to the right and move the deconstructor to the left
-                    itemContainer.GuiFrame.RectTransform.AbsoluteOffset = new Point(100, 0);
-                    GuiFrame.RectTransform.AbsoluteOffset = new Point(-100, 0);
+                    itemContainer.GuiFrame.RectTransform.AbsoluteOffset = new Point(GuiFrame.Rect.Width / -2 - padding, 0);
+                    GuiFrame.RectTransform.AbsoluteOffset = new Point(itemContainer.GuiFrame.Rect.Width / 2 + padding, 0);
                 }
             }
             return base.Select(character);
@@ -126,7 +126,7 @@ namespace Barotrauma.Items.Components
         private void DrawOverLay(SpriteBatch spriteBatch, GUICustomComponent overlayComponent)
         {
             overlayComponent.RectTransform.SetAsLastChild();
-            var lastSlot = inputContainer.Inventory.slots.Last();
+            var lastSlot = inputContainer.Inventory.visualSlots.Last();
 
             GUI.DrawRectangle(spriteBatch, 
                 new Rectangle(

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Engine.cs

@@ -144,16 +144,15 @@ namespace Barotrauma.Items.Components
                 Vector2 drawPos = item.DrawPosition;
                 drawPos += PropellerPos;
                 drawPos.Y = -drawPos.Y;
-
                 propellerSprite.Draw(spriteBatch, (int)Math.Floor(spriteIndex), drawPos, Color.White, propellerSprite.Origin, 0.0f, Vector2.One);
             }
 
-            if (editing && !GUI.DisableHUD)
+            if (editing && !DisablePropellerDamage && propellerDamage != null && !GUI.DisableHUD)
             {
                 Vector2 drawPos = item.DrawPosition;
-                drawPos += PropellerPos;
+                drawPos += PropellerPos * item.Scale;
                 drawPos.Y = -drawPos.Y;
-                GUI.DrawRectangle(spriteBatch, drawPos - Vector2.One * 10, Vector2.One * 20, GUI.Style.Red);
+                spriteBatch.DrawCircle(drawPos, propellerDamage.DamageRange * item.Scale, 16, GUI.Style.Red, thickness: 2);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs

@@ -190,7 +190,7 @@ namespace Barotrauma.Items.Components
                             };
                         }
 
-                        new GUITextBlock(new RectTransform(new Vector2(0.85f, 1f), container.RectTransform), fi.DisplayName)
+                        new GUITextBlock(new RectTransform(new Vector2(0.85f, 1f), container.RectTransform), GetRecipeNameAndAmount(fi))
                         {
                             Padding = Vector4.Zero,
                             AutoScaleVertical = true,
@@ -199,6 +199,21 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        private string GetRecipeNameAndAmount(FabricationRecipe fabricationRecipe)
+        {
+            if (fabricationRecipe == null) { return ""; }
+            if (fabricationRecipe.Amount > 1)
+            {
+                return TextManager.GetWithVariables("fabricationrecipenamewithamount",
+                    new string[2] { "[name]", "[amount]" },
+                    new string[2] { fabricationRecipe.DisplayName, fabricationRecipe.Amount.ToString() });
+            }
+            else
+            {
+                return fabricationRecipe.DisplayName;
+            }
+        }
+
         partial void OnItemLoadedProjSpecific()
         {
             inputContainer.AllowUIOverlap = true;
@@ -212,11 +227,11 @@ namespace Barotrauma.Items.Components
             // TODO, This works fine as of now but if GUI.PreventElementOverlap ever gets fixed this block of code may become obsolete or detrimental.
             // Only do this if there's only one linked component. If you link more containers then may
             // GUI.PreventElementOverlap have mercy on your HUD layout
-            if (GuiFrame != null && item.linkedTo.Count(entity => entity is Item item && item.DisplaySideBySideWhenLinked) == 1)
+            if (GuiFrame != null && item.linkedTo.Count(entity => entity is Item { DisplaySideBySideWhenLinked: true }) == 1)
             {
                 foreach (MapEntity linkedTo in item.linkedTo)
                 {
-                    if (!(linkedTo is Item linkedItem) || !linkedItem.DisplaySideBySideWhenLinked) { continue; }
+                    if (!(linkedTo is Item { DisplaySideBySideWhenLinked: true } linkedItem)) { continue; }
                     if (!linkedItem.Components.Any()) { continue; }
 
                     var itemContainer = linkedItem.GetComponent<ItemContainer>();
@@ -225,8 +240,8 @@ namespace Barotrauma.Items.Components
                     // how much spacing do we want between the components
                     var padding = (int) (8 * GUI.Scale);
                     // Move the linked container to the right and move the fabricator to the left
-                    itemContainer.GuiFrame.RectTransform.AbsoluteOffset = new Point(-100, 0);
-                    GuiFrame.RectTransform.AbsoluteOffset = new Point(100, 0);
+                    itemContainer.GuiFrame.RectTransform.AbsoluteOffset = new Point(GuiFrame.Rect.Width / -2 - padding, 0);
+                    GuiFrame.RectTransform.AbsoluteOffset = new Point(itemContainer.GuiFrame.Rect.Width / 2 + padding, 0);
                 }
             }
             
@@ -287,9 +302,8 @@ namespace Barotrauma.Items.Components
                         missingItems.Add(requiredItem);
                     }
                 }
-                foreach (Item item in inputContainer.Inventory.Items)
+                foreach (Item item in inputContainer.Inventory.AllItems)
                 {
-                    if (item == null) { continue; }
                     missingItems.Remove(missingItems.FirstOrDefault(mi => mi.ItemPrefabs.Contains(item.prefab)));
                 }
 
@@ -297,7 +311,7 @@ namespace Barotrauma.Items.Components
 
                 foreach (FabricationRecipe.RequiredItem requiredItem in missingItems)
                 {
-                    while (slotIndex < inputContainer.Capacity && inputContainer.Inventory.Items[slotIndex] != null)
+                    while (slotIndex < inputContainer.Capacity && inputContainer.Inventory.GetItemAt(slotIndex) != null)
                     {
                         slotIndex++;
                     }
@@ -307,17 +321,17 @@ namespace Barotrauma.Items.Components
                     {
                         if (item.ParentInventory != inputContainer.Inventory && IsItemValidIngredient(item, requiredItem))
                         {
-                            int availableSlotIndex = Array.IndexOf(item.ParentInventory.Items, item);
+                            int availableSlotIndex = item.ParentInventory.FindIndex(item);
                             //slots are null if the inventory has never been displayed 
                             //(linked item, but the UI is not set to be displayed at the same time)
-                            if (item.ParentInventory.slots != null)
+                            if (item.ParentInventory.visualSlots != null)
                             {
-                                if (item.ParentInventory.slots[availableSlotIndex].HighlightTimer <= 0.0f)
+                                if (item.ParentInventory.visualSlots[availableSlotIndex].HighlightTimer <= 0.0f)
                                 {
-                                    item.ParentInventory.slots[availableSlotIndex].ShowBorderHighlight(GUI.Style.Green, 0.5f, 0.5f, 0.2f);
+                                    item.ParentInventory.visualSlots[availableSlotIndex].ShowBorderHighlight(GUI.Style.Green, 0.5f, 0.5f, 0.2f);
                                     if (slotIndex < inputContainer.Capacity)
                                     {
-                                        inputContainer.Inventory.slots[slotIndex].ShowBorderHighlight(GUI.Style.Green, 0.5f, 0.5f, 0.2f);
+                                        inputContainer.Inventory.visualSlots[slotIndex].ShowBorderHighlight(GUI.Style.Green, 0.5f, 0.5f, 0.2f);
                                     }
                                 }
                             }
@@ -327,7 +341,7 @@ namespace Barotrauma.Items.Components
                     if (slotIndex >= inputContainer.Capacity) { break; }
                     
                     var itemIcon = requiredItem.ItemPrefabs.First().InventoryIcon ?? requiredItem.ItemPrefabs.First().sprite;
-                    Rectangle slotRect = inputContainer.Inventory.slots[slotIndex].Rect;
+                    Rectangle slotRect = inputContainer.Inventory.visualSlots[slotIndex].Rect;
                     itemIcon.Draw(
                         spriteBatch,
                         slotRect.Center.ToVector2(),
@@ -367,14 +381,12 @@ namespace Barotrauma.Items.Components
         {
             overlayComponent.RectTransform.SetAsLastChild();
 
-            if (outputContainer.Inventory.Items.First() != null) { return; }
-            
             FabricationRecipe targetItem = fabricatedItem ?? selectedItem;
             if (targetItem != null)
             {
                 var itemIcon = targetItem.TargetItem.InventoryIcon ?? targetItem.TargetItem.sprite;
 
-                Rectangle slotRect = outputContainer.Inventory.slots[0].Rect;
+                Rectangle slotRect = outputContainer.Inventory.visualSlots[0].Rect;
 
                 if (fabricatedItem != null)
                 {
@@ -449,8 +461,10 @@ namespace Barotrauma.Items.Components
                     Color = selectedItem.TargetItem.InventoryIconColor
                 };
             }*/
+
+
             var nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
-                selectedItem.TargetItem.Name, textAlignment: Alignment.CenterLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont)
+                GetRecipeNameAndAmount(selectedItem), textAlignment: Alignment.CenterLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont)
             {
                 AutoScaleHorizontal = true
             };
@@ -539,7 +553,7 @@ namespace Barotrauma.Items.Components
         private bool StartButtonClicked(GUIButton button, object obj)
         {
             if (selectedItem == null) { return false; }
-            if (!outputContainer.Inventory.IsEmpty())
+            if (fabricatedItem == null && !outputContainer.Inventory.CanBePut(selectedItem.TargetItem))
             {
                 outputSlot.Flash(GUI.Style.Red);
                 return false;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/MiniMap.cs

@@ -21,18 +21,14 @@ namespace Barotrauma.Items.Components
 
         private readonly List<Submarine> displayedSubs = new List<Submarine>();
 
+        private Point prevResolution;
+
         partial void InitProjSpecific(XElement element)
         {
             noPowerTip = TextManager.Get("SteeringNoPowerTip");
             CreateGUI();
         }
 
-        protected override void OnResolutionChanged()
-        {
-            base.OnResolutionChanged();
-            CreateHUD();
-        }
-
         protected override void CreateGUI()
         {
             GuiFrame.RectTransform.RelativeOffset = new Vector2(0.05f, 0.0f);
@@ -76,15 +72,10 @@ namespace Barotrauma.Items.Components
             hullInfoFrame.AddToGUIUpdateList(order: 1);
         }
 
-        public override void OnMapLoaded()
-        {
-            base.OnMapLoaded();
-            CreateHUD();
-        }
-
         private void CreateHUD()
         {
-            submarineContainer.ClearChildren();
+            prevResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
+            submarineContainer?.ClearChildren();
 
             if (item.Submarine == null) { return; }
 
@@ -94,19 +85,15 @@ namespace Barotrauma.Items.Components
             displayedSubs.AddRange(item.Submarine.DockedTo);
         }
 
-        public override void FlipX(bool relativeToSub)
-        {
-            CreateHUD();
-        }
-
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
             //recreate HUD if the subs we should display have changed
-            if ((item.Submarine == null && displayedSubs.Count > 0) ||              //item not inside a sub anymore, but display is still showing subs
-                !displayedSubs.Contains(item.Submarine) ||                          //current sub not displayer
-                item.Submarine.DockedTo.Any(s => !displayedSubs.Contains(s)) ||     //some of the docked subs not diplayed
-                !submarineContainer.Children.Any() ||                                        // We lack a GUI
-                displayedSubs.Any(s => s != item.Submarine && !item.Submarine.DockedTo.Contains(s))) //displaying a sub that shouldn't be displayed
+            if ((item.Submarine == null && displayedSubs.Count > 0) ||                                       //item not inside a sub anymore, but display is still showing subs
+                !displayedSubs.Contains(item.Submarine) ||                                                   //current sub not displayer
+                prevResolution.X != GameMain.GraphicsWidth || prevResolution.Y != GameMain.GraphicsHeight || //resolution changed
+                item.Submarine.DockedTo.Any(s => !displayedSubs.Contains(s)) ||                              //some of the docked subs not diplayed
+                !submarineContainer.Children.Any() ||                                                        // We lack a GUI
+                displayedSubs.Any(s => s != item.Submarine && !item.Submarine.DockedTo.Contains(s)))         //displaying a sub that shouldn't be displayed
             {
                 CreateHUD();
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Pump.cs

@@ -215,15 +215,33 @@ namespace Barotrauma.Items.Components
 
         public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
         {
+            int msgStartPos = msg.BitPosition;
+
+            float flowPercentage = msg.ReadRangedInteger(-10, 10) * 10.0f;
+            bool isActive = msg.ReadBoolean();
+            bool hijacked = msg.ReadBoolean();
+            float? targetLevel;
+            if (msg.ReadBoolean())
+            {
+                targetLevel = msg.ReadSingle();
+            }
+            else
+            {
+                targetLevel = null;
+            }
+
             if (correctionTimer > 0.0f)
             {
-                StartDelayedCorrection(type, msg.ExtractBits(5 + 1), sendingTime);
+                int msgLength = msg.BitPosition - msgStartPos;
+                msg.BitPosition = msgStartPos;
+                StartDelayedCorrection(type, msg.ExtractBits(msgLength), sendingTime);
                 return;
             }
 
-            FlowPercentage = msg.ReadRangedInteger(-10, 10) * 10.0f;
-            IsActive = msg.ReadBoolean();
-            Hijacked = msg.ReadBoolean();
+            FlowPercentage = flowPercentage;
+            IsActive = isActive;
+            Hijacked = hijacked;
+            TargetLevel = targetLevel;
         }
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Reactor.cs

@@ -502,8 +502,16 @@ namespace Barotrauma.Items.Components
         {
             if (item.Removed) { return; }
 
+            Vector2 clampedOptimalTurbineOutput = optimalTurbineOutput;
+            Vector2 clampedAllowedTurbineOutput = allowedTurbineOutput;
+            if (clampedOptimalTurbineOutput.X > 100.0f)
+            {
+                clampedOptimalTurbineOutput = new Vector2(92.0f, 110.0f);
+                clampedAllowedTurbineOutput = new Vector2(85.0f, 110.0f);
+            }
+
             DrawMeter(spriteBatch, container.Rect,
-                turbineOutputMeter, TurbineOutput, new Vector2(0.0f, 100.0f), optimalTurbineOutput, allowedTurbineOutput);
+                turbineOutputMeter, TurbineOutput, new Vector2(0.0f, 100.0f), clampedOptimalTurbineOutput, clampedAllowedTurbineOutput);
         }
 
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Sonar.cs

@@ -15,7 +15,8 @@ namespace Barotrauma.Items.Components
         public enum BlipType
         {
             Default,
-            Disruption
+            Disruption,
+            Destructible
         }
 
         private PathFinder pathFinder;
@@ -54,7 +55,7 @@ namespace Barotrauma.Items.Components
         private Sprite sonarBlip;
         private Sprite lineSprite;
 
-        private readonly Dictionary<string, Sprite> targetIcons = new Dictionary<string, Sprite>();
+        private readonly Dictionary<string, Tuple<Sprite, Color>> targetIcons = new Dictionary<string, Tuple<Sprite, Color>>();
 
         private float displayBorderSize;
 
@@ -70,6 +71,14 @@ namespace Barotrauma.Items.Components
 
         private float showDirectionalIndicatorTimer;
 
+        private readonly List<LevelObject> nearbyObjects = new List<LevelObject>();
+        private const float NearbyObjectUpdateInterval = 1.0f;
+        float nearbyObjectUpdateTimer;
+
+        private List<Submarine> connectedSubs = new List<Submarine>();
+        private const float ConnectedSubUpdateInterval = 1.0f;
+        float connectedSubUpdateTimer;
+
         //Vector2 = vector from the ping source to the position of the disruption
         //float = strength of the disruption, between 0-1
         private readonly List<Pair<Vector2, float>> disruptedDirections = new List<Pair<Vector2, float>>();
@@ -109,6 +118,10 @@ namespace Barotrauma.Items.Components
             {
                 BlipType.Disruption,
                 new Color[] { Color.TransparentBlack, new Color(254, 68, 19), new Color(255, 220, 62), new Color(255, 255, 255) }
+            },
+            {
+                BlipType.Destructible,
+                new Color[] { Color.TransparentBlack, new Color(74, 113, 75) * 0.8f, new Color(151, 236, 172) * 0.8f, new Color(153, 217, 234) * 0.8f }
             }
         };
 
@@ -124,11 +137,22 @@ namespace Barotrauma.Items.Components
 
         private readonly List<GUITextBlock> textBlocksToScaleAndNormalize = new List<GUITextBlock>();
 
+        private bool isConnectedToSteering;
+
+        private static string caveLabel;
+
+        private bool AllowUsingMineralScanner =>
+            HasMineralScanner && !isConnectedToSteering;
+
         partial void InitProjSpecific(XElement element)
         {
             System.Diagnostics.Debug.Assert(Enum.GetValues(typeof(BlipType)).Cast<BlipType>().All(t => blipColorGradient.ContainsKey(t)));
             sonarBlips = new List<SonarBlip>();
 
+            caveLabel = 
+                TextManager.Get("cave", returnNull: true) ?? 
+                TextManager.Get("missiontype.nest");
+
             foreach (XElement subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
@@ -161,7 +185,9 @@ namespace Barotrauma.Items.Components
                         break;
                     case "icon":
                         var targetIconSprite = new Sprite(subElement);
-                        targetIcons.Add(subElement.GetAttributeString("identifier", ""), targetIconSprite);
+                        var color = subElement.GetAttributeColor("color", Color.White);
+                        targetIcons.Add(subElement.GetAttributeString("identifier", ""),
+                            new Tuple<Sprite, Color>(targetIconSprite, color));
                         break;
                 }
             }
@@ -176,16 +202,20 @@ namespace Barotrauma.Items.Components
 
         protected override void CreateGUI()
         {
-            bool isConnectedToSteering = item.GetComponent<Steering>() != null;
-            Vector2 size = isConnectedToSteering ? controlBoxSize : new Vector2(controlBoxSize.X * 2.0f, controlBoxSize.Y);
+            isConnectedToSteering = item.GetComponent<Steering>() != null;
+            Vector2 size = isConnectedToSteering ? controlBoxSize : new Vector2(0.46f, 0.4f);
 
-            controlContainer = new GUIFrame(new RectTransform(size, GuiFrame.RectTransform, Anchor.BottomRight, Pivot.BottomLeft), "ItemUI");
+            controlContainer = new GUIFrame(new RectTransform(size, GuiFrame.RectTransform, Anchor.BottomLeft), "ItemUI");
+            if (!isConnectedToSteering && !GUI.IsFourByThree())
+            {
+                controlContainer.RectTransform.MaxSize = new Point((int)(380 * GUI.xScale), (int)(300 * GUI.yScale));
+            }
             var paddedControlContainer = new GUIFrame(new RectTransform(controlContainer.Rect.Size - GUIStyle.ItemFrameMargin, controlContainer.RectTransform, Anchor.Center)
             {
                 AbsoluteOffset = GUIStyle.ItemFrameOffset
             }, style: null);
             // Based on the height difference to the steering control box so that the elements keep the same size
-            float extraHeight = 0.03f;
+            float extraHeight = 0.0694f;
             var sonarModeArea = new GUIFrame(new RectTransform(new Vector2(1, 0.4f + extraHeight), paddedControlContainer.RectTransform, Anchor.TopCenter), style: null);
             SonarModeSwitch = new GUIButton(new RectTransform(new Vector2(0.2f, 1), sonarModeArea.RectTransform), string.Empty, style: "SwitchVertical")
             {
@@ -224,6 +254,8 @@ namespace Barotrauma.Items.Components
             };
             passiveTickBox.TextBlock.OverrideTextColor(GUI.Style.TextColor);
             activeTickBox.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+
+            textBlocksToScaleAndNormalize.Clear();
             textBlocksToScaleAndNormalize.Add(passiveTickBox.TextBlock);
             textBlocksToScaleAndNormalize.Add(activeTickBox.TextBlock);
 
@@ -249,7 +281,8 @@ namespace Barotrauma.Items.Components
                 }
             };
 
-            new GUIFrame(new RectTransform(new Vector2(0.8f, 0.01f), paddedControlContainer.RectTransform, Anchor.Center), style: "HorizontalLine");
+            new GUIFrame(new RectTransform(new Vector2(0.8f, 0.01f), paddedControlContainer.RectTransform, Anchor.Center), style: "HorizontalLine")
+            { UserData = "horizontalline" };
 
             var directionalModeFrame = new GUIFrame(new RectTransform(new Vector2(1, 0.45f), lowerAreaFrame.RectTransform, Anchor.BottomCenter), style: null);
             directionalModeSwitch = new GUIButton(new RectTransform(new Vector2(0.3f, 0.8f), directionalModeFrame.RectTransform, Anchor.CenterLeft), string.Empty, style: "SwitchHorizontal")
@@ -270,6 +303,15 @@ namespace Barotrauma.Items.Components
                 TextManager.Get("SonarDirectionalPing"), GUI.Style.TextColor, GUI.SubHeadingFont, Alignment.CenterLeft);
             textBlocksToScaleAndNormalize.Add(directionalModeSwitchText);
 
+            if (AllowUsingMineralScanner)
+            {
+                AddMineralScannerSwitchToGUI();
+            }
+            else
+            {
+                mineralScannerSwitch = null;
+            }
+
             GuiFrame.CanBeFocused = false;
             
             GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
@@ -284,12 +326,17 @@ namespace Barotrauma.Items.Components
             if (isConnectedToSteering)
             {
                 controlContainer.RectTransform.RelativeOffset = controlBoxOffset;
-                controlContainer.RectTransform.SetPosition(Anchor.TopLeft);
+                controlContainer.RectTransform.SetPosition(Anchor.TopRight);
                 sonarView.RectTransform.ScaleBasis = ScaleBasis.Smallest;
-                sonarView.RectTransform.SetPosition(Anchor.CenterRight);
+                sonarView.RectTransform.SetPosition(Anchor.CenterLeft);
                 sonarView.RectTransform.Resize(GUISizeCalculation);
                 GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
             }
+            else if (GUI.RelativeHorizontalAspectRatio > 0.75f)
+            {
+                sonarView.RectTransform.RelativeOffset = new Vector2(0.13f * GUI.RelativeHorizontalAspectRatio, 0);
+                sonarView.RectTransform.SetPosition(Anchor.BottomRight);
+            }
         }
 
         private void SetPingDirection(Vector2 direction)
@@ -306,20 +353,39 @@ namespace Barotrauma.Items.Components
         {
             base.OnItemLoaded();
             zoomSlider.BarScroll = MathUtils.InverseLerp(MinZoom, MaxZoom, zoom);
-            if (HasMineralScanner) { AddMineralScannerSwitchToGUI(); }
+            if (AllowUsingMineralScanner && mineralScannerSwitch == null)
+            {
+                AddMineralScannerSwitchToGUI();
+                GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
+            }
             //make the sonarView customcomponent render the steering view so it gets drawn in front of the sonar
             item.GetComponent<Steering>()?.AttachToSonarHUD(sonarView);
         }
 
         private void AddMineralScannerSwitchToGUI()
         {
-            // First adjust other elements of the lower area
-            zoomSlider.Parent.RectTransform.RelativeSize = new Vector2(1.0f, 0.3f);
-            directionalModeSwitch.Parent.RectTransform.RelativeSize = new Vector2(1.0f, 0.3f);
+            // First adjust other elements to make room for the additional switch
+            controlContainer.RectTransform.RelativeSize = new Vector2(
+                controlContainer.RectTransform.RelativeSize.X,
+                controlContainer.RectTransform.RelativeSize.Y * 1.25f);
+            SonarModeSwitch.Parent.RectTransform.RelativeSize = new Vector2(
+                SonarModeSwitch.Parent.RectTransform.RelativeSize.X,
+                SonarModeSwitch.Parent.RectTransform.RelativeSize.Y * 0.8f);
+            lowerAreaFrame.Parent.GetChildByUserData("horizontalline").RectTransform.RelativeOffset =
+                new Vector2(0.0f, -0.1f);
+            lowerAreaFrame.RectTransform.RelativeSize = new Vector2(
+                lowerAreaFrame.RectTransform.RelativeSize.X,
+                lowerAreaFrame.RectTransform.RelativeSize.Y * 1.2f);
+            zoomSlider.Parent.RectTransform.RelativeSize = new Vector2(
+                zoomSlider.Parent.RectTransform.RelativeSize.X,
+                zoomSlider.Parent.RectTransform.RelativeSize.Y * (2.0f / 3.0f));
+            directionalModeSwitch.Parent.RectTransform.RelativeSize = new Vector2(
+                directionalModeSwitch.Parent.RectTransform.RelativeSize.X,
+                zoomSlider.Parent.RectTransform.RelativeSize.Y);
             directionalModeSwitch.Parent.RectTransform.SetPosition(Anchor.Center);
 
             // Then add the scanner switch
-            var mineralScannerFrame = new GUIFrame(new RectTransform(new Vector2(1, 0.3f), lowerAreaFrame.RectTransform, Anchor.BottomCenter), style: null);
+            var mineralScannerFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, zoomSlider.Parent.RectTransform.RelativeSize.Y), lowerAreaFrame.RectTransform, Anchor.BottomCenter), style: null);
             mineralScannerSwitch = new GUIButton(new RectTransform(new Vector2(0.3f, 0.8f), mineralScannerFrame.RectTransform, Anchor.CenterLeft), string.Empty, style: "SwitchHorizontal")
             {
                 OnClicked = (button, data) =>
@@ -337,7 +403,6 @@ namespace Barotrauma.Items.Components
             var mineralScannerSwitchText = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1), mineralScannerFrame.RectTransform, Anchor.CenterRight),
                 TextManager.Get("SonarMineralScanner"), GUI.Style.TextColor, GUI.SubHeadingFont, Alignment.CenterLeft);
             textBlocksToScaleAndNormalize.Add(mineralScannerSwitchText);
-            GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
         }
 
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
@@ -358,6 +423,26 @@ namespace Barotrauma.Items.Components
                 networkUpdateTimer -= deltaTime;
             }
 
+            connectedSubUpdateTimer -= deltaTime;
+            if (connectedSubUpdateTimer <= 0.0f)
+            {
+                connectedSubs.Clear();
+                if (UseTransducers)
+                {
+                    foreach (var transducer in connectedTransducers)
+                    {
+                        if (transducer.Transducer.Item.Submarine == null) { continue; }
+                        if (connectedSubs.Contains(transducer.Transducer.Item.Submarine)) { continue; }
+                        connectedSubs = transducer.Transducer.Item.Submarine?.GetConnectedSubs();
+                    }
+                }
+                else if (item.Submarine != null)
+                {
+                    connectedSubs = item.Submarine?.GetConnectedSubs();
+                }
+                connectedSubUpdateTimer = ConnectedSubUpdateInterval;
+            }
+
             if (sonarView.Rect.Contains(PlayerInput.MousePosition))
             {
                 float scrollSpeed = PlayerInput.ScrollWheelSpeed / 1000.0f;
@@ -382,7 +467,7 @@ namespace Barotrauma.Items.Components
                 Vector2.DistanceSquared(sonarView.Rect.Center.ToVector2(), PlayerInput.MousePosition) <
                 (sonarView.Rect.Width / 2 * sonarView.Rect.Width / 2);
 
-            if (HasMineralScanner && Level.Loaded != null && !Level.Loaded.Generating)
+            if (AllowUsingMineralScanner && Level.Loaded != null && !Level.Loaded.Generating)
             {
                 if (MineralClusters == null)
                 {
@@ -417,26 +502,42 @@ namespace Barotrauma.Items.Components
 
             if (Level.Loaded != null)
             {
+                nearbyObjectUpdateTimer -= deltaTime;
+                if (nearbyObjectUpdateTimer <= 0.0f)
+                {
+                    nearbyObjects.Clear();
+                    foreach (var nearbyObject in Level.Loaded.LevelObjectManager.GetAllObjects(transducerCenter, range * zoom))
+                    {
+                        if (!nearbyObject.VisibleOnSonar) { continue; }
+                        float objectRange = range + nearbyObject.SonarRadius;
+                        if (Vector2.DistanceSquared(transducerCenter, nearbyObject.WorldPosition) < objectRange * objectRange)
+                        {
+                            nearbyObjects.Add(nearbyObject);
+                        }
+                    }
+                    nearbyObjectUpdateTimer = NearbyObjectUpdateInterval;
+                }
+
                 List<LevelTrigger> ballastFloraSpores = new List<LevelTrigger>();
                 Dictionary<LevelTrigger, Vector2> levelTriggerFlows = new Dictionary<LevelTrigger, Vector2>();
                 for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
                 {
                     var activePing = activePings[pingIndex];
-                    LevelObjectManager objManager = Level.Loaded.LevelObjectManager;
                     float pingRange = range * activePing.State / zoom;
-                    foreach (LevelObject levelObject in objManager.GetAllObjects(transducerCenter, pingRange))
+                    foreach (LevelObject levelObject in nearbyObjects)
                     {
                         if (levelObject.Triggers == null) { continue; }
                         //gather all nearby triggers that are causing the water to flow into the dictionary
                         foreach (LevelTrigger trigger in levelObject.Triggers)
                         {
                             Vector2 flow = trigger.GetWaterFlowVelocity();
-                            //ignore ones that are barely doing anything (flow^2 < 1)
-                            if (flow.LengthSquared() > 1.0f && !levelTriggerFlows.ContainsKey(trigger))
+                            //ignore ones that are barely doing anything (flow^2 <= 1)
+                            if (flow.LengthSquared() >= 1.0f && !levelTriggerFlows.ContainsKey(trigger))
                             {
                                 levelTriggerFlows.Add(trigger, flow);
                             }
-                            if (!string.IsNullOrWhiteSpace(trigger.InfectIdentifier) && Vector2.DistanceSquared(transducerCenter, trigger.WorldPosition) < pingRange / 2 * pingRange / 2)
+                            if (!string.IsNullOrWhiteSpace(trigger.InfectIdentifier) && 
+                                Vector2.DistanceSquared(transducerCenter, trigger.WorldPosition) < pingRange / 2 * pingRange / 2)
                             {
                                 ballastFloraSpores.Add(trigger);
                             }
@@ -727,8 +828,8 @@ namespace Barotrauma.Items.Components
             float directionalPingVisibility = useDirectionalPing && currentMode == Mode.Active ? 1.0f : showDirectionalIndicatorTimer;
             if (directionalPingVisibility > 0.0f)
             {
-                Vector2 sector1 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, DirectionalPingSector * 0.5f);
-                Vector2 sector2 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, -DirectionalPingSector * 0.5f);
+                Vector2 sector1 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, MathHelper.ToRadians(DirectionalPingSector * 0.5f));
+                Vector2 sector2 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, MathHelper.ToRadians(-DirectionalPingSector * 0.5f));
                 DrawLine(spriteBatch, Vector2.Zero, sector1, Color.LightCyan * 0.2f * directionalPingVisibility, width: 3);
                 DrawLine(spriteBatch, Vector2.Zero, sector2, Color.LightCyan * 0.2f * directionalPingVisibility, width: 3);
             }
@@ -761,7 +862,7 @@ namespace Barotrauma.Items.Components
             {
                 DrawMarker(spriteBatch,
                     Level.Loaded.StartLocation.Name,
-                    "outpost",
+                    Level.Loaded.StartOutpost != null ? "outpost" : "location",
                     Level.Loaded.StartLocation.Name,
                     Level.Loaded.StartPosition, transducerCenter,
                     displayScale, center, DisplayRadius);
@@ -771,16 +872,28 @@ namespace Barotrauma.Items.Components
             {
                 DrawMarker(spriteBatch,
                     Level.Loaded.EndLocation.Name,
-                    "outpost",
+                    Level.Loaded.EndOutpost != null ? "outpost" : "location",
                     Level.Loaded.EndLocation.Name,
                     Level.Loaded.EndPosition, transducerCenter,
                     displayScale, center, DisplayRadius);
             }
 
+            for (int i = 0; i < Level.Loaded.Caves.Count; i++)
+            {
+                var cave = Level.Loaded.Caves[i];
+                if (!cave.DisplayOnSonar) { continue; }
+                DrawMarker(spriteBatch,
+                    caveLabel,
+                    "cave",
+                    "cave" + i,
+                    cave.StartPos.ToVector2(), transducerCenter,
+                    displayScale, center, DisplayRadius);
+            }
+
             foreach (AITarget aiTarget in AITarget.List)
             {
-                if (!aiTarget.Enabled) continue;
-                if (string.IsNullOrEmpty(aiTarget.SonarLabel) || aiTarget.SoundRange <= 0.0f) continue;
+                if (!aiTarget.Enabled) { continue; }
+                if (string.IsNullOrEmpty(aiTarget.SonarLabel) || aiTarget.SoundRange <= 0.0f) { continue; }
 
                 if (Vector2.DistanceSquared(aiTarget.WorldPosition, transducerCenter) < aiTarget.SoundRange * aiTarget.SoundRange)
                 {
@@ -793,10 +906,8 @@ namespace Barotrauma.Items.Components
                 }
             }
             
-            if (GameMain.GameSession.Mission != null)
+            foreach (Mission mission in GameMain.GameSession.Missions)
             {
-                var mission = GameMain.GameSession.Mission;
-
                 if (!string.IsNullOrWhiteSpace(mission.SonarLabel))
                 {
                     foreach (Vector2 sonarPosition in mission.SonarPositions)
@@ -811,18 +922,17 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            if (HasMineralScanner && useMineralScanner && CurrentMode == Mode.Active && MineralClusters != null)
+            if (AllowUsingMineralScanner && useMineralScanner && CurrentMode == Mode.Active && MineralClusters != null)
             {
-                var maxMineralScanRangeSquared = Range * Range;
                 foreach (var t in MineralClusters)
                 {
                     var unobtainedMinerals = t.Item2.Where(i => i != null && i.GetRootInventoryOwner() == i);
                     if (unobtainedMinerals.None()) { continue; }
-                    if (Vector2.DistanceSquared(transducerCenter, t.Item1) > maxMineralScanRangeSquared) { continue; }
+                    if (!CheckResourceMarkerVisibility(t.Item1, transducerCenter)) { continue; }
                     var i = unobtainedMinerals.FirstOrDefault();
                     if (i == null) { continue; }
                     DrawMarker(spriteBatch,
-                        i.Name, null, i,
+                        i.Name, "mineral", i,
                         t.Item1, transducerCenter,
                         displayScale, center, DisplayRadius * 0.95f,
                         onlyShowTextOnMouseOver: true);
@@ -832,16 +942,11 @@ namespace Barotrauma.Items.Components
             foreach (Submarine sub in Submarine.Loaded)
             {
                 if (!sub.ShowSonarMarker) { continue; }
-                if (UseTransducers ?
-                    connectedTransducers.Any(t => sub == t.Transducer.Item.Submarine || sub.DockedTo.Contains(t.Transducer.Item.Submarine)) :
-                    (sub == item.Submarine || sub.DockedTo.Contains(item.Submarine)))
-                {
-                    continue;
-                }
+                if (connectedSubs.Contains(sub)) { continue; }
                 if (sub.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
-                             
-                DrawMarker(spriteBatch, 
-                    sub.Info.DisplayName, 
+
+                DrawMarker(spriteBatch,
+                    sub.Info.DisplayName,
                     sub.Info.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine",
                     sub,
                     sub.WorldPosition, transducerCenter, 
@@ -861,10 +966,8 @@ namespace Barotrauma.Items.Components
 
             foreach (Submarine submarine in Submarine.Loaded)
             {
-                if (UseTransducers ?
-                    !connectedTransducers.Any(t => submarine == t.Transducer.Item.Submarine || submarine.DockedTo.Contains(t.Transducer.Item.Submarine)) :
-                    submarine != item.Submarine && !submarine.DockedTo.Contains(item.Submarine)) continue;
-                if (submarine.HullVertices == null) continue;
+                if (!connectedSubs.Contains(submarine)) { continue; }
+                if (submarine.HullVertices == null) { continue; }
 
                 Vector2 offset = ConvertUnits.ToSimUnits(submarine.WorldPosition - transducerCenter);
 
@@ -948,8 +1051,8 @@ namespace Barotrauma.Items.Components
                 //don't show the docking ports of the opposing team on the sonar
                 if (item.Submarine != null)
                 {
-                    if ((dockingPort.Item.Submarine.TeamID == Character.TeamType.Team1 && item.Submarine.TeamID == Character.TeamType.Team2) ||
-                        (dockingPort.Item.Submarine.TeamID == Character.TeamType.Team2 && item.Submarine.TeamID == Character.TeamType.Team1))
+                    if ((dockingPort.Item.Submarine.TeamID == CharacterTeamType.Team1 && item.Submarine.TeamID == CharacterTeamType.Team2) ||
+                        (dockingPort.Item.Submarine.TeamID == CharacterTeamType.Team2 && item.Submarine.TeamID == CharacterTeamType.Team1))
                     {
                         continue;
                     }
@@ -1075,8 +1178,7 @@ namespace Barotrauma.Items.Components
 
             for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
             {
-                var activePing = activePings[pingIndex];
-                foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(pingSource, range * activePing.State))
+                foreach (LevelObject levelObject in nearbyObjects)
                 {
                     if (levelObject.ActivePrefab?.SonarDisruption <= 0.0f) { continue; }
 
@@ -1157,19 +1259,10 @@ namespace Barotrauma.Items.Components
 
             foreach (Submarine submarine in Submarine.Loaded)
             {
-                if (submarine.HullVertices == null) continue;
+                if (submarine.HullVertices == null) { continue; }
                 if (!DetectSubmarineWalls)
                 {
-                    if (UseTransducers)
-                    {
-                        if (connectedTransducers.Any(t => submarine == t.Transducer.Item.Submarine || 
-                            submarine.DockedTo.Contains(t.Transducer.Item.Submarine))) continue;
-                    }
-                    else
-                    {
-                        if (item.Submarine == submarine) continue;
-                        if (item.Submarine != null && item.Submarine.DockedTo.Contains(submarine)) continue;
-                    }
+                    if (connectedSubs.Contains(submarine)) { continue; }                    
                 }
 
                 for (int i = 0; i < submarine.HullVertices.Count; i++)
@@ -1209,9 +1302,9 @@ namespace Barotrauma.Items.Components
                 {
                     foreach (Voronoi2.GraphEdge edge in cell.Edges)
                     {
-                        if (!edge.IsSolid) continue;
+                        if (!edge.IsSolid) { continue; }
                         float cellDot = Vector2.Dot(cell.Center - pingSource, (edge.Center + cell.Translation) - cell.Center);
-                        if (cellDot > 0) continue;
+                        if (cellDot > 0) { continue; }
 
                         float facingDot = Vector2.Dot(
                             Vector2.Normalize(edge.Point1 - edge.Point2),
@@ -1222,7 +1315,8 @@ namespace Barotrauma.Items.Components
                             edge.Point2 + cell.Translation,
                             pingSource, transducerPos,
                             pingRadius, prevPingRadius,
-                            350.0f, 3.0f * (Math.Abs(facingDot) + 1.0f), range, pingStrength, passive);
+                            350.0f, 3.0f * (Math.Abs(facingDot) + 1.0f), range, pingStrength, passive,
+                            blipType : cell.IsDestructible ? BlipType.Destructible : BlipType.Default);
                     }
                 }
 
@@ -1311,7 +1405,7 @@ namespace Barotrauma.Items.Components
         }
         
         private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius,
-            float lineStep, float zStep, float range, float pingStrength, bool passive)
+            float lineStep, float zStep, float range, float pingStrength, bool passive, BlipType blipType = BlipType.Default)
         {
             lineStep /= zoom;
             zStep /= zoom;
@@ -1327,13 +1421,13 @@ namespace Barotrauma.Items.Components
                 //ignore if outside the display
                 Vector2 transducerDiff = point - transducerPos;
                 Vector2 transducerDisplayDiff = transducerDiff * displayScale;
-                if (transducerDisplayDiff.LengthSquared() > DisplayRadius * DisplayRadius) continue;
+                if (transducerDisplayDiff.LengthSquared() > DisplayRadius * DisplayRadius) { continue; }
 
                 //ignore if the point is not within the ping
                 Vector2 pointDiff = point - pingSource;
                 Vector2 displayPointDiff = pointDiff * displayScale;
                 float displayPointDistSqr = displayPointDiff.LengthSquared();
-                if (displayPointDistSqr < prevPingRadius * prevPingRadius || displayPointDistSqr > pingRadius * pingRadius) continue;
+                if (displayPointDistSqr < prevPingRadius * prevPingRadius || displayPointDistSqr > pingRadius * pingRadius) { continue; }
 
                 //ignore if direction is disrupted
                 float transducerDist = transducerDiff.Length();
@@ -1348,7 +1442,7 @@ namespace Barotrauma.Items.Components
                         break;
                     }
                 }
-                if (disrupted) continue;
+                if (disrupted) { continue; }
 
                 float displayPointDist = (float)Math.Sqrt(displayPointDistSqr);
                 float alpha = pingStrength * Rand.Range(1.5f, 2.0f);
@@ -1360,8 +1454,8 @@ namespace Barotrauma.Items.Components
                     int minDist = (int)(200 / zoom);
                     sonarBlips.RemoveAll(b => b.FadeTimer < fadeTimer && Math.Abs(pos.X - b.Position.X) < minDist && Math.Abs(pos.Y - b.Position.Y) < minDist);
 
-                    var blip = new SonarBlip(pos, fadeTimer, 1.0f + ((displayPointDist + z) / DisplayRadius));
-                    if (!passive && !CheckBlipVisibility(blip, transducerPos)) continue;
+                    var blip = new SonarBlip(pos, fadeTimer, 1.0f + ((displayPointDist + z) / DisplayRadius), blipType);
+                    if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
 
                     sonarBlips.Add(blip);
                     zStep += 0.5f / zoom;
@@ -1375,7 +1469,7 @@ namespace Barotrauma.Items.Components
                         alpha -= 0.1f;
                     }
 
-                    if (alpha < 0) break;
+                    if (alpha < 0) { break; }
                 }
             }
         }
@@ -1404,6 +1498,30 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        /// <summary>
+        /// Based largely on existing CheckBlipVisibility() code
+        /// </summary>
+        private bool CheckResourceMarkerVisibility(Vector2 resourcePos, Vector2 transducerPos)
+        {
+            var distSquared = Vector2.DistanceSquared(transducerPos, resourcePos);
+            if (distSquared > Range * Range)
+            {
+                return false;
+            }
+            if (currentPingIndex != -1 && activePings[currentPingIndex].IsDirectional)
+            {
+                var pos = (resourcePos - transducerPos) * displayScale * zoom;
+                pos.Y = -pos.Y;
+                var length = pos.Length();
+                var dir = pos / length;
+                if (Vector2.Dot(activePings[currentPingIndex].Direction, dir) < DirectionalPingDotProduct)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         private void DrawBlip(SpriteBatch spriteBatch, SonarBlip blip, Vector2 transducerPos, Vector2 center, float strength, float blipScale)
         {
             strength = MathHelper.Clamp(strength, 0.0f, 1.0f);
@@ -1524,13 +1642,14 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            if (string.IsNullOrEmpty(iconIdentifier) || !targetIcons.ContainsKey(iconIdentifier))
+            if (iconIdentifier == null || !targetIcons.ContainsKey(iconIdentifier))
             {
                 GUI.DrawRectangle(spriteBatch, new Rectangle((int)markerPos.X - 3, (int)markerPos.Y - 3, 6, 6), markerColor, thickness: 2);
             }
             else
             {
-                targetIcons[iconIdentifier].Draw(spriteBatch, markerPos);
+                var iconInfo = targetIcons[iconIdentifier];
+                iconInfo.Item1.Draw(spriteBatch, markerPos, iconInfo.Item2);
             }
 
             if (alpha <= 0.0f) { return; }
@@ -1561,9 +1680,9 @@ namespace Barotrauma.Items.Components
             screenBackground?.Remove();
             lineSprite?.Remove();
 
-            foreach (Sprite sprite in targetIcons.Values)
+            foreach (var t in targetIcons.Values)
             {
-                sprite.Remove();
+                t.Item1.Remove();
             }
             targetIcons.Clear();
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Steering.cs

@@ -34,7 +34,7 @@ namespace Barotrauma.Items.Components
 
         private GUIComponent steerArea;
 
-        private GUITextBlock pressureWarningText;
+        private GUITextBlock pressureWarningText, iceSpireWarningText;
 
         private GUITextBlock tipContainer;
 
@@ -112,7 +112,7 @@ namespace Barotrauma.Items.Components
 
         protected override void CreateGUI()
         {
-            controlContainer = new GUIFrame(new RectTransform(new Vector2(Sonar.controlBoxSize.X, 1 - Sonar.controlBoxSize.Y * 2), GuiFrame.RectTransform, Anchor.CenterLeft), "ItemUI");
+            controlContainer = new GUIFrame(new RectTransform(new Vector2(Sonar.controlBoxSize.X, 1 - Sonar.controlBoxSize.Y * 2), GuiFrame.RectTransform, Anchor.CenterRight), "ItemUI");
             var paddedControlContainer = new GUIFrame(new RectTransform(controlContainer.Rect.Size - GUIStyle.ItemFrameMargin, controlContainer.RectTransform, Anchor.Center)
             {
                 AbsoluteOffset = GUIStyle.ItemFrameOffset
@@ -265,7 +265,7 @@ namespace Barotrauma.Items.Components
                                           levelStartSelected ? Destination.LevelStart : Destination.LevelEnd);
 
             // Status ->
-            statusContainer = new GUIFrame(new RectTransform(Sonar.controlBoxSize, GuiFrame.RectTransform, Anchor.BottomLeft)
+            statusContainer = new GUIFrame(new RectTransform(Sonar.controlBoxSize, GuiFrame.RectTransform, Anchor.BottomRight)
             {
                 RelativeOffset = Sonar.controlBoxOffset
             }, "ItemUI");
@@ -311,6 +311,7 @@ namespace Barotrauma.Items.Components
                         {
                             Vector2 vel = controlledSub == null ? Vector2.Zero : controlledSub.Velocity;
                             var realWorldVel = ConvertUnits.ToDisplayUnits(vel.X * Physics.DisplayToRealWorldRatio) * 3.6f;
+                            if (controlledSub != null && controlledSub.FlippedX) { realWorldVel *= -1; }
                             return ((int)realWorldVel).ToString();
                         };
                         break;
@@ -339,9 +340,9 @@ namespace Barotrauma.Items.Components
             //docking interface ----------------------------------------------------
             float dockingButtonSize = 1.1f;
             float elementScale = 0.6f;
-            dockingContainer = new GUIFrame(new RectTransform(Sonar.controlBoxSize, GuiFrame.RectTransform, Anchor.BottomLeft, scaleBasis: ScaleBasis.Smallest)
+            dockingContainer = new GUIFrame(new RectTransform(Sonar.controlBoxSize, GuiFrame.RectTransform, Anchor.BottomRight, scaleBasis: ScaleBasis.Smallest)
             {
-                RelativeOffset = new Vector2(Sonar.controlBoxOffset.X + 0.05f, Sonar.controlBoxOffset.Y)
+                RelativeOffset = new Vector2(Sonar.controlBoxOffset.X + 0.05f, -0.05f)
             }, style: null);
 
             dockText = TextManager.Get("label.navterminaldock", fallBackTag: "captain.dock");
@@ -436,12 +437,17 @@ namespace Barotrauma.Items.Components
             };
 
             // Sonar area
-            steerArea = new GUICustomComponent(new RectTransform(Sonar.GUISizeCalculation, GuiFrame.RectTransform, Anchor.CenterRight, scaleBasis: ScaleBasis.Smallest),
+            steerArea = new GUICustomComponent(new RectTransform(Sonar.GUISizeCalculation, GuiFrame.RectTransform, Anchor.CenterLeft, scaleBasis: ScaleBasis.Smallest),
                 (spriteBatch, guiCustomComponent) => { DrawHUD(spriteBatch, guiCustomComponent.Rect); }, null);
             steerRadius = steerArea.Rect.Width / 2;
 
-            pressureWarningText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.25f), steerArea.RectTransform, Anchor.Center, Pivot.TopCenter), 
-                TextManager.Get("SteeringDepthWarning"), Color.Red, GUI.LargeFont, Alignment.Center)
+            iceSpireWarningText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.25f), steerArea.RectTransform, Anchor.Center, Pivot.TopCenter),
+                TextManager.Get("NavTerminalIceSpireWarning"), GUI.Style.Red, GUI.SubHeadingFont, Alignment.Center, color: Color.Black * 0.8f, wrap: true)
+            {
+                Visible = false
+            };
+            pressureWarningText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.25f), steerArea.RectTransform, Anchor.Center, Pivot.TopCenter), 
+                TextManager.Get("SteeringDepthWarning"), GUI.Style.Red, GUI.SubHeadingFont, Alignment.Center, color: Color.Black * 0.8f)
             {
                 Visible = false
             };
@@ -471,7 +477,11 @@ namespace Barotrauma.Items.Components
         public void AttachToSonarHUD(GUICustomComponent sonarView)
         {
             steerArea.Visible = false;
-            sonarView.OnDraw += (spriteBatch, guiCustomComponent) => { DrawHUD(spriteBatch, guiCustomComponent.Rect); };
+            sonarView.OnDraw += (spriteBatch, guiCustomComponent) => 
+            { 
+                DrawHUD(spriteBatch, guiCustomComponent.Rect);
+                steerArea.DrawChildren(spriteBatch, recursive: true);
+            };
         }
 
         public void DrawHUD(SpriteBatch spriteBatch, Rectangle rect)
@@ -712,12 +722,13 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            pressureWarningText.Visible = item.Submarine != null && item.Submarine.AtDamageDepth && Timing.TotalTime % 1.0f < 0.5f;
+            pressureWarningText.Visible = item.Submarine != null && item.Submarine.AtDamageDepth && Timing.TotalTime % 1.0f < 0.8f;
+            iceSpireWarningText.Visible = item.Submarine != null && !pressureWarningText.Visible && showIceSpireWarning && Timing.TotalTime % 1.0f < 0.8f;
 
             if (Vector2.DistanceSquared(PlayerInput.MousePosition, steerArea.Rect.Center.ToVector2()) < steerRadius * steerRadius)
             {
                 if (PlayerInput.PrimaryMouseButtonHeld() && !CrewManager.IsCommandInterfaceOpen && !GameSession.IsTabMenuOpen && 
-                    (!GameMain.GameSession?.Campaign?.ShowCampaignUI ?? true) && !GUIMessageBox.MessageBoxes.Any())
+                    (!GameMain.GameSession?.Campaign?.ShowCampaignUI ?? true) && !GUIMessageBox.MessageBoxes.Any(msgBox => msgBox is GUIMessageBox { MessageBoxType: GUIMessageBox.Type.Default }))
                 {
                     Vector2 inputPos = PlayerInput.MousePosition - steerArea.Rect.Center.ToVector2();
                     inputPos.Y = -inputPos.Y;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/RepairTool.cs

@@ -66,7 +66,11 @@ namespace Barotrauma.Items.Components
         {
             foreach (ParticleEmitter particleEmitter in particleEmitters)
             {
-                float particleAngle = item.body.Rotation + MathHelper.ToRadians(BarrelRotation) + ((item.body.Dir > 0.0f) ? 0.0f : MathHelper.Pi);
+                float particleAngle = MathHelper.ToRadians(BarrelRotation);
+                if (item.body != null)
+                {
+                    particleAngle += item.body.Rotation + ((item.body.Dir > 0.0f) ? 0.0f : MathHelper.Pi);
+                }
                 particleEmitter.Emit(
                     deltaTime, ConvertUnits.ToDisplayUnits(raystart),
                     item.CurrentHull, particleAngle, particleEmitter.Prefab.CopyEntityAngle ? -particleAngle : 0);
@@ -109,25 +113,28 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        partial void FixItemProjSpecific(Character user, float deltaTime, Item targetItem)
+        partial void FixItemProjSpecific(Character user, float deltaTime, Item targetItem, bool showProgressBar)
         {
-            float progressBarState = targetItem.ConditionPercentage / 100.0f;
-            if (!MathUtils.NearlyEqual(progressBarState, prevProgressBarState) || prevProgressBarTarget != targetItem)
+            if (showProgressBar)
             {
-                var door = targetItem.GetComponent<Door>();
-                if (door == null || door.Stuck <= 0)
+                float progressBarState = targetItem.ConditionPercentage / 100.0f;
+                if (!MathUtils.NearlyEqual(progressBarState, prevProgressBarState) || prevProgressBarTarget != targetItem)
                 {
-                    Vector2 progressBarPos = targetItem.DrawPosition;
-                    var progressBar = user.UpdateHUDProgressBar(
-                        targetItem,
-                        progressBarPos,
-                        progressBarState,
-                        GUI.Style.Red, GUI.Style.Green,
-                        progressBarState < prevProgressBarState ? "progressbar.cutting" : "");
-                    if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
+                    var door = targetItem.GetComponent<Door>();
+                    if (door == null || door.Stuck <= 0)
+                    {
+                        Vector2 progressBarPos = targetItem.DrawPosition;
+                        var progressBar = user?.UpdateHUDProgressBar(
+                            targetItem,
+                            progressBarPos,
+                            progressBarState,
+                            GUI.Style.Red, GUI.Style.Green,
+                            progressBarState < prevProgressBarState ? "progressbar.cutting" : "");
+                        if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
+                    }
+                    prevProgressBarState = progressBarState;
+                    prevProgressBarTarget = targetItem;
                 }
-                prevProgressBarState = progressBarState;
-                prevProgressBarTarget = targetItem;
             }
 
             Vector2 particlePos = ConvertUnits.ToDisplayUnits(pickedPosition);

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/Connection.cs

@@ -48,18 +48,14 @@ namespace Barotrauma.Items.Components
 
             Wire equippedWire = null;
             
-            bool allowRewiring = GameMain.NetworkMember?.ServerSettings == null || GameMain.NetworkMember.ServerSettings.AllowRewiring;
+            bool allowRewiring = GameMain.NetworkMember?.ServerSettings == null || GameMain.NetworkMember.ServerSettings.AllowRewiring || panel.AlwaysAllowRewiring;
             if (allowRewiring && (!panel.Locked || Screen.Selected == GameMain.SubEditorScreen))
             {
                 //if the Character using the panel has a wire item equipped
                 //and the wire hasn't been connected yet, draw it on the panel
-                for (int i = 0; i < character.SelectedItems.Length; i++)
+                foreach (Item item in character.HeldItems)
                 {
-                    Item selectedItem = character.SelectedItems[i];
-
-                    if (selectedItem == null) { continue; }
-
-                    Wire wireComponent = selectedItem.GetComponent<Wire>();
+                    Wire wireComponent = item.GetComponent<Wire>();
                     if (wireComponent != null)
                     {
                         equippedWire = wireComponent;
@@ -94,7 +90,8 @@ namespace Barotrauma.Items.Components
                             int linkIndex = c.FindWireIndex(DraggingConnected.Item);
                             if (linkIndex > -1 || panel.DisconnectedWires.Contains(DraggingConnected))
                             {
-                                Inventory.draggingItem = DraggingConnected.Item;
+                                Inventory.DraggingItems.Clear();
+                                Inventory.DraggingItems.Add(DraggingConnected.Item);
                             }
                         }
                     }
@@ -182,7 +179,11 @@ namespace Barotrauma.Items.Components
                         new Vector2(x + width / 2, y + height),
                         null, panel, "");
 
-                    if (DraggingConnected == equippedWire) { Inventory.draggingItem = equippedWire.Item; }
+                    if (DraggingConnected == equippedWire) 
+                    {
+                        Inventory.DraggingItems.Clear();
+                        Inventory.DraggingItems.Add(equippedWire.Item);
+                    }
                 }
             }
 
@@ -207,7 +208,7 @@ namespace Barotrauma.Items.Components
             //(so we don't drop the item when dropping the wire on a connection)
             if (mouseInRect || (GUI.MouseOn?.UserData is ConnectionPanel && GUI.MouseOn.MouseRect.Contains(PlayerInput.MousePosition))) 
             { 
-                Inventory.draggingItem = null; 
+                Inventory.DraggingItems.Clear(); 
             }       
         }
 
@@ -236,7 +237,7 @@ namespace Barotrauma.Items.Components
         {
             float connectorSpriteScale = (35.0f / connectionSprite.SourceRect.Width) * panel.Scale;
 
-            for (int i = 0; i < MaxLinked; i++)
+            for (int i = 0; i < MaxWires; i++)
             {
                 if (wires[i] == null || wires[i].Hidden || (DraggingConnected == wires[i] && (mouseIn || Screen.Selected == GameMain.SubEditorScreen))) { continue; }
                 if (wires[i].HiddenInGame && Screen.Selected == GameMain.GameScreen) { continue; }
@@ -380,7 +381,7 @@ namespace Barotrauma.Items.Components
                 {
                     ConnectionPanel.HighlightedWire = wire;
 
-                    bool allowRewiring = GameMain.NetworkMember?.ServerSettings == null || GameMain.NetworkMember.ServerSettings.AllowRewiring;
+                    bool allowRewiring = GameMain.NetworkMember?.ServerSettings == null || GameMain.NetworkMember.ServerSettings.AllowRewiring || panel.AlwaysAllowRewiring;
                     if (allowRewiring && (!wire.Locked && !panel.Locked || Screen.Selected == GameMain.SubEditorScreen))
                     {
                         //start dragging the wire

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/ConnectionPanel.cs

@@ -122,7 +122,7 @@ namespace Barotrauma.Items.Components
                 msg.ReadUInt16(); //user ID
                 foreach (Connection connection in Connections)
                 {
-                    for (int i = 0; i < Connection.MaxLinked; i++)
+                    for (int i = 0; i < connection.MaxWires; i++)
                     {
                         msg.ReadUInt16();
                     }
@@ -168,7 +168,7 @@ namespace Barotrauma.Items.Components
 
             foreach (Connection connection in Connections)
             {
-                for (int i = 0; i < Connection.MaxLinked; i++)
+                for (int i = 0; i < connection.MaxWires; i++)
                 {
                     ushort wireId = msg.ReadUInt16();
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/CustomInterface.cs

@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
@@ -15,7 +14,7 @@ namespace Barotrauma.Items.Components
 
         private Point ElementMaxSize => new Point(uiElementContainer.Rect.Width, (int)(65 * GUI.yScale));
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific()
         {
             CreateGUI();
         }
@@ -37,41 +36,70 @@ namespace Barotrauma.Items.Components
             float elementSize = Math.Min(1.0f / visibleElements.Count(), 1);
             foreach (CustomInterfaceElement ciElement in visibleElements)
             {
-                if (!string.IsNullOrEmpty(ciElement.PropertyName))
+                if (ciElement.HasPropertyName)
                 {
-                   var layoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, elementSize), uiElementContainer.RectTransform), isHorizontal: true)
-                   {
-                       RelativeSpacing = 0.02f,
-                       UserData = ciElement
-                   };
-                    new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), 
-                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label);
-                    var textBox = new GUITextBox(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), "", style: "GUITextBoxNoIcon")
+                    var layoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, elementSize), uiElementContainer.RectTransform), isHorizontal: true)
                     {
-                        OverflowClip = true,
+                        RelativeSpacing = 0.02f,
                         UserData = ciElement
                     };
-                    //reset size restrictions set by the Style to make sure the elements can fit the interface
-                    textBox.RectTransform.MinSize = textBox.Frame.RectTransform.MinSize = new Point(0, 0);
-                    textBox.RectTransform.MaxSize = textBox.Frame.RectTransform.MaxSize = new Point(int.MaxValue, int.MaxValue);
-                    textBox.OnDeselected += (tb, key) =>
+                    new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), 
+                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label);
+                    if (!ciElement.IsIntegerInput)
                     {
-                        if (GameMain.Client == null)
+                        var textBox = new GUITextBox(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), ciElement.Signal, style: "GUITextBoxNoIcon")
                         {
-                            TextChanged(tb.UserData as CustomInterfaceElement, textBox.Text);
-                        }
-                        else
+                            OverflowClip = true,
+                            UserData = ciElement
+                        };
+                        //reset size restrictions set by the Style to make sure the elements can fit the interface
+                        textBox.RectTransform.MinSize = textBox.Frame.RectTransform.MinSize = new Point(0, 0);
+                        textBox.RectTransform.MaxSize = textBox.Frame.RectTransform.MaxSize = new Point(int.MaxValue, int.MaxValue);
+                        textBox.OnDeselected += (tb, key) =>
                         {
-                            item.CreateClientEvent(this);
-                        }
-                    };
+                            if (GameMain.Client == null)
+                            {
+                                TextChanged(tb.UserData as CustomInterfaceElement, textBox.Text);
+                            }
+                            else
+                            {
+                                item.CreateClientEvent(this);
+                            }
+                        };
 
-                    textBox.OnEnterPressed += (tb, text) =>
+                        textBox.OnEnterPressed += (tb, text) =>
+                        {
+                            tb.Deselect();
+                            return true;
+                        };
+                        uiElements.Add(textBox);
+                    }
+                    else
                     {
-                        tb.Deselect();
-                        return true;
-                    };
-                    uiElements.Add(textBox);
+                        int.TryParse(ciElement.Signal, out int signal);
+                        var numberInput = new GUINumberInput(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), GUINumberInput.NumberType.Int)
+                        {
+                            UserData = ciElement,
+                            MinValueInt = ciElement.NumberInputMin,
+                            MaxValueInt = ciElement.NumberInputMax,
+                            IntValue = Math.Clamp(signal, ciElement.NumberInputMin, ciElement.NumberInputMax)
+                        };
+                        //reset size restrictions set by the Style to make sure the elements can fit the interface
+                        numberInput.RectTransform.MinSize = numberInput.LayoutGroup.RectTransform.MinSize = new Point(0, 0);
+                        numberInput.RectTransform.MaxSize = numberInput.LayoutGroup.RectTransform.MaxSize = new Point(int.MaxValue, int.MaxValue);
+                        numberInput.OnValueChanged += (ni) =>
+                        {
+                            if (GameMain.Client == null)
+                            {
+                                ValueChanged(ni.UserData as CustomInterfaceElement, ni.IntValue);
+                            }
+                            else
+                            {
+                                item.CreateClientEvent(this);
+                            }
+                        };
+                        uiElements.Add(numberInput);
+                    }
                 }
                 else if (ciElement.ContinuousSignal)
                 {
@@ -175,7 +203,7 @@ namespace Barotrauma.Items.Components
             foreach (var uiElement in uiElements)
             {
                 if (!(uiElement.UserData is CustomInterfaceElement element)) { continue; }
-                bool visible = Screen.Selected == GameMain.SubEditorScreen || element.StatusEffects.Any() || !string.IsNullOrEmpty(element.PropertyName) || (element.Connection != null && element.Connection.Wires.Any(w => w != null));
+                bool visible = Screen.Selected == GameMain.SubEditorScreen || element.StatusEffects.Any() || element.HasPropertyName || (element.Connection != null && element.Connection.Wires.Any(w => w != null));
                 if (visible) { visibleElementCount++; }
                 if (uiElement.Visible != visible)
                 {
@@ -203,36 +231,29 @@ namespace Barotrauma.Items.Components
             {
                 if (uiElements[i] is GUIButton button)
                 {
-                    button.Text = string.IsNullOrWhiteSpace(customInterfaceElementList[i].Label) ?
-                        TextManager.GetWithVariable("connection.signaloutx", "[num]", (i + 1).ToString()) :
-                        customInterfaceElementList[i].Label;
+                    button.Text = CreateLabelText(i);
                     button.TextBlock.Wrap = button.Text.Contains(' ');
                 }
                 else if (uiElements[i] is GUITickBox tickBox)
                 {
-                    tickBox.Text = string.IsNullOrWhiteSpace(customInterfaceElementList[i].Label) ?
-                        TextManager.GetWithVariable("connection.signaloutx", "[num]", (i + 1).ToString()) :
-                        customInterfaceElementList[i].Label;
+                    tickBox.Text = CreateLabelText(i);
                     tickBox.TextBlock.Wrap = tickBox.Text.Contains(' ');
                 }
-                if (uiElements[i] is GUITextBox textBox)
+                else if (uiElements[i] is GUITextBox || uiElements[i] is GUINumberInput)
                 {
-                    var textBlock = textBox.Parent.GetChild<GUITextBlock>();
-                    textBlock.Text = string.IsNullOrWhiteSpace(customInterfaceElementList[i].Label) ?
-                        TextManager.GetWithVariable("connection.signaloutx", "[num]", (i + 1).ToString()) :
-                        customInterfaceElementList[i].Label;
+                    var textBlock = uiElements[i].Parent.GetChild<GUITextBlock>();
+                    textBlock.Text = CreateLabelText(i);
                     textBlock.Wrap = textBlock.Text.Contains(' ');
-
-                    foreach (ISerializableEntity e in item.AllPropertyObjects)
-                    {
-                        if (e.SerializableProperties.ContainsKey(customInterfaceElementList[i].PropertyName))
-                        {
-                            textBox.Text = e.SerializableProperties[customInterfaceElementList[i].PropertyName].GetValue(e) as string;
-                        }
-                    }
                 }
             }
 
+            string CreateLabelText(int elementIndex)
+            {
+                return string.IsNullOrWhiteSpace(customInterfaceElementList[elementIndex].Label) ?
+                    TextManager.GetWithVariable("connection.signaloutx", "[num]", (elementIndex + 1).ToString()) :
+                    customInterfaceElementList[elementIndex].Label;
+            }
+
             uiElementContainer.Recalculate();
             var textBlocks = new List<GUITextBlock>();
             foreach (GUIComponent element in uiElementContainer.Children)
@@ -258,14 +279,40 @@ namespace Barotrauma.Items.Components
             GUITextBlock.AutoScaleAndNormalize(textBlocks);
         }
 
+        partial void UpdateSignalsProjSpecific()
+        {
+            for (int i = 0; i < signals.Length && i < uiElements.Count; i++)
+            {
+                if (uiElements[i] is GUITextBox tb)
+                {
+                    tb.Text = customInterfaceElementList[i].Signal;
+                }
+                else if (uiElements[i] is GUINumberInput ni)
+                {
+                    if (ni.InputType == GUINumberInput.NumberType.Int)
+                    {
+                        int.TryParse(customInterfaceElementList[i].Signal, out int value);
+                        ni.IntValue = value;
+                    }
+                }
+            }
+        }
+
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)
         {
             //extradata contains an array of buttons clicked by the player (or nothing if the player didn't click anything)
             for (int i = 0; i < customInterfaceElementList.Count; i++)
             {
-                if (!string.IsNullOrEmpty(customInterfaceElementList[i].PropertyName))
+                if (customInterfaceElementList[i].HasPropertyName)
                 {
-                    msg.Write(((GUITextBox)uiElements[i]).Text);
+                    if (!customInterfaceElementList[i].IsIntegerInput)
+                    {
+                        msg.Write(((GUITextBox)uiElements[i]).Text);
+                    }
+                    else
+                    {
+                        msg.Write(((GUINumberInput)uiElements[i]).IntValue.ToString());
+                    }
                 }
                 else if (customInterfaceElementList[i].ContinuousSignal)
                 {
@@ -282,9 +329,17 @@ namespace Barotrauma.Items.Components
         {
             for (int i = 0; i < customInterfaceElementList.Count; i++)
             {
-                if (!string.IsNullOrEmpty(customInterfaceElementList[i].PropertyName))
+                if (customInterfaceElementList[i].HasPropertyName)
                 {
-                    TextChanged(customInterfaceElementList[i], msg.ReadString());
+                    if (!customInterfaceElementList[i].IsIntegerInput)
+                    {
+                        TextChanged(customInterfaceElementList[i], msg.ReadString());
+                    }
+                    else
+                    {
+                        int.TryParse(msg.ReadString(), out int value);
+                        ValueChanged(customInterfaceElementList[i], value);
+                    }
                 }
                 else
                 {
@@ -300,6 +355,8 @@ namespace Barotrauma.Items.Components
                     }
                 }
             }
+
+            UpdateSignalsProjSpecific();
         }
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/Wire.cs

@@ -117,9 +117,9 @@ namespace Barotrauma.Items.Components
         {
             if (defaultWireSprite == null)
             {
-                defaultWireSprite = new Sprite("Content/Items/wireHorizontal.png", new Vector2(0.5f, 0.5f))
+                defaultWireSprite = new Sprite("Content/Items/Electricity/signalcomp.png", new Rectangle(970, 47, 14, 16), new Vector2(0.5f, 0.5f))
                 {
-                    Depth = 0.85f
+                    Depth = 0.855f
                 };
             }
 
@@ -156,7 +156,7 @@ namespace Barotrauma.Items.Components
                 drawOffset = sub.DrawPosition + sub.HiddenSubPosition;
             }
 
-            float depth = item.IsSelected ? 0.0f : SubEditorScreen.IsWiringMode() ? 0.02f : wireSprite.Depth + ((item.ID % 100) * 0.00001f);
+            float depth = item.IsSelected ? 0.0f : SubEditorScreen.IsWiringMode() ? 0.02f : wireSprite.Depth + (item.ID % 100) * 0.000001f;// item.GetDrawDepth(wireSprite.Depth, wireSprite);
 
             if (item.IsHighlighted)
             {
@@ -214,7 +214,10 @@ namespace Barotrauma.Items.Components
                             roundedGridPos += item.Submarine.Position;
                         }
 
-                        Submarine.DrawGrid(spriteBatch, 14, gridPos, roundedGridPos, alpha: 0.7f);
+                        if (!SubEditorScreen.IsSubEditor() || !SubEditorScreen.ShouldDrawGrid)
+                        {
+                            Submarine.DrawGrid(spriteBatch, 14, gridPos, roundedGridPos, alpha: 0.25f);
+                        }
 
                         WireSection.Draw(
                             spriteBatch, this,
@@ -286,10 +289,8 @@ namespace Barotrauma.Items.Components
         public static void UpdateEditing(List<Wire> wires)
         {
             var doubleClicked = PlayerInput.DoubleClicked();
-            
-            Wire equippedWire =
-                Character.Controlled?.SelectedItems[0]?.GetComponent<Wire>() ??
-                Character.Controlled?.SelectedItems[1]?.GetComponent<Wire>();
+
+            Wire equippedWire = Character.Controlled.HeldItems.FirstOrDefault(it => it.GetComponent<Wire>() != null)?.GetComponent<Wire>();
             if (equippedWire != null && GUI.MouseOn == null)
             {
                 if (PlayerInput.PrimaryMouseButtonClicked() && Character.Controlled.SelectedConstruction == null)
@@ -329,6 +330,9 @@ namespace Barotrauma.Items.Components
                         nodeWorldPos = nodeWorldPos - sub.HiddenSubPosition - sub.Position;
                     }
 
+                    if (selectedNodeIndex.HasValue && selectedNodeIndex.Value >= draggingWire.nodes.Count) { selectedNodeIndex = null; }
+                    if (highlightedNodeIndex.HasValue && highlightedNodeIndex.Value >= draggingWire.nodes.Count) { highlightedNodeIndex = null; }
+
                     if (selectedNodeIndex.HasValue)
                     {
                         if (!PlayerInput.IsShiftDown())
@@ -342,14 +346,15 @@ namespace Barotrauma.Items.Components
                     }
                     else
                     {
-                        if ((highlightedNodeIndex.HasValue && Vector2.DistanceSquared(nodeWorldPos, draggingWire.nodes[(int)highlightedNodeIndex]) > Submarine.GridSize.X * Submarine.GridSize.X) || 
+                        float dragDistance = Submarine.GridSize.X * Submarine.GridSize.Y;
+                        dragDistance *= 0.5f;
+                        if ((highlightedNodeIndex.HasValue && Vector2.DistanceSquared(nodeWorldPos, draggingWire.nodes[(int)highlightedNodeIndex]) >= dragDistance) || 
                             PlayerInput.IsShiftDown())
                         {
                             selectedNodeIndex = highlightedNodeIndex;
                         }
                     }
 
-
                     MapEntity.SelectEntity(draggingWire.item);
                 }
 
@@ -396,6 +401,13 @@ namespace Barotrauma.Items.Components
                         if (closestIndex > -1)
                         {
                             highlightedNodeIndex = closestIndex;
+
+                            Vector2 nudge = MapEntity.GetNudgeAmount(doHold: false);
+                            if (nudge != Vector2.Zero && closestIndex < selectedWire.nodes.Count)
+                            {
+                                selectedWire.MoveNode(closestIndex, nudge);
+                            }
+
                             //start dragging the node
                             if (PlayerInput.PrimaryMouseButtonHeld())
                             {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/StatusHUD.cs

@@ -148,20 +148,20 @@ namespace Barotrauma.Items.Components
             List<string> texts = new List<string>();
             List<Color> textColors = new List<Color>();
 
-            if (target.Info != null)
-            {
-                texts.Add(target.Name);
-                textColors.Add(GUI.Style.TextColor);
-            }
+            texts.Add(target.Info == null ? target.DisplayName : target.Info.DisplayName);
+            textColors.Add(GUI.Style.TextColor);            
             
             if (target.IsDead)
             {
                 texts.Add(TextManager.Get("Deceased"));
                 textColors.Add(GUI.Style.Red);
-                texts.Add(
-                    target.CauseOfDeath.Affliction?.CauseOfDeathDescription ??
-                    TextManager.AddPunctuation(':', TextManager.Get("CauseOfDeath"), TextManager.Get("CauseOfDeath." + target.CauseOfDeath.Type.ToString())));
-                textColors.Add(GUI.Style.Red);
+                if (target.CauseOfDeath != null)
+                {
+                    texts.Add(
+                        target.CauseOfDeath.Affliction?.CauseOfDeathDescription ??
+                        TextManager.AddPunctuation(':', TextManager.Get("CauseOfDeath"), TextManager.Get("CauseOfDeath." + target.CauseOfDeath.Type.ToString())));
+                    textColors.Add(GUI.Style.Red);
+                }
             }
             else
             {
@@ -170,6 +170,21 @@ namespace Barotrauma.Items.Components
                     texts.Add(target.customInteractHUDText);
                     textColors.Add(GUI.Style.Green);
                 }
+                if (!target.IsIncapacitated && target.IsPet)
+                {
+                    texts.Add(CharacterHUD.GetCachedHudText("PlayHint", GameMain.Config.KeyBindText(InputType.Use)));
+                    textColors.Add(GUI.Style.Green);
+                }
+                if (target.CharacterHealth.UseHealthWindow && equipper?.FocusedCharacter == target && equipper.CanInteractWith(target, 160f, false))
+                {
+                    texts.Add(CharacterHUD.GetCachedHudText("HealHint", GameMain.Config.KeyBindText(InputType.Health)));
+                    textColors.Add(GUI.Style.Green);
+                }
+                if (target.CanBeDragged)
+                {
+                    texts.Add(CharacterHUD.GetCachedHudText("GrabHint", GameMain.Config.KeyBindText(InputType.Grab)));
+                    textColors.Add(GUI.Style.Green);
+                }
 
                 if (target.IsUnconscious)
                 {
@@ -181,7 +196,7 @@ namespace Barotrauma.Items.Components
                     texts.Add(TextManager.Get("Stunned"));
                     textColors.Add(GUI.Style.Orange);
                 }
-                
+
                 int oxygenTextIndex = MathHelper.Clamp((int)Math.Floor((1.0f - (target.Oxygen / 100.0f)) * OxygenTexts.Length), 0, OxygenTexts.Length - 1);
                 texts.Add(OxygenTexts[oxygenTextIndex]);
                 textColors.Add(Color.Lerp(GUI.Style.Red, GUI.Style.Green, target.Oxygen / 100.0f));
@@ -210,7 +225,7 @@ namespace Barotrauma.Items.Components
 
                 foreach (AfflictionPrefab affliction in combinedAfflictionStrengths.Keys)
                 {
-                    texts.Add(TextManager.AddPunctuation(':', affliction.Name, ((int)combinedAfflictionStrengths[affliction]).ToString() + " %"));
+                    texts.Add(TextManager.AddPunctuation(':', affliction.Name, Math.Max(((int)combinedAfflictionStrengths[affliction]), 1).ToString() + " %"));
                     textColors.Add(Color.Lerp(GUI.Style.Orange, GUI.Style.Red, combinedAfflictionStrengths[affliction] / affliction.MaxStrength));
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs

@@ -181,14 +181,14 @@ namespace Barotrauma.Items.Components
             {
                 if (moveSoundChannel == null && startMoveSound != null)
                 {
-                    moveSoundChannel = SoundPlayer.PlaySound(startMoveSound.Sound, item.WorldPosition, startMoveSound.Volume, startMoveSound.Range);
+                    moveSoundChannel = SoundPlayer.PlaySound(startMoveSound.Sound, item.WorldPosition, startMoveSound.Volume, startMoveSound.Range, ignoreMuffling: startMoveSound.IgnoreMuffling);
                 }
                 else if (moveSoundChannel == null || !moveSoundChannel.IsPlaying)
                 {
                     if (moveSound != null)
                     {
                         moveSoundChannel.FadeOutAndDispose();
-                        moveSoundChannel = SoundPlayer.PlaySound(moveSound.Sound, item.WorldPosition, moveSound.Volume, moveSound.Range);
+                        moveSoundChannel = SoundPlayer.PlaySound(moveSound.Sound, item.WorldPosition, moveSound.Volume, moveSound.Range, ignoreMuffling: moveSound.IgnoreMuffling);
                         if (moveSoundChannel != null) moveSoundChannel.Looping = true;
                     }
                 }
@@ -200,7 +200,7 @@ namespace Barotrauma.Items.Components
                     if (endMoveSound != null && moveSoundChannel.Sound != endMoveSound.Sound)
                     {
                         moveSoundChannel.FadeOutAndDispose();
-                        moveSoundChannel = SoundPlayer.PlaySound(endMoveSound.Sound, item.WorldPosition, endMoveSound.Volume, endMoveSound.Range);
+                        moveSoundChannel = SoundPlayer.PlaySound(endMoveSound.Sound, item.WorldPosition, endMoveSound.Volume, endMoveSound.Range, ignoreMuffling: endMoveSound.IgnoreMuffling);
                         if (moveSoundChannel != null) moveSoundChannel.Looping = false;
                     }
                     else if (!moveSoundChannel.IsPlaying)
@@ -247,7 +247,7 @@ namespace Barotrauma.Items.Components
         
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
-            if (!MathUtils.NearlyEqual(item.Rotation, prevBaseRotation))
+            if (!MathUtils.NearlyEqual(item.Rotation, prevBaseRotation) || !MathUtils.NearlyEqual(item.Scale, prevScale))
             {
                 UpdateTransformedBarrelPos();
             }
@@ -290,9 +290,10 @@ namespace Barotrauma.Items.Components
 
             const float widgetRadius = 60.0f;
 
+            Vector2 center = new Vector2((float)Math.Cos((maxRotation + minRotation) / 2), (float)Math.Sin((maxRotation + minRotation) / 2));
             GUI.DrawLine(spriteBatch,
                 drawPos,
-                drawPos + new Vector2((float)Math.Cos((maxRotation + minRotation) / 2), (float)Math.Sin((maxRotation + minRotation) / 2)) * widgetRadius,
+                drawPos + center * widgetRadius,
                 Color.LightGreen);
 
             const float coneRadius = 300.0f;
@@ -300,7 +301,11 @@ namespace Barotrauma.Items.Components
             float circleRadius = coneRadius / Screen.Selected.Cam.Zoom * GUI.Scale;
             float lineThickness = 1f / Screen.Selected.Cam.Zoom;
 
-            if (radians > Math.PI * 2)
+            if (Math.Abs(minRotation - maxRotation) < 0.02f)
+            {
+                spriteBatch.DrawLine(drawPos, drawPos + center * circleRadius, GUI.Style.Green, thickness: lineThickness);
+            }
+            else if (radians > Math.PI * 2)
             {
                 spriteBatch.DrawCircle(drawPos, circleRadius, 180, GUI.Style.Red, thickness: lineThickness);
             }
@@ -309,12 +314,15 @@ namespace Barotrauma.Items.Components
                 spriteBatch.DrawSector(drawPos, circleRadius, radians, (int)Math.Abs(90 * radians), GUI.Style.Green, offset: minRotation, thickness: lineThickness);
             }
 
-            Widget minRotationWidget = GetWidget("minrotation", spriteBatch, size: 10, initMethod: (widget) =>
+            int baseWidgetScale = GUI.IntScale(16);
+            int widgetSize = (int) (Math.Max(baseWidgetScale, baseWidgetScale / Screen.Selected.Cam.Zoom));
+            float widgetThickness = Math.Max(1f, lineThickness);
+            Widget minRotationWidget = GetWidget("minrotation", spriteBatch, size: widgetSize, thickness: widgetThickness, initMethod: (widget) =>
             {
                 widget.Selected += () =>
-                 {
-                     oldRotation = RotationLimits;
-                 };
+                {
+                    oldRotation = RotationLimits;
+                };
                 widget.MouseDown += () =>
                 {
                     widget.color = GUI.Style.Green;
@@ -324,6 +332,7 @@ namespace Barotrauma.Items.Components
                 {
                     widget.color = Color.Yellow;
                     item.CreateEditingHUD();
+                    RotationLimits = RotationLimits;
                     if (SubEditorScreen.IsSubEditor())
                     {
                         SubEditorScreen.StoreCommand(new PropertyCommand(this, "RotationLimits", RotationLimits, oldRotation));
@@ -332,13 +341,7 @@ namespace Barotrauma.Items.Components
                 widget.MouseHeld += (deltaTime) =>
                 {
                     minRotation = GetRotationAngle(GetDrawPos());
-                    if (minRotation > maxRotation)
-                    {
-                        float temp = minRotation;
-                        minRotation = maxRotation;
-                        maxRotation = temp;
-                    }
-                    RotationLimits = RotationLimits;
+                    UpdateBarrel();
                     MapEntity.DisableSelect = true;
                 };
                 widget.PreUpdate += (deltaTime) =>
@@ -359,7 +362,7 @@ namespace Barotrauma.Items.Components
                 };
             });
 
-            Widget maxRotationWidget = GetWidget("maxrotation", spriteBatch, size: 10, initMethod: (widget) =>
+            Widget maxRotationWidget = GetWidget("maxrotation", spriteBatch, size: widgetSize, thickness: widgetThickness, initMethod: (widget) =>
             {
                 widget.Selected += () =>
                 {
@@ -368,12 +371,13 @@ namespace Barotrauma.Items.Components
                 widget.MouseDown += () =>
                 {
                     widget.color = GUI.Style.Green;
-                    prevAngle = minRotation;
+                    prevAngle = maxRotation;
                 };
                 widget.Deselected += () =>
                 {
                     widget.color = Color.Yellow;
                     item.CreateEditingHUD();
+                    RotationLimits = RotationLimits;
                     if (SubEditorScreen.IsSubEditor())
                     {
                         SubEditorScreen.StoreCommand(new PropertyCommand(this, "RotationLimits", RotationLimits, oldRotation));
@@ -382,13 +386,7 @@ namespace Barotrauma.Items.Components
                 widget.MouseHeld += (deltaTime) =>
                 {
                     maxRotation = GetRotationAngle(GetDrawPos());
-                    if (minRotation > maxRotation)
-                    {
-                        float temp = minRotation;
-                        minRotation = maxRotation;
-                        maxRotation = temp;
-                    }
-                    RotationLimits = RotationLimits;
+                    UpdateBarrel();
                     MapEntity.DisableSelect = true;
                 };
                 widget.PreUpdate += (deltaTime) =>
@@ -418,22 +416,32 @@ namespace Barotrauma.Items.Components
                 drawPos.Y = -drawPos.Y;
                 return drawPos;
             }
+
+            void UpdateBarrel()
+            {
+                rotation = (minRotation + maxRotation) / 2;
+            }
         }
 
-        private Widget GetWidget(string id, SpriteBatch spriteBatch, int size = 5, Action<Widget> initMethod = null)
+        private Widget GetWidget(string id, SpriteBatch spriteBatch, int size = 5, float thickness = 1f, Action<Widget> initMethod = null)
         {
+            Vector2 offset = new Vector2(size / 2 + 5, -10);
             if (!widgets.TryGetValue(id, out Widget widget))
             {
                 widget = new Widget(id, size, Widget.Shape.Rectangle)
                 {
                     color = Color.Yellow,
-                    tooltipOffset = new Vector2(size / 2 + 5, -10),
+                    tooltipOffset = offset,
                     inputAreaMargin = 20,
                     RequireMouseOn = false
                 };
                 widgets.Add(id, widget);
                 initMethod?.Invoke(widget);
             }
+
+            widget.size = size;
+            widget.tooltipOffset = offset;
+            widget.thickness = thickness;
             return widget;
         }
 
@@ -488,13 +496,8 @@ namespace Barotrauma.Items.Components
             List<Item> availableAmmo = new List<Item>();
             foreach (MapEntity e in item.linkedTo)
             {
-                var linkedItem = e as Item;
-                if (linkedItem == null) continue;
-
-                var itemContainer = linkedItem.GetComponent<ItemContainer>();
-                if (itemContainer?.Inventory?.Items == null) continue;   
-                
-                availableAmmo.AddRange(itemContainer.Inventory.Items);                
+                if (!(e is Item linkedItem)) { continue; }
+                availableAmmo.AddRange(linkedItem.ContainedItems);                
             }            
                         
             float chargeRate = 
@@ -536,7 +539,7 @@ namespace Barotrauma.Items.Components
                 {
                     // TODO: Optimize? Creates multiple new objects per frame?
                     Inventory.DrawSlot(spriteBatch, null,
-                        new InventorySlot(new Rectangle(invSlotPos + new Point((i % slotsPerRow) * (slotSize.X + spacing), (int)Math.Floor(i / (float)slotsPerRow) * (slotSize.Y + spacing)), slotSize)),
+                        new VisualSlot(new Rectangle(invSlotPos + new Point((i % slotsPerRow) * (slotSize.X + spacing), (int)Math.Floor(i / (float)slotsPerRow) * (slotSize.Y + spacing)), slotSize)),
                         availableAmmo[i], -1, true);
                 }
                 if (flashNoAmmo)

Barotrauma/BarotraumaClient/ClientSource/Items/DockingPort.cs

@@ -165,7 +165,14 @@ namespace Barotrauma.Items.Components
 
                 if (isLocked)
                 {
-                    Lock(isNetworkMessage: true, forcePosition: true);
+                    if (DockingTarget.joint != null)
+                    {
+                        DockingTarget.Lock(isNetworkMessage: true, forcePosition: true);
+                    }
+                    else
+                    {
+                        Lock(isNetworkMessage: true, forcePosition: true);
+                    }
                 }
             }
             else

Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Barotrauma.Extensions;
+using Barotrauma.MapCreatures.Behavior;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 
@@ -15,7 +16,7 @@ namespace Barotrauma
 {
     partial class Item : MapEntity, IDamageable, ISerializableEntity, IServerSerializable, IClientSerializable
     {
-        public static bool ShowItems = true;
+        public static bool ShowItems = true, ShowWires = true;
         
         private readonly List<PosInfo> positionBuffer = new List<PosInfo>();
 
@@ -29,6 +30,7 @@ namespace Barotrauma
         private bool editingHUDRefreshPending;
         private float editingHUDRefreshTimer;
 
+        private ContainedItemSprite activeContainedSprite;
 
         private readonly Dictionary<DecorativeSprite, DecorativeSprite.State> spriteAnimState = new Dictionary<DecorativeSprite, DecorativeSprite.State>();
 
@@ -85,7 +87,7 @@ namespace Barotrauma
         {
             get
             {
-                if (!GameMain.SubEditorScreen.ShowThalamus && prefab.Category.HasFlag(MapEntityCategory.Thalamus))
+                if (GameMain.SubEditorScreen.IsSubcategoryHidden(prefab.Subcategory))
                 {
                     return false;
                 }
@@ -93,18 +95,20 @@ namespace Barotrauma
             }
         }
 
+        public float GetDrawDepth()
+        {
+            return GetDrawDepth(SpriteDepth, Sprite);
+        }
+
         public Color GetSpriteColor()
         {
             Color color = spriteColor;
             if (Prefab.UseContainedSpriteColor && ownInventory != null)
             {
-                for (int i = 0; i < ownInventory.Items.Length; i++)
+                foreach (Item item in ContainedItems)
                 {
-                    if (ownInventory.Items[i] != null)
-                    {
-                        color = ownInventory.Items[i].ContainerColor;
-                        break;
-                    }
+                    color = item.ContainerColor;
+                    break;
                 }
             }
             return color;
@@ -115,13 +119,10 @@ namespace Barotrauma
             Color color = InventoryIconColor;
             if (Prefab.UseContainedInventoryIconColor && ownInventory != null)
             {
-                for (int i = 0; i < ownInventory.Items.Length; i++)
+                foreach (Item item in ContainedItems)
                 {
-                    if (ownInventory.Items[i] != null)
-                    {
-                        color = ownInventory.Items[i].ContainerColor;
-                        break;
-                    }
+                    color = item.ContainerColor;
+                    break;
                 }
             }
             return color;
@@ -130,6 +131,7 @@ namespace Barotrauma
         partial void SetActiveSpriteProjSpecific()
         {
             activeSprite = prefab.sprite;
+            activeContainedSprite = null;
             Holdable holdable = GetComponent<Holdable>();
             if (holdable != null && holdable.Attached)
             {
@@ -137,7 +139,9 @@ namespace Barotrauma
                 {
                     if (containedSprite.UseWhenAttached)
                     {
-                        activeSprite = containedSprite.Sprite;
+                        activeContainedSprite = containedSprite;
+                        activeSprite = containedSprite.Sprite; 
+                        UpdateSpriteStates(0.0f);
                         return;
                     }
                 }
@@ -149,7 +153,9 @@ namespace Barotrauma
                 {
                     if (containedSprite.MatchesContainer(Container))
                     {
+                        activeContainedSprite = containedSprite;
                         activeSprite = containedSprite.Sprite;
+                        UpdateSpriteStates(0.0f);
                         return;
                     }
                 }
@@ -182,6 +188,7 @@ namespace Barotrauma
                 decorativeSprite.Sprite.EnsureLazyLoaded();
                 spriteAnimState.Add(decorativeSprite, new DecorativeSprite.State());
             }
+            SetActiveSprite();
             UpdateSpriteStates(0.0f);
         }
 
@@ -235,12 +242,20 @@ namespace Barotrauma
         public override void Draw(SpriteBatch spriteBatch, bool editing, bool back = true)
         {
             if (!Visible || (!editing && HiddenInGame)) { return; }
-            if (editing && !ShowItems) { return; }
+
+            if (editing)
+            {
+                if (isWire)
+                {
+                    if (!ShowWires) { return; }
+                }
+                else if (!ShowItems) { return; }
+            }
             
             Color color = IsHighlighted && !GUI.DisableItemHighlights && Screen.Selected != GameMain.GameScreen ? GUI.Style.Orange : GetSpriteColor();
             //if (IsSelected && editing) color = Color.Lerp(color, Color.Gold, 0.5f);
 
-            bool isWiringMode = editing && SubEditorScreen.IsWiringMode() && !isWire && parentInventory == null;
+            bool isWiringMode = editing && SubEditorScreen.TransparentWiringMode && SubEditorScreen.IsWiringMode() && !isWire && parentInventory == null;
             bool renderTransparent = isWiringMode && GetComponent<ConnectionPanel>() == null;
             if (renderTransparent) { color *= 0.15f; }
             
@@ -300,7 +315,7 @@ namespace Barotrauma
                         foreach (var decorativeSprite in Prefab.DecorativeSprites)
                         {
                             if (!spriteAnimState[decorativeSprite].IsActive) { continue; }                            
-                            Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, -rotationRad) * Scale;
+                            Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier, -rotationRad) * Scale;
                             if (flippedX && Prefab.CanSpriteFlipX) { offset.X = -offset.X; }
                             if (flippedY && Prefab.CanSpriteFlipY) { offset.Y = -offset.Y; }
                             decorativeSprite.Sprite.DrawTiled(spriteBatch, 
@@ -323,7 +338,7 @@ namespace Barotrauma
                         }
                         activeSprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y) + drawOffset, color, origin, rotationRad, Scale, activeSprite.effects, depth);
                         fadeInBrokenSprite?.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y) + fadeInBrokenSprite.Offset.ToVector2() * Scale, color * fadeInBrokenSpriteAlpha, origin, rotationRad, Scale, activeSprite.effects, depth - 0.000001f);
-                        if (Infector != null && Infector.ParentBallastFlora.HasBrokenThrough)
+                        if (Infector != null && (Infector.ParentBallastFlora.HasBrokenThrough || BallastFloraBehavior.AlwaysShowBallastFloraSprite))
                         {
                             Prefab.InfectedSprite?.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y) + drawOffset, color, Prefab.InfectedSprite.Origin, rotationRad, Scale, activeSprite.effects, depth - 0.001f);
                             Prefab.DamagedInfectedSprite?.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y) + drawOffset, Infector.HealthColor, Prefab.DamagedInfectedSprite.Origin, rotationRad, Scale, activeSprite.effects, depth - 0.002f);
@@ -331,12 +346,12 @@ namespace Barotrauma
                         foreach (var decorativeSprite in Prefab.DecorativeSprites)
                         {
                             if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                            float rot = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState);
-                            Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, -rotationRad) * Scale;
+                            float rot = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor);
+                            Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier, -rotationRad) * Scale;
                             if (flippedX && Prefab.CanSpriteFlipX) { offset.X = -offset.X; }
                             if (flippedY && Prefab.CanSpriteFlipY) { offset.Y = -offset.Y; }
                             decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X + offset.X, -(DrawPosition.Y + offset.Y)), color, 
-                                rotationRad + rot, decorativeSprite.Scale * Scale, activeSprite.effects,
+                                rotationRad + rot, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, activeSprite.effects,
                                 depth: Math.Min(depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth), 0.999f));
                         }
                     }
@@ -348,7 +363,7 @@ namespace Barotrauma
                     {
                         if (!back) { return; }
                         float depthStep = 0.000001f;
-                        if (holdable.Picker.SelectedItems[0] == this)
+                        if (holdable.Picker.Inventory?.GetItemInLimbSlot(InvSlotType.RightHand) == this)
                         {
                             Limb holdLimb = holdable.Picker.AnimController.GetLimb(LimbType.RightHand);
                             if (holdLimb?.ActiveSprite != null)
@@ -360,7 +375,7 @@ namespace Barotrauma
                                 }
                             }
                         }
-                        else if (holdable.Picker.SelectedItems[1] == this)
+                        else if (holdable.Picker.Inventory?.GetItemInLimbSlot(InvSlotType.LeftHand) == this)
                         {
                             Limb holdLimb = holdable.Picker.AnimController.GetLimb(LimbType.LeftHand);
                             if (holdLimb?.ActiveSprite != null)
@@ -379,8 +394,8 @@ namespace Barotrauma
                     foreach (var decorativeSprite in Prefab.DecorativeSprites)
                     {
                         if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                        float rotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState);
-                        Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, -rotationRad) * Scale;
+                        float rotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor);
+                        Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier, -rotationRad) * Scale;
                         if (flippedX && Prefab.CanSpriteFlipX) { offset.X = -offset.X; }
                         if (flippedY && Prefab.CanSpriteFlipY) { offset.Y = -offset.Y; }
                         var ca = (float)Math.Cos(-body.Rotation);
@@ -388,7 +403,7 @@ namespace Barotrauma
                         Vector2 transformedOffset = new Vector2(ca * offset.X + sa * offset.Y, -sa * offset.X + ca * offset.Y);
 
                         decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X + transformedOffset.X, -(DrawPosition.Y + transformedOffset.Y)), color,
-                            -body.Rotation + rotation, decorativeSprite.Scale * Scale, activeSprite.effects,
+                            -body.Rotation + rotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, activeSprite.effects,
                             depth: depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth));
                     }
                 }
@@ -400,12 +415,12 @@ namespace Barotrauma
                     foreach (var decorativeSprite in upgradeSprites)
                     {
                         if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                        float rotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState);
-                        Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, -rotationRad) * Scale;
+                        float rotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor);
+                        Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier, -rotationRad) * Scale;
                         if (flippedX && Prefab.CanSpriteFlipX) { offset.X = -offset.X; }
                         if (flippedY && Prefab.CanSpriteFlipY) { offset.Y = -offset.Y; }
                         decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X + offset.X, -(DrawPosition.Y + offset.Y)), color,
-                            rotation, decorativeSprite.Scale * Scale, activeSprite.effects,
+                            rotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, activeSprite.effects,
                             depth: depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth));
                     }
                     
@@ -500,12 +515,39 @@ namespace Barotrauma
 
         public void UpdateSpriteStates(float deltaTime)
         {
-            DecorativeSprite.UpdateSpriteStates(Prefab.DecorativeSpriteGroups, spriteAnimState, ID, deltaTime, ConditionalMatches);
+            if (activeContainedSprite != null)
+            {
+                if (activeContainedSprite.DecorativeSpriteBehavior == ContainedItemSprite.DecorativeSpriteBehaviorType.HideWhenVisible)
+                {
+                    foreach (DecorativeSprite decorativeSprite in Prefab.DecorativeSprites)
+                    {
+                        var spriteState = spriteAnimState[decorativeSprite];
+                        spriteState.IsActive = false;
+                    }
+                    return;
+                }
+            }
+            else
+            {
+                foreach (var containedSprite in Prefab.ContainedSprites)
+                {
+                    if (containedSprite.Sprite != activeSprite && containedSprite.DecorativeSpriteBehavior == ContainedItemSprite.DecorativeSpriteBehaviorType.HideWhenNotVisible)
+                    {
+                        foreach (DecorativeSprite decorativeSprite in Prefab.DecorativeSprites)
+                        {
+                            var spriteState = spriteAnimState[decorativeSprite];
+                            spriteState.IsActive = false;
+                        }
+                        return;
+                    }
+                }
+            }
+
+            DecorativeSprite.UpdateSpriteStates(Prefab.DecorativeSpriteGroups, spriteAnimState, ID, deltaTime, ConditionalMatches);            
             
             foreach (var upgrade in Upgrades)
             {
-                var upgradeSprites = GetUpgradeSprites(upgrade);
-                
+                var upgradeSprites = GetUpgradeSprites(upgrade);                
                 foreach (var decorativeSprite in upgradeSprites)
                 {
                     var spriteState = spriteAnimState[decorativeSprite];
@@ -1030,6 +1072,28 @@ namespace Barotrauma
             // Always create the texts if they have not yet been created
             if (texts.Any() && !recreateHudTexts) { return texts; }
             texts.Clear();
+
+            string nameText = Name;
+            if (Prefab.Identifier == "idcard" || Tags.Contains("despawncontainer"))
+            {
+                string[] readTags = Tags.Split(',');
+                string idName = null;
+                foreach (string tag in readTags)
+                {
+                    string[] s = tag.Split(':');
+                    if (s[0] == "name")
+                    {
+                        idName = s[1];
+                        break;
+                    }
+                }
+                if (idName != null)
+                {
+                    nameText += $" ({idName})";
+                }
+            }
+            texts.Add(new ColoredText(nameText, GUI.Style.TextColor, false, false));            
+
             foreach (ItemComponent ic in components)
             {
                 if (string.IsNullOrEmpty(ic.DisplayMsg)) { continue; }
@@ -1254,7 +1318,7 @@ namespace Barotrauma
         {
             if (GameMain.Client == null) { return; }
 
-            if (parentInventory != null || body == null || !body.Enabled || Removed)
+            if (parentInventory != null || body == null || !body.Enabled || Removed || (GetComponent<Projectile>()?.IsStuckToTarget ?? false))
             {
                 positionBuffer.Clear();
                 return;
@@ -1262,12 +1326,7 @@ namespace Barotrauma
 
             isActive = true;
 
-            Vector2 newVelocity = body.LinearVelocity;
-            Vector2 newPosition = body.SimPosition;
-            float newAngularVelocity = body.AngularVelocity;
-            float newRotation = body.Rotation;
-            body.CorrectPosition(positionBuffer, out newPosition, out newVelocity, out newRotation, out newAngularVelocity);
-
+            body.CorrectPosition(positionBuffer, out Vector2 newPosition, out Vector2 newVelocity, out float newRotation, out float newAngularVelocity);
             body.LinearVelocity = newVelocity;
             body.AngularVelocity = newAngularVelocity;
             if (Vector2.DistanceSquared(newPosition, body.SimPosition) > 0.0001f ||
@@ -1485,7 +1544,7 @@ namespace Barotrauma
 
             foreach (WifiComponent wifiComponent in item.GetComponents<WifiComponent>())
             {
-                wifiComponent.TeamID = (Character.TeamType)teamID;
+                wifiComponent.TeamID = (CharacterTeamType)teamID;
             }
             if (descriptionChanged) { item.Description = itemDesc; }
             if (tagsChanged) { item.Tags = tags; }
@@ -1516,10 +1575,10 @@ namespace Barotrauma
 
         partial void RemoveProjSpecific()
         {
-            if (Inventory.draggingItem == this)
+            if (Inventory.DraggingItems.Contains(this))
             {
-                Inventory.draggingItem = null;
-                Inventory.draggingSlot = null;
+                Inventory.DraggingItems.Clear();
+                Inventory.DraggingSlot = null;
             }
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Items/ItemInventory.cs

@@ -24,14 +24,14 @@ namespace Barotrauma
 
         protected override void CalculateBackgroundFrame()
         {
-            var firstSlot = slots.FirstOrDefault();
+            var firstSlot = visualSlots.FirstOrDefault();
             if (firstSlot == null) { return; }
             Rectangle frame = firstSlot.Rect;
             frame.Location += firstSlot.DrawOffset.ToPoint();
             for (int i = 1; i < capacity; i++)
             {
-                Rectangle slotRect = slots[i].Rect;
-                slotRect.Location += slots[i].DrawOffset.ToPoint();
+                Rectangle slotRect = visualSlots[i].Rect;
+                slotRect.Location += visualSlots[i].DrawOffset.ToPoint();
                 frame = Rectangle.Union(frame, slotRect);
             }
             BackgroundFrame = new Rectangle(
@@ -43,7 +43,7 @@ namespace Barotrauma
 
         public override void Draw(SpriteBatch spriteBatch, bool subInventory = false)
         {
-            if (slots != null && slots.Length > 0)
+            if (visualSlots != null && visualSlots.Length > 0)
             {
                 CalculateBackgroundFrame();
                 if (container.InventoryBackSprite == null)
@@ -70,7 +70,7 @@ namespace Barotrauma
                 if (container.InventoryBottomSprite != null && !subInventory)
                 {
                     container.InventoryBottomSprite.Draw(spriteBatch, 
-                        new Vector2(BackgroundFrame.Center.X, BackgroundFrame.Bottom) + slots[0].DrawOffset, 
+                        new Vector2(BackgroundFrame.Center.X, BackgroundFrame.Bottom) + visualSlots[0].DrawOffset, 
                         0.0f, UIScale);
                 }
 

Barotrauma/BarotraumaClient/ClientSource/Items/ItemPrefab.cs

@@ -27,8 +27,14 @@ namespace Barotrauma
 
     class ContainedItemSprite
     {
+        public enum DecorativeSpriteBehaviorType
+        {
+            None, HideWhenVisible, HideWhenNotVisible
+        }
+
         public readonly Sprite Sprite;
         public readonly bool UseWhenAttached;
+        public readonly DecorativeSpriteBehaviorType DecorativeSpriteBehavior;
         public readonly string[] AllowedContainerIdentifiers;
         public readonly string[] AllowedContainerTags;
 
@@ -36,6 +42,7 @@ namespace Barotrauma
         {
             Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
             UseWhenAttached = element.GetAttributeBool("usewhenattached", false);
+            Enum.TryParse(element.GetAttributeString("decorativespritebehavior", "None"), ignoreCase: true, out DecorativeSpriteBehavior);
             AllowedContainerIdentifiers = element.GetAttributeStringArray("allowedcontaineridentifiers", new string[0], convertToLowerInvariant: true);
             AllowedContainerTags = element.GetAttributeStringArray("allowedcontainertags", new string[0], convertToLowerInvariant: true);
         }