(7ee8dbc11) v0.9.8.0

Barotrauma/BarotraumaClient/ClientSource/Characters/AI/AITarget.cs

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         public void Draw(SpriteBatch spriteBatch)
         {
-            if (!ShowAITargets) return;
+            if (!ShowAITargets) { return; }
             var pos = new Vector2(WorldPosition.X, -WorldPosition.Y);
             if (soundRange > 0.0f)
             {
@@ -43,7 +43,7 @@ namespace Barotrauma
                 }
                 else
                 {
-                    color = Color.WhiteSmoke;
+                    //color = Color.WhiteSmoke;
                     // disable the indicators for structures, because they clutter the debug view
                     return;
                 }

Barotrauma/BarotraumaClient/ClientSource/Characters/AI/EnemyAIController.cs

@@ -17,7 +17,7 @@ namespace Barotrauma
             if (State == AIState.Idle && PreviousState == AIState.Attack)
             {
                 var target = _selectedAiTarget ?? _lastAiTarget;
-                if (target != null)
+                if (target != null && target.Entity != null)
                 {
                     var memory = GetTargetMemory(target);
                     Vector2 targetPos = memory.Location;

Barotrauma/BarotraumaClient/ClientSource/Characters/AI/HumanAIController.cs

@@ -16,11 +16,6 @@ namespace Barotrauma
             }*/
         }
 
-        partial void SetOrderProjSpecific(Order order, string option)
-        {
-            GameMain.GameSession.CrewManager.DisplayCharacterOrder(Character, order, option);
-        }
-
         public override void DebugDraw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)
         {
             Vector2 pos = Character.WorldPosition;
@@ -40,7 +35,7 @@ namespace Barotrauma
                 var currentOrder = ObjectiveManager.CurrentOrder;
                 if (currentOrder != null)
                 {
-                    GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 20), $"ORDER: {currentOrder.DebugTag} ({currentOrder.GetPriority().FormatZeroDecimal()})", Color.White, Color.Black);
+                    GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 20), $"ORDER: {currentOrder.DebugTag} ({currentOrder.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                 }
                 else if (ObjectiveManager.WaitTimer > 0)
                 {
@@ -51,17 +46,17 @@ namespace Barotrauma
                 {
                     if (currentOrder == null)
                     {
-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 20), $"MAIN OBJECTIVE: {currentObjective.DebugTag} ({currentObjective.GetPriority().FormatZeroDecimal()})", Color.White, Color.Black);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 20), $"MAIN OBJECTIVE: {currentObjective.DebugTag} ({currentObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                     }
-                    var subObjective = currentObjective.SubObjectives.FirstOrDefault();
+                    var subObjective = currentObjective.CurrentSubObjective;
                     if (subObjective != null)
                     {
-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 40), $"SUBOBJECTIVE: {subObjective.DebugTag} ({subObjective.GetPriority().FormatZeroDecimal()})", Color.White, Color.Black);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 40), $"SUBOBJECTIVE: {subObjective.DebugTag} ({subObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                     }
                     var activeObjective = ObjectiveManager.GetActiveObjective();
                     if (activeObjective != null)
                     {
-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 60), $"ACTIVE OBJECTIVE: {activeObjective.DebugTag} ({activeObjective.GetPriority().FormatZeroDecimal()})", Color.White, Color.Black);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 60), $"ACTIVE OBJECTIVE: {activeObjective.DebugTag} ({activeObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                     }
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs

@@ -638,8 +638,7 @@ namespace Barotrauma
         
         public void Draw(SpriteBatch spriteBatch, Camera cam)
         {
-            if (!Enabled) return;
-
+            if (!Enabled) { return; }
             AnimController.Draw(spriteBatch, cam);
         }
 
@@ -656,8 +655,6 @@ namespace Barotrauma
             if (GameMain.DebugDraw)
             {
                 AnimController.DebugDraw(spriteBatch);
-
-                if (aiTarget != null) aiTarget.Draw(spriteBatch);
             }
             
             if (GUI.DisableHUD) return;

Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterHUD.cs

@@ -92,7 +92,7 @@ namespace Barotrauma
             
             if (!character.IsUnconscious && character.Stun <= 0.0f)
             {
-                if (character.Info != null && !character.ShouldLockHud())
+                if (character.Info != null && !character.ShouldLockHud() && character.SelectedCharacter == null)
                 {
                     bool mouseOnPortrait = HUDLayoutSettings.BottomRightInfoArea.Contains(PlayerInput.MousePosition) && GUI.MouseOn == null;
                     if (mouseOnPortrait && PlayerInput.PrimaryMouseButtonClicked())

Barotrauma/BarotraumaClient/ClientSource/Characters/Health/AfflictionHusk.cs

@@ -8,26 +8,25 @@ namespace Barotrauma
 {
     partial class AfflictionHusk : Affliction
     {
-        partial void UpdateMessages(float prevStrength, Character character)
+        partial void UpdateMessages()
         {
-            if (Strength < Prefab.MaxStrength * 0.5f)
+            switch (State)
             {
-                if (prevStrength % 10.0f > 0.05f && Strength % 10.0f < 0.05f)
-                {
+                case InfectionState.Dormant:
                     GUI.AddMessage(TextManager.Get("HuskDormant"), GUI.Style.Red);
-                }
-            }
-            else if (Strength < Prefab.MaxStrength)
-            {
-                if (state == InfectionState.Dormant && Character.Controlled == character)
-                {
+                    break;
+                case InfectionState.Transition:
                     GUI.AddMessage(TextManager.Get("HuskCantSpeak"), GUI.Style.Red);
-                }
-            }
-            else if (state != InfectionState.Active && Character.Controlled == character)
-            {
-                GUI.AddMessage(TextManager.GetWithVariable("HuskActivate", "[Attack]", GameMain.Config.KeyBindText(InputType.Attack)),
-                    GUI.Style.Red);
+                    break;
+                case InfectionState.Active:
+                    if (character.Params.UseHuskAppendage)
+                    {
+                        GUI.AddMessage(TextManager.GetWithVariable("HuskActivate", "[Attack]", GameMain.Config.KeyBindText(InputType.Attack)), GUI.Style.Red);
+                    }
+                    break;
+                case InfectionState.Final:
+                default:
+                    break;
             }
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs

@@ -132,7 +132,7 @@ namespace Barotrauma
         private List<HeartratePosition> heartratePositions;
         private float currentHeartrateTime;
         private float heartbeatTimer;
-        private Texture2D heartrateFade;
+        private static Texture2D heartrateFade;
 
         private readonly HeartratePosition[] heartbeatPattern = 
         {
@@ -478,7 +478,7 @@ namespace Barotrauma
 
             cprFrame = new GUIFrame(new RectTransform(new Vector2(0.7f, 1.0f), cprLayout.RectTransform), style: "GUIFrameListBox");
 
-            heartrateFade = TextureLoader.FromFile("Content/UI/Health/HeartrateFade.png");
+            heartrateFade ??= TextureLoader.FromFile("Content/UI/Health/HeartrateFade.png");
 
             new GUICustomComponent(new RectTransform(Vector2.One * 0.95f, cprFrame.RectTransform, Anchor.Center), DrawHeartrate, UpdateHeartrate);
 
@@ -816,9 +816,7 @@ namespace Barotrauma
                 if (highlightedLimbIndex < 0 && selectedLimbIndex < 0)
                 {
                     // If no limb is selected or highlighted, select the one with the most critical afflictions.
-                    var affliction = GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None)
-                        .OrderByDescending(a => a.DamagePerSecond)
-                        .ThenByDescending(a => a.Strength).FirstOrDefault();
+                    var affliction = SortAfflictionsBySeverity(GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None)).FirstOrDefault();
                     if (affliction.DamagePerSecond > 0 || affliction.Strength > 0)
                     {
                         var limbHealth = GetMatchingLimbHealth(affliction);
@@ -1185,7 +1183,8 @@ namespace Barotrauma
             Dictionary<string, float> treatmentSuitability = new Dictionary<string, float>();
             GetSuitableTreatments(treatmentSuitability, normalize: true, randomization: randomVariance);
 
-            Affliction mostSevereAffliction = afflictions.FirstOrDefault(a => !a.Prefab.IsBuff && !afflictions.Any(a2 => !a2.Prefab.IsBuff && a2.Strength > a.Strength)) ?? afflictions.FirstOrDefault();
+            //Affliction mostSevereAffliction = afflictions.FirstOrDefault(a => !a.Prefab.IsBuff && !afflictions.Any(a2 => !a2.Prefab.IsBuff && a2.Strength > a.Strength)) ?? afflictions.FirstOrDefault();
+            Affliction mostSevereAffliction = SortAfflictionsBySeverity(afflictions).FirstOrDefault();
             GUIButton buttonToSelect = null;
 
             foreach (Affliction affliction in afflictions)
@@ -1811,8 +1810,8 @@ namespace Barotrauma
                 float iconScale = 0.25f * scale;
                 Vector2 iconPos = highlightArea.Center.ToVector2();
 
-                Affliction mostSevereAffliction = thisAfflictions.FirstOrDefault(a => !a.Prefab.IsBuff && !thisAfflictions.Any(a2 => !a2.Prefab.IsBuff && a2.Strength > a.Strength)) ?? thisAfflictions.FirstOrDefault();
-                
+                //Affliction mostSevereAffliction = thisAfflictions.FirstOrDefault(a => !a.Prefab.IsBuff && !thisAfflictions.Any(a2 => !a2.Prefab.IsBuff && a2.Strength > a.Strength)) ?? thisAfflictions.FirstOrDefault();
+                Affliction mostSevereAffliction = SortAfflictionsBySeverity(thisAfflictions).FirstOrDefault();
                 if (mostSevereAffliction != null) { DrawLimbAfflictionIcon(spriteBatch, mostSevereAffliction, iconScale, ref iconPos); }
 
                 if (thisAfflictions.Count() > 1)
@@ -1992,6 +1991,9 @@ namespace Barotrauma
                 }
             }
 
+            medUIExtra?.Remove();
+            medUIExtra = null;
+
             limbIndicatorOverlay?.Remove();
             limbIndicatorOverlay = null;
         }

Barotrauma/BarotraumaClient/ClientSource/Characters/Limb.cs

@@ -220,9 +220,18 @@ namespace Barotrauma
             }
             set
             {
-                if (HuskSprite != null && value != enableHuskSprite)
+                if (enableHuskSprite == value) { return; }
+                enableHuskSprite = value;
+                if (enableHuskSprite)
                 {
-                    if (value)
+                    if (HuskSprite == null)
+                    {
+                        LoadHuskSprite();
+                    }
+                }
+                if (HuskSprite != null)
+                {
+                    if (enableHuskSprite)
                     {
                         List<WearableSprite> otherWearablesWithHusk = new List<WearableSprite>() { HuskSprite };
                         otherWearablesWithHusk.AddRange(OtherWearables);
@@ -235,7 +244,6 @@ namespace Barotrauma
                         UpdateWearableTypesToHide();
                     }
                 }
-                enableHuskSprite = value;
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs

@@ -195,6 +195,34 @@ namespace Barotrauma
             }
         }
 
+        private static bool IsCommandPermitted(string command, GameClient client)
+        {
+            switch (command)
+            {
+                case "kick":
+                    return client.HasPermission(ClientPermissions.Kick);
+                case "ban":
+                case "banip":
+                case "banendpoint":
+                    return client.HasPermission(ClientPermissions.Ban);
+                case "unban":
+                case "unbanip":
+                    return client.HasPermission(ClientPermissions.Unban);
+                case "netstats":
+                case "help":
+                case "dumpids":
+                case "admin":
+                case "entitylist":
+                case "togglehud":
+                case "toggleupperhud":
+                case "togglecharacternames":
+                case "fpscounter":
+                    return true;
+                default:
+                    return client.HasConsoleCommandPermission(command);
+            }
+        }
+
         public static void DequeueMessages()
         {
             while (queuedMessages.Count > 0)
@@ -367,6 +395,7 @@ namespace Barotrauma
                 NewMessage("Steam achievements have been disabled during this play session.", Color.Red);
 #endif
             }));
+            AssignRelayToServer("enablecheats", true);
 
             commands.Add(new Command("mainmenu|menu", "mainmenu/menu: Go to the main menu.", (string[] args) =>
             {
@@ -2113,6 +2142,11 @@ namespace Barotrauma
 
             commands.Add(new Command("flipx", "flipx: mirror the main submarine horizontally", (string[] args) =>
             {
+                if (GameMain.NetworkMember != null)
+                {
+                    ThrowError("Cannot use the flipx command while playing online.");
+                    return;
+                }
                 Submarine.MainSub?.FlipX();
             }, isCheat: true));
 

Barotrauma/BarotraumaClient/ClientSource/GUI/ChatBox.cs

@@ -135,31 +135,33 @@ namespace Barotrauma
                 }
             }
 
+            Color textColor = textBox.Color;
             switch (command)
             {
                 case "r":
                 case "radio":
-                    textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Radio];
+                    textColor = ChatMessage.MessageColor[(int)ChatMessageType.Radio];
                     break;
                 case "d":
                 case "dead":
-                    textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead];
+                    textColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead];
                     break;
                 default:
                     if (Character.Controlled != null && (Character.Controlled.IsDead || Character.Controlled.SpeechImpediment >= 100.0f))
                     {
-                        textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead];
+                        textColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead];
                     }
                     else if (command != "") //PMing
                     {
-                        textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Private];
+                        textColor = ChatMessage.MessageColor[(int)ChatMessageType.Private];
                     }
                     else
                     {
-                        textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Default];
+                        textColor = ChatMessage.MessageColor[(int)ChatMessageType.Default];
                     }
                     break;
             }
+            textBox.TextColor = textBox.TextBlock.SelectedTextColor = textColor;
 
             return true;
         }
@@ -252,21 +254,29 @@ namespace Barotrauma
                     Visible = false,
                     CanBeFocused = false
                 };
-                var senderText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), popupMsg.RectTransform, Anchor.TopRight),
-                    senderName, textColor: senderColor, font: GUI.SmallFont, textAlignment: Alignment.TopRight)
+                var content = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.9f), popupMsg.RectTransform, Anchor.Center));
+                Vector2 senderTextSize = Vector2.Zero;
+                if (!string.IsNullOrEmpty(senderName))
+                {
+                    var senderText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform),
+                        senderName, textColor: senderColor, style: null, font: GUI.SmallFont)
+                    {
+                        CanBeFocused = false
+                    };
+                    senderTextSize = senderText.Font.MeasureString(senderText.WrappedText);
+                    senderText.RectTransform.MinSize = new Point(0, senderText.Rect.Height);
+                }
+                var msgPopupText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform),
+                    displayedText, textColor: message.Color, font: GUI.SmallFont, textAlignment: Alignment.BottomLeft, style: null, wrap: true)
                 {
                     CanBeFocused = false
                 };
-                var msgPopupText = new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.0f), popupMsg.RectTransform, Anchor.TopRight)
-                    { AbsoluteOffset = new Point(0, senderText.Rect.Height) },
-                    displayedText, textColor: message.Color, font: GUI.SmallFont, textAlignment: Alignment.TopRight, style: null, wrap: true)
-                {
-                    CanBeFocused = false
-                };
-                int textWidth = (int)Math.Max(
-                    msgPopupText.Font.MeasureString(msgPopupText.WrappedText).X,
-                    senderText.Font.MeasureString(senderText.WrappedText).X);
-                popupMsg.RectTransform.Resize(new Point(textWidth + 20, msgPopupText.Rect.Bottom - senderText.Rect.Y), resizeChildren: false);
+                msgPopupText.RectTransform.MinSize = new Point(0, msgPopupText.Rect.Height);
+                Vector2 msgSize = msgPopupText.Font.MeasureString(msgPopupText.WrappedText);
+                int textWidth = (int)Math.Max(msgSize.X + msgPopupText.Padding.X + msgPopupText.Padding.Z, senderTextSize.X) + 10;
+                popupMsg.RectTransform.Resize(new Point((int)(textWidth / content.RectTransform.RelativeSize.X) , (int)((senderTextSize.Y + msgSize.Y) / content.RectTransform.RelativeSize.Y)), resizeChildren: true);
+                popupMsg.RectTransform.IsFixedSize = true;
+                content.Recalculate();
                 popupMessages.Enqueue(popupMsg);
             }
 

Barotrauma/BarotraumaClient/ClientSource/GUI/ComponentStyle.cs

@@ -5,16 +5,6 @@ using System.Xml.Linq;
 
 namespace Barotrauma
 {
-    public enum TransitionMode
-    {
-        Linear,
-        Smooth,
-        Smoother,
-        EaseIn,
-        EaseOut,
-        Exponential
-    }
-
     public enum SpriteFallBackState
     {
         None, 

Barotrauma/BarotraumaClient/ClientSource/GUI/GUIComponent.cs

@@ -524,23 +524,9 @@ namespace Barotrauma
             };
         }
 
-        private float GetEasing(TransitionMode easing, float t)
-        {
-            return easing switch
-            {
-                TransitionMode.Smooth => MathUtils.SmoothStep(t),
-                TransitionMode.Smoother => MathUtils.SmootherStep(t),
-                TransitionMode.EaseIn => MathUtils.EaseIn(t),
-                TransitionMode.EaseOut => MathUtils.EaseOut(t),
-                TransitionMode.Exponential => t * t,
-                TransitionMode.Linear => t,
-                _ => t,
-            };
-        }
-
         protected Color GetBlendedColor(Color targetColor, ref Color blendedColor)
         {
-            blendedColor = ColorCrossFadeTime > 0 ? Color.Lerp(blendedColor, targetColor, MathUtils.InverseLerp(ColorCrossFadeTime, 0, GetEasing(ColorTransition, colorFadeTimer))) : targetColor;
+            blendedColor = ColorCrossFadeTime > 0 ? Color.Lerp(blendedColor, targetColor, MathUtils.InverseLerp(ColorCrossFadeTime, 0, ToolBox.GetEasing(ColorTransition, colorFadeTimer))) : targetColor;
             return blendedColor;
         }
 
@@ -598,7 +584,7 @@ namespace Barotrauma
                         foreach (UISprite uiSprite in previousSprites)
                         {
                             float alphaMultiplier = SpriteCrossFadeTime > 0 && (uiSprite.CrossFadeOut || currentSprites != null && currentSprites.Any(s => s.CrossFadeIn))
-                                ? MathUtils.InverseLerp(0, SpriteCrossFadeTime, GetEasing(uiSprite.TransitionMode, spriteFadeTimer)) : 0;
+                                ? MathUtils.InverseLerp(0, SpriteCrossFadeTime, ToolBox.GetEasing(uiSprite.TransitionMode, spriteFadeTimer)) : 0;
                             if (alphaMultiplier > 0)
                             {
                                 uiSprite.Draw(spriteBatch, rect, previousColor * alphaMultiplier, SpriteEffects);
@@ -612,7 +598,7 @@ namespace Barotrauma
                     foreach (UISprite uiSprite in currentSprites)
                     {
                         float alphaMultiplier = SpriteCrossFadeTime > 0 && (uiSprite.CrossFadeIn || previousSprites != null && previousSprites.Any(s => s.CrossFadeOut))
-                            ? MathUtils.InverseLerp(SpriteCrossFadeTime, 0, GetEasing(uiSprite.TransitionMode, spriteFadeTimer)) : (_currentColor.A / 255.0f);
+                            ? MathUtils.InverseLerp(SpriteCrossFadeTime, 0, ToolBox.GetEasing(uiSprite.TransitionMode, spriteFadeTimer)) : (_currentColor.A / 255.0f);
                         if (alphaMultiplier > 0)
                         {
                             uiSprite.Draw(spriteBatch, rect, _currentColor * alphaMultiplier, SpriteEffects);

Barotrauma/BarotraumaClient/ClientSource/GUI/GUIDropDown.cs

@@ -95,6 +95,15 @@ namespace Barotrauma
             set { button.TextColor = value; }
         }
 
+        public override ScalableFont Font 
+        {
+            get { return button?.Font ?? base.Font; }
+            set 
+            {
+                if (button != null) { button.Font = value;  }               
+            }
+        }
+
         public void ReceiveTextInput(char inputChar)
         {
             GUI.KeyboardDispatcher.Subscriber = null;
@@ -168,12 +177,11 @@ namespace Barotrauma
             Anchor listAnchor = dropAbove ? Anchor.TopCenter : Anchor.BottomCenter;
             Pivot listPivot = dropAbove ? Pivot.BottomCenter : Pivot.TopCenter;
             listBox = new GUIListBox(new RectTransform(new Point(Rect.Width, Rect.Height * MathHelper.Clamp(elementCount, 2, 10)), rectT, listAnchor, listPivot)
-
             { IsFixedSize = false }, style: null)
             {
-                Enabled = !selectMultiple,
-                OnSelected = SelectItem
+                Enabled = !selectMultiple
             };
+            if (!selectMultiple) { listBox.OnSelected = SelectItem; }           
             GUI.Style.Apply(listBox, "GUIListBox", this);
             GUI.Style.Apply(listBox.ContentBackground, "GUIListBox", this);
 
@@ -245,7 +253,7 @@ namespace Barotrauma
                     ToolTip = toolTip
                 };
 
-                new GUITickBox(new RectTransform(new Point((int)(button.Rect.Height * 0.8f)), frame.RectTransform, anchor: Anchor.CenterLeft), text)
+                new GUITickBox(new RectTransform(new Vector2(1.0f, 0.8f), frame.RectTransform, anchor: Anchor.CenterLeft) { MaxSize = new Point(int.MaxValue, (int)(button.Rect.Height * 0.8f)) }, text)
                 {
                     UserData = userData,
                     ToolTip = toolTip,

Barotrauma/BarotraumaClient/ClientSource/GUI/GUITextBlock.cs

@@ -328,11 +328,7 @@ namespace Barotrauma
         {
             if (text == null) { return; }
 
-            censoredText = "";
-            for (int i = 0; i < text.Length; i++)
-            {
-                censoredText += "\u2022";
-            }
+            censoredText = string.IsNullOrEmpty(text) ? "" : new string('\u2022', text.Length);
 
             var rect = Rect;
 
@@ -446,9 +442,10 @@ namespace Barotrauma
             Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
             if (overflowClipActive)
             {
-                spriteBatch.End();
                 Rectangle scissorRect = new Rectangle(rect.X + (int)padding.X, rect.Y, rect.Width - (int)padding.X - (int)padding.Z, rect.Height);
-                spriteBatch.GraphicsDevice.ScissorRectangle = scissorRect;
+                if (!scissorRect.Intersects(prevScissorRect)) { return; }
+                spriteBatch.End();
+                spriteBatch.GraphicsDevice.ScissorRectangle = Rectangle.Intersect(prevScissorRect, scissorRect);
                 spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
             }
 

Barotrauma/BarotraumaClient/ClientSource/GameMain.cs

@@ -189,6 +189,11 @@ namespace Barotrauma
 
             Instance = this;
 
+            if (!Directory.Exists(Content.RootDirectory))
+            {
+                throw new Exception("Content folder not found. If you are trying to compile the game from the source code and own a legal copy of the game, you can copy the Content folder from the game's files to BarotraumaShared/Content.");
+            }
+
             Config = new GameSettings();
 
             Md5Hash.LoadCache();
@@ -421,17 +426,27 @@ namespace Barotrauma
             GUI.Init(Window, Config.SelectedContentPackages, GraphicsDevice);
             DebugConsole.Init();
 
-            CrossThread.RequestExecutionOnMainThread(() =>
+            if (Config.AutoUpdateWorkshopItems)
             {
-                if (Config.AutoUpdateWorkshopItems)
+                bool waitingForWorkshopUpdates = true;
+                bool result = false;
+                TaskPool.Add(SteamManager.AutoUpdateWorkshopItems(), (task) =>
                 {
-                    if (SteamManager.AutoUpdateWorkshopItems())
+                    result = task.Result;
+                    waitingForWorkshopUpdates = false;
+                });
+
+                while (waitingForWorkshopUpdates) { yield return CoroutineStatus.Running; }
+
+                if (result)
+                {
+                    CrossThread.RequestExecutionOnMainThread(() =>
                     {
                         ContentPackage.LoadAll();
                         Config.ReloadContentPackages();
-                    }
+                    });
                 }
-            });
+            }
             
 
             if (SelectedPackages.None())

Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs

@@ -330,17 +330,6 @@ namespace Barotrauma
             }
 
             AddCharacterToCrewList(character);
-
-            if (character is AICharacter)
-            {
-                var ai = character.AIController as HumanAIController;
-                if (ai == null)
-                {
-                    DebugConsole.ThrowError("Error in crewmanager - attempted to give orders to a character with no HumanAIController");
-                    return;
-                }
-                character.SetOrder(ai.CurrentOrder, "", null, false);
-            }
         }
 
         public void AddCharacterInfo(CharacterInfo characterInfo)
@@ -788,11 +777,11 @@ namespace Barotrauma
             characterFrame.SetAsFirstChild();
         }
 
-        private void DisplayPreviousCharacterOrder(Character character, GUILayoutGroup characterComponent, OrderInfo currentOrderInfo)
+        private void DisplayPreviousCharacterOrder(Character character, GUILayoutGroup characterComponent, OrderInfo orderInfo)
         {
-            if (currentOrderInfo.Order == null || currentOrderInfo.Order.Identifier == dismissedOrderPrefab.Identifier) { return; }
+            if (orderInfo.Order == null || orderInfo.Order.Identifier == dismissedOrderPrefab.Identifier) { return; }
 
-            var previousOrderInfo = new OrderInfo(currentOrderInfo);
+            var previousOrderInfo = new OrderInfo(orderInfo);
             var prevOrderFrame = new GUIButton(
                 new RectTransform(
                     characterComponent.GetChildByUserData("job").RectTransform.RelativeSize,
@@ -835,12 +824,12 @@ namespace Barotrauma
 
         private GUIComponent GetCurrentOrderComponent(GUILayoutGroup characterComponent)
         {
-            return characterComponent.FindChild(c => c.UserData is OrderInfo orderInfo && orderInfo.ComponentIdentifier == "currentorder");
+            return characterComponent?.FindChild(c => c?.UserData is OrderInfo orderInfo && orderInfo.ComponentIdentifier == "currentorder");
         }
 
         private GUIComponent GetPreviousOrderComponent(GUILayoutGroup characterComponent)
         {
-            return characterComponent.FindChild(c => c.UserData is OrderInfo orderInfo && orderInfo.ComponentIdentifier == "previousorder");
+            return characterComponent?.FindChild(c => c?.UserData is OrderInfo orderInfo && orderInfo.ComponentIdentifier == "previousorder");
         }
 
         private struct OrderInfo
@@ -910,7 +899,18 @@ namespace Barotrauma
                 {
                     if (!(c.UserData is Character character) || character.IsDead || character.Removed) { continue; }
                     AddCharacter(character);
-                    DisplayCharacterOrder(character, character.CurrentOrder, (character.AIController as HumanAIController)?.CurrentOrderOption);
+                    if (c.GetChild<GUILayoutGroup>() is GUILayoutGroup oldLayoutGroup)
+                    {
+                        if (GetCurrentOrderComponent(oldLayoutGroup)?.UserData is OrderInfo currInfo)
+                        {
+                            DisplayCharacterOrder(character, currInfo.Order, currInfo.OrderOption);
+                        }
+                        if (GetPreviousOrderComponent(oldLayoutGroup)?.UserData is OrderInfo prevInfo &&
+                            crewList.Content.Children.FirstOrDefault(c => c?.UserData == character)?.GetChild<GUILayoutGroup>() is GUILayoutGroup newLayoutGroup)
+                        {
+                            DisplayPreviousCharacterOrder(character, newLayoutGroup, prevInfo);
+                        }
+                    }
                 }
             }
 
@@ -944,6 +944,7 @@ namespace Barotrauma
             {
                 Character.Controlled.AIController.ObjectiveManager.WaitTimer = CharacterWaitOnSwitch;
             }
+            DisableCommandUI();
             Character.Controlled = character;
         }
 
@@ -1176,19 +1177,22 @@ namespace Barotrauma
 
                     if (PlayerInput.KeyHit(InputType.RadioChat) && !ChatBox.InputBox.Selected)
                     {
-                        ChatBox.InputBox.AddToGUIUpdateList();
-                        ChatBox.GUIFrame.Flash(Color.YellowGreen, 0.5f);
-                        if (!ChatBox.ToggleOpen)
+                        if (Character.Controlled == null || Character.Controlled.SpeechImpediment < 100)
                         {
-                            ChatBox.CloseAfterMessageSent = !ChatBox.ToggleOpen;
-                            ChatBox.ToggleOpen = true;
-                        }
+                            ChatBox.InputBox.AddToGUIUpdateList();
+                            ChatBox.GUIFrame.Flash(Color.YellowGreen, 0.5f);
+                            if (!ChatBox.ToggleOpen)
+                            {
+                                ChatBox.CloseAfterMessageSent = !ChatBox.ToggleOpen;
+                                ChatBox.ToggleOpen = true;
+                            }
 
-                        if (!ChatBox.InputBox.Text.StartsWith(ChatBox.RadioChatString))
-                        {
-                            ChatBox.InputBox.Text = ChatBox.RadioChatString;
+                            if (!ChatBox.InputBox.Text.StartsWith(ChatBox.RadioChatString))
+                            {
+                                ChatBox.InputBox.Text = ChatBox.RadioChatString;
+                            }
+                            ChatBox.InputBox.Select(ChatBox.InputBox.Text.Length);
                         }
-                        ChatBox.InputBox.Select(ChatBox.InputBox.Text.Length);
                     }
                 }
             }
@@ -1293,13 +1297,21 @@ namespace Barotrauma
         {
             get
             {
+#if DEBUG
+                return Character.Controlled == null || Character.Controlled.Info != null && Character.Controlled.SpeechImpediment < 100.0f;
+#else
                 return Character.Controlled != null && Character.Controlled.SpeechImpediment < 100.0f;
+#endif
             }
         }
 
         private bool CanSomeoneHearCharacter()
         {
+#if DEBUG
+            return true;
+#else
             return Character.Controlled != null && characters.Any(c => c != Character.Controlled && c.CanHearCharacter(Character.Controlled));
+#endif
         }
 
         private void CreateCommandUI(Character characterContext = null)
@@ -1505,17 +1517,7 @@ namespace Barotrauma
                 shortcutCenterNode = null;
             }
             CreateNodes(userData);
-            if (returnNode != null && returnNode.Visible)
-            {
-                var hotkey = optionNodes.Count + 1;
-                if (expandNode != null && expandNode.Visible) { hotkey += 1; }
-                CreateHotkeyIcon(returnNode.RectTransform, hotkey % 10, true);
-                returnNodeHotkey = Keys.D0 + hotkey % 10;
-            }
-            else
-            {
-                returnNodeHotkey = Keys.None;
-            }
+            CreateReturnNodeHotkey();
             return true;
         }
 
@@ -1539,10 +1541,20 @@ namespace Barotrauma
                 returnNode = null;
             }
             CreateNodes(userData);
+            CreateReturnNodeHotkey();
+            return true;
+        }
+
+        private void CreateReturnNodeHotkey()
+        {
             if (returnNode != null && returnNode.Visible)
             {
-                var hotkey = optionNodes.Count + 1;
-                if (expandNode != null && expandNode.Visible) { hotkey += 1; }
+                var hotkey = 1;
+                if (targetFrame == null || !targetFrame.Visible)
+                {
+                    hotkey = optionNodes.Count + 1;
+                    if (expandNode != null && expandNode.Visible) { hotkey += 1; }
+                }
                 CreateHotkeyIcon(returnNode.RectTransform, hotkey % 10, true);
                 returnNodeHotkey = Keys.D0 + hotkey % 10;
             }
@@ -1550,7 +1562,6 @@ namespace Barotrauma
             {
                 returnNodeHotkey = Keys.None;
             }
-            return true;
         }
 
         private void SetCenterNode(GUIButton node)
@@ -2148,7 +2159,11 @@ namespace Barotrauma
                 ToolTip = character.Info.DisplayName + " (" + character.Info.Job.Name + ")"
             };
 
+#if DEBUG
+            bool canHear = true;
+#else
             bool canHear = character.CanHearCharacter(Character.Controlled);
+#endif
             if (!canHear)
             {
                 node.CanBeFocused = icon.CanBeFocused = false;
@@ -2271,8 +2286,14 @@ namespace Barotrauma
 
         private Character GetBestCharacterForOrder(Order order)
         {
+#if !DEBUG
             if (Character.Controlled == null) { return null; }
-            return characters.FindAll(c => c != Character.Controlled && c.TeamID == Character.Controlled.TeamID)
+#endif
+            if (order.Category == OrderCategory.Operate && AIObjectiveOperateItem.IsOperatedByAnother(null, order.TargetItemComponent, out Character operatingCharacter))
+            {
+                return operatingCharacter;
+            }
+            return characters.FindAll(c => Character.Controlled == null || (c != Character.Controlled && c.TeamID == Character.Controlled.TeamID))
                 .OrderByDescending(c => c.CurrentOrder == null || c.CurrentOrder.Identifier == dismissedOrderPrefab.Identifier)
                 .ThenByDescending(c => order.HasAppropriateJob(c))
                 .ThenBy(c => c.CurrentOrder?.Weight)
@@ -2281,16 +2302,18 @@ namespace Barotrauma
 
         private List<Character> GetCharactersSortedForOrder(Order order)
         {
+#if !DEBUG
             if (Character.Controlled == null) { return new List<Character>(); }
+#endif
             if (order.Identifier == "follow")
             {
-                return characters.FindAll(c => c != Character.Controlled && c.TeamID == Character.Controlled.TeamID)
+                return characters.FindAll(c => Character.Controlled == null || (c != Character.Controlled && c.TeamID == Character.Controlled.TeamID))
                     .OrderByDescending(c => c.CurrentOrder == null || c.CurrentOrder.Identifier == dismissedOrderPrefab.Identifier)
                     .ToList();
             }
             else
             {
-                return characters.FindAll(c => c.TeamID == Character.Controlled.TeamID)
+                return characters.FindAll(c => Character.Controlled == null || c.TeamID == Character.Controlled.TeamID)
                     .OrderByDescending(c => c.CurrentOrder == null || c.CurrentOrder.Identifier == dismissedOrderPrefab.Identifier)
                     .ThenByDescending(c => order.HasAppropriateJob(c))
                     .ThenBy(c => c.CurrentOrder?.Weight)
@@ -2298,9 +2321,9 @@ namespace Barotrauma
             }
         }
 
-        #endregion
+#endregion
 
-        #endregion
+#endregion
 
         /// <summary>
         /// Creates a listbox that includes all the characters in the crew, can be used externally (round info menus etc)
@@ -2387,7 +2410,7 @@ namespace Barotrauma
             return true;
         }
 
-        #region Reports
+#region Reports
 
         /// <summary>
         /// Enables/disables report buttons when needed
@@ -2447,7 +2470,7 @@ namespace Barotrauma
             }
         }
 
-        #endregion
+#endregion
 
         public void InitSinglePlayerRound()
         {

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/SinglePlayerCampaign.cs

@@ -91,7 +91,7 @@ namespace Barotrauma
                 if (Character.Controlled.Submarine != outpost) { return null; }
                 
                 //if there's a sub docked to the outpost, we can leave the level
-                if (outpost.DockedTo.Count > 0)
+                if (outpost.DockedTo.Any())
                 {
                     var dockedSub = outpost.DockedTo.FirstOrDefault();
                     return dockedSub.DockedTo.Contains(Submarine.MainSub) ? Submarine.MainSub : dockedSub;

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/CaptainTutorial.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;
 using Barotrauma.Items.Components;
 using Barotrauma.Networking;
@@ -221,7 +222,7 @@ namespace Barotrauma.Tutorials
             {
                 //captain_navConsoleCustomInterface.HighlightElement(0, uiHighlightColor, duration: 1.0f, pulsateAmount: 0.0f);
                 yield return new WaitForSeconds(1.0f, false);
-            } while (Submarine.MainSub.DockedTo.Count > 0);
+            } while (Submarine.MainSub.DockedTo.Any());
             RemoveCompletedObjective(segments[4]);
             yield return new WaitForSeconds(2f, false);
             TriggerTutorialSegment(5); // Navigate to destination
@@ -245,7 +246,7 @@ namespace Barotrauma.Tutorials
             {
                 //captain_navConsoleCustomInterface.HighlightElement(0, uiHighlightColor, duration: 1.0f, pulsateAmount: 0.0f);
                 yield return new WaitForSeconds(1.0f, false);
-            } while (!Submarine.MainSub.AtEndPosition || Submarine.MainSub.DockedTo.Count == 0);
+            } while (!Submarine.MainSub.AtEndPosition || Submarine.MainSub.DockedTo.Any());
             RemoveCompletedObjective(segments[6]);
             yield return new WaitForSeconds(3f, false);
             GameMain.GameSession?.CrewManager.AddSinglePlayerChatMessage(radioSpeakerName, TextManager.GetWithVariable("Captain.Radio.Complete", "[OUTPOSTNAME]", GameMain.GameSession.EndLocation.Name), ChatMessageType.Radio, null);

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameSession.cs

@@ -13,6 +13,7 @@ namespace Barotrauma
 
         private GUIFrame infoFrameContent;
         public RoundSummary RoundSummary { get; private set; }
+        public static bool IsInfoFrameOpen => GameMain.GameSession?.infoFrame != null;
 
         private bool ToggleInfoFrame()
         {

Barotrauma/BarotraumaClient/ClientSource/GameSettings.cs

@@ -47,7 +47,7 @@ namespace Barotrauma
         {
             keyMapping = new KeyOrMouse[Enum.GetNames(typeof(InputType)).Length];
             keyMapping[(int)InputType.Run] = new KeyOrMouse(Keys.LeftShift);
-            keyMapping[(int)InputType.Attack] = new KeyOrMouse(MouseButton.MiddleMouse);
+            keyMapping[(int)InputType.Attack] = new KeyOrMouse(Keys.R);
             keyMapping[(int)InputType.Crouch] = new KeyOrMouse(Keys.LeftControl);
             keyMapping[(int)InputType.Grab] = new KeyOrMouse(Keys.G);
             keyMapping[(int)InputType.Health] = new KeyOrMouse(Keys.H);

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

@@ -154,7 +154,7 @@ namespace Barotrauma.Items.Components
                         };
                             // === POWER WARNING === //
                             inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform),
-                                TextManager.Get("FabricatorNoPower"), textColor: GUI.Style.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow")
+                                TextManager.Get("FabricatorNoPower"), textColor: GUI.Style.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow", wrap: true)
                             {
                                 HoverColor = Color.Black,
                                 IgnoreLayoutGroups = true,
@@ -584,15 +584,20 @@ namespace Barotrauma.Items.Components
 
         public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
         {
+            FabricatorState newState = (FabricatorState)msg.ReadByte();
+            float newTimeUntilReady = msg.ReadSingle();
             int itemIndex = msg.ReadRangedInteger(-1, fabricationRecipes.Count - 1);
             UInt16 userID = msg.ReadUInt16();
             Character user = Entity.FindEntityByID(userID) as Character;
 
-            if (itemIndex == -1 || user == null)
+            State = newState;
+            timeUntilReady = newTimeUntilReady;
+
+            if (newState == FabricatorState.Stopped || itemIndex == -1 || user == null)
             {
                 CancelFabricating();
             }
-            else
+            else if (newState == FabricatorState.Active || newState == FabricatorState.Paused)
             {
                 //if already fabricating the selected item, return
                 if (fabricatedItem != null && fabricationRecipes.IndexOf(fabricatedItem) == itemIndex) { return; }

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

@@ -490,7 +490,7 @@ namespace Barotrauma.Items.Components
                 disruptedDirections.Clear();
                 foreach (AITarget t in AITarget.List)
                 {
-                    if (t.SoundRange <= 0.0f || !t.Enabled || float.IsNaN(t.SoundRange) || float.IsInfinity(t.SoundRange)) { continue; }
+                    if (t.SoundRange <= 0.0f || float.IsNaN(t.SoundRange) || float.IsInfinity(t.SoundRange)) { continue; }
                     
                     float distSqr = Vector2.DistanceSquared(t.WorldPosition, transducerCenter);
                     if (distSqr > t.SoundRange * t.SoundRange * 2) { continue; }

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

@@ -665,7 +665,7 @@ namespace Barotrauma.Items.Components
 
             if (Vector2.DistanceSquared(PlayerInput.MousePosition, steerArea.Rect.Center.ToVector2()) < steerRadius * steerRadius)
             {
-                if (PlayerInput.PrimaryMouseButtonHeld() && !CrewManager.IsCommandInterfaceOpen)
+                if (PlayerInput.PrimaryMouseButtonHeld() && !CrewManager.IsCommandInterfaceOpen && !GameSession.IsInfoFrameOpen)
                 {
                     Vector2 displaySubPos = (-sonar.DisplayOffset * sonar.Zoom) / sonar.Range * sonar.DisplayRadius * sonar.Zoom;
                     displaySubPos.Y = -displaySubPos.Y;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerContainer.cs

@@ -106,11 +106,10 @@ namespace Barotrauma.Items.Components
         {
             if (indicatorSize.X <= 1.0f || indicatorSize.Y <= 1.0f) { return; }
 
-            GUI.DrawRectangle(spriteBatch,
-                new Vector2(
-                    item.DrawPosition.X - item.Sprite.SourceRect.Width / 2 * item.Scale + indicatorPosition.X * item.Scale,
-                    -item.DrawPosition.Y - item.Sprite.SourceRect.Height / 2 * item.Scale + indicatorPosition.Y * item.Scale),
-                indicatorSize * item.Scale, Color.Black, depth: item.SpriteDepth - 0.00001f);
+            Vector2 itemSize = new Vector2(item.Sprite.SourceRect.Width, item.Sprite.SourceRect.Height) * item.Scale;
+            Vector2 indicatorPos = -itemSize / 2 + indicatorPosition * item.Scale;
+            if (item.FlippedX && item.Prefab.CanSpriteFlipX) { indicatorPos.X = -indicatorPos.X - indicatorSize.X * item.Scale; }
+            if (item.FlippedY && item.Prefab.CanSpriteFlipY) { indicatorPos.Y = -indicatorPos.Y - indicatorSize.Y * item.Scale; }
 
             if (charge > 0)
             {
@@ -118,25 +117,23 @@ namespace Barotrauma.Items.Components
                 if (!isHorizontal)
                 {
                     GUI.DrawRectangle(spriteBatch,
-                    new Vector2(
-                        item.DrawPosition.X - item.Sprite.SourceRect.Width / 2 * item.Scale + indicatorPosition.X * item.Scale + 1,
-                        -item.DrawPosition.Y - item.Sprite.SourceRect.Height / 2 * item.Scale + indicatorPosition.Y * item.Scale + 1 + ((indicatorSize.Y * item.Scale) * (1.0f - charge / capacity))),
-                    new Vector2(indicatorSize.X * item.Scale - 2, (indicatorSize.Y * item.Scale - 2) * (charge / capacity)), indicatorColor, true, 
-                    depth: item.SpriteDepth - 0.00001f);
+                        new Vector2(item.DrawPosition.X, -item.DrawPosition.Y + ((indicatorSize.Y * item.Scale) * (1.0f - charge / capacity))) + indicatorPos,
+                        new Vector2(indicatorSize.X * item.Scale, (indicatorSize.Y * item.Scale) * (charge / capacity)), indicatorColor, true,
+                        depth: item.SpriteDepth - 0.00001f);
                 }
                 else
                 {
                     GUI.DrawRectangle(spriteBatch,
-                    new Vector2(
-                        item.DrawPosition.X - item.Sprite.SourceRect.Width / 2 * item.Scale + indicatorPosition.X * item.Scale + 1 ,
-                        -item.DrawPosition.Y - item.Sprite.SourceRect.Height / 2 * item.Scale + indicatorPosition.Y * item.Scale + 1),
-                    new Vector2((indicatorSize.X * item.Scale - 2) * (charge / capacity), indicatorSize.Y * item.Scale - 2), indicatorColor, true, 
-                    depth: item.SpriteDepth - 0.00001f);
+                        new Vector2(item.DrawPosition.X, -item.DrawPosition.Y) + indicatorPos,
+                        new Vector2((indicatorSize.X * item.Scale) * (charge / capacity), indicatorSize.Y * item.Scale), indicatorColor, true, 
+                        depth: item.SpriteDepth - 0.00001f);
                 }
             }
-
+            GUI.DrawRectangle(spriteBatch,
+                new Vector2(item.DrawPosition.X, -item.DrawPosition.Y) + indicatorPos,
+                indicatorSize * item.Scale, Color.Black, depth: item.SpriteDepth - 0.00001f);
         }
-        
+
         public void ClientWrite(IWriteMessage msg, object[] extraData)
         {
             msg.WriteRangedInteger((int)(rechargeSpeed / MaxRechargeSpeed * 10), 0, 10);

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

@@ -142,7 +142,7 @@ namespace Barotrauma.Items.Components
 
         private void DrawCharacterInfo(SpriteBatch spriteBatch, Character target, float alpha = 1.0f)
         {
-            Vector2 hudPos = GameMain.GameScreen.Cam.WorldToScreen(target.WorldPosition);
+            Vector2 hudPos = GameMain.GameScreen.Cam.WorldToScreen(target.DrawPosition);
             hudPos += Vector2.UnitX * 50.0f;
 
             List<string> texts = new List<string>();

Barotrauma/BarotraumaClient/ClientSource/Items/DockingPort.cs

@@ -152,7 +152,7 @@ namespace Barotrauma.Items.Components
                     string errorMsg = "Error while reading a docking port network event (Dock method did not create a joint between the ports)." +
                         " Submarine: " + (item.Submarine?.Name ?? "null") +
                         ", target submarine: " + (DockingTarget.item.Submarine?.Name ?? "null");
-                    if (item.Submarine?.DockedTo.Contains(DockingTarget.item.Submarine) ?? false)
+                    if (item.Submarine?.ConnectedDockingPorts.ContainsKey(DockingTarget.item.Submarine) ?? false)
                     {
                         errorMsg += "\nAlready docked.";
                     }

Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs

@@ -284,6 +284,7 @@ namespace Barotrauma
         }
 
         protected static HashSet<SlotReference> highlightedSubInventorySlots = new HashSet<SlotReference>();
+        private static List<SlotReference> subInventorySlotsToDraw = new List<SlotReference>();
 
         protected static SlotReference selectedSlot;
 
@@ -1048,11 +1049,14 @@ namespace Barotrauma
             return hoverArea;
         }
 
+
         public static void DrawFront(SpriteBatch spriteBatch)
         {
-            if (GUI.PauseMenuOpen || GUI.SettingsMenuOpen) return;
+            if (GUI.PauseMenuOpen || GUI.SettingsMenuOpen) { return; }
 
-            foreach (var slot in highlightedSubInventorySlots)
+            subInventorySlotsToDraw.Clear();
+            subInventorySlotsToDraw.AddRange(highlightedSubInventorySlots);
+            foreach (var slot in subInventorySlotsToDraw)
             {
                 int slotIndex = Array.IndexOf(slot.ParentInventory.slots, slot.Slot);
                 if (slotIndex > -1 && slotIndex < slot.ParentInventory.slots.Length)

Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs

@@ -333,15 +333,6 @@ namespace Barotrauma
 
             if (GameMain.DebugDraw)
             {
-                aiTarget?.Draw(spriteBatch);
-                var containedItems = ContainedItems;
-                if (containedItems != null)
-                {
-                    foreach (Item item in containedItems)
-                    {
-                        item.AiTarget?.Draw(spriteBatch);
-                    }
-                }
                 if (body != null)
                 {
                     body.DebugDraw(spriteBatch, Color.White);

Barotrauma/BarotraumaClient/ClientSource/Map/Hull.cs

@@ -248,8 +248,6 @@ namespace Barotrauma
 
             if (!editing && !GameMain.DebugDraw) return;
 
-            if (aiTarget != null) aiTarget.Draw(spriteBatch);
-
            Rectangle drawRect =
                 Submarine == null ? rect : new Rectangle((int)(Submarine.DrawPosition.X + rect.X), (int)(Submarine.DrawPosition.Y + rect.Y), rect.Width, rect.Height);
 

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectPrefab.cs

@@ -4,6 +4,7 @@ using Barotrauma.SpriteDeformations;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
@@ -120,7 +121,7 @@ namespace Barotrauma
 
             SerializableProperty.SerializeProperties(this, element);
 
-            foreach (XElement subElement in element.Elements())
+            foreach (XElement subElement in element.Elements().ToList())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -139,7 +140,7 @@ namespace Barotrauma
                         break;
                 }
             }
-            
+
             foreach (LightSourceParams lightSourceParams in LightSourceParams)
             {
                 var lightElement = new XElement("LightSource");

Barotrauma/BarotraumaClient/ClientSource/Map/LinkedSubmarine.cs

@@ -12,10 +12,10 @@ namespace Barotrauma
     {
         public override void Draw(SpriteBatch spriteBatch, bool editing, bool back = true)
         {
-            if (!editing || wallVertices == null) return;
+            if (!editing || wallVertices == null) { return; }
 
-            Color color = (IsHighlighted) ? GUI.Style.Orange : GUI.Style.Green;
-            if (IsSelected) color = GUI.Style.Red;
+            Color color = IsHighlighted ? GUI.Style.Orange : GUI.Style.Green;
+            if (IsSelected) { color = GUI.Style.Red; }
 
             Vector2 pos = Position;
 
@@ -37,11 +37,7 @@ namespace Barotrauma
             GUI.DrawLine(spriteBatch, pos + Vector2.UnitY * 50.0f, pos - Vector2.UnitY * 50.0f, color, 0.0f, 5);
             GUI.DrawLine(spriteBatch, pos + Vector2.UnitX * 50.0f, pos - Vector2.UnitX * 50.0f, color, 0.0f, 5);
 
-            Rectangle drawRect = rect;
-            drawRect.Y = -rect.Y;
-            GUI.DrawRectangle(spriteBatch, drawRect, GUI.Style.Red, true);
-
-            if (!Item.ShowLinks) return;
+            if (!Item.ShowLinks) { return; }
 
             foreach (MapEntity e in linkedTo)
             {

Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs

@@ -350,8 +350,6 @@ namespace Barotrauma
                         }
                     }
                 }
-
-                AiTarget?.Draw(spriteBatch);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Map/Submarine.cs

@@ -222,7 +222,7 @@ namespace Barotrauma
 
                     GUI.DrawRectangle(spriteBatch, worldBorders, Color.White, false, 0, 5);
 
-                    if (sub.subBody.PositionBuffer.Count < 2) continue;
+                    if (sub.subBody == null || sub.subBody.PositionBuffer.Count < 2) continue;
 
                     Vector2 prevPos = ConvertUnits.ToDisplayUnits(sub.subBody.PositionBuffer[0].Position);
                     prevPos.Y = -prevPos.Y;

Barotrauma/BarotraumaClient/ClientSource/Networking/Client.cs

@@ -15,6 +15,7 @@ namespace Barotrauma.Networking
         public byte ID;
         public UInt16 CharacterID;
         public bool Muted;
+        public bool InGame;
         public bool AllowKicking;
     }
 

Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs

@@ -8,6 +8,7 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Barotrauma.Networking
 {
@@ -60,6 +61,19 @@ namespace Barotrauma.Networking
 
         private bool connected;
 
+        private enum RoundInitStatus
+        {
+            NotStarted,
+            Starting,
+            WaitingForStartGameFinalize,
+            Started,
+            TimedOut,
+            Error,
+            Interrupted
+        }
+
+        private RoundInitStatus roundInitStatus = RoundInitStatus.NotStarted;
+
         private byte myID;
 
         private List<Client> otherClients;
@@ -148,6 +162,8 @@ namespace Barotrauma.Networking
             this.ownerKey = ownerKey;
             this.steamP2POwner = steamP2POwner;
 
+            roundInitStatus = RoundInitStatus.NotStarted;
+
             allowReconnect = true;
 
             netStats = new NetStats();
@@ -558,6 +574,13 @@ namespace Barotrauma.Networking
 
             try
             {
+                incomingMessagesToProcess.Clear();
+                incomingMessagesToProcess.AddRange(pendingIncomingMessages);
+                foreach (var inc in incomingMessagesToProcess)
+                {
+                    ReadDataMessage(inc);
+                }
+                pendingIncomingMessages.Clear();
                 clientPeer?.Update(deltaTime);
             }
             catch (Exception e)
@@ -632,11 +655,23 @@ namespace Barotrauma.Networking
             }
         }
 
-        private CoroutineHandle startGameCoroutine;
+        private readonly List<IReadMessage> pendingIncomingMessages = new List<IReadMessage>();
+        private readonly List<IReadMessage> incomingMessagesToProcess = new List<IReadMessage>();
 
         private void ReadDataMessage(IReadMessage inc)
         {
             ServerPacketHeader header = (ServerPacketHeader)inc.ReadByte();
+
+            if (header != ServerPacketHeader.STARTGAMEFINALIZE &&
+                header != ServerPacketHeader.ENDGAME &&
+                roundInitStatus == RoundInitStatus.WaitingForStartGameFinalize)
+            {
+                //rewind the header byte we just read
+                inc.BitPosition -= 8;
+                pendingIncomingMessages.Add(inc);
+                return;
+            }
+
             switch (header)
             {
                 case ServerPacketHeader.UPDATE_LOBBY:
@@ -714,7 +749,13 @@ namespace Barotrauma.Networking
                     }
                     break;
                 case ServerPacketHeader.STARTGAME:
-                    startGameCoroutine = GameMain.Instance.ShowLoading(StartGame(inc), false);
+                    GameMain.Instance.ShowLoading(StartGame(inc), false);
+                    break;
+                case ServerPacketHeader.STARTGAMEFINALIZE:
+                    if (roundInitStatus == RoundInitStatus.WaitingForStartGameFinalize)
+                    {
+                        ReadStartGameFinalize(inc);
+                    }
                     break;
                 case ServerPacketHeader.ENDGAME:
                     string endMessage = inc.ReadString();
@@ -725,6 +766,8 @@ namespace Barotrauma.Networking
                         GameMain.GameSession.WinningTeam = winningTeam;
                         GameMain.GameSession.Mission.Completed = true;
                     }
+
+                    roundInitStatus = RoundInitStatus.Interrupted;
                     CoroutineManager.StartCoroutine(EndGame(endMessage), "EndGame");
                     break;
                 case ServerPacketHeader.CAMPAIGN_SETUP_INFO:
@@ -775,7 +818,37 @@ namespace Barotrauma.Networking
                     break;
             }
         }
-        
+
+        private void ReadStartGameFinalize(IReadMessage inc)
+        {
+            ushort contentToPreloadCount = inc.ReadUInt16();
+            List<ContentFile> contentToPreload = new List<ContentFile>();
+            for (int i = 0; i < contentToPreloadCount; i++)
+            {
+                ContentType contentType = (ContentType)inc.ReadByte();
+                string filePath = inc.ReadString();
+                contentToPreload.Add(new ContentFile(filePath, contentType));
+            }
+
+            GameMain.GameSession.EventManager.PreloadContent(contentToPreload);
+
+            int levelEqualityCheckVal = inc.ReadInt32();
+
+            if (Level.Loaded.EqualityCheckVal != levelEqualityCheckVal)
+            {
+                string errorMsg = "Level equality check failed. The level generated at your end doesn't match the level generated by the server (seed: " + Level.Loaded.Seed +
+                    ", sub: " + Submarine.MainSub.Name + " (" + Submarine.MainSub.MD5Hash.ShortHash + ")" +
+                    ", mirrored: " + Level.Loaded.Mirrored + ").";
+                GameAnalyticsManager.AddErrorEventOnce("GameClient.StartGame:LevelsDontMatch" + Level.Loaded.Seed, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                throw new Exception(errorMsg);
+            }
+
+            GameMain.GameSession.Mission?.ClientReadInitial(inc);
+
+            roundInitStatus = RoundInitStatus.Started;
+        }
+
+
         private void OnDisconnect()
         {
             if (SteamManager.IsInitialized)
@@ -884,6 +957,7 @@ namespace Barotrauma.Networking
             }
             else
             {
+                connected = false;
                 connectCancelled = true;
 
                 string msg = "";
@@ -1108,6 +1182,7 @@ namespace Barotrauma.Networking
             if (Character != null) Character.Remove();
             HasSpawned = false;
             eventErrorWritten = false;
+            GameMain.NetLobbyScreen.StopWaitingForStartRound();
 
             while (CoroutineManager.IsCoroutineRunning("EndGame"))
             {
@@ -1126,9 +1201,11 @@ namespace Barotrauma.Networking
 
             EndVoteTickBox.Selected = false;
 
+            roundInitStatus = RoundInitStatus.Starting;
+
             int seed                    = inc.ReadInt32();
             string levelSeed            = inc.ReadString();
-            int levelEqualityCheckVal   = inc.ReadInt32();
+            //int levelEqualityCheckVal   = inc.ReadInt32();
             float levelDifficulty       = inc.ReadSingle();
 
             byte losMode            = inc.ReadByte();
@@ -1146,24 +1223,16 @@ namespace Barotrauma.Networking
             int missionIndex        = inc.ReadInt16();
 
             bool respawnAllowed     = inc.ReadBoolean();
-            bool loadSecondSub      = inc.ReadBoolean();
 
             bool disguisesAllowed   = inc.ReadBoolean();
             bool rewiringAllowed    = inc.ReadBoolean();
 
             bool allowRagdollButton = inc.ReadBoolean();
 
-            ushort contentToPreloadCount = inc.ReadUInt16();
-            List<ContentFile> contentToPreload = new List<ContentFile>();
-            for (int i = 0; i < contentToPreloadCount; i++)
-            {
-                ContentType contentType = (ContentType)inc.ReadByte();
-                string filePath = inc.ReadString();
-                contentToPreload.Add(new ContentFile(filePath, contentType));
-            }
-
             serverSettings.ReadMonsterEnabled(inc);
 
+            bool includesFinalize = inc.ReadBoolean(); inc.ReadPadBits();
+
             GameModePreset gameMode = GameModePreset.List.Find(gm => gm.Identifier == modeIdentifier);
             MultiPlayerCampaign campaign = 
                 GameMain.NetLobbyScreen.SelectedMode == GameMain.GameSession?.GameMode.Preset && gameMode == GameMain.NetLobbyScreen.SelectedMode ?
@@ -1237,21 +1306,105 @@ namespace Barotrauma.Networking
                     yield return CoroutineStatus.Failure;
                 }
 
+                MissionPrefab missionPrefab = missionIndex < 0 ? null : MissionPrefab.List[missionIndex];
+
                 GameMain.GameSession = missionIndex < 0 ?
                     new GameSession(GameMain.NetLobbyScreen.SelectedSub, "", gameMode, MissionType.None) :
-                    new GameSession(GameMain.NetLobbyScreen.SelectedSub, "", gameMode, MissionPrefab.List[missionIndex]);
-                GameMain.GameSession.StartRound(levelSeed, levelDifficulty, loadSecondSub);
+                    new GameSession(GameMain.NetLobbyScreen.SelectedSub, "", gameMode, missionPrefab);
+
+                //startRoundTask = Task.Run(async () => { await Task.Yield(); GameMain.GameSession.StartRound(levelSeed, levelDifficulty); });
+                GameMain.GameSession.StartRound(levelSeed, levelDifficulty);
             }
             else
             {
                 if (GameMain.GameSession?.CrewManager != null) GameMain.GameSession.CrewManager.Reset();
+                /*startRoundTask = Task.Run(async () =>
+                {
+                    await Task.Yield();
+                    GameMain.GameSession.StartRound(campaign.Map.SelectedConnection.Level,
+                        reloadSub: true,
+                        mirrorLevel: campaign.Map.CurrentLocation != campaign.Map.SelectedConnection.Locations[0]);
+                });*/
                 GameMain.GameSession.StartRound(campaign.Map.SelectedConnection.Level,
-                    reloadSub: true,
-                    loadSecondSub: false,
-                    mirrorLevel: campaign.Map.CurrentLocation != campaign.Map.SelectedConnection.Locations[0]);
+                        reloadSub: true,
+                        mirrorLevel: campaign.Map.CurrentLocation != campaign.Map.SelectedConnection.Locations[0]);
             }
 
-            GameMain.GameSession.Mission?.ClientReadInitial(inc);
+            roundInitStatus = RoundInitStatus.WaitingForStartGameFinalize;
+
+            DateTime? timeOut = null;
+            DateTime requestFinalizeTime = DateTime.Now;
+            TimeSpan requestFinalizeInterval = new TimeSpan(0, 0, 2);
+
+            while (true)
+            {
+                try
+                {
+                    if (timeOut.HasValue)
+                    {
+                        if (DateTime.Now > requestFinalizeTime)
+                        {
+                            IWriteMessage msg = new WriteOnlyMessage();
+                            msg.Write((byte)ClientPacketHeader.REQUEST_STARTGAMEFINALIZE);
+                            clientPeer.Send(msg, DeliveryMethod.Unreliable);
+                            requestFinalizeTime = DateTime.Now + requestFinalizeInterval;
+                        }
+                        if (DateTime.Now > timeOut)
+                        {
+                            DebugConsole.ThrowError("Error while starting the round (did not receive STARTGAMEFINALIZE message from the server). Stopping the round...");
+                            roundInitStatus = RoundInitStatus.TimedOut;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        if (includesFinalize)
+                        {
+                            ReadStartGameFinalize(inc);
+                            break;
+                        }
+
+                        //wait for up to 30 seconds for the server to send the STARTGAMEFINALIZE message
+                        timeOut = DateTime.Now + new TimeSpan(0, 0, seconds: 30);
+                    }
+
+                    if (!connected)
+                    {
+                        roundInitStatus = RoundInitStatus.Interrupted;
+                        break;
+                    }
+
+                    if (roundInitStatus != RoundInitStatus.WaitingForStartGameFinalize)
+                    {
+                        break;
+                    }
+
+                    clientPeer.Update((float)Timing.Step);
+                }
+                catch (Exception e)
+                {
+                    DebugConsole.ThrowError("There was an error initializing the round.", e, true);
+                    roundInitStatus = RoundInitStatus.Error;
+                    break;
+                }
+
+                //waiting for a STARTGAMEFINALIZE message
+                yield return CoroutineStatus.Running;
+            }
+
+            if (roundInitStatus != RoundInitStatus.Started)
+            {
+                if (roundInitStatus != RoundInitStatus.Interrupted)
+                {
+                    DebugConsole.ThrowError(roundInitStatus.ToString());
+                    CoroutineManager.StartCoroutine(EndGame(""));
+                    yield return CoroutineStatus.Failure;
+                }
+                else
+                {
+                    yield return CoroutineStatus.Success;
+                }
+            }
 
             if (GameMain.GameSession.Submarine.IsFileCorrupted)
             {
@@ -1261,7 +1414,7 @@ namespace Barotrauma.Networking
 
             for (int i = 0; i < Submarine.MainSubs.Length; i++)
             {
-                if (!loadSecondSub && i > 0) { break; }
+                if (Submarine.MainSubs[i] == null) { break; }
 
                 var teamID = i == 0 ? Character.TeamType.Team1 : Character.TeamType.Team2;
                 Submarine.MainSubs[i].TeamID = teamID;
@@ -1271,23 +1424,10 @@ namespace Barotrauma.Networking
                 }
             }
 
-            if (Level.Loaded.EqualityCheckVal != levelEqualityCheckVal)
-            {
-                string errorMsg = "Level equality check failed. The level generated at your end doesn't match the level generated by the server (seed: " + Level.Loaded.Seed +
-                    ", sub: " + Submarine.MainSub.Name + " (" + Submarine.MainSub.MD5Hash.ShortHash + ")" +
-                    ", mirrored: " + Level.Loaded.Mirrored + ").";
-                DebugConsole.ThrowError(errorMsg, createMessageBox: true);
-                GameAnalyticsManager.AddErrorEventOnce("GameClient.StartGame:LevelsDontMatch" + levelSeed, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
-                CoroutineManager.StartCoroutine(EndGame(""));
-                yield return CoroutineStatus.Failure;
-            }
-
             if (respawnAllowed) { respawnManager = new RespawnManager(this, GameMain.NetLobbyScreen.UsingShuttle ? GameMain.NetLobbyScreen.SelectedShuttle : null); }
 
-            GameMain.GameSession.EventManager.PreloadContent(contentToPreload);
-
-            ServerSettings.ServerDetailsChanged = true;
             gameStarted = true;
+            ServerSettings.ServerDetailsChanged = true;
 
             GameMain.GameScreen.Select();
 
@@ -1394,6 +1534,7 @@ namespace Barotrauma.Networking
                 string preferredJob = inc.ReadString();
                 UInt16 characterID  = inc.ReadUInt16();
                 bool muted          = inc.ReadBoolean();
+                bool inGame         = inc.ReadBoolean();
                 bool allowKicking   = inc.ReadBoolean();
                 inc.ReadPadBits();
 
@@ -1406,6 +1547,7 @@ namespace Barotrauma.Networking
                     PreferredJob = preferredJob,
                     CharacterID = characterID,
                     Muted = muted,
+                    InGame = inGame,
                     AllowKicking = allowKicking
                 });
             }
@@ -1424,6 +1566,7 @@ namespace Barotrauma.Networking
                         {
                             SteamID = tc.SteamID,
                             Muted = tc.Muted,
+                            InGame = tc.InGame,
                             AllowKicking = tc.AllowKicking
                         };
                         ConnectedClients.Add(existingClient);
@@ -1433,15 +1576,12 @@ namespace Barotrauma.Networking
                     existingClient.PreferredJob = tc.PreferredJob;
                     existingClient.Character = null;
                     existingClient.Muted = tc.Muted;
+                    existingClient.InGame = tc.InGame;
                     existingClient.AllowKicking = tc.AllowKicking;
                     GameMain.NetLobbyScreen.SetPlayerNameAndJobPreference(existingClient);
-                    if (tc.CharacterID > 0)
+                    if (Screen.Selected != GameMain.NetLobbyScreen && tc.CharacterID > 0)
                     {
-                        existingClient.Character = Entity.FindEntityByID(tc.CharacterID) as Character;
-                        if (existingClient.Character == null)
-                        {
-                            updateClientListId = false;
-                        }
+                        existingClient.CharacterID = tc.CharacterID;
                     }
                     if (existingClient.ID == myID)
                     {
@@ -2440,7 +2580,7 @@ namespace Barotrauma.Networking
                 if (GUI.KeyboardDispatcher.Subscriber == null)                
                 {
                     bool chatKeyHit = PlayerInput.KeyHit(InputType.Chat);
-                    bool radioKeyHit = PlayerInput.KeyHit(InputType.RadioChat);
+                    bool radioKeyHit = PlayerInput.KeyHit(InputType.RadioChat) && (Character.Controlled == null || Character.Controlled.SpeechImpediment < 0);
 
                     if (chatKeyHit || radioKeyHit)
                     {
@@ -2498,6 +2638,7 @@ namespace Barotrauma.Networking
             {
                 var transfer = fileReceiver.ActiveTransfers.First();
                 GameMain.NetLobbyScreen.FileTransferFrame.Visible = true;
+                GameMain.NetLobbyScreen.FileTransferFrame.UserData = transfer;
                 GameMain.NetLobbyScreen.FileTransferTitle.Text =
                     ToolBox.LimitString(
                         TextManager.GetWithVariable("DownloadingFile", "[filename]", transfer.FileName),

Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/LidgrenClientPeer.cs

@@ -91,6 +91,7 @@ namespace Barotrauma.Networking
                 return;
             }
 
+            incomingLidgrenMessages.Clear();
             netClient.ReadMessages(incomingLidgrenMessages);
 
             foreach (NetIncomingMessage inc in incomingLidgrenMessages)
@@ -107,8 +108,6 @@ namespace Barotrauma.Networking
                         break;
                 }
             }
-
-            incomingLidgrenMessages.Clear();
         }
 
         private void HandleDataMessage(NetIncomingMessage inc)

Barotrauma/BarotraumaClient/ClientSource/Networking/SteamManager.cs

@@ -1314,79 +1314,69 @@ namespace Barotrauma.Steam
             return upToDate;
         }
 
-        public static bool AutoUpdateWorkshopItems()
+        public static async Task<bool> AutoUpdateWorkshopItems()
         {
             if (!isInitialized) { return false; }
 
             var query = new Steamworks.Ugc.Query(Steamworks.UgcType.All)
                 .WhereUserSubscribed()
                 .WithLongDescription();
-            //ugcResultPageTasks ??= new List<Task>();
-            //ugcResultPageTasks.Add();
-            CancellationTokenSource cancelTokenSource = new CancellationTokenSource();
-            CancellationToken cancelToken = cancelTokenSource.Token;
-            Task task = Task.Factory.StartNew(async () =>
-            {
-                int processedResults = 0; int pageIndex = 1;
-                Steamworks.Ugc.ResultPage? resultPage = await query.GetPageAsync(pageIndex);
 
-                while (resultPage.HasValue && resultPage?.ResultCount > 0)
+            DateTime startTime = DateTime.Now;
+            DateTime endTime = startTime + new TimeSpan(0, 0, 30);
+
+            int processedResults = 0; int pageIndex = 1;
+            Steamworks.Ugc.ResultPage? resultPage = await query.GetPageAsync(pageIndex);
+
+            while (resultPage.HasValue && resultPage?.ResultCount > 0)
+            {
+                if (DateTime.Now > endTime)
                 {
-                    foreach (var item in resultPage.Value.Entries)
+                    return false;
+                }
+                foreach (var item in resultPage.Value.Entries)
+                {
+                    try
                     {
-                        if (cancelToken.IsCancellationRequested)
-                        {
-                            cancelToken.ThrowIfCancellationRequested();
-                        }
-                        try
-                        {
-                            if (!item.IsInstalled || !CheckWorkshopItemEnabled(item) || CheckWorkshopItemUpToDate(item)) { continue; }
-                            if (!UpdateWorkshopItem(item, out string errorMsg))
-                            {
-                                DebugConsole.ThrowError(errorMsg);
-                                new GUIMessageBox(
-                                    TextManager.Get("Error"),
-                                    TextManager.GetWithVariables("WorkshopItemUpdateFailed", new string[2] { "[itemname]", "[errormessage]" }, new string[2] { item.Title, errorMsg }));
-                            }
-                            else
-                            {
-                                //TODO: potential race condition
-                                new GUIMessageBox("", TextManager.GetWithVariable("WorkshopItemUpdated", "[itemname]", item.Title));
-                            }
-                        }
-                        catch (Exception e)
+                        if (!item.IsInstalled || !CheckWorkshopItemEnabled(item) || CheckWorkshopItemUpToDate(item)) { continue; }
+                        if (!UpdateWorkshopItem(item, out string errorMsg))
                         {
+                            DebugConsole.ThrowError(errorMsg);
                             new GUIMessageBox(
                                 TextManager.Get("Error"),
-                                TextManager.GetWithVariables("WorkshopItemUpdateFailed", new string[2] { "[itemname]", "[errormessage]" }, new string[2] { item.Title, e.Message + ", " + e.TargetSite }));
-                            GameAnalyticsManager.AddErrorEventOnce(
-                                "SteamManager.AutoUpdateWorkshopItems:" + e.Message,
-                                GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
-                                "Failed to autoupdate workshop item \"" + item.Title + "\". " + e.Message + "\n" + e.StackTrace);
+                                TextManager.GetWithVariables("WorkshopItemUpdateFailed", new string[2] { "[itemname]", "[errormessage]" }, new string[2] { item.Title, errorMsg }));
+                        }
+                        else
+                        {
+                            //TODO: potential race condition
+                            new GUIMessageBox("", TextManager.GetWithVariable("WorkshopItemUpdated", "[itemname]", item.Title));
                         }
                     }
-                    
-                    processedResults += resultPage.Value.ResultCount;
-                    pageIndex++;
-                    if (processedResults < resultPage?.TotalCount)
+                    catch (Exception e)
                     {
-                        resultPage = await query.GetPageAsync(pageIndex);
-                    }
-                    else
-                    {
-                        resultPage = null;
+                        new GUIMessageBox(
+                            TextManager.Get("Error"),
+                            TextManager.GetWithVariables("WorkshopItemUpdateFailed", new string[2] { "[itemname]", "[errormessage]" }, new string[2] { item.Title, e.Message + ", " + e.TargetSite }));
+                        GameAnalyticsManager.AddErrorEventOnce(
+                            "SteamManager.AutoUpdateWorkshopItems:" + e.Message,
+                            GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
+                            "Failed to autoupdate workshop item \"" + item.Title + "\". " + e.Message + "\n" + e.StackTrace);
                     }
                 }
-            }, cancelToken, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default);
-
-            task.Wait(10000);
-            if (!task.IsCompleted)
-            {
-                cancelTokenSource.Cancel();
-                task.Wait();
+                    
+                processedResults += resultPage.Value.ResultCount;
+                pageIndex++;
+                if (processedResults < resultPage?.TotalCount)
+                {
+                    resultPage = await query.GetPageAsync(pageIndex);
+                }
+                else
+                {
+                    resultPage = null;
+                }
             }
-            
-            return task.Status == TaskStatus.RanToCompletion;
+
+            return true;
         }
 
         public static bool UpdateWorkshopItem(Steamworks.Ugc.Item? item, out string errorMsg)

Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs

@@ -119,7 +119,7 @@ namespace Barotrauma.Networking
                 GameMain.NetLobbyScreen?.SetPlayerSpeaking(client);
                 GameMain.GameSession?.CrewManager?.SetClientSpeaking(client);
 
-                if (client.VoipSound.CurrentAmplitude > 0.1f) //TODO: might need to tweak
+                if ((client.VoipSound.CurrentAmplitude * client.VoipSound.Gain * GameMain.SoundManager.GetCategoryGainMultiplier("voip")) > 0.1f) //TODO: might need to tweak
                 {
                     if (client.Character != null && !client.Character.Removed)
                     {

Barotrauma/BarotraumaClient/ClientSource/Program.cs

@@ -7,6 +7,7 @@ using System.Text;
 using GameAnalyticsSDK.Net;
 using Barotrauma.Steam;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 
 #if WINDOWS
 using SharpDX;
@@ -22,42 +23,56 @@ namespace Barotrauma
     /// </summary>
     public static class Program
     {
+
+#if LINUX
+        /// <summary>
+        /// Sets the required environment variables for the game to initialize Steamworks correctly.
+        /// </summary>
+        [DllImport("linux_steam_env", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        private static extern void setLinuxEnv();
+#endif
+
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main(string[] args)
         {
-            GameMain game = null;
             string executableDir = "";
+
 #if !DEBUG
+            AppDomain currentDomain = AppDomain.CurrentDomain;
+            currentDomain.UnhandledException += new UnhandledExceptionEventHandler(CrashHandler);
+#endif
+
+#if LINUX
+            setLinuxEnv();
+#endif
+
+            Game = null;
+            executableDir = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            Directory.SetCurrentDirectory(executableDir);
+            SteamManager.Initialize();
+            Game = new GameMain(args);
+            Game.Run();
+            Game.Dispose();
+        }
+
+        private static GameMain Game;
+
+        private static void CrashHandler(object sender, UnhandledExceptionEventArgs args)
+        {
             try
             {
-#endif
-                executableDir = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
-                Directory.SetCurrentDirectory(executableDir);
-                SteamManager.Initialize();
-                game = new GameMain(args);
-                game.Run();
-                game.Dispose();
-#if !DEBUG
+                Game?.Exit();
+                CrashDump(Game, "crashreport.log", (Exception)args.ExceptionObject);
+                Game?.Dispose();
             }
-            catch (Exception e)
+            catch
             {
-                try
-                {
-                    CrashDump(game, Path.Combine(executableDir,"crashreport.log"), e);
-                }
-                catch (Exception e2)
-                {
-                    CrashMessageBox("Barotrauma seems to have crashed, and failed to generate a crash report: "
-                        + e2.Message + "\n" + e2.StackTrace.ToString(),
-                        null);
-                }
-                game?.Dispose();
+                //exception handler is broken, we have a serious problem here!!
                 return;
             }
-#endif
         }
 
         public static void CrashMessageBox(string message, string filePath)
@@ -83,16 +98,9 @@ namespace Barotrauma
             string exePath = System.Reflection.Assembly.GetEntryAssembly().Location;
             var md5 = System.Security.Cryptography.MD5.Create();
             Md5Hash exeHash = null;
-            try
+            using (var stream = File.OpenRead(exePath))
             {
-                using (var stream = File.OpenRead(exePath))
-                {
-                    exeHash = new Md5Hash(stream);
-                }
-            }
-            catch
-            {
-                //gotta catch them all, we don't want to throw an exception while writing a crash report
+                exeHash = new Md5Hash(stream);
             }
 
             StreamWriter sw = new StreamWriter(filePath);
@@ -217,4 +225,4 @@ namespace Barotrauma
         }
     }
 #endif
-}
+        }

Barotrauma/BarotraumaClient/ClientSource/Screens/CampaignSetupUI.cs

@@ -392,18 +392,19 @@ namespace Barotrauma
                 {
                     nameText.Text = Path.GetFileNameWithoutExtension(saveFile);
                     XDocument doc = SaveUtil.LoadGameSessionDoc(saveFile);
-                    if (doc.Root.GetChildElement("multiplayercampaign") != null)
-                    {
-                        //multiplayer campaign save in the wrong folder -> don't show the save
-                        saveList.Content.RemoveChild(saveFrame);
-                        continue;
-                    }
+
                     if (doc?.Root == null)
                     {
                         DebugConsole.ThrowError("Error loading save file \"" + saveFile + "\". The file may be corrupted.");
                         nameText.TextColor = GUI.Style.Red;
                         continue;
                     }
+                    if (doc.Root.GetChildElement("multiplayercampaign") != null)
+                    {
+                        //multiplayer campaign save in the wrong folder -> don't show the save
+                        saveList.Content.RemoveChild(saveFrame);
+                        continue;
+                    }
                     subName =  doc.Root.GetAttributeString("submarine", "");
                     saveTime = doc.Root.GetAttributeString("savetime", "");
                     contentPackageStr = doc.Root.GetAttributeString("selectedcontentpackages", "");

Barotrauma/BarotraumaClient/ClientSource/Screens/CharacterEditor/CharacterEditorScreen.cs

@@ -3347,6 +3347,7 @@ namespace Barotrauma.CharacterEditor
 
             void CreateCloseButton(SerializableEntityEditor editor, Action onButtonClicked, float size = 1)
             {
+                if (editor == null) { return; }
                 int height = 30;
                 var parent = new GUIFrame(new RectTransform(new Point(editor.Rect.Width, (int)(height * size * GUI.yScale)), editor.RectTransform, isFixedSize: true), style: null)
                 {
@@ -3366,6 +3367,7 @@ namespace Barotrauma.CharacterEditor
 
             void CreateAddButtonAtLast(ParamsEditor editor, Action onButtonClicked, string text)
             {
+                if (editor == null) { return; }
                 var parentFrame = new GUIFrame(new RectTransform(new Point(editor.EditorBox.Rect.Width, (int)(50 * GUI.yScale)), editor.EditorBox.Content.RectTransform), style: null, color: ParamsEditor.Color)
                 {
                     CanBeFocused = false
@@ -3383,6 +3385,7 @@ namespace Barotrauma.CharacterEditor
 
             void CreateAddButton(SerializableEntityEditor editor, Action onButtonClicked, string text)
             {
+                if (editor == null) { return; }
                 var parent = new GUIFrame(new RectTransform(new Point(editor.Rect.Width, (int)(60 * GUI.yScale)), editor.RectTransform), style: null)
                 {
                     CanBeFocused = false
@@ -4386,7 +4389,7 @@ namespace Barotrauma.CharacterEditor
                                 ResetParamsEditor();
                             }
                             limb.PullJointWorldAnchorA = ScreenToSim(PlayerInput.MousePosition);
-                            TryUpdateLimbParam(limb, "pullpos", ConvertUnits.ToDisplayUnits(limb.PullJointLocalAnchorA / limb.Params.Ragdoll.LimbScale));
+                            TryUpdateLimbParam(limb, "pullpos", ConvertUnits.ToDisplayUnits(limb.PullJointLocalAnchorA / limb.Params.Scale / limb.Params.Ragdoll.LimbScale));
                             GUI.DrawLine(spriteBatch, SimToScreen(limb.SimPosition), tformedPullPos, Color.MediumPurple);
                         });
                     }
@@ -4469,7 +4472,7 @@ namespace Barotrauma.CharacterEditor
                                 if (joint.BodyA == limb.body.FarseerBody)
                                 {
                                     joint.LocalAnchorA += input;
-                                    Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / RagdollParams.JointScale);
+                                    Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / joint.Scale);
                                     TryUpdateJointParam(joint, "limb1anchor", transformedValue);
                                     // Snap all selected joints to the first selected
                                     if (copyJointSettings)
@@ -4484,7 +4487,7 @@ namespace Barotrauma.CharacterEditor
                                 else if (joint.BodyB == limb.body.FarseerBody)
                                 {
                                     joint.LocalAnchorB += input;
-                                    Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / RagdollParams.JointScale);
+                                    Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / joint.Scale);
                                     TryUpdateJointParam(joint, "limb2anchor", transformedValue);
                                     // Snap all selected joints to the first selected
                                     if (copyJointSettings)
@@ -4504,12 +4507,12 @@ namespace Barotrauma.CharacterEditor
                                         if (joint.BodyA == limb.body.FarseerBody && otherJoint.BodyA == otherLimb.body.FarseerBody)
                                         {
                                             otherJoint.LocalAnchorA = joint.LocalAnchorA;
-                                            TryUpdateJointParam(otherJoint, "limb1anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / RagdollParams.JointScale));
+                                            TryUpdateJointParam(otherJoint, "limb1anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / joint.Scale));
                                         }
                                         else if (joint.BodyB == limb.body.FarseerBody && otherJoint.BodyB == otherLimb.body.FarseerBody)
                                         {
                                             otherJoint.LocalAnchorB = joint.LocalAnchorB;
-                                            TryUpdateJointParam(otherJoint, "limb2anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / RagdollParams.JointScale));
+                                            TryUpdateJointParam(otherJoint, "limb2anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / joint.Scale));
                                         }
                                     });
                                 }
@@ -4873,10 +4876,10 @@ namespace Barotrauma.CharacterEditor
                                         {
                                             // We want the collider to be slightly smaller than the source rect, because the source rect is usually a bit bigger than the graphic.
                                             float multiplier = 0.85f;
-                                            l.body.SetSize(new Vector2(ConvertUnits.ToSimUnits(width), ConvertUnits.ToSimUnits(height)) * RagdollParams.LimbScale * RagdollParams.TextureScale * multiplier);
-                                            TryUpdateLimbParam(l, "radius", ConvertUnits.ToDisplayUnits(l.body.radius / RagdollParams.LimbScale / RagdollParams.TextureScale));
-                                            TryUpdateLimbParam(l, "width", ConvertUnits.ToDisplayUnits(l.body.width / RagdollParams.LimbScale / RagdollParams.TextureScale));
-                                            TryUpdateLimbParam(l, "height", ConvertUnits.ToDisplayUnits(l.body.height / RagdollParams.LimbScale / RagdollParams.TextureScale));
+                                            l.body.SetSize(new Vector2(ConvertUnits.ToSimUnits(width), ConvertUnits.ToSimUnits(height)) * l.Scale * RagdollParams.TextureScale * multiplier);
+                                            TryUpdateLimbParam(l, "radius", ConvertUnits.ToDisplayUnits(l.body.radius / l.Params.Scale / RagdollParams.LimbScale / RagdollParams.TextureScale));
+                                            TryUpdateLimbParam(l, "width", ConvertUnits.ToDisplayUnits(l.body.width / l.Params.Scale / RagdollParams.LimbScale / RagdollParams.TextureScale));
+                                            TryUpdateLimbParam(l, "height", ConvertUnits.ToDisplayUnits(l.body.height / l.Params.Scale / RagdollParams.LimbScale / RagdollParams.TextureScale));
                                         }
                                         void RecalculateOrigin(Limb l)
                                         {
@@ -4963,7 +4966,7 @@ namespace Barotrauma.CharacterEditor
                 {
                     continue;
                 }
-                Vector2 tformedJointPos = jointPos = jointPos / RagdollParams.JointScale / limb.TextureScale * spriteSheetZoom;
+                Vector2 tformedJointPos = jointPos = jointPos / joint.Scale / limb.TextureScale * spriteSheetZoom;
                 tformedJointPos.Y = -tformedJointPos.Y;
                 tformedJointPos.X *= character.AnimController.Dir;
                 tformedJointPos += limbScreenPos;
@@ -4991,11 +4994,11 @@ namespace Barotrauma.CharacterEditor
                         Vector2 input = ConvertUnits.ToSimUnits(scaledMouseSpeed);
                         input.Y = -input.Y;
                         input.X *= character.AnimController.Dir;
-                        input *= RagdollParams.JointScale * limb.TextureScale / spriteSheetZoom;
+                        input *= joint.Scale * limb.TextureScale / spriteSheetZoom;
                         if (joint.BodyA == limb.body.FarseerBody)
                         {
                             joint.LocalAnchorA += input;
-                            Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / RagdollParams.JointScale);
+                            Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / joint.Scale);
                             TryUpdateJointParam(joint, "limb1anchor", transformedValue);
                             // Snap all selected joints to the first selected
                             if (copyJointSettings)
@@ -5010,7 +5013,7 @@ namespace Barotrauma.CharacterEditor
                         else if (joint.BodyB == limb.body.FarseerBody)
                         {
                             joint.LocalAnchorB += input;
-                            Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / RagdollParams.JointScale);
+                            Vector2 transformedValue = ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / joint.Scale);
                             TryUpdateJointParam(joint, "limb2anchor", transformedValue);
                             // Snap all selected joints to the first selected
                             if (copyJointSettings)
@@ -5029,12 +5032,12 @@ namespace Barotrauma.CharacterEditor
                                 if (joint.BodyA == limb.body.FarseerBody && otherJoint.BodyA == otherLimb.body.FarseerBody)
                                 {
                                     otherJoint.LocalAnchorA = joint.LocalAnchorA;
-                                    TryUpdateJointParam(otherJoint, "limb1anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / RagdollParams.JointScale));
+                                    TryUpdateJointParam(otherJoint, "limb1anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorA / joint.Scale));
                                 }
                                 else if (joint.BodyB == limb.body.FarseerBody && otherJoint.BodyB == otherLimb.body.FarseerBody)
                                 {
                                     otherJoint.LocalAnchorB = joint.LocalAnchorB;
-                                    TryUpdateJointParam(otherJoint, "limb2anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / RagdollParams.JointScale));
+                                    TryUpdateJointParam(otherJoint, "limb2anchor", ConvertUnits.ToDisplayUnits(joint.LocalAnchorB / joint.Scale));
                                 }
                             });
                         }

Barotrauma/BarotraumaClient/ClientSource/Screens/GameScreen.cs

@@ -91,7 +91,13 @@ namespace Barotrauma
                 c.DoVisibilityCheck(cam);
                 if (c.IsVisible != wasVisible)
                 {
-                    c.AnimController.Limbs.ForEach(l => { if (l.LightSource != null) l.LightSource.Enabled = c.IsVisible; });
+                    c.AnimController.Limbs.ForEach(l =>
+                    {
+                        if (l.LightSource != null)
+                        {
+                            l.LightSource.Enabled = c.IsVisible;
+                        }
+                    });
                 }
             }
 
@@ -282,14 +288,23 @@ namespace Barotrauma
 			}
 
 			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.LinearWrap, DepthStencilState.None, null, null, cam.Transform);
-			foreach (Character c in Character.CharacterList) c.DrawFront(spriteBatch, cam);
-
-			if (Level.Loaded != null) Level.Loaded.DrawFront(spriteBatch, cam);
-            if (GameMain.DebugDraw && GameMain.GameSession?.EventManager != null)
+            foreach (Character c in Character.CharacterList)
             {
-                GameMain.GameSession.EventManager.DebugDraw(spriteBatch);
+                c.DrawFront(spriteBatch, cam);
+            }
+            if (Level.Loaded != null)
+            {
+                Level.Loaded.DrawFront(spriteBatch, cam);
+            }
+            if (GameMain.DebugDraw)
+            {
+                MapEntity.mapEntityList.ForEach(me => me.AiTarget?.Draw(spriteBatch));
+                Character.CharacterList.ForEach(c => c.AiTarget?.Draw(spriteBatch));
+                if (GameMain.GameSession?.EventManager != null)
+                {
+                    GameMain.GameSession.EventManager.DebugDraw(spriteBatch);
+                }
             }
-
             spriteBatch.End();
 
             if (GameMain.LightManager.LosEnabled && GameMain.LightManager.LosMode != LosMode.None && Character.Controlled != null)

Barotrauma/BarotraumaClient/ClientSource/Screens/LevelEditorScreen.cs

@@ -517,8 +517,21 @@ namespace Barotrauma
                 {
                     foreach (XElement element in doc.Root.Elements())
                     {
-                        if (element.Name.ToString().ToLowerInvariant() != genParams.Name.ToLowerInvariant()) continue;
-                        SerializableProperty.SerializeProperties(genParams, element, true);
+                        XElement levelParamElement = element;
+                        if (element.IsOverride())
+                        {
+                            foreach (XElement subElement in element.Elements())
+                            {
+                                if (subElement.Name.ToString().Equals(genParams.Name, StringComparison.OrdinalIgnoreCase)) 
+                                { 
+                                    SerializableProperty.SerializeProperties(genParams, subElement, true);
+                                }
+                            }
+                        }
+                        else if (element.Name.ToString().Equals(genParams.Name, StringComparison.OrdinalIgnoreCase)) 
+                        { 
+                            SerializableProperty.SerializeProperties(genParams, element, true);
+                        }                        
                         break;
                     }
                 }

Barotrauma/BarotraumaClient/ClientSource/Screens/LobbyScreen.cs

@@ -79,8 +79,7 @@ namespace Barotrauma
         private IEnumerable<object> LoadRound()
         {
             GameMain.GameSession.StartRound(campaignUI.SelectedLevel, 
-                reloadSub: true, 
-                loadSecondSub: false,
+                reloadSub: true,
                 mirrorLevel: GameMain.GameSession.Map.CurrentLocation != GameMain.GameSession.Map.SelectedConnection.Locations[0]);
             GameMain.GameScreen.Select();
 

Barotrauma/BarotraumaClient/ClientSource/Screens/NetLobbyScreen.cs

@@ -443,7 +443,7 @@ namespace Barotrauma
             {
                 OnClicked = (btn, userdata) =>
                 {
-                    if (!(userdata is FileReceiver.FileTransferIn transfer)) { return false; }
+                    if (!(FileTransferFrame.UserData is FileReceiver.FileTransferIn transfer)) { return false; }
                     GameMain.Client?.CancelFileTransfer(transfer);
                     GameMain.Client.FileReceiver.StopTransfer(transfer);
                     return true;
@@ -658,7 +658,7 @@ namespace Barotrauma
                 OnClicked = (btn, obj) =>
                 {
                     GameMain.Client.RequestStartRound();
-                    CoroutineManager.StartCoroutine(WaitForStartRound(StartButton, allowCancel: true), "WaitForStartRound");
+                    CoroutineManager.StartCoroutine(WaitForStartRound(StartButton, allowCancel: false), "WaitForStartRound");
                     return true;
                 }
             };
@@ -1147,6 +1147,22 @@ namespace Barotrauma
             clientDisabledElements.AddRange(botSpawnModeButtons);
         }
 
+        public void StopWaitingForStartRound()
+        {
+            CoroutineManager.StopCoroutines("WaitForStartRound");
+
+            GUIMessageBox.CloseAll();
+            if (StartButton != null)
+            {
+                StartButton.Enabled = true;
+            }
+            if (campaignUI?.StartButton != null)
+            {
+                campaignUI.StartButton.Enabled = true;
+            }
+            GUI.ClearCursorWait();
+        }
+
         public IEnumerable<object> WaitForStartRound(GUIButton startButton, bool allowCancel)
         {
             GUI.SetCursorWaiting();
@@ -1173,7 +1189,8 @@ namespace Barotrauma
             }
 
             DateTime timeOut = DateTime.Now + new TimeSpan(0, 0, 10);
-            while (Selected == GameMain.NetLobbyScreen && DateTime.Now < timeOut)
+            while (Selected == GameMain.NetLobbyScreen &&
+                   DateTime.Now < timeOut)
             {
                 msgBox.Header.Text = headerText + new string('.', ((int)Timing.TotalTime % 3 + 1));
                 yield return CoroutineStatus.Running;
@@ -1322,6 +1339,8 @@ namespace Barotrauma
             if (GameMain.Client == null) return;
             spectateButton.Visible = true;
             spectateButton.Enabled = true;
+
+            StartButton.Visible = false;
         }
 
         public void SetCampaignCharacterInfo(CharacterInfo newCampaignCharacterInfo)
@@ -2745,11 +2764,11 @@ namespace Barotrauma
 
             availableJobs = availableJobs.ToList();
 
-            int itemsInRow = 1;
+            int itemsInRow = 0;
 
             foreach (var jobPrefab in availableJobs)
             {
-                if (itemsInRow >= 4)
+                if (itemsInRow >= 3)
                 {
                     row = new GUILayoutGroup(new RectTransform(Vector2.One, rows.RectTransform), true);
                     itemsInRow = 0;

Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs

@@ -741,6 +741,11 @@ namespace Barotrauma
         {
             base.Select();
 
+            GameMain.LightManager.AmbientLight = 
+                Level.Loaded?.GenerationParams?.AmbientLightColor ??
+                LevelGenerationParams.LevelParams?.FirstOrDefault()?.AmbientLightColor ??
+                new Color(20, 20, 20, 255); 
+
             UpdateEntityList();
 
             string name = (Submarine.MainSub == null) ? TextManager.Get("unspecifiedsubfilename") : Submarine.MainSub.Name;
@@ -1624,7 +1629,10 @@ namespace Barotrauma
             foreach (Item item in Item.ItemList)
             {
                 var lightComponent = item.GetComponent<LightComponent>();
-                if (lightComponent != null) lightComponent.Light.Enabled = item.ParentInventory == null;
+                if (lightComponent != null)
+                {
+                    lightComponent.Light.Enabled = item.ParentInventory == null;
+                }
             }
 
             if (selectedSub.GameVersion < new Version("0.8.9.0"))
@@ -1790,6 +1798,7 @@ namespace Barotrauma
             }
 
             MapEntity.DeselectAll();
+            MapEntity.FilteredSelectedList.Clear();
         }
 
         private void RemoveDummyCharacter()

Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs

@@ -569,15 +569,13 @@ namespace Barotrauma
                 Font = GUI.SmallFont,
                 Text = value,
                 OverflowClip = true,
-                OnEnterPressed = (textBox, text) =>
+            };
+            propertyBox.OnDeselected += (textBox, keys) =>
+            {
+                if (property.TrySetValue(entity, textBox.Text))
                 {
-                    if (property.TrySetValue(entity, text))
-                    {
-                        TrySendNetworkUpdate(entity, property);
-                        textBox.Text = (string)property.GetValue(entity);
-                        textBox.Deselect();
-                    }
-                    return true;
+                    TrySendNetworkUpdate(entity, property);
+                    textBox.Text = (string)property.GetValue(entity);
                 }
             };
             if (translationTextTag != null)

Barotrauma/BarotraumaClient/ClientSource/StatusEffects/StatusEffect.cs

@@ -52,7 +52,7 @@ namespace Barotrauma
             }
         }
 
-        partial void ApplyProjSpecific(float deltaTime, Entity entity, List<ISerializableEntity> targets, Hull hull, Vector2 worldPosition)
+        partial void ApplyProjSpecific(float deltaTime, Entity entity, IEnumerable<ISerializableEntity> targets, Hull hull, Vector2 worldPosition)
         {
             if (entity == null) { return; }
 
@@ -112,17 +112,19 @@ namespace Barotrauma
             foreach (ParticleEmitter emitter in particleEmitters)
             {
                 float angle = 0.0f;
+                float particleRotation = 0.0f;
                 if (emitter.Prefab.CopyEntityAngle)
                 {
                     if (entity is Item item && item.body != null)
                     {
                         angle = item.body.Rotation + ((item.body.Dir > 0.0f) ? 0.0f : MathHelper.Pi);
+                        particleRotation = -item.body.Rotation;
+                        if (item.body.Dir < 0.0f) { particleRotation += MathHelper.Pi; }
                     }
                 }
 
-                emitter.Emit(deltaTime, worldPosition, hull, angle);
-            }
-            
+                emitter.Emit(deltaTime, worldPosition, hull, angle: angle, particleRotation: particleRotation);
+            }            
         }
 
         static partial void UpdateAllProjSpecific(float deltaTime)