Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs

@@ -915,6 +915,10 @@ namespace Barotrauma
             {
                 openAccordion.AddToGUIUpdateList(order: 1);
             }
+            if (PlayerInput.PrimaryMouseButtonDown())
+            {
+                GUIComponent.OpenAccordionPopups.Clear();
+            }
 
             SocialOverlay.Instance?.AddToGuiUpdateList();
 
@@ -2647,6 +2651,8 @@ namespace Barotrauma
                 if (color.HasValue)
                 {
                     button.Color = color.Value;
+                    button.HoverColor = Color.Lerp(color.Value, Color.White, 0.5f);
+                    button.PressedColor = Color.Lerp(color.Value, Color.Black, 0.5f);
                 }
             }
 

Barotrauma/BarotraumaClient/ClientSource/GUI/TabMenu.cs

@@ -1701,7 +1701,7 @@ namespace Barotrauma
             if (hasPortrait)
             {
                 float portraitAspectRatio = portrait.SourceRect.Width / portrait.SourceRect.Height;
-                GUIImage portraitImage = new GUIImage(new RectTransform(new Vector2(0.5f, 1f), locationInfoContainer.RectTransform, Anchor.CenterRight), portrait, scaleToFit: true)
+                GUIImage portraitImage = new GUIImage(new RectTransform(new Vector2(0.45f, 1f), locationInfoContainer.RectTransform, Anchor.CenterRight), portrait, scaleToFit: GUIImage.ScalingMode.ScaleToFitLargestExtent)
                 {
                     IgnoreLayoutGroups = true
                 };