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

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs

@@ -255,7 +255,11 @@ namespace Barotrauma
                 }
                 if (subObjectives.Any(so => so.CanBeCompleted)) { return; }
                 UpdateSimpleEscape(deltaTime);
-                if (cannotFindSafeHull && !character.IsInFriendlySub && objectiveManager.Objectives.None(o => o is AIObjectiveReturn))
+
+                bool inFriendlySub = 
+                    character.IsInFriendlySub || 
+                    (character.IsEscorted && character.IsInPlayerSub);
+                if (cannotFindSafeHull && !inFriendlySub && objectiveManager.Objectives.None(o => o is AIObjectiveReturn))
                 {
                     if (OrderPrefab.Prefabs.TryGet("return".ToIdentifier(), out OrderPrefab orderPrefab))
                     {

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs

@@ -436,7 +436,10 @@ namespace Barotrauma
                             break;
                         case "statvalue":
                             var newStatValue = new AppliedStatValue(subElement);
-                            afflictionStatValues.Add(newStatValue.StatType, newStatValue);
+                            if (newStatValue.StatType == StatTypes.None || !afflictionStatValues.TryAdd(newStatValue.StatType, newStatValue))
+                            {
+                                DebugConsole.ThrowError($"Invalid stat value in the affliction \"{parentDebugName}\".", contentPackage: element.ContentPackage);                                
+                            }
                             break;
                         case "abilityflag":
                             AbilityFlags flagType = subElement.GetAttributeEnum("flagtype", AbilityFlags.None);