Unstable v0.1300.0.1

2021-03-05 17:00:56 +02:00
parent 64cdb32078
commit cb969c959f
199 changed files with 6043 additions and 3911 deletions
@@ -321,6 +321,10 @@ namespace Barotrauma
            float prevSize = chatBox.BarSize;

            string displayedText = message.TranslatedText;
+            if (message.Type == ChatMessageType.Server)
+            {
+                RichTextData.GetRichTextData(displayedText, out displayedText);
+            }
            string senderName = "";
            Color senderColor = Color.White;
            if (!string.IsNullOrWhiteSpace(message.SenderName))
@@ -1,10 +1,10 @@
 using Barotrauma.Extensions;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Barotrauma.Networking;

 namespace Barotrauma
 {
@@ -189,7 +189,7 @@ namespace Barotrauma
            };

            new GUITextBlock(new RectTransform(new Vector2(1.0f, height), pendingAndCrewGroup.RectTransform), TextManager.Get("campaignmenucrew"), font: GUI.SubHeadingFont);
-            crewList = new GUIListBox(new RectTransform(new Vector2(1.0f, (8)* height), pendingAndCrewGroup.RectTransform))
+            crewList = new GUIListBox(new RectTransform(new Vector2(1.0f, 8 * height), pendingAndCrewGroup.RectTransform))
            {
                Spacing = 1
            };
@@ -208,7 +208,7 @@ namespace Barotrauma
            {
                ClickSound = GUISoundType.HireRepairClick,
                ForceUpperCase = true,
-                OnClicked = (b, o) => ValidatePendingHires(true)
+                OnClicked = (b, o) => ValidateHires(PendingHires, true)
            };
            clearAllButton = new GUIButton(new RectTransform(new Vector2(1.0f / 3.0f, 1.0f), group.RectTransform), text: TextManager.Get("campaignstore.clearall"))
            {
@@ -338,7 +338,7 @@ namespace Barotrauma

            GUIFrame frame = new GUIFrame(new RectTransform(new Point(listBox.Content.Rect.Width, (int)(GUI.yScale * 55)), parent: listBox.Content.RectTransform), "ListBoxElement")
            {
-                UserData = new Tuple<CharacterInfo, float>(characterInfo, skill != null ? skill.Level : 0.0f)
+                UserData = new Tuple<CharacterInfo, float>(characterInfo, skill?.Level ?? 0.0f)
            };
            GUILayoutGroup mainGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.95f), frame.RectTransform, anchor: Anchor.Center), isHorizontal: true, childAnchor: Anchor.CenterLeft)
            {
@@ -346,19 +346,22 @@ namespace Barotrauma
            };

            float portraitWidth = (0.8f * mainGroup.Rect.Height) / mainGroup.Rect.Width;
-            new GUICustomComponent(new RectTransform(new Vector2(portraitWidth, 0.8f), mainGroup.RectTransform),
+            var icon = new GUICustomComponent(new RectTransform(new Vector2(portraitWidth, 0.8f), mainGroup.RectTransform),
                onDraw: (sb, component) => characterInfo.DrawIcon(sb, component.Rect.Center.ToVector2(), targetAreaSize: component.Rect.Size.ToVector2()))
            {
                CanBeFocused = false
            };

-            GUILayoutGroup nameAndJobGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.4f - portraitWidth, 0.8f), mainGroup.RectTransform));
-            GUITextBlock nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), nameAndJobGroup.RectTransform),
-                characterInfo.Name, textColor: jobColor, textAlignment: Alignment.BottomLeft)
+            GUILayoutGroup nameAndJobGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.4f - portraitWidth, 0.8f), mainGroup.RectTransform)) { CanBeFocused = false };
+            GUILayoutGroup nameGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), nameAndJobGroup.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft) { CanBeFocused = false };
+            GUITextBlock nameBlock = new GUITextBlock(new RectTransform(Vector2.One, nameGroup.RectTransform),
+                listBox == hireableList ? characterInfo.OriginalName : characterInfo.Name,
+                textColor: jobColor, textAlignment: Alignment.BottomLeft)
            {
                CanBeFocused = false
            };
            nameBlock.Text = ToolBox.LimitString(nameBlock.Text, nameBlock.Font, nameBlock.Rect.Width);
+
            GUITextBlock jobBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), nameAndJobGroup.RectTransform),
                characterInfo.Job.Name, textColor: Color.White, font: GUI.SmallFont, textAlignment: Alignment.TopLeft)
            {
@@ -384,11 +387,18 @@ namespace Barotrauma

            if (listBox != crewList)
            {
-                new GUITextBlock(new RectTransform(new Vector2(width, 1.0f), mainGroup.RectTransform), FormatCurrency(characterInfo.Salary), textAlignment: Alignment.Center)
+                new GUITextBlock(new RectTransform(new Vector2(width, 1.0f), mainGroup.RectTransform),
+                    FormatCurrency(characterInfo.Salary),
+                    textAlignment: Alignment.Center)
                {
                    CanBeFocused = false
                };
            }
+            else
+            {
+                // Just a bit of padding to make list layouts similar
+                new GUIFrame(new RectTransform(new Vector2(width, 1.0f), mainGroup.RectTransform), style: null) { CanBeFocused = false };
+            }

            if (listBox == hireableList)
            {
@@ -447,6 +457,23 @@ namespace Barotrauma
                    }
                };
            }
+
+            if (listBox == pendingList || listBox == crewList)
+            {
+                nameBlock.RectTransform.Resize(new Point(nameBlock.Rect.Width - nameBlock.Rect.Height, nameBlock.Rect.Height));
+                nameBlock.Text = ToolBox.LimitString(nameBlock.Text, nameBlock.Font, nameBlock.Rect.Width);
+                nameBlock.RectTransform.Resize(new Point((int)(nameBlock.Padding.X + nameBlock.TextSize.X + nameBlock.Padding.Z), nameBlock.Rect.Height));
+                Point size = new Point((int)(0.7f * nameBlock.Rect.Height));
+                new GUIImage(new RectTransform(size, nameGroup.RectTransform), "EditIcon") { CanBeFocused = false };
+                size = new Point(3 * mainGroup.AbsoluteSpacing + icon.Rect.Width + nameAndJobGroup.Rect.Width, mainGroup.Rect.Height);
+                new GUIButton(new RectTransform(size, frame.RectTransform) { RelativeOffset = new Vector2(0.025f) }, style: null)
+                {
+                    Enabled = HasPermission,
+                    ToolTip = TextManager.GetWithVariable("campaigncrew.givenicknametooltip", "[mouseprimary]", TextManager.Get($"input.{(PlayerInput.MouseButtonsSwapped() ? "rightmouse" : "leftmouse")}")), 
+                    UserData = characterInfo,
+                    OnClicked = CreateRenamingComponent
+                };
+            }
        }

        private void CreateCharacterPreviewFrame(GUIListBox listBox, GUIFrame characterFrame, CharacterInfo characterInfo)
@@ -479,7 +506,10 @@ namespace Barotrauma
            GUILayoutGroup infoValueGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.6f, 1.0f), infoGroup.RectTransform)) { Stretch = true };
            float blockHeight = 1.0f / 4;
            new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), infoLabelGroup.RectTransform), TextManager.Get("name"));
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), infoValueGroup.RectTransform), characterInfo.Name);
+            GUITextBlock nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), infoValueGroup.RectTransform), "");
+            string name = listBox == hireableList ? characterInfo.OriginalName : characterInfo.Name;
+            nameBlock.Text = ToolBox.LimitString(name, nameBlock.Font, nameBlock.Rect.Width);
+
            if (characterInfo.HasGenders)
            {
                new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), infoLabelGroup.RectTransform), TextManager.Get("gender"));
@@ -554,9 +584,18 @@ namespace Barotrauma
            if (PendingHires.Contains(characterInfo)) { PendingHires.Remove(characterInfo); }
            pendingList.Content.RemoveChild(pendingList.Content.FindChild(c => (c.UserData as Tuple<CharacterInfo, float>).Item1 == characterInfo));
            pendingList.UpdateScrollBarSize();
-            CreateCharacterFrame(characterInfo, hireableList);
-            SortCharacters(hireableList, (SortingMethod)sortingDropDown.SelectedItemData);
-            hireableList.UpdateScrollBarSize();
+
+            // Server will reset the names to originals in multiplayer
+            if (!GameMain.IsMultiplayer) { characterInfo?.ResetName(); }
+
+            if (campaign.Map.CurrentLocation.HireManager.AvailableCharacters.Any(info => info.GetIdentifierUsingOriginalName() == characterInfo.GetIdentifierUsingOriginalName()) &&
+                hireableList.Content.Children.None(c => c.UserData is Tuple<CharacterInfo, float> userData && userData.Item1.GetIdentifierUsingOriginalName() == characterInfo.GetIdentifierUsingOriginalName()))
+            {
+                CreateCharacterFrame(characterInfo, hireableList);
+                SortCharacters(hireableList, (SortingMethod)sortingDropDown.SelectedItemData);
+                hireableList.UpdateScrollBarSize();
+            }
+            
            if (setTotalHireCost) { SetTotalHireCost(); }
            if (createNetworkMessage) { SendCrewState(true); }
            return true;
@@ -573,36 +612,41 @@ namespace Barotrauma
        {
            if (pendingList == null || totalBlock == null || validateHiresButton == null) { return; }
            int total = 0;
-            pendingList.Content.Children.ForEach(c => total += (c.UserData as Tuple<CharacterInfo, float>).Item1.Salary);
+            pendingList.Content.Children.ForEach(c =>
+            {
+                total += (c.UserData as Tuple<CharacterInfo, float>).Item1.Salary;
+            });
            totalBlock.Text = FormatCurrency(total);
            bool enoughMoney = campaign != null ? total <= campaign.Money : true;
            totalBlock.TextColor = enoughMoney ? Color.White : Color.Red;
            validateHiresButton.Enabled = enoughMoney && pendingList.Content.RectTransform.Children.Any();
        }

-        public bool ValidatePendingHires(bool createNetworkEvent = false)
+        public bool ValidateHires(List<CharacterInfo> hires, bool createNetworkEvent = false)
        {
-            List<CharacterInfo> hires = new List<CharacterInfo>();
-            int total = 0;
-            foreach (GUIComponent c in pendingList.Content.Children.ToList())
-            {
-                if (c.UserData is Tuple<CharacterInfo, float> info)
-                {
-                    hires.Add(info.Item1);
-                    total += info.Item1.Salary;
-                }
-            }
+            if (hires == null || hires.None()) { return false; }

-            if (hires.None() || total > campaign.Money) { return false; }
+            List<CharacterInfo> nonDuplicateHires = new List<CharacterInfo>();
+            hires.ForEach(hireInfo =>
+            {
+                if(campaign.CrewManager.GetCharacterInfos().None(crewInfo => crewInfo.IsNewHire && crewInfo.GetIdentifierUsingOriginalName() == hireInfo.GetIdentifierUsingOriginalName()))
+                {
+                    nonDuplicateHires.Add(hireInfo);
+                }
+            });
+
+            if (nonDuplicateHires.None()) { return false; }
+
+            int total = nonDuplicateHires.Aggregate(0, (total, info) => total + info.Salary);
+
+            if (total > campaign.Money) { return false; }

            bool atLeastOneHired = false;
-            foreach (CharacterInfo ci in hires)
+            foreach (CharacterInfo ci in nonDuplicateHires)
            {
                if (campaign.TryHireCharacter(campaign.Map.CurrentLocation, ci))
                {
                    atLeastOneHired = true;
-                    PendingHires.Remove(ci);
-                    pendingList.Content.RemoveChild(pendingList.Content.FindChild(c => (c.UserData as Tuple<CharacterInfo, float>).Item1 == ci));
                }
                else
                {
@@ -629,6 +673,93 @@ namespace Barotrauma
            return false;
        }

+        private bool CreateRenamingComponent(GUIButton button, object userData)
+        {
+            if (!HasPermission || !(userData is CharacterInfo characterInfo)) { return false; }
+            var outerGlowFrame = new GUIFrame(new RectTransform(new Vector2(1.25f, 1.25f), parentComponent.RectTransform, Anchor.Center),
+                style: "OuterGlow", color: Color.Black * 0.7f);
+            var frame = new GUIFrame(new RectTransform(new Vector2(0.33f, 0.4f), outerGlowFrame.RectTransform, anchor: Anchor.Center)
+            {
+                MaxSize = new Point(400, 300).Multiply(GUI.Scale)
+            });
+            var layoutGroup = new GUILayoutGroup(new RectTransform((frame.Rect.Size - GUIStyle.ItemFrameMargin).Multiply(new Vector2(0.75f, 1.0f)), frame.RectTransform, anchor: Anchor.Center), childAnchor: Anchor.TopCenter)
+            {
+                RelativeSpacing = 0.02f,
+                Stretch = true
+            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), layoutGroup.RectTransform), TextManager.Get("campaigncrew.givenickname"), font: GUI.SubHeadingFont, textAlignment: Alignment.Center, wrap: true);
+            var groupElementSize = new Vector2(1.0f, 0.25f);
+            var nameBox = new GUITextBox(new RectTransform(groupElementSize, layoutGroup.RectTransform))
+            {
+                MaxTextLength = Client.MaxNameLength
+            };
+            new GUIButton(new RectTransform(groupElementSize, layoutGroup.RectTransform), text: TextManager.Get("confirm"))
+            {
+                OnClicked = (button, userData) =>
+                {
+                    if (RenameCharacter(characterInfo, nameBox.Text?.Trim()))
+                    {
+                        parentComponent.RemoveChild(outerGlowFrame);
+                        return true;
+                    }
+                    else
+                    {
+                        nameBox.Flash(color: Color.Red);
+                        return false;
+                    }
+                    
+                }
+            };
+            new GUIButton(new RectTransform(groupElementSize, layoutGroup.RectTransform), text: TextManager.Get("cancel"))
+            {
+                OnClicked = (button, userData) =>
+                {
+                    parentComponent.RemoveChild(outerGlowFrame);
+                    return true;
+                }
+            };
+            layoutGroup.Recalculate();
+            return true;
+        }
+
+        public bool RenameCharacter(CharacterInfo characterInfo, string newName)
+        {
+            if (characterInfo == null || string.IsNullOrEmpty(newName)) { return false; }
+            if (newName == characterInfo.Name) { return false; }
+            if (GameMain.IsMultiplayer)
+            {
+                SendCrewState(false, renameCharacter: (characterInfo, newName));
+            }
+            else
+            {
+                var crewComponent = crewList.Content.FindChild(c => (c.UserData as Tuple<CharacterInfo, float>).Item1 == characterInfo);
+                if (crewComponent != null)
+                {
+                    crewList.Content.RemoveChild(crewComponent);
+                    campaign.CrewManager.RenameCharacter(characterInfo, newName);
+                    CreateCharacterFrame(characterInfo, crewList);
+                    SortCharacters(crewList, SortingMethod.JobAsc);
+                }
+                else
+                {
+                    var pendingComponent = pendingList.Content.FindChild(c => (c.UserData as Tuple<CharacterInfo, float>).Item1 == characterInfo);
+                    if (pendingComponent != null)
+                    {
+                        pendingList.Content.RemoveChild(pendingComponent);
+                        campaign.Map.CurrentLocation.HireManager.RenameCharacter(characterInfo, newName);
+                        CreateCharacterFrame(characterInfo, pendingList);
+                        SortCharacters(pendingList, SortingMethod.JobAsc);
+                        SetTotalHireCost();
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
        private bool FireCharacter(GUIButton button, object selection)
        {
            if (!(selection is CharacterInfo characterInfo)) { return false; }
@@ -649,9 +780,10 @@ namespace Barotrauma
                UpdateLocationView(campaign.Map.CurrentLocation, false);
            }

-            if ((GUI.MouseOn?.UserData as Tuple<CharacterInfo, float>)?.Item1 is CharacterInfo characterInfo)
+            (GUIComponent highlightedFrame, CharacterInfo highlightedInfo) = FindHighlightedCharacter(GUI.MouseOn);
+            if (highlightedFrame != null && highlightedInfo != null)
            {
-                if (characterPreviewFrame == null || characterInfo != characterPreviewFrame.UserData)
+                if (characterPreviewFrame == null || highlightedInfo != characterPreviewFrame.UserData)
                {
                    GUIComponent component = GUI.MouseOn;
                    GUIListBox listBox = null;
@@ -674,7 +806,7 @@ namespace Barotrauma

                    if (listBox != null)
                    {
-                        SelectCharacter(listBox, GUI.MouseOn as GUIFrame, characterInfo);
+                        SelectCharacter(listBox, highlightedFrame as GUIFrame, highlightedInfo);
                    }
                }
                else
@@ -688,6 +820,27 @@ namespace Barotrauma
                characterPreviewFrame.Parent?.RemoveChild(characterPreviewFrame);
                characterPreviewFrame = null;
            }
+
+            static (GUIComponent, CharacterInfo) FindHighlightedCharacter(GUIComponent c)
+            {
+                if (c == null)
+                {
+                    return default;
+                }
+                if (c.UserData is Tuple<CharacterInfo, float> highlightedData)
+                {
+                    return (c, highlightedData.Item1);
+                }
+                if (c.Parent != null)
+                {
+                    if (c.Parent is GUIListBox)
+                    {
+                        return default;
+                    }
+                    return FindHighlightedCharacter(c.Parent);
+                }
+                return default;
+            }
        }

        public void SetPendingHires(List<int> characterInfos, Location location)
@@ -700,7 +853,7 @@ namespace Barotrauma
            PendingHires.Clear();
            foreach (int identifier in characterInfos)
            {
-                CharacterInfo match = location.HireManager.AvailableCharacters.Find(info => info.GetIdentifier() == identifier);
+                CharacterInfo match = location.HireManager.AvailableCharacters.Find(info => info.GetIdentifierUsingOriginalName() == identifier);
                if (match != null)
                {
                    PendingHires.Add(match);
@@ -717,9 +870,10 @@ namespace Barotrauma
        /// Notify the server of crew changes
        /// </summary>
        /// <param name="updatePending">When set to true will tell the server to update the pending hires</param>
+        /// <param name="renameCharacter">When not null tell the server to rename this character. Item1 is the character to rename, Item2 is the new name, Item3 indicates whether the renamed character is already a part of the crew.</param>
        /// <param name="firedCharacter">When not null tell the server to fire this character</param>
        /// <param name="validateHires">When set to true will tell the server to validate pending hires</param>
-        public void SendCrewState(bool updatePending, CharacterInfo firedCharacter = null, bool validateHires = false)
+        public void SendCrewState(bool updatePending, (CharacterInfo info, string newName) renameCharacter = default, CharacterInfo firedCharacter = null, bool validateHires = false)
        {
            if (campaign is MultiPlayerCampaign)
            {
@@ -732,12 +886,23 @@ namespace Barotrauma
                    msg.Write((ushort)PendingHires.Count);
                    foreach (CharacterInfo pendingHire in PendingHires)
                    {
-                        msg.Write(pendingHire.GetIdentifier());
+                        msg.Write(pendingHire.GetIdentifierUsingOriginalName());
                    }
                }

                msg.Write(validateHires);

+                bool validRenaming = renameCharacter.info != null && !string.IsNullOrEmpty(renameCharacter.newName);
+                msg.Write(validRenaming);
+                if (validRenaming)
+                {
+                    int identifier = renameCharacter.info.GetIdentifierUsingOriginalName();
+                    msg.Write(identifier);
+                    msg.Write(renameCharacter.newName);
+                    bool existingCrewMember = campaign.CrewManager?.GetCharacterInfos().Any(ci => ci.GetIdentifierUsingOriginalName() == identifier) ?? false;
+                    msg.Write(existingCrewMember);
+                }
+
                msg.Write(firedCharacter != null);
                if (firedCharacter != null)
                {
@@ -1338,9 +1338,9 @@ namespace Barotrauma
            }
        }

-        public static void DrawLine(SpriteBatch sb, Vector2 start, Vector2 end, Color clr, float depth = 0.0f, int width = 1)
+        public static void DrawLine(SpriteBatch sb, Vector2 start, Vector2 end, Color clr, float depth = 0.0f, float width = 1)
        {
-            DrawLine(sb, t, start, end, clr, depth, width);
+            DrawLine(sb, t, start, end, clr, depth, (int)width);
        }

        public static void DrawLine(SpriteBatch sb, Sprite sprite, Vector2 start, Vector2 end, Color clr, float depth = 0.0f, int width = 1)
@@ -1407,7 +1407,7 @@ namespace Barotrauma
            font.DrawStringWithColors(sb, text, pos, color, 0.0f, Vector2.Zero, 1f, SpriteEffects.None, depth, richTextData);
        }

-        public static void DrawRectangle(SpriteBatch sb, Vector2 start, Vector2 size, Color clr, bool isFilled = false, float depth = 0.0f, int thickness = 1)
+        public static void DrawRectangle(SpriteBatch sb, Vector2 start, Vector2 size, Color clr, bool isFilled = false, float depth = 0.0f, float thickness = 1)
        {
            if (size.X < 0)
            {
@@ -1422,7 +1422,7 @@ namespace Barotrauma
            DrawRectangle(sb, new Rectangle((int)start.X, (int)start.Y, (int)size.X, (int)size.Y), clr, isFilled, depth, thickness);
        }

-        public static void DrawRectangle(SpriteBatch sb, Rectangle rect, Color clr, bool isFilled = false, float depth = 0.0f, int thickness = 1)
+        public static void DrawRectangle(SpriteBatch sb, Rectangle rect, Color clr, bool isFilled = false, float depth = 0.0f, float thickness = 1)
        {
            if (isFilled)
            {
@@ -1430,15 +1430,15 @@ namespace Barotrauma
            }
            else
            {
-                sb.Draw(t, new Rectangle(rect.X + thickness, rect.Y, rect.Width - thickness * 2, thickness), null, clr, 0.0f, Vector2.Zero, SpriteEffects.None, depth);
-                sb.Draw(t, new Rectangle(rect.X + thickness, rect.Y + rect.Height - thickness, rect.Width - thickness * 2, thickness), null, clr, 0.0f, Vector2.Zero, SpriteEffects.None, depth);
-
-                sb.Draw(t, new Rectangle(rect.X, rect.Y, thickness, rect.Height), null, clr, 0.0f, Vector2.Zero, SpriteEffects.None, depth);
-                sb.Draw(t, new Rectangle(rect.X + rect.Width - thickness, rect.Y, thickness, rect.Height), null, clr, 0.0f, Vector2.Zero, SpriteEffects.None, depth);
+                Rectangle srcRect = new Rectangle(0, 0, 1, 1);
+                sb.Draw(t, new Vector2(rect.X, rect.Y), srcRect, clr, 0.0f, Vector2.Zero, new Vector2(thickness, rect.Height), SpriteEffects.None, depth);
+                sb.Draw(t, new Vector2(rect.X + thickness, rect.Y), srcRect, clr, 0.0f, Vector2.Zero, new Vector2(rect.Width - thickness, thickness), SpriteEffects.None, depth);
+                sb.Draw(t, new Vector2(rect.X + thickness, rect.Bottom - thickness), srcRect, clr, 0.0f, Vector2.Zero, new Vector2(rect.Width - thickness, thickness), SpriteEffects.None, depth);
+                sb.Draw(t, new Vector2(rect.Right - thickness, rect.Y + thickness), srcRect, clr, 0.0f, Vector2.Zero, new Vector2(thickness, rect.Height - thickness * 2f), SpriteEffects.None, depth);
            }
        }

-        public static void DrawRectangle(SpriteBatch sb, Vector2 center, float width, float height, float rotation, Color clr, float depth = 0.0f, int thickness = 1)
+        public static void DrawRectangle(SpriteBatch sb, Vector2 center, float width, float height, float rotation, Color clr, float depth = 0.0f, float thickness = 1)
        {
            Matrix rotate = Matrix.CreateRotationZ(rotation);

@@ -1455,7 +1455,7 @@ namespace Barotrauma
            DrawLine(sb, bottomLeft, topLeft, clr, depth, thickness);
        }

-        public static void DrawRectangle(SpriteBatch sb, Vector2[] corners, Color clr, float depth = 0.0f, int thickness = 1)
+        public static void DrawRectangle(SpriteBatch sb, Vector2[] corners, Color clr, float depth = 0.0f, float thickness = 1)
        {
            if (corners.Length != 4)
            {
@@ -705,6 +705,29 @@ namespace Barotrauma
            if (!Visible) return;
            DrawToolTip(spriteBatch, ToolTip, GUI.MouseOn.Rect, TooltipRichTextData);
        }
+        
+        public static void DrawToolTip(SpriteBatch spriteBatch, string toolTip, Vector2 pos, List<RichTextData> richTextData = null)
+        {
+            if (Tutorials.Tutorial.ContentRunning) { return; }
+
+            int width = (int)(400 * GUI.Scale);
+            int height = (int)(18 * GUI.Scale);
+            Point padding = new Point((int)(10 * GUI.Scale));
+
+            if (toolTipBlock == null || (string)toolTipBlock.userData != toolTip)
+            {
+                toolTipBlock = new GUITextBlock(new RectTransform(new Point(width, height), null), richTextData, toolTip, font: GUI.SmallFont, wrap: true, style: "GUIToolTip");
+                toolTipBlock.RectTransform.NonScaledSize = new Point(
+                    (int)(GUI.SmallFont.MeasureString(toolTipBlock.WrappedText).X + padding.X + toolTipBlock.Padding.X + toolTipBlock.Padding.Z),
+                    (int)(GUI.SmallFont.MeasureString(toolTipBlock.WrappedText).Y + padding.Y + toolTipBlock.Padding.Y + toolTipBlock.Padding.W));
+                toolTipBlock.userData = toolTip;
+            }
+
+            toolTipBlock.RectTransform.AbsoluteOffset = pos.ToPoint();
+            toolTipBlock.SetTextPos();
+
+            toolTipBlock.DrawManually(spriteBatch);
+        }

        public static void DrawToolTip(SpriteBatch spriteBatch, string toolTip, Rectangle targetElement, List<RichTextData> richTextData = null)
        {
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Barotrauma.Networking;
+using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -22,11 +23,11 @@ namespace Barotrauma
        {
            Default,
            InGame,
-            Vote
+            Vote,
+            Hint
        }

        public List<GUIButton> Buttons { get; private set; } = new List<GUIButton>();
-        //public GUIFrame BackgroundFrame { get; private set; }
        public GUILayoutGroup Content { get; private set; }
        public GUIFrame InnerFrame { get; private set; }
        public GUITextBlock Header { get; private set; }
@@ -58,8 +59,6 @@ namespace Barotrauma

        public bool AutoClose;

-        private readonly bool alwaysVisible;
-
        private float openState;
        private float iconState;
        private bool iconSwitching;
@@ -77,10 +76,17 @@ namespace Barotrauma
            this.Buttons[0].OnClicked = Close;
        }

-        public GUIMessageBox(string headerText, string text, string[] buttons, Vector2? relativeSize = null, Point? minSize = null, Alignment textAlignment = Alignment.TopLeft, Type type = Type.Default, string tag = "", Sprite icon = null, string iconStyle = "", Sprite backgroundIcon = null)
+        public GUIMessageBox(string headerText, string text, string[] buttons, Vector2? relativeSize = null, Point? minSize = null, Alignment textAlignment = Alignment.TopLeft, Type type = Type.Default, string tag = "", Sprite icon = null, string iconStyle = "", Sprite backgroundIcon = null, bool parseRichText = false)
            : base(new RectTransform(GUI.Canvas.RelativeSize, GUI.Canvas, Anchor.Center), style: GUI.Style.GetComponentStyle("GUIMessageBox." + type) != null ? "GUIMessageBox." + type : "GUIMessageBox")
        {
-            int width = (int)(DefaultWidth * (type == Type.Default ? 1.0f : 1.5f)), height = 0;
+            int width = (int)(DefaultWidth * type switch
+            {
+                Type.Default => 1.0f,
+                Type.Hint => 1.25f,
+                _ => 1.5f
+            });
+            int height = 0;
+
            if (relativeSize.HasValue)
            {
                width = (int)(GameMain.GraphicsWidth * relativeSize.Value.X);
@@ -107,6 +113,7 @@ namespace Barotrauma
            Anchor anchor = type switch
            {
                Type.InGame => Anchor.TopCenter,
+                Type.Hint => Anchor.TopRight,
                Type.Vote => Anchor.TopRight,
                _ => Anchor.Center
            };
@@ -127,13 +134,13 @@ namespace Barotrauma
                Content = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), InnerFrame.RectTransform, Anchor.Center)) { AbsoluteSpacing = 5 };
                            
                Header = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), 
-                    headerText, font: GUI.SubHeadingFont, textAlignment: Alignment.Center, wrap: true);
+                    headerText, font: GUI.SubHeadingFont, textAlignment: Alignment.Center, wrap: true, parseRichText: parseRichText);
                GUI.Style.Apply(Header, "", this);
                Header.RectTransform.MinSize = new Point(0, Header.Rect.Height);

                if (!string.IsNullOrWhiteSpace(text))
                {
-                    Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), text, textAlignment: textAlignment, wrap: true);
+                    Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), text, textAlignment: textAlignment, wrap: true, parseRichText: parseRichText);
                    GUI.Style.Apply(Text, "", this);
                    Text.RectTransform.NonScaledSize = Text.RectTransform.MinSize = Text.RectTransform.MaxSize = 
                        new Point(Text.Rect.Width, Text.Rect.Height);
@@ -180,7 +187,6 @@ namespace Barotrauma
            else if (type == Type.InGame)
            {
                InnerFrame.RectTransform.AbsoluteOffset = new Point(0, GameMain.GraphicsHeight);
-                alwaysVisible = true;
                CanBeFocused = false;
                AutoClose = true;
                GUI.Style.Apply(InnerFrame, "", this);
@@ -235,13 +241,13 @@ namespace Barotrauma
                    };
                }

-                Header = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), headerText, wrap: true);
+                Header = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), headerText, wrap: true, parseRichText: parseRichText);
                GUI.Style.Apply(Header, "", this);
                Header.RectTransform.MinSize = new Point(0, Header.Rect.Height);

                if (!string.IsNullOrWhiteSpace(text))
                {
-                    Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), text, textAlignment: textAlignment, wrap: true);
+                    Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), text, textAlignment: textAlignment, wrap: true, parseRichText: parseRichText);
                    GUI.Style.Apply(Text, "", this);
                    Content.Recalculate();
                    Text.RectTransform.NonScaledSize = Text.RectTransform.MinSize = Text.RectTransform.MaxSize =
@@ -266,30 +272,204 @@ namespace Barotrauma
                }
                Buttons[0].RectTransform.MaxSize = new Point((int)(0.4f * Buttons[0].Rect.Y), Buttons[0].Rect.Y);
            }
-            
+            else if (type == Type.Hint)
+            {
+                CanBeFocused = false;
+                GUI.Style.Apply(InnerFrame, "", this);
+
+                Point absoluteSpacing = GUIStyle.ItemFrameMargin.Multiply(1.0f / 5.0f);
+                var verticalLayoutGroup = new GUILayoutGroup(new RectTransform(GetVerticalLayoutGroupSize(), parent: InnerFrame.RectTransform, anchor: Anchor.Center), childAnchor: Anchor.TopCenter)
+                {
+                    AbsoluteSpacing = absoluteSpacing.Y,
+                    Stretch = true
+                };
+
+                var topHorizontalLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.7f), verticalLayoutGroup.RectTransform),
+                    isHorizontal: true, childAnchor: Anchor.CenterLeft)
+                {
+                    Stretch = true,
+                    RelativeSpacing = 0.02f
+                };
+
+                int iconMaxHeight = 0;
+                if (icon != null)
+                {
+                    Icon = new GUIImage(new RectTransform(new Vector2(0.15f, 0.95f), topHorizontalLayoutGroup.RectTransform), icon, scaleToFit: true);
+                    iconMaxHeight = (int)Icon.Sprite.size.Y;
+                }
+                else
+                {
+                    bool iconStyleDefined = !string.IsNullOrEmpty(iconStyle);
+                    Icon = new GUIImage(new RectTransform(new Vector2(0.15f, 0.95f), topHorizontalLayoutGroup.RectTransform),
+                        iconStyleDefined ? iconStyle : "GUIButtonInfo", scaleToFit: true);
+                    if (!iconStyleDefined)
+                    {
+                        Icon.Color = Color.Orange;
+                    }
+                    iconMaxHeight = (int)(Icon.Style.GetDefaultSprite()?.size.Y ?? GUI.yScale * 40);
+                }
+
+                iconMaxHeight = Math.Min((int)(GUI.yScale * 40), iconMaxHeight);
+                int iconMinHeight = Math.Min((int)(GUI.yScale * 40), iconMaxHeight);
+                Icon.RectTransform.MinSize = new Point(Icon.Rect.Width, iconMinHeight);
+                Icon.RectTransform.MaxSize = new Point(Icon.Rect.Width, iconMaxHeight);
+
+                Content = new GUILayoutGroup(new RectTransform(new Vector2(Icon != null ? 0.85f : 1.0f, 1.0f), topHorizontalLayoutGroup.RectTransform))
+                {
+                    AbsoluteSpacing = absoluteSpacing.Y,
+                };
+
+                var bottomContainer = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.3f), verticalLayoutGroup.RectTransform), style: null);
+
+                var tickBoxLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.67f, 1.0f), bottomContainer.RectTransform, anchor: Anchor.CenterLeft),
+                    isHorizontal: true, childAnchor: Anchor.CenterLeft)
+                {
+                    Stretch = true,
+                    RelativeSpacing = 0.02f
+                };
+
+                var dontShowAgainTickBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickBoxLayoutGroup.RectTransform),
+                    TextManager.Get("hintmessagebox.dontshowagain"))
+                {
+                    ToolTip = TextManager.Get("hintmessagebox.dontshowagaintooltip"),
+                    UserData = "dontshowagain"
+                };
+
+                //var disableHintsTickBox = new GUITickBox(new RectTransform(new Vector2(0.33f, 1.0f), tickBoxLayoutGroup.RectTransform),
+                //    TextManager.Get("hintmessagebox.disablehints"))
+                //{
+                //    ToolTip = TextManager.Get("hintmessagebox.disablehintstooltip"),
+                //    UserData = "disablehints"
+                //};
+
+                Buttons = new List<GUIButton>(1)
+                {
+                    new GUIButton(new RectTransform(new Vector2(0.33f, 1.0f), bottomContainer.RectTransform, Anchor.CenterRight),
+                        text: TextManager.Get("hintmessagebox.dismiss"), style: "GUIButtonSmall")
+                    {
+                        OnClicked = Close
+                    }
+                };
+
+                InputType? closeInput = null;
+                if (GameMain.Config.KeyBind(InputType.Use).MouseButton == MouseButton.None)
+                {
+                    closeInput = InputType.Use;
+                }
+                else if (GameMain.Config.KeyBind(InputType.Select).MouseButton == MouseButton.None)
+                {
+                    closeInput = InputType.Select;
+                }
+                if (closeInput.HasValue)
+                {
+                    Buttons[0].ToolTip = TextManager.ParseInputTypes($"{TextManager.Get("hintmessagebox.dismiss")} ([InputType.{closeInput.Value}])");
+                    Buttons[0].OnAddedToGUIUpdateList += (GUIComponent component) =>
+                    {
+                        if (!closing && openState >= 1.0f && PlayerInput.KeyHit(closeInput.Value))
+                        {
+                            GUIButton btn = component as GUIButton;
+                            btn?.OnClicked(btn, btn.UserData);
+                            btn?.Flash(GUI.Style.Green);
+                        }
+                    };
+                }
+
+                Header = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), headerText, wrap: true);
+                GUI.Style.Apply(Header, "", this);
+                Header.RectTransform.MinSize = new Point(0, Header.Rect.Height);
+
+                if (!string.IsNullOrWhiteSpace(text))
+                {
+                    Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), text, textAlignment: textAlignment, wrap: true);
+                    GUI.Style.Apply(Text, "", this);
+                    Content.Recalculate();
+                    Text.RectTransform.NonScaledSize = Text.RectTransform.MinSize = Text.RectTransform.MaxSize =
+                        new Point(Text.Rect.Width, Text.Rect.Height);
+                    Text.RectTransform.IsFixedSize = true;
+                    if (string.IsNullOrWhiteSpace(headerText))
+                    {
+                        Header.RectTransform.Parent = null;
+                        Content.ChildAnchor = Anchor.Center;
+                    }
+                }
+
+                if (height == 0)
+                {
+                    height = absoluteSpacing.Y;
+                    int upperContainerHeight = absoluteSpacing.Y;
+                    if (Header.Rect.Height > 0) { upperContainerHeight += Header.Rect.Height + Content.AbsoluteSpacing; }
+                    if (Text != null) { upperContainerHeight += Text.Rect.Height + Content.AbsoluteSpacing; }
+                    upperContainerHeight = Math.Max(upperContainerHeight, Icon.Rect.Height);
+                    height += upperContainerHeight;
+                    height += absoluteSpacing.Y;
+                    height += (int)((bottomContainer.RectTransform.RelativeSize.Y / topHorizontalLayoutGroup.RectTransform.RelativeSize.Y) * upperContainerHeight);
+                    height += absoluteSpacing.Y;
+                    if (minSize.HasValue) { height = Math.Max(height, minSize.Value.Y); }
+
+                    InnerFrame.RectTransform.NonScaledSize = new Point(InnerFrame.Rect.Width, height);
+                    verticalLayoutGroup.RectTransform.NonScaledSize = GetVerticalLayoutGroupSize();
+                    verticalLayoutGroup.Recalculate();
+                    topHorizontalLayoutGroup.Recalculate();
+                    Content.Recalculate();
+                    tickBoxLayoutGroup.Recalculate();
+                }
+
+                InnerFrame.RectTransform.AbsoluteOffset = new Point(GUI.IntScale(64), -InnerFrame.Rect.Height);
+
+                Point GetVerticalLayoutGroupSize()
+                {
+                    return InnerFrame.Rect.Size - absoluteSpacing.Multiply(2);
+                }
+            }
+
            MessageBoxes.Add(this);
        }

+        /// <summary>
+        /// Use to create a message box of Hint type
+        /// </summary>
+        public GUIMessageBox(string hintIdentifier, string text, Sprite icon) : this("", text, new string[0], textAlignment: Alignment.CenterLeft, type: Type.Hint, icon: icon)
+        {
+            if (InnerFrame.FindChild("dontshowagain", recursive: true) is GUITickBox dontShowAgainTickBox)
+            {
+                dontShowAgainTickBox.OnSelected = HintManager.OnDontShowAgain;
+                dontShowAgainTickBox.UserData = hintIdentifier;
+            }
+            if (InnerFrame.FindChild("disablehints", recursive: true) is GUITickBox disableHintsTickBox)
+            {
+                disableHintsTickBox.OnSelected = HintManager.OnDisableHints;
+                disableHintsTickBox.UserData = hintIdentifier;
+            }
+        }
+
+        private static Type[] messageBoxTypes;
+
        public static void AddActiveToGUIUpdateList()
        {
-            for (int i = 0; i < MessageBoxes.Count; i++)
+            messageBoxTypes ??= (Type[])Enum.GetValues(typeof(Type));
+
+            foreach (var type in messageBoxTypes)
            {
-                if (MessageBoxes[i] is GUIMessageBox alwaysVisibleMsgBox && alwaysVisibleMsgBox.alwaysVisible)
+                for (int i = 0; i < MessageBoxes.Count; i++)
                {
-                    alwaysVisibleMsgBox.AddToGUIUpdateList();
-                    break;
-                }
-            }
-            for (int i = MessageBoxes.Count - 1; i >= 0; i--)
-            {
-                if (MessageBoxes[i].UserData as string == "verificationprompt" ||
-                    MessageBoxes[i].UserData as string == "bugreporter")
-                {
-                    continue;
-                }
-                if (!(MessageBoxes[i] is GUIMessageBox msgBox) || !msgBox.alwaysVisible)
-                {
-                    MessageBoxes[i].AddToGUIUpdateList();
+                    if (MessageBoxes[i] == null) { continue; }
+                    if (!(MessageBoxes[i] is GUIMessageBox messageBox))
+                    {
+                        if (type == Type.Default)
+                        {
+                            // Message box not of type GUIMessageBox is likely the round summary
+                            MessageBoxes[i].AddToGUIUpdateList();
+                            break;
+                        }
+                        continue;
+                    }
+                    if (messageBox.type != type) { continue; }
+
+                    // These are handled separately in GUI.HandlePersistingElements()
+                    if (MessageBoxes[i].UserData as string == "verificationprompt") { continue; }
+                    if (MessageBoxes[i].UserData as string == "bugreporter") { continue; }
+
+                    messageBox.AddToGUIUpdateList();
                    break;
                }
            }
@@ -337,11 +517,21 @@ namespace Barotrauma
                }
            }

-            if (type == Type.InGame)
+            if (type == Type.InGame || type == Type.Hint)
            {
-                Vector2 initialPos = new Vector2(0.0f, GameMain.GraphicsHeight);
-                Vector2 defaultPos = new Vector2(0.0f, HUDLayoutSettings.InventoryAreaLower.Y - InnerFrame.Rect.Height - 20 * GUI.Scale);
-                Vector2 endPos = new Vector2(GameMain.GraphicsWidth, defaultPos.Y);
+                Vector2 initialPos, defaultPos, endPos;
+                if (type == Type.InGame)
+                {
+                    initialPos = new Vector2(0.0f, GameMain.GraphicsHeight);
+                    defaultPos = new Vector2(0.0f, HUDLayoutSettings.InventoryAreaLower.Y - InnerFrame.Rect.Height - 20 * GUI.Scale);
+                    endPos = new Vector2(GameMain.GraphicsWidth, defaultPos.Y);
+                }
+                else
+                {
+                    initialPos = new Vector2(GUI.IntScale(64), -InnerFrame.Rect.Height);
+                    defaultPos = new Vector2(initialPos.X, HUDLayoutSettings.MessageAreaTop.Height + GUI.IntScale(64));
+                    endPos = new Vector2(-InnerFrame.Rect.Width, defaultPos.Y);
+                }

                if (!closing)
                {
@@ -428,7 +618,7 @@ namespace Barotrauma

        public void Close()
        {
-            if (type == Type.InGame)
+            if (type == Type.InGame || type == Type.Hint)
            {
                closing = true;
            }
@@ -35,6 +35,7 @@ namespace Barotrauma
        public readonly Sprite[] CursorSprite = new Sprite[7];

        public UISprite RadiationSprite { get; private set; }
+        public SpriteSheet RadiationAnimSpriteSheet { get; private set; }

        public UISprite UIGlow { get; private set; }
        public UISprite UIGlowCircular { get; private set; }
@@ -214,6 +215,9 @@ namespace Barotrauma
                    case "radiation":
                        RadiationSprite = new UISprite(subElement);
                        break;
+                    case "radiationanimspritesheet":
+                        RadiationAnimSpriteSheet = new SpriteSheet(subElement);
+                        break;
                    case "uiglowcircular":
                        UIGlowCircular = new UISprite(subElement);
                        break;
@@ -279,7 +279,8 @@ namespace Barotrauma
        /// If the rectT height is set 0, the height is calculated from the text.
        /// </summary>
        public GUITextBlock(RectTransform rectT, string text, Color? textColor = null, ScalableFont font = null, 
-            Alignment textAlignment = Alignment.Left, bool wrap = false, string style = "", Color? color = null, bool playerInput = false) 
+            Alignment textAlignment = Alignment.Left, bool wrap = false, string style = "", Color? color = null,
+            bool playerInput = false, bool parseRichText = false) 
            : base(style, rectT)
        {
            if (color.HasValue)
@@ -289,7 +290,13 @@ namespace Barotrauma
            if (textColor.HasValue)
            {
                OverrideTextColor(textColor.Value);
-            }            
+            }
+
+            if (parseRichText)
+            {
+                richTextData = RichTextData.GetRichTextData(text, out text);
+                hasColorHighlight = richTextData != null;
+            }

            //if the text is in chinese/korean/japanese and we're not using a CJK-compatible font,
            //use the default CJK font as a fallback
@@ -70,6 +70,14 @@ namespace Barotrauma
        }

        private string selectedTip;
+        private List<RichTextData> selectedTipRichTextData;
+        private bool selectedTipRichTextUnparsed;
+        private void SetSelectedTip(string tip)
+        {
+            selectedTip = tip;
+            selectedTipRichTextData = null;
+            selectedTipRichTextUnparsed = true;
+        }

        private readonly object loadMutex = new object();
        private float? loadState;
@@ -115,7 +123,7 @@ namespace Barotrauma
            overlay = TextureLoader.FromFile("Content/UI/LoadingScreenOverlay.png");
            noiseSprite = new Sprite("Content/UI/noise.png", Vector2.Zero);
            DrawLoadingText = true;
-            selectedTip = TextManager.Get("LoadingScreenTip", true);
+            SetSelectedTip(TextManager.Get("LoadingScreenTip", true));
        }

        public void Draw(SpriteBatch spriteBatch, GraphicsDevice graphics, float deltaTime)
@@ -215,14 +223,34 @@ namespace Barotrauma

                if (GUI.Font != null && selectedTip != null)
                {
+                    if (selectedTipRichTextUnparsed)
+                    {
+                        selectedTipRichTextData = RichTextData.GetRichTextData(selectedTip, out selectedTip);
+                        selectedTipRichTextUnparsed = false;
+                    }
+
                    string wrappedTip = ToolBox.WrapText(selectedTip, GameMain.GraphicsWidth * 0.5f, GUI.Font);
                    string[] lines = wrappedTip.Split('\n');
                    float lineHeight = GUI.Font.MeasureString(selectedTip).Y;

-                    for (int i = 0; i < lines.Length; i++)
+                    if (selectedTipRichTextData != null)
                    {
-                        GUI.Font.DrawString(spriteBatch, lines[i],
-                            new Vector2((int)(GameMain.GraphicsWidth / 2.0f - GUI.Font.MeasureString(lines[i]).X / 2.0f), (int)(GameMain.GraphicsHeight * 0.8f + i * lineHeight)), Color.White);
+                        int rtdOffset = 0;
+                        for (int i = 0; i < lines.Length; i++)
+                        {
+                            GUI.Font.DrawStringWithColors(spriteBatch, lines[i],
+                                new Vector2((int)(GameMain.GraphicsWidth / 2.0f - GUI.Font.MeasureString(lines[i]).X / 2.0f), (int)(GameMain.GraphicsHeight * 0.8f + i * lineHeight)), Color.White,
+                                0f, Vector2.Zero, 1f, SpriteEffects.None, 0f, selectedTipRichTextData, rtdOffset);
+                            rtdOffset += lines[i].Length;
+                        }
+                    }
+                    else
+                    {
+                        for (int i = 0; i < lines.Length; i++)
+                        {
+                            GUI.Font.DrawString(spriteBatch, lines[i],
+                                new Vector2((int)(GameMain.GraphicsWidth / 2.0f - GUI.Font.MeasureString(lines[i]).X / 2.0f), (int)(GameMain.GraphicsHeight * 0.8f + i * lineHeight)), Color.White);
+                        }
                    }
                }

@@ -302,7 +330,7 @@ namespace Barotrauma
                {
                    GameMain.Config.Language = language;
                    //reload tip in the selected language
-                    selectedTip = TextManager.Get("LoadingScreenTip", true);
+                    SetSelectedTip(TextManager.Get("LoadingScreenTip", true));
                    GameMain.Config.SetDefaultBindings(legacy: false);
                    GameMain.Config.CheckBindings(useDefaults: true);
                    WaitForLanguageSelection = false;
@@ -364,7 +392,7 @@ namespace Barotrauma
        {
            drawn = false;
            LoadState = null;
-            selectedTip = TextManager.Get("LoadingScreenTip", true);
+            SetSelectedTip(TextManager.Get("LoadingScreenTip", true));
            currentBackgroundTexture = LocationType.List.GetRandom()?.GetPortrait(Rand.Int(int.MaxValue))?.Texture;
            
            while (!drawn)
@@ -1284,7 +1284,8 @@ namespace Barotrauma
            // Add items on the sub(s)
            Submarine.MainSub?.GetItems(true)
                .Where(i => i.Components.All(c => !(c is Holdable h) || !h.Attachable || !h.Attached) &&
-                            i.Components.All(c => !(c is Wire w) || w.Connections.All(c => c == null)))
+                            i.Components.All(c => !(c is Wire w) || w.Connections.All(c => c == null)) &&
+                            ItemAndAllContainersInteractable(i))
                .ForEach(i => AddToOwnedItems(i.Prefab));

            // Add items in character inventories
@@ -1302,6 +1303,16 @@ namespace Barotrauma

            ownedItemsUpdateTimer = 0.0f;

+            static bool ItemAndAllContainersInteractable(Item item)
+            {
+                do
+                {
+                    if (!item.IsPlayerTeamInteractable) { return false; }
+                    item = item.Container;
+                } while (item != null);
+                return true;
+            }
+
            void AddToOwnedItems(ItemPrefab itemPrefab, int amount = 1)
            {
                if (OwnedItems.ContainsKey(itemPrefab))
@@ -882,10 +882,15 @@ 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) { RelativeOffset = new Vector2(0.225f, 0f) }, false, childAnchor: Anchor.TopLeft);

-                    string missionNameString = ToolBox.WrapText(mission.Name, missionTextGroup.Rect.Width, GUI.LargeFont);
-                    string missionDescriptionString = ToolBox.WrapText(mission.Description, missionTextGroup.Rect.Width, GUI.Font);
                    string rewardText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", mission.Reward));
-                    string missionRewardString = ToolBox.WrapText(TextManager.GetWithVariable("MissionReward", "[reward]", rewardText), missionTextGroup.Rect.Width, GUI.Font);
+
+                    var missionNameRichTextData = RichTextData.GetRichTextData(mission.Name, out string missionNameString);
+                    var missionDescriptionRichTextData = RichTextData.GetRichTextData(mission.Description, out string missionDescriptionString);
+                    var missionRewardRichTextData = RichTextData.GetRichTextData(TextManager.GetWithVariable("MissionReward", "[reward]", rewardText), out string missionRewardString);
+
+                    missionNameString = ToolBox.WrapText(missionNameString, missionTextGroup.Rect.Width, GUI.LargeFont);
+                    missionDescriptionString = ToolBox.WrapText(missionDescriptionString, missionTextGroup.Rect.Width, GUI.Font);
+                    missionRewardString = ToolBox.WrapText(missionRewardString, missionTextGroup.Rect.Width, GUI.Font);

                    Vector2 missionNameSize = GUI.LargeFont.MeasureString(missionNameString);
                    Vector2 missionDescriptionSize = GUI.Font.MeasureString(missionDescriptionString);
@@ -901,12 +906,12 @@ namespace Barotrauma
                        int iconHeight = Math.Max(missionTextGroup.RectTransform.NonScaledSize.Y, (int)(iconWidth * iconAspectRatio));
                        Point iconSize = new Point(iconWidth, iconHeight);

-                        new GUIImage(new RectTransform(iconSize, missionDescriptionHolder.RectTransform), mission.Prefab.Icon, null, true) { Color = mission.Prefab.IconColor, HoverColor = mission.Prefab.IconColor };
+                        new GUIImage(new RectTransform(iconSize, missionDescriptionHolder.RectTransform), mission.Prefab.Icon, null, true) { Color = mission.Prefab.IconColor };
                    }
-                    new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextGroup.RectTransform), missionNameString, font: GUI.LargeFont);
-                    new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextGroup.RectTransform), missionRewardString);
-                    new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextGroup.RectTransform), missionDescriptionString);
-                }                
+                    new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextGroup.RectTransform), missionNameRichTextData, missionNameString, font: GUI.LargeFont);
+                    new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextGroup.RectTransform), missionRewardRichTextData, missionRewardString);
+                    new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextGroup.RectTransform), missionDescriptionRichTextData, missionDescriptionString);
+                }
            }
            else
            {