v1.2.6.0 (Winter Update)

2023-12-14 16:11:27 +02:00
parent af8cc89fce
commit b91e85559d
375 changed files with 7771 additions and 2874 deletions
@@ -568,7 +568,7 @@ namespace Barotrauma
                                itemContainer.KeepOpenWhenEquippedBy(character) && 
                                !DraggingItems.Contains(item) &&
                                character.CanAccessInventory(itemContainer.Inventory) &&
-                                !highlightedSubInventorySlots.Any(s => s.Inventory == itemContainer.Inventory))
+                                !highlightedSubInventorySlots.Any(s => s.Inventory == itemContainer.Inventory && s.SlotIndex == i))
                            {
                                ShowSubInventory(new SlotReference(this, visualSlots[i], i, false, itemContainer.Inventory), deltaTime, cam, hideSubInventories, true);
                            }
@@ -709,11 +709,11 @@ namespace Barotrauma
        private void ShowSubInventory(SlotReference slotRef, float deltaTime, Camera cam, List<SlotReference> hideSubInventories, bool isEquippedSubInventory)
        {
            Rectangle hoverArea = GetSubInventoryHoverArea(slotRef);
-            if (isEquippedSubInventory)
+            if (isEquippedSubInventory && slotRef.Inventory is not ItemInventory { Container.MovableFrame: true, Container.KeepOpenWhenEquipped: true })
            {
                foreach (SlotReference highlightedSubInventorySlot in highlightedSubInventorySlots)
                {
-                    if (highlightedSubInventorySlot == slotRef) continue;
+                    if (highlightedSubInventorySlot == slotRef) { continue; }
                    if (hoverArea.Intersects(GetSubInventoryHoverArea(highlightedSubInventorySlot)))
                    {
                        return; // If an equipped one intersects with a currently active hover one, do not open
@@ -818,7 +818,8 @@ namespace Barotrauma

                if (selectedContainer != null && 
                    selectedContainer.Inventory != null && 
-                    !selectedContainer.Inventory.Locked && 
+                    !selectedContainer.Inventory.Locked &&
+                    selectedContainer.DrawInventory &&
                    allowInventorySwap)
                {
                    //player has selected the inventory of another item -> attempt to move the item there
@@ -841,6 +842,7 @@ namespace Barotrauma
                }
                else if (character.HeldItems.FirstOrDefault(i =>
                    i.OwnInventory != null &&
+                    i.OwnInventory.Container.DrawInventory &&
                    (i.OwnInventory.CanBePut(item) || ((i.OwnInventory.Capacity == 1 || i.OwnInventory.Container.HasSubContainers) && i.OwnInventory.AllowSwappingContainedItems && i.OwnInventory.Container.CanBeContained(item)))) is { } equippedContainer)
                {
                    if (allowEquip)
@@ -1027,7 +1029,7 @@ namespace Barotrauma
                    //order by the condition of the contained item to prefer putting into the item with the emptiest ammo/battery/tank
                    foreach (Item heldItem in character.HeldItems.OrderByDescending(heldItem => GetContainPriority(item, heldItem)))
                    {
-                        if (heldItem.OwnInventory == null) { continue; }
+                        if (heldItem.OwnInventory == null || !heldItem.OwnInventory.Container.DrawInventory) { continue; }
                        //don't allow swapping if we're moving items into an item with 1 slot holding a stack of items
                        //(in that case, the quick action should just fill up the stack)
                        bool disallowSwapping = 
@@ -54,7 +54,9 @@ namespace Barotrauma.Items.Components
        {
            if (deconstructor.InputContainer.Inventory.AllItems.Count() == 2)
            {
-                if (!deconstructor.InputContainer.Inventory.AllItems.All(it => it.Prefab == item.Prefab))
+                var otherGeneticMaterial =
+                    deconstructor.InputContainer.Inventory.AllItems.FirstOrDefault(it => it != item && it.Prefab == item.Prefab)?.GetComponent<GeneticMaterial>();
+                if (otherGeneticMaterial == null)
                {
                    buttonText = TextManager.Get("researchstation.combine");
                    infoText = TextManager.Get("researchstation.combine.infotext");
@@ -62,7 +64,7 @@ namespace Barotrauma.Items.Components
                else
                {
                    buttonText = TextManager.Get("researchstation.refine");
-                    int taintedProbability = (int)(GetTaintedProbabilityOnRefine(Character.Controlled) * 100);
+                    int taintedProbability = (int)(GetTaintedProbabilityOnRefine(otherGeneticMaterial, Character.Controlled) * 100);
                    infoText = TextManager.GetWithVariable("researchstation.refine.infotext", "[taintedprobability]", taintedProbability.ToString());
                }
            }
@@ -260,6 +260,12 @@ namespace Barotrauma.Items.Components
            if (!hasSoundsOfType[(int)type]) { return; }
            if (GameMain.Client?.MidRoundSyncing ?? false) { return; }

+            //above the top boundary of the level (in an inactive respawn shuttle?)
+            if (item.Submarine != null && Level.Loaded != null && item.Submarine.WorldPosition.Y > Level.Loaded.Size.Y) 
+            {
+                return; 
+            }
+
            if (loopingSound != null)
            {
                if (Vector3.DistanceSquared(GameMain.SoundManager.ListenerPosition, new Vector3(item.WorldPosition, 0.0f)) > loopingSound.Range * loopingSound.Range ||
@@ -388,12 +394,9 @@ namespace Barotrauma.Items.Components
            }
        }

-        public void StopSounds(ActionType type)
+        public void StopLoopingSound()
        {
            if (loopingSound == null) { return; }
-
-            if (loopingSound.Type != type) { return; }
-
            if (loopingSoundChannel != null)
            {
                loopingSoundChannel.FadeOutAndDispose();
@@ -402,6 +405,12 @@ namespace Barotrauma.Items.Components
            }
        }

+        public void StopSounds(ActionType type)
+        {
+            if (loopingSound == null || loopingSound.Type != type) { return; }
+            StopLoopingSound();
+        }
+
        private float GetSoundVolume(ItemSound sound)
        {
            if (sound == null) { return 0.0f; }
@@ -497,7 +506,8 @@ namespace Barotrauma.Items.Components
                case "guiframe":
                    if (subElement.GetAttribute("rect") != null)
                    {
-                        DebugConsole.ThrowError($"Error in item config \"{item.ConfigFilePath}\" - GUIFrame defined as rect, use RectTransform instead.");
+                        DebugConsole.ThrowError($"Error in item config \"{item.ConfigFilePath}\" - GUIFrame defined as rect, use RectTransform instead.",
+                            contentPackage: subElement.ContentPackage);
                        break;
                    }
                    GuiFrameSource = subElement;
@@ -516,7 +526,8 @@ namespace Barotrauma.Items.Components
                    if (filePath.IsNullOrEmpty())
                    {
                        DebugConsole.ThrowError(
-                            $"Error when instantiating item \"{item.Name}\" - sound with no file path set");
+                            $"Error when instantiating item \"{item.Name}\" - sound with no file path set",
+                            contentPackage: subElement.ContentPackage);
                        break;
                    }

@@ -528,7 +539,8 @@ namespace Barotrauma.Items.Components
                    }
                    catch (Exception e)
                    {
-                        DebugConsole.ThrowError($"Invalid sound type \"{typeStr}\" in item \"{item.Prefab.Identifier}\"!", e);
+                        DebugConsole.ThrowError($"Invalid sound type \"{typeStr}\" in item \"{item.Prefab.Identifier}\"!", e,
+                            contentPackage: subElement.ContentPackage);
                        break;
                    }
                    
@@ -758,6 +770,8 @@ namespace Barotrauma.Items.Components
            }
        }

+        public virtual void OnPlayerSkillsChanged() { }
+
        public virtual void AddTooltipInfo(ref LocalizedString name, ref LocalizedString description) { }
    }
 }
@@ -158,7 +158,8 @@ namespace Barotrauma.Items.Components
                IndicatorStyle = GUIStyle.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...");
+                    DebugConsole.AddWarning($"Item \"{item.Name}\" defines both a contained state indicator style and a custom indicator sprite. Will use the custom sprite...",
+                        contentPackage: item.Prefab.ContentPackage);
                }
            }
            if (GuiFrame == null)
@@ -345,9 +346,9 @@ namespace Barotrauma.Items.Components

        public bool KeepOpenWhenEquippedBy(Character character)
        {
-            if (!character.CanAccessInventory(Inventory) ||
-                !KeepOpenWhenEquipped ||
-                !character.HasEquippedItem(Item))
+            if (!KeepOpenWhenEquipped ||
+                !character.HasEquippedItem(Item) ||
+                !character.CanAccessInventory(Inventory))
            {
                return false;
            }
@@ -570,11 +571,13 @@ namespace Barotrauma.Items.Components
                {
                    spriteRotation = contained.Rotation;
                }
-                if ((item.body != null && item.body.Dir == -1) || item.FlippedX)
+                bool flipX = (item.body != null && item.body.Dir == -1) || item.FlippedX;
+                if (flipX)
                {
                    spriteEffects |= MathUtils.NearlyEqual(spriteRotation % 180, 90.0f) ? SpriteEffects.FlipVertically : SpriteEffects.FlipHorizontally;
                }
-                if (item.FlippedY)
+                bool flipY = item.FlippedY;
+                if (flipY)
                {
                    spriteEffects |= MathUtils.NearlyEqual(spriteRotation % 180, 90.0f) ? SpriteEffects.FlipHorizontally : SpriteEffects.FlipVertically;
                }
@@ -588,6 +591,7 @@ namespace Barotrauma.Items.Components
                    contained.Item.Scale,
                    spriteEffects,
                    depth: containedSpriteDepth);
+                contained.Item.DrawDecorativeSprites(spriteBatch, itemPos, flipX,flipY, (contained.Item.body == null ? 0.0f : contained.Item.body.DrawRotation), containedSpriteDepth);

                foreach (ItemContainer ic in contained.Item.GetComponents<ItemContainer>())
                {
@@ -227,7 +227,7 @@ namespace Barotrauma.Items.Components
            switch (text)
            {
                case "[CurrentLocationName]":
-                    SetDisplayText(Level.Loaded?.StartLocation?.Name ?? string.Empty);
+                    SetDisplayText(Level.Loaded?.StartLocation?.DisplayName.Value ?? string.Empty);
                    break;
                case "[CurrentBiomeName]":
                    SetDisplayText(Level.Loaded?.LevelData?.Biome?.DisplayName.Value ?? string.Empty);
@@ -67,7 +67,7 @@ namespace Barotrauma.Items.Components
                Light.Position = item.Position;
            }
            PhysicsBody body = Light.ParentBody;
-            if (body != null)
+             if (body != null && body.Enabled)
            {
                Light.Rotation = body.Dir > 0.0f ? body.DrawRotation : body.DrawRotation - MathHelper.Pi;
                Light.LightSpriteEffect = (body.Dir > 0.0f) ? SpriteEffects.None : SpriteEffects.FlipVertically;
@@ -66,7 +66,11 @@ namespace Barotrauma.Items.Components
            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), sliderArea.RectTransform, Anchor.TopCenter), "", textColor: GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.Center)
            {
                AutoScaleHorizontal = true,
-                TextGetter = () => { return TextManager.AddPunctuation(':', powerLabel, (int)(targetForce) + " %"); }
+                TextGetter = () => 
+                { 
+                    return TextManager.AddPunctuation(':', powerLabel, 
+                        TextManager.GetWithVariable("percentageformat", "[value]", ((int)MathF.Round(targetForce)).ToString())); 
+                }
            };
            forceSlider = new GUIScrollBar(new RectTransform(new Vector2(0.95f, 0.45f), sliderArea.RectTransform, Anchor.Center), barSize: 0.1f, style: "DeviceSlider")
            {
@@ -4,6 +4,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;

 namespace Barotrauma.Items.Components
@@ -393,6 +394,8 @@ namespace Barotrauma.Items.Components

        partial void SelectProjSpecific(Character character)
        {
+            if (character != Character.Controlled) { return; }
+
            var nonItems = itemList.Content.Children.Where(c => c.UserData is not FabricationRecipe).ToList();
            nonItems.ForEach(i => itemList.Content.RemoveChild(i));

@@ -784,6 +787,7 @@ namespace Barotrauma.Items.Components

        private void HideEmptyItemListCategories()
        {
+            bool visibleElementsChanged = false;
            //go through the elements backwards, and disable the labels ("insufficient skills to fabricate", "recipe required...") if there's no items below them
            bool recipeVisible = false;
            foreach (GUIComponent child in itemList.Content.Children.Reverse())
@@ -792,7 +796,11 @@ namespace Barotrauma.Items.Components
                {
                    if (child.Enabled)
                    {
-                        child.Visible = recipeVisible;
+                        if (child.Visible != recipeVisible)
+                        {
+                            child.Visible = recipeVisible;
+                            visibleElementsChanged = true;
+                        }
                    }
                    recipeVisible = false;
                }
@@ -802,8 +810,11 @@ namespace Barotrauma.Items.Components
                }
            }

-            itemList.UpdateScrollBarSize();
-            itemList.BarScroll = 0.0f;
+            if (visibleElementsChanged)
+            {
+                itemList.UpdateScrollBarSize();
+                itemList.BarScroll = 0.0f;
+            }
        }

        public bool ClearFilter()
@@ -815,11 +826,22 @@ namespace Barotrauma.Items.Components
            return true;
        }

+        private readonly record struct SelectedRecipe(Character User, FabricationRecipe SelectedItem, Option<float> OverrideRequiredTime);
+        private Option<SelectedRecipe> LastSelectedRecipe = Option.None;
+
        private bool SelectItem(Character user, FabricationRecipe selectedItem, float? overrideRequiredTime = null)
        {
            this.selectedItem = selectedItem;
            displayingForCharacter = user;
+            var selectedRecipe = new SelectedRecipe(user, selectedItem, overrideRequiredTime is null ? Option.None : Option.Some(overrideRequiredTime.Value));
+            LastSelectedRecipe = Option.Some(selectedRecipe);
+            CreateSelectedItemUI(selectedRecipe);
+            return true;
+        }

+        private void CreateSelectedItemUI(SelectedRecipe recipe)
+        {
+            var (user, selectedItem, overrideRequiredTime) = recipe;
            int max = Math.Max(selectedItem.TargetItem.GetMaxStackSize(outputContainer.Inventory) / selectedItem.Amount, 1);

            if (amountInput != null)
@@ -843,8 +865,10 @@ namespace Barotrauma.Items.Components
            LocalizedString itemName = GetRecipeNameAndAmount(selectedItem);
            LocalizedString name = itemName;

-            float quality = selectedItem.Quality ?? GetFabricatedItemQuality(selectedItem, user);
-            if (quality > 0)
+            QualityResult result = GetFabricatedItemQuality(selectedItem, user);
+
+            float quality = selectedItem.Quality ?? result.Quality;
+            if (quality > 0 || result.HasRandomQualityRollChance)
            {
                name = TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", itemName + '\n')
                    .Fallback(TextManager.GetWithVariable("itemname.quality3", "[itemname]", itemName + '\n'));
@@ -855,6 +879,49 @@ namespace Barotrauma.Items.Components
            {
                AutoScaleHorizontal = true
            };
+
+            if (result.HasRandomQualityRollChance)
+            {
+                var iconLayout = new GUIFrame(new RectTransform(new Vector2(0.4f, 1f), selectedItemFrame.RectTransform, anchor: Anchor.TopRight), style: null);
+                var icon = GameSession.CreateNotificationIcon(iconLayout, offset: true);
+
+                float percentage1 = result.TotalPlusOnePercentage;
+                float percentage2 = result.TotalPlusTwoPercentage;
+
+                string chance1text = percentage1.ToString("F1", CultureInfo.InvariantCulture);
+                string chance2text = percentage2.ToString("F1", CultureInfo.InvariantCulture);
+
+                int quality1 = Math.Clamp(result.Quality + 1, min: 0, max: 3);
+                int quality2 = Math.Clamp(result.Quality + 2, min: 0, max: 3);
+
+                LocalizedString quality1Text = TextManager.Get($"quality{quality1}");
+                LocalizedString quality2Text = TextManager.Get($"quality{quality2}");
+
+                string localizationTag = percentage2 > 0f && percentage1 > 0 && quality1 != quality2 ? "meetsbonusrequirementtwice" : "meetsbonusrequirement";
+
+                var variables = new (string Key, LocalizedString Value)[]
+                {
+                    ("[chance]", chance1text), ("[quality]", quality1Text),
+                    ("[chance2]", chance2text), ("[quality2]", quality2Text)
+                };
+
+                if (MathUtils.NearlyEqual(percentage1, 0))
+                {
+                    variables = new[] { ("[chance]", chance2text), ("[quality]", quality2Text) };
+                }
+
+                if (quality1 == quality2)
+                {
+                    LocalizedString rawPercentage = result.PlusOnePercentage.ToString("F1", CultureInfo.InvariantCulture);
+                    variables = new[] { ("[chance]", rawPercentage), ("[quality]", quality1Text) };
+                }
+
+                LocalizedString qualityTooltip = TextManager.GetWithVariables(localizationTag, variables);
+
+                icon.ToolTip = RichString.Rich(qualityTooltip);
+                icon.Visible = icon.CanBeFocused = true;
+            }
+
            nameBlock.Padding = new Vector4(0, nameBlock.Padding.Y, GUI.IntScale(5), nameBlock.Padding.W);
            if (nameBlock.TextScale < 0.7f)
            {
@@ -865,15 +932,15 @@ namespace Barotrauma.Items.Components
                nameBlock.Wrap = true;
                nameBlock.SetTextPos();
                nameBlock.RectTransform.MinSize = new Point(0, (int)(nameBlock.TextSize.Y * nameBlock.TextScale));
-            }            
-            
+            }
+
            if (!selectedItem.TargetItem.Description.IsNullOrEmpty())
            {
                var description = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
                    selectedItem.TargetItem.Description,
                    font: GUIStyle.SmallFont, wrap: true);
                description.Padding = new Vector4(0, description.Padding.Y, description.Padding.Z, description.Padding.W);
-            
+
                while (description.Rect.Height + nameBlock.Rect.Height > paddedFrame.Rect.Height)
                {
                    var lines = description.WrappedText.Split('\n');
@@ -884,13 +951,13 @@ namespace Barotrauma.Items.Components
                    description.ToolTip = selectedItem.TargetItem.Description;
                }
            }
-            
+
            IEnumerable<Skill> inadequateSkills = Enumerable.Empty<Skill>();
            if (user != null)
            {
                inadequateSkills = selectedItem.RequiredSkills.Where(skill => user.GetSkillLevel(skill.Identifier) < Math.Round(skill.Level * SkillRequirementMultiplier));
            }
-            
+
            if (selectedItem.RequiredSkills.Any())
            {
                LocalizedString text = "";
@@ -911,9 +978,10 @@ namespace Barotrauma.Items.Components
            float degreeOfSuccess = user == null ? 0.0f : FabricationDegreeOfSuccess(user, selectedItem.RequiredSkills);
            if (degreeOfSuccess > 0.5f) { degreeOfSuccess = 1.0f; }

-            float requiredTime = overrideRequiredTime ??
-                (user == null ? selectedItem.RequiredTime : GetRequiredTime(selectedItem, user));
-            
+            float requiredTime = overrideRequiredTime.TryUnwrap(out var time) 
+                ? time
+                : (user == null ? selectedItem.RequiredTime : GetRequiredTime(selectedItem, user));
+
            if ((int)requiredTime > 0)
            {
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform), 
@@ -936,7 +1004,6 @@ namespace Barotrauma.Items.Components
                    font: GUIStyle.SmallFont);

            }
-            return true;
        }

        public void HighlightRecipe(string identifier, Color color)
@@ -1046,6 +1113,15 @@ namespace Barotrauma.Items.Components
            }
        }

+        public override void OnPlayerSkillsChanged()
+            => RefreshSelectedItem();
+
+        public void RefreshSelectedItem()
+        {
+            if (!LastSelectedRecipe.TryUnwrap(out var lastSelected)) { return; }
+            CreateSelectedItemUI(lastSelected);
+        }
+
        partial void UpdateRequiredTimeProjSpecific()
        {
            if (requiredTimeBlock == null) { return; }
@@ -66,7 +66,15 @@ namespace Barotrauma.Items.Components
        private float prevPassivePingRadius;

        private Vector2 center;
-        private float displayScale;
+
+        /// <summary>
+        /// Current scale of the display, taking zoom into account. In other words, the scaling factor of world coordinates to coordinates on the display.
+        /// </summary>
+        public float DisplayScale
+        {
+            get;
+            private set;
+        } = 1.0f;

        private const float DisruptionUpdateInterval = 0.2f;
        private float disruptionUpdateTimer;
@@ -751,9 +759,9 @@ namespace Barotrauma.Items.Components
            {
                var activePing = activePings[pingIndex];
                float pingRadius = DisplayRadius * activePing.State / zoom;
-                if (disruptionUpdateTimer <= 0.0f) { UpdateDisruptions(transducerCenter, pingRadius / displayScale); }               
+                if (disruptionUpdateTimer <= 0.0f) { UpdateDisruptions(transducerCenter, pingRadius / DisplayScale); }               
                Ping(transducerCenter, transducerCenter,
-                    pingRadius, activePing.PrevPingRadius, displayScale, range / zoom, passive: false, pingStrength: 2.0f);
+                    pingRadius, activePing.PrevPingRadius, DisplayScale, range / zoom, passive: false, pingStrength: 2.0f);
                activePing.PrevPingRadius = pingRadius;
            }
            if (disruptionUpdateTimer <= 0.0f)
@@ -770,7 +778,7 @@ namespace Barotrauma.Items.Components
                    if (c.Params.HideInSonar) { continue; }

                    if (!c.IsUnconscious && c.Params.DistantSonarRange > 0.0f &&
-                        ((c.WorldPosition - transducerCenter) * displayScale).LengthSquared() > DisplayRadius * DisplayRadius)
+                        ((c.WorldPosition - transducerCenter) * DisplayScale).LengthSquared() > DisplayRadius * DisplayRadius)
                    {
                        Vector2 targetVector = c.WorldPosition - transducerCenter;
                        if (targetVector.LengthSquared() > MathUtils.Pow2(c.Params.DistantSonarRange)) { continue; }
@@ -818,7 +826,7 @@ namespace Barotrauma.Items.Components
                    if (dist > prevPassivePingRadius * Range && dist <= passivePingRadius * Range && Rand.Int(sonarBlips.Count) < 500)
                    {
                        Ping(t.WorldPosition, transducerCenter,
-                            t.SoundRange * displayScale, 0, displayScale, range,
+                            t.SoundRange * DisplayScale, 0, DisplayScale, range,
                            passive: true, pingStrength: 0.5f, needsToBeInSector: t);
                        if (t.IsWithinSector(transducerCenter))
                        {
@@ -857,7 +865,7 @@ namespace Barotrauma.Items.Components
            displayBorderSize = 0.2f;
            center = rect.Center.ToVector2();
            DisplayRadius = (rect.Width / 2.0f) * (1.0f - displayBorderSize);
-            displayScale = DisplayRadius / range * zoom;
+            DisplayScale = DisplayRadius / range * zoom;

            screenBackground?.Draw(spriteBatch, center, 0.0f, rect.Width / screenBackground.size.X);

@@ -972,7 +980,7 @@ namespace Barotrauma.Items.Components
                        aiTarget.SonarIconIdentifier,
                        aiTarget,
                        aiTarget.WorldPosition, transducerCenter,
-                        displayScale, center, DisplayRadius * 0.975f);
+                        DisplayScale, center, DisplayRadius * 0.975f);
                }
            }

@@ -983,21 +991,21 @@ namespace Barotrauma.Items.Components
                if (Level.Loaded.StartLocation?.Type is { ShowSonarMarker: true })
                {
                    DrawMarker(spriteBatch,
-                        Level.Loaded.StartLocation.Name,
+                        Level.Loaded.StartLocation.DisplayName.Value,
                        (Level.Loaded.StartOutpost != null ? "outpost" : "location").ToIdentifier(),
                        "startlocation",
                        Level.Loaded.StartExitPosition, transducerCenter,
-                        displayScale, center, DisplayRadius);
+                        DisplayScale, center, DisplayRadius);
                }

                if (Level.Loaded is { EndLocation.Type.ShowSonarMarker: true, Type: LevelData.LevelType.LocationConnection })
                {
                    DrawMarker(spriteBatch,
-                        Level.Loaded.EndLocation.Name,
+                        Level.Loaded.EndLocation.DisplayName.Value,
                        (Level.Loaded.EndOutpost != null ? "outpost" : "location").ToIdentifier(),
                        "endlocation",
                        Level.Loaded.EndExitPosition, transducerCenter,
-                        displayScale, center, DisplayRadius);
+                        DisplayScale, center, DisplayRadius);
                }

                for (int i = 0; i < Level.Loaded.Caves.Count; i++)
@@ -1009,7 +1017,7 @@ namespace Barotrauma.Items.Components
                        "cave".ToIdentifier(),
                        "cave" + i,
                        cave.StartPos.ToVector2(), transducerCenter,
-                        displayScale, center, DisplayRadius);
+                        DisplayScale, center, DisplayRadius);
                }
            }

@@ -1026,7 +1034,7 @@ namespace Barotrauma.Items.Components
                            mission.SonarIconIdentifier,
                            "mission" + missionIndex + ":" + i,
                            position, transducerCenter,
-                            displayScale, center, DisplayRadius * 0.95f);
+                            DisplayScale, center, DisplayRadius * 0.95f);
                    }
                    i++;
                }
@@ -1059,7 +1067,7 @@ namespace Barotrauma.Items.Components
                    DrawMarker(spriteBatch,
                        i.Name, "mineral".ToIdentifier(), "mineralcluster" + i,
                        c.center, transducerCenter,
-                        displayScale, center, DisplayRadius * 0.95f,
+                        DisplayScale, center, DisplayRadius * 0.95f,
                        onlyShowTextOnMouseOver: true);
                }
            }
@@ -1088,19 +1096,19 @@ namespace Barotrauma.Items.Components
                    (sub.Info.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine").ToIdentifier(),
                    sub,
                    sub.WorldPosition, transducerCenter, 
-                    displayScale, center, DisplayRadius * 0.95f);
+                    DisplayScale, center, DisplayRadius * 0.95f);
            }

            if (GameMain.DebugDraw)
            {
                var steering = item.GetComponent<Steering>();
-                steering?.DebugDrawHUD(spriteBatch, transducerCenter, displayScale, DisplayRadius, center);
+                steering?.DebugDrawHUD(spriteBatch, transducerCenter, DisplayScale, DisplayRadius, center);
            }
        }

        private void DrawOwnSubmarineBorders(SpriteBatch spriteBatch, Vector2 transducerCenter, float signalStrength)
        {
-            float simScale = displayScale * Physics.DisplayToSimRation * zoom;
+            float simScale = DisplayScale * Physics.DisplayToSimRation;

            foreach (Submarine submarine in Submarine.Loaded)
            {
@@ -1167,7 +1175,7 @@ namespace Barotrauma.Items.Components

        private void DrawDockingPorts(SpriteBatch spriteBatch, Vector2 transducerCenter, float signalStrength)
        {
-            float scale = displayScale * zoom;
+            float scale = DisplayScale;

            Steering steering = item.GetComponent<Steering>();
            if (steering != null && steering.DockingModeEnabled && steering.ActiveDockingSource != null)
@@ -1219,7 +1227,7 @@ namespace Barotrauma.Items.Components

        private void DrawDockingIndicator(SpriteBatch spriteBatch, Steering steering, ref Vector2 transducerCenter)
        {
-            float scale = displayScale * zoom;
+            float scale = DisplayScale;
            
            Vector2 worldFocusPos = (steering.ActiveDockingSource.Item.WorldPosition + steering.DockingTarget.Item.WorldPosition) / 2.0f;
            worldFocusPos.X = steering.DockingTarget.Item.WorldPosition.X;
@@ -1591,7 +1599,7 @@ namespace Barotrauma.Items.Components
        {
            lineStep /= zoom;
            zStep /= zoom;
-            range *= displayScale;
+            range *= DisplayScale;
            float length = (point1 - point2).Length();
            Vector2 lineDir = (point2 - point1) / length;
            for (float x = 0; x < length; x += lineStep * Rand.Range(0.8f, 1.2f))
@@ -1602,12 +1610,12 @@ namespace Barotrauma.Items.Components

                //ignore if outside the display
                Vector2 transducerDiff = point - transducerPos;
-                Vector2 transducerDisplayDiff = transducerDiff * displayScale;
+                Vector2 transducerDisplayDiff = transducerDiff * DisplayScale / zoom;
                if (transducerDisplayDiff.LengthSquared() > DisplayRadius * DisplayRadius) { continue; }

                //ignore if the point is not within the ping
                Vector2 pointDiff = point - pingSource;
-                Vector2 displayPointDiff = pointDiff * displayScale;
+                Vector2 displayPointDiff = pointDiff * DisplayScale / zoom;
                float displayPointDistSqr = displayPointDiff.LengthSquared();
                if (displayPointDistSqr < prevPingRadius * prevPingRadius || displayPointDistSqr > pingRadius * pingRadius) { continue; }

@@ -1628,9 +1636,9 @@ namespace Barotrauma.Items.Components

                float displayPointDist = (float)Math.Sqrt(displayPointDistSqr);
                float alpha = pingStrength * Rand.Range(1.5f, 2.0f);
-                for (float z = 0; z < DisplayRadius - transducerDist * displayScale; z += zStep)
+                for (float z = 0; z < DisplayRadius - transducerDist * DisplayScale; z += zStep)
                {
-                    Vector2 pos = point + Rand.Vector(150.0f / zoom) + pingDirection * z / displayScale;
+                    Vector2 pos = point + Rand.Vector(150.0f / zoom) + pingDirection * z / DisplayScale;
                    float fadeTimer = alpha * (1.0f - displayPointDist / range);

                    if (needsToBeInSector != null)
@@ -1697,7 +1705,7 @@ namespace Barotrauma.Items.Components

        private bool CheckBlipVisibility(SonarBlip blip, Vector2 transducerPos)
        {
-            Vector2 pos = (blip.Position - transducerPos) * displayScale * zoom;
+            Vector2 pos = (blip.Position - transducerPos) * DisplayScale;
            pos.Y = -pos.Y;

            float posDistSqr = pos.LengthSquared();
@@ -1731,7 +1739,7 @@ namespace Barotrauma.Items.Components
            }
            if (currentPingIndex != -1 && activePings[currentPingIndex].IsDirectional)
            {
-                var pos = (resourcePos - transducerPos) * displayScale * zoom;
+                var pos = (resourcePos - transducerPos) * DisplayScale;
                pos.Y = -pos.Y;
                var length = pos.Length();
                var dir = pos / length;
@@ -1749,7 +1757,7 @@ namespace Barotrauma.Items.Components
            
            float distort = 1.0f - item.Condition / item.MaxCondition;
            
-            Vector2 pos = (blip.Position - transducerPos) * displayScale * zoom;
+            Vector2 pos = (blip.Position - transducerPos) * DisplayScale;
            pos.Y = -pos.Y;

            if (Rand.Range(0.5f, 2.0f) < distort) { pos.X = -pos.X; }
@@ -1825,14 +1833,13 @@ namespace Barotrauma.Items.Components

            Vector2 position = worldPosition - transducerPosition;

-            position *= zoom;
            position *= scale;
            position.Y = -position.Y;

            float textAlpha = MathHelper.Clamp(1.5f - dist / 50000.0f, 0.5f, 1.0f);

            Vector2 dir = Vector2.Normalize(position);
-            Vector2 markerPos = (linearDist * zoom * scale > radius) ? dir * radius : position;
+            Vector2 markerPos = (linearDist * scale > radius) ? dir * radius : position;
            markerPos += center;

            markerPos.X = (int)markerPos.X;
@@ -216,7 +216,7 @@ namespace Barotrauma.Items.Components
                }
            };
            levelStartTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.Center),
-                GameMain.GameSession?.StartLocation == null ? "" : ToolBox.LimitString(GameMain.GameSession.StartLocation.Name, GUIStyle.SmallFont, textLimit),
+                GameMain.GameSession?.StartLocation == null ? "" : ToolBox.LimitString(GameMain.GameSession.StartLocation.DisplayName, GUIStyle.SmallFont, textLimit),
                font: GUIStyle.SmallFont, style: "GUIRadioButton")
            {
                Enabled = autoPilot,
@@ -243,7 +243,7 @@ namespace Barotrauma.Items.Components
            };

            levelEndTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.BottomCenter),
-                (GameMain.GameSession?.EndLocation == null || Level.IsLoadedOutpost) ? "" : ToolBox.LimitString(GameMain.GameSession.EndLocation.Name, GUIStyle.SmallFont, textLimit),
+                (GameMain.GameSession?.EndLocation == null || Level.IsLoadedOutpost) ? "" : ToolBox.LimitString(GameMain.GameSession.EndLocation.DisplayName, GUIStyle.SmallFont, textLimit),
                font: GUIStyle.SmallFont, style: "GUIRadioButton")
            {
                Enabled = autoPilot,
@@ -389,7 +389,7 @@ namespace Barotrauma.Items.Components
                            if (!ObjectiveManager.AllActiveObjectivesCompleted())
                            {
                                exitOutpostPrompt = new GUIMessageBox("",
-                                    TextManager.GetWithVariable("CampaignExitTutorialOutpostPrompt", "[locationname]", campaign.Map.CurrentLocation.Name),
+                                    TextManager.GetWithVariable("CampaignExitTutorialOutpostPrompt", "[locationname]", campaign.Map.CurrentLocation.DisplayName),
                                    new LocalizedString[] { TextManager.Get("yes"), TextManager.Get("no") });
                                exitOutpostPrompt.Buttons[0].OnClicked += (_, _) =>
                                {
@@ -509,9 +509,9 @@ namespace Barotrauma.Items.Components
            noPowerTip = TextManager.Get("SteeringNoPowerTip");
            autoPilotMaintainPosTip = TextManager.Get("SteeringAutoPilotMaintainPosTip");
            autoPilotLevelStartTip = TextManager.GetWithVariable("SteeringAutoPilotLocationTip", "[locationname]",
-                GameMain.GameSession?.StartLocation == null ? "Start" : GameMain.GameSession.StartLocation.Name);
+                GameMain.GameSession?.StartLocation == null ? "Start" : GameMain.GameSession.StartLocation.DisplayName);
            autoPilotLevelEndTip = TextManager.GetWithVariable("SteeringAutoPilotLocationTip", "[locationname]",
-                GameMain.GameSession?.EndLocation == null ? "End" : GameMain.GameSession.EndLocation.Name);
+                GameMain.GameSession?.EndLocation == null ? "End" : GameMain.GameSession.EndLocation.DisplayName);
        }

        protected override void OnResolutionChanged()
@@ -589,7 +589,8 @@ namespace Barotrauma.Items.Components
                Sonar sonar = item.GetComponent<Sonar>();
                if (sonar != null && controlledSub != null)
                {
-                    Vector2 displayPosToMaintain = ((posToMaintain.Value - controlledSub.WorldPosition)) / sonar.Range * sonar.DisplayRadius * sonar.Zoom;
+                    Vector2 displayPosToMaintain = ((posToMaintain.Value - controlledSub.WorldPosition)) * sonar.DisplayScale;
+
                    displayPosToMaintain.Y = -displayPosToMaintain.Y;
                    displayPosToMaintain = displayPosToMaintain.ClampLength(velRect.Width / 2);
                    displayPosToMaintain = steerArea.Rect.Center.ToVector2() + displayPosToMaintain;
@@ -670,14 +671,14 @@ namespace Barotrauma.Items.Components
                pos2.Y = -pos2.Y;
                pos2 += center;

-                GUI.DrawLine(spriteBatch, 
-                    pos1, 
+                GUI.DrawLine(spriteBatch,
+                    pos1,
                    pos2,
                    GUIStyle.Red * 0.6f, width: 3);

                if (obstacle.Intersection.HasValue)
                {
-                    Vector2 intersectionPos = (obstacle.Intersection.Value - transducerCenter) *displayScale;
+                    Vector2 intersectionPos = (obstacle.Intersection.Value - transducerCenter) * displayScale;
                    intersectionPos.Y = -intersectionPos.Y;
                    intersectionPos += center;
                    GUI.DrawRectangle(spriteBatch, intersectionPos - Vector2.One * 2, Vector2.One * 4, GUIStyle.Red);
@@ -151,7 +151,7 @@ namespace Barotrauma.Items.Components
                GUI.DrawLine(spriteBatch, 
                    new Vector2(debugRayStartPos.X, -debugRayStartPos.Y),
                    new Vector2(debugRayEndPos.X, -debugRayEndPos.Y),
-                    Color.Yellow);
+                    Color.Yellow, width: 3f);
            }
        }
 #endif
@@ -95,7 +95,7 @@ namespace Barotrauma.Items.Components
                                MaxValueFloat = numberInputMax,
                                FloatValue = Math.Clamp(floatSignal, numberInputMin, numberInputMax),
                                DecimalsToDisplay = ciElement.NumberInputDecimalPlaces,
-                                valueStep = numberInputStep,
+                                ValueStep = numberInputStep,
                                OnValueChanged = (ni) =>
                                {
                                    if (GameMain.Client == null)
@@ -121,7 +121,7 @@ namespace Barotrauma.Items.Components
                                MinValueInt = numberInputMin,
                                MaxValueInt = numberInputMax,
                                IntValue = Math.Clamp(intSignal, numberInputMin, numberInputMax),
-                                valueStep = numberInputStep,
+                                ValueStep = numberInputStep,
                                OnValueChanged = (ni) =>
                                {
                                    if (GameMain.Client == null)
@@ -137,7 +137,8 @@ namespace Barotrauma.Items.Components
                        }
                        else
                        {
-                            DebugConsole.LogError($"Error creating a CustomInterface component: unexpected NumberType \"{(ciElement.NumberType.HasValue ? ciElement.NumberType.Value.ToString() : "none")}\"");
+                            DebugConsole.LogError($"Error creating a CustomInterface component: unexpected NumberType \"{(ciElement.NumberType.HasValue ? ciElement.NumberType.Value.ToString() : "none")}\"",
+                                contentPackage: item.Prefab.ContentPackage);
                        }
                        if (numberInput != null)
                        {
@@ -349,8 +349,8 @@ namespace Barotrauma.Items.Components
            }

            GUI.DrawString(spriteBatch, hudPos, texts[0].Value, textColors[0] * alpha, Color.Black * 0.7f * alpha, 2, GUIStyle.SubHeadingFont, ForceUpperCase.No);
-            hudPos.X += 5.0f;
-            hudPos.Y += 24.0f * GameSettings.CurrentConfig.Graphics.TextScale;
+            hudPos.X += 5.0f * GUI.Scale;
+            hudPos.Y += GUIStyle.SubHeadingFont.MeasureString(texts[0].Value).Y;

            hudPos.X = (int)hudPos.X;
            hudPos.Y = (int)hudPos.Y;
@@ -358,7 +358,7 @@ namespace Barotrauma.Items.Components
            for (int i = 1; i < texts.Count; i++)
            {
                GUI.DrawString(spriteBatch, hudPos, texts[i], textColors[i] * alpha, Color.Black * 0.7f * alpha, 2, GUIStyle.SmallFont);
-                hudPos.Y += (int)(18.0f * GameSettings.CurrentConfig.Graphics.TextScale);
+                hudPos.Y += (int)(GUIStyle.SubHeadingFont.MeasureString(texts[i].Value).Y);
            }
        }
    }
@@ -16,6 +16,8 @@ namespace Barotrauma.Items.Components

        private GUIProgressBar powerIndicator;

+        private Vector2? debugDrawTargetPos;
+
        public int UIElementHeight
        {
            get 
@@ -422,9 +424,23 @@ namespace Barotrauma.Items.Components
            if (GameMain.DebugDraw)
            {
                Vector2 firingPos = GetRelativeFiringPosition();
+                Vector2 endPos = firingPos + 3500 * GetBarrelDir();
                firingPos.Y = -firingPos.Y;
+                endPos.Y = -endPos.Y;
                GUI.DrawLine(spriteBatch, firingPos - Vector2.UnitX * 5, firingPos + Vector2.UnitX * 5, Color.Red);
                GUI.DrawLine(spriteBatch, firingPos - Vector2.UnitY * 5, firingPos + Vector2.UnitY * 5, Color.Red);
+
+                if (debugDrawTargetPos.HasValue)
+                {
+                    Vector2 targetPos = debugDrawTargetPos.Value;
+                    targetPos.Y = -targetPos.Y;
+                    GUI.DrawLine(spriteBatch, targetPos - Vector2.UnitX * 5, targetPos + Vector2.UnitX * 5, Color.Magenta, width: 5);
+                    GUI.DrawLine(spriteBatch, targetPos - Vector2.UnitY * 5, targetPos + Vector2.UnitY * 5, Color.Magenta, width: 5);
+
+                    GUI.DrawLine(spriteBatch, firingPos, targetPos, Color.Magenta, width: 2);
+
+                }
+                GUI.DrawLine(spriteBatch, firingPos, endPos, Color.LightGray, width: 2);
            }

            if (!editing || GUI.DisableHUD || !item.IsSelected) { return; }
@@ -258,7 +258,7 @@ namespace Barotrauma
                else
                {
                    LocalizedString description = item.Description;
-                    if (item.HasTag(Tags.IdCard) || item.HasTag(Tags.DespawnContainer))
+                    if (item.HasTag(Tags.IdCardTag) || item.HasTag(Tags.DespawnContainer))
                    {
                        string[] readTags = item.Tags.Split(',');
                        string idName = null;
@@ -730,7 +730,7 @@ namespace Barotrauma
                        DraggingInventory = null;
                        subInventory.savedPosition = PlayerInput.MousePosition.ToPoint();
                    }
-                    else
+                    else if (DraggingInventory == subInventory)
                    {
                        subInventory.savedPosition = PlayerInput.MousePosition.ToPoint();
                    }
@@ -901,7 +901,7 @@ namespace Barotrauma
                if (IsOnInventorySlot(Character.Controlled.SelectedCharacter.Inventory)) { return true; }
            }

-            bool IsOnInventorySlot(Inventory inventory)
+            static bool IsOnInventorySlot(Inventory inventory)
            {
                for (var i = 0; i < inventory.visualSlots.Length; i++)
                {
@@ -1107,7 +1107,7 @@ namespace Barotrauma

            if (container.MovableFrame && !IsInventoryHoverAvailable(Owner as Character, container))
            {
-                if (positionUpdateQueued) // Wait a frame before updating the positioning of the container after a resolution change to have everything working
+                if (container.Inventory.positionUpdateQueued) // Wait a frame before updating the positioning of the container after a resolution change to have everything working
                {
                    int height = (int)(movableFrameRectHeight * UIScale);
                    CreateSlots();
@@ -1116,7 +1116,7 @@ namespace Barotrauma
                    draggableIndicatorOffset = DraggableIndicator.size * draggableIndicatorScale / 2f;
                    draggableIndicatorOffset += new Vector2(height / 2f - draggableIndicatorOffset.Y);
                    container.Inventory.originalPos = container.Inventory.savedPosition = container.Inventory.movableFrameRect.Center;
-                    positionUpdateQueued = false;
+                    container.Inventory.positionUpdateQueued = false;
                }

                if (container.Inventory.movableFrameRect.Size == Point.Zero || GUI.HasSizeChanged(prevScreenResolution, prevUIScale, prevHUDScale))
@@ -1127,11 +1127,20 @@ namespace Barotrauma
                    prevScreenResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
                    prevUIScale = UIScale;
                    prevHUDScale = GUI.Scale;
-                    positionUpdateQueued = true;
+                    container.Inventory.positionUpdateQueued = true;
                }
                else
                {
-                    GUI.DrawRectangle(spriteBatch, container.Inventory.movableFrameRect, movableFrameRectColor, true);
+                    Color color = movableFrameRectColor;
+                    if (DraggingInventory != null && DraggingInventory != container.Inventory)
+                    {
+                        color *= 0.7f;
+                    }
+                    else if (container.Inventory.movableFrameRect.Contains(PlayerInput.MousePosition))
+                    {
+                        color = Color.Lerp(color, PlayerInput.PrimaryMouseButtonHeld() ? Color.Black : Color.White, 0.25f);
+                    }
+                    GUI.DrawRectangle(spriteBatch, container.Inventory.movableFrameRect, color, true);
                    DraggableIndicator.Draw(spriteBatch, container.Inventory.movableFrameRect.Location.ToVector2() + draggableIndicatorOffset, 0, draggableIndicatorScale);
                }             
            }
@@ -1269,12 +1278,20 @@ namespace Barotrauma
                        if (DraggingItems.Count(it => !it.IsFullCondition && it.Condition > 0.0f) > 1 || 
                            selectedInventory.GetItemsAt(slotIndex).Count(it => !it.IsFullCondition && it.Condition > 0.0f) > 1) 
                        { 
-                            allowCombine = false; 
+                            allowCombine = false;
                        }
                        int itemCount = 0;
                        foreach (Item item in DraggingItems)
                        {
-                            bool success =  selectedInventory.TryPutItem(item, slotIndex, allowSwapping: !anySuccess, allowCombine, Character.Controlled);
+                            if (selectedInventory.GetItemAt(slotIndex)?.OwnInventory?.Container is { } container &&
+                                container.Inventory.CanBePut(item))
+                            {
+                                if (!container.AllowDragAndDrop || !container.DrawInventory)
+                                {
+                                    allowCombine = false;
+                                }
+                            }
+                            bool success = selectedInventory.TryPutItem(item, slotIndex, allowSwapping: !anySuccess, allowCombine, Character.Controlled);
                            if (success)
                            {
                                anySuccess = true;
@@ -1380,18 +1397,17 @@ namespace Barotrauma

        protected static Rectangle GetSubInventoryHoverArea(SlotReference subSlot)
        {
-            Rectangle hoverArea;
-            if ((Screen.Selected != GameMain.SubEditorScreen || GameMain.SubEditorScreen.DrawCharacterInventory) &&
-                (!subSlot.Inventory.Movable() || 
-                (Character.Controlled?.Inventory == subSlot.ParentInventory && !Character.Controlled.HasEquippedItem(subSlot.Item)) ||
-                (subSlot.ParentInventory is CharacterInventory characterInventory && characterInventory.CurrentLayout != CharacterInventory.Layout.Default)))
+            if (Character.Controlled == null)
            {
-                //slot not visible as a separate, movable panel -> just use the area of the slot directly
-                hoverArea = subSlot.Slot.Rect;
-                hoverArea.Location += subSlot.Slot.DrawOffset.ToPoint();
-                hoverArea = Rectangle.Union(hoverArea, subSlot.Slot.EquipButtonRect);
+                return Rectangle.Empty;
            }
-            else
+
+            Rectangle hoverArea;
+            bool isMovable = subSlot.Inventory.Movable() && !subSlot.ParentInventory.IsInventoryHoverAvailable(Character.Controlled, subSlot.Item?.GetComponent<ItemContainer>());
+            bool unEquipped = Character.Controlled.Inventory == subSlot.ParentInventory && !Character.Controlled.HasEquippedItem(subSlot.Item);
+            bool isDefaultLayout = subSlot.ParentInventory is not CharacterInventory characterInventory || characterInventory.CurrentLayout == CharacterInventory.Layout.Default;
+            bool subEditorCharacterInventoryHidden = Screen.Selected == GameMain.SubEditorScreen && !GameMain.SubEditorScreen.DrawCharacterInventory;
+            if (subEditorCharacterInventoryHidden || (isMovable && !unEquipped && isDefaultLayout))
            {
                hoverArea = subSlot.Inventory.BackgroundFrame;
                hoverArea.Location += subSlot.Slot.DrawOffset.ToPoint();
@@ -1400,6 +1416,13 @@ namespace Barotrauma
                    hoverArea = Rectangle.Union(hoverArea, subSlot.Inventory.movableFrameRect);
                }
            }
+            else
+            {
+                //slot not visible as a separate, movable panel -> just use the area of the slot directly
+                hoverArea = subSlot.Slot.Rect;
+                hoverArea.Location += subSlot.Slot.DrawOffset.ToPoint();
+                hoverArea = Rectangle.Union(hoverArea, subSlot.Slot.EquipButtonRect);
+            }

            if (subSlot.Inventory?.visualSlots != null)
            {
@@ -1584,11 +1607,16 @@ namespace Barotrauma

                if (DraggingItems.Any() && inventory != null && slotIndex > -1 && slotIndex < inventory.visualSlots.Length)
                {
+                    var itemInSlot = inventory.slots[slotIndex].FirstOrDefault();
                    if (inventory.CanBePutInSlot(DraggingItems.First(), slotIndex))
                    {
                        canBePut = true;
                    }
-                    else if (inventory.slots[slotIndex].FirstOrDefault()?.OwnInventory?.CanBePut(DraggingItems.First()) ?? false)
+                    else if
+                        (itemInSlot?.OwnInventory != null &&
+                        itemInSlot.OwnInventory.CanBePut(DraggingItems.First()) &&
+                        itemInSlot.OwnInventory.Container.AllowDragAndDrop &&
+                        itemInSlot.OwnInventory.Container.DrawInventory)
                    {
                        canBePut = true;
                    }
@@ -1922,9 +1950,25 @@ namespace Barotrauma
                foreach (UInt16 id in receivedItemIDs[i])
                {
                    if (Entity.FindEntityByID(id) is not Item item || slots[i].Contains(item)) { continue; }
+
+                    if (Owner is Item thisItem && thisItem.Container == item)
+                    {
+                        //if this item is inside the item we're trying to contain inside it, we need to drop it (both items can't be inside each other!)
+                        //can happen when a player swaps the items to be "the other way around", and we receive a message about the contained item
+                        //before the message about the "parent item" being placed in some other inventory (like the player's inventory)
+                        thisItem.Drop(null);
+                    }
+
                    if (!TryPutItem(item, i, false, false, null, false))
                    {
-                        ForceToSlot(item, i);
+                        try
+                        {
+                            ForceToSlot(item, i);
+                        }
+                        catch (InvalidOperationException e)
+                        {
+                            DebugConsole.AddSafeError(e.Message + "\n" + e.StackTrace.CleanupStackTrace());
+                        }
                    }
                    for (int j = 0; j < capacity; j++)
                    {
@@ -132,9 +132,9 @@ namespace Barotrauma
            return GetDrawDepth(SpriteDepth + DrawDepthOffset, Sprite);
        }

-        public Color GetSpriteColor(bool withHighlight = false)
+        public Color GetSpriteColor(Color? defaultColor = null, bool withHighlight = false)
        {
-            Color color = spriteColor;
+            Color color = defaultColor ?? spriteColor;
            if (Prefab.UseContainedSpriteColor && ownInventory != null)
            {
                foreach (Item item in ContainedItems)
@@ -286,7 +286,8 @@ namespace Barotrauma
            {
                int padding = 100;

-                Vector2 min = new Vector2(-rect.Width / 2 - padding, -rect.Height / 2 - padding);
+                RectangleF boundingBox = GetTransformedQuad().BoundingAxisAlignedRectangle;
+                Vector2 min = new Vector2(-boundingBox.Width / 2 - padding, -boundingBox.Height / 2 - padding);
                Vector2 max = -min;

                foreach (IDrawableComponent drawable in drawableComponents)
@@ -333,9 +334,7 @@ namespace Barotrauma
                else if (!ShowItems) { return; }
            }

-            Color color = 
-                overrideColor ??
-                (IsIncludedInSelection && editing ?  GUIStyle.Blue : GetSpriteColor(withHighlight: true));
+            Color color = GetSpriteColor(spriteColor);

            bool isWiringMode = editing && SubEditorScreen.TransparentWiringMode && SubEditorScreen.IsWiringMode() && !isWire && parentInventory == null;
            bool renderTransparent = isWiringMode && GetComponent<ConnectionPanel>() == null;
@@ -388,9 +387,9 @@ namespace Barotrauma
                {
                    if (Prefab.ResizeHorizontal || Prefab.ResizeVertical)
                    {
-                        Vector2 size = new Vector2(rect.Width, rect.Height);
                        if (color.A > 0)
                        {
+                            Vector2 size = new Vector2(rect.Width, rect.Height);
                            activeSprite.DrawTiled(spriteBatch, new Vector2(DrawPosition.X - rect.Width / 2, -(DrawPosition.Y + rect.Height / 2)) + drawOffset,
                                size, color: color,
                                textureScale: Vector2.One * Scale,
@@ -403,18 +402,7 @@ namespace Barotrauma
                                    textureScale: Vector2.One * Scale,
                                    depth: d);
                            }
-                            foreach (var decorativeSprite in Prefab.DecorativeSprites)
-                            {
-                                if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                                Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier, flippedX && Prefab.CanSpriteFlipX ? RotationRad : -RotationRad) * Scale;
-                                if (flippedX && Prefab.CanSpriteFlipX) { offset.X = -offset.X; }
-                                if (flippedY && Prefab.CanSpriteFlipY) { offset.Y = -offset.Y; }
-                                decorativeSprite.Sprite.DrawTiled(spriteBatch,
-                                    new Vector2(DrawPosition.X + offset.X - rect.Width / 2, -(DrawPosition.Y + offset.Y + rect.Height / 2)),
-                                    size, color: color,
-                                    textureScale: Vector2.One * Scale,
-                                    depth: Math.Min(depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth), 0.999f));
-                            }
+                            DrawDecorativeSprites(spriteBatch, DrawPosition, flippedX && Prefab.CanSpriteFlipX, flippedY && Prefab.CanSpriteFlipY, rotation: 0, depth);
                        }
                    }
                    else
@@ -434,19 +422,8 @@ namespace Barotrauma
                            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);
                        }
-                        foreach (var decorativeSprite in Prefab.DecorativeSprites)
-                        {
-                            if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                            float rot = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor);
-                            bool flipX = flippedX && Prefab.CanSpriteFlipX;
-                            bool flipY = flippedY && Prefab.CanSpriteFlipY;
-                            Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier, flipX ^ flipY ? RotationRad : -RotationRad) * Scale;
-                            if (flipX) { offset.X = -offset.X; }
-                            if (flipY) { offset.Y = -offset.Y; }
-                            decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X + offset.X, -(DrawPosition.Y + offset.Y)), color,
-                                RotationRad + rot, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, activeSprite.effects,
-                                depth: Math.Min(depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth), 0.999f));
-                        }
+
+                        DrawDecorativeSprites(spriteBatch, DrawPosition, flippedX && Prefab.CanSpriteFlipX, flippedY && Prefab.CanSpriteFlipY, -RotationRad, depth);
                    }
                }
                else if (body.Enabled)
@@ -490,21 +467,7 @@ namespace Barotrauma
                        float d = Math.Min(depth + (fadeInBrokenSprite.Sprite.Depth - activeSprite.Depth - 0.000001f), 0.999f);
                        body.Draw(spriteBatch, fadeInBrokenSprite.Sprite, color * fadeInBrokenSpriteAlpha, d, Scale);
                    }
-                    foreach (var decorativeSprite in Prefab.DecorativeSprites)
-                    {
-                        if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                        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 = MathF.Cos(-body.DrawRotation);
-                        var sa = MathF.Sin(-body.DrawRotation);
-                        Vector2 transformedOffset = new Vector2(ca * offset.X + sa * offset.Y, -sa * offset.X + ca * offset.Y);
-
-                        decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(body.DrawPosition.X + transformedOffset.X, -(body.DrawPosition.Y + transformedOffset.Y)), color,
-                            -body.DrawRotation + rotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, activeSprite.effects,
-                            depth: depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth));
-                    }
+                    DrawDecorativeSprites(spriteBatch, body.DrawPosition, flipX: body.Dir < 0, flipY: false, rotation: body.Rotation, depth: depth);
                }

                foreach (var upgrade in Upgrades)
@@ -522,7 +485,6 @@ namespace Barotrauma
                            rotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, activeSprite.effects,
                            depth: depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth));
                    }
-
                }

                activeSprite.effects = oldEffects;
@@ -567,8 +529,14 @@ namespace Barotrauma
                Vector2 drawPos = new Vector2(DrawPosition.X - rect.Width / 2, -(DrawPosition.Y + rect.Height / 2));
                Vector2 drawSize = new Vector2(MathF.Ceiling(rect.Width + Math.Abs(drawPos.X - (int)drawPos.X)), MathF.Ceiling(rect.Height + Math.Abs(drawPos.Y - (int)drawPos.Y)));
                drawPos = new Vector2(MathF.Floor(drawPos.X), MathF.Floor(drawPos.Y));
-                GUI.DrawRectangle(spriteBatch, drawPos, drawSize,
-                    Color.White, false, 0, thickness: Math.Max(1, (int)(2 / Screen.Selected.Cam.Zoom)));
+                GUI.DrawRectangle(sb: spriteBatch,
+                    center: drawPos + drawSize * 0.5f,
+                    width: drawSize.X,
+                    height: drawSize.Y,
+                    rotation: RotationRad,
+                    clr: Color.White,
+                    depth: 0,
+                    thickness: 2f / Screen.Selected.Cam.Zoom);

                foreach (Rectangle t in Prefab.Triggers)
                {
@@ -618,6 +586,62 @@ namespace Barotrauma
                }
                return origin;
            }
+
+            Color GetSpriteColor(Color defaultColor)
+            {
+                return
+                    overrideColor ??
+                    (IsIncludedInSelection && editing ? GUIStyle.Blue : this.GetSpriteColor(defaultColor: defaultColor, withHighlight: true));
+            }
+        }
+
+        public void DrawDecorativeSprites(SpriteBatch spriteBatch, Vector2 drawPos, bool flipX, bool flipY, float rotation, float depth)
+        {
+            foreach (var decorativeSprite in Prefab.DecorativeSprites)
+            {
+                Color decorativeSpriteColor = GetSpriteColor(decorativeSprite.Color).Multiply(GetSpriteColor(spriteColor));
+                if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
+
+                Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier,
+                    flipX ^ flipY ? -rotation : rotation) * Scale;
+
+                if (ResizeHorizontal || ResizeVertical)
+                {
+                    decorativeSprite.Sprite.DrawTiled(spriteBatch,
+                        new Vector2(DrawPosition.X + offset.X - rect.Width / 2, -(DrawPosition.Y + offset.Y + rect.Height / 2)),
+                        new Vector2(rect.Width, rect.Height), color: decorativeSpriteColor,
+                        textureScale: Vector2.One * Scale,
+                        depth: Math.Min(depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth), 0.999f));
+                }
+                else
+                {
+                    float spriteRotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor);
+                    
+                    Vector2 origin = decorativeSprite.Sprite.Origin;
+                    SpriteEffects spriteEffects = SpriteEffects.None;
+                    if (flipX && Prefab.CanSpriteFlipX) 
+                    { 
+                        offset.X = -offset.X;
+                        origin.X = -origin.X + decorativeSprite.Sprite.size.X;
+                        spriteEffects = SpriteEffects.FlipHorizontally;
+                    }
+                    if (flipY && Prefab.CanSpriteFlipY) 
+                    { 
+                        offset.Y = -offset.Y;
+                        origin.Y = -origin.Y + decorativeSprite.Sprite.size.Y;
+                        spriteEffects |= SpriteEffects.FlipVertically;
+                    }
+                    if (body != null)
+                    {
+                        var ca = MathF.Cos(-body.DrawRotation);
+                        var sa = MathF.Sin(-body.DrawRotation);
+                        offset = new Vector2(ca * offset.X + sa * offset.Y, -sa * offset.X + ca * offset.Y);
+                    }
+                    decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(drawPos.X + offset.X, -(drawPos.Y + offset.Y)), decorativeSpriteColor, origin,
+                        -rotation + spriteRotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, spriteEffects,
+                        depth: depth + (decorativeSprite.Sprite.Depth - activeSprite.Depth));
+                }
+            }
        }

        partial void OnCollisionProjSpecific(float impact)
@@ -795,6 +819,19 @@ namespace Barotrauma
            }
        }

+        public override bool IsMouseOn(Vector2 position)
+        {
+            Vector2 rectSize = rect.Size.ToVector2();
+
+            Vector2 bodyPos = WorldPosition;
+
+            Vector2 transformedMousePos = MathUtils.RotatePointAroundTarget(position, bodyPos, RotationRad);
+
+            return
+                Math.Abs(transformedMousePos.X - bodyPos.X) < rectSize.X / 2.0f &&
+                Math.Abs(transformedMousePos.Y - bodyPos.Y) < rectSize.Y / 2.0f;
+        }
+
        public GUIComponent CreateEditingHUD(bool inGame = false)
        {
            activeEditors.Clear();
@@ -852,7 +889,12 @@ namespace Barotrauma
                    CanBeFocused = true
                };

-                new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityX"), style: "GUIButtonSmall")
+                GUINumberInput rotationField =
+                    itemEditor.Fields.TryGetValue("Rotation".ToIdentifier(), out var rotationFieldComponents)
+                        ? rotationFieldComponents.OfType<GUINumberInput>().FirstOrDefault()
+                        : null;
+
+                var mirrorX = new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityX"), style: "GUIButtonSmall")
                {
                    ToolTip = TextManager.Get("MirrorEntityXToolTip"),
                    Enabled = Prefab.CanFlipX,
@@ -863,10 +905,13 @@ namespace Barotrauma
                            me.FlipX(relativeToSub: false);
                        }
                        if (!SelectedList.Contains(this)) { FlipX(relativeToSub: false); }
+                        ColorFlipButton(button, FlippedX);
+                        if (rotationField != null) { rotationField.FloatValue = Rotation; }
                        return true;
                    }
                };
-                new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"), style: "GUIButtonSmall")
+                ColorFlipButton(mirrorX, FlippedX);
+                var mirrorY = new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"), style: "GUIButtonSmall")
                {
                    ToolTip = TextManager.Get("MirrorEntityYToolTip"),
                    Enabled = Prefab.CanFlipY,
@@ -877,9 +922,12 @@ namespace Barotrauma
                            me.FlipY(relativeToSub: false);
                        }
                        if (!SelectedList.Contains(this)) { FlipY(relativeToSub: false); }
+                        ColorFlipButton(button, FlippedY);
+                        if (rotationField != null) { rotationField.FloatValue = Rotation; }
                        return true;
                    }
                };
+                ColorFlipButton(mirrorY, FlippedY);
                if (Sprite != null)
                {
                    var reloadTextureButton = new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("ReloadSprite"), style: "GUIButtonSmall");
@@ -1540,6 +1588,23 @@ namespace Barotrauma
                        RemoveFromDroppedStack(allowClientExecute: true);
                    }
                    break;
+                case EventType.SetHighlight:
+                    bool isTargetedForThisClient = msg.ReadBoolean();
+                    if (isTargetedForThisClient)
+                    {
+                        bool highlight = msg.ReadBoolean();
+                        ExternalHighlight = highlight;
+                        if (highlight)
+                        { 
+                            Color highlightColor = msg.ReadColorR8G8B8A8();
+                            HighlightColor = highlightColor;
+                        }
+                        else
+                        {
+                            HighlightColor = null;
+                        }
+                    }
+                    break;
                default:
                    throw new Exception($"Malformed incoming item event: unsupported event type {eventType}");
            }
@@ -1940,5 +2005,13 @@ namespace Barotrauma
                Inventory.DraggingSlot = null;
            }
        }
+
+        public void OnPlayerSkillsChanged()
+        {
+            foreach (ItemComponent ic in components)
+            {
+                ic.OnPlayerSkillsChanged();
+            }
+        }
    }
 }
@@ -321,10 +321,8 @@ namespace Barotrauma
                }
                else
                {
-                    if (ResizeHorizontal)
-                        placeSize.X = Math.Max(position.X - placePosition.X, Size.X);
-                    if (ResizeVertical)
-                        placeSize.Y = Math.Max(placePosition.Y - position.Y, Size.Y);
+                    if (ResizeHorizontal) { placeSize.X = Math.Max(position.X - placePosition.X, Size.X); }
+                    if (ResizeVertical) { placeSize.Y = Math.Max(placePosition.Y - position.Y, Size.Y); }

                    if (PlayerInput.PrimaryMouseButtonReleased())
                    {
@@ -369,15 +367,31 @@ namespace Barotrauma
            }
        }

-        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f, SpriteEffects spriteEffects = SpriteEffects.None)
+        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f, float rotation = 0.0f, SpriteEffects spriteEffects = SpriteEffects.None)
        {
            if (!ResizeHorizontal && !ResizeVertical)
            {
-                Sprite.Draw(spriteBatch, new Vector2(placeRect.Center.X, -(placeRect.Y - placeRect.Height / 2)), SpriteColor * 0.8f, scale: scale);
+                sprite.Draw(
+                    spriteBatch: spriteBatch,
+                    pos: new Vector2(placeRect.Center.X,
+                        -(placeRect.Y - placeRect.Height / 2)),
+                    color: SpriteColor * 0.8f,
+                    scale: scale,
+                    rotate: rotation,
+                    spriteEffect: spriteEffects ^ sprite.effects);
            }
            else
            {
-                Sprite.DrawTiled(spriteBatch, new Vector2(placeRect.X, -placeRect.Y), placeRect.Size.ToVector2(), SpriteColor * 0.8f);
+                Vector2 position = placeRect.Location.ToVector2();
+                Vector2 placeSize = placeRect.Size.ToVector2();
+                sprite?.DrawTiled(
+                    spriteBatch: spriteBatch,
+                    position: new Vector2(position.X, -position.Y),
+                    targetSize: placeSize,
+                    rotation: rotation,
+                    textureScale: Vector2.One * scale,
+                    color: SpriteColor * 0.8f,
+                    spriteEffects: spriteEffects ^ sprite.effects);
            }
        }