0.1500.3.0 (🗿 edition)

2021-09-17 22:47:21 +09:00
parent 1231170fce
commit 5a6bbcc79e
75 changed files with 1145 additions and 441 deletions
@@ -801,7 +801,11 @@ namespace Barotrauma
                {
                    var treatmentButton = component.GetChild<GUIButton>();
                    if (!(treatmentButton?.UserData is ItemPrefab itemPrefab)) { continue; }
-                    treatmentButton.Enabled = Character.Controlled.Inventory.AllItems.Any(it => it.prefab == itemPrefab);
+                    treatmentButton.Enabled = Character.Controlled.Inventory.AllItems.Any(it => it.prefab == itemPrefab);  
+                    foreach (GUIComponent child in treatmentButton.Children)
+                    {
+                        child.Enabled = treatmentButton.Enabled;
+                    }
                }
            }

@@ -1155,7 +1159,10 @@ namespace Barotrauma
            //key = item identifier
            //float = suitability
            Dictionary<string, float> treatmentSuitability = new Dictionary<string, float>();
-            GetSuitableTreatments(treatmentSuitability, normalize: true, limb: selectedLimbIndex == -1 ? null : Character.AnimController.Limbs.Find(l => l.HealthIndex == selectedLimbIndex));
+            GetSuitableTreatments(treatmentSuitability, 
+                normalize: true,
+                ignoreHiddenAfflictions: true,
+                limb: selectedLimbIndex == -1 ? null : Character.AnimController.Limbs.Find(l => l.HealthIndex == selectedLimbIndex));

            foreach (string treatment in treatmentSuitability.Keys.ToList())
            {
@@ -1260,10 +1267,11 @@ namespace Barotrauma
                    UserData = item
                };

-                var innerFrame = new GUIButton(new RectTransform(Vector2.One, itemSlot.RectTransform, Anchor.Center, Pivot.Center, scaleBasis: ScaleBasis.Smallest), style: "GUIButtonRound")
+                var innerFrame = new GUIButton(new RectTransform(Vector2.One, itemSlot.RectTransform, Anchor.Center, Pivot.Center, scaleBasis: ScaleBasis.Smallest), style: "SubtreeHeader")
                {
                    UserData = item,
                    ToolTip = $"‖color:255,255,255,255‖{item.Name}‖color:end‖" + '\n' + item.Description,
+                    DisabledColor = Color.White * 0.1f,
                    OnClicked = (btn, userdata) =>
                    {
                        if (!(userdata is ItemPrefab itemPrefab)) { return false; }
@@ -1274,6 +1282,17 @@ namespace Barotrauma
                        return true;
                    }
                };
+
+                new GUIImage(new RectTransform(Vector2.One, innerFrame.RectTransform, Anchor.Center), style: "TalentBackgroundGlow")
+                {
+                    CanBeFocused = false,
+                    Color = Color.White * 0.7f,
+                    HoverColor = Color.White,
+                    PressedColor = Color.DarkGray,
+                    SelectedColor = Color.Transparent,
+                    DisabledColor = Color.Transparent
+                };
+
                Sprite itemSprite = item.InventoryIcon ?? item.sprite;
                Color itemColor = itemSprite == item.sprite ? item.SpriteColor : item.InventoryIconColor;
                var itemIcon = new GUIImage(new RectTransform(new Vector2(0.8f, 0.8f), innerFrame.RectTransform, Anchor.Center),
@@ -1283,7 +1302,7 @@ namespace Barotrauma
                    Color = itemColor * 0.9f,
                    HoverColor = itemColor,
                    SelectedColor = itemColor,
-                    DisabledColor = itemColor * 0.7f
+                    DisabledColor = itemColor * 0.8f
                };
            }

@@ -1697,13 +1697,14 @@ namespace Barotrauma
                    //check missing mission texts
                    foreach (var missionPrefab in MissionPrefab.List)
                    {
-                        string nameIdentifier = "missionname." + missionPrefab.Identifier;
+                        string missionId = (missionPrefab.ConfigElement.Attribute("textidentifier") == null ? missionPrefab.Identifier : missionPrefab.ConfigElement.GetAttributeString("textidentifier", string.Empty));
+                        string nameIdentifier = "missionname." + missionId;
                        if (!tags[language].Contains(nameIdentifier))
                        {
                            if (!missingTags.ContainsKey(nameIdentifier)) { missingTags[nameIdentifier] = new HashSet<string>(); }
                            missingTags[nameIdentifier].Add(language);
                        }
-                        string descriptionIdentifier = "missiondescription." + missionPrefab.Identifier;
+                        string descriptionIdentifier = "missiondescription." + missionId;
                        if (!tags[language].Contains(descriptionIdentifier))
                        {
                            if (!missingTags.ContainsKey(descriptionIdentifier)) { missingTags[descriptionIdentifier] = new HashSet<string>(); }
@@ -1713,6 +1714,7 @@ namespace Barotrauma

                    foreach (SubmarineInfo sub in SubmarineInfo.SavedSubmarines)
                    {
+                        if (sub.Type != SubmarineType.Player) { continue; }
                        string nameIdentifier = "submarine.name." + sub.Name.ToLowerInvariant();
                        if (!tags[language].Contains(nameIdentifier))
                        {
@@ -1729,14 +1731,23 @@ namespace Barotrauma

                    foreach (AfflictionPrefab affliction in AfflictionPrefab.List)
                    {
-                        string nameIdentifier = "afflictionname." + affliction.Identifier;
+                        if (affliction.ShowIconThreshold > affliction.MaxStrength && 
+                            affliction.ShowIconToOthersThreshold > affliction.MaxStrength && 
+                            affliction.ShowInHealthScannerThreshold > affliction.MaxStrength)
+                        {
+                            //hidden affliction, no need for localization
+                            continue;
+                        }
+
+                        string afflictionId = affliction.TranslationOverride ?? affliction.Identifier;
+                        string nameIdentifier = "afflictionname." + afflictionId;
                        if (!tags[language].Contains(nameIdentifier))
                        {
                            if (!missingTags.ContainsKey(nameIdentifier)) { missingTags[nameIdentifier] = new HashSet<string>(); }
                            missingTags[nameIdentifier].Add(language);
                        }

-                        string descriptionIdentifier = "afflictiondescription." + affliction.Identifier;
+                        string descriptionIdentifier = "afflictiondescription." + afflictionId;
                        if (!tags[language].Contains(descriptionIdentifier))
                        {
                            if (!missingTags.ContainsKey(descriptionIdentifier)) { missingTags[descriptionIdentifier] = new HashSet<string>(); }
@@ -1744,6 +1755,29 @@ namespace Barotrauma
                        }
                    }

+                    foreach (var talentTree in TalentTree.JobTalentTrees)
+                    {
+                        foreach (var talentSubTree in talentTree.Value.TalentSubTrees)
+                        {
+                            string nameIdentifier = "talenttree." + talentSubTree.Identifier;
+                            if (!tags[language].Contains(nameIdentifier))
+                            {
+                                if (!missingTags.ContainsKey(nameIdentifier)) { missingTags[nameIdentifier] = new HashSet<string>(); }
+                                missingTags[nameIdentifier].Add(language);
+                            }
+                        }
+                    }
+
+                    foreach (var talent in TalentPrefab.TalentPrefabs)
+                    {
+                        string nameIdentifier = "talentname." + talent.Identifier;
+                        if (!tags[language].Contains(nameIdentifier))
+                        {
+                            if (!missingTags.ContainsKey(nameIdentifier)) { missingTags[nameIdentifier] = new HashSet<string>(); }
+                            missingTags[nameIdentifier].Add(language);
+                        }
+                    }
+
                    //check missing entity names
                    foreach (MapEntityPrefab me in MapEntityPrefab.List)
                    {
@@ -41,11 +41,14 @@ namespace Barotrauma
        public SpriteSheet SavingIndicator { get; private set; }

        public UISprite UIGlow { get; private set; }
+        public UISprite TalentGlow { get; private set; }

        public UISprite PingCircle { get; private set; }

        public UISprite UIGlowCircular { get; private set; }

+        public UISprite UIGlowSolidCircular { get; private set; }
+
        public UISprite ButtonPulse { get; private set; }

        public SpriteSheet FocusIndicator { get; private set; }
@@ -88,6 +91,12 @@ namespace Barotrauma
        public Color TextColorDark { get; private set; } = Color.Black * 0.9f;
        public Color TextColorDim { get; private set; } = Color.White * 0.6f;

+        public Color ItemQualityColorPoor { get; private set; } = Color.Gray;
+        public Color ItemQualityColorNormal { get; private set; } = Color.White;
+        public Color ItemQualityColorGood { get; private set; } = Color.LightGreen;
+        public Color ItemQualityColorExcellent { get; private set; } = Color.LightBlue;
+        public Color ItemQualityColorMasterwork { get; private set; } = Color.MediumPurple;
+
        public Color ColorReputationVeryLow { get; private set; } = Color.Red;
        public Color ColorReputationLow { get; private set; } = Color.Orange;
        public Color ColorReputationNeutral { get; private set; } = Color.White * 0.8f;
@@ -241,6 +250,9 @@ namespace Barotrauma
                    case "uiglow":
                        UIGlow = new UISprite(subElement);
                        break;
+                    case "talentglow":
+                        TalentGlow = new UISprite(subElement);
+                        break;
                    case "pingcircle":
                        PingCircle = new UISprite(subElement);
                        break;
@@ -253,6 +265,9 @@ namespace Barotrauma
                    case "uiglowcircular":
                        UIGlowCircular = new UISprite(subElement);
                        break;
+                    case "uiglowsolidcircular":
+                        UIGlowSolidCircular = new UISprite(subElement);
+                        break;
                    case "endroundbuttonpulse":
                        ButtonPulse = new UISprite(subElement);
                        break;
@@ -81,7 +81,7 @@ namespace Barotrauma

        private readonly object loadMutex = new object();
        private float? loadState;
-        
+
        public float? LoadState
        {
            get
@@ -90,8 +90,8 @@ namespace Barotrauma
                {
                    return loadState;
                }
-            }        
-            set 
+            }
+            set
            {
                lock (loadMutex)
                {
@@ -141,7 +141,7 @@ namespace Barotrauma
                    GameMain.Config.EnableSplashScreen = false;
                }
            }
-                        
+
            var titleStyle = GUI.Style?.GetComponentStyle("TitleText");
            Sprite titleSprite = null;
            if (!WaitForLanguageSelection && titleStyle != null && titleStyle.Sprites.ContainsKey(GUIComponent.ComponentState.None))
@@ -177,8 +177,8 @@ namespace Barotrauma
                color: Color.White * noiseStrength * 0.1f,
                textureScale: Vector2.One * noiseScale);

-            titleSprite?.Draw(spriteBatch, new Vector2(GameMain.GraphicsWidth * 0.05f, GameMain.GraphicsHeight * 0.125f), 
-                Color.White, origin: new Vector2(0.0f, titleSprite.SourceRect.Height / 2.0f), 
+            titleSprite?.Draw(spriteBatch, new Vector2(GameMain.GraphicsWidth * 0.05f, GameMain.GraphicsHeight * 0.125f),
+                Color.White, origin: new Vector2(0.0f, titleSprite.SourceRect.Height / 2.0f),
                scale: GameMain.GraphicsHeight / 2000.0f);

            if (WaitForLanguageSelection)
@@ -211,6 +211,13 @@ namespace Barotrauma
                        if (LoadState != null)
                        {
                            loadText += " " + (int)LoadState + " %";
+
+#if DEBUG
+                            if (GameMain.FirstLoad && GameMain.CancelQuickStart)
+                            {
+                                loadText += " (Quickstart aborted)";
+                            }
+#endif
                        }
                    }
                    if (GUI.LargeFont != null)
@@ -265,7 +272,7 @@ namespace Barotrauma
            decorativeGraph.Draw(spriteBatch, (int)(decorativeGraph.FrameCount * noiseVal),
                new Vector2(GameMain.GraphicsWidth * 0.001f, GameMain.GraphicsHeight * 0.24f),
                Color.White, Vector2.Zero, 0.0f, decorativeScale, SpriteEffects.FlipVertically);
-            
+
            decorativeMap.Draw(spriteBatch, (int)(decorativeMap.FrameCount * noiseVal),
                new Vector2(GameMain.GraphicsWidth * 0.99f, GameMain.GraphicsHeight * 0.66f),
                Color.White, decorativeMap.FrameSize.ToVector2(), 0.0f, decorativeScale);
@@ -281,9 +288,9 @@ namespace Barotrauma
            }
            else if (noiseVal < 0.5f)
            {
-                randText = 
-                    Rand.Int(100).ToString().PadLeft(2, '0') + " " + 
-                    Rand.Int(100).ToString().PadLeft(2, '0') + " " + 
+                randText =
+                    Rand.Int(100).ToString().PadLeft(2, '0') + " " +
+                    Rand.Int(100).ToString().PadLeft(2, '0') + " " +
                    Rand.Int(100).ToString().PadLeft(2, '0') + " " +
                    Rand.Int(100).ToString().PadLeft(2, '0');
            }
@@ -299,12 +306,12 @@ namespace Barotrauma
        {
            if (languageSelectionFont == null)
            {
-                languageSelectionFont = new ScalableFont("Content/Fonts/NotoSans/NotoSans-Bold.ttf", 
+                languageSelectionFont = new ScalableFont("Content/Fonts/NotoSans/NotoSans-Bold.ttf",
                    (uint)(30 * (GameMain.GraphicsHeight / 1080.0f)), graphicsDevice);
            }
            if (languageSelectionFontCJK == null)
            {
-                languageSelectionFontCJK = new ScalableFont("Content/Fonts/NotoSans/NotoSansCJKsc-Bold.otf", 
+                languageSelectionFontCJK = new ScalableFont("Content/Fonts/NotoSans/NotoSansCJKsc-Bold.otf",
                    (uint)(30 * (GameMain.GraphicsHeight / 1080.0f)), graphicsDevice, dynamicLoading: true);
            }
            if (languageSelectionCursor == null)
@@ -320,11 +327,11 @@ namespace Barotrauma
                var font = TextManager.IsCJK(localizedLanguageName) ? languageSelectionFontCJK : languageSelectionFont;

                Vector2 textSize = font.MeasureString(localizedLanguageName);
-                bool hover = 
-                    Math.Abs(PlayerInput.MousePosition.X - textPos.X) < textSize.X / 2 && 
+                bool hover =
+                    Math.Abs(PlayerInput.MousePosition.X - textPos.X) < textSize.X / 2 &&
                    Math.Abs(PlayerInput.MousePosition.Y - textPos.Y) < textSpacing.Y / 2;

-                font.DrawString(spriteBatch, localizedLanguageName, textPos - textSize / 2, 
+                font.DrawString(spriteBatch, localizedLanguageName, textPos - textSize / 2,
                    hover ? Color.White : Color.White * 0.6f);
                if (hover && PlayerInput.PrimaryMouseButtonClicked())
                {
@@ -394,14 +401,14 @@ namespace Barotrauma
            LoadState = null;
            SetSelectedTip(TextManager.Get("LoadingScreenTip", true));
            currentBackgroundTexture = LocationType.List.GetRandom()?.GetPortrait(Rand.Int(int.MaxValue))?.Texture;
-            
+
            while (!drawn)
            {
                yield return CoroutineStatus.Running;
            }

            CoroutineManager.StartCoroutine(loader);
-            
+
            yield return CoroutineStatus.Running;

            while (CoroutineManager.IsCoroutineRunning(loader.ToString()))
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Linq;
@@ -18,8 +19,8 @@ namespace Barotrauma
        private static UISprite spectateIcon, disconnectedIcon;
        private static Sprite ownerIcon, moderatorIcon;

-        private enum InfoFrameTab { Crew, Mission, Reputation, MyCharacter, Traitor, Submarine, Talents };
-        private static InfoFrameTab selectedTab;
+        public enum InfoFrameTab { Crew, Mission, Reputation, MyCharacter, Traitor, Submarine, Talents };
+        public static InfoFrameTab selectedTab;
        private GUIFrame infoFrame, contentFrame;

        private readonly List<GUIButton> tabButtons = new List<GUIButton>();
@@ -48,7 +49,7 @@ namespace Barotrauma
            private readonly GUIFrame frame;

            public LinkedGUI(Client client, GUIFrame frame, bool hasCharacter, GUITextBlock textBlock)
-            {                
+            {
                this.client = client;
                this.textBlock = textBlock;
                this.frame = frame;
@@ -262,7 +263,11 @@ namespace Barotrauma
            var talentsButton = createTabButton(InfoFrameTab.Talents, "tabmenu.talents");
            talentsButton.OnAddedToGUIUpdateList += (GUIComponent component) =>
            {
-                talentsButton.Enabled = Character.Controlled?.Info != null && GameMain.GameSession?.Campaign != null;
+                talentsButton.Enabled = Character.Controlled?.Info != null && (GameMain.GameSession?.Campaign != null || Screen.Selected == GameMain.TestScreen || GameMain.GameSession.GameMode is TestGameMode);
+                if (!talentsButton.Enabled && selectedTab == InfoFrameTab.Talents)
+                {
+                    SelectInfoFrameTab(null, InfoFrameTab.Crew);
+                }
            };
        }

@@ -417,7 +422,7 @@ namespace Barotrauma
            if (GameMain.IsMultiplayer)
            {
                CreateMultiPlayerList(false);
-                CreateMultiPlayerLogContent(crewFrame); 
+                CreateMultiPlayerLogContent(crewFrame);
            }
            else
            {
@@ -608,7 +613,7 @@ namespace Barotrauma
                AbsoluteSpacing = 2
            };

-            new GUICustomComponent(new RectTransform(new Point(jobColumnWidth, paddedFrame.Rect.Height), paddedFrame.RectTransform, Anchor.Center), 
+            new GUICustomComponent(new RectTransform(new Point(jobColumnWidth, paddedFrame.Rect.Height), paddedFrame.RectTransform, Anchor.Center),
                onDraw: (sb, component) => DrawNotInGameIcon(sb, component.Rect, client))
            {
                CanBeFocused = false,
@@ -837,7 +842,7 @@ namespace Barotrauma
        }

        private static readonly List<Pair<string, PlayerConnectionChangeType>> storedMessages = new List<Pair<string, PlayerConnectionChangeType>>();
-               
+
        public static void StorePlayerConnectionChangeMessage(ChatMessage message)
        {
            if (!GameMain.GameSession?.IsRunning ?? true) { return; }
@@ -850,7 +855,7 @@ namespace Barotrauma
                TabMenu instance = GameSession.TabMenuInstance;
                instance.AddLineToLog(msg, message.ChangeType);
                instance.RemoveCurrentElements();
-                instance.CreateMultiPlayerList(true);                
+                instance.CreateMultiPlayerList(true);
            }
        }

@@ -969,7 +974,7 @@ namespace Barotrauma
                    GUIFrame missionDescriptionHolder = new GUIFrame(new RectTransform(Vector2.One, missionList.Content.RectTransform), style: null);
                    GUILayoutGroup missionTextGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.744f, 0f), missionDescriptionHolder.RectTransform, Anchor.CenterLeft) { AbsoluteOffset = new Point(iconSize + spacing, 0) }, false, childAnchor: Anchor.TopLeft)
                    {
-                        AbsoluteSpacing = spacing 
+                        AbsoluteSpacing = spacing
                    };
                    string descriptionText = mission.Description;
                    foreach (string missionMessage in mission.ShownMessages)
@@ -997,7 +1002,7 @@ namespace Barotrauma
                    float ySize = missionNameSize.Y + missionDescriptionSize.Y + missionRewardSize.Y + missionReputationSize.Y + missionTextGroup.AbsoluteSpacing * 4;
                    bool displayDifficulty = mission.Difficulty.HasValue;
                    if (displayDifficulty) { ySize += missionRewardSize.Y; }
-                    
+
                    missionDescriptionHolder.RectTransform.NonScaledSize = new Point(missionDescriptionHolder.RectTransform.NonScaledSize.X, (int)ySize);
                    missionTextGroup.RectTransform.NonScaledSize = new Point(missionTextGroup.RectTransform.NonScaledSize.X, missionDescriptionHolder.RectTransform.NonScaledSize.Y);

@@ -1008,8 +1013,8 @@ namespace Barotrauma
                        int iconHeight = Math.Max(missionTextGroup.RectTransform.NonScaledSize.Y, (int)(iconWidth * iconAspectRatio));
                        Point iconSize = new Point(iconWidth, iconHeight);*/

-                        new GUIImage(new RectTransform(new Point(iconSize), missionDescriptionHolder.RectTransform), mission.Prefab.Icon, null, true) 
-                        { 
+                        new GUIImage(new RectTransform(new Point(iconSize), missionDescriptionHolder.RectTransform), mission.Prefab.Icon, null, true)
+                        {
                            Color = mission.Prefab.IconColor,
                            HoverColor = mission.Prefab.IconColor,
                            SelectedColor = mission.Prefab.IconColor,
@@ -1174,19 +1179,38 @@ namespace Barotrauma
        private Color unselectableColor = new Color(100, 100, 100, 225);
        private Color pressedColor = new Color(60, 60, 60, 225);

-        private readonly List<(GUIButton button, GUIImage background, GUIImage icon)> talentButtons = new List<(GUIButton button, GUIImage background, GUIImage icon)>();
+        private readonly List<(GUIButton button, GUIComponent icon, GUIImage glow)> talentButtons = new List<(GUIButton button, GUIComponent icon, GUIImage glow)>();
+        private readonly List<(string talentTree, int index, GUIImage icon, GUIFrame background, GUIFrame backgroundGlow)> talentCornerIcons = new List<(string talentTree, int index, GUIImage icon, GUIFrame background, GUIFrame backgroundGlow)>();
        private List<string> selectedTalents = new List<string>();
-        private GUITextBlock talentTitleText;
-        private GUITextBlock talentDescriptionText;
-        private GUITextBlock talentPointsText;

        private GUITextBlock experienceText;
        private GUIProgressBar experienceBar;
+        private GUITextBlock talentPointText;
+        private GUIListBox skillListBox;
+
+        private readonly ImmutableDictionary<TalentTree.TalentTreeStageState, GUIComponentStyle> talentStageStyles = new Dictionary<TalentTree.TalentTreeStageState, GUIComponentStyle>
+        {
+            { TalentTree.TalentTreeStageState.Invalid, GUI.Style.GetComponentStyle("TalentTreeLocked") },
+            { TalentTree.TalentTreeStageState.Locked, GUI.Style.GetComponentStyle("TalentTreeLocked") },
+            { TalentTree.TalentTreeStageState.Unlocked, GUI.Style.GetComponentStyle("TalentTreePurchased") },
+            { TalentTree.TalentTreeStageState.Available, GUI.Style.GetComponentStyle("TalentTreeUnlocked") },
+            { TalentTree.TalentTreeStageState.Highlighted, GUI.Style.GetComponentStyle("TalentTreeAvailable") },
+        }.ToImmutableDictionary();
+
+        private readonly ImmutableDictionary<TalentTree.TalentTreeStageState, Color> talentStageBackgroundColors = new Dictionary<TalentTree.TalentTreeStageState, Color>
+        {
+            { TalentTree.TalentTreeStageState.Invalid, new Color(48,48,48,255) },
+            { TalentTree.TalentTreeStageState.Locked, new Color(48,48,48,255) },
+            { TalentTree.TalentTreeStageState.Unlocked, new Color(24,37,31,255) },
+            { TalentTree.TalentTreeStageState.Available, new Color(50,47,33,255) },
+            { TalentTree.TalentTreeStageState.Highlighted, new Color(50,47,33,255) },
+        }.ToImmutableDictionary();

        private void CreateTalentInfo(GUIFrame infoFrame)
        {
            infoFrame.ClearChildren();
            talentButtons.Clear();
+            talentCornerIcons.Clear();

            Character controlledCharacter = Character.Controlled;
            if (controlledCharacter == null) { return; }
@@ -1195,6 +1219,8 @@ namespace Barotrauma
            int padding = GUI.IntScale(15);
            GUIFrame talentFrameContent = new GUIFrame(new RectTransform(new Point(talentFrameBackground.Rect.Width - padding, talentFrameBackground.Rect.Height - padding), infoFrame.RectTransform, Anchor.Center), style: null);

+            GUIFrame paddedTalentFrame = new GUIFrame(new RectTransform(new Vector2(0.9f), talentFrameContent.RectTransform, Anchor.Center), style: null);
+
            if (controlledCharacter.Info == null)
            {
                DebugConsole.ThrowError("No character info found for talent UI");
@@ -1203,87 +1229,103 @@ namespace Barotrauma

            selectedTalents = controlledCharacter.Info.UnlockedTalents.ToList();

-            GUILayoutGroup talentFrameLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), talentFrameContent.RectTransform, anchor: Anchor.Center), childAnchor: Anchor.TopCenter)
+            GUILayoutGroup talentFrameLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), paddedTalentFrame.RectTransform, anchor: Anchor.Center), childAnchor: Anchor.TopCenter)
            {
                AbsoluteSpacing = GUI.IntScale(5)
            };

-            GUILayoutGroup talentInfoLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.325f), talentFrameLayoutGroup.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter);
+            GUILayoutGroup talentInfoLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.25f), talentFrameLayoutGroup.RectTransform, Anchor.Center), isHorizontal: true);

-            GUIFrame talentTitleFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.25f), talentInfoLayoutGroup.RectTransform, Anchor.TopCenter), style: null);
+            CharacterInfo info = controlledCharacter.Info;
+            Job job = info.Job;

-            talentTitleText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), talentTitleFrame.RectTransform, Anchor.TopLeft), "", font: GUI.LargeFont);
-            talentPointsText = new GUITextBlock(new RectTransform(new Vector2(0.25f, 1.0f), talentTitleFrame.RectTransform, Anchor.TopRight), "", font: GUI.Font, textAlignment: Alignment.Center);
-
-            GUIFrame talentDescriptionFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.4f), talentInfoLayoutGroup.RectTransform, Anchor.TopCenter), style: null);
-
-            talentDescriptionText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), talentDescriptionFrame.RectTransform, Anchor.TopLeft), "", font: GUI.Font, textAlignment: Alignment.TopLeft, wrap: true);
-
-            GUIFrame characterInfoFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.3f), talentInfoLayoutGroup.RectTransform, Anchor.TopLeft), style: null);
-            GUILayoutGroup characterInfoColumn = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), characterInfoFrame.RectTransform, anchor: Anchor.TopLeft), childAnchor: Anchor.TopLeft, isHorizontal: true);
-
-            // move to a different tab menu
-            if (GameSettings.VerboseLogging)
+            new GUICustomComponent(new RectTransform(new Vector2(0.25f, 1f), talentInfoLayoutGroup.RectTransform), onDraw: (batch, component) =>
            {
-                CreateCharacterSheet(characterInfoColumn);
-            }
+                float posY = component.Rect.Bottom - component.Rect.Width;
+                info.DrawPortrait(batch, new Vector2(component.Rect.X, posY), Vector2.Zero, component.Rect.Width, false, false);
+            });
+
+            GUILayoutGroup nameLayout = new GUILayoutGroup(new RectTransform(new Vector2(0.375f, 1f), talentInfoLayoutGroup.RectTransform));
+
+            Vector2 nameSize = GUI.SubHeadingFont.MeasureString(info.Name);
+            GUITextBlock nameBlock = new GUITextBlock(new RectTransform(Vector2.One, nameLayout.RectTransform), info.Name, font: GUI.SubHeadingFont) { TextColor = job.Prefab.UIColor };
+            nameBlock.RectTransform.NonScaledSize = nameSize.Pad(nameBlock.Padding).ToPoint();
+
+            Vector2 jobSize = GUI.SmallFont.MeasureString(job.Name);
+            GUITextBlock jobBlock = new GUITextBlock(new RectTransform(Vector2.One, nameLayout.RectTransform), job.Name, font: GUI.SmallFont) { TextColor = job.Prefab.UIColor };
+            jobBlock.RectTransform.NonScaledSize = jobSize.Pad(jobBlock.Padding).ToPoint();
+
+            string traitString = TextManager.AddPunctuation(':', TextManager.Get("PersonalityTrait"), TextManager.Get("personalitytrait." + info.PersonalityTrait.Name.Replace(" ", "")));
+            Vector2 traitSize = GUI.SmallFont.MeasureString(traitString);
+            GUITextBlock traitBlock = new GUITextBlock(new RectTransform(Vector2.One, nameLayout.RectTransform), traitString, font: GUI.SmallFont);
+            traitBlock.RectTransform.NonScaledSize = traitSize.Pad(traitBlock.Padding).ToPoint();
+
+            GUILayoutGroup skillLayout = new GUILayoutGroup(new RectTransform(new Vector2(0.375f, 1f), talentInfoLayoutGroup.RectTransform)) { Stretch = true };
+
+            string skillString = TextManager.Get("skills");
+            Vector2 skillSize = GUI.SubHeadingFont.MeasureString(skillString);
+            GUITextBlock skillBlock = new GUITextBlock(new RectTransform(Vector2.One, skillLayout.RectTransform), skillString, font: GUI.SubHeadingFont);
+            skillBlock.RectTransform.NonScaledSize = skillSize.Pad(skillBlock.Padding).ToPoint();
+
+            skillListBox = new GUIListBox(new RectTransform(new Vector2(1f, 1f - skillBlock.RectTransform.RelativeSize.Y), skillLayout.RectTransform), style: null);
+            CreateTalentSkillList(controlledCharacter, skillListBox);

            if (!TalentTree.JobTalentTrees.TryGetValue(controlledCharacter.Info.Job.Prefab.Identifier, out TalentTree talentTree)) { return; }

-            GUIListBox talentTreeListBox = new GUIListBox(new RectTransform(new Vector2(1f, 0.6f), talentFrameLayoutGroup.RectTransform, Anchor.TopCenter), isHorizontal: true, style: null);
+            new GUIFrame(new RectTransform(new Vector2(1f, 1f), talentFrameLayoutGroup.RectTransform), style: "HorizontalLine");

-            int spacing = GUI.IntScale(5);
+            GUIListBox talentTreeListBox = new GUIListBox(new RectTransform(new Vector2(1f, 0.7f), talentFrameLayoutGroup.RectTransform, Anchor.TopCenter), isHorizontal: true, style: null);

            foreach (var subTree in talentTree.TalentSubTrees)
            {
                GUIFrame subTreeFrame = new GUIFrame(new RectTransform(new Vector2(0.333f, 1f), talentTreeListBox.Content.RectTransform, anchor: Anchor.TopLeft), style: null);
                GUILayoutGroup subTreeLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), subTreeFrame.RectTransform, Anchor.Center), false, childAnchor: Anchor.TopCenter);

-                GUIFrame subtreeTitleFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.111f), subTreeLayoutGroup.RectTransform, anchor: Anchor.TopCenter), style: "SubtreeHeader");
-
-                new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), subtreeTitleFrame.RectTransform, anchor: Anchor.TopCenter), subTree.Identifier, font: GUI.LargeFont, textAlignment: Alignment.Center);
+                GUIFrame subtreeTitleFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.111f), subTreeLayoutGroup.RectTransform, anchor: Anchor.TopCenter), style: null);
+                int elementPadding = GUI.IntScale(8);
+                Point headerSize = subtreeTitleFrame.RectTransform.NonScaledSize;
+                GUIFrame subTreeTitleBackground = new GUIFrame(new RectTransform(new Point(headerSize.X - elementPadding, headerSize.Y), subtreeTitleFrame.RectTransform, anchor: Anchor.Center), style: "SubtreeHeader");
+                new GUITextBlock(new RectTransform(Vector2.One, subTreeTitleBackground.RectTransform, anchor: Anchor.TopCenter), subTree.DisplayName, font: GUI.LargeFont, textAlignment: Alignment.Center);

                for (int i = 0; i < 4; i++)
                {
-                    GUIFrame talentOptionFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.222f), subTreeLayoutGroup.RectTransform, anchor: Anchor.TopCenter), style: "TalentOptionFrame");
-                    GUIImage talentBackground = new GUIImage(new RectTransform(Vector2.One, talentOptionFrame.RectTransform, anchor: Anchor.Center), style: "TalentBackground")
+                    GUIFrame talentOptionFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.222f), subTreeLayoutGroup.RectTransform, anchor: Anchor.TopCenter), style: null);
+
+                    Point talentFrameSize = talentOptionFrame.RectTransform.NonScaledSize;
+
+                    GUIFrame talentBackground = new GUIFrame(new RectTransform(new Point(talentFrameSize.X - elementPadding, talentFrameSize.Y - elementPadding), talentOptionFrame.RectTransform, anchor: Anchor.Center), style: "TalentBackground");
+                    GUIFrame talentBackgroundHighlight = new GUIFrame(new RectTransform(Vector2.One, talentBackground.RectTransform, anchor: Anchor.Center), style: "TalentBackgroundGlow") { Visible = false };
+
+                    GUIImage cornerIcon = new GUIImage(new RectTransform(new Vector2(0.25f), talentOptionFrame.RectTransform, anchor: Anchor.BottomRight, scaleBasis: ScaleBasis.BothHeight), style: null)
                    {
-                        CanBeFocused = false,
-                        Color = unselectableColor,
+                        CanBeFocused = false
                    };

+                    Point iconSize = cornerIcon.RectTransform.NonScaledSize;
+                    cornerIcon.RectTransform.AbsoluteOffset = new Point(iconSize.X / 2, iconSize.Y / 2);
+
                    if (subTree.TalentOptionStages.Count > i)
                    {
                        TalentOption talentOption = subTree.TalentOptionStages[i];

-                        GUILayoutGroup talentOptionLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), talentOptionFrame.RectTransform, Anchor.CenterLeft), isHorizontal: true, childAnchor: Anchor.CenterLeft)
-                        {
-                            Stretch = true,
-                        };
+                        GUILayoutGroup talentOptionCenterGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.75f, 0.7f), talentOptionFrame.RectTransform, Anchor.Center), childAnchor: Anchor.CenterLeft);
+
+                        GUILayoutGroup talentOptionLayoutGroup = new GUILayoutGroup(new RectTransform(Vector2.One, talentOptionCenterGroup.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft) { Stretch = true };

                        foreach (TalentPrefab talent in talentOption.Talents)
                        {
-                            int optionPadding = GUI.IntScale(10);
-                            GUIFrame talentFrame = new GUIFrame(new RectTransform(new Point(talentOptionFrame.Rect.Width, talentOptionFrame.Rect.Height - optionPadding), talentOptionLayoutGroup.RectTransform), style: null)
+                            GUIFrame talentFrame = new GUIFrame(new RectTransform(Vector2.One, talentOptionLayoutGroup.RectTransform), style: null)
                            {
                                CanBeFocused = false,
                            };
-                            new GUIImage(new RectTransform(Vector2.One, talentFrame.RectTransform, anchor: Anchor.Center), style: "TalentFrameBackground")
-                            {
-                                CanBeFocused = false,
-                            };
-                            GUIImage iconImage = null;

-                            GUIButton talentButton = new GUIButton(new RectTransform(Vector2.One, talentFrame.RectTransform, anchor: Anchor.Center), style: "TalentFrame")
+                            GUIButton talentButton = new GUIButton(new RectTransform(Vector2.One, talentFrame.RectTransform, anchor: Anchor.Center), style: null)
                            {
                                ToolTip = $"{talent.DisplayName}\n\n{talent.Description}",
                                UserData = talent.Identifier,
                                PressedColor = pressedColor,
                                OnClicked = (button, userData) =>
                                {
-                                    talentTitleText.Text = talent.DisplayName;
-                                    talentDescriptionText.Text = talent.Description;
-
                                    // deselect other buttons in tier by removing their selected talents from pool
                                    foreach (GUIButton guiButton in talentOptionLayoutGroup.GetAllChildren<GUIButton>())
                                    {
@@ -1314,61 +1356,129 @@ namespace Barotrauma
                                },
                            };

+                            talentButton.Color = talentButton.HoverColor = talentButton.PressedColor = talentButton.SelectedColor = Color.Transparent;

-                            int iconPadding = GUI.IntScale(15);
-                            iconImage = new GUIImage(new RectTransform(new Point(talentFrame.Rect.Width - iconPadding, talentFrame.Rect.Height - iconPadding), talentFrame.RectTransform, anchor: Anchor.Center), sprite: talent.Icon, scaleToFit: true)
+                            GUIComponent iconImage;
+                            if (talent.Icon is null)
                            {
-                                PressedColor = unselectableColor,
-                                CanBeFocused = false,
-                            };
+                                iconImage = new GUITextBlock(new RectTransform(Vector2.One, talentButton.RectTransform, anchor: Anchor.Center, scaleBasis: ScaleBasis.BothHeight), text: "???", font: GUI.LargeFont, textAlignment: Alignment.Center, style: null)
+                                {
+                                    OutlineColor = GUI.Style.Red,
+                                    TextColor = GUI.Style.Red,
+                                    PressedColor = unselectableColor,
+                                    CanBeFocused = false,
+                                };
+                            }
+                            else
+                            {
+                                iconImage = new GUIImage(new RectTransform(Vector2.One, talentButton.RectTransform, anchor: Anchor.Center), sprite: talent.Icon, scaleToFit: true)
+                                {
+                                    PressedColor = unselectableColor,
+                                    CanBeFocused = false,
+                                };
+                            }

-                            talentButtons.Add((talentButton, talentBackground, iconImage));
+                            GUIImage iconGlow = new GUIImage(new RectTransform(Vector2.One, iconImage.RectTransform, anchor: Anchor.Center), sprite: GUI.Style.TalentGlow.Sprite, scaleToFit: true) { Visible = false };
+
+                            talentButtons.Add((talentButton, iconImage, iconGlow));
                        }
+
+                        talentCornerIcons.Add((subTree.Identifier, i, cornerIcon, talentBackground, talentBackgroundHighlight));
                    }
                }
            }

-            GUIFrame talentBottomFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.07f), talentFrameLayoutGroup.RectTransform, Anchor.TopCenter), style: null);
+            GUILayoutGroup talentBottomFrame = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.07f), talentFrameLayoutGroup.RectTransform, Anchor.TopCenter), isHorizontal: true) { RelativeSpacing = 0.01f };

-            GUIFrame experienceBarFrame = new GUIFrame(new RectTransform(new Vector2(0.775f, 0.75f), talentBottomFrame.RectTransform, Anchor.TopCenter), style: null);
+            GUILayoutGroup experienceLayout = new GUILayoutGroup(new RectTransform(new Vector2(0.775f, 1f), talentBottomFrame.RectTransform));
+            GUIFrame experienceBarFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.5f), experienceLayout.RectTransform), style: null);

            experienceBar = new GUIProgressBar(new RectTransform(new Vector2(1f, 1f), experienceBarFrame.RectTransform, Anchor.CenterLeft),
-                barSize: controlledCharacter.Info.GetProgressTowardsNextLevel(), color: Color.White, style: "ExperienceBar")
+                barSize: controlledCharacter.Info.GetProgressTowardsNextLevel(), color: GUI.Style.Green)
            {
                IsHorizontal = true
            };

-            GUIImage experienceTextBackground = new GUIImage(new RectTransform(new Vector2(0.2f, 0.475f), experienceBarFrame.RectTransform, anchor: Anchor.Center), style: "ExperienceTextBackground");
+            experienceText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), experienceBarFrame.RectTransform, anchor: Anchor.Center), "", font: GUI.Font, textAlignment: Alignment.CenterRight);

-            experienceText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), experienceTextBackground.RectTransform, anchor: Anchor.Center), "", font: GUI.Font, textColor: Color.White, textAlignment: Alignment.Center);
+            talentPointText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), experienceLayout.RectTransform, anchor: Anchor.Center), "", font: GUI.SubHeadingFont, parseRichText: true, textAlignment: Alignment.CenterRight);

-            new GUIButton(new RectTransform(new Vector2(0.1f, 0.3f), talentBottomFrame.RectTransform, anchor: Anchor.TopRight), text: TextManager.Get("applysettingsbutton"))
-            {
-                OnClicked = ApplyTalentSelection,
-            };
-
-            new GUIButton(new RectTransform(new Vector2(0.1f, 0.3f), talentBottomFrame.RectTransform, anchor: Anchor.TopLeft), text: TextManager.Get("reset"))
+            new GUIButton(new RectTransform(new Vector2(0.1f, 1f), talentBottomFrame.RectTransform), text: TextManager.Get("reset"), style: "GUICharacterInfoButton")
            {
                OnClicked = ResetTalentSelection,
            };

+            new GUIButton(new RectTransform(new Vector2(0.1f, 1f), talentBottomFrame.RectTransform), text: TextManager.Get("applysettingsbutton"), style: "GUICharacterInfoButton")
+            {
+                OnClicked = ApplyTalentSelection,
+            };
+
            UpdateTalentButtons();
        }

+        private void CreateTalentSkillList(Character character, GUIListBox parent)
+        {
+            parent.Content.ClearChildren();
+            foreach (Skill skill in character.Info.Job.Skills)
+            {
+                GUILayoutGroup skillContainer = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.2f), parent.Content.RectTransform), isHorizontal: true) { CanBeFocused = false };
+
+                new GUITextBlock(new RectTransform(new Vector2(0.7f, 1f), skillContainer.RectTransform), TextManager.Get($"skillname.{skill.Identifier}", returnNull: true) ?? skill.Identifier);
+                new GUITextBlock(new RectTransform(new Vector2(0.15f, 1.0f), skillContainer.RectTransform), Math.Floor(skill.Level).ToString("F0"), textAlignment: Alignment.CenterRight) { Padding = new Vector4(0, 0, 4, 0) };
+
+                float modifiedSkillLevel = character.GetSkillLevel(skill.Identifier);
+                if (!MathUtils.NearlyEqual(MathF.Floor(modifiedSkillLevel), MathF.Floor(skill.Level)))
+                {
+                    int skillChange = (int)MathF.Floor(modifiedSkillLevel - skill.Level);
+                    string stringColor = true switch
+                    {
+                        true when skillChange > 0 => XMLExtensions.ColorToString(GUI.Style.Green),
+                        true when skillChange < 0 => XMLExtensions.ColorToString(GUI.Style.Red),
+                        _ => XMLExtensions.ColorToString(GUI.Style.TextColor)
+                    };
+
+                    string changeText = $"(‖color:{stringColor}‖{(skillChange > 0 ? "+" : string.Empty) + skillChange}‖color:end‖)";
+                    new GUITextBlock(new RectTransform(new Vector2(0.15f, 1.0f), skillContainer.RectTransform), changeText, parseRichText: true) { Padding = Vector4.Zero };
+                }
+                skillContainer.Recalculate();
+            }
+
+            parent.RecalculateChildren();
+        }
+
        private void UpdateTalentButtons()
        {
            Character controlledCharacter = Character.Controlled;

-            talentPointsText.Text = $"{TextManager.Get("talentpointsleft")}{controlledCharacter.Info.GetAvailableTalentPoints()}";
            experienceText.Text = $"{controlledCharacter.Info.ExperiencePoints - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()} / {controlledCharacter.Info.GetExperienceRequiredToLevelUp() - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()}";
            experienceBar.BarSize = controlledCharacter.Info.GetProgressTowardsNextLevel();
            //experienceBar.ToolTip = $"{controlledCharacter.Info.ExperiencePoints - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()} / {controlledCharacter.Info.GetExperienceRequiredToLevelUp() - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()}";

            selectedTalents = TalentTree.CheckTalentSelection(controlledCharacter, selectedTalents);

-            foreach (var talentButton in talentButtons)
+            string pointsLeft = controlledCharacter.Info.GetAvailableTalentPoints().ToString();
+
+            int talentCount = selectedTalents.Count - controlledCharacter.Info.UnlockedTalents.Count;
+
+            if (talentCount > 0)
            {
-                talentButton.background.Color = unselectableColor;
+                string pointsUsed = $"‖color:{XMLExtensions.ColorToString(GUI.Style.Red)}‖{-talentCount}‖color:end‖";
+                string localizedString = TextManager.GetWithVariables("talentmenu.points.spending", new []{ "[amount]", "[used]" }, new []{ pointsLeft, pointsUsed});
+                talentPointText.SetRichText(localizedString);
+            }
+            else
+            {
+                talentPointText.SetRichText(TextManager.GetWithVariable("talentmenu.points", "[amount]", pointsLeft));
+            }
+
+            foreach (var (talentTree, index, icon, frame, glow) in talentCornerIcons)
+            {
+                TalentTree.TalentTreeStageState state = TalentTree.GetTalentOptionStageState(controlledCharacter, talentTree, index, selectedTalents);
+                GUIComponentStyle newStyle = talentStageStyles[state];
+                icon.ApplyStyle(newStyle);
+                icon.Color = newStyle.Color;
+                frame.Color = talentStageBackgroundColors[state];
+                glow.Visible = state == TalentTree.TalentTreeStageState.Highlighted;
            }

            foreach (var talentButton in talentButtons)
@@ -1377,30 +1487,23 @@ namespace Barotrauma
                bool unselectable = !TalentTree.IsViableTalentForCharacter(controlledCharacter, talentIdentifier, selectedTalents) || controlledCharacter.HasTalent(talentIdentifier);
                Color newTalentColor = unselectable ? unselectableColor : unselectedColor;

+                talentButton.glow.Visible = false;
+
                if (controlledCharacter.HasTalent(talentIdentifier))
                {
-                    newTalentColor = ownedColor;
+                    newTalentColor = new Color(140,225,140,255);
                }
                else if (selectedTalents.Contains(talentIdentifier))
                {
-                    newTalentColor = selectedColor;
+                    newTalentColor = new Color(174,164,124,255);
+                    talentButton.glow.Visible = true;
                }

-                talentButton.button.Color = newTalentColor;
-                talentButton.button.SelectedColor = newTalentColor;
-                talentButton.button.HoverColor = newTalentColor;
-                talentButton.button.DisabledColor = newTalentColor;
-
                talentButton.icon.Color = newTalentColor;
-
-                // update background color as well, if not defined yet
-                if (talentButton.background.Color == unselectableColor)
-                {
-                    talentButton.background.Color = newTalentColor;
-                }
            }
-        }

+            CreateTalentSkillList(controlledCharacter, skillListBox);
+        }

        private void ApplyTalents(Character controlledCharacter)
        {
@@ -194,6 +194,8 @@ namespace Barotrauma

 #if DEBUG
        public static bool FirstLoad = true;
+
+        public static bool CancelQuickStart;
 #endif

        public GameMain(string[] args)
@@ -309,7 +311,7 @@ namespace Barotrauma

            GraphicsDeviceManager.PreferredBackBufferWidth = GraphicsWidth;
            GraphicsDeviceManager.PreferredBackBufferHeight = GraphicsHeight;
-            
+
            GraphicsDeviceManager.ApplyChanges();

            if (windowMode == WindowMode.BorderlessWindowed)
@@ -588,7 +590,7 @@ namespace Barotrauma
            StructurePrefab.LoadAll(GetFilesOfType(ContentType.Structure));
            TitleScreen.LoadState = 55.0f;
        yield return CoroutineStatus.Running;
-        
+
            UpgradePrefab.LoadAll(GetFilesOfType(ContentType.UpgradeModules));
            TitleScreen.LoadState = 56.0f;
        yield return CoroutineStatus.Running;
@@ -601,7 +603,7 @@ namespace Barotrauma
            ItemAssemblyPrefab.LoadAll();
            TitleScreen.LoadState = 60.0f;
        yield return CoroutineStatus.Running;
-            
+
            GameModePreset.Init();

            SaveUtil.DeleteDownloadedSubs();
@@ -654,7 +656,7 @@ namespace Barotrauma
            ParticleManager.LoadPrefabs();
            TitleScreen.LoadState = 88.0f;
            LevelObjectPrefab.LoadAll();
-            
+
            TitleScreen.LoadState = 90.0f;
        yield return CoroutineStatus.Running;

@@ -804,7 +806,9 @@ namespace Barotrauma
                    }

 #if DEBUG
-                    if (TitleScreen.LoadState >= 100.0f && !TitleScreen.PlayingSplashScreen && (Config.AutomaticQuickStartEnabled || Config.AutomaticCampaignLoadEnabled || Config.TestScreenEnabled) && FirstLoad && !PlayerInput.KeyDown(Keys.LeftShift))
+                    CancelQuickStart |= PlayerInput.KeyDown(Keys.LeftShift);
+
+                    if (TitleScreen.LoadState >= 100.0f && !TitleScreen.PlayingSplashScreen && (Config.AutomaticQuickStartEnabled || Config.AutomaticCampaignLoadEnabled || Config.TestScreenEnabled) && FirstLoad && !CancelQuickStart)
                    {
                        loadingScreenOpen = false;
                        FirstLoad = false;
@@ -812,7 +816,7 @@ namespace Barotrauma
                        if (Config.TestScreenEnabled)
                        {
                            TestScreen.Select();
-                        } 
+                        }
                        else if (Config.AutomaticQuickStartEnabled)
                        {
                            MainMenuScreen.QuickStart();
@@ -930,8 +934,8 @@ namespace Barotrauma
                        static bool itemHudActive()
                        {
                            if (Character.Controlled?.SelectedConstruction == null) { return false; }
-                            return 
-                                Character.Controlled.SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null) || 
+                            return
+                                Character.Controlled.SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null) ||
                                ((Character.Controlled.ViewTarget as Item)?.Prefab?.FocusOnSelected ?? false);
                        }
                    }
@@ -1095,7 +1099,7 @@ namespace Barotrauma
            if (save)
            {
                GUI.SetSavingIndicatorState(true);
-                
+
                if (GameSession.Submarine != null && !GameSession.Submarine.Removed)
                {
                    GameSession.SubmarineInfo = new SubmarineInfo(GameSession.Submarine);
@@ -1267,7 +1271,7 @@ namespace Barotrauma
            string text = TextManager.GetWithVariable("openlinkinbrowserprompt", "[link]", url);
            string extensionText = TextManager.Get(promptExtensionTag, returnNull: true, useEnglishAsFallBack: false);
            if (!string.IsNullOrEmpty(extensionText))
-            {   
+            {
                text += $"\n\n{extensionText}";
            }

@@ -208,7 +208,7 @@ namespace Barotrauma

            ReportButtonFrame.RectTransform.AbsoluteOffset = new Point(0, -chatBox.ToggleButton.Rect.Height);

-            CreateReports(this, ReportButtonFrame, reports, false);
+            CreateReportButtons(this, ReportButtonFrame, reports, false);

            #endregion

@@ -218,7 +218,7 @@ namespace Barotrauma
            dismissedOrderPrefab ??= Order.GetPrefab("dismissed");
        }

-        public static void CreateReports(CrewManager crewManager, GUIComponent parent, List<Order> reports, bool isHorizontal)
+        public static void CreateReportButtons(CrewManager crewManager, GUIComponent parent, List<Order> reports, bool isHorizontal)
        {
            //report buttons
            foreach (Order order in reports)
@@ -228,22 +228,21 @@ namespace Barotrauma
                {
                    OnClicked = (button, userData) =>
                    {
-                        if (!CanIssueOrders) { return false; }
+                        if (!CanIssueOrders || crewManager?.DraggedOrder != null) { return false; }
                        var sub = Character.Controlled.Submarine;
                        if (sub == null || sub.TeamID != Character.Controlled.TeamID || sub.Info.IsWreck) { return false; }

                        if (crewManager != null)
                        {
                            crewManager.SetCharacterOrder(null, order, null, CharacterInfo.HighestManualOrderPriority, Character.Controlled);
-
                            if (crewManager.IsSinglePlayer) { HumanAIController.ReportProblem(Character.Controlled, order); }
                        }
                        return true;
                    },
                    UserData = order,
-                    ToolTip = order.Name,
                    ClampMouseRectToParent = false
                };
+                btn.ToolTip = $"‖color:{XMLExtensions.ColorToString(order.Prefab.Color)}‖{order.Name}‖color:end‖\n{TextManager.Get("draganddropreports")}";

                if (crewManager != null)
                {
@@ -272,8 +271,9 @@ namespace Barotrauma
                {
                    Color = order.Color,
                    HoverColor = Color.Lerp(order.Color, Color.White, 0.5f),
-                    ToolTip = order.Name,
-                    SpriteEffects = SpriteEffects.FlipHorizontally
+                    ToolTip = btn.RawToolTip,
+                    SpriteEffects = SpriteEffects.FlipHorizontally,
+                    UserData = order
                };
            }
        }
@@ -717,7 +717,7 @@ namespace Barotrauma
                    hull ??= orderGiver.CurrentHull;
                    AddOrder(new Order(order.Prefab ?? order, hull, null, orderGiver), order.FadeOutTime);
                }
-                else if(order.IsIgnoreOrder)
+                else if (order.IsIgnoreOrder)
                {
                    WallSection ws = null;
                    if (order.TargetType == Order.OrderTargetType.Entity && order.TargetEntity is IIgnorable ignorable)
@@ -1232,7 +1232,7 @@ namespace Barotrauma
                    highlightedQuickUseSlot = visualSlots[i];
                }

-                if (!slots[i].First().AllowedSlots.Any(a => a == InvSlotType.Any) || SlotTypes[i] == InvSlotType.HealthInterface)
+                if (slots[i].First().AllowedSlots.Count() == 1 || SlotTypes[i] == InvSlotType.HealthInterface)
                {
                    continue;
                }
@@ -8,6 +8,7 @@ using Barotrauma.IO;
 using System.Text;
 using System.Xml.Linq;
 using Barotrauma.Sounds;
+using System.Linq;

 namespace Barotrauma.Items.Components
 {
@@ -145,7 +146,9 @@ namespace Barotrauma.Items.Components
            if (character == null || !character.IsKeyDown(InputType.Aim)) { return; }

            //camera focused on some other item/device, don't draw the crosshair
-            if (character.ViewTarget != null && (character.ViewTarget is Item item) && item.Prefab.FocusOnSelected) { return; }
+            if (character.ViewTarget != null && (character.ViewTarget is Item viewTargetItem) && viewTargetItem.Prefab.FocusOnSelected) { return; }
+            //don't draw the crosshair if the item is in some other type of equip slot than hands (e.g. assault rifle in the bag slot)
+            if (!character.HeldItems.Contains(item)) { return; }

            GUI.HideCursor = (crosshairSprite != null || crosshairPointerSprite != null) &&
                GUI.MouseOn == null && !Inventory.IsMouseOnInventory && !GameMain.Instance.Paused;
@@ -214,7 +214,7 @@ namespace Barotrauma.Items.Components
            if (UILabel == string.Empty) { return string.Empty; }
            if (UILabel != null)
            {
-                return TextManager.Get("UILabel." + UILabel);
+                return TextManager.Get("UILabel." + UILabel, returnNull: true) ?? TextManager.Get(UILabel);
            }
            else
            {
@@ -37,7 +37,7 @@ namespace Barotrauma.Items.Components

        private FabricationRecipe pendingFabricatedItem;

-        private Pair<Rectangle, string> tooltip;
+        private (Rectangle area, string text)? tooltip;

        private GUITextBlock requiredTimeBlock;

@@ -270,7 +270,7 @@ namespace Barotrauma.Items.Components
            });

            var sufficientSkillsText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorsufficientskills", returnNull: true) ?? "Sufficient skills to fabricate", textColor: GUI.Style.Green, font: GUI.SubHeadingFont)
+                TextManager.Get("fabricatorsufficientskills"), textColor: GUI.Style.Green, font: GUI.SubHeadingFont)
            {
                AutoScaleHorizontal = true,
                CanBeFocused = false
@@ -278,7 +278,7 @@ namespace Barotrauma.Items.Components
            sufficientSkillsText.RectTransform.SetAsFirstChild();

            var insufficientSkillsText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorinsufficientskills", returnNull: true) ?? "Insufficient skills to fabricate", textColor: Color.Orange, font: GUI.SubHeadingFont)
+                TextManager.Get("fabricatorinsufficientskills"), textColor: Color.Orange, font: GUI.SubHeadingFont)
            {
                AutoScaleHorizontal = true,
                CanBeFocused = false
@@ -290,7 +290,7 @@ namespace Barotrauma.Items.Components
            }

            var requiresRecipeText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorrequiresrecipe", returnNull: true) ?? "Requires recipe to fabricate", textColor: Color.Red, font: GUI.SubHeadingFont)
+                TextManager.Get("fabricatorrequiresrecipe"), textColor: Color.Red, font: GUI.SubHeadingFont)
            {
                AutoScaleHorizontal = true,
                CanBeFocused = false
@@ -403,7 +403,7 @@ namespace Barotrauma.Items.Components
                        {
                            toolTipText += '\n' + requiredItem.ItemPrefabs.First().Description;
                        }
-                        tooltip = new Pair<Rectangle, string>(slotRect, toolTipText);
+                        tooltip = (slotRect, toolTipText);
                    }

                    slotIndex++;
@@ -443,7 +443,7 @@ namespace Barotrauma.Items.Components
            
            if (tooltip != null)
            {
-                GUIComponent.DrawToolTip(spriteBatch, tooltip.Second, tooltip.First);
+                GUIComponent.DrawToolTip(spriteBatch, tooltip.Value.text, tooltip.Value.area);
                tooltip = null;
            }
        }
@@ -463,6 +463,22 @@ namespace Barotrauma.Items.Components
                if (recipe?.DisplayName == null) { continue; }
                child.Visible = recipe.DisplayName.ToLower().Contains(filter);
            }
+
+            //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())
+            {
+                if (!(child.UserData is FabricationRecipe recipe))
+                {
+                    child.Visible = recipeVisible;
+                    recipeVisible = false;
+                }
+                else
+                {
+                    recipeVisible = child.Visible;
+                }
+            }
+
            itemList.UpdateScrollBarSize();
            itemList.BarScroll = 0.0f;

@@ -498,9 +514,20 @@ namespace Barotrauma.Items.Components
                };
            }*/

+            string name = GetRecipeNameAndAmount(selectedItem);
+
+            float quality = 0;
+            foreach (string tag in selectedItem.TargetItem.Tags)
+            {
+                quality += user?.Info?.GetSavedStatValue(StatTypes.IncreaseFabricationQuality, tag) ?? 0;
+            }
+            if (quality > 0)
+            {
+                name = TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", name+'\n', fallBackTag: "itemname.quality3");
+            }

            var nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
-                GetRecipeNameAndAmount(selectedItem), textAlignment: Alignment.CenterLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont)
+               name, textAlignment: Alignment.CenterLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont, parseRichText: true)
            {
                AutoScaleHorizontal = true
            };
@@ -218,8 +218,8 @@ namespace Barotrauma.Items.Components
                                      DefaultNeutralColor = MiniMapBaseColor * 0.8f,
                                      HoverColor = Color.White,
                                      BlueprintBlue = new Color(23, 38, 33),
-                                      HullWaterColor = new Color(17, 173, 179),
-                                      HullWaterLineColor = Color.LightBlue,
+                                      HullWaterColor = new Color(17, 173, 179) * 0.5f,
+                                      HullWaterLineColor = Color.LightBlue * 0.5f,
                                      NoPowerColor = MiniMapBaseColor * 0.1f,
                                      ElectricalBaseColor = GUI.Style.Orange,
                                      NoPowerElectricalColor = ElectricalBaseColor * 0.1f;
@@ -307,10 +307,13 @@ namespace Barotrauma.Items.Components

            if (reports.Any())
            {
-                CrewManager.CreateReports(GameMain.GameSession?.CrewManager, reportFrame, reports, true);
+                CrewManager.CreateReportButtons(GameMain.GameSession?.CrewManager, reportFrame, reports, true);
            }

-            searchBarFrame = new GUILayoutGroup(new RectTransform(new Vector2(1), bottomFrame.RectTransform), isHorizontal: true, childAnchor: Anchor.Center);
+            searchBarFrame = new GUILayoutGroup(new RectTransform(new Vector2(1.5f, 1.0f), bottomFrame.RectTransform, Anchor.Center), isHorizontal: true, childAnchor: Anchor.Center)
+            {
+                Visible = false
+            };
            searchBar = new GUITextBox(new RectTransform(new Vector2(1), searchBarFrame.RectTransform), string.Empty, createClearButton: true, createPenIcon: true)
            {
                OnEnterPressed = (box, text) =>
@@ -345,6 +348,7 @@ namespace Barotrauma.Items.Components

            foreach (ItemPrefab prefab in ItemPrefab.Prefabs.OrderBy(prefab => prefab.Name))
            {
+                if (prefab.HideInMenus) { continue; }
                CreateItemFrame(prefab, listBox.Content.RectTransform);
            }

@@ -355,7 +359,10 @@ namespace Barotrauma.Items.Components

            searchBar.OnSelected += (sender, key) =>
            {
-                itemsFoundOnSub = Item.ItemList.Where(it => it.Submarine == item.Submarine && !it.NonInteractable && !it.HiddenInGame && it.Components.OfType<Holdable>().Any()).Select(it => it.Prefab).ToImmutableHashSet();
+                itemsFoundOnSub = Item.ItemList.Where(it => 
+                    it.Submarine == item.Submarine && 
+                    !it.NonInteractable && !it.HiddenInGame && 
+                    (it.GetComponent<Holdable>() != null || it.GetComponent<Wearable>() != null)).Select(it => it.Prefab).ToImmutableHashSet();
            };

            searchBar.OnKeyHit += ControlSearchTooltip;
@@ -487,21 +494,24 @@ namespace Barotrauma.Items.Components
                CreateHUD();
            }

-            if (PlayerInput.PrimaryMouseButtonDown() && currentMode != MiniMapMode.HullStatus)
+            if (scissorComponent != null)
            {
-                if (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn))
+                if (PlayerInput.PrimaryMouseButtonDown() && currentMode != MiniMapMode.HullStatus)
                {
-                    dragMapStart = PlayerInput.MousePosition;
+                    if (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn))
+                    {
+                        dragMapStart = PlayerInput.MousePosition;
+                    }
                }
-            }

-            if (currentMode != MiniMapMode.HullStatus && Math.Abs(PlayerInput.ScrollWheelSpeed) > 0 && (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn)))
-            {
-                float newZoom = Math.Clamp(Zoom + PlayerInput.ScrollWheelSpeed / 1000.0f * Zoom, minZoom, maxZoom);
-                float distanceScale = newZoom / Zoom;
-                mapOffset *= distanceScale;
-                recalculate |= !MathUtils.NearlyEqual(Zoom, newZoom);
-                Zoom = newZoom;
+                if (currentMode != MiniMapMode.HullStatus && Math.Abs(PlayerInput.ScrollWheelSpeed) > 0 && (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn)))
+                {
+                    float newZoom = Math.Clamp(Zoom + PlayerInput.ScrollWheelSpeed / 1000.0f * Zoom, minZoom, maxZoom);
+                    float distanceScale = newZoom / Zoom;
+                    mapOffset *= distanceScale;
+                    recalculate |= !MathUtils.NearlyEqual(Zoom, newZoom);
+                    Zoom = newZoom;
+                }
            }

            if (dragMapStart is { } dragStart)
@@ -524,15 +534,13 @@ namespace Barotrauma.Items.Components

            if (recalculate)
            {
-                miniMapContainer.RectTransform.LocalScale = new Vector2(Zoom);
-                miniMapContainer.RectTransform.RecalculateChildren(true, true);
-                miniMapContainer.RectTransform.AbsoluteOffset = mapOffset.ToPoint();
+                if (miniMapContainer != null)
+                {
+                    miniMapContainer.RectTransform.LocalScale = new Vector2(Zoom);
+                    miniMapContainer.RectTransform.RecalculateChildren(true, true);
+                    miniMapContainer.RectTransform.AbsoluteOffset = mapOffset.ToPoint();
+                }
                recalculate = false;
-
-                // var (maxWidth, maxHeight) = miniMapContainer.Rect.Size.ToVector2() / 2f;
-                //
-                // mapOffset.X = Math.Clamp(mapOffset.X, -maxWidth, maxWidth);
-                // mapOffset.Y = Math.Clamp(mapOffset.Y, -maxHeight, maxHeight);
            }

            // is there a better way to do this?
@@ -606,17 +614,6 @@ namespace Barotrauma.Items.Components

        private void DrawHUDFront(SpriteBatch spriteBatch, GUICustomComponent container)
        {
-            // TODO remove
-            #warning remove
-            if (currentMode == MiniMapMode.HullCondition)
-            {
-                const string wipText = "work in progress";
-                Vector2 textSize = GUI.LargeFont.MeasureString(wipText);
-                Vector2 textPos = GuiFrame.Rect.Center.ToVector2();
-
-                GUI.DrawString(spriteBatch, textPos - textSize / 2, wipText.ToUpper(), GUI.Style.Orange, Color.Black * 0.8f, backgroundPadding: 8, font: GUI.LargeFont);
-            }
-
            if (Voltage < MinVoltage)
            {
                Vector2 textSize = GUI.Font.MeasureString(noPowerTip);
@@ -627,18 +624,45 @@ namespace Barotrauma.Items.Components
                return;
            }

-            if (currentMode == MiniMapMode.HullStatus)
+            if (currentMode == MiniMapMode.HullStatus || currentMode == MiniMapMode.HullCondition)
            {
                Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
                spriteBatch.End();
                spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
                spriteBatch.GraphicsDevice.ScissorRectangle = submarineContainer.Rect;

-                foreach (var (entity, component) in hullStatusComponents)
+                if (currentMode == MiniMapMode.HullCondition && item.Submarine != null)
                {
-                    if (!(entity is Hull hull)) { continue; }
-                    if (!hullDatas.TryGetValue(hull, out HullData? hullData) || hullData is null) { continue; }
-                    DrawHullCards(spriteBatch, hull, hullData, component.RectComponent);
+                    var sprite = GUI.Style.UIGlowSolidCircular?.Sprite;
+                    float alpha = (MathF.Sin(blipState / maxBlipState * MathHelper.TwoPi) + 1.5f) * 0.5f;
+                    if (sprite != null)
+                    {
+                        Vector2 spriteSize = sprite.size;
+                        Rectangle worldBorders = item.Submarine.GetDockedBorders();
+                        worldBorders.Location += item.Submarine.WorldPosition.ToPoint();
+                        foreach (Gap gap in Gap.GapList)
+                        {
+                            if (gap.IsRoomToRoom || gap.Submarine != item.Submarine || gap.ConnectedDoor != null) { continue; }
+                            RectangleF entityRect = ScaleRectToUI(gap, miniMapFrame.Rect, worldBorders);
+
+                            Vector2 scale = new Vector2(entityRect.Size.X / spriteSize.X, entityRect.Size.Y / spriteSize.Y) * 2.0f;
+
+                            Color color = ToolBox.GradientLerp(gap.Open, GUI.Style.HealthBarColorMedium, GUI.Style.HealthBarColorLow) * alpha;
+                            sprite.Draw(spriteBatch,
+                                miniMapFrame.Rect.Location.ToVector2() + entityRect.Center,
+                                color, origin: sprite.Origin, rotate: 0.0f, scale: scale);
+                        }
+                    }
+                }
+
+                if (currentMode == MiniMapMode.HullStatus)
+                {
+                    foreach (var (entity, component) in hullStatusComponents)
+                    {
+                        if (!(entity is Hull hull)) { continue; }
+                        if (!hullDatas.TryGetValue(hull, out HullData? hullData) || hullData is null) { continue; }
+                        DrawHullCards(spriteBatch, hull, hullData, component.RectComponent);
+                    }
                }

                spriteBatch.End();
@@ -721,14 +745,21 @@ namespace Barotrauma.Items.Components
                UserData = prefab
            };

-            GUILayoutGroup layout = new GUILayoutGroup(new RectTransform(Vector2.One, frame.RectTransform), isHorizontal: true);
+            GUILayoutGroup layout = new GUILayoutGroup(new RectTransform(Vector2.One, frame.RectTransform), isHorizontal: true)
+            {
+                Stretch = true
+            };
            new GUIImage(new RectTransform(Vector2.One, layout.RectTransform, scaleBasis: ScaleBasis.BothHeight), sprite)
            {
-                Color = prefab.InventoryIconColor
+                Color = prefab.InventoryIconColor,
+                UserData = prefab
            };

-            new GUITextBlock(new RectTransform(Vector2.One, layout.RectTransform), prefab.Name, font: GUI.SubHeadingFont);
-            layout.UserData = prefab;
+            var nameText = new GUITextBlock(new RectTransform(Vector2.One, layout.RectTransform), prefab.Name);
+            nameText.RectTransform.SizeChanged += () =>
+            {
+                nameText.Text = ToolBox.LimitString(prefab.Name, nameText.Font, nameText.Rect.Width);
+            };
        }

        private void SearchItems(string text)
@@ -792,15 +823,18 @@ namespace Barotrauma.Items.Components

        private void UpdateHUDBack()
        {
+            if (item.Submarine == null) { return; }
+
            hullInfoFrame.Visible = false;
-            electricalFrame.Visible = false;
-            miniMapFrame.Visible = false;
            reportFrame.Visible = false;
            searchBarFrame.Visible = false;
+            electricalFrame.Visible = false;
+            miniMapFrame.Visible = false;

            switch (currentMode)
            {
                case MiniMapMode.HullStatus:
+                case MiniMapMode.HullCondition:
                    UpdateHullStatus();
                    miniMapFrame.Visible = true;
                    reportFrame.Visible = true;
@@ -937,16 +971,19 @@ namespace Barotrauma.Items.Components
                    SetTooltip(borderComponent.Rect.Center, header, line1, line2, line3, line1Color, line2Color, line3Color);
                }

+                bool draggingReport = GameMain.GameSession?.CrewManager?.DraggedOrder != null;
                // When setting the colors we want to know the linked hulls too or else the linked hull will not realize its being hovered over and reset the border color
                foreach (Hull linkedHull in hullData.LinkedHulls)
                {
                    if (!hullStatusComponents.ContainsKey(linkedHull)) { continue; }

-                    isHoveringOver |= canHoverOverHull && hullStatusComponents[linkedHull].RectComponent == GUI.MouseOn;
+                    isHoveringOver |= 
+                        canHoverOverHull && 
+                        (hullStatusComponents[linkedHull].RectComponent == GUI.MouseOn || (draggingReport && hullStatusComponents[linkedHull].RectComponent.MouseRect.Contains(PlayerInput.MousePosition)));
                    if (isHoveringOver) { break; }
                }

-                if (isHoveringOver)
+                if (isHoveringOver || (draggingReport && component.MouseRect.Contains(PlayerInput.MousePosition)))
                {
                    borderColor = Color.Lerp(borderColor, Color.White, 0.5f);
                    componentColor = HoverColor;
@@ -1037,7 +1074,7 @@ namespace Barotrauma.Items.Components
            }
            else
            {
-                bool hullsVisible = currentMode == MiniMapMode.HullStatus;
+                bool hullsVisible = currentMode == MiniMapMode.HullStatus || currentMode == MiniMapMode.HullCondition;

                foreach (var (entity, component) in hullStatusComponents)
                {
@@ -1150,7 +1187,7 @@ namespace Barotrauma.Items.Components
                GameMain.GameScreen.BlueprintEffect.Parameters["width"].SetValue((float)texture.Width);
                GameMain.GameScreen.BlueprintEffect.Parameters["height"].SetValue((float)texture.Height);

-                Color blueprintBlue = BlueprintBlue * currentMode switch { MiniMapMode.HullStatus => 0.1f, MiniMapMode.ElectricalView => 0.1f, _ => 0.5f };
+                Color blueprintBlue = BlueprintBlue * currentMode switch { MiniMapMode.HullStatus => 0.1f, MiniMapMode.HullCondition => 0.1f, MiniMapMode.ElectricalView => 0.1f, _ => 0.5f };

                Vector2 origin = new Vector2(texture.Width / 2f, texture.Height / 2f);
                float scale = currentMode == MiniMapMode.HullStatus ? 1.0f : Zoom;
@@ -19,9 +19,11 @@ namespace Barotrauma.Items.Components

        private GUIProgressBar progressBar;

-        private List<ParticleEmitter> particleEmitters = new List<ParticleEmitter>();
+        private GUITextBlock progressBarOverlayText;
+
+        private readonly List<ParticleEmitter> particleEmitters = new List<ParticleEmitter>();
        //the corresponding particle emitter is active when the condition is within this range
-        private List<Vector2> particleEmitterConditionRanges = new List<Vector2>();
+        private readonly List<Vector2> particleEmitterConditionRanges = new List<Vector2>();

        private SoundChannel repairSoundChannel;

@@ -88,7 +90,7 @@ namespace Barotrauma.Items.Components
            }
        }

-        private void CreateGUI()
+        protected override void CreateGUI()
        {
            var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.8f, 0.75f), GuiFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter)
            {
@@ -123,6 +125,11 @@ namespace Barotrauma.Items.Components

            progressBar = new GUIProgressBar(new RectTransform(new Vector2(0.6f, 1.0f), progressBarHolder.RectTransform),
                color: GUI.Style.Green, barSize: 0.0f, style: "DeviceProgressBar");
+            progressBarOverlayText = new GUITextBlock(new RectTransform(Vector2.One, progressBar.RectTransform), string.Empty, font: GUI.SubHeadingFont, textAlignment: Alignment.Center)
+            {
+                IgnoreLayoutGroups = true
+            };
+
            repairButtonText = TextManager.Get("RepairButton");
            repairingText = TextManager.Get("Repairing");
            RepairButton = new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), progressBarHolder.RectTransform, Anchor.TopCenter), repairButtonText)
@@ -138,6 +145,7 @@ namespace Barotrauma.Items.Components
            progressBarHolder.RectTransform.MinSize = RepairButton.RectTransform.MinSize;
            RepairButton.RectTransform.MinSize = new Point((int)(RepairButton.TextBlock.TextSize.X * 1.2f), RepairButton.RectTransform.MinSize.Y);

+
            sabotageButtonText = TextManager.Get("SabotageButton");
            sabotagingText = TextManager.Get("Sabotaging");
            SabotageButton = new GUIButton(new RectTransform(new Vector2(0.8f, 0.15f), paddedFrame.RectTransform, Anchor.BottomCenter), sabotageButtonText, style: "GUIButtonSmall")
@@ -229,9 +237,23 @@ namespace Barotrauma.Items.Components
        {
            IsActive = true;

-            progressBar.BarSize = item.Condition / item.MaxCondition;
+            float defaultMaxCondition = (item.MaxCondition / item.MaxRepairConditionMultiplier);
+
+            progressBar.BarSize = item.Condition / defaultMaxCondition;
            progressBar.Color = ToolBox.GradientLerp(progressBar.BarSize, GUI.Style.Red, GUI.Style.Orange, GUI.Style.Green);

+            if (item.Condition > defaultMaxCondition)
+            {
+                float extraCondition = item.MaxCondition * (item.MaxRepairConditionMultiplier - 1.0f);
+                progressBar.Color = ToolBox.GradientLerp((item.Condition - defaultMaxCondition) / extraCondition, GUI.Style.ColorReputationHigh, GUI.Style.ColorReputationVeryHigh);
+                progressBarOverlayText.Visible = true;
+                progressBarOverlayText.Text = $"{(int)Math.Round((item.Condition / defaultMaxCondition) * 100)}%";
+            }
+            else
+            {
+                progressBarOverlayText.Visible = false;
+            }
+
            RepairButton.Enabled = (currentFixerAction == FixActions.None || (CurrentFixer == character && currentFixerAction != FixActions.Repair)) && !item.IsFullCondition;
            RepairButton.Text = (currentFixerAction == FixActions.None || CurrentFixer != character || currentFixerAction != FixActions.Repair) ? 
                repairButtonText : 
@@ -316,12 +316,17 @@ namespace Barotrauma

                    string colorStr = XMLExtensions.ColorToString(!item.AllowStealing ? GUI.Style.Red : Color.White);

+                    if (item.Quality > 0)
+                    {
+                        name = TextManager.GetWithVariable("itemname.quality" + item.Quality, "[itemname]", name, fallBackTag: "itemname.quality3");
+                    }
                    toolTip = $"‖color:{colorStr}‖{name}‖color:end‖";
+
                    if (itemsInSlot.All(it => it.NonInteractable || it.NonPlayerTeamInteractable))
                    {
                        toolTip += " " + TextManager.Get("connectionlocked");
                    }
-                    if (!item.IsFullCondition && !item.Prefab.HideConditionBar)
+                    if (!item.IsFullCondition && !item.Prefab.HideConditionInTooltip)
                    {
                        string conditionColorStr = XMLExtensions.ColorToString(ToolBox.GradientLerp(item.Condition / item.MaxCondition, GUI.Style.ColorInventoryEmpty, GUI.Style.ColorInventoryHalf, GUI.Style.ColorInventoryFull));
                        toolTip += $"‖color:{conditionColorStr}‖ ({(int)item.ConditionPercentage} %)‖color:end‖";
@@ -1068,7 +1068,7 @@ namespace Barotrauma
                foreach (Character otherCharacter in Character.CharacterList)
                {
                    if (otherCharacter != character &&
-                        otherCharacter.SelectedConstruction == character.SelectedConstruction)
+                        otherCharacter.SelectedConstruction == this)
                    {
                        ItemInUseWarning.Visible = true;
                        if (mergedHUDRect.Width > GameMain.GraphicsWidth / 2) { mergedHUDRect.Inflate(-GameMain.GraphicsWidth / 4, 0); }
@@ -1194,7 +1194,7 @@ namespace Barotrauma
                }
            }

-            if (Character.Controlled != null && Character.Controlled.SelectedConstruction != this)
+            if (Character.Controlled != null && Character.Controlled.SelectedConstruction != this && GetComponent<RemoteController>() == null)
            { 
                if (Character.Controlled.SelectedConstruction?.GetComponent<RemoteController>()?.TargetItem != this && 
                    !Character.Controlled.HeldItems.Any(it => it.GetComponent<RemoteController>()?.TargetItem == this))
@@ -1537,6 +1537,7 @@ namespace Barotrauma
            byte bodyType           = msg.ReadByte();
            bool spawnedInOutpost   = msg.ReadBoolean();
            bool allowStealing      = msg.ReadBoolean();
+            int quality             = msg.ReadRangedInteger(0, Items.Components.Quality.MaxQuality);
            byte teamID             = msg.ReadByte();
            bool tagsChanged        = msg.ReadBoolean();
            string tags = "";
@@ -1612,7 +1613,8 @@ namespace Barotrauma
                item = new Item(itemPrefab, pos, sub, id: itemId)
                {
                    SpawnedInOutpost = spawnedInOutpost,
-                    AllowStealing = allowStealing
+                    AllowStealing = allowStealing,
+                    Quality = quality
                };
            }
            catch (Exception e)
@@ -1694,7 +1694,7 @@ namespace Barotrauma

        private void CreateJobVariantTooltip(JobPrefab jobPrefab, int variant, GUIComponent parentSlot)
        {
-            jobVariantTooltip = new GUIFrame(new RectTransform(new Point((int)(500 * GUI.Scale), (int)(200 * GUI.Scale)), GUI.Canvas, pivot: Pivot.BottomRight), 
+            jobVariantTooltip = new GUIFrame(new RectTransform(new Point((int)(400 * GUI.Scale), (int)(180 * GUI.Scale)), GUI.Canvas, pivot: Pivot.BottomRight), 
                style: "GUIToolTip")
            {
                UserData = new Pair<JobPrefab, int>(jobPrefab, variant)
@@ -1707,17 +1707,7 @@ namespace Barotrauma
                AbsoluteSpacing = (int)(15 * GUI.Scale)
            };

-            string name =
-                TextManager.Get("jobname." + jobPrefab.Identifier + (variant + 1), returnNull: true, fallBackTag: "jobname." + jobPrefab.Identifier) ?? 
-                "";
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), name, font: GUI.SubHeadingFont);
-                       
-            string description = 
-                TextManager.Get("jobdescription." + jobPrefab.Identifier + (variant + 1), returnNull: true, fallBackTag: "jobdescription." + jobPrefab.Identifier) ??
-                "";
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), description, wrap: true, font: GUI.SmallFont);
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), TextManager.GetWithVariable("startingequipmentname", "[number]", (variant + 1).ToString()), font: GUI.SubHeadingFont, textAlignment: Alignment.Center);

            var itemIdentifiers = jobPrefab.ItemIdentifiers[variant]
                .Distinct()
@@ -1726,7 +1716,7 @@ namespace Barotrauma
            int itemsPerRow = 5;
            int rows = (int)Math.Max(Math.Ceiling(itemIdentifiers.Count() / (float)itemsPerRow), 1);

-            new GUICustomComponent(new RectTransform(new Vector2(1.0f, 0.4f * rows), content.RectTransform, Anchor.BottomLeft),
+            new GUICustomComponent(new RectTransform(new Vector2(1.0f, 0.4f * rows), content.RectTransform, Anchor.BottomCenter),
                onDraw: (sb, component) => { DrawJobVariantItems(sb, component, new Pair<JobPrefab, int>(jobPrefab, variant), itemsPerRow); });

            jobVariantTooltip.RectTransform.MinSize = new Point(0, content.RectTransform.Children.Sum(c => c.Rect.Height + content.AbsoluteSpacing));
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Linq;
+using Barotrauma.Extensions;
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -23,6 +24,8 @@ namespace Barotrauma
        private Character? dummyCharacter;
        public static Effect BlueprintEffect;

+        private TabMenu tabMenu;
+
        public TestScreen()
        {
            Cam = new Camera();
@@ -50,18 +53,15 @@ namespace Barotrauma
                dummyCharacter?.Remove();
            }

-            // ????????
-            submarine = new Submarine(SubmarineInfo.SavedSubmarines.FirstOrDefault(info => info.Name.Equals("Crescent", StringComparison.OrdinalIgnoreCase)));
-            miniMapItem = new Item(ItemPrefab.Find(null, "statusmonitor"), Vector2.Zero, submarine);
-            MiniMap miniMap = miniMapItem.GetComponent<MiniMap>();
-            miniMap.PowerConsumption = 0;
-
            dummyCharacter = Character.Create(CharacterPrefab.HumanSpeciesName, Vector2.Zero, "", id: Entity.DummyID, hasAi: false);
+            dummyCharacter.Info.Job = new Job(JobPrefab.Prefabs.Where(jp => TalentTree.JobTalentTrees.ContainsKey(jp.Identifier)).GetRandom());
            dummyCharacter.Info.Name = "Galldren";
            dummyCharacter.Inventory.CreateSlots();

            Character.Controlled = dummyCharacter;
            GameMain.World.ProcessChanges();
+            TabMenu.selectedTab = TabMenu.InfoFrameTab.Talents;
+            tabMenu = new TabMenu();
        }

        public override void AddToGUIUpdateList()
@@ -69,34 +69,21 @@ namespace Barotrauma
            Frame.AddToGUIUpdateList();
            CharacterHUD.AddToGUIUpdateList(dummyCharacter);
            dummyCharacter?.SelectedConstruction?.AddToGUIUpdateList();
+            tabMenu.AddToGUIUpdateList();
        }

        public override void Update(double deltaTime)
        {
            base.Update(deltaTime);
+            tabMenu.Update();

-            if (dummyCharacter is { } dummy && miniMapItem is { } item)
+            if (dummyCharacter is { } dummy)
            {
-                if (dummy.SelectedConstruction != item)
-                {
-                    dummy.SelectedConstruction = item;
-                }
-                dummy.SelectedConstruction?.UpdateHUD(Cam, dummy, (float)deltaTime);
-                Vector2 pos = FarseerPhysics.ConvertUnits.ToSimUnits(item.Position);
-                foreach (Limb limb in dummy.AnimController.Limbs)
-                {
-                    limb.body.SetTransform(pos, 0.0f);
-                }
-
-                if (dummy.AnimController?.Collider is { } collider)
-                {
-                    collider.SetTransform(pos, 0);
-                }
-
                dummy.ControlLocalPlayer((float)deltaTime, Cam, false);
                dummy.Control((float)deltaTime, Cam);
-                dummy.Submarine = submarine;
            }
+
+            GUI.Update((float)deltaTime);
        }

        public override void Draw(double deltaTime, GraphicsDevice graphics, SpriteBatch spriteBatch)