(5a377a8ee) Unstable v0.9.1000.0

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AIController.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Barotrauma
 {
-    public enum AIState { Idle, Attack, Escape, Eat, Flee, Avoid, Aggressive, PassiveAggressive }
+    public enum AIState { Idle, Attack, Escape, Eat, Flee, Avoid, Aggressive, PassiveAggressive, Protect }
 
     abstract partial class AIController : ISteerable
     {

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs

@@ -36,14 +36,17 @@ namespace Barotrauma
 
         private readonly float updateTargetsInterval = 1;
         private readonly float updateMemoriesInverval = 1;
+        private readonly float attackLimbResetInterval = 2;
 
-        private float avoidLookAheadDistance;
+        private readonly float avoidLookAheadDistance;
 
+        private IndoorsSteeringManager PathSteering => insideSteering as IndoorsSteeringManager;
         private SteeringManager outsideSteering, insideSteering;
 
         private float updateTargetsTimer;
         private float updateMemoriesTimer;
-                
+        private float attackLimbResetTimer;
+
         private bool IsCoolDownRunning => AttackingLimb != null && AttackingLimb.attack.CoolDownTimer > 0;
         public float CombatStrength => Character.Params.AI.CombatStrength;
         private float Sight => Character.Params.AI.Sight;
@@ -63,6 +66,7 @@ namespace Barotrauma
             get { return _attackingLimb; }
             private set
             {
+                attackLimbResetTimer = 0;
                 _attackingLimb = value;
                 attackVector = null;
                 Reverse = _attackingLimb != null && _attackingLimb.attack.Reverse;
@@ -82,8 +86,9 @@ namespace Barotrauma
         private readonly float colliderWidth;
         private readonly float colliderLength;
         private readonly int requiredHoleCount;
-        private readonly bool canAttackSub;
-        private readonly bool canAttackCharacters;
+        private bool canAttackWalls;
+        private bool canAttackDoors;
+        private bool canAttackCharacters;
 
         private readonly float priorityFearIncreasement = 2;
         private readonly float memoryFadeTime = 0.5f;
@@ -183,24 +188,9 @@ namespace Barotrauma
                 }
             }
 
-            bool canBreakDoors = false;
-            if (GetTarget("room")?.Priority > 0.0f)
-            {
-                var currentContexts = Character.GetAttackContexts();
-                foreach (Limb limb in Character.AnimController.Limbs)
-                {
-                    if (limb.attack == null) { continue; }
-                    if (!limb.attack.IsValidTarget(AttackTarget.Structure)) { continue; }
-                    if (limb.attack.IsValidContext(currentContexts) && limb.attack.StructureDamage > 0.0f)
-                    {
-                        canBreakDoors = true;
-                        break;
-                    }
-                }
-            }
-
+            ReevaluateAttacks();
             outsideSteering = new SteeringManager(this);
-            insideSteering = new IndoorsSteeringManager(this, false, canBreakDoors);
+            insideSteering = new IndoorsSteeringManager(this, false, canAttackDoors);
             steeringManager = outsideSteering;
             State = AIState.Idle;
 
@@ -210,9 +200,6 @@ namespace Barotrauma
             requiredHoleCount = (int)Math.Ceiling(ConvertUnits.ToDisplayUnits(colliderWidth) / Structure.WallSectionSize);
 
             avoidLookAheadDistance = Math.Max(colliderWidth * 3, 1.5f);
-
-            canAttackSub = Character.AnimController.CanAttackSubmarine;
-            canAttackCharacters = Character.AnimController.CanAttackCharacters;
         }
 
         private CharacterParams.AIParams AIParams => Character.Params.AI;
@@ -227,27 +214,28 @@ namespace Barotrauma
             selectedTargetMemory.Priority = priority;
         }
 
-        private float escapeMargin;
+        private float movementMargin;
         
         public override void Update(float deltaTime)
         {
             if (DisableEnemyAI) { return; }
-
             base.Update(deltaTime);
-            bool ignorePlatforms = (-Character.AnimController.TargetMovement.Y > Math.Abs(Character.AnimController.TargetMovement.X));
 
-            if (steeringManager is IndoorsSteeringManager)
+            bool ignorePlatforms = Character.AnimController.TargetMovement.Y < -0.5f && (-Character.AnimController.TargetMovement.Y > Math.Abs(Character.AnimController.TargetMovement.X));
+            if (steeringManager == insideSteering)
             {
-                var currPath = ((IndoorsSteeringManager)steeringManager).CurrentPath;
+                var currPath = PathSteering.CurrentPath;
                 if (currPath != null && currPath.CurrentNode != null)
                 {
                     if (currPath.CurrentNode.SimPosition.Y < Character.AnimController.GetColliderBottom().Y)
                     {
-                        ignorePlatforms = true;
+                        // Don't allow to jump from too high.
+                        float allowedJumpHeight = Character.AnimController.ImpactTolerance / 2;
+                        float height = Math.Abs(currPath.CurrentNode.SimPosition.Y - Character.SimPosition.Y);
+                        ignorePlatforms = height < allowedJumpHeight;
                     }
                 }
             }
-            
             Character.AnimController.IgnorePlatforms = ignorePlatforms;
 
             //clients get the facing direction from the server
@@ -376,7 +364,7 @@ namespace Barotrauma
                         return;
                     }
                     float squaredDistance = Vector2.DistanceSquared(WorldPosition, SelectedAiTarget.WorldPosition);
-                    var attackLimb = GetAttackLimb(SelectedAiTarget.WorldPosition);
+                    var attackLimb = AttackingLimb ?? GetAttackLimb(SelectedAiTarget.WorldPosition);
                     if (attackLimb != null && squaredDistance <= Math.Pow(attackLimb.attack.Range, 2))
                     {
                         run = true;
@@ -393,7 +381,7 @@ namespace Barotrauma
                     {
                         bool isBeingChased = IsBeingChased;
                         float reactDistance = !isBeingChased && selectedTargetingParams != null && selectedTargetingParams.ReactDistance > 0 ? selectedTargetingParams.ReactDistance : GetPerceivingRange(SelectedAiTarget);
-                        if (squaredDistance <= Math.Pow(reactDistance + escapeMargin, 2))
+                        if (squaredDistance <= Math.Pow(reactDistance + movementMargin, 2))
                         {
                             float halfReactDistance = reactDistance / 2;
                             float attackDistance = selectedTargetingParams != null && selectedTargetingParams.AttackDistance > 0 ? selectedTargetingParams.AttackDistance : halfReactDistance;
@@ -405,21 +393,48 @@ namespace Barotrauma
                             else
                             {
                                 run = isBeingChased ? true : squaredDistance < Math.Pow(halfReactDistance, 2);
-                                if (escapeMargin <= 0)
+                                if (movementMargin <= 0)
                                 {
-                                    escapeMargin = halfReactDistance;
+                                    movementMargin = halfReactDistance;
                                 }
-                                escapeMargin = MathHelper.Clamp(escapeMargin += deltaTime, halfReactDistance, reactDistance);
+                                movementMargin = MathHelper.Clamp(movementMargin += deltaTime, halfReactDistance, reactDistance);
                                 UpdateEscape(deltaTime);
                             }
                         }
                         else
                         {
-                            escapeMargin = 0;
+                            movementMargin = 0;
                             UpdateIdle(deltaTime);
                         }
                     }
                     break;
+                case AIState.Protect:
+                    if (SelectedAiTarget == null || SelectedAiTarget.Entity == null || SelectedAiTarget.Entity.Removed)
+                    {
+                        State = AIState.Idle;
+                        return;
+                    }
+                    if (SelectedAiTarget.Entity is Character targetCharacter && targetCharacter.LastAttacker is Character attacker)
+                    {
+                        // Attack the character that attacked the target we are protecting
+                        ChangeTargetState(attacker, AIState.Attack, selectedTargetingParams.Priority * 2);
+                        SelectTarget(attacker.AiTarget);
+                        return;
+                    }
+                    float sqrDist = Vector2.DistanceSquared(WorldPosition, SelectedAiTarget.WorldPosition);
+                    float reactDist = selectedTargetingParams != null && selectedTargetingParams.ReactDistance > 0 ? selectedTargetingParams.ReactDistance : GetPerceivingRange(SelectedAiTarget);
+                    if (sqrDist > Math.Pow(reactDist + movementMargin, 2))
+                    {
+                        movementMargin = reactDist;
+                        run = true;
+                        UpdateFollow(deltaTime);
+                    }
+                    else
+                    {
+                        movementMargin = MathHelper.Clamp(movementMargin -= deltaTime, 0, reactDist);
+                        UpdateIdle(deltaTime);
+                    }
+                    break;
                 default:
                     throw new NotImplementedException();
             }
@@ -432,6 +447,8 @@ namespace Barotrauma
                 SwarmBehavior.Refresh();
                 SwarmBehavior.UpdateSteering(deltaTime);
             }
+            // Ensure that the creature keeps inside the level
+            SteerInsideLevel(deltaTime);
             float speed = Character.AnimController.GetCurrentSpeed(run && Character.CanRun);
             steeringManager.Update(speed);
             Character.AnimController.TargetMovement = Character.ApplyMovementLimits(Steering, State == AIState.Idle && Character.AnimController.InWater ? Steering.Length() : speed);
@@ -456,7 +473,6 @@ namespace Barotrauma
                     SteeringManager.SteeringAvoid(deltaTime, lookAheadDistance: avoidLookAheadDistance, weight: 5);
                     return;
                 }
-                SteerInsideLevel(deltaTime);
             }
             var target = SelectedAiTarget ?? _lastAiTarget;
             if (target?.Entity != null && !target.Entity.Removed && PreviousState == AIState.Attack && Character.CurrentHull == null)
@@ -576,10 +592,10 @@ namespace Barotrauma
                 }
                 else if (pathSteering != null)
                 {
-                    if (canAttackSub && hasValidPath)
+                    if (canAttackDoors && hasValidPath)
                     {
                         var door = pathSteering.CurrentPath.CurrentNode?.ConnectedDoor ?? pathSteering.CurrentPath.NextNode?.ConnectedDoor;
-                        if (door != null && !door.IsOpen)
+                        if (door != null && !door.IsOpen && !door.IsBroken)
                         {
                             if (SelectedAiTarget != door.Item.AiTarget)
                             {
@@ -615,7 +631,6 @@ namespace Barotrauma
                 {
                     SteeringManager.SteeringWander();
                     SteeringManager.SteeringAvoid(deltaTime, lookAheadDistance: avoidLookAheadDistance, weight: 5);
-                    SteerInsideLevel(deltaTime);
                 }
             }
         }
@@ -641,13 +656,18 @@ namespace Barotrauma
             if (SelectedAiTarget.Entity is Item item)
             {
                 // If the item is held by a character, attack the character instead.
-                var pickable = item.GetComponent<Pickable>();
-                if (pickable != null)
+                Character owner = GetOwner(item);
+                if (owner != null)
                 {
-                    var target = pickable.Picker?.AiTarget;
-                    if (target?.Entity != null && !target.Entity.Removed)
+                    if (IsFriendly(Character, owner))
                     {
-                        SelectedAiTarget = target;
+                        ResetAITarget();
+                        State = AIState.Idle;
+                        return;
+                    }
+                    else
+                    {
+                        SelectedAiTarget = owner.AiTarget;
                     }
                 }
             }
@@ -659,7 +679,8 @@ namespace Barotrauma
                 {
                     attackWorldPos += wallTarget.Structure.Submarine.Position;
                 }
-                attackSimPos = ConvertUnits.ToSimUnits(attackWorldPos);
+                attackSimPos = Character.Submarine == wallTarget.Structure.Submarine ? wallTarget.Position : attackWorldPos;
+                attackSimPos = ConvertUnits.ToSimUnits(attackSimPos);
             }
             else
             {
@@ -685,7 +706,7 @@ namespace Barotrauma
                         WallSection section = wall.Sections[i];
                         if (CanPassThroughHole(wall, i) && section?.gap != null)
                         {
-                            if (SteerThroughGap(wall, section, section.gap.WorldPosition, deltaTime))
+                            if (SteerThroughGap(wall, section, wall.SectionPosition(i, true), deltaTime))
                             {
                                 return;
                             }
@@ -697,7 +718,7 @@ namespace Barotrauma
                     var door = i.GetComponent<Door>();
                     // Steer through the door manually if it's open or broken
                     // Don't try to enter dry hulls if cannot walk or if the gap is too narrow
-                    if (door?.LinkedGap?.FlowTargetHull != null && !door.LinkedGap.IsRoomToRoom && door.IsOpen)
+                    if (door?.LinkedGap?.FlowTargetHull != null && !door.LinkedGap.IsRoomToRoom && (door.IsOpen || door.IsBroken))
                     {
                         if (Character.AnimController.CanWalk || door.LinkedGap.FlowTargetHull.WaterPercentage > 25)
                         {
@@ -715,7 +736,6 @@ namespace Barotrauma
             }
             else if (SelectedAiTarget.Entity is Structure w && wallTarget == null)
             {
-                // Targeting only the outer walls
                 bool isBroken = true;
                 for (int i = 0; i < w.Sections.Length; i++)
                 {
@@ -886,24 +906,11 @@ namespace Barotrauma
                 }
                 canAttack = AttackingLimb != null && AttackingLimb.attack.CoolDownTimer <= 0;
             }
-            if (!canAttack && SelectedAiTarget.Entity.Submarine != null && !canAttackSub)
+            if (!Character.AnimController.SimplePhysicsEnabled && SelectedAiTarget.Entity.Submarine != null && Character.Submarine == null && (!canAttackDoors || !canAttackWalls || !AIParams.TargetOuterWalls))
             {
-                float dist = Vector2.Distance(Character.AnimController.MainLimb.WorldPosition, attackWorldPos);
-                if (wallTarget != null)
+                if (Vector2.Distance(Character.WorldPosition, attackWorldPos) < 2000 * 2000)
                 {
-                    // Steer towards the target, but turn away if a wall is blocking the way
-                    if (dist < ConvertUnits.ToDisplayUnits(colliderLength) * 3)
-                    {
-                        State = AIState.Idle;
-                        IgnoreTarget(SelectedAiTarget);
-                        // Resetting the ai target prevents the character from chasing it
-                        ResetAITarget();
-                        return;
-                    }
-                }
-                else if (dist < 1000)
-                {
-                    // Check that we are not bumping into a door
+                    // Check that we are not bumping into a door or a wall
                     Vector2 rayStart = SimPosition;
                     if (Character.Submarine == null)
                     {
@@ -912,9 +919,10 @@ namespace Barotrauma
                     Vector2 toTarget = SelectedAiTarget.WorldPosition - WorldPosition;
                     Vector2 rayEnd = rayStart + toTarget.ClampLength(Character.AnimController.Collider.GetLocalFront().Length() * 2);
                     Body closestBody = Submarine.CheckVisibility(rayStart, rayEnd, ignoreSubs: true);
-                    if (Submarine.LastPickedFraction != 1.0f && closestBody != null && closestBody.UserData is Item i && i.Submarine != null && i.GetComponent<Door>() != null)
+                    if (Submarine.LastPickedFraction != 1.0f && closestBody != null && 
+                        (!AIParams.TargetOuterWalls || !canAttackWalls && closestBody.UserData is Structure s && s.Submarine != null || !canAttackDoors && closestBody.UserData is Item i && i.Submarine != null && i.GetComponent<Door>() != null))
                     {
-                        // Target is unreachable, there's a door ahead
+                        // Target is unreachable, there's a door or wall ahead
                         State = AIState.Idle;
                         IgnoreTarget(SelectedAiTarget);
                         ResetAITarget();
@@ -925,7 +933,7 @@ namespace Barotrauma
             float distance = 0;
             Limb attackTargetLimb = null;
             Character targetCharacter = SelectedAiTarget.Entity as Character;
-            if (canAttack)
+            if (canAttack && !Character.AnimController.SimplePhysicsEnabled)
             {
                 // Target a specific limb instead of the target center position
                 if (wallTarget == null && targetCharacter != null)
@@ -943,7 +951,7 @@ namespace Barotrauma
                     attackSimPos = Character.GetRelativeSimPosition(attackTargetLimb);
                 }
                 // Check that we can reach the target
-                Vector2 toTarget = attackWorldPos - AttackingLimb.WorldPosition;
+                Vector2 toTarget = attackWorldPos - (Character.AnimController.SimplePhysicsEnabled ? Character.WorldPosition : AttackingLimb.WorldPosition);
                 if (wallTarget != null)
                 {
                     if (wallTarget.Structure.Submarine != null)
@@ -980,7 +988,15 @@ namespace Barotrauma
                 {
                     // If not, reset the attacking limb, if the cooldown is not running
                     // Don't use the property, because we don't want cancel reversing, if we are reversing.
-                    _attackingLimb = null;
+                    if (attackLimbResetTimer > attackLimbResetInterval)
+                    {
+                        _attackingLimb = null;
+                        attackLimbResetTimer = 0;
+                    }
+                    else
+                    {
+                        attackLimbResetTimer += deltaTime;
+                    }
                 }
             }
             Limb steeringLimb = canAttack ? AttackingLimb : null;
@@ -1020,21 +1036,25 @@ namespace Barotrauma
             }
             else
             {
-                Vector2 offset = Character.SimPosition - steeringLimb.SimPosition;
-                // Offset so that we don't overshoot the movement
-                Vector2 steerPos = attackSimPos + offset;
+                Vector2 steerPos = attackSimPos;
+                if (!Character.AnimController.SimplePhysicsEnabled)
+                {
+                    // Offset so that we don't overshoot the movement
+                    Vector2 offset = Character.SimPosition - steeringLimb.SimPosition;
+                    steerPos += offset;
+                }
                 if (SteeringManager is IndoorsSteeringManager pathSteering)
                 {
                     if (pathSteering.CurrentPath != null)
                     {
                         // Attack doors
-                        if (canAttackSub)
+                        if (canAttackDoors)
                         {
                             // If the target is in the same hull, there shouldn't be any doors blocking the path
                             if (targetCharacter == null || targetCharacter.CurrentHull != Character.CurrentHull)
                             {
                                 var door = pathSteering.CurrentPath.CurrentNode?.ConnectedDoor ?? pathSteering.CurrentPath.NextNode?.ConnectedDoor;
-                                if (door != null && !door.IsOpen)
+                                if (door != null && !door.IsOpen && !door.IsBroken)
                                 {
                                     if (door.Item.AiTarget != null && SelectedAiTarget != door.Item.AiTarget)
                                     {
@@ -1045,15 +1065,17 @@ namespace Barotrauma
                             }
                         }
                         // Steer towards the target if in the same room and swimming
-                        if ((Character.AnimController.InWater || pursue) && targetCharacter != null && VisibleHulls.Contains(targetCharacter.CurrentHull))
+                        if ((Character.AnimController.InWater || pursue || !Character.AnimController.CanWalk) &&
+                            (targetCharacter != null && VisibleHulls.Contains(targetCharacter.CurrentHull) || Character.CanSeeTarget(SelectedAiTarget.Entity)))
                         {
-                            SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(attackSimPos - steeringLimb.SimPosition));
+                            Vector2 myPos = Character.AnimController.SimplePhysicsEnabled ? Character.SimPosition : steeringLimb.SimPosition;
+                            SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(steerPos - myPos));
                         }
                         else
                         {
                             SteeringManager.SteeringSeek(steerPos, 2);
                             // Switch to Idle when cannot reach the target and if cannot damage the walls
-                            if ((!canAttackSub || wallTarget == null) && !pathSteering.IsPathDirty && pathSteering.CurrentPath.Unreachable)
+                            if ((!canAttackWalls || wallTarget == null) && !pathSteering.IsPathDirty && pathSteering.CurrentPath.Unreachable)
                             {
                                 State = AIState.Idle;
                                 return;
@@ -1112,6 +1134,8 @@ namespace Barotrauma
             return false;
         }
 
+        private readonly List<Limb> attackLimbs = new List<Limb>();
+        private readonly List<float> weights = new List<float>();
         private Limb GetAttackLimb(Vector2 attackWorldPos, Limb ignoredLimb = null)
         {
             var currentContexts = Character.GetAttackContexts();
@@ -1127,23 +1151,38 @@ namespace Barotrauma
                 if (attack == null) { continue; }
                 if (attack.CoolDownTimer > 0) { continue; }
                 if (!attack.IsValidContext(currentContexts)) { continue; }
-                if (!attack.IsValidTarget(target)) { continue; }
+                if (!attack.IsValidTarget(target as IDamageable)) { continue; }
                 if (target is ISerializableEntity se && target is Character)
                 {
                     if (attack.Conditionals.Any(c => !c.Matches(se))) { continue; }
                 }
                 if (attack.Conditionals.Any(c => c.TargetSelf && !c.Matches(Character))) { continue; }
-                float priority = CalculatePriority(limb, attackWorldPos);
-                if (priority > currentPriority)
+                if (AIParams.RandomAttack)
                 {
-                    currentPriority = priority;
-                    selectedLimb = limb;
+                    attackLimbs.Add(limb);
+                    weights.Add(limb.attack.Priority);
                 }
+                else
+                {
+                    float priority = CalculatePriority(limb, attackWorldPos);
+                    if (priority > currentPriority)
+                    {
+                        currentPriority = priority;
+                        selectedLimb = limb;
+                    }
+                }
+            }
+            if (AIParams.RandomAttack)
+            {
+                selectedLimb = ToolBox.SelectWeightedRandom(attackLimbs, weights, Rand.RandSync.Server);
+                attackLimbs.Clear();
+                weights.Clear();
             }
             return selectedLimb;
 
             float CalculatePriority(Limb limb, Vector2 attackPos)
             {
+                if (Character.AnimController.SimplePhysicsEnabled) { return 1 + limb.attack.Priority; }
                 float dist = Vector2.Distance(limb.WorldPosition, attackPos);
                 // The limb is ignored if the target is not close. Prevents character going in reverse if very far away from it.
                 // We also need a max value that is more than the actual range.
@@ -1171,7 +1210,7 @@ namespace Barotrauma
             Body closestBody = Submarine.CheckVisibility(rayStart, rayEnd, ignoreSubs: true, ignoreSensors: CanEnterSubmarine, ignoreDisabledWalls: CanEnterSubmarine);
             if (Submarine.LastPickedFraction != 1.0f && closestBody != null)
             {
-                if (closestBody.UserData is Structure wall && wall.Submarine != null)
+                if (closestBody.UserData is Structure wall && wall.Submarine != null && (wall.Submarine.Info.IsPlayer || wall.Submarine.Info.IsOutpost && TargetOutposts))
                 {
                     int sectionIndex = wall.FindSectionIndex(ConvertUnits.ToDisplayUnits(Submarine.LastPickedPosition));
                     float sectionDamage = wall.SectionDamage(sectionIndex);
@@ -1210,7 +1249,10 @@ namespace Barotrauma
                     LatchOntoAI?.SetAttachTarget(wall.Submarine.PhysicsBody.FarseerBody, wall.Submarine, ConvertUnits.ToSimUnits(sectionPos), attachTargetNormal);
                     if (Character.AnimController.CanEnterSubmarine || !wall.SectionBodyDisabled(sectionIndex) && !IsWallDisabled(wall))
                     {
-                        wallTarget = new WallTarget(sectionPos, wall, sectionIndex);
+                        if (AIParams.TargetOuterWalls || wall.prefab.Tags.Contains("inner"))
+                        {
+                            wallTarget = new WallTarget(sectionPos, wall, sectionIndex);
+                        }
                     }
                 }
                 if (!Character.AnimController.CanEnterSubmarine && wallTarget == null)
@@ -1239,7 +1281,7 @@ namespace Barotrauma
             }
             return isDisabled;
         }
-        
+
         public override void OnAttacked(Character attacker, AttackResult attackResult)
         {
             float reactionTime = Rand.Range(0.1f, 0.3f);
@@ -1249,22 +1291,28 @@ namespace Barotrauma
             Character.AnimController.ReleaseStuckLimbs();
             LatchOntoAI?.DeattachFromBody();
             if (attacker == null || attacker.AiTarget == null) { return; }
+            bool isFriendly = IsFriendly(Character, attacker);
             if (wasLatched)
             {
                 avoidTimer = avoidTime * Rand.Range(0.75f, 1.25f);
-                SelectTarget(attacker.AiTarget);
+                if (!isFriendly)
+                {
+                    SelectTarget(attacker.AiTarget);
+                }
                 return;
             }
 
             if (State == AIState.Flee)
             {
-                SelectTarget(attacker.AiTarget);
+                if (!isFriendly)
+                {
+                    SelectTarget(attacker.AiTarget);
+                }
                 return;
             }
-
-            if (attackResult.Damage > 0.0f)
+            if (!isFriendly && attackResult.Damage > 0.0f)
             {
-                bool canAttack = attacker.Submarine == Character.Submarine && canAttackCharacters || attacker.Submarine != null && canAttackSub;
+                bool canAttack = attacker.Submarine == Character.Submarine && canAttackCharacters || attacker.Submarine != null && canAttackWalls;
                 if (Character.Params.AI.AttackWhenProvoked && canAttack)
                 {
                     if (attacker.IsHusk)
@@ -1322,7 +1370,7 @@ namespace Barotrauma
             targetMemory.Priority += GetRelativeDamage(attackResult.Damage, Character.Vitality) * AggressionHurt;
 
             // Only allow to react once. Otherwise would attack the target with only a fraction of a cooldown
-            bool retaliate = SelectedAiTarget != attacker.AiTarget && attacker.Submarine == Character.Submarine;
+            bool retaliate = !isFriendly && SelectedAiTarget != attacker.AiTarget && attacker.Submarine == Character.Submarine;
             bool avoidGunFire = Character.Params.AI.AvoidGunfire && attacker.Submarine != Character.Submarine;
 
             if (State == AIState.Attack && !IsCoolDownRunning)
@@ -1367,6 +1415,8 @@ namespace Barotrauma
             IDamageable damageTarget = wallTarget != null ? wallTarget.Structure : SelectedAiTarget.Entity as IDamageable;
             if (damageTarget != null)
             {
+                //simulate attack input to get the character to attack client-side
+                Character.SetInput(InputType.Attack, true, true);
                 if (attackingLimb.UpdateAttack(deltaTime, attackSimPos, damageTarget, out AttackResult attackResult, distance, targetLimb))
                 {
                     if (damageTarget.Health > 0)
@@ -1424,7 +1474,7 @@ namespace Barotrauma
                     State = AIState.Idle;
                     return;
                 }
-                Vector2 mouthPos = Character.AnimController.GetMouthPosition().Value;
+                Vector2 mouthPos = Character.AnimController.SimplePhysicsEnabled ? SimPosition : Character.AnimController.GetMouthPosition().Value;
                 Vector2 attackSimPosition = Character.GetRelativeSimPosition(target);
                 Vector2 limbDiff = attackSimPosition - mouthPos;
                 float extent = Math.Max(mouthLimb.body.GetMaxExtent(), 2);
@@ -1453,6 +1503,25 @@ namespace Barotrauma
 
         #endregion
 
+        private void UpdateFollow(float deltaTime)
+        {
+            if (SelectedAiTarget == null || SelectedAiTarget.Entity == null || SelectedAiTarget.Entity.Removed)
+            {
+                State = AIState.Idle;
+                return;
+            }
+            Vector2 dir = Vector2.Normalize(SelectedAiTarget.Entity.WorldPosition - Character.WorldPosition);
+            if (!MathUtils.IsValid(dir))
+            {
+                return;
+            }
+            steeringManager.SteeringManual(deltaTime, dir);
+            if (Character.AnimController.InWater)
+            {
+                SteeringManager.SteeringAvoid(deltaTime, lookAheadDistance: avoidLookAheadDistance, weight: 15);
+            }
+        }
+
         #region Targeting
         private bool IsLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub;
 
@@ -1579,13 +1648,16 @@ namespace Barotrauma
                     Door door = null;
                     if (aiTarget.Entity is Item item)
                     {
-                        //item inside and we're outside -> attack the hull
-                        if (item.CurrentHull != null && character.CurrentHull == null)
-                        {
-                            targetingTag = "room";
-                        }
-
                         door = item.GetComponent<Door>();
+                        bool targetingFromOutsideToInside = item.CurrentHull != null && character.CurrentHull == null;
+                        if (targetingFromOutsideToInside)
+                        {
+                            if (door != null && !canAttackDoors || !canAttackWalls)
+                            {
+                                // Can't reach
+                                continue;
+                            }
+                        }
                         foreach (var prio in AIParams.Targets)
                         {
                             if (item.HasTag(prio.Tag))
@@ -1594,7 +1666,25 @@ namespace Barotrauma
                                 break;
                             }
                         }
-
+                        if (door == null && targetingTag == null)
+                        {
+                            if (item.GetComponent<Sonar>() != null)
+                            {
+                                targetingTag = "sonar";
+                            }
+                            else if (targetingFromOutsideToInside)
+                            {
+                                targetingTag = "room";
+                            }
+                        }
+                        else if (targetingTag == "nasonov")
+                        {
+                            if ((item.Submarine == null || !item.Submarine.Info.IsPlayer) && item.ParentInventory == null)
+                            {
+                                // Only target nasonovartifacts when they are held be a player or inside the playersub
+                                continue;
+                            }
+                        }
                         // Ignore the target if it's a decoy and the character is already inside a sub
                         if (character.CurrentHull != null && targetingTag == "decoy")
                         {
@@ -1609,15 +1699,13 @@ namespace Barotrauma
                             // Ignore structures that doesn't have a body (not walls)
                             continue;
                         }
-                        if (s.IsPlatform)
+                        if (s.IsPlatform) { continue; }
+                        if (s.Submarine == null) { continue; }
+                        bool isCharacterInside = character.CurrentHull != null;
+                        bool isInnerWall = s.prefab.Tags.Contains("inner");
+                        if (isInnerWall && !isCharacterInside)
                         {
-                            continue;
-                        }
-                        bool isCharacterOutside = s.Submarine == null || character.CurrentHull == null;
-                        bool targetInnerWalls = AIParams.TargetInnerWalls;
-                        if (!isCharacterOutside && !targetInnerWalls)
-                        {
-                            // Ignore walls when inside (walltargets still work)
+                            // Ignore inner walls when outside (walltargets still work)
                             continue;
                         }
                         valueModifier = 1;
@@ -1630,39 +1718,70 @@ namespace Barotrauma
                             var section = s.Sections[i];
                             if (section.gap == null) { continue; }
                             bool leadsInside = !section.gap.IsRoomToRoom && section.gap.FlowTargetHull != null;
+                            isInnerWall = isInnerWall || !leadsInside;
                             if (Character.AnimController.CanEnterSubmarine)
                             {
-                                if (isCharacterOutside)
+                                if (!isCharacterInside)
                                 {
                                     if (CanPassThroughHole(s, i))
                                     {
-                                        valueModifier *= leadsInside ? (AggressiveBoarding ? 5 : 1) : (targetInnerWalls ? 1 : 0);
+                                        valueModifier *= leadsInside ? (AggressiveBoarding ? 5 : 1) : 0;
+                                    }
+                                    else if (AggressiveBoarding && leadsInside && canAttackWalls && AIParams.TargetOuterWalls)
+                                    {
+                                        // Up to 100% priority increase for every gap in the wall when an aggressive boarder is outside
+                                        valueModifier *= 1 + section.gap.Open;
+                                    }
+                                }
+                                else
+                                {
+                                    // Inside
+                                    if (AggressiveBoarding)
+                                    {
+                                        if (!isInnerWall)
+                                        {
+                                            // Only interested in getting inside (aggressive boarder) -> don't target outer walls when already inside
+                                            valueModifier = 0;
+                                            break;
+                                        }
+                                        else if (CanPassThroughHole(s, i))
+                                        {
+                                            valueModifier *= isInnerWall ? 1 : 0;
+                                        }
+                                        else if (!canAttackWalls)
+                                        {
+                                            valueModifier = 0;
+                                            break;
+                                        }
                                     }
                                     else
                                     {
-                                        // Ignore holes that cannot be passed through if cannot attack items/structures. Holes that are big enough should be targeted, so that we can get in
-                                        if (!canAttackSub)
+                                        if (!canAttackWalls)
                                         {
-                                            continue;
-                                        }
-                                        if (AggressiveBoarding && leadsInside)
-                                        {
-                                            // Up to 100% priority increase for every gap in the wall when an aggressive boarder is outside
-                                            valueModifier *= 1 + section.gap.Open;
+                                            valueModifier = 0;
+                                            break;
                                         }
+                                        // We are actually interested in breaking things -> reduce the priority when the wall is already broken
+                                        // (Terminalcells)
+                                        valueModifier *= 1 - section.gap.Open * 0.25f;
                                     }
                                 }
-                                else if (!canAttackSub || CanPassThroughHole(s, i))
-                                {
-                                    // Already inside -> ignore holes in the walls and ignore walls if cannot attack the sub.
-                                    continue;
-                                }
                             }
-                            else if (!leadsInside || !canAttackSub)
+                            else
                             {
-                                // Can't get in, ignore inner walls
-                                // Also ignore all walls if cannot attack the sub
-                                continue;
+                                // Cannot enter
+                                if (isInnerWall || !canAttackWalls)
+                                {
+                                    // Ignore inner walls and all walls if cannot do damage on walls.
+                                    valueModifier = 0;
+                                    break;
+                                }
+                                else if (AggressiveBoarding)
+                                {
+                                    // Up to 100% priority increase for every gap in the wall when an aggressive boarder is outside
+                                    // (Bonethreshers)
+                                    valueModifier *= 1 + section.gap.Open;
+                                }
                             }
                         }
                     }
@@ -1679,31 +1798,34 @@ namespace Barotrauma
                         }
                         if (door.Item.Submarine == null) { continue;}
                         bool isOutdoor = door.LinkedGap?.FlowTargetHull != null && !door.LinkedGap.IsRoomToRoom;
-                        bool isOpen = door.IsOpen;
-                        if (!isOpen && (!canAttackSub))
+                        bool isOpen = door.IsOpen || door.IsBroken;
+                        if (!isOpen && !canAttackDoors || (isOutdoor && !AIParams.TargetOuterWalls))
                         {
-                            // Ignore doors that are not open if cannot attack items/structures. Open doors should be targeted, so that we can get in if we are aggressive boarders
-                            valueModifier = 0;
+                            // Ignore doors that are not open if cannot attack doors or shouldn't target outer doors.
+                            continue;
                         }
-                        if (character.CurrentHull == null)
+                        if (isOpen && (!Character.AnimController.CanEnterSubmarine || !AggressiveBoarding))
                         {
-                            valueModifier = isOutdoor ? 1 : 0;
+                            // Ignore broken and open doors
+                            // Aggressive boarders don't ignore open doors, because they use them for get in.
+                            continue;
                         }
-                        else if (AggressiveBoarding)
+                        if (AggressiveBoarding)
                         {
-                            // Increase priority if the character is outside and an aggressive boarder, and the door is from outside to inside
-                            if (character.CurrentHull == null)
+                            // Increase the priority if the character is outside and the door is from outside to inside
+                            if (character.CurrentHull == null && isOutdoor)
                             {
                                 valueModifier *= isOpen ? 5 : 1;
                             }
                             else
                             {
-                                valueModifier *= isOpen ? 0 : 1;
+                                // Inside
+                                valueModifier *= isOpen || isOutdoor ? 0 : 1;
                             }
                         }
-                        else if (!Character.AnimController.CanEnterSubmarine && isOpen) //ignore broken and open doors
+                        else if (character.CurrentHull == null)
                         {
-                            continue;
+                            valueModifier = isOutdoor ? 1 : 0;
                         }
                     }
                     else if (aiTarget.Entity is IDamageable targetDamageable && targetDamageable.Health <= 0.0f)
@@ -1745,9 +1867,18 @@ namespace Barotrauma
 
                 if (valueModifier > targetValue)
                 {
-                    // Don't target items that we own. 
-                    // This is a rare case, and almost entirely related to Humanhusks, so let's check it last to reduce unnecessary checks (although the check shouldn't be expensive)
-                    if (aiTarget.Entity is Item i && i.IsOwnedBy(character)) { continue; }
+                    if (aiTarget.Entity is Item i)
+                    {
+                        Character owner = GetOwner(i);
+                        // Don't target items that we own. 
+                        // This is a rare case, and almost entirely related to Humanhusks, so let's check it last to reduce unnecessary checks (although the check shouldn't be expensive)
+                        if (owner == character) { continue; }
+                        if (owner != null && IsFriendly(Character, owner))
+                        {
+                            // If the item is held by a friendly character, ignore it.
+                            continue;
+                        }
+                    }
                     if (targetCharacter != null)
                     {
                         if (targetCharacter.Submarine != Character.Submarine)
@@ -1772,7 +1903,7 @@ namespace Barotrauma
                                     foreach (var gap in Character.CurrentHull.ConnectedGaps)
                                     {
                                         var door = gap.ConnectedDoor;
-                                        if (door == null || !door.IsOpen)
+                                        if (door == null || !door.IsOpen && !door.IsBroken)
                                         {
                                             var wall = gap.ConnectedWall;
                                             if (wall != null)
@@ -1966,11 +2097,17 @@ namespace Barotrauma
                 {
                     // If the target is shooting from the submarine, we might not perceive it because it doesn't move.
                     // --> Target the submarine too.
-                    if (target.Submarine != null && canAttackSub)
+                    if (target.Submarine != null && (canAttackDoors || canAttackWalls))
                     {
                         ChangeParams("room", state, priority);
-                        ChangeParams("wall", state, priority);
-                        ChangeParams("door", state, priority);
+                        if (canAttackWalls)
+                        {
+                            ChangeParams("wall", state, priority);
+                        }
+                        if (canAttackDoors)
+                        {
+                            ChangeParams("door", state, priority);
+                        }
                     }
                     ChangeParams("provocative", state, priority, onlyExisting: true);
                     ChangeParams("light", state, priority, onlyExisting: true);
@@ -1991,7 +2128,7 @@ namespace Barotrauma
             Character.AnimController.ReleaseStuckLimbs();
             escapeTarget = null;
             AttackingLimb = null;
-            escapeMargin = 0;
+            movementMargin = 0;
             allGapsSearched = false;
             unreachableGaps.Clear();
             if (isStateChanged && to == AIState.Idle && from != to)
@@ -2016,28 +2153,66 @@ namespace Barotrauma
             }
         }
 
+        public void ReevaluateAttacks()
+        {
+            canAttackWalls = LatchOntoAI != null && LatchOntoAI.AttachToSub;
+            canAttackDoors = false;
+            canAttackCharacters = false;
+            foreach (var limb in Character.AnimController.Limbs)
+            {
+                if (limb.IsSevered) { continue; }
+                if (limb.attack == null) { continue; }
+                if (!canAttackWalls)
+                {
+                    canAttackWalls = limb.attack.IsValidTarget(AttackTarget.Structure) && limb.attack.StructureDamage > 0;
+                }
+                if (!canAttackDoors)
+                {
+                    canAttackDoors = limb.attack.IsValidTarget(AttackTarget.Structure) && limb.attack.ItemDamage > 0;
+                }
+                if (!canAttackCharacters)
+                {
+                    canAttackCharacters = limb.attack.IsValidTarget(AttackTarget.Character);
+                }
+            }
+            if (PathSteering != null)
+            {
+                PathSteering.CanBreakDoors = canAttackDoors;
+            }
+        }
+
+        private Vector2 returnDir;
+        private float returnTimer;
         private void SteerInsideLevel(float deltaTime)
         {
-            if (Level.Loaded == null) { return; } 
-            
-            Vector2 levelSimSize = new Vector2(
-                ConvertUnits.ToSimUnits(Level.Loaded.Size.X),
-                ConvertUnits.ToSimUnits(Level.Loaded.Size.Y));
-
-            float margin = 10.0f;
-
-            if (SimPosition.Y < 0.0)
+            if (SteeringManager is IndoorsSteeringManager) { return; }
+            if (Level.Loaded == null) { return; }
+            Vector2 levelSimSize = ConvertUnits.ToSimUnits(Level.Loaded.Size.X, Level.Loaded.Size.Y);
+            float returnTime = 3;
+            if (SimPosition.Y < 0)
             {
-                steeringManager.SteeringManual(deltaTime, Vector2.UnitY * MathUtils.InverseLerp(0.0f, -margin, SimPosition.Y));
+                // Too far down
+                returnTimer = returnTime * Rand.Range(0.75f, 1.25f);
+                returnDir = Vector2.UnitY;
             }
-            if (SimPosition.X < 0.0f)
+            if (SimPosition.X < 0)
             {
-                steeringManager.SteeringManual(deltaTime, Vector2.UnitX * MathUtils.InverseLerp(0.0f, -margin, SimPosition.X));
+                // Too far left
+                returnTimer = returnTime * Rand.Range(0.75f, 1.25f);
+                returnDir = Vector2.UnitX;
             }
             if (SimPosition.X > levelSimSize.X)
             {
-                steeringManager.SteeringManual(deltaTime, Vector2.UnitX * MathUtils.InverseLerp(levelSimSize.X, levelSimSize.X + margin, SimPosition.X));
-            }            
+                // Too far right
+                returnTimer = returnTime * Rand.Range(0.75f, 1.25f);
+                returnDir = -Vector2.UnitX;
+            }
+            if (returnTimer > 0)
+            {
+                returnTimer -= deltaTime;
+                SteeringManager.Reset();
+                SteeringManager.SteeringManual(deltaTime, returnDir);
+            }
         }
 
         private bool CanPassThroughHole(Structure wall, int sectionIndex)
@@ -2068,7 +2243,6 @@ namespace Barotrauma
             targetLimbs.Clear();
             foreach (var limb in target.AnimController.Limbs)
             {
-                if (limb.IsSevered) { continue; }
                 if (limb.type == targetLimbType || targetLimbType == LimbType.None)
                 {
                     targetLimbs.Add(limb);
@@ -2083,6 +2257,7 @@ namespace Barotrauma
             Limb targetLimb = null;
             foreach (Limb limb in targetLimbs)
             {
+                if (limb.IsSevered) { continue; }
                 float dist = Vector2.DistanceSquared(limb.WorldPosition, attackLimb.WorldPosition) / Math.Max(limb.AttackPriority, 0.1f);
                 if (dist < closestDist)
                 {
@@ -2092,6 +2267,27 @@ namespace Barotrauma
             }
             return targetLimb;
         }
+
+        private Character GetOwner(Item item)
+        {
+            // If the item is held by a character, attack the character instead.
+            var pickable = item.GetComponent<Pickable>();
+            if (pickable != null)
+            {
+                Character owner = pickable.Picker ?? item.FindParentInventory(i => i.Owner is Character)?.Owner as Character;
+                if (owner != null)
+                {
+                    var target = owner.AiTarget;
+                    if (target?.Entity != null && !target.Entity.Removed)
+                    {
+                        return owner;
+                    }
+                }
+            }
+            return null;
+        }
+
+        public static bool IsFriendly(Character me, Character other) => other.SpeciesName == me.SpeciesName || other.Params.CompareGroup(me.Params.Group);
     }
 
     //the "memory" of the Character 

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs

@@ -30,8 +30,9 @@ namespace Barotrauma
 
         public static float HULL_SAFETY_THRESHOLD = 50;
 
-        public HashSet<Hull> UnreachableHulls { get; private set; } = new HashSet<Hull>();
-        public HashSet<Hull> UnsafeHulls { get; private set; } = new HashSet<Hull>();
+        public readonly HashSet<Hull> UnreachableHulls = new HashSet<Hull>();
+        public readonly HashSet<Hull> UnsafeHulls = new HashSet<Hull>();
+        public readonly List<Item> IgnoredItems = new List<Item>();
 
         private SteeringManager outsideSteering, insideSteering;
 
@@ -55,13 +56,13 @@ namespace Barotrauma
             private set;
         }
 
-        public float CurrentHullSafety { get; private set; }
+        public float CurrentHullSafety { get; private set; } = 100;
 
         public HumanAIController(Character c) : base(c)
         {
             if (!c.IsHuman)
             {
-                throw new System.Exception($"Tried to create a human ai controller for a non-human: {c.SpeciesName}!");
+                throw new Exception($"Tried to create a human ai controller for a non-human: {c.SpeciesName}!");
             }
             insideSteering = new IndoorsSteeringManager(this, true, false);
             outsideSteering = new SteeringManager(this);
@@ -85,7 +86,7 @@ namespace Barotrauma
             {
                 unreachableClearTimer = clearUnreachableInterval;
                 UnreachableHulls.Clear();
-                ignoredContainers.Clear();
+                IgnoredItems.Clear();
             }
 
             // Use the pathfinding also outside of the sub, but not farther than the extents of the sub + 500 units.
@@ -175,9 +176,7 @@ namespace Barotrauma
             }
             steeringManager.Update(Character.AnimController.GetCurrentSpeed(run && Character.CanRun));
 
-            bool ignorePlatforms = Character.AnimController.TargetMovement.Y < -0.5f &&
-                (-Character.AnimController.TargetMovement.Y > Math.Abs(Character.AnimController.TargetMovement.X));
-
+            bool ignorePlatforms = Character.AnimController.TargetMovement.Y < -0.5f && (-Character.AnimController.TargetMovement.Y > Math.Abs(Character.AnimController.TargetMovement.X));
             if (steeringManager == insideSteering)
             {
                 var currPath = PathSteering.CurrentPath;
@@ -185,51 +184,24 @@ namespace Barotrauma
                 {
                     if (currPath.CurrentNode.SimPosition.Y < Character.AnimController.GetColliderBottom().Y)
                     {
-                        // Don't allow to jump from too high. The formula might require tweaking.
+                        // Don't allow to jump from too high.
                         float allowedJumpHeight = Character.AnimController.ImpactTolerance / 2;
                         float height = Math.Abs(currPath.CurrentNode.SimPosition.Y - Character.SimPosition.Y);
                         ignorePlatforms = height < allowedJumpHeight;
                     }
                 }
-
                 if (Character.IsClimbing && PathSteering.IsNextLadderSameAsCurrent)
                 {
                     Character.AnimController.TargetMovement = new Vector2(0.0f, Math.Sign(Character.AnimController.TargetMovement.Y));
                 }
             }
-
             Character.AnimController.IgnorePlatforms = ignorePlatforms;
 
             Vector2 targetMovement = AnimController.TargetMovement;
-
             if (!Character.AnimController.InWater)
             {
                 targetMovement = new Vector2(Character.AnimController.TargetMovement.X, MathHelper.Clamp(Character.AnimController.TargetMovement.Y, -1.0f, 1.0f));
             }
-
-            if (Character.AnimController.InWater && targetMovement.LengthSquared() < 0.000001f)
-            {
-                bool isAiming = false;
-                var holdable = Character.SelectedConstruction?.GetComponent<Holdable>();
-                if (holdable != null)
-                {
-                    isAiming = holdable.ControlPose;
-                }
-                bool swimInPlace = !isAiming;
-                if (swimInPlace && ObjectiveManager.GetActiveObjective() is AIObjectiveGoTo goToObjective)
-                {
-                    if (goToObjective.Target != Character)
-                    {
-                        swimInPlace = false;
-                    }
-                }
-                if (swimInPlace)
-                {
-                    // Swim in place so that we don't fall motionless and look dead.
-                    targetMovement = new Vector2(targetMovement.X, Rand.Range(-0.001f, 0.001f));
-                }
-            }
-
             Character.AnimController.TargetMovement = Character.ApplyMovementLimits(targetMovement, AnimController.GetCurrentSpeed(run));
 
             flipTimer -= deltaTime;
@@ -280,14 +252,14 @@ namespace Barotrauma
                         else
                         {
                             findItemState = FindItemState.Extinguisher;
-                            if (FindSuitableContainer(Character, extinguisher, out Item targetContainer))
+                            if (FindSuitableContainer(extinguisher, out Item targetContainer))
                             {
                                 findItemState = FindItemState.None;
                                 itemIndex = 0;
                                 if (targetContainer != null)
                                 {
                                     var decontainObjective = new AIObjectiveDecontainItem(Character, extinguisher, ObjectiveManager, targetContainer: targetContainer.GetComponent<ItemContainer>());
-                                    decontainObjective.Abandoned += () => ignoredContainers.Add(targetContainer);
+                                    decontainObjective.Abandoned += () => IgnoredItems.Add(targetContainer);
                                     ObjectiveManager.CurrentObjective.AddSubObjective(decontainObjective, addFirst: true);
                                     return;
                                 }
@@ -310,42 +282,47 @@ namespace Barotrauma
                         || ObjectiveManager.IsCurrentObjective<AIObjectiveFindSafety>() 
                         || ObjectiveManager.CurrentObjective.GetSubObjectivesRecursive(true).Any(o => o.KeepDivingGearOn);
                     bool removeDivingSuit = !Character.AnimController.HeadInWater && oxygenLow;
-                    AIObjectiveGoTo gotoObjective = ObjectiveManager.GetActiveObjective<AIObjectiveGoTo>();
+                    bool takeMaskOff = !Character.AnimController.HeadInWater && oxygenLow;
                     if (!removeDivingSuit)
                     {
-                        bool targetHasNoSuit = gotoObjective != null && gotoObjective.mimic && !HasDivingSuit(gotoObjective.Target as Character);
-                        removeDivingSuit = !shouldKeepTheGearOn && (gotoObjective == null || targetHasNoSuit);
-                    }
-                    bool takeMaskOff = !Character.AnimController.HeadInWater && oxygenLow;
-                    if (!takeMaskOff && Character.CurrentHull.WaterPercentage < 40)
-                    {
-                        bool targetHasNoMask = gotoObjective != null && gotoObjective.mimic && !HasDivingMask(gotoObjective.Target as Character);
-                        takeMaskOff = !shouldKeepTheGearOn && (gotoObjective == null || targetHasNoMask);
-                    }
-                    if (gotoObjective != null)
-                    {
-                        if (gotoObjective.Target is Hull h)
+                        if (shouldKeepTheGearOn)
                         {
-                            if (NeedsDivingGear(Character, h, out _))
-                            {
-                                removeDivingSuit = false;
-                                takeMaskOff = false;
-                            }
+                            removeDivingSuit = false;
                         }
-                        else if (gotoObjective.Target is Character c)
+                    }
+                    if (!takeMaskOff)
+                    {
+                        if (shouldKeepTheGearOn)
                         {
-                            if (NeedsDivingGear(Character, c.CurrentHull, out _))
-                            {
-                                removeDivingSuit = false;
-                                takeMaskOff = false;
-                            }
+                            takeMaskOff = false;
                         }
-                        else if (gotoObjective.Target is Item i)
+                    }
+                    if (!shouldKeepTheGearOn && (!takeMaskOff || !removeDivingSuit))
+                    {
+                        foreach (var objective in ObjectiveManager.CurrentObjective.GetSubObjectivesRecursive(includingSelf: true))
                         {
-                            if (NeedsDivingGear(Character, i.CurrentHull, out _))
+                            if (objective is AIObjectiveGoTo gotoObjective)
                             {
-                                removeDivingSuit = false;
-                                takeMaskOff = false;
+                                bool insideSteering = SteeringManager == PathSteering && PathSteering.CurrentPath != null && !PathSteering.IsPathDirty;
+                                Hull targetHull = gotoObjective.GetTargetHull();
+                                bool targetIsOutside = (gotoObjective.Target != null && targetHull == null) || (insideSteering && PathSteering.CurrentPath.HasOutdoorsNodes);
+                                if (targetIsOutside || NeedsDivingGear(Character, targetHull, out _))
+                                {
+                                    removeDivingSuit = false;
+                                    takeMaskOff = false;
+                                    break;
+                                }
+                                else if (gotoObjective.mimic)
+                                {
+                                    if (!removeDivingSuit)
+                                    {
+                                        removeDivingSuit = !HasDivingSuit(gotoObjective.Target as Character);
+                                    }
+                                    if (!takeMaskOff)
+                                    {
+                                        takeMaskOff = !HasDivingMask(gotoObjective.Target as Character);
+                                    }
+                                }
                             }
                         }
                     }
@@ -363,7 +340,7 @@ namespace Barotrauma
                                 else
                                 {
                                     findItemState = FindItemState.DivingSuit;
-                                    if (FindSuitableContainer(Character, divingSuit, out Item targetContainer))
+                                    if (FindSuitableContainer(divingSuit, out Item targetContainer))
                                     {
                                         findItemState = FindItemState.None;
                                         itemIndex = 0;
@@ -375,7 +352,7 @@ namespace Barotrauma
                                             };
                                             decontainObjective.Abandoned += () =>
                                             {
-                                                ignoredContainers.Add(targetContainer);
+                                                IgnoredItems.Add(targetContainer);
                                             };
                                             ObjectiveManager.CurrentObjective.AddSubObjective(decontainObjective, addFirst: true);
                                             return;
@@ -405,14 +382,14 @@ namespace Barotrauma
                                     else
                                     {
                                         findItemState = FindItemState.DivingMask;
-                                        if (FindSuitableContainer(Character, mask, out Item targetContainer))
+                                        if (FindSuitableContainer(mask, out Item targetContainer))
                                         {
                                             findItemState = FindItemState.None;
                                             itemIndex = 0;
                                             if (targetContainer != null)
                                             {
                                                 var decontainObjective = new AIObjectiveDecontainItem(Character, mask, ObjectiveManager, targetContainer: targetContainer.GetComponent<ItemContainer>());
-                                                decontainObjective.Abandoned += () => ignoredContainers.Add(targetContainer);
+                                                decontainObjective.Abandoned += () => IgnoredItems.Add(targetContainer);
                                                 ObjectiveManager.CurrentObjective.AddSubObjective(decontainObjective, addFirst: true);
                                                 return;
                                             }
@@ -442,14 +419,14 @@ namespace Barotrauma
                     {
                         if (!item.AllowedSlots.Contains(InvSlotType.Any) || !Character.Inventory.TryPutItem(item, Character, new List<InvSlotType>() { InvSlotType.Any }))
                         {
-                            if (FindSuitableContainer(Character, item, out Item targetContainer))
+                            if (FindSuitableContainer(item, out Item targetContainer))
                             {
                                 findItemState = FindItemState.None;
                                 itemIndex = 0;
                                 if (targetContainer != null)
                                 {
                                     var decontainObjective = new AIObjectiveDecontainItem(Character, item, ObjectiveManager, targetContainer: targetContainer.GetComponent<ItemContainer>());
-                                    decontainObjective.Abandoned += () => ignoredContainers.Add(targetContainer);
+                                    decontainObjective.Abandoned += () => IgnoredItems.Add(targetContainer);
                                     ObjectiveManager.CurrentObjective.AddSubObjective(decontainObjective, addFirst: true);
                                     return;
                                 }
@@ -478,11 +455,10 @@ namespace Barotrauma
         }
         private FindItemState findItemState;
         private int itemIndex;
-        private List<Item> ignoredContainers = new List<Item>();
-        public bool FindSuitableContainer(Character character, Item containableItem, out Item suitableContainer)
+        public bool FindSuitableContainer(Item containableItem, out Item suitableContainer)
         {
             suitableContainer = null;
-            if (character.FindItem(ref itemIndex, out Item targetContainer, ignoredItems: ignoredContainers, customPriorityFunction: i =>
+            if (Character.FindItem(ref itemIndex, out Item targetContainer, ignoredItems: IgnoredItems, customPriorityFunction: i =>
             {
                 var container = i.GetComponent<ItemContainer>();
                 if (container == null) { return 0; }
@@ -645,7 +621,7 @@ namespace Barotrauma
                     // Should not cancel any existing ai objectives (so that if the character attacked you and then helped, we still would want to retaliate).
                     return;
                 }
-                if (!attacker.IsPlayer && attacker.AIController != null && attacker.AIController.Enabled)
+                if (attacker.IsBot)
                 {
                     // Don't retaliate on damage done by friendly ai, because we know that it's accidental
                     AddCombatObjective(AIObjectiveCombat.CombatMode.Retreat, Rand.Range(0.5f, 1f, Rand.RandSync.Unsynced));
@@ -784,7 +760,6 @@ namespace Barotrauma
             return false;
         }
 
-
         public static bool HasDivingGear(Character character, float conditionPercentage = 0) => HasDivingSuit(character, conditionPercentage) || HasDivingMask(character, conditionPercentage);
 
         /// <summary>
@@ -1055,13 +1030,11 @@ namespace Barotrauma
         public static bool IsItemOperatedByAnother(Character character, ItemComponent target, out Character operatingCharacter)
         {
             operatingCharacter = null;
+            if (target?.Item == null) { return false; }
             foreach (var c in Character.CharacterList)
             {
-                if (character != null)
-                {
-                    if (c == character) { continue; }
-                    if (!IsFriendly(character, c)) { continue; }
-                }
+                if (character != null && c == character) { continue; }
+                if (character?.AIController is HumanAIController humanAi && !humanAi.IsFriendly(c)) { continue; }
                 if (c.SelectedConstruction != target.Item) { continue; }
                 operatingCharacter = c;
                 // If the other character is player, don't try to operate

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/IndoorsSteeringManager.cs

@@ -12,7 +12,8 @@ namespace Barotrauma
         private PathFinder pathFinder;
         private SteeringPath currentPath;
 
-        private bool canOpenDoors, canBreakDoors;
+        private bool canOpenDoors;
+        public bool CanBreakDoors { get; set; }
 
         private Character character;
 
@@ -50,8 +51,8 @@ namespace Barotrauma
         /// </summary>
         public bool InLadders =>
             currentPath != null &&
-            currentPath.CurrentNode != null && (currentPath.CurrentNode.Ladders != null ||
-            (currentPath.NextNode != null && currentPath.NextNode.Ladders != null));
+            currentPath.CurrentNode != null && (currentPath.CurrentNode.Ladders != null && !currentPath.CurrentNode.Ladders.Item.NonInteractable ||
+            (currentPath.NextNode != null && currentPath.NextNode.Ladders != null && !currentPath.NextNode.Ladders.Item.NonInteractable));
 
         /// <summary>
         /// Returns true if any node in the path is in stairs
@@ -69,6 +70,7 @@ namespace Barotrauma
                 if (currentPath.NextNode == null) { return false; }
                 var currentLadder = currentPath.CurrentNode.Ladders;
                 if (currentLadder == null) { return false; }
+                if (currentLadder.Item.NonInteractable) { return false; }
                 var nextLadder = GetNextLadder();
                 return nextLadder != null && nextLadder == currentLadder;
             }
@@ -80,7 +82,7 @@ namespace Barotrauma
             pathFinder.GetNodePenalty = GetNodePenalty;
 
             this.canOpenDoors = canOpenDoors;
-            this.canBreakDoors = canBreakDoors;
+            this.CanBreakDoors = canBreakDoors;
 
             character = (host as AIController).Character;
 
@@ -103,6 +105,12 @@ namespace Barotrauma
             IsPathDirty = false;
         }
 
+        public void ResetPath()
+        {
+            currentPath = null;
+            IsPathDirty = true;
+        }
+
         public void SteeringSeek(Vector2 target, float weight, Func<PathNode, bool> startNodeFilter = null, Func<PathNode, bool> endNodeFilter = null, Func<PathNode, bool> nodeFilter = null)
         {
             steering += CalculateSteeringSeek(target, weight, startNodeFilter, endNodeFilter, nodeFilter);
@@ -115,7 +123,7 @@ namespace Barotrauma
         {
             if (currentPath == null) { return null; }
             if (currentPath.NextNode == null) { return null; }
-            if (currentPath.NextNode.Ladders != null)
+            if (currentPath.NextNode.Ladders != null && !currentPath.NextNode.Ladders.Item.NonInteractable)
             {
                 return currentPath.NextNode.Ladders;
             }
@@ -126,7 +134,10 @@ namespace Barotrauma
                 {
                     var node = currentPath.Nodes[index];
                     if (node == null) { return null; }
-                    return node.Ladders;
+                    if (node.Ladders != null && !node.Ladders.Item.NonInteractable)
+                    {
+                        return node.Ladders;
+                    }
                 }
                 return null;
             }
@@ -134,7 +145,19 @@ namespace Barotrauma
 
         private Vector2 CalculateSteeringSeek(Vector2 target, float weight, Func<PathNode, bool> startNodeFilter = null, Func<PathNode, bool> endNodeFilter = null, Func<PathNode, bool> nodeFilter = null)
         {
-            bool needsNewPath = character.Params.PathFinderPriority > 0.5f && (currentPath == null || currentPath.Unreachable || currentPath.Finished || Vector2.DistanceSquared(target, currentTarget) > 1);
+            Vector2 targetDiff = target - currentTarget;
+            if (currentPath != null && currentPath.Nodes.Any())
+            {
+                //current path calculated relative to a different sub than where the character is now
+                //take that into account when calculating if the target has moved
+                Submarine currentPathSub = currentPath?.Nodes.First().Submarine;
+                if (currentPathSub != character.Submarine && character.Submarine != null)
+                {
+                    Vector2 subDiff = character.Submarine.SimPosition - currentPathSub.SimPosition;
+                    targetDiff += subDiff;
+                }
+            }
+            bool needsNewPath = character.Params.PathFinderPriority > 0.5f && (currentPath == null || currentPath.Unreachable || currentPath.Finished || targetDiff.LengthSquared() > 1);
             //find a new path if one hasn't been found yet or the target is different from the current target
             if (needsNewPath || findPathTimer < -1.0f)
             {
@@ -172,12 +195,13 @@ namespace Barotrauma
 
             Vector2 diff = DiffToCurrentNode();
             var collider = character.AnimController.Collider;
+            // Only humanoids can climb ladders
+            bool canClimb = character.AnimController is HumanoidAnimController;
             //if not in water and the waypoint is between the top and bottom of the collider, no need to move vertically
-            if (!character.AnimController.InWater && !character.IsClimbing && diff.Y < collider.height / 2 + collider.radius)
+            if (canClimb && !character.AnimController.InWater && !character.IsClimbing && diff.Y < collider.height / 2 + collider.radius)
             {
                 diff.Y = 0.0f;
             }
-            //if (diff.LengthSquared() < 0.001f) { return -host.Steering; }
             if (diff == Vector2.Zero) { return Vector2.Zero; }
             return Vector2.Normalize(diff) * weight;
         }
@@ -186,8 +210,10 @@ namespace Barotrauma
 
         private Vector2 DiffToCurrentNode()
         {
-            if (currentPath == null || currentPath.Unreachable) return Vector2.Zero;
-
+            if (currentPath == null || currentPath.Unreachable)
+            {
+                return Vector2.Zero;
+            }
             if (currentPath.Finished)
             {
                 Vector2 pos2 = host.SimPosition;
@@ -197,15 +223,12 @@ namespace Barotrauma
                     pos2 -= CurrentPath.Nodes.Last().Submarine.SimPosition;
                 }
                 return currentTarget - pos2;
-            }
-            
+            }  
             if (canOpenDoors && !character.LockHands && buttonPressCooldown <= 0.0f)
             {
                 CheckDoorsInPath();
-            }
-            
+            }       
             Vector2 pos = host.SimPosition;
-
             if (character != null && currentPath.CurrentNode != null)
             {
                 if (CurrentPath.CurrentNode.Submarine != null)
@@ -220,19 +243,17 @@ namespace Barotrauma
                     }
                 }
             }
-
             bool isDiving = character.AnimController.InWater && character.AnimController.HeadInWater;
-
-            //only humanoids can climb ladders
-            if (!isDiving && character.AnimController is HumanoidAnimController && IsNextLadderSameAsCurrent)
+            // Only humanoids can climb ladders
+            bool canClimb = character.AnimController is HumanoidAnimController;
+            if (canClimb && !isDiving && IsNextLadderSameAsCurrent)
             {
-                if (character.SelectedConstruction != currentPath.CurrentNode.Ladders.Item &&
-                    currentPath.CurrentNode.Ladders.Item.IsInsideTrigger(character.WorldPosition))
+                var ladders = currentPath.CurrentNode.Ladders;
+                if (character.SelectedConstruction != ladders.Item && ladders.Item.IsInsideTrigger(character.WorldPosition))
                 {
                     currentPath.CurrentNode.Ladders.Item.TryInteract(character, false, true);
                 }
-            }
-            
+            }         
             var collider = character.AnimController.Collider;
             if (character.IsClimbing && !isDiving)
             {
@@ -252,13 +273,16 @@ namespace Barotrauma
                     {
                         diff.Y = Math.Max(diff.Y, 1.0f);
                     }
+                    // We need some margin, because if a hatch has closed, it's possible that the height from floor is slightly negative.
+                    float margin = 0.1f;
+                    bool isAboveFloor = heightFromFloor > -margin && heightFromFloor < collider.height * 1.5f;
                     // If the next waypoint is horizontally far, we don't want to keep holding the ladders
-                    if (nextLadder == null || Math.Abs(currentPath.CurrentNode.WorldPosition.X - currentPath.NextNode.WorldPosition.X) > 50)
+                    if (isAboveFloor && (nextLadder == null || Math.Abs(currentPath.CurrentNode.WorldPosition.X - currentPath.NextNode.WorldPosition.X) > 50))
                     {
                         character.AnimController.Anim = AnimController.Animation.None;
                         character.SelectedConstruction = null;
                     }
-                    else if (!nextLadderSameAsCurrent)
+                    else if (nextLadder != null && !nextLadderSameAsCurrent)
                     {
                         // Try to change the ladder (hatches between two submarines)
                         if (character.SelectedConstruction != nextLadder.Item && nextLadder.Item.IsInsideTrigger(character.WorldPosition))
@@ -266,9 +290,6 @@ namespace Barotrauma
                             nextLadder.Item.TryInteract(character, false, true);
                         }
                     }
-                    // We need some margin, because if a hatch has closed, it's possible that the height from floor is slightly negative.
-                    float margin = 0.1f;
-                    bool isAboveFloor = heightFromFloor > -margin && heightFromFloor < collider.height * 1.5f;
                     if (nextLadder != null || isAboveFloor)
                     {
                         currentPath.SkipToNextNode();
@@ -286,7 +307,7 @@ namespace Barotrauma
                 }
                 return diff;
             }
-            else if (character.AnimController.InWater)
+            else if (!canClimb || character.AnimController.InWater)
             {
                 // If the character is underwater, we don't need the ladders anymore
                 if (character.IsClimbing && isDiving)
@@ -294,49 +315,59 @@ namespace Barotrauma
                     character.AnimController.Anim = AnimController.Animation.None;
                     character.SelectedConstruction = null;
                 }
-                float multiplier = MathHelper.Lerp(1, 10, MathHelper.Clamp(collider.LinearVelocity.Length() / 10, 0, 1));
-                float targetDistance = collider.GetSize().X * multiplier;
-                float horizontalDistance = Math.Abs(character.WorldPosition.X - currentPath.CurrentNode.WorldPosition.X);
-                float verticalDistance = Math.Abs(character.WorldPosition.Y - currentPath.CurrentNode.WorldPosition.Y);
-                if (character.CurrentHull != currentPath.CurrentNode.CurrentHull)
+                var door = currentPath.CurrentNode.ConnectedDoor;
+                bool blockedByDoor = door != null && !door.IsOpen && !door.IsBroken;
+                if (!blockedByDoor)
                 {
-                    verticalDistance *= 2;
-                }
-                float distance = horizontalDistance + verticalDistance;
-                if (ConvertUnits.ToSimUnits(distance) < targetDistance)
-                {
-                    currentPath.SkipToNextNode();
+                    float multiplier = MathHelper.Lerp(1, 10, MathHelper.Clamp(collider.LinearVelocity.Length() / 10, 0, 1));
+                    float targetDistance = collider.GetSize().X * multiplier;
+                    float horizontalDistance = Math.Abs(character.WorldPosition.X - currentPath.CurrentNode.WorldPosition.X);
+                    float verticalDistance = Math.Abs(character.WorldPosition.Y - currentPath.CurrentNode.WorldPosition.Y);
+                    if (character.CurrentHull != currentPath.CurrentNode.CurrentHull)
+                    {
+                        verticalDistance *= 2;
+                    }
+                    float distance = horizontalDistance + verticalDistance;
+                    if (ConvertUnits.ToSimUnits(distance) < targetDistance)
+                    {
+                        currentPath.SkipToNextNode();
+                    }
                 }
             }
             else if (!IsNextLadderSameAsCurrent)
             {
+                // Walking horizontally
                 Vector2 colliderBottom = character.AnimController.GetColliderBottom();
                 Vector2 colliderSize = collider.GetSize();
                 Vector2 velocity = collider.LinearVelocity;
-                // If the character is smaller than this, it fails to use the waypoint nodes, because they are always too high.
+                // If the character is smaller than this, it would fail to use the waypoint nodes because they are always too high.
                 float minHeight = 1;
                 // Cannot use the head position, because not all characters have head or it can be below the total height of the character
                 float characterHeight = Math.Max(colliderSize.Y + character.AnimController.ColliderHeightFromFloor, minHeight);
                 float horizontalDistance = Math.Abs(collider.SimPosition.X - currentPath.CurrentNode.SimPosition.X);
                 bool isAboveFeet = currentPath.CurrentNode.SimPosition.Y > colliderBottom.Y;
                 bool isNotTooHigh = currentPath.CurrentNode.SimPosition.Y < colliderBottom.Y + characterHeight;
+                var door = currentPath.CurrentNode.ConnectedDoor;
+                bool blockedByDoor = door != null && !door.IsOpen && !door.IsBroken;
                 float margin = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.X) / 10, 0, 1));
                 float targetDistance = collider.radius * margin;
-                if (horizontalDistance < targetDistance && isAboveFeet && isNotTooHigh)
+                if (horizontalDistance < targetDistance && isAboveFeet && isNotTooHigh && !blockedByDoor)
                 {
                     currentPath.SkipToNextNode();
                 }
             }
-
-            if (currentPath.CurrentNode == null) return Vector2.Zero;
-
+            if (currentPath.CurrentNode == null)
+            {
+                return Vector2.Zero;
+            }
             return currentPath.CurrentNode.SimPosition - pos;
         }
 
         private bool CanAccessDoor(Door door, Func<Controller, bool> buttonFilter = null)
         {
             if (door.IsOpen) { return true; }
-            if (canBreakDoors) { return true; }
+            if (door.Item.NonInteractable) { return false; }
+            if (CanBreakDoors) { return true; }
             if (door.IsStuck) { return false; }
             if (!canOpenDoors || character.LockHands) { return false; }
             if (door.HasIntegratedButtons)
@@ -345,7 +376,7 @@ namespace Barotrauma
             }
             else
             {
-                return door.Item.GetConnectedComponents<Controller>(true).Any(b => b.HasAccess(character) && (buttonFilter == null || buttonFilter(b)));
+                return door.Item.GetConnectedComponents<Controller>(true).Any(b => !b.Item.NonInteractable && b.HasAccess(character) && (buttonFilter == null || buttonFilter(b)));
             }
         }
 
@@ -519,9 +550,9 @@ namespace Barotrauma
             //non-humanoids can't climb up ladders
             if (!(character.AnimController is HumanoidAnimController))
             {
-                if (node.Waypoint.Ladders != null && nextNode.Waypoint.Ladders != null &&
-                    nextNode.Position.Y - node.Position.Y > 1.0f && //more than one sim unit to climb up
-                    nextNode.Waypoint.CurrentHull != null && nextNode.Waypoint.CurrentHull.Surface < nextNode.Waypoint.Position.Y) //upper node not underwater
+                if (node.Waypoint.Ladders != null && nextNode.Waypoint.Ladders != null && nextNode.Waypoint.Ladders.Item.NonInteractable ||
+                    (nextNode.Position.Y - node.Position.Y > 1.0f && //more than one sim unit to climb up
+                    nextNode.Waypoint.CurrentHull != null && nextNode.Waypoint.CurrentHull.Surface < nextNode.Waypoint.Position.Y)) //upper node not underwater
                 {
                     return null;
                 }
@@ -539,7 +570,10 @@ namespace Barotrauma
                 }
                 if (character.NeedsAir && hull.WaterVolume / hull.Rect.Width > 100.0f)
                 {
-                    penalty += 500.0f;
+                    if (!HumanAIController.HasDivingSuit(character))
+                    {
+                        penalty += 500.0f;
+                    }
                 }
                 if (character.PressureProtection < 10.0f && hull.WaterVolume > hull.Volume)
                 {

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/LatchOntoAI.cs

@@ -1,11 +1,11 @@
 using FarseerPhysics;
-using FarseerPhysics.Common;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -19,8 +19,8 @@ namespace Barotrauma
         private Vector2 attachSurfaceNormal;
         private Submarine attachTargetSubmarine;
 
-        private bool attachToSub;
-        private bool attachToWalls;
+        public bool AttachToSub { get; private set; }
+        public bool AttachToWalls { get; private set; }
 
         private float minDeattachSpeed = 3.0f, maxDeattachSpeed = 10.0f;
         private float damageOnDetach = 0.0f, detachStun = 0.0f;
@@ -58,8 +58,8 @@ namespace Barotrauma
 
         public LatchOntoAI(XElement element, EnemyAIController enemyAI)
         {
-            attachToWalls = element.GetAttributeBool("attachtowalls", false);
-            attachToSub = element.GetAttributeBool("attachtosub", false);
+            AttachToWalls = element.GetAttributeBool("attachtowalls", false);
+            AttachToSub = element.GetAttributeBool("attachtosub", false);
             minDeattachSpeed = element.GetAttributeFloat("mindeattachspeed", 3.0f);
             maxDeattachSpeed = Math.Max(minDeattachSpeed, element.GetAttributeFloat("maxdeattachspeed", 10.0f));
             damageOnDetach = element.GetAttributeFloat("damageondetach", 0.0f);
@@ -67,11 +67,19 @@ namespace Barotrauma
             localAttachPos = ConvertUnits.ToSimUnits(element.GetAttributeVector2("localattachpos", Vector2.Zero));
             attachLimbRotation = MathHelper.ToRadians(element.GetAttributeFloat("attachlimbrotation", 0.0f));
 
-            if (Enum.TryParse(element.GetAttributeString("attachlimb", "Head"), out LimbType attachLimbType))
+            string limbString = element.GetAttributeString("attachlimb", null);
+            attachLimb = enemyAI.Character.AnimController.Limbs.FirstOrDefault(l => string.Equals(l.Name, limbString, StringComparison.OrdinalIgnoreCase));
+            if (attachLimb == null)
             {
-                attachLimb = enemyAI.Character.AnimController.GetLimb(attachLimbType);
+                if (Enum.TryParse(limbString, out LimbType attachLimbType))
+                {
+                    attachLimb = enemyAI.Character.AnimController.GetLimb(attachLimbType);
+                }
+            }
+            if (attachLimb == null)
+            {
+                attachLimb = enemyAI.Character.AnimController.MainLimb;
             }
-            if (attachLimb == null) attachLimb = enemyAI.Character.AnimController.MainLimb;
 
             enemyAI.Character.OnDeath += OnCharacterDeath;
         }
@@ -108,7 +116,9 @@ namespace Barotrauma
                     //something went wrong, limb body is very far from the joint anchor -> deattach
                     if (Vector2.DistanceSquared(attachJoints[i].WorldAnchorB, attachJoints[i].BodyA.Position) > 10.0f * 10.0f)
                     {
+#if DEBUG
                         DebugConsole.ThrowError("Limb body of the character \"" + character.Name + "\" is very far from the attach joint anchor -> deattach");
+#endif
                         DeattachFromBody();
                         return;
                     }
@@ -131,7 +141,7 @@ namespace Barotrauma
             switch (enemyAI.State)
             {
                 case AIState.Idle:
-                    if (attachToWalls && character.Submarine == null && Level.Loaded != null)
+                    if (AttachToWalls && character.Submarine == null && Level.Loaded != null)
                     {
                         if (!IsAttached)
                         {
@@ -180,8 +190,9 @@ namespace Barotrauma
                     }
                     else
                     {
-                        float dist = Vector2.Distance(character.SimPosition, wallAttachPos);
-                        if (dist < Math.Max(Math.Max(character.AnimController.Collider.radius, character.AnimController.Collider.width), character.AnimController.Collider.height) * 1.2f)
+                        float squaredDistance = Vector2.DistanceSquared(character.SimPosition, wallAttachPos);
+                        float targetDistance = Math.Max(Math.Max(character.AnimController.Collider.radius, character.AnimController.Collider.width), character.AnimController.Collider.height) * 1.2f;
+                        if (squaredDistance < targetDistance * targetDistance)
                         {
                             //close enough to a wall -> attach
                             AttachToBody(character.AnimController.Collider, attachLimb, attachTargetBody, wallAttachPos);
@@ -197,12 +208,13 @@ namespace Barotrauma
                     }
                     break;
                 case AIState.Attack:
+                case AIState.Aggressive:
                     if (enemyAI.AttackingLimb != null)
                     {
-                        if (attachToSub && !enemyAI.IsSteeringThroughGap && wallAttachPos != Vector2.Zero && attachTargetBody != null)
+                        if (AttachToSub && !enemyAI.IsSteeringThroughGap && wallAttachPos != Vector2.Zero && attachTargetBody != null)
                         {
                             // is not attached or is attached to something else
-                            if (!IsAttached || IsAttached && attachJoints[0].BodyB == attachTargetBody)
+                            if (!IsAttached || IsAttached && attachJoints[0].BodyB != attachTargetBody)
                             {
                                 if (Vector2.DistanceSquared(ConvertUnits.ToDisplayUnits(transformedAttachPos), enemyAI.AttackingLimb.WorldPosition) < enemyAI.AttackingLimb.attack.DamageRange * enemyAI.AttackingLimb.attack.DamageRange)
                                 {
@@ -247,16 +259,17 @@ namespace Barotrauma
             if (attachJoints.Count > 0)
             {
                 //already attached to the target body, no need to do anything
-                if (attachJoints[0].BodyB == targetBody) return;
+                if (attachJoints[0].BodyB == targetBody) { return; }
                 DeattachFromBody();
             }
 
             jointDir = attachLimb.Dir;
 
             Vector2 transformedLocalAttachPos = localAttachPos * attachLimb.Scale * attachLimb.Params.Ragdoll.LimbScale;
-            if (jointDir < 0.0f) transformedLocalAttachPos.X = -transformedLocalAttachPos.X;
-
-            //transformedLocalAttachPos = Vector2.Transform(transformedLocalAttachPos, Matrix.CreateRotationZ(attachLimb.Rotation));
+            if (jointDir < 0.0f)
+            {
+                transformedLocalAttachPos.X = -transformedLocalAttachPos.X;
+            }
 
             float angle = MathUtils.VectorToAngle(-attachSurfaceNormal) - MathHelper.PiOver2 + attachLimbRotation * attachLimb.Dir;
             attachLimb.body.SetTransform(attachPos + attachSurfaceNormal * transformedLocalAttachPos.Length(), angle);
@@ -274,7 +287,10 @@ namespace Barotrauma
 
             // Limb scale is already taken into account when creating the collider.
             Vector2 colliderFront = collider.GetLocalFront();
-            if (jointDir < 0.0f) colliderFront.X = -colliderFront.X;
+            if (jointDir < 0.0f)
+            {
+                colliderFront.X = -colliderFront.X;
+            }
             collider.SetTransform(attachPos + attachSurfaceNormal * colliderFront.Length(), MathUtils.VectorToAngle(-attachSurfaceNormal) - MathHelper.PiOver2);
 
             var colliderJoint = new WeldJoint(collider.FarseerBody, targetBody, colliderFront, targetBody.GetLocalPoint(attachPos), false)

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/NPCConversation.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Xml.Linq;
 
@@ -375,9 +375,7 @@ namespace Barotrauma
                 }
             }
 
-            StreamWriter file = new StreamWriter(@"NPCConversations.csv");
-            file.WriteLine(sb.ToString());
-            file.Close();
+            File.WriteAllText("NPCConversations.csv", sb.ToString());
         }
 
         private static void WriteConversation(System.Text.StringBuilder sb, NPCConversation conv, int depthIndex)

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

@@ -30,6 +30,7 @@ namespace Barotrauma
 
         public virtual bool KeepDivingGearOn => false;
         public virtual bool UnequipItems => false;
+        public virtual bool AllowOutsideSubmarine => false;
 
         protected readonly List<AIObjective> subObjectives = new List<AIObjective>();
         private float _cumulatedDevotion;
@@ -117,7 +118,6 @@ namespace Barotrauma
         public void TryComplete(float deltaTime)
         {
             if (isCompleted) { return; }
-            //if (Abandon && !IsLoop && subObjectives.None()) { return; }
             if (CheckState()) { return; }
             // Not ready -> act (can't do foreach because it's possible that the collection is modified in event callbacks.
             for (int i = 0; i < subObjectives.Count; i++)
@@ -182,12 +182,26 @@ namespace Barotrauma
             }
         }
 
+        protected bool IsAllowed => AllowOutsideSubmarine || character.Submarine != null && character.Submarine.TeamID == character.TeamID && character.Submarine.Info.IsPlayer;
+
         /// <summary>
         /// Call this only when the priority needs to be recalculated. Use the cached Priority property when you don't need to recalculate.
         /// </summary>
         public virtual float GetPriority()
         {
-            Priority = CumulatedDevotion * PriorityModifier;
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
+            if (objectiveManager.CurrentOrder == this)
+            {
+                Priority = AIObjectiveManager.OrderPriority;
+            }
+            else
+            {
+                Priority = CumulatedDevotion;
+            }
             return Priority;
         }
 
@@ -196,7 +210,7 @@ namespace Barotrauma
             var currentObjective = objectiveManager.CurrentObjective;
             if (currentObjective != null && (currentObjective == this || currentObjective.subObjectives.Any(so => so == this)))
             {
-                CumulatedDevotion += Devotion * PriorityModifier * deltaTime;
+                CumulatedDevotion += Devotion * deltaTime;
             }
         }
 
@@ -204,11 +218,7 @@ namespace Barotrauma
 
         public virtual void Update(float deltaTime)
         {
-            if (objectiveManager.CurrentOrder == this)
-            {
-                Priority = AIObjectiveManager.OrderPriority;
-            }
-            else if (objectiveManager.WaitTimer <= 0)
+            if (objectiveManager.CurrentOrder != this && objectiveManager.WaitTimer <= 0)
             {
                 UpdateDevotion(deltaTime);
             }

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

@@ -20,11 +20,16 @@ namespace Barotrauma
         {
             if (battery == null) { return false; }
             var item = battery.Item;
+            if (item.NonInteractable) { return false; }
             if (item.Submarine == null) { return false; }
             if (item.CurrentHull == null) { return false; }
             if (item.Submarine.TeamID != character.TeamID) { return false; }
+            if (character.Submarine != null)
+            {
+                if (item.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (!character.Submarine.IsEntityFoundOnThisSub(item, true)) { return false; }
+            }
             if (item.ConditionPercentage <= 0) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(item, true)) { return false; }
             if (Character.CharacterList.Any(c => c.CurrentHull == item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return false; }
             if (IsReady(battery)) { return false; }
             return true;

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

@@ -13,6 +13,7 @@ namespace Barotrauma
 
         public override bool KeepDivingGearOn => true;
         public override bool IgnoreUnsafeHulls => true;
+        public override bool AllowOutsideSubmarine => true;
 
         private readonly CombatMode initialMode;
 
@@ -120,6 +121,12 @@ namespace Barotrauma
 
         protected override bool Check()
         {
+            if (initialMode == CombatMode.Offensive && Mode != CombatMode.Offensive)
+            {
+                Abandon = true;
+                SteeringManager.Reset();
+                return false;
+            }
             bool completed = (Enemy != null && (Enemy.Removed || Enemy.IsDead)) || (initialMode != CombatMode.Offensive && coolDownTimer <= 0);
             if (completed)
             {
@@ -464,7 +471,6 @@ namespace Barotrauma
                 SteeringManager.Reset();
                 return;
             }
-
             retreatTarget = null;
             RemoveSubObjective(ref retreatObjective);
             RemoveSubObjective(ref seekAmmunition);
@@ -481,9 +487,8 @@ namespace Barotrauma
                 },
                 onAbandon: () =>
                 {
-                    Mode = CombatMode.Defensive;
+                    Abandon = true;
                     SteeringManager.Reset();
-                    RemoveSubObjective(ref followTargetObjective);
                 });
             if (followTargetObjective != null)
             {
@@ -592,10 +597,7 @@ namespace Barotrauma
 
         private void Attack(float deltaTime)
         {
-            float squaredDistance = Vector2.DistanceSquared(character.Position, Enemy.Position);
             character.CursorPosition = Enemy.Position;
-            float engageDistance = 500;
-            if (character.CurrentHull != Enemy.CurrentHull && squaredDistance > engageDistance * engageDistance) { return; }
             if (!character.CanSeeCharacter(Enemy)) { return; }
             if (Weapon.RequireAimToUse)
             {
@@ -603,7 +605,7 @@ namespace Barotrauma
                 if (SteeringManager == PathSteering)
                 {
                     var door = PathSteering.CurrentPath?.CurrentNode?.ConnectedDoor;
-                    if (door != null && !door.IsOpen)
+                    if (door != null && !door.IsOpen && !door.IsBroken)
                     {
                         isOperatingButtons = door.HasIntegratedButtons || door.Item.GetConnectedComponents<Controller>(true).Any();
                     }
@@ -625,7 +627,7 @@ namespace Barotrauma
             }
             if (WeaponComponent is MeleeWeapon meleeWeapon)
             {
-                if (squaredDistance <= meleeWeapon.Range * meleeWeapon.Range)
+                if (Vector2.DistanceSquared(character.Position, Enemy.Position) <= meleeWeapon.Range * meleeWeapon.Range)
                 {
                     character.SetInput(InputType.Shoot, false, true);
                     Weapon.Use(deltaTime, character);
@@ -635,7 +637,7 @@ namespace Barotrauma
             {
                 if (WeaponComponent is RepairTool repairTool)
                 {
-                    if (squaredDistance > repairTool.Range * repairTool.Range) { return; }
+                    if (Vector2.DistanceSquared(character.Position, Enemy.Position) > repairTool.Range * repairTool.Range) { return; }
                 }
                 if (VectorExtensions.Angle(VectorExtensions.Forward(Weapon.body.TransformedRotation), Enemy.Position - Weapon.Position) < MathHelper.PiOver4)
                 {

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

@@ -158,7 +158,7 @@ namespace Barotrauma
                         Abandon = true;
                     }, onCompleted: () =>
                     {
-                        if (getItemObjective.TargetItem != null)
+                        if (getItemObjective?.TargetItem != null)
                         {
                             containedItems.Add(getItemObjective.TargetItem);
                         }

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

@@ -27,6 +27,11 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
             if (!objectiveManager.IsCurrentOrder<AIObjectiveExtinguishFires>() 
                 && Character.CharacterList.Any(c => c.CurrentHull == targetHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c)))
             {
@@ -101,7 +106,7 @@ namespace Barotrauma
                             if (SteeringManager == PathSteering)
                             {
                                 var door = PathSteering.CurrentPath?.CurrentNode?.ConnectedDoor;
-                                if (door != null && !door.IsOpen)
+                                if (door != null && !door.IsOpen && !door.IsBroken)
                                 {
                                     isOperatingButtons = door.HasIntegratedButtons || door.Item.GetConnectedComponents<Controller>(true).Any();
                                 }

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

@@ -32,7 +32,11 @@ namespace Barotrauma
             if (hull.FireSources.None()) { return false; }
             if (hull.Submarine == null) { return false; }
             if (hull.Submarine.TeamID != character.TeamID) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(hull, true)) { return false; }
+            if (character.Submarine != null)
+            {
+                if (hull.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (!character.Submarine.IsEntityFoundOnThisSub(hull, true)) { return false; }
+            }
             return true;
         }
     }

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

@@ -1,9 +1,4 @@
-using Barotrauma.Items.Components;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using Barotrauma.Extensions;
+using System.Collections.Generic;
 
 namespace Barotrauma
 {
@@ -40,7 +35,11 @@ namespace Barotrauma
             if (target.Submarine == null) { return false; }
             if (target.Submarine.TeamID != character.TeamID) { return false; }
             if (target.CurrentHull == null) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
+            if (character.Submarine != null)
+            {
+                if (target.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (!character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
+            }
             return true;
         }
     }

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

@@ -12,6 +12,7 @@ namespace Barotrauma
         public override bool KeepDivingGearOn => true;
         public override bool IgnoreUnsafeHulls => true;
         public override bool ConcurrentObjectives => true;
+        public override bool AllowOutsideSubmarine => true;
         public override bool IsLoop { get => true; set => throw new System.Exception("Trying to set the value for IsLoop from: " + System.Environment.StackTrace); }
 
         // TODO: expose?
@@ -26,14 +27,39 @@ namespace Barotrauma
         private AIObjectiveGoTo goToObjective;
         private AIObjectiveFindDivingGear divingGearObjective;
 
-        public AIObjectiveFindSafety(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier) {  }
+        public AIObjectiveFindSafety(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier) { }
 
         protected override bool Check() => false;
         public override bool CanBeCompleted => true;
 
         private bool resetPriority;
 
-        public override float GetPriority() => Priority;
+        public override float GetPriority()
+        {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
+            if (character.CurrentHull == null)
+            {
+                Priority = objectiveManager.CurrentOrder is AIObjectiveGoTo && HumanAIController.HasDivingSuit(character) ? 0 : 100;
+            }
+            else
+            {
+                if (HumanAIController.NeedsDivingGear(character, character.CurrentHull, out _) && !HumanAIController.HasDivingGear(character))
+                {
+                    Priority = 100;
+                }
+                Priority = MathHelper.Clamp(Priority, 0, 100);
+                if (divingGearObjective != null && !divingGearObjective.IsCompleted && divingGearObjective.CanBeCompleted)
+                {
+                    // Boost the priority while seeking the diving gear
+                    Priority = Math.Max(Priority, Math.Min(AIObjectiveManager.OrderPriority + 20, 100));
+                }
+            }
+            return Priority;
+        }
 
         public override void Update(float deltaTime)
         {
@@ -46,28 +72,20 @@ namespace Barotrauma
             if (character.CurrentHull == null)
             {
                 currenthullSafety = 0;
-                Priority = objectiveManager.CurrentOrder is AIObjectiveGoTo ? 0 : 100;
-                return;
-            }
-            if (HumanAIController.NeedsDivingGear(character, character.CurrentHull, out _) && !HumanAIController.HasDivingGear(character))
-            {
-                Priority = 100;
-            }
-            currenthullSafety = HumanAIController.CurrentHullSafety;
-            if (currenthullSafety > HumanAIController.HULL_SAFETY_THRESHOLD)
-            {
-                Priority -= priorityDecrease * deltaTime;
             }
             else
             {
-                float dangerFactor = (100 - currenthullSafety) / 100;
-                Priority += dangerFactor * priorityIncrease * deltaTime;
-            }
-            Priority = MathHelper.Clamp(Priority, 0, 100);
-            if (divingGearObjective != null && !divingGearObjective.IsCompleted && divingGearObjective.CanBeCompleted)
-            {
-                // Boost the priority while seeking the diving gear
-                Priority = Math.Max(Priority, Math.Min(AIObjectiveManager.OrderPriority + 20, 100));
+                currenthullSafety = HumanAIController.CurrentHullSafety;
+                if (currenthullSafety > HumanAIController.HULL_SAFETY_THRESHOLD)
+                {
+                    Priority -= priorityDecrease * deltaTime;
+                }
+                else
+                {
+                    float dangerFactor = (100 - currenthullSafety) / 100;
+                    Priority += dangerFactor * priorityIncrease * deltaTime;
+                }
+                Priority = MathHelper.Clamp(Priority, 0, 100);
             }
         }
 
@@ -76,34 +94,39 @@ namespace Barotrauma
         protected override void Act(float deltaTime)
         {
             var currentHull = character.CurrentHull;
-            bool needsDivingGear = HumanAIController.NeedsDivingGear(character, currentHull, out bool needsDivingSuit);
-            bool needsEquipment = false;
-            if (needsDivingSuit)
+            bool dangerousPressure = currentHull == null || currentHull.LethalPressure > 0;
+            if (!dangerousPressure)
             {
-                needsEquipment = !HumanAIController.HasDivingSuit(character, AIObjectiveFindDivingGear.lowOxygenThreshold);
-            }
-            else if (needsDivingGear)
-            {
-                needsEquipment = !HumanAIController.HasDivingGear(character, AIObjectiveFindDivingGear.lowOxygenThreshold);
-            }
-            if (needsEquipment && divingGearObjective == null && !character.LockHands)
-            {
-                RemoveSubObjective(ref goToObjective);
-                TryAddSubObjective(ref divingGearObjective, 
-                    constructor: () => new AIObjectiveFindDivingGear(character, needsDivingSuit, objectiveManager),
-                    onAbandon: () =>
-                    {
-                        searchHullTimer = Math.Min(1, searchHullTimer);
+                // Don't try to seek diving gear if the pressure is dangerous. Just get out.
+                bool needsDivingGear = HumanAIController.NeedsDivingGear(character, currentHull, out bool needsDivingSuit);
+                bool needsEquipment = false;
+                if (needsDivingSuit)
+                {
+                    needsEquipment = !HumanAIController.HasDivingSuit(character, AIObjectiveFindDivingGear.lowOxygenThreshold);
+                }
+                else if (needsDivingGear)
+                {
+                    needsEquipment = !HumanAIController.HasDivingGear(character, AIObjectiveFindDivingGear.lowOxygenThreshold);
+                }
+                if (needsEquipment && divingGearObjective == null && !character.LockHands)
+                {
+                    RemoveSubObjective(ref goToObjective);
+                    TryAddSubObjective(ref divingGearObjective,
+                        constructor: () => new AIObjectiveFindDivingGear(character, needsDivingSuit, objectiveManager),
+                        onAbandon: () =>
+                        {
+                            searchHullTimer = Math.Min(1, searchHullTimer);
                         // Don't reset the diving gear objective, because it's possible that there is no diving gear -> seek a safe hull and then reset so that we can check again.
                     },
-                    onCompleted: () =>
-                    {
-                        resetPriority = true;
-                        searchHullTimer = Math.Min(1, searchHullTimer);
-                        RemoveSubObjective(ref divingGearObjective);
-                    });
+                        onCompleted: () =>
+                        {
+                            resetPriority = true;
+                            searchHullTimer = Math.Min(1, searchHullTimer);
+                            RemoveSubObjective(ref divingGearObjective);
+                        });
+                }
             }
-            else if (divingGearObjective == null || !divingGearObjective.CanBeCompleted)
+            if (divingGearObjective == null || !divingGearObjective.CanBeCompleted)
             {
                 if (currenthullSafety < HumanAIController.HULL_SAFETY_THRESHOLD)
                 {
@@ -128,14 +151,14 @@ namespace Barotrauma
                         {
                             RemoveSubObjective(ref goToObjective);
                         }
-                        TryAddSubObjective(ref goToObjective, 
+                        TryAddSubObjective(ref goToObjective,
                             constructor: () => new AIObjectiveGoTo(currentSafeHull, character, objectiveManager, getDivingGearIfNeeded: true)
                             {
                                 AllowGoingOutside = HumanAIController.HasDivingSuit(character, conditionPercentage: 50)
                             },
                             onCompleted: () =>
                             {
-                                if (currenthullSafety > HumanAIController.HULL_SAFETY_THRESHOLD || 
+                                if (currenthullSafety > HumanAIController.HULL_SAFETY_THRESHOLD ||
                                     HumanAIController.NeedsDivingGear(character, currentHull, out bool needsSuit) && (needsSuit ? HumanAIController.HasDivingSuit(character) : HumanAIController.HasDivingMask(character)))
                                 {
                                     resetPriority = true;
@@ -233,10 +256,8 @@ namespace Barotrauma
                     //(no need to do the expensive pathfinding if we already know we're not going to choose this hull)
                     if (hullSafety < bestValue) { continue; }
                     // Don't allow to go outside if not already outside.
-                    var path = character.CurrentHull != null ? 
-                        PathSteering.PathFinder.FindPath(character.SimPosition, hull.SimPosition, nodeFilter: node => node.Waypoint.CurrentHull != null) : 
-                        PathSteering.PathFinder.FindPath(character.SimPosition, hull.SimPosition);
-                    if (path.Unreachable && character.CurrentHull != null)
+                    var path = PathSteering.PathFinder.FindPath(character.SimPosition, hull.SimPosition, nodeFilter: node => node.Waypoint.CurrentHull != null);
+                    if (path.Unreachable)
                     {
                         HumanAIController.UnreachableHulls.Add(hull);
                         continue;
@@ -276,6 +297,7 @@ namespace Barotrauma
                     float distanceFactor = MathHelper.Lerp(1, 0.2f, MathUtils.InverseLerp(0, MathUtils.Pow(100000, 2), distance));
                     hullSafety *= distanceFactor;
                     // If the target is not inside a friendly submarine, considerably reduce the hull safety.
+                    // Intentionally exclude wrecks from this check
                     if (hull.Submarine.TeamID != character.TeamID && hull.Submarine.TeamID != Character.TeamType.FriendlyNPC)
                     {
                         hullSafety /= 10;

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

@@ -1,9 +1,9 @@
-using Barotrauma.Items.Components;
+using Barotrauma.Extensions;
+using Barotrauma.Items.Components;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Linq;
-using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -20,15 +20,23 @@ namespace Barotrauma
         private AIObjectiveGoTo gotoObjective;
         private AIObjectiveOperateItem operateObjective;
 
-        public AIObjectiveFixLeak(Gap leak, Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base (character, objectiveManager, priorityModifier)
+        public bool IgnoreSeverityAndDistance { get; private set; }
+
+        public AIObjectiveFixLeak(Gap leak, Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1, bool ignoreSeverityAndDistance = false) : base (character, objectiveManager, priorityModifier)
         {
             Leak = leak;
+            IgnoreSeverityAndDistance = ignoreSeverityAndDistance;
         }
 
         protected override bool Check() => Leak.Open <= 0 || Leak.Removed;
 
         public override float GetPriority()
         {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
             if (Leak.Removed || Leak.Open <= 0)
             {
                 Priority = 0;
@@ -39,8 +47,8 @@ namespace Barotrauma
                 float yDist = Math.Abs(character.WorldPosition.Y - Leak.WorldPosition.Y);
                 // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally).
                 // If the target is close, ignore the distance factor alltogether so that we keep fixing the leaks that are nearby.
-                float distanceFactor = xDist < 200 && yDist < 100 ? 1 : MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, xDist + yDist * 3.0f));
-                float severity = AIObjectiveFixLeaks.GetLeakSeverity(Leak) / 100;
+                float distanceFactor = IgnoreSeverityAndDistance || xDist < 200 && yDist < 100 ? 1 : MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, xDist + yDist * 3.0f));
+                float severity = IgnoreSeverityAndDistance ? 1 : AIObjectiveFixLeaks.GetLeakSeverity(Leak) / 100;
                 float max = Math.Min((AIObjectiveManager.OrderPriority - 1), 90);
                 float devotion = CumulatedDevotion / 100;
                 Priority = MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + (severity * distanceFactor * PriorityModifier), 0, 1));

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

@@ -1,7 +1,5 @@
 using Microsoft.Xna.Framework;
-using System;
 using System.Linq;
-using Barotrauma.Extensions;
 using System.Collections.Generic;
 
 namespace Barotrauma
@@ -11,8 +9,12 @@ namespace Barotrauma
         public override string DebugTag => "fix leaks";
         public override bool ForceRun => true;
         public override bool KeepDivingGearOn => true;
+        private Hull PrioritizedHull { get; set; }
 
-        public AIObjectiveFixLeaks(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier) { }
+        public AIObjectiveFixLeaks(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1, Hull prioritizedHull = null) : base(character, objectiveManager, priorityModifier)
+        {
+            PrioritizedHull = prioritizedHull;
+        }
 
         protected override bool Filter(Gap gap) => IsValidTarget(gap, character);
 
@@ -35,7 +37,7 @@ namespace Barotrauma
 
         protected override float TargetEvaluation()
         {
-            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveFixLeaks>(), onlyBots: true);
+            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveFixLeaks>() && !c.Character.IsIncapacitated, onlyBots: true);
             int totalLeaks = Targets.Count();
             if (totalLeaks == 0) { return 0; }
             int secondaryLeaks = Targets.Count(l => l.IsRoomToRoom);
@@ -60,7 +62,7 @@ namespace Barotrauma
 
         protected override IEnumerable<Gap> GetList() => Gap.GapList;
         protected override AIObjective ObjectiveConstructor(Gap gap) 
-            => new AIObjectiveFixLeak(gap, character, objectiveManager, PriorityModifier);
+            => new AIObjectiveFixLeak(gap, character, objectiveManager, priorityModifier: PriorityModifier, ignoreSeverityAndDistance: gap.FlowTargetHull == PrioritizedHull);
 
         protected override void OnObjectiveCompleted(AIObjective objective, Gap target)
             => HumanAIController.RemoveTargets<AIObjectiveFixLeaks, Gap>(character, target);
@@ -71,7 +73,11 @@ namespace Barotrauma
             if (gap.ConnectedWall == null || gap.ConnectedDoor != null || gap.Open <= 0 || gap.linkedTo.All(l => l == null)) { return false; }
             if (gap.Submarine == null) { return false; }
             if (gap.Submarine.TeamID != character.TeamID) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(gap, true)) { return false; }
+            if (character.Submarine != null)
+            {
+                if (gap.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (!character.Submarine.IsEntityFoundOnThisSub(gap, true)) { return false; }
+            }
             return true;
         }
     }

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

@@ -3,6 +3,7 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -20,7 +21,9 @@ namespace Barotrauma
         //can be either tags or identifiers
         private string[] itemIdentifiers;
         public IEnumerable<string> Identifiers => itemIdentifiers;
-        private Item targetItem, moveToTarget, rootContainer;
+
+        private Item targetItem;
+        private ISpatialEntity moveToTarget;
         private bool isDoneSeeking;
         public Item TargetItem => targetItem;
         private int currSearchIndex;
@@ -29,6 +32,8 @@ namespace Barotrauma
         private float currItemPriority;
         private bool checkInventory;
 
+        public static float DefaultReach = 100;
+
         public bool AllowToFindDivingGear { get; set; } = true;
 
         public AIObjectiveGetItem(Character character, Item targetItem, AIObjectiveManager objectiveManager, bool equip = true, float priorityModifier = 1) 
@@ -62,8 +67,7 @@ namespace Barotrauma
             if (item != null)
             {
                 targetItem = item;
-                rootContainer = item.GetRootContainer();
-                moveToTarget = rootContainer ?? item;
+                moveToTarget = item.GetRootInventoryOwner();
             }
             return item != null;
         }
@@ -86,6 +90,15 @@ namespace Barotrauma
                 }
                 if (!isDoneSeeking)
                 {
+                    bool dangerousPressure = character.CurrentHull == null || character.CurrentHull.LethalPressure > 0;
+                    if (dangerousPressure)
+                    {
+#if DEBUG
+                        DebugConsole.NewMessage($"{character.Name}: Seeking item aborted, because the pressure is dangerous.", Color.Yellow);
+#endif
+                        Abandon = true;
+                        return;
+                    }
                     FindTargetItem();
                     objectiveManager.GetObjective<AIObjectiveIdle>().Wander(deltaTime);
                     return;
@@ -108,7 +121,26 @@ namespace Barotrauma
                 Reset();
                 return;
             }
-            if (character.CanInteractWith(targetItem, out _, checkLinked: false))
+            bool canInteract = false;
+            if (moveToTarget is Character c)
+            {
+                if (character == c)
+                {
+                    canInteract = true;
+                    moveToTarget = null;
+                }
+                else
+                {
+                    character.SelectCharacter(c);
+                    canInteract = character.CanInteractWith(c, maxDist: DefaultReach);
+                    character.DeselectCharacter();
+                }
+            }
+            else if (moveToTarget is Item parentItem)
+            {
+                canInteract = character.CanInteractWith(parentItem, out _, checkLinked: false);
+            }
+            if (canInteract)
             {
                 var pickable = targetItem.GetComponent<Pickable>();
                 if (pickable == null)
@@ -173,17 +205,17 @@ namespace Barotrauma
                     }
                 }
             }
-            else
+            else if (moveToTarget != null)
             {
                 TryAddSubObjective(ref goToObjective,
                     constructor: () =>
                     {
-                        return new AIObjectiveGoTo(moveToTarget, character, objectiveManager, repeat: false, getDivingGearIfNeeded: AllowToFindDivingGear)
+                        return new AIObjectiveGoTo(moveToTarget, character, objectiveManager, repeat: false, getDivingGearIfNeeded: AllowToFindDivingGear, closeEnough: DefaultReach)
                         {
                             // If the root container changes, the item is no longer where it was (taken by someone -> need to find another item)
-                            abortCondition = () => targetItem == null || targetItem.GetRootContainer() != rootContainer,
+                            abortCondition = () => targetItem == null || targetItem.GetRootInventoryOwner() != moveToTarget,
                             DialogueIdentifier = "dialogcannotreachtarget",
-                            TargetName = moveToTarget.Name
+                            TargetName = (moveToTarget as MapEntity)?.Name ?? (moveToTarget as Character)?.Name ?? moveToTarget.ToString()
                         };
                     },
                     onAbandon: () =>
@@ -212,23 +244,27 @@ namespace Barotrauma
             {
                 currSearchIndex++;
                 var item = Item.ItemList[currSearchIndex];
-                if (item.Submarine == null) { continue; }
-                if (item.CurrentHull == null) { continue; }
-                if (item.Submarine.TeamID != character.TeamID) { continue; }
+                Submarine itemSub = item.Submarine ?? item.ParentInventory?.Owner?.Submarine;
+                if (itemSub == null) { continue; }
+                if (itemSub.TeamID != character.TeamID) { continue; }
                 if (!CheckItem(item)) { continue; }
                 if (ignoredContainerIdentifiers != null && item.Container != null)
                 {
                     if (ignoredContainerIdentifiers.Contains(item.ContainerIdentifier)) { continue; }
                 }
-                if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(item, true)) { continue; }
+                if (character.Submarine != null)
+                {
+                    if (itemSub.Info.Type != character.Submarine.Info.Type) { continue; }
+                    if (character.Submarine.GetConnectedSubs().None(s => s == itemSub && itemSub.TeamID == character.TeamID && itemSub.Info.Type == character.Submarine.Info.Type)) { continue; }
+                }
                 if (character.IsItemTakenBySomeoneElse(item)) { continue; }
                 float itemPriority = 1;
                 if (GetItemPriority != null)
                 {
                     itemPriority = GetItemPriority(item);
                 }
-                Item rootContainer = item.GetRootContainer();
-                Vector2 itemPos = (rootContainer ?? item).WorldPosition;
+                Entity rootInventoryOwner = item.GetRootInventoryOwner();
+                Vector2 itemPos = (rootInventoryOwner ?? item).WorldPosition;
                 float yDist = Math.Abs(character.WorldPosition.Y - itemPos.Y);
                 yDist = yDist > 100 ? yDist * 5 : 0;
                 float dist = Math.Abs(character.WorldPosition.X - itemPos.X) + yDist;
@@ -239,8 +275,7 @@ namespace Barotrauma
                 if (itemPriority < currItemPriority) { continue; }
                 currItemPriority = itemPriority;
                 targetItem = item;
-                moveToTarget = rootContainer ?? item;
-                this.rootContainer = rootContainer;
+                moveToTarget = rootInventoryOwner ?? item;
             }
             if (currSearchIndex >= Item.ItemList.Count - 1)
             {
@@ -276,6 +311,7 @@ namespace Barotrauma
 
         private bool CheckItem(Item item)
         {
+            if (item.NonInteractable) { return false; }
             if (ignoredItems.Contains(item)) { return false; };
             if (item.Condition < TargetCondition) { return false; }
             if (ItemFilter != null && !ItemFilter(item)) { return false; }
@@ -288,7 +324,6 @@ namespace Barotrauma
             RemoveSubObjective(ref goToObjective);
             targetItem = null;
             moveToTarget = null;
-            rootContainer = null;
             isDoneSeeking = false;
             currSearchIndex = 0;
         }

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

@@ -44,6 +44,9 @@ namespace Barotrauma
         public bool AllowGoingOutside { get; set; }
 
         public override bool AbandonWhenCannotCompleteSubjectives => !repeat;
+
+        public override bool AllowOutsideSubmarine => AllowGoingOutside;
+
         public string DialogueIdentifier { get; set; }
         public string TargetName { get; set; }
 
@@ -63,31 +66,42 @@ namespace Barotrauma
             {
                 Priority = 0;
             }
-            return objectiveManager.CurrentOrder == this ? AIObjectiveManager.OrderPriority : Priority;
+            else
+            {
+                Priority = objectiveManager.CurrentOrder == this ? AIObjectiveManager.OrderPriority : 10;
+            }
+            return Priority;
         }
 
-        public AIObjectiveGoTo(ISpatialEntity target, Character character, AIObjectiveManager objectiveManager, bool repeat = false, bool getDivingGearIfNeeded = true, float priorityModifier = 1, float closeEnough = 0) 
-            : base (character, objectiveManager, priorityModifier)
+        public AIObjectiveGoTo(ISpatialEntity target, Character character, AIObjectiveManager objectiveManager, bool repeat = false, bool getDivingGearIfNeeded = true, float priorityModifier = 1, float closeEnough = 0)
+            : base(character, objectiveManager, priorityModifier)
         {
             this.Target = target;
             this.repeat = repeat;
             waitUntilPathUnreachable = 3.0f;
             this.getDivingGearIfNeeded = getDivingGearIfNeeded;
-            CloseEnough = closeEnough;
             if (Target is Item i)
             {
                 CloseEnough = Math.Max(CloseEnough, i.InteractDistance + Math.Max(i.Rect.Width, i.Rect.Height) / 2);
             }
+            else if (Target is Character)
+            {
+                CloseEnough = Math.Max(closeEnough, AIObjectiveGetItem.DefaultReach);
+            }
+            else
+            {
+                CloseEnough = closeEnough;
+            }
         }
 
         private void SpeakCannotReach()
         {
 #if DEBUG
-            DebugConsole.NewMessage($"{character.Name}: Cannot reach the target: {Target.ToString()}", Color.Yellow);
+            DebugConsole.NewMessage($"{character.Name}: Cannot reach the target: {Target}", Color.Yellow);
 #endif
             if (objectiveManager.CurrentOrder != null && DialogueIdentifier != null)
             {
-                string msg = TargetName == null ? TextManager.Get(DialogueIdentifier, true) : TextManager.GetWithVariable(DialogueIdentifier, "[name]", TargetName, true);
+                string msg = TargetName == null ? TextManager.Get(DialogueIdentifier, true) : TextManager.GetWithVariable(DialogueIdentifier, "[name]", TargetName, formatCapitals: !(Target is Character));
                 if (msg != null)
                 {
                     character.Speak(msg, identifier: DialogueIdentifier, minDurationBetweenSimilar: 20.0f);
@@ -200,16 +214,25 @@ namespace Barotrauma
                     }
                     if (needsEquipment)
                     {
-                        TryAddSubObjective(ref findDivingGear, () => new AIObjectiveFindDivingGear(character, needsDivingSuit, objectiveManager), 
+                        TryAddSubObjective(ref findDivingGear, () => new AIObjectiveFindDivingGear(character, needsDivingSuit, objectiveManager),
                             onAbandon: () => Abandon = true,
                             onCompleted: () => RemoveSubObjective(ref findDivingGear));
                         return;
                     }
                 }
-                if (repeat && IsCloseEnough)
+                if (repeat)
                 {
-                    OnCompleted();
-                    return;
+                    if (IsCloseEnough)
+                    {
+                        if (requiredCondition == null || requiredCondition())
+                        {
+                            if (character.CanSeeTarget(Target))
+                            {
+                                OnCompleted();
+                                return;
+                            }
+                        }
+                    }
                 }
                 if (SteeringManager == PathSteering)
                 {
@@ -237,7 +260,7 @@ namespace Barotrauma
             }
         }
 
-        private Hull GetTargetHull()
+        public Hull GetTargetHull()
         {
             if (Target is Hull h)
             {
@@ -277,13 +300,7 @@ namespace Barotrauma
                     //otherwise characters can let go of the ladders too soon once they're close enough to the target
                     if (PathSteering.CurrentPath.NextNode != null) { return false; }
                 }
-
-                bool closeEnough = Vector2.DistanceSquared(Target.WorldPosition, character.WorldPosition) < CloseEnough * CloseEnough;
-                if (closeEnough)
-                {
-                    closeEnough = !(Target is Character) || Target is Character c && c.CurrentHull == character.CurrentHull;
-                }
-                return closeEnough;
+                return Vector2.DistanceSquared(Target.WorldPosition, character.WorldPosition) < CloseEnough * CloseEnough;
             }
         }
 
@@ -319,7 +336,9 @@ namespace Barotrauma
                         }
                         else if (Target is Character targetCharacter)
                         {
-                            if (character.CanInteractWith(targetCharacter, CloseEnough)) { IsCompleted = true; }
+                            character.SelectCharacter(targetCharacter);
+                            if (character.CanInteractWith(targetCharacter, skipDistanceCheck: true)) { IsCompleted = true; }
+                            character.DeselectCharacter();
                         }
                         else
                         {
@@ -331,6 +350,16 @@ namespace Barotrauma
             return IsCompleted;
         }
 
+        protected override void OnAbandon()
+        {
+            StopMovement();
+            if (SteeringManager == PathSteering)
+            {
+                PathSteering.ResetPath();
+            }
+            base.OnAbandon();
+        }
+
         private void StopMovement()
         {
             character.AIController.SteeringManager.Reset();

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

@@ -3,7 +3,6 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -11,6 +10,7 @@ namespace Barotrauma
     {
         public override string DebugTag => "idle";
         public override bool UnequipItems => true;
+        public override bool AllowOutsideSubmarine => true;
 
         private readonly float newTargetIntervalMin = 10;
         private readonly float newTargetIntervalMax = 20;
@@ -34,41 +34,43 @@ namespace Barotrauma
         {
             standStillTimer = Rand.Range(-10.0f, 10.0f);
             walkDuration = Rand.Range(0.0f, 10.0f);
+            CalculatePriority();
         }
 
         protected override bool Check() => false;
         public override bool CanBeCompleted => true;
 
-        public override bool IsLoop { get => true; set => throw new System.Exception("Trying to set the value for IsLoop from: " + System.Environment.StackTrace); }
+        public override bool IsLoop { get => true; set => throw new Exception("Trying to set the value for IsLoop from: " + Environment.StackTrace); }
 
         private float randomTimer;
         private float randomUpdateInterval = 5;
         public float Random { get; private set; }
 
-        public void CalculatePriority()
+        public void CalculatePriority(float max = 0)
         {
-            Random = Rand.Range(0.5f, 1.5f);
-            randomTimer = randomUpdateInterval;
-            float max = Math.Min(Math.Min(AIObjectiveManager.RunPriority, AIObjectiveManager.OrderPriority) - 1, 100);
-            float initiative = character.GetSkillLevel("initiative");
-            Priority = MathHelper.Lerp(1, max, MathUtils.InverseLerp(100, 0, initiative * Random));
+            //Random = Rand.Range(0.5f, 1.5f);
+            //randomTimer = randomUpdateInterval;
+            //max = max > 0 ? max : Math.Min(Math.Min(AIObjectiveManager.RunPriority, AIObjectiveManager.OrderPriority) - 1, 100);
+            //float initiative = character.GetSkillLevel("initiative");
+            //Priority = MathHelper.Lerp(1, max, MathUtils.InverseLerp(100, 0, initiative * Random));
+            Priority = 1;
         }
 
         public override float GetPriority() => Priority;
 
         public override void Update(float deltaTime)
         {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    CalculatePriority();
-                }
-            }
+            //if (objectiveManager.CurrentObjective == this)
+            //{
+            //    if (randomTimer > 0)
+            //    {
+            //        randomTimer -= deltaTime;
+            //    }
+            //    else
+            //    {
+            //        CalculatePriority();
+            //    }
+            //}
         }
 
         protected override void Act(float deltaTime)
@@ -128,7 +130,7 @@ namespace Barotrauma
                     //choose a random available hull
                     currentTarget = ToolBox.SelectWeightedRandom(targetHulls, hullWeights, Rand.RandSync.Unsynced);
                     bool isCurrentHullAllowed = !IsForbidden(character.CurrentHull);
-                    var path = PathSteering.PathFinder.FindPath(character.SimPosition, currentTarget.SimPosition, nodeFilter: node =>
+                    var path = PathSteering.PathFinder.FindPath(character.SimPosition, currentTarget.SimPosition, errorMsgStr: $"AIObjectiveIdle {character.DisplayName}", nodeFilter: node =>
                     {
                         if (node.Waypoint.CurrentHull == null) { return false; }
                         // Check that there is no unsafe or forbidden hulls on the way to the target
@@ -231,9 +233,11 @@ namespace Barotrauma
             {
                 if (HumanAIController.UnsafeHulls.Contains(hull)) { continue; }
                 if (hull.Submarine == null) { continue; }
-                if (hull.Submarine.TeamID != character.TeamID) { continue; }
-                // If the character is inside, only take connected hulls into account.
-                if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(hull, true)) { continue; }
+                if (character.Submarine == null) { break; }
+                if (hull.Submarine.TeamID != character.Submarine.TeamID) { continue; }
+                if (hull.Submarine.Info.Type != character.Submarine.Info.Type) { continue; }
+                // If the character is inside, only take connected subs into account.
+                if (!character.Submarine.IsEntityFoundOnThisSub(hull, true)) { continue; }
                 if (IsForbidden(hull)) { continue; }
                 // Ignore hulls that are too low to stand inside
                 if (character.AnimController is HumanoidAnimController animController)

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

@@ -47,7 +47,7 @@ namespace Barotrauma
         public override bool AllowSubObjectiveSorting => true;
         public virtual bool InverseTargetEvaluation => false;
 
-        public override bool IsLoop { get => true; set => throw new System.Exception("Trying to set the value for IsLoop from: " + System.Environment.StackTrace); }
+        public override bool IsLoop { get => true; set => throw new Exception("Trying to set the value for IsLoop from: " + System.Environment.StackTrace); }
 
         public override void Update(float deltaTime)
         {
@@ -108,6 +108,11 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
             if (character.LockHands || character.Submarine == null || Targets.None())
             {
                 Priority = 0;
@@ -199,7 +204,7 @@ namespace Barotrauma
                     {
                         Objectives.Remove(target);
                         ignoreList.Add(target);
-                        targetUpdateTimer = 0;
+                        targetUpdateTimer = Math.Min(0.1f, targetUpdateTimer);
                     };
                 }
             }

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

@@ -1,9 +1,10 @@
-using Barotrauma.Items.Components;
+using Barotrauma.Extensions;
+using Barotrauma.Items.Components;
+using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Barotrauma.Extensions;
-using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
@@ -13,8 +14,11 @@ namespace Barotrauma
         public const float OrderPriority = 70;
         public const float RunPriority = 50;
         // Constantly increases the priority of the selected objective, unless overridden
-        public const float baseDevotion = 3;
+        public const float baseDevotion = 5;
 
+        /// <summary>
+        /// Excluding the current order.
+        /// </summary>
         public List<AIObjective> Objectives { get; private set; } = new List<AIObjective>();
 
         private readonly Character character;
@@ -87,8 +91,25 @@ namespace Barotrauma
 
         public Dictionary<AIObjective, CoroutineHandle> DelayedObjectives { get; private set; } = new Dictionary<AIObjective, CoroutineHandle>();
 
+        private void ClearIgnored()
+        {
+            if (character.AIController is HumanAIController humanAi)
+            {
+                humanAi.UnreachableHulls.Clear();
+                humanAi.IgnoredItems.Clear();
+            }
+        }
+
         public void CreateAutonomousObjectives()
         {
+            if (character.IsDead)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("Attempted to create autonomous orders for a dead character");
+#else
+                return;
+#endif
+            }
             foreach (var delayedObjective in DelayedObjectives)
             {
                 CoroutineManager.StopCoroutines(delayedObjective.Value);
@@ -98,24 +119,16 @@ namespace Barotrauma
             AddObjective(new AIObjectiveFindSafety(character, this));
             AddObjective(new AIObjectiveIdle(character, this));
             int objectiveCount = Objectives.Count;
-            foreach (var automaticOrder in character.Info.Job.Prefab.AutomaticOrders)
+            foreach (var autonomousObjective in character.Info.Job.Prefab.AutonomousObjective)
             {
-                var orderPrefab = Order.GetPrefab(automaticOrder.identifier);
-                if (orderPrefab == null) { throw new Exception($"Could not find a matching prefab by the identifier: '{automaticOrder.identifier}'"); }
-                // TODO: Similar code is used in CrewManager:815-> DRY
-                var matchingItems = orderPrefab.ItemIdentifiers.Any() ?
-                    Item.ItemList.FindAll(it => orderPrefab.ItemIdentifiers.Contains(it.Prefab.Identifier) || it.HasTag(orderPrefab.ItemIdentifiers)) :
-                    Item.ItemList.FindAll(it => it.Components.Any(ic => ic.GetType() == orderPrefab.ItemComponentType));
-                matchingItems.RemoveAll(it => it.Submarine != character.Submarine);
-                var item = matchingItems.GetRandom();
-                var order = new Order(
-                    orderPrefab,
-                    item ?? character.CurrentHull as Entity,
-                    item?.Components.FirstOrDefault(ic => ic.GetType() == orderPrefab.ItemComponentType),
-                    orderGiver: character);
+                var orderPrefab = Order.GetPrefab(autonomousObjective.identifier);
+                if (orderPrefab == null) { throw new Exception($"Could not find a matching prefab by the identifier: '{autonomousObjective.identifier}'"); }
+                var item = orderPrefab.MustSetTarget ? orderPrefab.GetMatchingItems(character.Submarine, false)?.GetRandom() : null;
+                var order = new Order(orderPrefab, item ?? character.CurrentHull as Entity,
+                    item?.Components.FirstOrDefault(ic => ic.GetType() == orderPrefab.ItemComponentType), orderGiver: character);
                 if (order == null) { continue; }
-                var objective = CreateObjective(order, automaticOrder.option, character, automaticOrder.priorityModifier);
-                if (objective != null)
+                var objective = CreateObjective(order, autonomousObjective.option, character, isAutonomous: true, autonomousObjective.priorityModifier);
+                if (objective != null && objective.CanBeCompleted)
                 {
                     AddObjective(objective, delay: Rand.Value() / 2);
                     objectiveCount++;
@@ -167,7 +180,7 @@ namespace Barotrauma
             {
                 previousObjective?.OnDeselected();
                 CurrentObjective?.OnSelected();
-                GetObjective<AIObjectiveIdle>().CalculatePriority();
+                GetObjective<AIObjectiveIdle>().CalculatePriority(Math.Max(CurrentObjective.Priority - 10, 0));
             }
             return CurrentObjective;
         }
@@ -179,7 +192,27 @@ namespace Barotrauma
 
         public void UpdateObjectives(float deltaTime)
         {
-            CurrentOrder?.Update(deltaTime);
+            if (CurrentOrder != null)
+            {
+                if (CurrentOrder.IsCompleted)
+                {
+#if DEBUG
+                    DebugConsole.NewMessage($"{character.Name}: Removing order {CurrentOrder.DebugTag}, because it is completed.", Color.LightGreen);
+#endif
+                    CurrentOrder = null;
+                }
+                else if (!CurrentOrder.CanBeCompleted)
+                {
+#if DEBUG
+                    DebugConsole.NewMessage($"{character.Name}: Removing order {CurrentOrder.DebugTag}, because it cannot be completed.", Color.Red);
+#endif
+                    CurrentOrder = null;
+                }
+                else
+                {
+                    CurrentOrder.Update(deltaTime);
+                }
+            }
             if (WaitTimer > 0)
             {
                 WaitTimer -= deltaTime;
@@ -202,7 +235,7 @@ namespace Barotrauma
 #endif
                     Objectives.Remove(objective);
                 }
-                else if (objective != CurrentOrder)
+                else
                 {
                     objective.Update(deltaTime);
                 }
@@ -212,14 +245,15 @@ namespace Barotrauma
 
         public void SortObjectives()
         {
+            CurrentOrder?.GetPriority();
+            Objectives.ForEach(o => o.GetPriority());
             if (Objectives.Any())
             {
-                Objectives.ForEach(o => o.GetPriority());
                 Objectives.Sort((x, y) => y.Priority.CompareTo(x.Priority));
             }
             GetCurrentObjective()?.SortSubObjectives();
         }
-        
+
         public void DoCurrentObjective(float deltaTime)
         {
             if (WaitTimer <= 0)
@@ -231,7 +265,7 @@ namespace Barotrauma
                 character.AIController.SteeringManager.Reset();
             }
         }
-        
+
         public void SetOrder(AIObjective objective)
         {
             CurrentOrder = objective;
@@ -239,7 +273,16 @@ namespace Barotrauma
 
         public void SetOrder(Order order, string option, Character orderGiver)
         {
-            CurrentOrder = CreateObjective(order, option, orderGiver);
+            if (character.IsDead)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("Attempted to set an order for a dead character");
+#else
+                return;
+#endif
+            }
+            ClearIgnored();
+            CurrentOrder = CreateObjective(order, option, orderGiver, isAutonomous: false);
             if (CurrentOrder == null)
             {
                 // Recreate objectives, because some of them may be removed, if impossible to complete (e.g. due to path finding)
@@ -251,7 +294,7 @@ namespace Barotrauma
             }
         }
 
-        public AIObjective CreateObjective(Order order, string option, Character orderGiver, float priorityModifier = 1)
+        public AIObjective CreateObjective(Order order, string option, Character orderGiver, bool isAutonomous, float priorityModifier = 1)
         {
             if (order == null) { return null; }
             AIObjective newObjective;
@@ -270,13 +313,13 @@ namespace Barotrauma
                     };
                     break;
                 case "wait":
-                    newObjective = new AIObjectiveGoTo(character, character, this, repeat: true, priorityModifier: priorityModifier)
+                    newObjective = new AIObjectiveGoTo(order.TargetEntity ?? character, character, this, repeat: true, priorityModifier: priorityModifier)
                     {
                         AllowGoingOutside = character.CurrentHull == null
                     };
                     break;
                 case "fixleaks":
-                    newObjective = new AIObjectiveFixLeaks(character, this, priorityModifier);
+                    newObjective = new AIObjectiveFixLeaks(character, this, priorityModifier: priorityModifier, prioritizedHull: order.TargetEntity as Hull);
                     break;
                 case "chargebatteries":
                     newObjective = new AIObjectiveChargeBatteries(character, this, option, priorityModifier);
@@ -285,13 +328,31 @@ namespace Barotrauma
                     newObjective = new AIObjectiveRescueAll(character, this, priorityModifier);
                     break;
                 case "repairsystems":
-                    newObjective = new AIObjectiveRepairItems(character, this, priorityModifier)
+                case "repairmechanical":
+                case "repairelectrical":
+                    newObjective = new AIObjectiveRepairItems(character, this, priorityModifier: priorityModifier, prioritizedItem: order.TargetEntity as Item)
                     {
-                        RequireAdequateSkills = option == "jobspecific"
+                        RelevantSkill = order.AppropriateSkill,
+                        RequireAdequateSkills = isAutonomous
                     };
                     break;
                 case "pumpwater":
-                    newObjective = new AIObjectivePumpWater(character, this, option, priorityModifier: priorityModifier);
+                    if (order.TargetItemComponent is Pump targetPump)
+                    {
+                        if (order.TargetItemComponent.Item.NonInteractable) { return null; }
+                        newObjective = new AIObjectiveOperateItem(targetPump, character, this, option, false, priorityModifier: priorityModifier)
+                        {
+                            IsLoop = true,
+                            Override = orderGiver != null && orderGiver.IsPlayer
+                        };
+                        // ItemComponent.AIOperate() returns false by default -> We'd have to set IsLoop = false and implement a custom override of AIOperate for the Pump.cs, 
+                        // if we want that the bot just switches the pump on/off and continues doing something else.
+                        // If we want that the bot does the objective and then forgets about it, I think we could do the same plus dismiss when the bot is done.
+                    }
+                    else
+                    {
+                        newObjective = new AIObjectivePumpWater(character, this, option, priorityModifier: priorityModifier);
+                    }
                     break;
                 case "extinguishfires":
                     newObjective = new AIObjectiveExtinguishFires(character, this, priorityModifier);
@@ -301,9 +362,11 @@ namespace Barotrauma
                     break;
                 case "steer":
                     var steering = (order?.TargetEntity as Item)?.GetComponent<Steering>();
-                    if (steering != null) steering.PosToMaintain = steering.Item.Submarine?.WorldPosition;
+                    if (steering != null) { steering.PosToMaintain = steering.Item.Submarine?.WorldPosition; }
                     if (order.TargetItemComponent == null) { return null; }
-                    newObjective = new AIObjectiveOperateItem(order.TargetItemComponent, character, this, option, requireEquip: false, useController: order.UseController, priorityModifier: priorityModifier)
+                    if (order.TargetItemComponent.Item.NonInteractable) { return null; }
+                    newObjective = new AIObjectiveOperateItem(order.TargetItemComponent, character, this, option,
+                        requireEquip: false, useController: order.UseController, controller: order.ConnectedController, priorityModifier: priorityModifier)
                     {
                         IsLoop = true,
                         // Don't override unless it's an order by a player
@@ -312,17 +375,32 @@ namespace Barotrauma
                     break;
                 default:
                     if (order.TargetItemComponent == null) { return null; }
-                    newObjective = new AIObjectiveOperateItem(order.TargetItemComponent, character, this, option, requireEquip: false, useController: order.UseController, priorityModifier: priorityModifier)
+                    if (order.TargetItemComponent.Item.NonInteractable) { return null; }
+                    newObjective = new AIObjectiveOperateItem(order.TargetItemComponent, character, this, option,
+                        requireEquip: false, useController: order.UseController, controller: order.ConnectedController, priorityModifier: priorityModifier)
                     {
-                        IsLoop = true,
+                        IsLoop = option != "shutdown",
                         // Don't override unless it's an order by a player
                         Override = orderGiver != null && orderGiver.IsPlayer
                     };
+                    if (newObjective.Abandon) { return null; }
                     break;
             }
             return newObjective;
         }
 
+        private void DismissSelf()
+        {
+#if CLIENT
+            if (GameMain.GameSession?.CrewManager != null && GameMain.GameSession.CrewManager.IsSinglePlayer)
+            {
+                GameMain.GameSession?.CrewManager?.SetCharacterOrder(character, Order.GetPrefab("dismissed"), null, character);
+            }
+#else
+            GameMain.Server?.SendOrderChatMessage(new OrderChatMessage(Order.GetPrefab("dismissed"), null, null, character, character));
+#endif
+        }
+
         private bool IsAllowedToWait()
         {
             if (CurrentOrder != null) { return false; }

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

@@ -3,7 +3,6 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -32,6 +31,11 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
             if (component.Item.ConditionPercentage <= 0)
             {
                 Priority = 0;
@@ -42,38 +46,74 @@ namespace Barotrauma
                 {
                     Priority = AIObjectiveManager.OrderPriority;
                 }
-
-                if (component.Item.CurrentHull == null || component.Item.CurrentHull.FireSources.Any() || HumanAIController.IsItemOperatedByAnother(GetTarget(), out _))
+                ItemComponent target = GetTarget();
+                Item targetItem = target?.Item;
+                if (targetItem == null)
+                {
+#if DEBUG
+                    DebugConsole.ThrowError("Item or component of AI Objective Operate item wass null. This shouldn't happen.");
+#endif
+                    Abandon = true;
+                    Priority = 0;
+                    return Priority;
+                }
+                switch (Option)
+                {
+                    case "shutdown":
+                        var powered = component?.Item.GetComponent<Powered>();
+                        if (powered != null && powered.IsActive)
+                        {
+                            Priority = 0;
+                            return Priority;
+                        }
+                        break;
+                    case "powerup":
+                        // Check that we don't already have another order that is targeting the same item.
+                        if (objectiveManager.CurrentOrder is AIObjectiveOperateItem operateOrder && operateOrder != this && operateOrder.GetTarget() == target)
+                        {
+                            Priority = 0;
+                            return Priority;
+                        }
+                        break;
+                }
+                if (targetItem.CurrentHull == null || targetItem.CurrentHull.FireSources.Any() || HumanAIController.IsItemOperatedByAnother(target, out _))
                 {
                     Priority = 0;
                 }
-                else if (Character.CharacterList.Any(c => c.CurrentHull == component.Item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c)))
+                else if (Character.CharacterList.Any(c => c.CurrentHull == targetItem.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c)))
                 {
                     Priority = 0;
                 }
                 else
                 {
                     float value = CumulatedDevotion + (AIObjectiveManager.OrderPriority * PriorityModifier);
-                    float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1), 90);
+                    float max = objectiveManager.CurrentOrder == this ? MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90) : AIObjectiveManager.RunPriority - 1;
                     Priority = MathHelper.Clamp(value, 0, max);
                 }
             }
             return Priority;
         }
 
-        public AIObjectiveOperateItem(ItemComponent item, Character character, AIObjectiveManager objectiveManager, string option, bool requireEquip, Entity operateTarget = null, bool useController = false, float priorityModifier = 1) 
-            : base (character, objectiveManager, priorityModifier, option)
+        public AIObjectiveOperateItem(ItemComponent item, Character character, AIObjectiveManager objectiveManager, string option, bool requireEquip,
+            Entity operateTarget = null, bool useController = false, ItemComponent controller = null, float priorityModifier = 1)
+            : base(character, objectiveManager, priorityModifier, option)
         {
-            this.component = item ?? throw new System.ArgumentNullException("item", "Attempted to create an AIObjectiveOperateItem with a null target.");
+            component = item ?? throw new ArgumentNullException("item", "Attempted to create an AIObjectiveOperateItem with a null target.");
             this.requireEquip = requireEquip;
             this.operateTarget = operateTarget;
             this.useController = useController;
-            if (useController)
+            if (useController) { this.controller = controller ?? component?.Item?.FindController(); }
+            var target = GetTarget();
+            if (target == null)
             {
-                //try finding the controller with the simpler non-recursive method first
-                controller =
-                        component.Item.GetConnectedComponents<Controller>().FirstOrDefault() ??
-                        component.Item.GetConnectedComponents<Controller>(recursive: true).FirstOrDefault();
+#if DEBUG
+                throw new Exception("target null");
+#endif
+                Abandon = true;
+            }
+            else if (target.Item.NonInteractable)
+            {
+                Abandon = true;
             }
         }
 
@@ -117,7 +157,7 @@ namespace Barotrauma
                     {
                         DialogueIdentifier = "dialogcannotreachtarget",
                         TargetName = target.Item.Name
-                    }, 
+                    },
                         onAbandon: () => Abandon = true,
                         onCompleted: () => RemoveSubObjective(ref goToObjective));
                 }
@@ -132,7 +172,7 @@ namespace Barotrauma
                 }
                 else if (!character.Inventory.Items.Contains(component.Item))
                 {
-                    TryAddSubObjective(ref getItemObjective, () => new AIObjectiveGetItem(character, component.Item, objectiveManager, equip: true), 
+                    TryAddSubObjective(ref getItemObjective, () => new AIObjectiveGetItem(character, component.Item, objectiveManager, equip: true),
                         onAbandon: () => Abandon = true,
                         onCompleted: () => RemoveSubObjective(ref getItemObjective));
                 }

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

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
-using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -27,13 +26,18 @@ namespace Barotrauma
         protected override bool Filter(Pump pump)
         {
             if (pump == null) { return false; }
+            if (pump.Item.NonInteractable) { return false; }
             if (pump.Item.HasTag("ballast")) { return false; }
             if (pump.Item.Submarine == null) { return false; }
             if (pump.Item.CurrentHull == null) { return false; }
             if (pump.Item.Submarine.TeamID != character.TeamID) { return false; }
             if (pump.Item.ConditionPercentage <= 0) { return false; }
             if (pump.Item.CurrentHull.FireSources.Count > 0) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(pump.Item, true)) { return false; }
+            if (character.Submarine != null)
+            {
+                if (pump.Item.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (!character.Submarine.IsEntityFoundOnThisSub(pump.Item, true)) { return false; }
+            }
             if (Character.CharacterList.Any(c => c.CurrentHull == pump.Item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return false; }
             if (IsReady(pump)) { return false; }
             return true;

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

@@ -3,7 +3,6 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Linq;
 using Barotrauma.Extensions;
-using FarseerPhysics;
 
 namespace Barotrauma
 {
@@ -20,14 +19,22 @@ namespace Barotrauma
         private RepairTool repairTool;
 
         private bool IsRepairing => character.SelectedConstruction == Item && Item.GetComponent<Repairable>()?.CurrentFixer == character;
+        private readonly bool isPriority;
 
-        public AIObjectiveRepairItem(Character character, Item item, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier)
+        public AIObjectiveRepairItem(Character character, Item item, AIObjectiveManager objectiveManager, float priorityModifier = 1, bool isPriority = false)
+            : base(character, objectiveManager, priorityModifier)
         {
             Item = item;
+            this.isPriority = isPriority;
         }
 
         public override float GetPriority()
         {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
             // TODO: priority list?
             // Ignore items that are being repaired by someone else.
             if (Item.Repairables.Any(r => r.CurrentFixer != null && r.CurrentFixer != character))
@@ -36,20 +43,19 @@ namespace Barotrauma
             }
             else
             {
-                float yDist = Math.Abs(character.WorldPosition.Y - Item.WorldPosition.Y);
-                yDist = yDist > 100 ? yDist * 5 : 0;
-                float dist = Math.Abs(character.WorldPosition.X - Item.WorldPosition.X) + yDist;
-                float distanceFactor = MathHelper.Lerp(1, 0.25f, MathUtils.InverseLerp(0, 5000, dist));
-                if (Item.CurrentHull == character.CurrentHull)
+                float distanceFactor = 1;
+                if (!isPriority && Item.CurrentHull != character.CurrentHull)
                 {
-                    distanceFactor = 1;
+                    float yDist = Math.Abs(character.WorldPosition.Y - Item.WorldPosition.Y);
+                    yDist = yDist > 100 ? yDist * 5 : 0;
+                    float dist = Math.Abs(character.WorldPosition.X - Item.WorldPosition.X) + yDist;
+                    distanceFactor = MathHelper.Lerp(1, 0.25f, MathUtils.InverseLerp(0, 5000, dist));
                 }
-                float damagePriority = MathHelper.Lerp(1, 0, Item.Condition / Item.MaxCondition);
-                float successFactor = MathHelper.Lerp(0, 1, Item.Repairables.Average(r => r.DegreeOfSuccess(character)));
+                float severity = isPriority ? 1 : AIObjectiveRepairItems.GetTargetPriority(Item, character);
                 float isSelected = IsRepairing ? 50 : 0;
                 float devotion = (CumulatedDevotion + isSelected) / 100;
                 float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
-                Priority = MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + (damagePriority * distanceFactor * successFactor * PriorityModifier), 0, 1));
+                Priority = MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + (severity * distanceFactor * PriorityModifier), 0, 1));
             }
             return Priority;
         }

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Barotrauma.Items.Components;
 using Barotrauma.Extensions;
+using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
@@ -15,12 +16,23 @@ namespace Barotrauma
         /// </summary>
         public bool RequireAdequateSkills;
 
+        /// <summary>
+        /// If set, only fix items where required skill matches this.
+        /// </summary>
+        public string RelevantSkill;
+
+        private readonly Item prioritizedItem;
+
         public override bool AllowMultipleInstances => true;
 
         public override bool IsDuplicate<T>(T otherObjective) => 
             (otherObjective as AIObjective) is AIObjectiveRepairItems repairObjective && repairObjective.RequireAdequateSkills == RequireAdequateSkills;
 
-        public AIObjectiveRepairItems(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier) { }
+        public AIObjectiveRepairItems(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1, Item prioritizedItem = null)
+            : base(character, objectiveManager, priorityModifier)
+        {
+            this.prioritizedItem = prioritizedItem;
+        }
 
         protected override void CreateObjectives()
         {
@@ -45,7 +57,7 @@ namespace Barotrauma
                         {
                             Objectives.Remove(item);
                             ignoreList.Add(item);
-                            targetUpdateTimer = 0;
+                            targetUpdateTimer = Math.Min(0.1f, targetUpdateTimer);
                         };
                     }
                     break;
@@ -67,9 +79,9 @@ namespace Barotrauma
                     if (item.Repairables.All(r => condition >= r.AIRepairThreshold)) { return false; }
                 }
             }
-            if (RequireAdequateSkills)
+            if (!string.IsNullOrWhiteSpace(RelevantSkill))
             {
-                if (item.Repairables.Any(r => !r.HasRequiredSkills(character))) { return false; }
+                if (item.Repairables.None(r => r.requiredSkills.Any(s => s.Identifier.Equals(RelevantSkill, StringComparison.OrdinalIgnoreCase)))) { return false; }
             }
             return true;
         }
@@ -81,7 +93,7 @@ namespace Barotrauma
                 // Don't stop fixing until done
                 return 100;
             }
-            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveRepairItems>(), onlyBots: true);
+            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveRepairItems>() && !c.Character.IsIncapacitated, onlyBots: true);
             int items = Targets.Count;
             bool anyFixers = otherFixers > 0;
             float ratio = anyFixers ? items / (float)otherFixers : 1;
@@ -96,14 +108,28 @@ namespace Barotrauma
                     // Enough fixers
                     return 0;
                 }
-                return Targets.Sum(t => 100 - t.ConditionPercentage) * ratio;
+                if (RequireAdequateSkills)
+                {
+                    return Targets.Sum(t => GetTargetPriority(t, character)) * ratio;
+                }
+                else
+                {
+                    return Targets.Sum(t => 100 - t.ConditionPercentage) * ratio;
+                }
             }
         }
 
+        public static float GetTargetPriority(Item item, Character character)
+        {
+            float damagePriority = MathHelper.Lerp(1, 0, item.Condition / item.MaxCondition);
+            float successFactor = MathHelper.Lerp(0, 1, item.Repairables.Average(r => r.DegreeOfSuccess(character)));
+            return MathHelper.Lerp(0, 100, MathHelper.Clamp(damagePriority * successFactor, 0, 1));
+        }
+
         protected override IEnumerable<Item> GetList() => Item.ItemList;
 
         protected override AIObjective ObjectiveConstructor(Item item) 
-            => new AIObjectiveRepairItem(character, item, objectiveManager, PriorityModifier);
+            => new AIObjectiveRepairItem(character, item, objectiveManager, priorityModifier: PriorityModifier, isPriority: item == prioritizedItem);
 
         protected override void OnObjectiveCompleted(AIObjective objective, Item target)
             => HumanAIController.RemoveTargets<AIObjectiveRepairItems, Item>(character, target);
@@ -111,12 +137,17 @@ namespace Barotrauma
         public static bool IsValidTarget(Item item, Character character)
         {
             if (item == null) { return false; }
+            if (item.NonInteractable) { return false; }
             if (item.IsFullCondition) { return false; }
             if (item.CurrentHull == null) { return false; }
             if (item.Submarine == null) { return false; }
             if (item.Submarine.TeamID != character.TeamID) { return false; }
             if (item.Repairables.None()) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(item, true)) { return false; }
+            if (character.Submarine != null)
+            {
+                if (item.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (!character.Submarine.IsEntityFoundOnThisSub(item, true)) { return false; }
+            }
             return true;
         }
     }

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

@@ -38,7 +38,19 @@ namespace Barotrauma
             }
             this.targetCharacter = targetCharacter;
         }
-        
+
+        protected override void OnAbandon()
+        {
+            character.SelectedCharacter = null;
+            base.OnAbandon();
+        }
+
+        protected override void OnCompleted()
+        {
+            character.SelectedCharacter = null;
+            base.OnCompleted();
+        }
+
         protected override void Act(float deltaTime)
         {
             if (character.LockHands || targetCharacter == null || targetCharacter.CurrentHull == null || targetCharacter.Removed || targetCharacter.IsDead)
@@ -46,16 +58,13 @@ namespace Barotrauma
                 Abandon = true;
                 return;
             }
-            if (targetCharacter.SelectedBy != null && targetCharacter.SelectedBy != character)
+            var otherRescuer = targetCharacter.SelectedBy;
+            if (otherRescuer != null && otherRescuer != character)
             {
-                var otherCharacter = character.SelectedBy;
-                if (otherCharacter != null)
-                {
-                    // Someone else is rescuing/holding the target.
-                    Abandon = otherCharacter.IsPlayer || character.GetSkillLevel("medical") < otherCharacter.GetSkillLevel("medical");
-                }
+                // Someone else is rescuing/holding the target.
+                Abandon = otherRescuer.IsPlayer || character.GetSkillLevel("medical") < otherRescuer.GetSkillLevel("medical");
+                return;
             }
-
             if (targetCharacter != character)
             {
                 // Incapacitated target is not in a safe place -> Move to a safe place first
@@ -63,9 +72,12 @@ namespace Barotrauma
                 {
                     if (character.SelectedCharacter != targetCharacter)
                     {
-                        character.Speak(TextManager.GetWithVariables("DialogFoundUnconsciousTarget", new string[2] { "[targetname]", "[roomname]" },
-                            new string[2] { targetCharacter.Name, targetCharacter.CurrentHull.DisplayName }, new bool[2] { false, true }),
-                            null, 1.0f, "foundunconscioustarget" + targetCharacter.Name, 60.0f);
+                        if (targetCharacter.CurrentHull.DisplayName != null)
+                        {
+                            character.Speak(TextManager.GetWithVariables("DialogFoundUnconsciousTarget", new string[2] { "[targetname]", "[roomname]" },
+                                new string[2] { targetCharacter.Name, targetCharacter.CurrentHull.DisplayName }, new bool[2] { false, true }),
+                                null, 1.0f, "foundunconscioustarget" + targetCharacter.Name, 60.0f);
+                        }
 
                         // Go to the target and select it
                         if (!character.CanInteractWith(targetCharacter))
@@ -142,10 +154,13 @@ namespace Barotrauma
             {
                 // We can start applying treatment
                 if (character != targetCharacter && character.SelectedCharacter != targetCharacter)
-                {                
-                    character.Speak(TextManager.GetWithVariables("DialogFoundWoundedTarget", new string[2] { "[targetname]", "[roomname]" },
-                        new string[2] { targetCharacter.Name, targetCharacter.CurrentHull.DisplayName }, new bool[2] { false, true }),
-                        null, 1.0f, "foundwoundedtarget" + targetCharacter.Name, 60.0f);
+                {
+                    if (targetCharacter.CurrentHull.DisplayName != null)
+                    {
+                        character.Speak(TextManager.GetWithVariables("DialogFoundWoundedTarget", new string[2] { "[targetname]", "[roomname]" },
+                            new string[2] { targetCharacter.Name, targetCharacter.CurrentHull.DisplayName }, new bool[2] { false, true }),
+                            null, 1.0f, "foundwoundedtarget" + targetCharacter.Name, 60.0f);
+                    }
 
                     character.SelectCharacter(targetCharacter);
                 }
@@ -155,13 +170,23 @@ namespace Barotrauma
 
         private readonly List<string> suitableItemIdentifiers = new List<string>();
         private readonly List<string> itemNameList = new List<string>();
-        private Dictionary<string, float> currentTreatmentSuitabilities = new Dictionary<string, float>();
+        private readonly Dictionary<string, float> currentTreatmentSuitabilities = new Dictionary<string, float>();
         private void GiveTreatment(float deltaTime)
         {
+            if (targetCharacter == null)
+            {
+                string errorMsg = $"{character.Name}: Attempted to update a Rescue objective with no target!";
+                DebugConsole.ThrowError(errorMsg);
+                Abandon = true;
+                return;
+            }
+
+            SteeringManager?.Reset();
+
             if (!targetCharacter.IsPlayer)
             {
                 // If the target is a bot, don't let it move
-                targetCharacter.AIController?.SteeringManager.Reset();
+                targetCharacter.AIController?.SteeringManager?.Reset();
             }
             if (treatmentTimer > 0.0f)
             {
@@ -176,6 +201,8 @@ namespace Barotrauma
             //check if we already have a suitable treatment for any of the afflictions
             foreach (Affliction affliction in GetSortedAfflictions(targetCharacter))
             {
+                if (affliction == null) { throw new Exception("Affliction was null"); }
+                if (affliction.Prefab == null) { throw new Exception("Affliction prefab was null"); }
                 foreach (KeyValuePair<string, float> treatmentSuitability in affliction.Prefab.TreatmentSuitability)
                 {
                     if (currentTreatmentSuitabilities.ContainsKey(treatmentSuitability.Key) && currentTreatmentSuitabilities[treatmentSuitability.Key] > 0.0f)
@@ -288,6 +315,11 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
+            if (!IsAllowed)
+            {
+                Priority = 0;
+                return Priority;
+            }
             if (targetCharacter == null || targetCharacter.CurrentHull == null || targetCharacter.Removed || targetCharacter.IsDead)
             {
                 Priority = 0;

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

@@ -33,46 +33,32 @@ namespace Barotrauma
 
         protected override float TargetEvaluation()
         {
-            int otherRescuers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveRescueAll>(), onlyBots: true);
-            int targetCount = Targets.Count;
-            bool anyRescuers = otherRescuers > 0;
-            float ratio = anyRescuers ? targetCount / (float)otherRescuers : 1;
-            if (objectiveManager.CurrentOrder == this)
+            if (objectiveManager.CurrentOrder != this)
             {
-                return Targets.Min(t => GetVitalityFactor(t)) / ratio;
-            }
-            else
-            {
-                float multiplier = 1;
-                if (anyRescuers)
+                if (!character.IsMedic && HumanAIController.IsTrueForAnyCrewMember(c => c != HumanAIController && c.Character.IsMedic && !c.Character.IsUnconscious))
                 {
-                    float mySkill = character.GetSkillLevel("medical");
-                    int betterRescuers = HumanAIController.CountCrew(c => c != HumanAIController && c.Character.Info.Job.GetSkillLevel("medical") >= mySkill, onlyBots: true);
-                    if (targetCount / (float)betterRescuers <= 1)
-                    {
-                        // Enough rescuers
-                        return 100;
-                    }
-                    else
-                    {
-                        bool foundOtherMedics = HumanAIController.IsTrueForAnyCrewMember(c => c != HumanAIController && c.Character.Info.Job.Prefab.Identifier == "medicaldoctor");
-                        if (foundOtherMedics)
-                        {
-                            if (character.Info.Job.Prefab.Identifier != "medicaldoctor")
-                            {
-                                // Double the vitality factor -> less likely to take action
-                                multiplier = 2;
-                            }
-                        }
-                    }
+                    // Don't do anything if there's a medic on board and we are not a medic
+                    return 100;
                 }
-                return Targets.Min(t => GetVitalityFactor(t)) / ratio * multiplier;
             }
+            float worstCondition = Targets.Min(t => GetVitalityFactor(t));
+            if (Targets.Contains(character))
+            {
+                if (character.Bleeding > 10)
+                {
+                    // Enforce the highest priority when bleeding out.
+                    worstCondition = 0;
+                }
+                // Boost the priority when wounded.
+                worstCondition /= 2;
+            }
+            return worstCondition;
         }
 
         public static float GetVitalityFactor(Character character)
         {
-            float vitality = character.HealthPercentage - character.Bleeding - character.Bloodloss + Math.Min(character.Oxygen, 0);
+            float vitality = character.HealthPercentage - (character.Bleeding * 2) - character.Bloodloss + Math.Min(character.Oxygen, 0);
+            vitality -= character.CharacterHealth.GetAfflictionStrength("paralysis");
             return Math.Clamp(vitality, 0, 100);
         }
 
@@ -91,6 +77,11 @@ namespace Barotrauma
                 if (GetVitalityFactor(target) >= GetVitalityThreshold(humanAI.ObjectiveManager, character, target)) { return false; }
                 if (!humanAI.ObjectiveManager.IsCurrentOrder<AIObjectiveRescueAll>())
                 {
+                    if (!character.IsMedic && target != character)
+                    {
+                        // Don't allow to treat others autonomously
+                        return false;
+                }
                     // Ignore unsafe hulls, unless ordered
                     if (humanAI.UnsafeHulls.Contains(target.CurrentHull))
                     {
@@ -105,11 +96,15 @@ namespace Barotrauma
             if (target.Submarine == null || character.Submarine == null) { return false; }
             if (target.Submarine.TeamID != character.Submarine.TeamID) { return false; }
             if (target.CurrentHull == null) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
-            if (!target.IsPlayer && HumanAIController.IsActive(target) && target.AIController is HumanAIController targetAI)
+            if (character.Submarine != null)
+            {
+                if (target.Submarine.Info.Type != character.Submarine.Info.Type) { return false; }
+                if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
+            }
+            if (target != character &&!target.IsPlayer && HumanAIController.IsActive(target) && target.AIController is HumanAIController targetAI)
             {
                 // Ignore all concious targets that are currently fighting, fleeing or treating characters
-                if (targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveCombat>() || 
+                if (targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveCombat>() ||
                     targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveFindSafety>() ||
                     targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveRescue>())
                 {

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Order.cs

@@ -1,4 +1,5 @@
-using Barotrauma.Items.Components;
+using Barotrauma.Extensions;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -13,8 +14,7 @@ namespace Barotrauma
         Movement,
         Power,
         Maintenance,
-        Operate,
-        Undefined
+        Operate
     }
 
     class Order
@@ -31,11 +31,7 @@ namespace Barotrauma
             return order;
         }
         
-        public Order Prefab
-        {
-            get;
-            private set;
-        }
+        public Order Prefab { get; private set; }
 
         public readonly string Name;
 
@@ -55,7 +51,7 @@ namespace Barotrauma
                 {
                     return color.Value;
                 }
-                else if (OrderCategoryIcons.TryGetValue(Category, out Tuple<Sprite, Color> sprite))
+                else if (Category.HasValue && OrderCategoryIcons.TryGetValue((OrderCategory)Category, out Tuple<Sprite, Color> sprite))
                 {
                     return sprite.Item2;
                 }
@@ -83,18 +79,28 @@ namespace Barotrauma
 
         public Character OrderGiver;
 
-        public readonly OrderCategory Category;
+        private readonly OrderCategory? category;
+        public OrderCategory? Category => category;
 
         //legacy support
         public readonly string[] AppropriateJobs;
         public readonly string[] Options;
-        public readonly string[] OptionNames;
+        private readonly Dictionary<string, string> OptionNames;
 
         public readonly Dictionary<string, Sprite> OptionSprites;
 
-        public readonly float Weight;
+        private readonly Dictionary<string, Sprite> minimapIcons;
+        public Dictionary<string, Sprite> MinimapIcons => IsPrefab ? minimapIcons : Prefab.minimapIcons;
 
-        static Order()
+        public readonly float Weight;
+        public readonly bool MustSetTarget;
+        public readonly string AppropriateSkill;
+
+        public bool HasOptions => (IsPrefab ? Options : Prefab.Options).Length > 1;
+        public bool IsPrefab { get; private set; }
+        public readonly bool MustManuallyAssign;
+
+        public static void Init()
         {
             Prefabs = new Dictionary<string, Order>();
             OrderCategoryIcons = new Dictionary<OrderCategory, Tuple<Sprite, Color>>();
@@ -197,28 +203,24 @@ namespace Barotrauma
             TargetAllCharacters = orderElement.GetAttributeBool("targetallcharacters", false);
             AppropriateJobs = orderElement.GetAttributeStringArray("appropriatejobs", new string[0]);
             Options = orderElement.GetAttributeStringArray("options", new string[0]);
-            Category = (OrderCategory)Enum.Parse(typeof(OrderCategory), orderElement.GetAttributeString("category", "undefined"), true);
+            var category = orderElement.GetAttributeString("category", null);
+            if (!string.IsNullOrWhiteSpace(category)) { this.category = (OrderCategory)Enum.Parse(typeof(OrderCategory), category, true); }
             Weight = orderElement.GetAttributeFloat(0.0f, "weight");
+            MustSetTarget = orderElement.GetAttributeBool("mustsettarget", false);
+            AppropriateSkill = orderElement.GetAttributeString("appropriateskill", null);
 
-            string translatedOptionNames = TextManager.Get("OrderOptions." + Identifier, true);
-            if (translatedOptionNames == null)
+            var optionNames = TextManager.Get("OrderOptions." + Identifier, true)?.Split(',', '，') ??
+                orderElement.GetAttributeStringArray("optionnames", new string[0]);
+            OptionNames = new Dictionary<string, string>();
+            for (int i = 0; i < Options.Length && i < optionNames.Length; i++)
             {
-                OptionNames = orderElement.GetAttributeStringArray("optionnames", new string[0]);
+                OptionNames.Add(Options[i], optionNames[i].Trim());
             }
-            else
-            {
-                string[] splitOptionNames = translatedOptionNames.Split(',', '，');
-                OptionNames = new string[Options.Length];
-                for (int i = 0; i < Options.Length && i < splitOptionNames.Length; i++)
-                {
-                    OptionNames[i] = splitOptionNames[i].Trim();
-                }
-            }
-
-            if (OptionNames.Length != Options.Length)
+            if (OptionNames.Count != Options.Length)
             {
                 DebugConsole.ThrowError("Error in Order " + Name + " - the number of option names doesn't match the number of options.");
-                OptionNames = Options;
+                OptionNames.Clear();
+                Options.ForEach(o => OptionNames.Add(o, o));
             }
 
             var spriteElement = orderElement.GetChildElement("sprite");
@@ -241,18 +243,31 @@ namespace Barotrauma
                     }
                 }
             }
+
+            minimapIcons = new Dictionary<string, Sprite>();
+            var minimapIconElements = orderElement.GetChildElements("minimapicon");
+            foreach (XElement minimapIconElement in minimapIconElements)
+            {
+                var id = minimapIconElement.GetAttributeString("id", null);
+                if (string.IsNullOrWhiteSpace(id)) { continue; }
+                minimapIcons.Add(id, new Sprite(minimapIconElement.GetChildElement("sprite"), lazyLoad: true));
+            }
+
+            IsPrefab = true;
+            MustManuallyAssign = orderElement.GetAttributeBool("mustmanuallyassign", false);
         }
         
         /// <summary>
         /// Constructor for order instances
         /// </summary>
-        public Order(Order prefab, Entity targetEntity, ItemComponent targetItem, Character orderGiver = null)
+        public Order(Order prefab, Entity targetEntity, ItemComponent targetItem, Character orderGiver = null, bool isAutonomous = false)
         {
             Prefab = prefab;
 
             Name                = prefab.Name;
             Identifier          = prefab.Identifier;
             ItemComponentType   = prefab.ItemComponentType;
+            ItemIdentifiers     = prefab.ItemIdentifiers;
             Options             = prefab.Options;
             SymbolSprite        = prefab.SymbolSprite;
             Color               = prefab.Color;
@@ -261,22 +276,31 @@ namespace Barotrauma
             AppropriateJobs     = prefab.AppropriateJobs;
             FadeOutTime         = prefab.FadeOutTime;
             Weight              = prefab.Weight;
-            Category            = prefab.Category;
-            OrderGiver          = orderGiver;
+            MustSetTarget       = prefab.MustSetTarget;
+            AppropriateSkill    = prefab.AppropriateSkill;
+            category            = prefab.Category;
+            MustManuallyAssign  = prefab.MustManuallyAssign;
 
+            OrderGiver = orderGiver;
             TargetEntity = targetEntity;
             if (targetItem != null)
             {
                 if (UseController)
                 {
-                    //try finding the controller with the simpler non-recursive method first
-                    ConnectedController = 
-                        targetItem.Item.GetConnectedComponents<Controller>().FirstOrDefault() ?? 
-                        targetItem.Item.GetConnectedComponents<Controller>(recursive: true).FirstOrDefault();
+                    ConnectedController = targetItem.Item?.FindController();
+                    if (ConnectedController == null)
+                    {
+#if DEBUG
+                        throw new Exception("Tried to use controller, but couldn't find one");
+#endif
+                        UseController = false;
+                    }
                 }
                 TargetEntity = targetItem.Item;
                 TargetItemComponent = targetItem;
             }
+
+            IsPrefab = false;
         }
         
         public bool HasAppropriateJob(Character character)
@@ -310,5 +334,51 @@ namespace Barotrauma
 
             return msg;
         }
+
+        public List<Item> GetMatchingItems(Submarine submarine, bool mustBelongToPlayerSub)
+        {
+            List<Item> matchingItems = new List<Item>();
+            if (submarine == null) { return matchingItems; }
+            if (ItemComponentType != null || ItemIdentifiers.Length > 0)
+            {
+                matchingItems = ItemIdentifiers.Length > 0 ?
+                    Item.ItemList.FindAll(it => ItemIdentifiers.Contains(it.Prefab.Identifier) || it.HasTag(ItemIdentifiers)) :
+                    Item.ItemList.FindAll(it => it.Components.Any(ic => ic.GetType() == ItemComponentType));
+                if (mustBelongToPlayerSub)
+                {
+                    matchingItems.RemoveAll(it => it.Submarine?.Info != null && it.Submarine.Info.Type != SubmarineInfo.SubmarineType.Player);
+                    matchingItems.RemoveAll(it => it.Submarine != submarine && !submarine.DockedTo.Contains(it.Submarine));
+                }
+                else
+                {
+                    matchingItems.RemoveAll(it => it.Submarine != submarine);
+                }
+                matchingItems.RemoveAll(it => it.NonInteractable);
+                if (UseController)
+                {
+                    matchingItems.RemoveAll(i => i.Components.None(c => c.GetType() == ItemComponentType) && !i.TryFindController(out _));
+                }
+            }
+            return matchingItems;
+        }
+
+        public List<Item> GetMatchingItems(bool mustBelongToPlayerSub)
+        {
+            Submarine submarine = Character.Controlled != null && Character.Controlled.TeamID == Character.TeamType.Team2 && Submarine.MainSubs.Length > 1 ?
+                Submarine.MainSubs[1] :
+                Submarine.MainSub;
+            return GetMatchingItems(submarine, mustBelongToPlayerSub);
+        }
+
+        public string GetOptionName(string id)
+        {
+            return Prefab == null ? OptionNames[id] : Prefab.OptionNames[id];
+        }
+
+        public string GetOptionName(int index)
+        {
+            if (index < 0 || index >= Options.Length) { return null; }
+            return GetOptionName(Options[index]);
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/PathFinder.cs

@@ -46,7 +46,7 @@ namespace Barotrauma
             var nodes = new Dictionary<int, PathNode>();
             foreach (WayPoint wayPoint in wayPoints)
             {
-                if (wayPoint == null) continue;
+                if (wayPoint == null) { continue; }
                 if (nodes.ContainsKey(wayPoint.ID))
                 {
 #if DEBUG
@@ -63,7 +63,7 @@ namespace Barotrauma
                 {
                     PathNode connectedNode = null;
                     nodes.TryGetValue(linked.ID, out connectedNode);
-                    if (connectedNode == null) continue;
+                    if (connectedNode == null) { continue; }
 
                     node.Value.connections.Add(connectedNode);                    
                 }
@@ -107,17 +107,17 @@ namespace Barotrauma
 
         void WaypointLinksChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            if (Submarine.Unloading) return;
+            if (Submarine.Unloading) { return; }
 
             var waypoints = sender as IEnumerable<MapEntity>;
 
             foreach (MapEntity me in waypoints)
             {
                 WayPoint wp = me as WayPoint;
-                if (me == null) continue;
+                if (me == null) { continue; }
 
                 var node = nodes.Find(n => n.Waypoint == wp);
-                if (node == null) return;
+                if (node == null) { return; }
 
                 if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove)
                 {
@@ -136,10 +136,10 @@ namespace Barotrauma
                     for (int i = 0; i < wp.linkedTo.Count; i++)
                     {
                         WayPoint connected = wp.linkedTo[i] as WayPoint;
-                        if (connected == null) continue;
+                        if (connected == null) { continue; }
 
                         //already connected, continue
-                        if (node.connections.Any(n => n.Waypoint == connected)) continue;
+                        if (node.connections.Any(n => n.Waypoint == connected)) { continue; }
 
                         var matchingNode = nodes.Find(n => n.Waypoint == connected);
                         if (matchingNode == null)
@@ -201,8 +201,8 @@ namespace Barotrauma
                         if (body != null)
                         {
                             //if (body.UserData is Submarine) continue;
-                            if (body.UserData is Structure && !((Structure)body.UserData).IsPlatform) continue;
-                            if (body.UserData is Item && body.FixtureList[0].CollisionCategories.HasFlag(Physics.CollisionWall)) continue;
+                            if (body.UserData is Structure && !((Structure)body.UserData).IsPlatform) { continue; }
+                            if (body.UserData is Item && body.FixtureList[0].CollisionCategories.HasFlag(Physics.CollisionWall)) { continue; }
                         }
                     }
 
@@ -236,9 +236,9 @@ namespace Barotrauma
                 if (InsideSubmarine)
                 {
                     //much higher cost to waypoints that are outside
-                    if (node.Waypoint.CurrentHull == null) dist *= 10.0f;
+                    if (node.Waypoint.CurrentHull == null) { dist *= 10.0f; }
                     //avoid stopping at a doorway
-                    if (node.Waypoint.ConnectedDoor != null) dist *= 10.0f;
+                    if (node.Waypoint.ConnectedDoor != null) { dist *= 10.0f; }
                 }
                 if (dist < closestDist || endNode == null)
                 {
@@ -251,8 +251,8 @@ namespace Barotrauma
                         if (body != null)
                         {
                             //if (body.UserData is Submarine) continue;
-                            if (body.UserData is Structure && !((Structure)body.UserData).IsPlatform) continue;
-                            if (body.UserData is Item && body.FixtureList[0].CollisionCategories.HasFlag(Physics.CollisionWall)) continue;
+                            if (body.UserData is Structure && !((Structure)body.UserData).IsPlatform) { continue; }
+                            if (body.UserData is Item && body.FixtureList[0].CollisionCategories.HasFlag(Physics.CollisionWall)) { continue; }
                         }
                     }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/SteeringPath.cs

@@ -9,12 +9,31 @@ namespace Barotrauma
 
         int currentIndex;
 
+        private float? totalLength;
+
         public bool Unreachable
         {
             get;
             set;
         }
 
+        public float TotalLength
+        {
+            get
+            {
+                if (Unreachable) { return float.PositiveInfinity; }
+                if (!totalLength.HasValue)
+                {
+                    totalLength = 0.0f;
+                    for (int i = 0; i < nodes.Count - 1; i++)
+                    {
+                        totalLength += Vector2.Distance(nodes[i].WorldPosition, nodes[i + 1].WorldPosition);
+                    }
+                }
+                return totalLength.Value;
+            }
+        }
+
         public SteeringPath(bool unreachable = false)
         {
             nodes = new List<WayPoint>();
@@ -23,10 +42,10 @@ namespace Barotrauma
 
         public void AddNode(WayPoint node)
         {
-            if (node == null) return;
+            if (node == null) { return; }
             nodes.Add(node);
 
-            if (node.CurrentHull == null) HasOutdoorsNodes = true;
+            if (node.CurrentHull == null) { HasOutdoorsNodes = true; }
         }
         
         public bool HasOutdoorsNodes
@@ -48,10 +67,10 @@ namespace Barotrauma
 
         public WayPoint PrevNode
         {
-            get 
+            get
             {
-                if (currentIndex-1 < 0 || currentIndex-1 > nodes.Count - 1) return null;
-                return nodes[currentIndex-1]; 
+                if (currentIndex - 1 < 0 || currentIndex - 1 > nodes.Count - 1) { return null; }
+                return nodes[currentIndex - 1];
             }
         }
 
@@ -59,7 +78,7 @@ namespace Barotrauma
         {
             get 
             {
-                if (currentIndex < 0 || currentIndex > nodes.Count - 1) return null;
+                if (currentIndex < 0 || currentIndex > nodes.Count - 1) { return null; }
                 return nodes[currentIndex]; 
             }
         }
@@ -73,7 +92,7 @@ namespace Barotrauma
         {
             get
             {
-                if (currentIndex+1 < 0 || currentIndex+1 > nodes.Count - 1) return null;
+                if (currentIndex + 1 < 0 || currentIndex + 1 > nodes.Count - 1) { return null; }
                 return nodes[currentIndex+1];
             }
         }
@@ -90,8 +109,8 @@ namespace Barotrauma
 
         public WayPoint CheckProgress(Vector2 simPosition, float minSimDistance = 0.1f)
         {
-            if (nodes.Count == 0 || currentIndex>nodes.Count-1) return null;
-            if (Vector2.Distance(simPosition, nodes[currentIndex].SimPosition) < minSimDistance) currentIndex++;
+            if (nodes.Count == 0 || currentIndex > nodes.Count - 1) { return null; }
+            if (Vector2.Distance(simPosition, nodes[currentIndex].SimPosition) < minSimDistance) { currentIndex++; }
 
             return CurrentNode;
         }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Wreck/WreckAI.cs

@@ -8,7 +8,7 @@ using System;
 
 namespace Barotrauma
 {
-    class WreckAI : IServerSerializable
+    partial class WreckAI : IServerSerializable
     {
         public Submarine Wreck { get; private set; }
 
@@ -16,6 +16,7 @@ namespace Barotrauma
 
         private readonly List<Item> allItems;
         private readonly List<Item> thalamusItems;
+        private readonly List<Structure> thalamusStructures;
         private readonly List<Turret> turrets = new List<Turret>();
         private readonly List<WayPoint> wayPoints = new List<WayPoint>();
         private readonly List<Hull> hulls = new List<Hull>();
@@ -28,17 +29,89 @@ namespace Barotrauma
 
         private bool IsClient => GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
 
-        public WreckAI(Submarine wreck, Item brain, List<Item> items = null)
+        private bool IsThalamus(MapEntityPrefab entityPrefab) => IsThalamus(entityPrefab, Config.Entity);
+
+        private static IEnumerable<T> GetThalamusEntities<T>(Submarine wreck, string tag) where T : MapEntity => GetThalamusEntities(wreck, tag).Where(e => e is T).Select(e => e as T);
+
+        private static IEnumerable<MapEntity> GetThalamusEntities(Submarine wreck, string tag) => MapEntity.mapEntityList.Where(e => e.Submarine == wreck && e.prefab != null && IsThalamus(e.prefab, tag));
+
+        private static bool IsThalamus(MapEntityPrefab entityPrefab, string tag) => entityPrefab.Category == MapEntityCategory.Thalamus || entityPrefab.Tags.Contains(tag);
+
+        public WreckAI(Submarine wreck)
         {
+            Wreck = wreck;
             Config = WreckAIConfig.GetRandom();
             if (Config == null)
             {
                 DebugConsole.ThrowError("WreckAI: No wreck AI config found!");
-                Kill();
                 return;
             }
-            allItems = items ?? wreck.GetItems(false);
-            thalamusItems = allItems.FindAll(i => i.Prefab.Category == MapEntityCategory.Thalamus || i.HasTag("thalamus"));
+            var thalamusPrefabs = ItemPrefab.Prefabs.Where(p => IsThalamus(p));
+            var brainPrefab = thalamusPrefabs.GetRandom(i => i.Tags.Contains(Config.Brain), Rand.RandSync.Server);
+            if (brainPrefab == null)
+            {
+                DebugConsole.ThrowError($"WreckAI: Could not find any brain prefab with the tag {Config.Brain}! Cannot continue. Failed to create wreck AI.");
+                return;
+            }
+            allItems = Wreck.GetItems(false);
+            thalamusItems = allItems.FindAll(i => IsThalamus(i.prefab));
+            var hulls = Wreck.GetHulls(false);
+            brain = new Item(brainPrefab, Vector2.Zero, Wreck);
+            thalamusItems.Add(brain);
+            Vector2 negativeMargin = new Vector2(40, 20);
+            Vector2 minSize = brain.Rect.Size.ToVector2() - negativeMargin;
+            Vector2 maxSize = new Vector2(brain.Rect.Width * 3, brain.Rect.Height * 3);
+            // First try to get a room that is not too big and not in the edges of the sub.
+            // Also try not to create the brain in a room that already have carrier items inside.
+            // Ignore hulls that have any linked hulls to keep the calculations simple.
+            // Shrink the horizontal axis so that the brain is not placed in the left or right side, where we often have curved walls.
+            // Also ignore hulls that have open gaps, because we'll want the room to be full of water. The room will be filled with water when the brain is inserted in the room.
+            Rectangle shrinkedBounds = ToolBox.GetWorldBounds(Wreck.WorldPosition.ToPoint(), new Point(Wreck.Borders.Width - 500, Wreck.Borders.Height));
+            bool BaseCondition(Hull h) => h.RectWidth > minSize.X && h.RectHeight > minSize.Y && h.GetLinkedEntities<Hull>().None() && h.ConnectedGaps.None(g => g.Open > 0);
+            bool IsNotTooBig(Hull h) => h.RectWidth < maxSize.X && h.RectHeight < maxSize.Y;
+            bool IsNotInFringes(Hull h) => shrinkedBounds.ContainsWorld(h.WorldRect);
+            bool DoesNotContainOtherItems(Hull h) => thalamusItems.None(i => i.CurrentHull == h);
+            Hull brainHull = hulls.GetRandom(h => BaseCondition(h) && IsNotTooBig(h) && IsNotInFringes(h) && DoesNotContainOtherItems(h), Rand.RandSync.Server);
+            if (brainHull == null)
+            {
+                brainHull = hulls.GetRandom(h => BaseCondition(h) && IsNotInFringes(h) && DoesNotContainOtherItems(h), Rand.RandSync.Server);
+            }
+            if (brainHull == null)
+            {
+                brainHull = hulls.GetRandom(h => BaseCondition(h) && (IsNotInFringes(h) || DoesNotContainOtherItems(h)), Rand.RandSync.Server);
+            }
+            if (brainHull == null)
+            {
+                brainHull = hulls.GetRandom(BaseCondition, Rand.RandSync.Server);
+            }
+            var thalamusStructurePrefabs = StructurePrefab.Prefabs.Where(p => IsThalamus(p));
+            if (brainHull == null) { return; }
+            brainHull.WaterVolume = brainHull.Volume;
+            brain.SetTransform(brainHull.SimPosition, rotation: 0, findNewHull: false);
+            brain.CurrentHull = brainHull;
+            var backgroundPrefab = thalamusStructurePrefabs.GetRandom(i => i.Tags.Contains(Config.BrainRoomBackground), Rand.RandSync.Server);
+            if (backgroundPrefab != null)
+            {
+                new Structure(brainHull.Rect, backgroundPrefab, Wreck);
+            }
+            var horizontalWallPrefab = thalamusStructurePrefabs.GetRandom(p => p.Tags.Contains(Config.BrainRoomHorizontalWall), Rand.RandSync.Server);
+            if (horizontalWallPrefab != null)
+            {
+                int height = (int)horizontalWallPrefab.Size.Y;
+                int halfHeight = height / 2;
+                int quarterHeight = halfHeight / 2;
+                new Structure(new Rectangle(brainHull.Rect.Left, brainHull.Rect.Top + quarterHeight, brainHull.Rect.Width, height), horizontalWallPrefab, Wreck);
+                new Structure(new Rectangle(brainHull.Rect.Left, brainHull.Rect.Top - brainHull.Rect.Height + halfHeight + quarterHeight, brainHull.Rect.Width, height), horizontalWallPrefab, Wreck);
+            }
+            var verticalWallPrefab = thalamusStructurePrefabs.GetRandom(p => p.Tags.Contains(Config.BrainRoomVerticalWall), Rand.RandSync.Server);
+            if (verticalWallPrefab != null)
+            {
+                int width = (int)verticalWallPrefab.Size.X;
+                int halfWidth = width / 2;
+                int quarterWidth = halfWidth / 2;
+                new Structure(new Rectangle(brainHull.Rect.Left - quarterWidth, brainHull.Rect.Top, width, brainHull.Rect.Height), verticalWallPrefab, Wreck);
+                new Structure(new Rectangle(brainHull.Rect.Right - halfWidth - quarterWidth, brainHull.Rect.Top, width, brainHull.Rect.Height), verticalWallPrefab, Wreck);
+            }
             foreach (Item item in allItems)
             {
                 if (thalamusItems.Contains(item))
@@ -62,7 +135,7 @@ namespace Barotrauma
                                 if (MapEntityPrefab.List.GetRandom(e => e is ItemPrefab i && container.CanBeContained(i) && 
                                         Config.ForbiddenAmmunition.None(id => id.Equals(i.Identifier, StringComparison.OrdinalIgnoreCase)), Rand.RandSync.Server) is ItemPrefab ammoPrefab)
                                 {
-                                    Item ammo = new Item(ammoPrefab, container.Item.WorldPosition, wreck);
+                                    Item ammo = new Item(ammoPrefab, container.Item.WorldPosition, Wreck);
                                     if (!container.Inventory.TryPutItem(ammo, i, allowSwapping: false, allowCombine: false, user: null, createNetworkEvent: false))
                                     {
                                         item.Remove();
@@ -73,16 +146,14 @@ namespace Barotrauma
                     }
                 }
             }
-            this.brain = brain;
-            Wreck = wreck;
-            foreach (var item in Wreck.GetItems(false))
+            foreach (var item in allItems)
             {
                 var turret = item.GetComponent<Turret>();
                 if (turret != null)
                 {
                     turrets.Add(turret);
                 }
-                if (item.HasTag("cellspawnorgan"))
+                if (item.HasTag(Config.Spawner))
                 {
                     if (!spawnOrgans.Contains(item))
                     {
@@ -93,19 +164,22 @@ namespace Barotrauma
             wayPoints.AddRange(Wreck.GetWaypoints(false));
             hulls.AddRange(Wreck.GetHulls(false));
             IsAlive = true;
+            thalamusStructures = GetThalamusEntities<Structure>(Wreck, Config.Entity).ToList();
         }
 
         private readonly List<Item> destroyedOrgans = new List<Item>();
         public void Update(float deltaTime)
         {
-            if (!IsAlive || Wreck == null || Wreck.Removed)
+            if (!IsAlive) { return; }
+            if (Wreck == null || Wreck.Removed)
             {
-                cells.ForEach(c => c.OnDeath -= OnCellDeath);
+                Remove();
                 return;
             }
             if (brain == null || brain.Removed || brain.Condition <= 0)
             {
                 Kill();
+                return;
             }
             destroyedOrgans.Clear();
             foreach (var organ in spawnOrgans)
@@ -116,7 +190,6 @@ namespace Barotrauma
                 }
             }
             destroyedOrgans.ForEach(o => spawnOrgans.Remove(o));
-
             bool someoneNearby = false;
             float minDist = Sonar.DefaultSonarRange * 2.0f;
             foreach (Submarine submarine in Submarine.Loaded)
@@ -138,7 +211,6 @@ namespace Barotrauma
                 }
             }
             if (!someoneNearby) { return; }
-
             OperateTurrets(deltaTime);
             if (!IsClient)
             {
@@ -164,7 +236,7 @@ namespace Barotrauma
             }
             int cellsOutside = Rand.Range(MinCellsOutside, MaxCellsOutside);
             // If we failed to spawn some of the cells in the brainroom/inside, spawn some extra cells outside.
-            cellsOutside = Math.Clamp(cellsOutside + brainRoomCells + cellsInside - cells.Count, cellsOutside, MaxCellsOutside);
+            cellsOutside = Math.Clamp(cellsOutside + brainRoomCells + cellsInside - protectiveCells.Count, cellsOutside, MaxCellsOutside);
             for (int i = 0; i < cellsOutside; i++)
             {
                 ISpatialEntity targetEntity = wayPoints.GetRandom(wp => wp.CurrentHull == null);
@@ -174,35 +246,93 @@ namespace Barotrauma
             initialCellsSpawned = true;
         }
 
-        public void Kill()
+        private void Kill()
         {
+            thalamusItems.ForEach(i => i.Condition = 0);
+            foreach (var turret in turrets)
+            {
+                // Snap all tendons
+                foreach (Item item in turret.ActiveProjectiles)
+                {
+                    if (item.GetComponent<Projectile>()?.IsStuckToTarget ?? false)
+                    {
+                        item.Condition = 0;
+                    }
+                }
+            }
+            FadeOutColors();
+            protectiveCells.ForEach(c => c.OnDeath -= OnCellDeath);
             if (!IsClient)
             {
-                brain.Condition = 0;
+                if (Config != null)
+                {
+                    if (Config.KillAgentsWhenEntityDies)
+                    {
+                        protectiveCells.ForEach(c => c.Kill(CauseOfDeathType.Unknown, null));
+                        if (!string.IsNullOrWhiteSpace(Config.OffensiveAgent))
+                        {
+                            foreach (var character in Character.CharacterList)
+                            {
+                                // Kills ALL offensive agents that are near the thalamus. Not the ideal solution, 
+                                // but as long as spawning is handled via status effects, I don't know if there is any better way.
+                                // In practice there shouldn't be terminal cells from different thalamus organisms at the same time.
+                                // And if there was, the distance check should prevent killing the agents of a different organism.
+                                if (character.SpeciesName.Equals(Config.OffensiveAgent, StringComparison.OrdinalIgnoreCase))
+                                {
+                                    // Sonar distance is used also for wreck positioning. No wreck should be closer to each other than this.
+                                    float maxDistance = Sonar.DefaultSonarRange;
+                                    if (Vector2.DistanceSquared(character.WorldPosition, Wreck.WorldPosition) < maxDistance * maxDistance)
+                                    {
+                                        character.Kill(CauseOfDeathType.Unknown, null);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
+            protectiveCells.Clear();
             IsAlive = false;
         }
 
+        partial void FadeOutColors();
+
+        public void Remove()
+        {
+            Kill();
+            RemoveThalamusItems(Wreck);
+            thalamusItems?.Clear();
+            thalamusStructures?.Clear();
+        }
+
+        public static void RemoveThalamusItems(Submarine wreck)
+        {
+            foreach (var wreckAiConfig in WreckAIConfig.List)
+            {
+                GetThalamusEntities(wreck, wreckAiConfig.Entity).ForEachMod(e => e.Remove());
+            }
+        }
+
         // The client doesn't use these, so we don't have to sync them.
-        private readonly List<Character> cells = new List<Character>();
+        private readonly List<Character> protectiveCells = new List<Character>();
         // Intentionally contains duplicates.
         private readonly List<Hull> populatedHulls = new List<Hull>();
         private float cellSpawnTimer;
 
-        private float CellSpawnTime => Config.CellSpawnTime;
-        private float CellSpawnRandomFactor => Config.CellSpawnRandomFactor;
-        private int MinCellsPerBrainRoom => Config.MinCellsPerBrainRoom;
-        private int MaxCellsPerRoom => Config.MaxCellsPerRoom;
-        private int MinCellsOutside => Config.MinCellsOutside;
-        private int MaxCellsOutside => Config.MaxCellsOutside;
-        private int MinCellsInside => Config.MinCellsInside;
-        private int MaxCellsInside => Config.MaxCellsInside;
-        private int MaxCellCount => Config.MaxCellCount;
+        private float CellSpawnTime => Config.AgentSpawnDelay;
+        private float CellSpawnRandomFactor => Config.AgentSpawnDelayRandomFactor;
+        private int MinCellsPerBrainRoom => Config.MinAgentsPerBrainRoom;
+        private int MaxCellsPerRoom => Config.MaxAgentsPerRoom;
+        private int MinCellsOutside => Config.MinAgentsOutside;
+        private int MaxCellsOutside => Config.MaxAgentsOutside;
+        private int MinCellsInside => Config.MinAgentsInside;
+        private int MaxCellsInside => Config.MaxAgentsInside;
+        private int MaxCellCount => Config.MaxAgentCount;
         private float MinWaterLevel => Config.MinWaterLevel;
 
         void UpdateReinforcements(float deltaTime)
         {
-            if (cells.Count >= MaxCellCount) { return; }
+            if (protectiveCells.Count >= MaxCellCount || spawnOrgans.Count == 0) { return; }
             cellSpawnTimer -= deltaTime;
             if (cellSpawnTimer < 0)
             {
@@ -214,7 +344,7 @@ namespace Barotrauma
         bool TrySpawnCell(out Character cell, ISpatialEntity targetEntity = null)
         {
             cell = null;
-            if (cells.Count >= MaxCellCount) { return false; }
+            if (protectiveCells.Count >= MaxCellCount) { return false; }
             if (targetEntity == null)
             {
                 targetEntity = 
@@ -231,8 +361,8 @@ namespace Barotrauma
                 populatedHulls.Add(wp.CurrentHull);
             }
             // Don't add items in the list, because we want to be able to ignore the restrictions for spawner organs.
-            cell = Character.Create("Leucocyte", targetEntity.WorldPosition, ToolBox.RandomSeed(8), hasAi: true, createNetworkEvent: true);
-            cells.Add(cell);
+            cell = Character.Create(Config.DefensiveAgent, targetEntity.WorldPosition, ToolBox.RandomSeed(8), hasAi: true, createNetworkEvent: true);
+            protectiveCells.Add(cell);
             cell.OnDeath += OnCellDeath;
             cellSpawnTimer = CellSpawnTime * Rand.Range(CellSpawnRandomFactor, 1 + CellSpawnRandomFactor);
             return true;
@@ -243,7 +373,7 @@ namespace Barotrauma
             foreach (var turret in turrets)
             {
                 // Never target other creatures than humans with the turrets.
-                turret.ThalamusOperate(deltaTime, 
+                turret.ThalamusOperate(this, deltaTime, 
                     !turret.Item.HasTag("ignorecharacters"), 
                     targetOtherCreatures: false, 
                     !turret.Item.HasTag("ignoresubmarines"), 
@@ -253,7 +383,7 @@ namespace Barotrauma
 
         void OnCellDeath(Character character, CauseOfDeath causeOfDeath)
         {
-            cells.Remove(character);
+            protectiveCells.Remove(character);
         }
 
 #if SERVER
@@ -261,12 +391,6 @@ namespace Barotrauma
         {
             msg.Write(IsAlive);
         }
-#endif
-#if CLIENT
-        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
-        {
-            IsAlive = msg.ReadBoolean();
-        }
 #endif
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Wreck/WreckAIConfig.cs

@@ -12,35 +12,68 @@ namespace Barotrauma
 
         public Dictionary<string, SerializableProperty> SerializableProperties { get; private set; }
 
+        [Serialize("", false)]
+        public string Entity { get; private set; }
+
+        [Serialize("", false)]
+        public string DefensiveAgent { get; private set; }
+
+        [Serialize("", false)]
+        public string OffensiveAgent { get; private set; }
+
+        [Serialize("", false)]
+        public string Brain { get; private set; }
+
+        [Serialize("", false)]
+        public string Spawner { get; private set; }
+
+        [Serialize("", false)]
+        public string BrainRoomBackground { get; private set; }
+
+        [Serialize("", false)]
+        public string BrainRoomVerticalWall { get; private set; }
+
+        [Serialize("", false)]
+        public string BrainRoomHorizontalWall { get; private set; }
+
         [Serialize(60f, false)]
-        public float CellSpawnTime { get; set; }
+        public float AgentSpawnDelay { get; private set; }
 
         [Serialize(0.5f, false)]
-        public float CellSpawnRandomFactor { get; set; }
+        public float AgentSpawnDelayRandomFactor { get; private set; }
 
         [Serialize(0, false)]
-        public int MinCellsPerBrainRoom { get; set; }
+        public int MinAgentsPerBrainRoom { get; private set; }
 
         [Serialize(3, false)]
-        public int MaxCellsPerRoom { get; set; }
+        public int MaxAgentsPerRoom { get; private set; }
 
         [Serialize(2, false)]
-        public int MinCellsOutside { get; set; }
+        public int MinAgentsOutside { get; private set; }
 
         [Serialize(5, false)]
-        public int MaxCellsOutside { get; set; }
+        public int MaxAgentsOutside { get; private set; }
 
         [Serialize(3, false)]
-        public int MinCellsInside { get; set; }
+        public int MinAgentsInside { get; private set; }
 
         [Serialize(10, false)]
-        public int MaxCellsInside { get; set; }
+        public int MaxAgentsInside { get; private set; }
 
         [Serialize(15, false)]
-        public int MaxCellCount { get; set; }
+        public int MaxAgentCount { get; private set; }
 
         [Serialize(100f, false)]
-        public float MinWaterLevel { get; set; }
+        public float MinWaterLevel { get; private set; }
+
+        [Serialize(true, false)]
+        public bool KillAgentsWhenEntityDies { get; private set; }
+
+        [Serialize(1f, false)]
+        public float DeadEntityColorMultiplier { get; private set; }
+
+        [Serialize(1f, false)]
+        public float DeadEntityColorFadeOutTime { get; private set; }
 
         public readonly string[] ForbiddenAmmunition;
 

Barotrauma/BarotraumaShared/SharedSource/Characters/AICharacter.cs

@@ -46,9 +46,13 @@ namespace Barotrauma
         {
             base.Update(deltaTime, cam);
 
-            if (!Enabled) return;
+            if (!Enabled) { return; }
+            if (IsDead || Vitality <= 0.0f || Stun > 0.0f || IsIncapacitated) { return; }
 
-            if (!IsRemotePlayer)
+            //don't enable simple physics on dead/incapacitated characters
+            //the ragdoll controls the movement of incapacitated characters instead of the collider,
+            //but in simple physics mode the ragdoll would get disabled, causing the character to not move at all
+            if (!IsRemotePlayer && !(AIController is HumanAIController))
             {
                 float characterDist = float.MaxValue;
 #if CLIENT
@@ -70,10 +74,9 @@ namespace Barotrauma
                 }
             }
 
-            if (IsDead || Vitality <= 0.0f|| Stun > 0.0f || IsIncapacitated) return;
-            if (!aiController.Enabled) return;
-            if (GameMain.NetworkMember != null && !GameMain.NetworkMember.IsServer) return;
-            if (Controlled == this) return;
+            if (!aiController.Enabled) { return; }
+            if (GameMain.NetworkMember != null && !GameMain.NetworkMember.IsServer) { return; }
+            if (Controlled == this) { return; }
             
             if (!IsRemotePlayer)
             {

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/AnimController.cs

@@ -76,7 +76,8 @@ namespace Barotrauma
             {
                 if (InWater || !CanWalk)
                 {
-                    return TargetMovement.Length() > (SwimSlowParams.MovementSpeed + SwimFastParams.MovementSpeed) / 2.0f;
+                    float avg = (SwimSlowParams.MovementSpeed + SwimFastParams.MovementSpeed) / 2.0f;
+                    return TargetMovement.LengthSquared() > avg * avg;
                 }
                 else
                 {

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/FishAnimController.cs

@@ -213,7 +213,12 @@ namespace Barotrauma
                 UpdateWalkAnim(deltaTime);
             }
 
-            //don't flip or drag when simply physics is enabled
+            if (character.SelectedCharacter != null)
+            {
+                DragCharacter(character.SelectedCharacter, deltaTime);
+            }
+
+            //don't flip when simply physics is enabled
             if (SimplePhysicsEnabled) { return; }
             
             if (!character.IsRemotePlayer && (character.AIController == null || character.AIController.CanFlip))
@@ -248,29 +253,33 @@ namespace Barotrauma
                 }
             }
 
-            if (character.SelectedCharacter != null)
-            {
-                DragCharacter(character.SelectedCharacter, deltaTime);
-            }
-
             if (!CurrentFishAnimation.Flip) { return; }
             if (IsStuck) { return; }
             if (character.AIController != null && !character.AIController.CanFlip) { return; }
 
             flipCooldown -= deltaTime;
-
-            if (TargetDir != Direction.None && TargetDir != dir) 
+            if (TargetDir != Direction.None && TargetDir != dir)
             {
                 flipTimer += deltaTime;
-                if ((flipTimer > 0.5f && flipCooldown <= 0.0f) || character.IsRemotePlayer)
+                // Speed reductions are not taken into account here. It's intentional: an ai character cannot flip if it's heavily paralyzed (for example).
+                float requiredSpeed = CurrentAnimationParams.MovementSpeed / 2;
+                if (CurrentHull != null)
+                {
+                    // Enemy movement speeds are halved inside submarines
+                    requiredSpeed /= 2;
+                }
+                bool isMovingFastEnough = Math.Abs(MainLimb.LinearVelocity.X) > requiredSpeed;
+                bool isTryingToMoveHorizontally = Math.Abs(TargetMovement.X) > Math.Abs(TargetMovement.Y);
+                if ((flipTimer > CurrentFishAnimation.FlipDelay && flipCooldown <= 0.0f && ((isMovingFastEnough && isTryingToMoveHorizontally) || IsMovingBackwards))
+                    || character.IsRemotePlayer)
                 {
                     Flip();
                     if (!inWater || (CurrentSwimParams != null && CurrentSwimParams.Mirror))
                     {
-                        Mirror();
+                        Mirror(CurrentSwimParams != null ? CurrentSwimParams.MirrorLerp : true);
                     }
                     flipTimer = 0.0f;
-                    flipCooldown = 1.0f;
+                    flipCooldown = CurrentFishAnimation.FlipCooldown;
                 }
             }
             else
@@ -295,7 +304,7 @@ namespace Barotrauma
             if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
             {
                 //stop dragging if there's something between the pull limb and the target
-                Vector2 sourceSimPos = mouthLimb.SimPosition;
+                Vector2 sourceSimPos = SimplePhysicsEnabled ? character.SimPosition : mouthLimb.SimPosition;
                 Vector2 targetSimPos = target.SimPosition;
                 if (character.Submarine != null && character.SelectedCharacter.Submarine == null)
                 {
@@ -317,7 +326,7 @@ namespace Barotrauma
             float eatSpeed = dmg / ((float)Math.Sqrt(Math.Max(target.Mass, 1)) * 10);
             eatTimer += deltaTime * eatSpeed;
 
-            Vector2 mouthPos = GetMouthPosition().Value;
+            Vector2 mouthPos = SimplePhysicsEnabled ? character.SimPosition : GetMouthPosition().Value;
             Vector2 attackSimPosition = character.Submarine == null ? ConvertUnits.ToSimUnits(target.WorldPosition) : target.SimPosition;
 
             Vector2 limbDiff = attackSimPosition - mouthPos;
@@ -525,6 +534,7 @@ namespace Barotrauma
 
             foreach (var limb in Limbs)
             {
+                if (limb.IsSevered) { continue; }
                 if (Math.Abs(limb.Params.ConstantTorque) > 0)
                 {
                     limb.body.SmoothRotate(movementAngle + MathHelper.ToRadians(limb.Params.ConstantAngle) * Dir, limb.Params.ConstantTorque, wrapAngle: true);
@@ -550,10 +560,12 @@ namespace Barotrauma
 
             for (int i = 0; i < Limbs.Length; i++)
             {
-                if (Limbs[i].SteerForce <= 0.0f) { continue; }
+                var limb = Limbs[i];
+                if (limb.IsSevered) { continue; }
+                if (limb.SteerForce <= 0.0f) { continue; }
                 if (!Collider.PhysEnabled) { continue; }
-                Vector2 pullPos = Limbs[i].PullJointWorldAnchorA;
-                Limbs[i].body.ApplyForce(movement * Limbs[i].SteerForce * Limbs[i].Mass * Math.Max(character.SpeedMultiplier, 1), pullPos);
+                Vector2 pullPos = limb.PullJointWorldAnchorA;
+                limb.body.ApplyForce(movement * limb.SteerForce * limb.Mass * Math.Max(character.SpeedMultiplier, 1), pullPos);
             }
 
             Vector2 mainLimbDiff = mainLimb.PullJointWorldAnchorB - mainLimb.SimPosition;
@@ -604,6 +616,14 @@ namespace Barotrauma
             float stepLift = TargetMovement.X == 0.0f ? 0 :
                 (float)Math.Sin(WalkPos * CurrentGroundedParams.StepLiftFrequency + MathHelper.Pi * CurrentGroundedParams.StepLiftOffset) * (CurrentGroundedParams.StepLiftAmount / 100);
 
+            float limpAmount = character.GetLegPenalty();
+            if (limpAmount > 0)
+            {
+                float walkPosX = (float)Math.Cos(WalkPos);
+                //make the footpos oscillate when limping
+                limpAmount = Math.Max(Math.Abs(walkPosX) * limpAmount, 0.0f) * Math.Min(Math.Abs(TargetMovement.X), 0.3f) * Dir;
+            }
+
             Limb torso = GetLimb(LimbType.Torso);
             if (torso != null)
             {
@@ -613,7 +633,7 @@ namespace Barotrauma
                 }
                 if (TorsoPosition.HasValue)
                 {
-                    Vector2 pos = colliderBottom + new Vector2(0, TorsoPosition.Value + stepLift);
+                    Vector2 pos = colliderBottom + new Vector2(limpAmount, TorsoPosition.Value + stepLift);
 
                     if (torso != mainLimb)
                     {
@@ -635,7 +655,7 @@ namespace Barotrauma
                 }
                 if (HeadPosition.HasValue)
                 {
-                    Vector2 pos = colliderBottom + new Vector2(0, HeadPosition.Value + stepLift * CurrentGroundedParams.StepLiftHeadMultiplier);
+                    Vector2 pos = colliderBottom + new Vector2(limpAmount, HeadPosition.Value + stepLift * CurrentGroundedParams.StepLiftHeadMultiplier);
 
                     if (head != mainLimb)
                     {
@@ -670,6 +690,7 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
+                if (limb.IsSevered) { continue; }
                 if (Math.Abs(limb.Params.ConstantTorque) > 0)
                 {
                     limb.body.SmoothRotate(movementAngle + MathHelper.ToRadians(limb.Params.ConstantAngle) * Dir, limb.Params.ConstantTorque, wrapAngle: true);
@@ -766,6 +787,7 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
+                if (limb.IsSevered) { continue; }
 #if CLIENT
                 if (limb.LightSource != null)
                 {
@@ -821,6 +843,7 @@ namespace Barotrauma
             base.Flip();
             foreach (Limb l in Limbs)
             {
+                if (l.IsSevered) { continue; }
                 if (!l.DoesFlip) { continue; }         
                 if (RagdollParams.IsSpritesheetOrientationHorizontal)
                 {
@@ -838,10 +861,13 @@ namespace Barotrauma
 
             foreach (Limb l in Limbs)
             {
+                if (l.IsSevered) { continue; }
+
                 TrySetLimbPosition(l,
                     centerOfMass,
                     new Vector2(centerOfMass.X - (l.SimPosition.X - centerOfMass.X), l.SimPosition.Y),
                     lerp);
+
                 l.body.PositionSmoothingFactor = 0.8f;
 
                 if (!l.DoesFlip) { continue; }
@@ -862,7 +888,7 @@ namespace Barotrauma
                 if (diff < 100.0f)
                 {
                     character.SelectedCharacter.AnimController.SetPosition(
-                        new Vector2(centerOfMass.X - diff, character.SelectedCharacter.SimPosition.Y), lerp: true);
+                        new Vector2(centerOfMass.X - diff, character.SelectedCharacter.SimPosition.Y), lerp);
                 }
             }
         }  

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/HumanoidAnimController.cs

@@ -323,7 +323,14 @@ namespace Barotrauma
 
             levitatingCollider = true;
             ColliderIndex = Crouching ? 1 : 0;
-            if (!Crouching && ColliderIndex == 1) Crouching = true;
+            if (character.SelectedConstruction?.GetComponent<Controller>()?.ControlCharacterPose ?? false)
+            {
+                Crouching = false;
+            }
+            else if (!Crouching && ColliderIndex == 1) 
+            { 
+                Crouching = true; 
+            }
 
             //stun (= disable the animations) if the ragdoll receives a large enough impact
             if (strongestImpact > 0.0f)
@@ -441,7 +448,7 @@ namespace Barotrauma
                 for (int i = -1; i < 2; i += 2)
                 {
                     Vector2 footPos = GetColliderBottom();
-                    footPos = new Vector2(waist.SimPosition.X + Math.Sign(StepSize.Value.X * i) * Dir * 0.3f, footPos.Y - 0.1f * RagdollParams.JointScale);
+                    footPos = new Vector2(waist.SimPosition.X + Math.Sign(WalkParams.StepSize.X * i) * Dir * 0.3f, footPos.Y - 0.1f * RagdollParams.JointScale);
                     var foot = i == -1 ? rightFoot : leftFoot;
                     MoveLimb(foot, footPos, Math.Abs(foot.SimPosition.X - footPos.X) * 100.0f, true);
                 }
@@ -481,7 +488,7 @@ namespace Barotrauma
 
                     swimmingStateLockTimer -= deltaTime;
 
-                    if (forceStanding)
+                    if (forceStanding || character.AnimController.AnimationTestPose)
                     {
                         swimming = false;
                     }
@@ -542,12 +549,6 @@ namespace Barotrauma
             Limb leftLeg = GetLimb(LimbType.LeftLeg);
             Limb rightLeg = GetLimb(LimbType.RightLeg);
 
-            float limpAmount = 
-                character.CharacterHealth.GetAfflictionStrength("damage", leftFoot, true) +
-                character.CharacterHealth.GetAfflictionStrength("damage", rightFoot, true) +
-                character.CharacterHealth.GetAfflictionStrength("spaceherpes");
-            limpAmount = MathHelper.Clamp(limpAmount / 100.0f, 0.0f, 1.0f);
-
             float walkCycleMultiplier = 1.0f;
             if (Stairs != null)
             {
@@ -582,6 +583,11 @@ namespace Barotrauma
             stepSize.Y *= walkPosY;
 
             float footMid = colliderPos.X;
+
+            var herpes = character.CharacterHealth.GetAffliction("spaceherpes", false);
+            float herpesAmount = herpes == null ? 0 : herpes.Strength / herpes.Prefab.MaxStrength;
+            float legDamage = character.GetLegPenalty(startSum: -0.1f) * 1.1f;
+            float limpAmount = MathHelper.Lerp(0, 1, legDamage + herpesAmount);
             if (limpAmount > 0.0f)
             {
                 //make the footpos oscillate when limping
@@ -652,6 +658,7 @@ namespace Barotrauma
                     (float)Math.Sin(WalkPos * CurrentGroundedParams.StepLiftFrequency + MathHelper.Pi * CurrentGroundedParams.StepLiftOffset) * (CurrentGroundedParams.StepLiftAmount / 100);
 
                 float y = colliderPos.Y + stepLift;
+
                 if (TorsoPosition.HasValue)
                 {
                     y += TorsoPosition.Value;
@@ -690,6 +697,7 @@ namespace Barotrauma
 
                 foreach (Limb limb in Limbs)
                 {
+                    if (limb.IsSevered) { continue; }
                     MoveLimb(limb, limb.SimPosition + move, 15.0f, true);
                 }
 
@@ -947,8 +955,6 @@ namespace Barotrauma
 
             torso.body.MoveToPos(Collider.SimPosition + new Vector2((float)Math.Sin(-Collider.Rotation), (float)Math.Cos(-Collider.Rotation)) * 0.4f, 5.0f);
 
-            if (TargetMovement == Vector2.Zero) { return; }
-
             movement = MathUtils.SmoothStep(movement, TargetMovement, 0.3f);
 
             if (TorsoAngle.HasValue)
@@ -1001,29 +1007,31 @@ namespace Barotrauma
             }
 
             WalkPos += movement.Length();
-            legCyclePos += Vector2.Normalize(movement).Length();
+            legCyclePos += Math.Min(movement.LengthSquared() + Collider.AngularVelocity, 1.0f);
             handCyclePos += MathHelper.ToRadians(CurrentSwimParams.HandCycleSpeed) * Math.Sign(movement.X);
 
             var waist = GetLimb(LimbType.Waist);
             footPos = waist == null ? Vector2.Zero : waist.SimPosition - new Vector2((float)Math.Sin(-Collider.Rotation), (float)Math.Cos(-Collider.Rotation)) * (upperLegLength + lowerLegLength);
-            Vector2 transformedFootPos = new Vector2((float)Math.Sin(legCyclePos / CurrentSwimParams.LegCycleLength / character.SpeedMultiplier) * CurrentSwimParams.LegMoveAmount, 0.0f);
+            Vector2 transformedFootPos = new Vector2((float)Math.Sin(legCyclePos / CurrentSwimParams.LegCycleLength) * CurrentSwimParams.LegMoveAmount, 0.0f);
             transformedFootPos = Vector2.Transform(transformedFootPos, Matrix.CreateRotationZ(Collider.Rotation));
 
+            float torque = CurrentSwimParams.FootRotateStrength * character.SpeedMultiplier * (1.2f - character.GetLegPenalty());
             if (rightFoot != null && !rightFoot.Disabled)
             {
-                FootIK(rightFoot, footPos - transformedFootPos, CurrentSwimParams.FootRotateStrength, CurrentSwimParams.FootRotateStrength, CurrentSwimParams.FootAngleInRadians);
+                FootIK(rightFoot, footPos - transformedFootPos, torque, torque, CurrentSwimParams.FootAngleInRadians);
             }
             if (leftFoot != null && !leftFoot.Disabled)
             {
-                FootIK(leftFoot, footPos + transformedFootPos, CurrentSwimParams.FootRotateStrength, CurrentSwimParams.FootRotateStrength, CurrentSwimParams.FootAngleInRadians);
+                FootIK(leftFoot, footPos + transformedFootPos, torque, torque, CurrentSwimParams.FootAngleInRadians);
             }
 
             handPos = (torso.SimPosition + head.SimPosition) / 2.0f;
 
-            //at the surface, not moving sideways -> hands just float around
-            if (!headInWater && TargetMovement.X == 0.0f && TargetMovement.Y > 0)
+            //at the surface, not moving sideways OR not moving at all
+            // -> hands just float around
+            if ((!headInWater && TargetMovement.X == 0.0f && TargetMovement.Y > 0) || TargetMovement.LengthSquared() < 0.001f)
             {
-                handPos.X = handPos.X + Dir * 0.6f;
+                handPos += MathUtils.RotatePoint(Vector2.UnitX * Dir * 0.6f, torso.Rotation);
 
                 float wobbleAmount = 0.1f;
 
@@ -1060,7 +1068,7 @@ namespace Barotrauma
                 rightHandPos.X = (Dir == 1.0f) ? Math.Max(0.3f, rightHandPos.X) : Math.Min(-0.3f, rightHandPos.X);
                 rightHandPos = Vector2.Transform(rightHandPos, rotationMatrix);
 
-                HandIK(rightHand, handPos + rightHandPos, CurrentSwimParams.HandMoveStrength * character.SpeedMultiplier);
+                HandIK(rightHand, handPos + rightHandPos, CurrentSwimParams.HandMoveStrength * character.SpeedMultiplier * (1 - Character.GetRightHandPenalty()));
             }
 
             if (leftHand != null && !leftHand.Disabled)
@@ -1069,7 +1077,7 @@ namespace Barotrauma
                 leftHandPos.X = (Dir == 1.0f) ? Math.Max(0.3f, leftHandPos.X) : Math.Min(-0.3f, leftHandPos.X);
                 leftHandPos = Vector2.Transform(leftHandPos, rotationMatrix);
 
-                HandIK(leftHand, handPos + leftHandPos, CurrentSwimParams.HandMoveStrength * character.SpeedMultiplier);
+                HandIK(leftHand, handPos + leftHandPos, CurrentSwimParams.HandMoveStrength * character.SpeedMultiplier * (1 - Character.GetLeftHandPenalty()));
             }
         }
 
@@ -1251,31 +1259,39 @@ namespace Barotrauma
 
             Limb head = GetLimb(LimbType.Head);
             Limb torso = GetLimb(LimbType.Torso);
-            
-            //if the head is moving, try to protect it with the hands
-            if (head.LinearVelocity.LengthSquared() > 1.0f && !head.IsSevered)
+
+            if (head != null && head.LinearVelocity.LengthSquared() > 1.0f && !head.IsSevered)
             {
+                //if the head is moving, try to protect it with the hands
                 Limb leftHand = GetLimb(LimbType.LeftHand);
                 Limb rightHand = GetLimb(LimbType.RightHand);
 
                 //move hands in front of the head in the direction of the movement
                 Vector2 protectPos = head.SimPosition + Vector2.Normalize(head.LinearVelocity);
-                if (!rightHand.IsSevered) HandIK(rightHand, protectPos, strength * 0.1f);
-                if (!leftHand.IsSevered) HandIK(leftHand, protectPos, strength * 0.1f);
+                if (rightHand != null && !rightHand.IsSevered)
+                {
+                    HandIK(rightHand, protectPos, strength * 0.1f);
+                }
+                if (leftHand != null && !leftHand.IsSevered)
+                {
+                    HandIK(leftHand, protectPos, strength * 0.1f);
+                }
             }
 
+            if (torso == null) { return; }
             //attempt to make legs stay in a straight line with the torso to prevent the character from doing a split
             for (int i = 0; i < 2; i++)
             {
                 var thigh = i == 0 ? GetLimb(LimbType.LeftThigh) : GetLimb(LimbType.RightThigh);
-                if (thigh.IsSevered) continue;
+                if (thigh == null) { continue; }
+                if (thigh.IsSevered) { continue; }
 
                 float thighDiff = Math.Abs(MathUtils.GetShortestAngle(torso.Rotation, thigh.Rotation));
                 float thighTorque = thighDiff * thigh.Mass * Math.Sign(torso.Rotation - thigh.Rotation) * 5.0f;
                 thigh.body.ApplyTorque(thighTorque * strength);                
 
                 var leg = i == 0 ? GetLimb(LimbType.LeftLeg) : GetLimb(LimbType.RightLeg);
-                if (leg.IsSevered) continue;
+                if (leg == null || leg.IsSevered) { continue; }
                 float legDiff = Math.Abs(MathUtils.GetShortestAngle(torso.Rotation, leg.Rotation));
                 float legTorque = legDiff * leg.Mass * Math.Sign(torso.Rotation - leg.Rotation) * 5.0f;
                 leg.body.ApplyTorque(legTorque * strength);                
@@ -1410,7 +1426,7 @@ namespace Barotrauma
                     SteamAchievementManager.OnCharacterRevived(target, character);
                     lastReviveTime = (float)Timing.TotalTime;
 #if SERVER
-                    GameMain.Server?.KarmaManager?.OnCharacterHealthChanged(target, character, damage: Math.Min(prevVitality - target.Vitality, 0.0f));
+                    GameMain.Server?.KarmaManager?.OnCharacterHealthChanged(target, character, damage: Math.Min(prevVitality - target.Vitality, 0.0f), stun: 0.0f);
 #endif
                     //reset attacker, we don't want the character to start attacking us
                     //because we caused a bit of damage to them during CPR
@@ -1540,6 +1556,11 @@ namespace Barotrauma
                         {
                             sourceSimPos -= character.SelectedCharacter.Submarine.SimPosition;
                         }
+                        else if (character.Submarine != null && character.SelectedCharacter.Submarine != null && character.Submarine != character.SelectedCharacter.Submarine)
+                        {
+                            targetSimPos += character.SelectedCharacter.Submarine.SimPosition;
+                            targetSimPos -= character.Submarine.SimPosition;
+                        }
                         var body = Submarine.CheckVisibility(sourceSimPos, targetSimPos, ignoreSubs: true);
                         if (body != null)
                         {
@@ -1553,8 +1574,8 @@ namespace Barotrauma
                     
                     Vector2 diff = ConvertUnits.ToSimUnits(targetLimb.WorldPosition - pullLimb.WorldPosition);
 
-                    Vector2 targetAnchor = targetLimb.SimPosition;
-                    float targetForce = 0.0f;
+                    Vector2 targetAnchor;
+                    float targetForce;
                     pullLimb.PullJointEnabled = true;
                     if (targetLimb.type == LimbType.Torso || targetLimb == target.AnimController.MainLimb)
                     {
@@ -1624,6 +1645,7 @@ namespace Barotrauma
                 
                 if (!target.AllowInput)
                 {
+                    target.AnimController.Stairs = Stairs;
                     target.AnimController.IgnorePlatforms = IgnorePlatforms;
                     target.AnimController.TargetMovement = TargetMovement;
                 }
@@ -1981,6 +2003,8 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
+                if (limb.IsSevered) { continue; }
+
                 bool mirror = false;
                 bool flipAngle = false;
                 bool wrapAngle = false;

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs

@@ -55,7 +55,11 @@ namespace Barotrauma
             {
                 if (limbs == null)
                 {
-                    DebugConsole.ThrowError("Attempted to access a potentially removed ragdoll. Character: " + character.Name + ", id: " + character.ID + ", removed: " + character.Removed + ", ragdoll removed: " + !list.Contains(this));
+                    string errorMsg = "Attempted to access a potentially removed ragdoll. Character: " + character.Name + ", id: " + character.ID + ", removed: " + character.Removed + ", ragdoll removed: " + !list.Contains(this);
+#if DEBUG || UNSTABLE
+                    errorMsg += '\n' + Environment.StackTrace;
+#endif
+                    DebugConsole.ThrowError(errorMsg);
                     GameAnalyticsManager.AddErrorEventOnce(
                         "Ragdoll.Limbs:AccessRemoved",
                         GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
@@ -80,7 +84,7 @@ namespace Barotrauma
                 frozen = value;
 
                 Collider.FarseerBody.LinearDamping = frozen ? (1.5f / (float)Timing.Step) : 0.0f;
-                Collider.FarseerBody.AngularDamping = frozen ? (1.5f / (float)Timing.Step) : 0.0f;
+                Collider.FarseerBody.AngularDamping = frozen ? (1.5f / (float)Timing.Step) : PhysicsBody.DefaultAngularDamping;
                 Collider.FarseerBody.IgnoreGravity = frozen;
 
                 //Collider.PhysEnabled = !frozen;
@@ -93,12 +97,17 @@ namespace Barotrauma
 
         private bool simplePhysicsEnabled;
 
+        public Character Character => character;
         protected Character character;
 
         protected float strongestImpact;
 
         private float splashSoundTimer;
 
+        //the ragdoll builds a "tolerance" to the flow force when being pushed by water. 
+        //Allows sudden forces (breach, letting water through a door) to heavily push the character around while ensuring flowing water won't make the characters permanently stuck.
+        private float flowForceTolerance, flowStunTolerance;
+
         //the movement speed of the ragdoll
         public Vector2 movement;
         //the target speed towards which movement is interpolated
@@ -152,8 +161,8 @@ namespace Barotrauma
             }
             set
             {
-                if (value == colliderIndex || collider == null) return;
-                if (value >= collider.Count || value < 0) return;
+                if (value == colliderIndex || collider == null) { return; }
+                if (value >= collider.Count || value < 0) { return; }
 
                 if (collider[colliderIndex].height < collider[value].height)
                 {
@@ -161,10 +170,9 @@ namespace Barotrauma
                     pos1.Y -= collider[colliderIndex].height * ColliderHeightFromFloor;
                     Vector2 pos2 = pos1;
                     pos2.Y += collider[value].height * 1.1f;
-                    if (GameMain.World.RayCast(pos1, pos2).Any(f => f.CollisionCategories.HasFlag(Physics.CollisionWall))) return;
+                    if (GameMain.World.RayCast(pos1, pos2).Any(f => f.CollisionCategories.HasFlag(Physics.CollisionWall))) { return; }
                 }
 
-
                 Vector2 pos = collider[colliderIndex].SimPosition;
                 pos.Y -= collider[colliderIndex].height * 0.5f;
                 pos.Y += collider[value].height * 0.5f;
@@ -212,7 +220,7 @@ namespace Barotrauma
                     mainLimb = torso ?? head;
                     if (mainLimb == null)
                     {
-                        mainLimb = Limbs.FirstOrDefault();
+                        mainLimb = Limbs.FirstOrDefault(l => !l.IsSevered && !l.ignoreCollisions);
                     }
                 }
                 return mainLimb;
@@ -234,13 +242,13 @@ namespace Barotrauma
             get { return simplePhysicsEnabled; }
             set
             {
-                if (value == simplePhysicsEnabled) return;
+                if (value == simplePhysicsEnabled) { return; }
 
                 simplePhysicsEnabled = value;
 
                 foreach (Limb limb in Limbs)
                 {
-                    if (limb.IsSevered) continue;
+                    if (limb.IsSevered) { continue; }
                     if (limb.body == null)
                     {
                         DebugConsole.ThrowError("Limb has no body! (" + (character != null ? character.Name : "Unknown character") + ", " + limb.type.ToString());
@@ -292,8 +300,6 @@ namespace Barotrauma
         public float ImpactTolerance => RagdollParams.ImpactTolerance;
         public bool Draggable => RagdollParams.Draggable;
         public bool CanEnterSubmarine => RagdollParams.CanEnterSubmarine;
-        public bool CanAttackSubmarine => Limbs.Any(l => l.attack != null && l.attack.IsValidTarget(AttackTarget.Structure));
-        public bool CanAttackCharacters => Limbs.Any(l => l.attack != null && l.attack.IsValidTarget(AttackTarget.Character));
 
         public float Dir => dir == Direction.Left ? -1.0f : 1.0f;
 
@@ -320,6 +326,7 @@ namespace Barotrauma
                 Submarine currSubmarine = currentHull?.Submarine;
                 foreach (Limb limb in Limbs)
                 {
+                    if (limb.IsSevered) { continue; }
                     limb.body.Submarine = currSubmarine;
                 }
                 Collider.Submarine = currSubmarine;
@@ -373,7 +380,7 @@ namespace Barotrauma
                 foreach (var kvp in items)
                 {
                     int id = kvp.Key.ID;
-                    // This can be the case if we manipulate the ragdoll in runtime (husk appendage, limb severance)
+                    // This can be the case if we manipulate the ragdoll at runtime (husk appendage, limb removal in the character editor)
                     if (id > limbs.Length - 1) { continue; }
                     var limb = limbs[id];
                     var itemList = kvp.Value;
@@ -633,10 +640,7 @@ namespace Barotrauma
             Vector2 colliderBottom = GetColliderBottom();
             if (structure.IsPlatform)
             {
-                if (IgnorePlatforms) { return false; }
-
-                //the collision is ignored if the lowest limb is under the platform
-                //if (lowestLimb==null || lowestLimb.Position.Y < structure.Rect.Y) return false;
+                if (IgnorePlatforms || currentHull == null) { return false; }
 
                 if (colliderBottom.Y < ConvertUnits.ToSimUnits(structure.Rect.Y - 5)) { return false; }
                 if (f1.Body.Position.Y < ConvertUnits.ToSimUnits(structure.Rect.Y - 5)) { return false; }
@@ -719,12 +723,14 @@ namespace Barotrauma
 
             ImpactProjSpecific(impact, f1.Body);
         }
-        
-        public void SeverLimbJoint(LimbJoint limbJoint, bool playSound = true)
+
+        private readonly List<Limb> connectedLimbs = new List<Limb>();
+        private readonly List<LimbJoint> checkedJoints = new List<LimbJoint>();
+        public bool SeverLimbJoint(LimbJoint limbJoint, bool playSound = true)
         {
             if (!limbJoint.CanBeSevered || limbJoint.IsSevered)
             {
-                return;
+                return false;
             }
 
             limbJoint.IsSevered = true;
@@ -737,9 +743,8 @@ namespace Barotrauma
             limbJoint.LimbA.body.ApplyLinearImpulse(limbDiff * mass, (limbJoint.LimbA.SimPosition + limbJoint.LimbB.SimPosition) / 2.0f);
             limbJoint.LimbB.body.ApplyLinearImpulse(-limbDiff * mass, (limbJoint.LimbA.SimPosition + limbJoint.LimbB.SimPosition) / 2.0f);
 
-            List<Limb> connectedLimbs = new List<Limb>();
-            List<LimbJoint> checkedJoints = new List<LimbJoint>();
-
+            connectedLimbs.Clear();
+            checkedJoints.Clear();
             GetConnectedLimbs(connectedLimbs, checkedJoints, MainLimb);
             foreach (Limb limb in Limbs)
             {
@@ -748,11 +753,11 @@ namespace Barotrauma
             }
 
             SeverLimbJointProjSpecific(limbJoint, playSound: true);
-
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
             {
                 GameMain.NetworkMember.CreateEntityEvent(character, new object[] { NetEntityEvent.Type.Status });
             }
+            return true;
         }
 
         partial void SeverLimbJointProjSpecific(LimbJoint limbJoint, bool playSound);
@@ -763,7 +768,7 @@ namespace Barotrauma
 
             foreach (LimbJoint joint in LimbJoints)
             {
-                if (joint.IsSevered || checkedJoints.Contains(joint)) continue;
+                if (joint.IsSevered || checkedJoints.Contains(joint)) { continue; }
                 if (joint.LimbA == limb)
                 {
                     if (!connectedLimbs.Contains(joint.LimbB))
@@ -860,7 +865,7 @@ namespace Barotrauma
         {
             for (int i = 0; i < Limbs.Length; i++)
             {
-                if (Limbs[i] == null) continue;
+                if (Limbs[i] == null) { continue; }
                 Limbs[i].PullJointEnabled = false;
             }
         }
@@ -966,8 +971,8 @@ namespace Barotrauma
                 else
                 {
                     if (character.Position.X < gap.Rect.X || character.Position.X > gap.Rect.Right) continue;
-                    if (Math.Sign((gap.Rect.Y - gap.Rect.Height / 2) - (currentHull.Rect.Center.Y - currentHull.Rect.Height / 2)) !=
-                        Math.Sign(character.Position.Y - (currentHull.Rect.Center.Y - currentHull.Rect.Height / 2)))
+                    if (Math.Sign((gap.Rect.Y - gap.Rect.Height / 2) - (currentHull.Rect.Y - currentHull.Rect.Height / 2)) !=
+                        Math.Sign(character.Position.Y - (currentHull.Rect.Y - currentHull.Rect.Height / 2)))
                     {
                         continue;
                     }
@@ -981,8 +986,8 @@ namespace Barotrauma
         {
             foreach (Limb limb in Limbs)
             {
-                if (limb.IsSevered) continue;
-                if (limb.body.FarseerBody.ContactList == null) continue;
+                if (limb.IsSevered) { continue; }
+                if (limb.body.FarseerBody.ContactList == null) { continue; }
 
                 ContactEdge ce = limb.body.FarseerBody.ContactList;
                 while (ce != null && ce.Contact != null)
@@ -994,7 +999,7 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
-                if (limb.IsSevered) continue;
+                if (limb.IsSevered) { continue; }
                 limb.body.LinearVelocity += velocityChange;
             }
 
@@ -1019,15 +1024,15 @@ namespace Barotrauma
             Category collisionCategory = (IgnorePlatforms) ?
                 wall | Physics.CollisionProjectile | Physics.CollisionStairs
                 : wall | Physics.CollisionProjectile | Physics.CollisionPlatform | Physics.CollisionStairs;
-            
-            if (collisionCategory == prevCollisionCategory) return;
+
+            if (collisionCategory == prevCollisionCategory) { return; }
             prevCollisionCategory = collisionCategory;
 
             Collider.CollidesWith = collisionCategory | Physics.CollisionItemBlocking;
 
             foreach (Limb limb in Limbs)
             {
-                if (limb.ignoreCollisions || limb.IsSevered) continue;
+                if (limb.ignoreCollisions || limb.IsSevered) { continue; }
 
                 try
                 {
@@ -1080,8 +1085,6 @@ namespace Barotrauma
             CheckDistFromCollider();
             UpdateCollisionCategories();
 
-            Vector2 flowForce = Vector2.Zero;
-
             FindHull();
             PreventOutsideCollision();
             
@@ -1103,10 +1106,7 @@ namespace Barotrauma
             }
             else
             {
-                flowForce = GetFlowForce();
-
                 headInWater = false;
-
                 inWater = false;
                 if (currentHull.WaterVolume > currentHull.Volume * 0.95f)
                 {
@@ -1128,7 +1128,7 @@ namespace Barotrauma
                             if (lowerHull != null) floorY = ConvertUnits.ToSimUnits(lowerHull.Rect.Y - lowerHull.Rect.Height);
                         }
                     }
-                    float standHeight = 
+                    float standHeight =
                         HeadPosition.HasValue ? HeadPosition.Value :
                         TorsoPosition.HasValue ? TorsoPosition.Value :
                         Collider.GetMaxExtent() * 0.5f;
@@ -1139,10 +1139,7 @@ namespace Barotrauma
                 }
             }
 
-            if (flowForce.LengthSquared() > 0.001f)
-            {
-                Collider.ApplyForce(flowForce, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
-            }
+            UpdateHullFlowForces(deltaTime);
 
             if (currentHull == null ||
                 currentHull.WaterVolume > currentHull.Volume * 0.95f ||
@@ -1151,7 +1148,6 @@ namespace Barotrauma
                 Collider.ApplyWaterForces();
             }
 
-
             foreach (Limb limb in Limbs)
             {
                 //find the room which the limb is in
@@ -1176,14 +1172,7 @@ namespace Barotrauma
                     if (limb.Position.Y < limbHull.Surface)
                     {
                         limb.inWater = true;
-
-                        if (flowForce.LengthSquared() > 0.001f)
-                        {
-                            limb.body.ApplyForce(flowForce, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
-                        }
-
                         surfaceY = limbHull.Surface;
-
                         if (limb.type == LimbType.Head)
                         {
                             headInWater = true;
@@ -1228,6 +1217,8 @@ namespace Barotrauma
 
         private void CheckBodyInRest(float deltaTime)
         {
+            if (SimplePhysicsEnabled) { return; }
+
             if (InWater || Collider.LinearVelocity.LengthSquared() > 0.01f || character.SelectedBy != null || !character.IsDead)
             {
                 bodyInRestTimer = 0.0f;
@@ -1253,6 +1244,12 @@ namespace Barotrauma
         private int validityResets;
         private bool CheckValidity()
         {
+            if (limbs == null)
+            {
+                DebugConsole.ThrowError("Attempted to check the validity of a potentially removed ragdoll. Character: " + character.Name + ", id: " + character.ID + ", removed: " + character.Removed + ", ragdoll removed: " + !list.Contains(this));
+                Invalid = true;
+                return false;
+            }
             bool isColliderValid = CheckValidity(Collider);
             bool limbsValid = true;
             foreach (Limb limb in limbs)
@@ -1275,8 +1272,8 @@ namespace Barotrauma
                     Collider.SetTransform(Vector2.Zero, 0.0f);
                     foreach (Limb limb in Limbs)
                     {
-                        limb.body.SetTransform(Collider.SimPosition, 0.0f);
-                        limb.body.ResetDynamics();
+                        limb.body?.SetTransform(Collider.SimPosition, 0.0f);
+                        limb.body?.ResetDynamics();
                     }
                     Frozen = true;
                 }
@@ -1350,6 +1347,74 @@ namespace Barotrauma
 
         partial void Splash(Limb limb, Hull limbHull);
 
+        private void UpdateHullFlowForces(float deltaTime)
+        {
+            if (currentHull == null) { return; }
+
+            const float StunForceThreshold = 5.0f;
+            const float StunDuration = 0.5f;
+            const float ToleranceIncreaseSpeed = 5.0f;
+            const float ToleranceDecreaseSpeed = 1.0f;
+
+            //how much distance to a gap affects the force it exerts on the character
+            const float DistanceFactor = 0.5f;
+            const float ForceMultiplier = 0.035f;
+
+            Vector2 flowForce = Vector2.Zero;
+            foreach (Gap gap in Gap.GapList)
+            {
+                if (gap.Open <= 0.0f || !gap.linkedTo.Contains(currentHull) || gap.LerpedFlowForce.LengthSquared() < 0.01f) { continue; }
+                float dist = Vector2.Distance(MainLimb.WorldPosition, gap.WorldPosition) * DistanceFactor;
+                flowForce += Vector2.Normalize(gap.LerpedFlowForce) * (Math.Max(gap.LerpedFlowForce.Length() - dist, 0.0f) * ForceMultiplier);
+            }
+
+            //throwing conscious/moving characters around takes more force -> double the flow force
+            if (character.CanMove) { flowForce *= 2.0f; }
+
+            float flowForceMagnitude = flowForce.Length();
+            float limbMultipier = limbs.Count(l => l.inWater) / (float)limbs.Length;
+            //if the force strong enough, stun the character to let it get thrown around by the water
+            if ((flowForceMagnitude * limbMultipier) - flowStunTolerance > StunForceThreshold)
+            {
+                character.Stun = Math.Max(character.Stun, StunDuration);
+                flowStunTolerance = Math.Max(flowStunTolerance, flowForceMagnitude);
+            }
+
+            if (character == Character.Controlled && inWater && Screen.Selected?.Cam != null)
+            {
+                float shakeStrength = Math.Min(flowForceMagnitude / 10.0f, 5.0f) * limbMultipier;
+                Screen.Selected.Cam.Shake = Math.Max(Screen.Selected.Cam.Shake, shakeStrength);
+            }
+
+            if (flowForceMagnitude > 0.0001f)
+            {
+                flowForce = Vector2.Normalize(flowForce) * Math.Max(flowForceMagnitude - flowForceTolerance, 0.0f);
+            }
+
+            if (flowForceTolerance <= flowForceMagnitude * 1.5f && inWater)
+            {
+                //build up "tolerance" to the flow force
+                //ensures the character won't get permanently stuck by forces, while allowing sudden changes in flow to push the character hard
+                flowForceTolerance += deltaTime * ToleranceIncreaseSpeed;
+                flowStunTolerance = Math.Max(flowStunTolerance, flowForceTolerance);
+            }
+            else
+            {
+                flowForceTolerance = Math.Max(flowForceTolerance - deltaTime * ToleranceDecreaseSpeed, 0.0f);
+                flowStunTolerance = Math.Max(flowStunTolerance - deltaTime * ToleranceDecreaseSpeed, 0.0f);
+            }
+
+            if (flowForce.LengthSquared() > 0.001f)
+            {
+                Collider.ApplyForce(flowForce, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                foreach (Limb limb in limbs)
+                {
+                    if (!limb.inWater) { continue; }
+                    limb.body.ApplyForce(flowForce, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                }
+            }
+        }
+
         private void RefreshFloorY(Limb refLimb = null, bool ignoreStairs = false)
         {
             PhysicsBody refBody = refLimb == null ? Collider : refLimb.body;
@@ -1487,7 +1552,7 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
-                if (limb.IsSevered) continue;
+                if (limb.IsSevered) { continue; }
                 //check visibility from the new position of the collider to the new position of this limb
                 Vector2 movePos = limb.SimPosition + limbMoveAmount;
 
@@ -1551,7 +1616,7 @@ namespace Barotrauma
                 Vector2 forceDir = diff / (float)Math.Sqrt(distSqrd);
                 foreach (Limb limb in Limbs)
                 {
-                    if (limb.IsSevered) continue;
+                    if (limb.IsSevered) { continue; }
                     limb.body.CollidesWith = Physics.CollisionNone;
                     limb.body.ApplyForce(forceDir * limb.Mass * 10.0f, maxVelocity: 10.0f);
                 }
@@ -1597,28 +1662,37 @@ namespace Barotrauma
             UpdateNetPlayerPositionProjSpecific(deltaTime, lowestSubPos);
         }
         
-        private Vector2 GetFlowForce()
-        {
-            Vector2 limbPos = Limbs[0].Position;
-
-            Vector2 force = Vector2.Zero;
-            foreach (Gap gap in Gap.GapList)
-            {
-                if (gap.Open <= 0.0f || gap.FlowTargetHull != currentHull || gap.LerpedFlowForce.LengthSquared() < 0.01f) continue;
-
-                Vector2 gapPos = gap.SimPosition;
-                float dist = Vector2.Distance(limbPos, gapPos);
-                force += Vector2.Normalize(gap.LerpedFlowForce) * (Math.Max(gap.LerpedFlowForce.Length() - dist, 0.0f) / 500.0f);
-            }
-            return force;
-        }
-
         /// <summary>
         /// Note that if there are multiple limbs of the same type, only the first of them is found in the dictionary.
         /// </summary>
-        public Limb GetLimb(LimbType limbType)
+        public Limb GetLimb(LimbType limbType, bool excludeSevered = true)
         {
-            limbDictionary.TryGetValue(limbType, out Limb limb);
+            Limb limb = null;
+            if (HasMultipleLimbsOfSameType)
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    limbDictionary.TryGetValue(limbType, out limb);
+                    if (limb == null)
+                    {
+                        // No limbs found
+                        break;
+                    }
+                    if (!excludeSevered || !limb.IsSevered)
+                    {
+                        // Found a valid limb
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                limbDictionary.TryGetValue(limbType, out limb);
+            }
+            if (excludeSevered && limb != null && limb.IsSevered)
+            {
+                limb = null;
+            }
             return limb;
         }
 
@@ -1661,10 +1735,15 @@ namespace Barotrauma
             Limb lowestLimb = null;
             foreach (Limb limb in Limbs)
             {
+                if (limb.IsSevered) { continue; }
                 if (lowestLimb == null)
+                {
                     lowestLimb = limb;
+                }
                 else if (limb.SimPosition.Y < lowestLimb.SimPosition.Y)
+                {
                     lowestLimb = limb;
+                }
             }
 
             return lowestLimb;

Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs

@@ -260,7 +260,7 @@ namespace Barotrauma
             return totalDamage;
         }
 
-        public Attack(float damage, float bleedingDamage, float burnDamage, float structureDamage, float range = 0.0f)
+        public Attack(float damage, float bleedingDamage, float burnDamage, float structureDamage, float itemDamage, float range = 0.0f)
         {
             if (damage > 0.0f) Afflictions.Add(AfflictionPrefab.InternalDamage.Instantiate(damage), null);
             if (bleedingDamage > 0.0f) Afflictions.Add(AfflictionPrefab.Bleeding.Instantiate(bleedingDamage), null);
@@ -269,6 +269,7 @@ namespace Barotrauma
             Range = range;
             DamageRange = range;
             StructureDamage = structureDamage;
+            ItemDamage = itemDamage;
         }
 
         public Attack(XElement element, string parentDebugName)
@@ -315,11 +316,6 @@ namespace Barotrauma
                                 continue;
                             }
                         }
-
-                        //float afflictionStrength = subElement.GetAttributeFloat(1.0f, "amount", "strength");
-                        //var affliction = afflictionPrefab.Instantiate(afflictionStrength);
-                        //Afflictions.Add(affliction, subElement);
-
                         break;
                     case "conditional":
                         foreach (XAttribute attribute in subElement.Attributes())
@@ -346,14 +342,18 @@ namespace Barotrauma
                 afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier.Equals(afflictionIdentifier, System.StringComparison.OrdinalIgnoreCase));
                 if (afflictionPrefab != null)
                 {
-                    float afflictionStrength = subElement.GetAttributeFloat(1.0f, "amount", "strength");
-                    affliction = afflictionPrefab.Instantiate(afflictionStrength);
+                    affliction = afflictionPrefab.Instantiate(0.0f);
                 }
                 else
                 {
                     affliction = new Affliction(null, 0);
                 }
                 affliction.Deserialize(subElement);
+                //backwards compatibility
+                if (subElement.Attribute("amount") != null && subElement.Attribute("strength") == null)
+                {
+                    affliction.Strength = subElement.GetAttributeFloat("amount", 0.0f);
+                }
                 // add the affliction anyway, so that it can be shown in the editor.
                 Afflictions.Add(affliction, subElement);
             }
@@ -515,10 +515,10 @@ namespace Barotrauma
         public void SetCoolDown()
         {
             float randomFraction = CoolDown * CoolDownRandomFactor;
-            CurrentRandomCoolDown = MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value(Rand.RandSync.Server));
+            CurrentRandomCoolDown = MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value());
             CoolDownTimer = CoolDown + CurrentRandomCoolDown;
             randomFraction = SecondaryCoolDown * CoolDownRandomFactor;
-            SecondaryCoolDownTimer = SecondaryCoolDown + MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value(Rand.RandSync.Server));
+            SecondaryCoolDownTimer = SecondaryCoolDown + MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value());
         }
 
         public void ResetCoolDown()
@@ -571,18 +571,14 @@ namespace Barotrauma
 
         public bool IsValidTarget(AttackTarget targetType) => TargetType == AttackTarget.Any || TargetType == targetType;
 
-        public bool IsValidTarget(Entity target)
+        public bool IsValidTarget(IDamageable target)
         {
-            switch (TargetType)
+            return TargetType switch
             {
-                case AttackTarget.Character:
-                    return target is Character;
-                case AttackTarget.Structure:
-                    return !(target is Character);
-                case AttackTarget.Any:
-                default:
-                    return true;
-            }
+                AttackTarget.Character => target is Character,
+                AttackTarget.Structure => !(target is Character),
+                _ => true,
+            };
         }
 
         public Vector2 CalculateAttackPhase(TransitionMode easing = TransitionMode.Linear)

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -3,7 +3,7 @@ using FarseerPhysics;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using System;
-using System.IO;
+using Barotrauma.IO;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
@@ -43,6 +43,7 @@ namespace Barotrauma
 
                 foreach (Limb limb in AnimController.Limbs)
                 {
+                    if (limb.IsSevered) { continue; }
                     if (limb.body != null)
                     {
                         limb.body.Enabled = enabled;
@@ -59,6 +60,7 @@ namespace Barotrauma
         public bool IsRemotePlayer;
 
         public bool IsPlayer => Controlled == this || IsRemotePlayer;
+        public bool IsBot => !IsPlayer && AIController is HumanAIController humanAI && humanAI.Enabled;
 
         public readonly Dictionary<string, SerializableProperty> Properties;
         public Dictionary<string, SerializableProperty> SerializableProperties
@@ -234,6 +236,7 @@ namespace Barotrauma
         {
             get
             {
+                if (info != null && !string.IsNullOrWhiteSpace(info.Name)) { return info.Name; }
                 var displayName = Params.DisplayName;
                 if (string.IsNullOrWhiteSpace(displayName))
                 {
@@ -601,7 +604,9 @@ namespace Barotrauma
                     {
                         errorMsg += " AnimController.Collider == null";
                     }
-
+#if DEBUG || UNSTABLE
+                    errorMsg += '\n' + Environment.StackTrace;
+#endif
                     DebugConsole.NewMessage(errorMsg, Color.Red);
                     GameAnalyticsManager.AddErrorEventOnce(
                         "Character.SimPosition:AccessRemoved",
@@ -1137,22 +1142,76 @@ namespace Barotrauma
             greatestNegativeSpeedMultiplier = 1f;
         }
 
+        /// <summary>
+        /// Speed reduction from the current limb specific damage. Min 0, max 1.
+        /// </summary>
+        public float GetTemporarySpeedReduction()
+        {
+            float reduction = 0;
+            reduction = CalculateMovementPenalty(AnimController.GetLimb(LimbType.RightFoot, excludeSevered: false), reduction);
+            reduction = CalculateMovementPenalty(AnimController.GetLimb(LimbType.LeftFoot, excludeSevered: false), reduction);
+            reduction = CalculateMovementPenalty(AnimController.GetLimb(LimbType.RightHand, excludeSevered: false), reduction);
+            reduction = CalculateMovementPenalty(AnimController.GetLimb(LimbType.LeftHand, excludeSevered: false), reduction);
+            int totalTailLimbs = 0;
+            int destroyedTailLimbs = 0;
+            foreach (var limb in AnimController.Limbs)
+            {
+                if (limb.type == LimbType.Tail)
+                {
+                    totalTailLimbs++;
+                    if (limb.IsSevered)
+                    {
+                        destroyedTailLimbs++;
+                    }
+                }
+            }
+            if (destroyedTailLimbs > 0)
+            {
+                reduction += MathHelper.Lerp(0, AnimController.InWater ? 1f : 0.5f, (float)destroyedTailLimbs / totalTailLimbs);
+            }
+            return Math.Clamp(reduction, 0, 1f);
+        }
+
+        private float CalculateMovementPenalty(Limb limb, float sum, float max = 0.4f)
+        {
+            if (limb != null)
+            {
+                sum += MathHelper.Lerp(0, max, CharacterHealth.GetLimbDamage(limb));
+            }
+            return Math.Clamp(sum, 0, 1f);
+        }
+
+        public float GetRightHandPenalty() => CalculateMovementPenalty(AnimController.GetLimb(LimbType.RightHand, excludeSevered: false), 0, max: 1);
+        public float GetLeftHandPenalty() => CalculateMovementPenalty(AnimController.GetLimb(LimbType.LeftHand, excludeSevered: false), 0, max: 1);
+
+        public float GetLegPenalty(float startSum = 0)
+        {
+            float sum = startSum;
+            foreach (var limb in AnimController.Limbs)
+            {
+                switch (limb.type)
+                {
+                    case LimbType.RightFoot:
+                    case LimbType.LeftFoot:
+                        sum += CalculateMovementPenalty(limb, sum, max: 0.5f);
+                        break;
+                }
+            }
+            return Math.Clamp(sum, 0, 1f);
+        }
+
         public float ApplyTemporarySpeedLimits(float speed)
         {
-            var leftFoot = AnimController.GetLimb(LimbType.LeftFoot);
-            if (leftFoot != null)
+            float max;
+            if (AnimController is HumanoidAnimController)
             {
-                float footAfflictionStrength = CharacterHealth.GetAfflictionStrength("damage", leftFoot, true);
-                speed *= MathHelper.Lerp(1.0f, 0.4f, MathHelper.Clamp(footAfflictionStrength / 80.0f, 0.0f, 1.0f));
+                max = AnimController.InWater ? 0.5f : 0.7f;
             }
-
-            var rightFoot = AnimController.GetLimb(LimbType.RightFoot);
-            if (rightFoot != null)
+            else
             {
-                float footAfflictionStrength = CharacterHealth.GetAfflictionStrength("damage", rightFoot, true);
-                speed *= MathHelper.Lerp(1.0f, 0.4f, MathHelper.Clamp(footAfflictionStrength / 80.0f, 0.0f, 1.0f));
+                max = AnimController.InWater ? 0.9f : 0.5f;
             }
-
+            speed *= 1f - MathHelper.Lerp(0, max, GetTemporarySpeedReduction());
             return speed;
         }
 
@@ -1251,60 +1310,74 @@ namespace Barotrauma
             {
                 attackCoolDown -= deltaTime;
             }
-            else if (IsKeyDown(InputType.Attack))
+            else if (IsKeyDown(InputType.Attack) && (IsRemotePlayer || Controlled == this || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient)))
             {
+                Vector2 attackPos = SimPosition + ConvertUnits.ToSimUnits(cursorPosition - Position);
+                List<Body> ignoredBodies = AnimController.Limbs.Select(l => l.body.FarseerBody).ToList();
+                ignoredBodies.Add(AnimController.Collider.FarseerBody);
+
+                var body = Submarine.PickBody(
+                    SimPosition,
+                    attackPos,
+                    ignoredBodies,
+                    Physics.CollisionCharacter | Physics.CollisionWall);
+
+                IDamageable attackTarget = null;
+                if (body != null)
+                {
+                    attackPos = Submarine.LastPickedPosition;
+
+                    if (body.UserData is Submarine sub)
+                    {
+                        body = Submarine.PickBody(
+                            SimPosition - ((Submarine)body.UserData).SimPosition,
+                            attackPos - ((Submarine)body.UserData).SimPosition,
+                            ignoredBodies,
+                            Physics.CollisionWall);
+
+                        if (body != null)
+                        {
+                            attackPos = Submarine.LastPickedPosition + sub.SimPosition;
+                            attackTarget = body.UserData as IDamageable;
+                        }
+                    }
+                    else
+                    {
+                        if (body.UserData is IDamageable)
+                        {
+                            attackTarget = (IDamageable)body.UserData;
+                        }
+                        else if (body.UserData is Limb)
+                        {
+                            attackTarget = ((Limb)body.UserData).character;
+                        }
+                    }
+                }
                 var currentContexts = GetAttackContexts();
-                var validLimbs = AnimController.Limbs.Where(l => !l.IsSevered && !l.IsStuck && l.attack != null && l.attack.IsValidContext(currentContexts));
+                var validLimbs = AnimController.Limbs.Where(l =>
+                {
+                    if (l.IsSevered || l.IsStuck) { return false; }
+                    var attack = l.attack;
+                    if (attack == null) { return false; }
+                    if (attack.CoolDownTimer > 0) { return false; }
+                    if (!attack.IsValidContext(currentContexts)) { return false; }
+                    if (attackTarget != null)
+                    {
+                        if (!attack.IsValidTarget(attackTarget)) { return false; }
+                        if (attackTarget is ISerializableEntity se && attackTarget is Character)
+                        {
+                            if (attack.Conditionals.Any(c => !c.Matches(se))) { return false; }
+                        }
+                    }
+                    if (attack.Conditionals.Any(c => c.TargetSelf && !c.Matches(this))) { return false; }
+                    return true;
+                });
                 var sortedLimbs = validLimbs.OrderBy(l => Vector2.DistanceSquared(ConvertUnits.ToDisplayUnits(l.SimPosition), cursorPosition));
                 // Select closest
                 var attackLimb = sortedLimbs.FirstOrDefault();
                 if (attackLimb != null)
                 {
-                    Vector2 attackPos = attackLimb.SimPosition + Vector2.Normalize(cursorPosition - attackLimb.Position) * ConvertUnits.ToSimUnits(attackLimb.attack.Range);
-
-                    List<Body> ignoredBodies = AnimController.Limbs.Select(l => l.body.FarseerBody).ToList();
-                    ignoredBodies.Add(AnimController.Collider.FarseerBody);
-
-                    var body = Submarine.PickBody(
-                        attackLimb.SimPosition,
-                        attackPos,
-                        ignoredBodies,
-                        Physics.CollisionCharacter | Physics.CollisionWall);
-
-                    IDamageable attackTarget = null;
-                    if (body != null)
-                    {
-                        attackPos = Submarine.LastPickedPosition;
-
-                        if (body.UserData is Submarine sub)
-                        {
-                            body = Submarine.PickBody(
-                                attackLimb.SimPosition - ((Submarine)body.UserData).SimPosition,
-                                attackPos - ((Submarine)body.UserData).SimPosition,
-                                ignoredBodies,
-                                Physics.CollisionWall);
-
-                            if (body != null)
-                            {
-                                attackPos = Submarine.LastPickedPosition + sub.SimPosition;
-                                attackTarget = body.UserData as IDamageable;
-                            }
-                        }
-                        else
-                        {
-                            if (body.UserData is IDamageable)
-                            {
-                                attackTarget = (IDamageable)body.UserData;
-                            }
-                            else if (body.UserData is Limb)
-                            {
-                                attackTarget = ((Limb)body.UserData).character;
-                            }
-                        }
-                    }
-
                     attackLimb.UpdateAttack(deltaTime, attackPos, attackTarget, out AttackResult attackResult);
-
                     if (!attackLimb.attack.IsRunning)
                     {
                         attackCoolDown = 1.0f;
@@ -1391,22 +1464,23 @@ namespace Barotrauma
         {
             Limb selfLimb = AnimController.GetLimb(LimbType.Head);
             if (selfLimb == null) { selfLimb = AnimController.GetLimb(LimbType.Torso); }
-            if (selfLimb == null) { selfLimb = AnimController.Limbs.FirstOrDefault(); }
+            if (selfLimb == null) { selfLimb = AnimController.MainLimb; }
             return selfLimb;
         }
 
         public bool CanSeeTarget(ISpatialEntity target, Limb seeingLimb = null)
         {
-            seeingLimb = seeingLimb ?? GetSeeingLimb();
+            seeingLimb ??= GetSeeingLimb();
             if (seeingLimb == null) { return false; }
+            ISpatialEntity seeingEntity = AnimController.SimplePhysicsEnabled ? this : seeingLimb as ISpatialEntity;
             // TODO: Could we just use the method below? If not, let's refactor it so that we can.
-            Vector2 diff = ConvertUnits.ToSimUnits(target.WorldPosition - seeingLimb.WorldPosition);
+            Vector2 diff = ConvertUnits.ToSimUnits(target.WorldPosition - seeingEntity.WorldPosition);
             Body closestBody;
             //both inside the same sub (or both outside)
             //OR the we're inside, the other character outside
             if (target.Submarine == Submarine || target.Submarine == null)
             {
-                closestBody = Submarine.CheckVisibility(seeingLimb.SimPosition, seeingLimb.SimPosition + diff);
+                closestBody = Submarine.CheckVisibility(seeingEntity.SimPosition, seeingEntity.SimPosition + diff);
             }
             //we're outside, the other character inside
             else if (Submarine == null)
@@ -1416,7 +1490,7 @@ namespace Barotrauma
             //both inside different subs
             else
             {
-                closestBody = Submarine.CheckVisibility(seeingLimb.SimPosition, seeingLimb.SimPosition + diff);
+                closestBody = Submarine.CheckVisibility(seeingEntity.SimPosition, seeingEntity.SimPosition + diff);
                 if (!IsBlocking(closestBody))
                 {
                     closestBody = Submarine.CheckVisibility(target.SimPosition, target.SimPosition - diff);
@@ -1433,10 +1507,11 @@ namespace Barotrauma
                 }
                 else if (body.UserData is Item item && item != target)
                 {
+                    // TODO: The door collider should be disabled, so this check is probably unnecessary.
                     var door = item.GetComponent<Door>();
                     if (door != null)
                     {
-                        return !door.IsOpen;
+                        return !door.IsOpen && !door.IsBroken;
                     }
                 }
                 return false;
@@ -1463,7 +1538,7 @@ namespace Barotrauma
             Structure wall = closestBody.UserData as Structure;
             Item item = closestBody.UserData as Item;
             Door door = item?.GetComponent<Door>();
-            return (wall == null || !wall.CastShadow) && (door == null || door.IsOpen);
+            return (wall == null || !wall.CastShadow) && (door == null || door.IsOpen || door.IsBroken);
         }
 
         public bool HasItem(Item item, bool requireEquipped = false) => requireEquipped ? HasEquippedItem(item) : item.IsOwnedBy(this);
@@ -1561,7 +1636,7 @@ namespace Barotrauma
         /// <summary>
         /// Finds the closest item seeking by identifiers or tags from the world.
         /// Ignores items that are outside or in another team's submarine or in a submarine that is not connected to this submarine.
-        /// Also ignores items that are taken by someone else.
+        /// Also ignores non-interactable items and items that are taken by someone else.
         /// The method is run in steps for performance reasons. So you'll have to provide the reference to the itemIndex.
         /// Returns false while running and true when done.
         /// </summary>
@@ -1578,12 +1653,17 @@ namespace Barotrauma
             {
                 itemIndex++;
                 var item = Item.ItemList[itemIndex];
+                if (item.NonInteractable) { continue; }
                 if (ignoredItems != null && ignoredItems.Contains(item)) { continue; }
                 if (item.Submarine == null) { continue; }
                 if (item.Submarine.TeamID != TeamID) { continue; }
-                if (Submarine != null && !Submarine.IsEntityFoundOnThisSub(item, true)) { continue; }
                 if (item.CurrentHull == null) { continue; }
                 if (ignoreBroken && item.Condition <= 0) { continue; }
+                if (Submarine != null)
+                {
+                    if (item.Submarine.Info.Type != Submarine.Info.Type) { continue; }
+                    if (!Submarine.IsEntityFoundOnThisSub(item, true)) { continue; }
+                }
                 if (customPredicate != null && !customPredicate(item)) { continue; }
                 if (identifiers != null && identifiers.None(id => item.Prefab.Identifier == id || item.HasTag(id))) { continue; }
                 if (ignoredContainerIdentifiers != null && item.Container != null)
@@ -1593,8 +1673,8 @@ namespace Barotrauma
                 if (IsItemTakenBySomeoneElse(item)) { continue; }
                 float itemPriority = customPriorityFunction != null ? customPriorityFunction(item) : 1;
                 if (itemPriority <= 0) { continue; }
-                Item rootContainer = item.GetRootContainer();
-                Vector2 itemPos = (rootContainer ?? item).WorldPosition;
+                Entity rootInventoryOwner = item.GetRootInventoryOwner();
+                Vector2 itemPos = (rootInventoryOwner ?? item).WorldPosition;
                 float yDist = Math.Abs(WorldPosition.Y - itemPos.Y);
                 yDist = yDist > 100 ? yDist * 5 : 0;
                 float dist = Math.Abs(WorldPosition.X - itemPos.X) + yDist;
@@ -1612,13 +1692,16 @@ namespace Barotrauma
 
         public bool IsItemTakenBySomeoneElse(Item item) => item.FindParentInventory(i => i.Owner != this && i.Owner is Character owner && !owner.IsDead && !owner.Removed) != null;
 
-        public bool CanInteractWith(Character c, float maxDist = 200.0f, bool checkVisibility = true)
+        public bool CanInteractWith(Character c, float maxDist = 200.0f, bool checkVisibility = true, bool skipDistanceCheck = false)
         {
-            if (c == this || Removed || !c.Enabled || !c.CanBeSelected) return false;
-            if (!c.CharacterHealth.UseHealthWindow && !c.CanBeDragged && c.onCustomInteract == null) return false;
+            if (c == this || Removed || !c.Enabled || !c.CanBeSelected) { return false; }
+            if (!c.CharacterHealth.UseHealthWindow && !c.CanBeDragged && c.onCustomInteract == null) { return false; }
 
-            maxDist = ConvertUnits.ToSimUnits(maxDist);
-            if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) return false;
+            if (!skipDistanceCheck)
+            {
+                maxDist = ConvertUnits.ToSimUnits(maxDist);
+                if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) { return false; }
+            }
 
             return checkVisibility ? CanSeeCharacter(c) : true;
         }
@@ -1824,13 +1907,17 @@ namespace Barotrauma
                     if (findFocusedTimer <= 0.0f || Screen.Selected == GameMain.SubEditorScreen)
                     {
                         FocusedCharacter = CanInteract ? FindCharacterAtPosition(mouseSimPos) : null;
+                        if (FocusedCharacter != null && !CanSeeCharacter(FocusedCharacter)) { FocusedCharacter = null; }
                         float aimAssist = GameMain.Config.AimAssistAmount * (AnimController.InWater ? 1.5f : 1.0f);
                         if (SelectedItems.Any(it => it?.GetComponent<Wire>()?.IsActive ?? false))
                         {
                             //disable aim assist when rewiring to make it harder to accidentally select items when adding wire nodes
                             aimAssist = 0.0f;
                         }
-                        focusedItem = CanInteract ? FindItemAtPosition(mouseSimPos, aimAssist) : null;
+
+                        var item = FindItemAtPosition(mouseSimPos, aimAssist);
+                        
+                        focusedItem = CanInteract ? item : null;
                         findFocusedTimer = 0.05f;
                     }
                 }
@@ -1964,7 +2051,7 @@ namespace Barotrauma
                     if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
                     {
                         //disable AI characters that are far away from all clients and the host's character and not controlled by anyone
-                        if (c == Controlled || c.IsRemotePlayer)
+                        if (c.IsPlayer || (c.IsBot && !c.IsDead))
                         {
                             c.Enabled = true;
                         }
@@ -2182,11 +2269,12 @@ namespace Barotrauma
             lowPassMultiplier = MathHelper.Lerp(lowPassMultiplier, 1.0f, 0.1f);
 
             //ragdoll button
-            if (IsRagdolled)
+            if (IsRagdolled || !CanMove)
             {
-                if (AnimController is HumanoidAnimController) ((HumanoidAnimController)AnimController).Crouching = false;
-                /*if(GameMain.Server != null)
-                    GameMain.Server.CreateEntityEvent(this, new object[] { NetEntityEvent.Type.Status });*/
+                if (AnimController is HumanoidAnimController) 
+                { 
+                    ((HumanoidAnimController)AnimController).Crouching = false; 
+                }
                 AnimController.ResetPullJoints();
                 SelectedConstruction = null;
                 return;
@@ -2209,7 +2297,7 @@ namespace Barotrauma
                 SelectedConstruction = null;
             }
 
-            if (!IsDead) LockHands = false;
+            if (!IsDead) { LockHands = false; }
         }
 
         partial void UpdateControlled(float deltaTime, Camera cam);
@@ -2295,9 +2383,12 @@ namespace Barotrauma
 
             if (!IsDead) { return; }
 
-            if (Submarine != null && CharacterList.Count(c => c.IsDead && c.Submarine == Submarine) < GameMain.Config.CorpsesPerSubDespawnThreshold)
+            int subCorpseCount = 0;
+
+            if (Submarine != null)
             {
-                return;
+                subCorpseCount = CharacterList.Count(c => c.IsDead && c.Submarine == Submarine);
+                if (subCorpseCount < GameMain.Config.CorpsesPerSubDespawnThreshold) { return; }
             }
 
             float distToClosestPlayer = GetDistanceToClosestPlayer();
@@ -2306,8 +2397,20 @@ namespace Barotrauma
                 //despawn in 1 minute if very far from all human players
                 despawnTimer = Math.Max(despawnTimer, GameMain.Config.CorpseDespawnDelay - 60.0f);
             }
+
+            float despawnPriority = 1.0f;
+            if (subCorpseCount > GameMain.Config.CorpsesPerSubDespawnThreshold)
+            {
+                //despawn faster if there are lots of corpses in the sub (twice as many as the threshold -> despawn twice as fast)
+                despawnPriority += (subCorpseCount - GameMain.Config.CorpsesPerSubDespawnThreshold) / (float)GameMain.Config.CorpsesPerSubDespawnThreshold;
+            }
+            if (AIController is EnemyAIController)
+            {
+                //enemies despawn faster
+                despawnPriority *= 2.0f;
+            }
             
-            despawnTimer += deltaTime;
+            despawnTimer += deltaTime * despawnPriority;
             if (despawnTimer < GameMain.Config.CorpseDespawnDelay) { return; }
 
             if (IsHuman)
@@ -2416,6 +2519,14 @@ namespace Barotrauma
             //set the character order only if the character is close enough to hear the message
             if (orderGiver != null && !CanHearCharacter(orderGiver)) { return; }
 
+            // If there's another character operating the same device, make them dismiss themself
+            if (order != null && order.Category == OrderCategory.Operate)
+            {
+                CharacterList.FindAll(c => c != this && c.TeamID == TeamID && c.CurrentOrder is Order characterOrder && characterOrder.Category == OrderCategory.Operate &&
+                                           characterOrder.Identifier.Equals(order.Identifier) && characterOrder.TargetEntity == order.TargetEntity)?
+                    .ForEach(c => c.SetOrder(Order.GetPrefab("dismissed"), null, c, speak: true));
+            }
+
             if (AIController is HumanAIController humanAI)
             {
                 humanAI.SetOrder(order, orderOption, orderGiver, speak);
@@ -2426,6 +2537,11 @@ namespace Barotrauma
             CurrentOrderOption = orderOption;
         }
 
+        /// <summary>
+        /// Reset order data so it doesn't carry into further rounds, as the AI is "recreated" always in between rounds anyway.
+        /// </summary>
+        public void ResetCurrentOrder() => Info?.ResetCurrentOrder();
+
         private readonly List<AIChatMessage> aiChatMessageQueue = new List<AIChatMessage>();
 
         //key = identifier, value = time the message was sent
@@ -2575,7 +2691,7 @@ namespace Barotrauma
             if (attacker is Character attackingCharacter && attackingCharacter.AIController == null)
             {
                 StringBuilder sb = new StringBuilder();
-                sb.Append(LogName + " attacked by " + attackingCharacter.LogName + ".");
+                sb.Append(GameServer.CharacterLogName(this) + " attacked by " + GameServer.CharacterLogName(attackingCharacter) + ".");
                 if (attackResult.Afflictions != null)
                 {
                     foreach (Affliction affliction in attackResult.Afflictions)
@@ -2588,40 +2704,62 @@ namespace Barotrauma
             }
 #endif
 
-            bool isNotClient = GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient;
-
-            TrySeverLimbJoints(limbHit, attack.SeverLimbsProbability);
+            TrySeverLimbJoints(limbHit, attack.SeverLimbsProbability, attackResult.Damage);
 
             return attackResult;
         }
 
-        public void TrySeverLimbJoints(Limb targetLimb, float severLimbsProbability)
+        public void TrySeverLimbJoints(Limb targetLimb, float severLimbsProbability, float damage)
         {
-            bool isNotClient = GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient;
-
-            if (isNotClient &&
-                IsDead && Rand.Range(0.0f, 1.0f) < severLimbsProbability)
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
+#if DEBUG
+            if (targetLimb.character != this)
             {
-                foreach (LimbJoint joint in AnimController.LimbJoints)
-                {
-                    if (joint.CanBeSevered && (joint.LimbA == targetLimb || joint.LimbB == targetLimb))
-                    {
-#if CLIENT
-                        CurrentHull?.AddDecal("blood", WorldPosition, Rand.Range(0.5f, 1.5f));                       
+                DebugConsole.ThrowError($"{Name} is attempting to sever joints of {targetLimb.character.Name}!");
+                return;
+            }
 #endif
-                        AnimController.SeverLimbJoint(joint);
-
-                        if (joint.LimbA == targetLimb)
-                        {
-                            joint.LimbB.body.LinearVelocity += targetLimb.LinearVelocity * 0.5f;
-                        }
-                        else
-                        {
-                            joint.LimbA.body.LinearVelocity += targetLimb.LinearVelocity * 0.5f;
-                        }
+            if (!IsDead && !targetLimb.CanBeSeveredAlive) { return; }
+            if (damage < targetLimb.Params.MinSeveranceDamage) { return; }
+            bool wasSevered = false;
+            float random = Rand.Value();
+            foreach (LimbJoint joint in AnimController.LimbJoints)
+            {
+                if (!joint.CanBeSevered) { continue; }
+                if (joint.LimbA != targetLimb && joint.LimbB != targetLimb) { continue; }
+                float probability = severLimbsProbability;
+                if (!IsDead)
+                {
+                    probability *= joint.Params.SeveranceProbabilityModifier;
+                }
+                if (probability <= 0) { continue; }
+                if (random > probability) { continue; }
+                bool severed = AnimController.SeverLimbJoint(joint);
+                if (!wasSevered)
+                {
+                    wasSevered = severed;
+                }
+                if (severed)
+                {
+                    if (joint.LimbA == targetLimb)
+                    {
+                        joint.LimbB.body.LinearVelocity += targetLimb.LinearVelocity * 0.5f;
+                    }
+                    else
+                    {
+                        joint.LimbA.body.LinearVelocity += targetLimb.LinearVelocity * 0.5f;
                     }
                 }
             }
+            if (wasSevered)
+            {
+                if (targetLimb.character.AIController is EnemyAIController enemyAI)
+                {
+                    enemyAI.ReevaluateAttacks();
+                }
+                ApplyStatusEffects(ActionType.OnSevered, 1.0f);
+                targetLimb.ApplyStatusEffects(ActionType.OnSevered, 1.0f);
+            }
         }
 
         public AttackResult AddDamage(Vector2 worldPosition, IEnumerable<Affliction> afflictions, float stun, bool playSound, float attackImpulse = 0.0f, Character attacker = null)
@@ -2700,10 +2838,15 @@ namespace Barotrauma
             Vector2 simPos = hitLimb.SimPosition + ConvertUnits.ToSimUnits(dir);
             AttackResult attackResult = hitLimb.AddDamage(simPos, afflictions, playSound);
             CharacterHealth.ApplyDamage(hitLimb, attackResult);
+            ApplyStatusEffects(ActionType.OnDamaged, 1.0f);
+            if (attackResult.Damage > 0)
+            {
+                hitLimb.ApplyStatusEffects(ActionType.OnDamaged, 1.0f);
+            }
             if (attacker != this)
             {
                 OnAttacked?.Invoke(attacker, attackResult);
-                OnAttackedProjSpecific(attacker, attackResult);
+                OnAttackedProjSpecific(attacker, attackResult, stun);
                 if (!wasDead)
                 {
                     TryAdjustAttackerSkill(attacker, -attackResult.Damage);
@@ -2718,7 +2861,7 @@ namespace Barotrauma
             return attackResult;
         }
 
-        partial void OnAttackedProjSpecific(Character attacker, AttackResult attackResult);
+        partial void OnAttackedProjSpecific(Character attacker, AttackResult attackResult, float stun);
 
         public void TryAdjustAttackerSkill(Character attacker, float healthChange)
         {
@@ -2760,6 +2903,7 @@ namespace Barotrauma
             }
         }
 
+        private readonly List<ISerializableEntity> targets = new List<ISerializableEntity>();
         public void ApplyStatusEffects(ActionType actionType, float deltaTime)
         {
             foreach (StatusEffect statusEffect in statusEffects)
@@ -2768,30 +2912,60 @@ namespace Barotrauma
                 if (statusEffect.HasTargetType(StatusEffect.TargetType.NearbyItems) ||
                     statusEffect.HasTargetType(StatusEffect.TargetType.NearbyCharacters))
                 {
-                    var targets = new List<ISerializableEntity>();
+                    targets.Clear();
                     statusEffect.GetNearbyTargets(WorldPosition, targets);
                     statusEffect.Apply(ActionType.OnActive, deltaTime, this, targets);
                 }
                 else
                 {
                     statusEffect.Apply(actionType, deltaTime, this, this);
+                    if (statusEffect.targetLimbs != null)
+                    {
+                        foreach (var limbType in statusEffect.targetLimbs)
+                        {
+                            if (statusEffect.HasTargetType(StatusEffect.TargetType.AllLimbs))
+                            {
+                                // Target all matching limbs
+                                foreach (var limb in AnimController.Limbs)
+                                {
+                                    if (limb.IsSevered) { continue; }
+                                    if (limb.type == limbType)
+                                    {
+                                        statusEffect.Apply(actionType, deltaTime, this, limb);
+                                    }
+                                }
+                            }
+                            else if (statusEffect.HasTargetType(StatusEffect.TargetType.Limb))
+                            {
+                                // Target just the first matching limb
+                                Limb limb = AnimController.GetLimb(limbType);
+                                statusEffect.Apply(actionType, deltaTime, this, limb);
+                            }
+                        }
+                    }
                 }
             }
+            if (actionType != ActionType.OnDamaged && actionType != ActionType.OnSevered)
+            {
+                // OnDamaged is called only for the limb that is hit.
+                AnimController.Limbs.ForEach(l => l.ApplyStatusEffects(actionType, deltaTime));
+            }
         }
 
         private void Implode(bool isNetworkMessage = false)
         {
-            if (CharacterHealth.Unkillable) { return; }
+            if (CharacterHealth.Unkillable || IsDead) { return; }
 
             if (!isNetworkMessage)
             {
-                if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) return;
+                if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
             }
 
-            Kill(CauseOfDeathType.Pressure, null, isNetworkMessage);
-            CharacterHealth.PressureAffliction.Strength = CharacterHealth.PressureAffliction.Prefab.MaxStrength;
-            CharacterHealth.SetAllDamage(200.0f, 0.0f, 0.0f);
-            BreakJoints();
+            CharacterHealth.ApplyAffliction(null, new Affliction(AfflictionPrefab.Pressure, AfflictionPrefab.Pressure.MaxStrength));
+            if (IsDead)
+            {
+                BreakJoints();
+            }
         }
 
         public void BreakJoints()
@@ -2799,6 +2973,7 @@ namespace Barotrauma
             Vector2 centerOfMass = AnimController.GetCenterOfMass();
             foreach (Limb limb in AnimController.Limbs)
             {
+                if (limb.IsSevered) { continue; }
                 limb.AddDamage(limb.SimPosition, 500.0f, 0.0f, 0.0f, false);
 
                 Vector2 diff = centerOfMass - limb.SimPosition;
@@ -2866,7 +3041,10 @@ namespace Barotrauma
                 causeOfDeathAffliction?.Source ?? LastAttacker, LastDamageSource);
             OnDeath?.Invoke(this, CauseOfDeath);
 
-            SteamAchievementManager.OnCharacterKilled(this, CauseOfDeath);
+            if (GameMain.GameSession != null && Screen.Selected == GameMain.GameScreen)
+            {
+                SteamAchievementManager.OnCharacterKilled(this, CauseOfDeath);
+            }
 
             KillProjSpecific(causeOfDeath, causeOfDeathAffliction, log);
 
@@ -3023,13 +3201,13 @@ namespace Barotrauma
         public IEnumerable<AttackContext> GetAttackContexts()
         {
             currentContexts.Clear();
-            if (AnimController.CurrentAnimationParams.IsGroundedAnimation)
+            if (AnimController.InWater)
             {
-                currentContexts.Add(AttackContext.Ground);
+                currentContexts.Add(AttackContext.Water);
             }
             else
             {
-                currentContexts.Add(AttackContext.Water);
+                currentContexts.Add(AttackContext.Ground);
             }
             if (CurrentHull == null)
             {
@@ -3131,5 +3309,15 @@ namespace Barotrauma
             }
             return targetPos;
         }
+
+        public bool IsCaptain => HasJob("captain");
+        public bool IsEngineer => HasJob("engineer");
+        public bool IsMechanic => HasJob("mechanic");
+        public bool IsMedic => HasJob("medicaldoctor");
+        public bool IsOfficer => HasJob("securityofficer");
+        public bool IsAsssitant => HasJob("assistant");
+        public bool IsWatchman => HasJob("watchman");
+
+        public bool HasJob(string identifier) => Info?.Job?.Prefab.Identifier == identifier;
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs

@@ -4,7 +4,7 @@ using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Xml.Linq;
 
@@ -997,6 +997,15 @@ namespace Barotrauma
             faceAttachments = null;
         }
 
+        /// <summary>
+        /// Reset order data so it doesn't carry into further rounds, as the AI is "recreated" always in between rounds anyway.
+        /// </summary>
+        public void ResetCurrentOrder()
+        {
+            CurrentOrder = null;
+            CurrentOrderOption = "";
+        }
+
         public void Remove()
         {
             Character = null;

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterPrefab.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;

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

@@ -19,7 +19,7 @@ namespace Barotrauma
         public virtual float Strength
         {
             get { return _strength; }
-            set { _strength = value; }
+            set { _strength = MathHelper.Clamp(value, 0.0f, Prefab.MaxStrength); }
         }
 
         [Serialize("", true), Editable]
@@ -184,6 +184,8 @@ namespace Barotrauma
             {
                 _strength += currentEffect.StrengthChange * deltaTime * (1f - characterHealth.GetResistance(Prefab.Identifier));
             }
+            // Don't use the property, because its virtual and some afflictions like husk overload it for external use.
+            _strength = MathHelper.Clamp(_strength, 0.0f, Prefab.MaxStrength);
 
             foreach (StatusEffect statusEffect in currentEffect.StatusEffects)
             {

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

@@ -97,13 +97,15 @@ namespace Barotrauma
 
         private void ApplyDamage(float deltaTime, bool applyForce)
         {
+            int limbCount = character.AnimController.Limbs.Count(l => !l.ignoreCollisions && !l.IsSevered);
             foreach (Limb limb in character.AnimController.Limbs)
             {
+                if (limb.IsSevered) { continue; }
                 float random = Rand.Value(Rand.RandSync.Server);
                 huskInfection.Clear();
-                huskInfection.Add(AfflictionPrefab.InternalDamage.Instantiate(random * deltaTime / character.AnimController.Limbs.Length));
+                huskInfection.Add(AfflictionPrefab.InternalDamage.Instantiate(random * 10 * deltaTime / limbCount));
                 character.LastDamageSource = null;
-                float force = applyForce ? random * 0.1f * limb.Mass : 0;
+                float force = applyForce ? random * 0.5f * limb.Mass : 0;
                 character.DamageLimb(limb.WorldPosition, limb, huskInfection, 0, false, force);
             }
         }
@@ -186,18 +188,20 @@ namespace Barotrauma
                 }
             }
 
-            if (character.Inventory.Items.Length != husk.Inventory.Items.Length)
+            if (character.Inventory != null && husk.Inventory != null)
             {
-                string errorMsg = "Failed to move items from the source character's inventory into a husk's inventory (inventory sizes don't match)";
-                DebugConsole.ThrowError(errorMsg);
-                GameAnalyticsManager.AddErrorEventOnce("AfflictionHusk.CreateAIHusk:InventoryMismatch", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
-                yield return CoroutineStatus.Success;
-            }
-
-            for (int i = 0; i < character.Inventory.Items.Length && i < husk.Inventory.Items.Length; i++)
-            {
-                if (character.Inventory.Items[i] == null) continue;
-                husk.Inventory.TryPutItem(character.Inventory.Items[i], i, true, false, null);
+                if (character.Inventory.Items.Length != husk.Inventory.Items.Length)
+                {
+                    string errorMsg = "Failed to move items from the source character's inventory into a husk's inventory (inventory sizes don't match)";
+                    DebugConsole.ThrowError(errorMsg);
+                    GameAnalyticsManager.AddErrorEventOnce("AfflictionHusk.CreateAIHusk:InventoryMismatch", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                    yield return CoroutineStatus.Success;
+                }
+                for (int i = 0; i < character.Inventory.Items.Length && i < husk.Inventory.Items.Length; i++)
+                {
+                    if (character.Inventory.Items[i] == null) continue;
+                    husk.Inventory.TryPutItem(character.Inventory.Items[i], i, true, false, null);
+                }
             }
 
             husk.SetStun(5);
@@ -255,20 +259,19 @@ namespace Barotrauma
                     Limb attachLimb = null;
                     if (matchingAffliction.AttachLimbId > -1)
                     {
-                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => l.Params.ID == matchingAffliction.AttachLimbId);
+                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => !l.IsSevered && l.Params.ID == matchingAffliction.AttachLimbId);
                     }
                     else if (matchingAffliction.AttachLimbName != null)
                     {
-                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => l.Name == matchingAffliction.AttachLimbName);
+                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => !l.IsSevered && l.Name == matchingAffliction.AttachLimbName);
                     }
                     else if (matchingAffliction.AttachLimbType != LimbType.None)
                     {
-                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => l.type == matchingAffliction.AttachLimbType);
+                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => !l.IsSevered && l.type == matchingAffliction.AttachLimbType);
                     }
                     if (attachLimb == null)
                     {
-                        DebugConsole.Log("Attachment limb not defined in the affliction prefab or no matching limb could be found. Using the appendage definition as it is.");
-                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => l.Params.ID == jointParams.Limb1);
+                        attachLimb = ragdoll.Limbs.FirstOrDefault(l => !l.IsSevered && l.Params.ID == jointParams.Limb1);
                     }
                     if (attachLimb != null)
                     {
@@ -286,10 +289,6 @@ namespace Barotrauma
                         ragdoll.AddJoint(jointParams);
                         appendage.Add(huskAppendage);
                     }
-                    else
-                    {
-                        DebugConsole.ThrowError("Attachment limb not found!");
-                    }
                 }
             }
             return appendage;

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

@@ -265,7 +265,8 @@ namespace Barotrauma
         public readonly Sprite Icon;
         public readonly Color[] IconColors;
 
-        private List<Effect> effects = new List<Effect>();
+        private readonly List<Effect> effects = new List<Effect>();
+        public IEnumerable<Effect> Effects => effects;
 
         private readonly string typeName;
 

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

@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using Barotrauma.Extensions;
 using System.Xml.Linq;

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Buffs/BuffDurationIncrease.cs

@@ -1,4 +1,5 @@
 using Microsoft.Xna.Framework;
+using System;
 
 namespace Barotrauma
 {
@@ -19,7 +20,7 @@ namespace Barotrauma
             {
                 foreach (Affliction affliction in afflictions)
                 {
-                    if (!affliction.Prefab.IsBuff || affliction == this || affliction.MultiplierSource != this) continue;
+                    if (!affliction.Prefab.IsBuff || affliction == this || affliction.MultiplierSource != this) { continue; }
                     affliction.MultiplierSource = null;
                     affliction.StrengthDiminishMultiplier = 1f;
                 }
@@ -28,9 +29,9 @@ namespace Barotrauma
             {
                 foreach (Affliction affliction in afflictions)
                 {
-                    if (!affliction.Prefab.IsBuff || affliction == this || affliction.MultiplierSource == this) continue;
+                    if (!affliction.Prefab.IsBuff || affliction == this) { continue; }
                     float multiplier = GetDiminishMultiplier();
-                    if (affliction.StrengthDiminishMultiplier < multiplier) continue;
+                    if (affliction.StrengthDiminishMultiplier < multiplier && affliction.MultiplierSource != this) { continue; }
 
                     affliction.MultiplierSource = this;
                     affliction.StrengthDiminishMultiplier = multiplier;
@@ -40,14 +41,15 @@ namespace Barotrauma
 
         private float GetDiminishMultiplier()
         {
-            if (Strength < Prefab.ActivationThreshold) return 1.0f;
+            if (Strength < Prefab.ActivationThreshold) { return 1.0f; }
             AfflictionPrefab.Effect currentEffect = Prefab.GetActiveEffect(Strength);
-            if (currentEffect == null) return 1.0f;
+            if (currentEffect == null) { return 1.0f; }
 
-            return MathHelper.Lerp(
+            float multiplier = MathHelper.Lerp(
                 currentEffect.MinBuffMultiplier,
                 currentEffect.MaxBuffMultiplier,
                 (Strength - currentEffect.MinStrength) / (currentEffect.MaxStrength - currentEffect.MinStrength));
+            return 1.0f / Math.Max(multiplier, 0.001f);
         }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs

@@ -349,13 +349,16 @@ namespace Barotrauma
         /// Most monsters for example don't have separate healths for different limbs, essentially meaning that every affliction is applied to every limb.</param>
         public float GetAfflictionStrength(string afflictionType, Limb limb, bool requireLimbSpecific)
         {
-            if (requireLimbSpecific && limbHealths.Count == 1) return 0.0f;
+            if (requireLimbSpecific && limbHealths.Count == 1) { return 0.0f; }
 
             float strength = 0.0f;
             foreach (Affliction affliction in limbHealths[limb.HealthIndex].Afflictions)
             {
-                if (affliction.Strength < affliction.Prefab.ActivationThreshold) continue;
-                if (affliction.Prefab.AfflictionType == afflictionType) strength += affliction.Strength;
+                if (affliction.Strength < affliction.Prefab.ActivationThreshold) { continue; }
+                if (affliction.Prefab.AfflictionType == afflictionType)
+                {
+                    strength += affliction.Strength;
+                }
             }
             return strength;
         }
@@ -365,17 +368,23 @@ namespace Barotrauma
             float strength = 0.0f;
             foreach (Affliction affliction in afflictions)
             {
-                if (affliction.Strength < affliction.Prefab.ActivationThreshold) continue;
-                if (affliction.Prefab.AfflictionType == afflictionType) strength += affliction.Strength;
+                if (affliction.Strength < affliction.Prefab.ActivationThreshold) { continue; }
+                if (affliction.Prefab.AfflictionType == afflictionType)
+                {
+                    strength += affliction.Strength;
+                }
             }
-            if (!allowLimbAfflictions) return strength;
+            if (!allowLimbAfflictions) { return strength; }
 
             foreach (LimbHealth limbHealth in limbHealths)
             {
                 foreach (Affliction affliction in limbHealth.Afflictions)
                 {
-                    if (affliction.Strength < affliction.Prefab.ActivationThreshold) continue;
-                    if (affliction.Prefab.AfflictionType == afflictionType) strength += affliction.Strength;
+                    if (affliction.Strength < affliction.Prefab.ActivationThreshold) { continue; }
+                    if (affliction.Prefab.AfflictionType == afflictionType)
+                    {
+                        strength += affliction.Strength;
+                    }
                 }
             }
 
@@ -419,11 +428,11 @@ namespace Barotrauma
             return resistance;
         }
 
-        private List<Affliction> matchingAfflictions = new List<Affliction>();
+        private readonly List<Affliction> matchingAfflictions = new List<Affliction>();
         public void ReduceAffliction(Limb targetLimb, string affliction, float amount)
         {
             matchingAfflictions.Clear();
-
+            matchingAfflictions.AddRange(afflictions);
             if (targetLimb != null)
             {
                 matchingAfflictions.AddRange(limbHealths[targetLimb.HealthIndex].Afflictions);
@@ -506,6 +515,27 @@ namespace Barotrauma
             if (Vitality <= MinVitality) { Kill(); }
         }
 
+        public float GetLimbDamage(Limb limb)
+        {
+            float damageStrength;
+            if (limb.IsSevered)
+            {
+                return 1;
+            }
+            else
+            {
+                // Instead of using the limbhealth count here, I think it's best to define the max vitality per limb roughly with a constant value.
+                // Therefore with e.g. 80 health, the max damage per limb would be 20.
+                // Having at least 20 damage on both legs would cause maximum limping.
+                float max = MaxVitality / 4;
+                float damage = GetAfflictionStrength("damage", limb, true);
+                float bleeding = GetAfflictionStrength("bleeding", limb, true);
+                float burn = GetAfflictionStrength("burn", limb, true);
+                damageStrength = Math.Min(damage + bleeding + burn, max);
+                return damageStrength / max;
+            }
+        }
+
         public void RemoveAllAfflictions()
         {
             foreach (LimbHealth limbHealth in limbHealths)
@@ -523,7 +553,7 @@ namespace Barotrauma
 
         private void AddLimbAffliction(Limb limb, Affliction newAffliction)
         {
-            if (!newAffliction.Prefab.LimbSpecific || limb == null) return;
+            if (!newAffliction.Prefab.LimbSpecific || limb == null) { return; }
             if (limb.HealthIndex < 0 || limb.HealthIndex >= limbHealths.Count)
             {
                 DebugConsole.ThrowError("Limb health index out of bounds. Character\"" + Character.Name +
@@ -535,8 +565,8 @@ namespace Barotrauma
 
         private void AddLimbAffliction(LimbHealth limbHealth, Affliction newAffliction)
         {
-            if (!DoesBleed && newAffliction is AfflictionBleeding) return;
-            if (!Character.NeedsOxygen && newAffliction.Prefab == AfflictionPrefab.OxygenLow) return;
+            if (!DoesBleed && newAffliction is AfflictionBleeding) { return; }
+            if (!Character.NeedsOxygen && newAffliction.Prefab == AfflictionPrefab.OxygenLow) { return; }
 
             foreach (Affliction affliction in limbHealth.Afflictions)
             {
@@ -545,7 +575,10 @@ namespace Barotrauma
                     affliction.Strength = Math.Min(affliction.Prefab.MaxStrength, affliction.Strength + (newAffliction.Strength * (100.0f / MaxVitality) * (1f - GetResistance(affliction.Prefab.Identifier))));
                     affliction.Source = newAffliction.Source;
                     CalculateVitality();
-                    if (Vitality <= MinVitality) Kill();
+                    if (Vitality <= MinVitality)
+                    {
+                        Kill();
+                    }
                     return;
                 }
             }
@@ -560,7 +593,10 @@ namespace Barotrauma
             Character.HealthUpdateInterval = 0.0f;
 
             CalculateVitality();
-            if (Vitality <= MinVitality) Kill();
+            if (Vitality <= MinVitality)
+            {
+                Kill();
+            }
 #if CLIENT
             selectedLimbIndex = -1;
 #endif
@@ -894,10 +930,7 @@ namespace Barotrauma
 
         partial void RemoveProjSpecific();
 
-        /// <summary>
-        /// Automatically filters out buffs.
-        /// </summary>
-        public static IEnumerable<Affliction> SortAfflictionsBySeverity(IEnumerable<Affliction> afflictions) =>
-            afflictions.Where(a => !a.Prefab.IsBuff).OrderByDescending(a => a.DamagePerSecond).ThenByDescending(a => a.Strength);
+        public static IEnumerable<Affliction> SortAfflictionsBySeverity(IEnumerable<Affliction> afflictions, bool excludeBuffs = true) =>
+            afflictions.Where(a => !excludeBuffs || !a.Prefab.IsBuff).OrderByDescending(a => a.DamagePerSecond).ThenByDescending(a => a.Strength);
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/DamageModifier.cs

@@ -19,6 +19,13 @@ namespace Barotrauma
             private set;
         }
 
+        [Serialize(1.0f, false), Editable(DecimalCount = 2, MinValueFloat = 0, MaxValueFloat = 1)]
+        public float ProbabilityMultiplier
+        {
+            get;
+            private set;
+        }
+
         [Serialize("0.0,360", false), Editable]
         public Vector2 ArmorSector
         {

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/Job.cs

@@ -80,8 +80,8 @@ namespace Barotrauma
 
         public float GetSkillLevel(string skillIdentifier)
         {
+            if (string.IsNullOrWhiteSpace(skillIdentifier)) { return 0.0f; }
             skills.TryGetValue(skillIdentifier, out Skill skill);
-
             return (skill == null) ? 0.0f : skill.Level;
         }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/JobPrefab.cs

@@ -64,7 +64,7 @@ namespace Barotrauma
         public readonly Dictionary<int, List<string>> ItemIdentifiers = new Dictionary<int, List<string>>();
         public readonly Dictionary<int, Dictionary<string, bool>> ShowItemPreview = new Dictionary<int, Dictionary<string, bool>>();
         public readonly List<SkillPrefab> Skills = new List<SkillPrefab>();
-        public readonly List<AutonomousObjective> AutomaticOrders = new List<AutonomousObjective>();
+        public readonly List<AutonomousObjective> AutonomousObjective = new List<AutonomousObjective>();
         public readonly List<string> AppropriateOrders = new List<string>();
 
         [Serialize("1,1,1,1", false)]
@@ -198,7 +198,7 @@ namespace Barotrauma
                         }
                         break;
                     case "autonomousobjectives":
-                        subElement.Elements().ForEach(order => AutomaticOrders.Add(new AutonomousObjective(order)));
+                        subElement.Elements().ForEach(order => AutonomousObjective.Add(new AutonomousObjective(order)));
                         break;
                     case "appropriateobjectives":
                     case "appropriateorders":

Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs

@@ -166,10 +166,20 @@ namespace Barotrauma
                 if (isSevered)
                 {
                     ragdoll.SubtractMass(this);
+                    if (type == LimbType.Head)
+                    {
+                        character.Kill(CauseOfDeathType.Unknown, null);
+                    }
+                }
+                else
+                {
+                    severedFadeOutTimer = 0.0f;
                 }
-                if (!isSevered) severedFadeOutTimer = 0.0f;
 #if CLIENT
-                if (isSevered) damageOverlayStrength = 100.0f;
+                if (isSevered)
+                {
+                    damageOverlayStrength = 100.0f;
+                }
 #endif
             }
         }
@@ -366,12 +376,42 @@ namespace Barotrauma
 
         public string Name => Params.Name;
 
+        // Exposed for status effects
+        public bool IsDead => character.IsDead;
+
+        public bool CanBeSeveredAlive
+        {
+            get
+            {
+                if (character.IsHumanoid) { return false; }
+                if (this == character.AnimController.MainLimb) { return false; }
+                if (character.AnimController.CanWalk)
+                {
+                    switch (type)
+                    {
+                        case LimbType.LeftFoot:
+                        case LimbType.RightFoot:
+                        case LimbType.LeftLeg:
+                        case LimbType.RightLeg:
+                        case LimbType.LeftThigh:
+                        case LimbType.RightThigh:
+                        case LimbType.Legs:
+                        case LimbType.Waist:
+                            return false;
+                    }
+                }
+                return true;
+            }
+        }
+
         public Dictionary<string, SerializableProperty> SerializableProperties
         {
             get;
             private set;
         }
 
+        private readonly List<StatusEffect> statusEffects = new List<StatusEffect>();
+
         public Limb(Ragdoll ragdoll, Character character, LimbParams limbParams)
         {
             this.ragdoll = ragdoll;
@@ -434,6 +474,9 @@ namespace Barotrauma
                     case "damagemodifier":
                         DamageModifiers.Add(new DamageModifier(subElement, character.Name));
                         break;
+                    case "statuseffect":
+                        statusEffects.Add(StatusEffect.Load(subElement, Name));
+                        break;
                 }
             }
 
@@ -471,43 +514,60 @@ namespace Barotrauma
             return AddDamage(simPosition, afflictions, playSound);
         }
 
+        private readonly List<DamageModifier> appliedDamageModifiers = new List<DamageModifier>();
+        private readonly List<Affliction> afflictionsCopy = new List<Affliction>();
         public AttackResult AddDamage(Vector2 simPosition, IEnumerable<Affliction> afflictions, bool playSound)
         {
-            List<DamageModifier> appliedDamageModifiers = new List<DamageModifier>();
-            //create a copy of the original affliction list to prevent modifying the afflictions of an Attack/StatusEffect etc
-            var afflictionsCopy = afflictions.Where(a => Rand.Range(0.0f, 1.0f) <= a.Probability).ToList();
-            for (int i = 0; i < afflictionsCopy.Count; i++)
+            appliedDamageModifiers.Clear();
+            afflictionsCopy.Clear();
+            foreach (var affliction in afflictions)
             {
+                var newAffliction = affliction;
+                float random = Rand.Value(Rand.RandSync.Unsynced);
+                if (random > affliction.Probability) { continue; }
+                bool applyAffliction = true;
                 foreach (DamageModifier damageModifier in DamageModifiers)
                 {
-                    if (!damageModifier.MatchesAffliction(afflictionsCopy[i])) continue;
+                    if (!damageModifier.MatchesAffliction(affliction)) { continue; }
+                    if (random > affliction.Probability * damageModifier.ProbabilityMultiplier)
+                    {
+                        applyAffliction = false;
+                        continue;
+                    }
                     if (SectorHit(damageModifier.ArmorSectorInRadians, simPosition))
                     {
-                        afflictionsCopy[i] = afflictionsCopy[i].CreateMultiplied(damageModifier.DamageMultiplier);
+                        newAffliction = affliction.CreateMultiplied(damageModifier.DamageMultiplier);
                         appliedDamageModifiers.Add(damageModifier);
                     }
                 }
-
                 foreach (WearableSprite wearable in wearingItems)
                 {
                     foreach (DamageModifier damageModifier in wearable.WearableComponent.DamageModifiers)
                     {
-                        if (!damageModifier.MatchesAffliction(afflictionsCopy[i])) continue;
+                        if (!damageModifier.MatchesAffliction(affliction)) { continue; }
+                        if (random > affliction.Probability * damageModifier.ProbabilityMultiplier)
+                        {
+                            applyAffliction = false;
+                            continue;
+                        }
                         if (SectorHit(damageModifier.ArmorSectorInRadians, simPosition))
                         {
-                            afflictionsCopy[i] = afflictionsCopy[i].CreateMultiplied(damageModifier.DamageMultiplier);
+                            newAffliction = affliction.CreateMultiplied(damageModifier.DamageMultiplier);
                             appliedDamageModifiers.Add(damageModifier);
                         }
                     }
                 }
+                if (applyAffliction)
+                {
+                    afflictionsCopy.Add(newAffliction);
+                }
             }
-
-            AddDamageProjSpecific(simPosition, afflictionsCopy, playSound, appliedDamageModifiers);
-
-            return new AttackResult(afflictionsCopy, this, appliedDamageModifiers);
+            var result = new AttackResult(afflictionsCopy, this, appliedDamageModifiers);
+            AddDamageProjSpecific(playSound, result);
+            return result;
         }
 
-        partial void AddDamageProjSpecific(Vector2 simPosition, List<Affliction> afflictions, bool playSound, List<DamageModifier> appliedDamageModifiers);
+        partial void AddDamageProjSpecific(bool playSound, AttackResult result);
 
         public bool SectorHit(Vector2 armorSector, Vector2 simPosition)
         {
@@ -564,7 +624,8 @@ namespace Barotrauma
         public bool UpdateAttack(float deltaTime, Vector2 attackSimPos, IDamageable damageTarget, out AttackResult attackResult, float distance = -1, Limb targetLimb = null)
         {
             attackResult = default(AttackResult);
-            float dist = distance > -1 ? distance : ConvertUnits.ToDisplayUnits(Vector2.Distance(SimPosition, attackSimPos));
+            Vector2 simPos = ragdoll.SimplePhysicsEnabled ? character.SimPosition : SimPosition;
+            float dist = distance > -1 ? distance : ConvertUnits.ToDisplayUnits(Vector2.Distance(simPos, attackSimPos));
             bool wasRunning = attack.IsRunning;
             attack.UpdateAttackTimer(deltaTime);
 
@@ -577,7 +638,7 @@ namespace Barotrauma
                     case HitDetection.Distance:
                         if (dist < attack.DamageRange)
                         {
-                            structureBody = Submarine.PickBody(SimPosition, attackSimPos, collisionCategory: Physics.CollisionWall | Physics.CollisionLevel, allowInsideFixture: true);                            
+                            structureBody = Submarine.PickBody(simPos, attackSimPos, collisionCategory: Physics.CollisionWall | Physics.CollisionLevel, allowInsideFixture: true);                            
                             if (damageTarget is Item i && i.GetComponent<Items.Components.Door>() != null)
                             {
                                 // If the attack is aimed to an item and hits an item, it's successful.
@@ -646,33 +707,19 @@ namespace Barotrauma
 
             if (wasHit)
             {
-                bool playSound = false;
-#if CLIENT
-                playSound = LastAttackSoundTime < Timing.TotalTime - SoundInterval;
-                if (playSound)
+                if (character == Character.Controlled || GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
                 {
-                    LastAttackSoundTime = SoundInterval;
+                    ExecuteAttack(damageTarget, targetLimb, out attackResult);
                 }
+#if SERVER
+                GameMain.NetworkMember.CreateEntityEvent(character, new object[] 
+                { 
+                    NetEntityEvent.Type.ExecuteAttack, 
+                    this, 
+                    (damageTarget as Entity)?.ID ?? Entity.NullEntityID, 
+                    damageTarget is Character && targetLimb != null ? Array.IndexOf(((Character)damageTarget).AnimController.Limbs, targetLimb) : 0
+                });   
 #endif
-                if (damageTarget is Character targetCharacter && targetLimb != null)
-                {
-                    attackResult = attack.DoDamageToLimb(character, targetLimb, WorldPosition, 1.0f, playSound);
-                }
-                else
-                {
-                    attackResult = attack.DoDamage(character, damageTarget, WorldPosition, 1.0f, playSound);
-                }
-                if (structureBody != null && attack.StickChance > Rand.Range(0.0f, 1.0f, Rand.RandSync.Server))
-                {
-                    // TODO: use the hit pos?
-                    var localFront = body.GetLocalFront(Params.GetSpriteOrientation());
-                    var from = body.FarseerBody.GetWorldPoint(localFront);
-                    var to = from;
-                    var drawPos = body.DrawPosition;
-                    StickTo(structureBody, from, to);
-                }
-                attack.ResetAttackTimer();
-                attack.SetCoolDown();
             }
 
             Vector2 diff = attackSimPos - SimPosition;
@@ -685,6 +732,7 @@ namespace Barotrauma
                     {
                         if (limbIndex < 0 || limbIndex >= character.AnimController.Limbs.Length) { continue; }
                         Limb limb = character.AnimController.Limbs[limbIndex];
+                        if (limb.IsSevered) { continue; }
                         diff = attackSimPos - limb.SimPosition;
                         if (diff == Vector2.Zero) { continue; }
                         limb.body.ApplyTorque(limb.Mass * character.AnimController.Dir * attack.Torque * limb.Params.AttackForceMultiplier);
@@ -705,11 +753,49 @@ namespace Barotrauma
             if (!attack.IsRunning)
             {
                 // Set the main collider where the body lands after the attack
-                character.AnimController.Collider.SetTransform(character.AnimController.MainLimb.body.SimPosition, rotation: 0);
+                character.AnimController.Collider.SetTransform(character.AnimController.MainLimb.body.SimPosition, rotation: character.AnimController.Collider.Rotation);
             }
             return wasHit;
         }
 
+        public void ExecuteAttack(IDamageable damageTarget, Limb targetLimb, out AttackResult attackResult)
+        {
+            bool playSound = false;
+#if CLIENT
+            playSound = LastAttackSoundTime < Timing.TotalTime - SoundInterval;
+            if (playSound)
+            {
+                LastAttackSoundTime = SoundInterval;
+            }
+#endif
+            if (damageTarget is Character targetCharacter && targetLimb != null)
+            {
+                attackResult = attack.DoDamageToLimb(character, targetLimb, WorldPosition, 1.0f, playSound);
+            }
+            else
+            {
+                if (damageTarget is Item targetItem && !targetItem.Prefab.DamagedByMonsters)
+                {
+                    attackResult = new AttackResult();
+                }
+                else
+                {
+                    attackResult = attack.DoDamage(character, damageTarget, WorldPosition, 1.0f, playSound);
+                }
+            }
+            /*if (structureBody != null && attack.StickChance > Rand.Range(0.0f, 1.0f, Rand.RandSync.Server))
+            {
+                // TODO: use the hit pos?
+                var localFront = body.GetLocalFront(Params.GetSpriteOrientation());
+                var from = body.FarseerBody.GetWorldPoint(localFront);
+                var to = from;
+                var drawPos = body.DrawPosition;
+                StickTo(structureBody, from, to);
+            }*/
+            attack.ResetAttackTimer();
+            attack.SetCoolDown();
+        }
+
         private WeldJoint attachJoint;
         private WeldJoint colliderJoint;
         public bool IsStuck => attachJoint != null;
@@ -769,6 +855,30 @@ namespace Barotrauma
             }
         }
 
+        private readonly List<ISerializableEntity> targets = new List<ISerializableEntity>();
+        public void ApplyStatusEffects(ActionType actionType, float deltaTime)
+        {
+            foreach (StatusEffect statusEffect in statusEffects)
+            {
+                if (statusEffect.type != actionType) { continue; }
+                if (statusEffect.HasTargetType(StatusEffect.TargetType.NearbyItems) ||
+                    statusEffect.HasTargetType(StatusEffect.TargetType.NearbyCharacters))
+                {
+                    targets.Clear();
+                    statusEffect.GetNearbyTargets(WorldPosition, targets);
+                    statusEffect.Apply(ActionType.OnActive, deltaTime, character, targets);
+                }
+                else
+                {
+                    if (statusEffect.HasTargetType(StatusEffect.TargetType.Character))
+                    {
+                        statusEffect.Apply(actionType, deltaTime, character, character, WorldPosition);
+                    }
+                    statusEffect.Apply(actionType, deltaTime, character, this, WorldPosition);
+                }
+            }
+        }
+
         public void Remove()
         {
             body?.Remove();

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/AnimationParams.cs

@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
+using Barotrauma.IO;
 using System;
 using System.Linq;
 using System.Xml.Linq;

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/FishAnimations.cs

@@ -72,6 +72,12 @@ namespace Barotrauma
         [Editable, Serialize(true, true, description: "Should the character be flipped depending on which direction it faces. Should usually be enabled on all characters that have distinctive upper and lower sides.")]
         public bool Flip { get; set; }
 
+        [Serialize(1f, true, description: "Reduces continuous flipping when the character abruptly changes direction."), Editable]
+        public float FlipCooldown { get; set; }
+
+        [Serialize(0.5f, true, description: "How much it takes before the character flips. The timer starts when the character starts to move in the different direction."), Editable]
+        public float FlipDelay { get; set; }
+
         [Serialize(10.0f, true, description: "How much force is used to move the head to the correct position."), Editable(MinValueFloat = 0, MaxValueFloat = 100)]
         public float HeadMoveForce { get; set; }
 
@@ -146,9 +152,18 @@ namespace Barotrauma
         [Editable, Serialize(true, true, description: "Should the character be flipped depending on which direction it faces. Should usually be enabled on all characters that have distinctive upper and lower sides.")]
         public bool Flip { get; set; }
 
+        [Serialize(1f, true, description: "Reduces continuous flipping when the character abruptly changes direction."), Editable]
+        public float FlipCooldown { get; set; }
+
+        [Serialize(0.5f, true, description: "How much it takes before the character flips. The timer starts when the character starts to move in the different direction."), Editable]
+        public float FlipDelay { get; set; }
+
         [Editable, Serialize(true, true, description: "If enabled, the character will simply be mirrored horizontally when it wants to turn around. If disabled, it will rotate itself to face the other direction.")]
         public bool Mirror { get; set; }
 
+        [Editable, Serialize(true, true, description: "Disabling this will make mirroring instantaneous.")]
+        public bool MirrorLerp { get; set; }
+
         [Serialize(5f, true), Editable]
         public float WaveAmplitude { get; set; }
 
@@ -205,7 +220,6 @@ namespace Barotrauma
 
     interface IFishAnimation
     {
-        bool Flip { get; set; }
         string FootAngles { get; set; }
         Dictionary<int, float> FootAnglesInRadians { get; set; }
         float TailAngle { get; set; }
@@ -214,5 +228,8 @@ namespace Barotrauma
         float TorsoTorque { get; set; }
         float TailTorque { get; set; }
         float FootTorque { get; set; }
+        bool Flip { get; set; }
+        float FlipCooldown { get; set; }
+        float FlipDelay { get; set; }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs

@@ -25,10 +25,10 @@ namespace Barotrauma
         [Serialize("", true, description: "If defined, different species of the same group are considered like the characters of the same species by the AI."), Editable]
         public string Group { get; private set; }
 
-        [Serialize(false, true), Editable]
+        [Serialize(false, true), Editable(ReadOnly = true)]
         public bool Humanoid { get; private set; }
 
-        [Serialize(false, true), Editable]
+        [Serialize(false, true), Editable(ReadOnly = true)]
         public bool HasInfo { get; private set; }
 
         [Serialize(false, true), Editable]
@@ -43,24 +43,36 @@ namespace Barotrauma
         [Serialize(false, true, description: "Can the creature live without water or does it die on dry land?"), Editable]
         public bool NeedsWater { get; set; }
 
-        [Serialize(false, true), Editable]
+        [Serialize(false, false), Editable]
         public bool CanSpeak { get; set; }
 
-        [Serialize(100f, true, description: "How much noise the character makes when moving?"), Editable(minValue: 0f, maxValue: 1000f)]
+        [Serialize(100f, true, description: "How much noise the character makes when moving?"), Editable(minValue: 0f, maxValue: 10000f)]
         public float Noise { get; set; }
 
-        [Serialize(100f, true, description: "How visible the character is?"), Editable(minValue: 0f, maxValue: 1000f)]
+        [Serialize(100f, true, description: "How visible the character is?"), Editable(minValue: 0f, maxValue: 10000f)]
         public float Visibility { get; set; }
 
         [Serialize("blood", true), Editable]
         public string BloodDecal { get; private set; }
 
+        [Serialize("blooddrop", true), Editable]
+        public string BleedParticleAir { get; private set; }
+
+        [Serialize("waterblood", true), Editable]
+        public string BleedParticleWater { get; private set; }
+
         [Serialize(10f, true, description: "How effectively/easily the character eats other characters. Affects the forces, the amount of particles, and the time required before the target is eaten away"), Editable(MinValueFloat = 1, MaxValueFloat = 1000, ValueStep = 1)]
         public float EatingSpeed { get; set; }
 
         [Serialize(1f, true, "Decreases the intensive path finding call frequency. Set to a lower value for insignificant creatures to improve performance."), Editable(minValue: 0f, maxValue: 1f)]
         public float PathFinderPriority { get; set; }
 
+        [Serialize(false, true), Editable]
+        public bool HideInSonar { get; set; }
+
+        [Serialize(0f, true), Editable]
+        public float SonarDisruption { get; set; }
+
         public readonly string File;
 
         public readonly List<SubParam> SubParams = new List<SubParam>();
@@ -465,8 +477,11 @@ namespace Barotrauma
             [Serialize(true, true, description: "Enforce aggressive behavior if the creature is spawned as a target of a monster mission."), Editable()]
             public bool EnforceAggressiveBehaviorForMissions { get; private set; }
 
-            [Serialize(false, true, description: "Should the character target or ignore walls when it's inside the submarine. Doesn't have any effect if no target priority for walls is defined."), Editable()]
-            public bool TargetInnerWalls { get; private set; }
+            [Serialize(true, true, description: "Should the character target or ignore walls when it's outside the submarine. Doesn't have any effect if no target priority for walls is defined."), Editable()]
+            public bool TargetOuterWalls { get; private set; }
+
+            [Serialize(false, true, description: "If enabled, the character chooses randomly from the available attacks. The priority is used as a weight for weighted random."), Editable()]
+            public bool RandomAttack { get; private set; }
 
             // TODO: latchonto, swarming
 

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/EditableParams.cs

@@ -1,8 +1,12 @@
-using System.IO;
-using System.Collections.Generic;
-using System.Xml;
+using System.Collections.Generic;
 using System.Xml.Linq;
 using Microsoft.Xna.Framework;
+#if DEBUG
+using System.IO;
+using System.Xml;
+#else
+using Barotrauma.IO;
+#endif
 
 namespace Barotrauma
 {
@@ -75,7 +79,7 @@ namespace Barotrauma
             Folder = Path.GetDirectoryName(FullPath);
         }
 
-        public virtual bool Save(string fileNameWithoutExtension = null, XmlWriterSettings settings = null)
+        public virtual bool Save(string fileNameWithoutExtension = null, System.Xml.XmlWriterSettings settings = null)
         {
             if (!Directory.Exists(Folder))
             {
@@ -85,7 +89,7 @@ namespace Barotrauma
             Serialize();
             if (settings == null)
             {
-                settings = new XmlWriterSettings
+                settings = new System.Xml.XmlWriterSettings
                 {
                     Indent = true,
                     OmitXmlDeclaration = true,

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Ragdoll/RagdollParams.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
 using System.Linq;
-using System.IO;
+using Barotrauma.IO;
 using System.Xml;
 using Barotrauma.Extensions;
 #if CLIENT
@@ -470,6 +470,12 @@ namespace Barotrauma
             [Serialize(true, true), Editable]
             public bool CanBeSevered { get; set; }
 
+            [Serialize(1f, true, description:"Modifies the severance probability (defined per item/attack) when the character is alive. Currently only affects limbs of type None, Shield, or Tail on non-humanoid ragdolls. Also note that if CanBeSevered is false, this property doesn't have any effect."), Editable(MinValueFloat = 0, MaxValueFloat = 10, ValueStep = 0.1f, DecimalCount = 2)]
+            public float SeveranceProbabilityModifier { get; set; }
+
+            [Serialize("gore", true), Editable]
+            public string BreakSound { get; set; }
+
             [Serialize(true, true), Editable]
             public bool LimitEnabled { get; set; }
 
@@ -605,7 +611,11 @@ namespace Barotrauma
             [Serialize(1f, true), Editable(DecimalCount = 2, MinValueFloat = 0, MaxValueFloat = 10)]
             public float AttackForceMultiplier { get; set; }
 
+            [Serialize(1f, true, description:"How much damage must be done by the attack in order to be able to cut off the limb. Note that it's evaluated after the damage modifiers."), Editable(DecimalCount = 0, MinValueFloat = 0, MaxValueFloat = 1000)]
+            public float MinSeveranceDamage { get; set; }
+
             // Non-editable ->
+            // TODO: make read-only
             [Serialize(0, true)]
             public int HealthIndex { get; set; }
 
@@ -813,6 +823,15 @@ namespace Barotrauma
             [Serialize("", true), Editable()]
             public string Texture { get; set; }
 
+            [Serialize("1.0,1.0,1.0,1.0", true), Editable()]
+            public Color Color { get; set; }
+
+            [Serialize("1.0,1.0,1.0,1.0", true, description: "Target color when the character is dead."), Editable()]
+            public Color DeadColor { get; set; }
+
+            [Serialize(0f, true, "How long it takes to fade into the dead color? 0 = Not applied."), Editable(DecimalCount = 1, MinValueFloat = 0, MaxValueFloat = 10)]
+            public float DeadColorTime { get; set; }
+
             public override string Name => "Sprite";
 
             public SpriteParams(XElement element, RagdollParams ragdoll) : base(element, ragdoll) { }
@@ -927,7 +946,7 @@ namespace Barotrauma
             {
                 public override string Name => "Light Texture";
 
-                [Serialize("", true), Editable]
+                [Serialize("Content/Lights/pointlight_bright.png", true), Editable]
                 public string Texture { get; private set; }
 
                 [Serialize("0.5, 0.5", true), Editable(DecimalCount = 2)]

Barotrauma/BarotraumaShared/SharedSource/Characters/SkillSettings.cs

@@ -128,7 +128,7 @@ namespace Barotrauma
 
             if (Current == null)
             {
-                DebugConsole.NewMessage("Now skill settings found in the selected content packages. Using default values.");
+                DebugConsole.NewMessage("No skill settings found in the selected content packages. Using default values.");
                 Current = new SkillSettings(null);
             }
         }

Barotrauma/BarotraumaShared/SharedSource/ContentPackage.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Xml.Linq;
@@ -53,7 +53,7 @@ namespace Barotrauma
         
         //these types of files are included in the MD5 hash calculation,
         //meaning that the players must have the exact same files to play together
-        private static HashSet<ContentType> multiplayerIncompatibleContent = new HashSet<ContentType>
+        public static HashSet<ContentType> MultiplayerIncompatibleContent { get; private set; } = new HashSet<ContentType>
         {
             ContentType.Jobs,
             ContentType.Item,
@@ -67,6 +67,7 @@ namespace Barotrauma
             ContentType.RuinConfig,
             ContentType.Outpost,
             ContentType.Wreck,
+            ContentType.WreckAIConfig,
             ContentType.Afflictions,
             ContentType.Orders,
             ContentType.Corpses
@@ -81,6 +82,7 @@ namespace Barotrauma
             ContentType.Structure,
             ContentType.Outpost,
             ContentType.Wreck,
+            ContentType.WreckAIConfig,
             ContentType.Text,
             ContentType.Executable,
             ContentType.ServerExecutable,
@@ -159,7 +161,7 @@ namespace Barotrauma
 
         public bool HasMultiplayerIncompatibleContent
         {
-            get { return Files.Any(f => multiplayerIncompatibleContent.Contains(f.Type)); }
+            get { return Files.Any(f => MultiplayerIncompatibleContent.Contains(f.Type)); }
         }
 
         private ContentPackage()
@@ -412,7 +414,42 @@ namespace Barotrauma
                 doc.Root.Add(new XElement(file.Type.ToString(), new XAttribute("file", file.Path.CleanUpPathCrossPlatform())));
             }
 
-            doc.Save(filePath);
+            doc.SaveSafe(filePath);
+
+            var packagesToDeselect = List.Where(p => p.Path.CleanUpPath() == Path.CleanUpPath()).ToList();
+            bool reselectPackage = false;
+
+            if (packagesToDeselect.Any())
+            {
+                foreach (var p in packagesToDeselect)
+                {
+                    if (GameMain.Config.SelectedContentPackages.Contains(p))
+                    {
+                        reselectPackage = true;
+                        if (p.CorePackage)
+                        {
+                            GameMain.Config.SelectCorePackage(List.Find(cpp => cpp.CorePackage && !packagesToDeselect.Contains(cpp)));
+                        }
+                        else
+                        {
+                            GameMain.Config.DeselectContentPackage(p);
+                        }
+                    }
+                    List.Remove(p);
+                }
+                List.Add(this);
+                if (reselectPackage)
+                {
+                    if (CorePackage)
+                    {
+                        GameMain.Config.SelectCorePackage(this);
+                    }
+                    else
+                    {
+                        GameMain.Config.SelectContentPackage(this);
+                    }
+                }
+            }
         }
 
         public void CalculateHash(bool logging = false)
@@ -426,7 +463,7 @@ namespace Barotrauma
 
             foreach (ContentFile file in Files)
             {
-                if (!multiplayerIncompatibleContent.Contains(file.Type)) { continue; }
+                if (!MultiplayerIncompatibleContent.Contains(file.Type)) { continue; }
 
                 try
                 {
@@ -537,7 +574,7 @@ namespace Barotrauma
 
             while (true)
             {
-                string temp = System.IO.Path.GetDirectoryName(path);
+                string temp = Barotrauma.IO.Path.GetDirectoryName(path);
                 if (string.IsNullOrEmpty(temp)) { break; }
                 path = temp;
             }
@@ -578,7 +615,7 @@ namespace Barotrauma
                 }
             }
 
-            string[] files = Directory.GetFiles(folder, "*.xml");
+            IEnumerable<string> files = Directory.GetFiles(folder, "*.xml");
 
             List.Clear();
 
@@ -587,12 +624,12 @@ namespace Barotrauma
                 List.Add(new ContentPackage(filePath));
             }
 
-            string[] modDirectories = Directory.GetDirectories("Mods");
+            IEnumerable<string> modDirectories = Directory.GetDirectories("Mods");
             foreach (string modDirectory in modDirectories)
             {
-                if (System.IO.Path.GetFileName(modDirectory.TrimEnd(System.IO.Path.DirectorySeparatorChar)) == "ExampleMod") { continue; }
-                string modFilePath = System.IO.Path.Combine(modDirectory, Steam.SteamManager.MetadataFileName);
-                string copyingFilePath = System.IO.Path.Combine(modDirectory, Steam.SteamManager.CopyIndicatorFileName);
+                if (Barotrauma.IO.Path.GetFileName(modDirectory.TrimEnd(Barotrauma.IO.Path.DirectorySeparatorChar)) == "ExampleMod") { continue; }
+                string modFilePath = Barotrauma.IO.Path.Combine(modDirectory, Steam.SteamManager.MetadataFileName);
+                string copyingFilePath = Barotrauma.IO.Path.Combine(modDirectory, Steam.SteamManager.CopyIndicatorFileName);
                 if (File.Exists(copyingFilePath))
                 {
                     //this mod didn't clean up its copying file; assume it's corrupted and delete it

Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs

@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Text;
 
@@ -678,7 +678,7 @@ namespace Barotrauma
                 NewMessage(Hull.EditFire ? "Fire spawning on" : "Fire spawning off", Color.White);                
             }, isCheat: true));
 
-            commands.Add(new Command("explosion", "explosion [range] [force] [damage] [structuredamage] [emp strength]: Creates an explosion at the position of the cursor.", null, isCheat: true));
+            commands.Add(new Command("explosion", "explosion [range] [force] [damage] [structuredamage] [item damage] [emp strength]: Creates an explosion at the position of the cursor.", null, isCheat: true));
 
             commands.Add(new Command("showseed|showlevelseed", "showseed: Show the seed of the current level.", (string[] args) =>
             {
@@ -692,7 +692,7 @@ namespace Barotrauma
                 }
             },null));
             
-            commands.Add(new Command("teleportsub", "teleportsub [start/end]: Teleport the submarine to the start or end of the level. WARNING: does not take outposts into account, so often leads to physics glitches. Only use for debugging.", (string[] args) =>
+            commands.Add(new Command("teleportsub", "teleportsub [start/end/cursor]: Teleport the submarine to the position of the cursor, or the start or end of the level. WARNING: does not take outposts into account, so often leads to physics glitches. Only use for debugging.", (string[] args) =>
             {
                 if (Submarine.MainSub == null || Level.Loaded == null) return;
 
@@ -975,6 +975,22 @@ namespace Barotrauma
                 }
             }));
 
+            commands.Add(new Command("money", "", args =>
+            {
+                if (args.Length == 0) { return; }
+                if (GameMain.GameSession.GameMode is CampaignMode campaign)
+                {
+                    if (int.TryParse(args[0], out int money))
+                    {
+                        campaign.Money += money;
+                    }
+                    else
+                    {
+                        ThrowError($"\"{args[0]}\" is not a valid numeric value.");
+                    }
+                }
+            }, isCheat: true));
+
             commands.Add(new Command("difficulty|leveldifficulty", "difficulty [0-100]: Change the level difficulty setting in the server lobby.", null));
             
             commands.Add(new Command("autoitemplacerdebug|outfitdebug", "autoitemplacerdebug: Toggle automatic item placer debug info on/off. The automatically placed items are listed in the debug console at the start of a round.", (string[] args) =>

Barotrauma/BarotraumaShared/SharedSource/Enums.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     public enum TransitionMode
     {
@@ -13,4 +9,17 @@ namespace Barotrauma
         EaseOut,
         Exponential
     }
+
+    public enum ActionType
+    {
+        Always, OnPicked, OnUse, OnSecondaryUse,
+        OnWearing, OnContaining, OnContained, OnNotContained,
+        OnActive, OnFailure, OnBroken,
+        OnFire, InWater, NotInWater,
+        OnImpact,
+        OnEating,
+        OnDeath = OnBroken,
+        OnDamaged,
+        OnSevered
+    }
 }

Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs

@@ -1,4 +1,5 @@
-using Microsoft.Xna.Framework;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +10,8 @@ namespace Barotrauma
     {
         const float IntensityUpdateInterval = 5.0f;
 
+        const float CalculateDistanceTraveledInterval = 5.0f;
+
         private Level level;
 
         private readonly List<Sprite> preloadedSprites = new List<Sprite>();
@@ -30,6 +33,11 @@ namespace Barotrauma
 
         private float intensityUpdateTimer;
 
+        private PathFinder pathFinder;
+        private float totalPathLength;
+        private float calculateDistanceTraveledTimer;
+        private float distanceTraveled;
+
         private float avgCrewHealth, avgHullIntegrity, floodingAmount, fireAmount, enemyDanger;
 
         private float roundDuration;
@@ -72,6 +80,10 @@ namespace Barotrauma
             pendingEventSets.Clear();
             selectedEvents.Clear();
 
+            pathFinder = new PathFinder(WayPoint.WayPointList, indoorsSteering: false);
+            var steeringPath = pathFinder.FindPath(ConvertUnits.ToSimUnits(Level.Loaded.StartPosition), ConvertUnits.ToSimUnits(Level.Loaded.EndPosition));
+            totalPathLength = steeringPath.TotalLength;
+
             this.level = level;
             SelectSettings();
 
@@ -137,7 +149,44 @@ namespace Barotrauma
 
         public void PreloadContent(IEnumerable<ContentFile> contentFiles)
         {
-            foreach (ContentFile file in contentFiles)
+            var filesToPreload = new List<ContentFile>(contentFiles);
+            foreach (Submarine sub in Submarine.Loaded)
+            {
+                if (sub.WreckAI == null) { continue; }
+
+                if (!string.IsNullOrEmpty(sub.WreckAI.Config.DefensiveAgent))
+                {
+                    var prefab = CharacterPrefab.FindBySpeciesName(sub.WreckAI.Config.DefensiveAgent);
+                    if (prefab != null && !filesToPreload.Any(f => f.Path == prefab.FilePath))
+                    {
+                        filesToPreload.Add(new ContentFile(prefab.FilePath, ContentType.Character));
+                    }
+                }
+                foreach (Item item in Item.ItemList)
+                {
+                    if (item.Submarine != sub) { continue; }
+                    foreach (Items.Components.ItemComponent component in item.Components)
+                    {
+                        if (component.statusEffectLists == null) { continue; }
+                        foreach (var statusEffectList in component.statusEffectLists.Values)
+                        {
+                            foreach (StatusEffect statusEffect in statusEffectList)
+                            {
+                                foreach (var spawnInfo in statusEffect.SpawnCharacters)
+                                {
+                                    var prefab = CharacterPrefab.FindBySpeciesName(spawnInfo.SpeciesName);
+                                    if (prefab != null && !filesToPreload.Any(f => f.Path == prefab.FilePath))
+                                    {
+                                        filesToPreload.Add(new ContentFile(prefab.FilePath, ContentType.Character));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }                
+            }
+
+            foreach (ContentFile file in filesToPreload)
             {
                 switch (file.Type)
                 {
@@ -225,7 +274,7 @@ namespace Barotrauma
             }
             else if (eventSet.PerWreck)
             {
-                applyCount = Submarine.Loaded.Count(s => s.Info.IsWreck && (s.ThalamusAI == null || !s.ThalamusAI.IsAlive));
+                applyCount = Submarine.Loaded.Count(s => s.Info.IsWreck && (s.WreckAI == null || !s.WreckAI.IsAlive));
             }
             for (int i = 0; i < applyCount; i++)
             {
@@ -299,12 +348,9 @@ namespace Barotrauma
 
         private bool CanStartEventSet(ScriptedEventSet eventSet)
         {
-            float distFromStart = Vector2.Distance(Submarine.MainSub.WorldPosition, level.StartPosition);
-            float distFromEnd = Vector2.Distance(Submarine.MainSub.WorldPosition, level.EndPosition);
-
-            float distanceTraveled = MathHelper.Clamp(
-                (Submarine.MainSub.WorldPosition.X - level.StartPosition.X) / (level.EndPosition.X - level.StartPosition.X),
-                0.0f, 1.0f);
+            ISpatialEntity refEntity = GetRefEntity();
+            float distFromStart = Vector2.Distance(refEntity.WorldPosition, level.StartPosition);
+            float distFromEnd = Vector2.Distance(refEntity.WorldPosition, level.EndPosition);
 
             //don't create new events if within 50 meters of the start/end of the level
             if (!eventSet.AllowAtStart)
@@ -367,6 +413,13 @@ namespace Barotrauma
                 }
             }
 
+            calculateDistanceTraveledTimer -= deltaTime;
+            if (calculateDistanceTraveledTimer <= 0.0f)
+            {
+                distanceTraveled = CalculateDistanceTraveled();
+                calculateDistanceTraveledTimer = CalculateDistanceTraveledInterval;
+            }
+
             eventThreshold += settings.EventThresholdIncrease * deltaTime;
             if (eventCoolDown > 0.0f)
             {
@@ -514,5 +567,62 @@ namespace Barotrauma
                 currentIntensity = MathHelper.Max(0.0025f * IntensityUpdateInterval, targetIntensity);
             }
         }
+
+        private float CalculateDistanceTraveled()
+        {
+            var refEntity = GetRefEntity();
+            Vector2 target = ConvertUnits.ToSimUnits(Level.Loaded.EndPosition);
+            var steeringPath = pathFinder.FindPath(ConvertUnits.ToSimUnits(refEntity.WorldPosition), target);
+            if (steeringPath.Unreachable || float.IsPositiveInfinity(totalPathLength))
+            {
+                //use horizontal position in the level as a fallback if a path can't be found
+                return MathHelper.Clamp((refEntity.WorldPosition.X - level.StartPosition.X) / (level.EndPosition.X - level.StartPosition.X), 0.0f, 1.0f);
+            }
+            else
+            {
+                return MathHelper.Clamp(1.0f - steeringPath.TotalLength / totalPathLength, 0.0f, 1.0f);
+            }
+        }
+
+
+        /// <summary>
+        /// Get the entity that should be used in determining how far the player has progressed in the level.
+        /// = The submarine or player character that has progressed the furthest. 
+        /// </summary>
+        private ISpatialEntity GetRefEntity()
+        {
+            ISpatialEntity refEntity = Submarine.MainSub;
+#if CLIENT
+            if (Character.Controlled != null)
+            {
+                if (Character.Controlled.Submarine != null && 
+                    Character.Controlled.Submarine.Info.Type == SubmarineInfo.SubmarineType.Player)
+                {
+                    refEntity = Character.Controlled.Submarine;
+                }
+                else
+                {
+                    refEntity = Character.Controlled;
+                }
+            }
+#else
+            foreach (Barotrauma.Networking.Client client in GameMain.Server.ConnectedClients)
+            {
+                if (client.Character == null) { continue; }
+                //only take the players inside a player sub into account. 
+                //Otherwise the system could be abused by for example making a respawned player wait
+                //close to the destination outpost
+                if (client.Character.Submarine != null && 
+                    client.Character.Submarine.Info.Type == SubmarineInfo.SubmarineType.Player)
+                {
+                    if (client.Character.Submarine.WorldPosition.X > refEntity.WorldPosition.X)
+                    {
+                        refEntity = client.Character.Submarine;
+                    }
+                }
+            }
+#endif
+            return refEntity;
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Events/EventManagerSettings.cs

@@ -24,8 +24,9 @@ namespace Barotrauma
         public readonly float MinLevelDifficulty = 0.0f;
         public readonly float MaxLevelDifficulty = 100.0f;
 
-        static EventManagerSettings()
+        public static void Init()
         {
+            List.Clear();
             foreach (ContentFile file in GameMain.Instance.GetFilesOfType(ContentType.EventManagerSettings))
             {
                 Load(file);

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/CombatMission.cs

@@ -108,23 +108,6 @@ namespace Barotrauma
             subs[1].SetPosition(subs[1].FindSpawnPos(Level.Loaded.EndPosition));
             subs[1].FlipX();
 
-            //prevent wifi components from communicating between subs
-            List<WifiComponent> wifiComponents = new List<WifiComponent>();
-            foreach (Item item in Item.ItemList)
-            {
-                wifiComponents.AddRange(item.GetComponents<WifiComponent>());
-            }
-            foreach (WifiComponent wifiComponent in wifiComponents)
-            {
-                for (int i = 0; i < 2; i++)
-                {
-                    if (wifiComponent.Item.Submarine == subs[i] || subs[i].ConnectedDockingPorts.ContainsKey(wifiComponent.Item.Submarine))
-                    {
-                        wifiComponent.TeamID = subs[i].TeamID;
-                    }
-                }
-            }
-
             crews = new List<Character>[] { new List<Character>(), new List<Character>() };
 
             foreach (Submarine submarine in Submarine.Loaded)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/MonsterMission.cs

@@ -70,7 +70,7 @@ namespace Barotrauma
                 monsterFiles.Add(new Tuple<string, Point>(monster, new Point(min, max)));
             }
             description = description.Replace("[monster]",
-                TextManager.Get("character." + System.IO.Path.GetFileNameWithoutExtension(monsterFileName)));
+                TextManager.Get("character." + Barotrauma.IO.Path.GetFileNameWithoutExtension(monsterFileName)));
         }
         
         public override void Start(Level level)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/SalvageMission.cs

@@ -1,8 +1,10 @@
-using FarseerPhysics;
+using Barotrauma.Extensions;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
@@ -17,11 +19,14 @@ namespace Barotrauma
         private readonly string containerTag;
 
         private readonly string existingItemTag;
-
-        private bool usedExistingItem;
-
+        
         private readonly bool showMessageWhenPickedUp;
 
+        /// <summary>
+        /// Status effects executed on the target item when the mission starts. A random effect is chosen from each child list.
+        /// </summary>
+        private readonly List<List<StatusEffect>> statusEffects = new List<List<StatusEffect>>();
+
         public override IEnumerable<Vector2> SonarPositions
         {
             get
@@ -71,6 +76,29 @@ namespace Barotrauma
             {
                 spawnPositionType = Level.PositionType.Cave | Level.PositionType.Ruin;
             }
+
+            foreach (XElement element in prefab.ConfigElement.Elements())
+            {
+                switch (element.Name.ToString().ToLowerInvariant())
+                {
+                    case "statuseffect":
+                        {
+                            var newEffect = StatusEffect.Load(element, parentDebugName: prefab.Name);
+                            if (newEffect == null) { continue; }
+                            statusEffects.Add(new List<StatusEffect> { newEffect });
+                            break;
+                        }
+                    case "chooserandom":
+                        statusEffects.Add(new List<StatusEffect>());
+                        foreach (XElement subElement in element.Elements())
+                        {
+                            var newEffect = StatusEffect.Load(subElement, parentDebugName: prefab.Name);
+                            if (newEffect == null) { continue; }
+                            statusEffects.Last().Add(newEffect);
+                        }
+                        break;
+                }
+            }
         }
 
         public override void Start(Level level)
@@ -103,7 +131,9 @@ namespace Barotrauma
                                 if (Submarine.RectContains(worldBorders, it.WorldPosition))
                                 {
                                     item = it;
+#if SERVER
                                     usedExistingItem = true;
+#endif
                                     break;
                                 }
                             }
@@ -118,6 +148,18 @@ namespace Barotrauma
                     item.FindHull();
                 }
 
+                for (int i = 0; i < statusEffects.Count; i++)
+                {
+                    List<StatusEffect> effectList = statusEffects[i];
+                    if (effectList.Count == 0) { continue; }
+                    int effectIndex = Rand.Int(effectList.Count);
+                    var selectedEffect = effectList[effectIndex];
+                    item.ApplyStatusEffect(selectedEffect, selectedEffect.type, deltaTime: 1.0f, worldPosition: item.Position);
+#if SERVER
+                    executedEffectIndices.Add(new Pair<int, int>(i, effectIndex));
+#endif
+                }
+
                 //try to find a container and place the item inside it
                 if (!string.IsNullOrEmpty(containerTag) && item.ParentInventory == null)
                 {
@@ -147,15 +189,23 @@ namespace Barotrauma
 
         public override void Update(float deltaTime)
         {
+            if (item == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("Error in salvage mission " + Prefab.Identifier + " (item was null)");
+#endif
+                return;
+            }
+
             if (IsClient)
             {
-                if (item.ParentInventory != null) { item.body.FarseerBody.BodyType = BodyType.Dynamic; }
+                if (item.ParentInventory != null && item.body != null) { item.body.FarseerBody.BodyType = BodyType.Dynamic; }
                 return;
             }
             switch (State)
             {
                 case 0:
-                    if (item.ParentInventory != null) { item.body.FarseerBody.BodyType = BodyType.Dynamic; }
+                    if (item.ParentInventory != null && item.body != null) { item.body.FarseerBody.BodyType = BodyType.Dynamic; }
                     if (showMessageWhenPickedUp)
                     {
                         if (!(item.ParentInventory?.Owner is Character)) { return; }
@@ -175,7 +225,10 @@ namespace Barotrauma
 
         public override void End()
         {
-            if (item.CurrentHull?.Submarine == null || !item.CurrentHull.Submarine.AtEndPosition || item.Removed) { return; }
+            if (item.CurrentHull?.Submarine == null || (!item.CurrentHull.Submarine.AtEndPosition && !item.CurrentHull.Submarine.AtStartPosition) || item.Removed) 
+            { 
+                return; 
+            }
 
             item?.Remove();
             item = null;

Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs

@@ -118,13 +118,13 @@ namespace Barotrauma
 
         private List<Level.InterestingPosition> GetAvailableSpawnPositions()
         {
-            var availablePositions = Level.Loaded.PositionsOfInterest.FindAll(p => spawnPosType.HasFlag(p.PositionType) && !Level.Loaded.UsedPositions.Contains(p));
+            var availablePositions = Level.Loaded.PositionsOfInterest.FindAll(p => spawnPosType.HasFlag(p.PositionType));
             var removals = new List<Level.InterestingPosition>();
             foreach (var position in availablePositions)
             {
                 if (position.Submarine != null)
                 {
-                    if (position.Submarine.ThalamusAI != null && position.Submarine.ThalamusAI.IsAlive)
+                    if (position.Submarine.WreckAI != null && position.Submarine.WreckAI.IsAlive)
                     {
                         removals.Add(position);
                     }
@@ -169,10 +169,6 @@ namespace Barotrauma
                 if (Rand.Value(Rand.RandSync.Server) > prefab.SpawnProbability)
                 {
                     removedPositions.Add(position);
-                    if (prefab.AllowOnlyOnce)
-                    {
-                        Level.Loaded.UsedPositions.Add(position);
-                    }
                 }
             }
             removedPositions.ForEach(p => availablePositions.Remove(p));
@@ -237,17 +233,15 @@ namespace Barotrauma
                 spawnPos = chosenPosition.Position.ToVector2();
                 if (chosenPosition.Submarine != null || chosenPosition.Ruin != null)
                 {
-                    var spawnPoint = WayPoint.GetRandom(SpawnType.Enemy, sub: chosenPosition.Submarine, useSyncedRand: false);
-                    if (spawnPoint != null)
+                    var spawnPoint = WayPoint.GetRandom(SpawnType.Enemy, sub: chosenPosition.Submarine, ruin: chosenPosition.Ruin, useSyncedRand: false);
+                    if (spawnPoint != null) 
                     {
-                        spawnPos = spawnPoint.WorldPosition;
+                        System.Diagnostics.Debug.Assert(spawnPoint.Submarine == chosenPosition.Submarine);
+                        System.Diagnostics.Debug.Assert(spawnPoint.ParentRuin == chosenPosition.Ruin);
+                        spawnPos = spawnPoint.WorldPosition; 
                     }
                 }
                 spawnPending = true;
-                if (prefab.AllowOnlyOnce)
-                {
-                    Level.Loaded.UsedPositions.Add(chosenPosition);
-                }
             }
         }
 
@@ -276,11 +270,14 @@ namespace Barotrauma
             if (spawnPending)
             {
                 //wait until there are no submarines at the spawnpos
-                foreach (Submarine submarine in Submarine.Loaded)
+                if (spawnPosType == Level.PositionType.MainPath)
                 {
-                    if (submarine.Info.Type != SubmarineInfo.SubmarineType.Player) { continue; }
-                    float minDist = GetMinDistanceToSub(submarine);
-                    if (Vector2.DistanceSquared(submarine.WorldPosition, spawnPos.Value) < minDist * minDist) { return; }
+                    foreach (Submarine submarine in Submarine.Loaded)
+                    {
+                        if (submarine.Info.Type != SubmarineInfo.SubmarineType.Player) { continue; }
+                        float minDist = GetMinDistanceToSub(submarine);
+                        if (Vector2.DistanceSquared(submarine.WorldPosition, spawnPos.Value) < minDist * minDist) { return; }
+                    }
                 }
 
                 //if spawning in a ruin/cave, wait for someone to be close to it to spawning 

Barotrauma/BarotraumaShared/SharedSource/Events/ScriptedEventPrefab.cs

@@ -11,7 +11,6 @@ namespace Barotrauma
         public readonly Type EventType;      
         public readonly string MusicType;
         public readonly float SpawnProbability;
-        public readonly bool AllowOnlyOnce;
         public float Commonness;
 
         public ScriptedEventPrefab(XElement element)
@@ -34,7 +33,6 @@ namespace Barotrauma
             }
             Commonness = element.GetAttributeFloat("commonness", 1.0f);
             SpawnProbability = Math.Clamp(element.GetAttributeFloat("spawnprobability", 1.0f), 0, 1);
-            AllowOnlyOnce = element.GetAttributeBool("allowonlyonce", false);
         }
 
         public ScriptedEvent CreateInstance()

Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs

@@ -32,13 +32,22 @@ namespace Barotrauma.Extensions
 
         public static T GetRandom<T>(this IEnumerable<T> source, Func<T, bool> predicate, Rand.RandSync randSync = Rand.RandSync.Unsynced)
         {
+            if (predicate == null) { return GetRandom(source, randSync); }
             return source.Where(predicate).GetRandom(randSync);
         }
 
         public static T GetRandom<T>(this IEnumerable<T> source, Rand.RandSync randSync = Rand.RandSync.Unsynced)
         {
-            int count = source.Count();
-            return count == 0 ? default(T) : source.ElementAt(Rand.Range(0, count, randSync));
+            if (source is IList<T> list)
+            {
+                int count = list.Count;
+                return count == 0 ? default : list[Rand.Range(0, count, randSync)];
+            }
+            else
+            {
+                int count = source.Count();
+                return count == 0 ? default : source.ElementAt(Rand.Range(0, count, randSync));
+            }
         }
 
         /// <summary>

Barotrauma/BarotraumaShared/SharedSource/FrameCounter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 
 namespace Barotrauma
@@ -42,7 +43,7 @@ namespace Barotrauma
         public float GetAverageElapsedMillisecs(string identifier)
         {
             if (!avgTicksPerFrame.ContainsKey(identifier)) return 0.0f;
-            return avgTicksPerFrame[identifier] / (float)TimeSpan.TicksPerMillisecond;
+            return avgTicksPerFrame[identifier]  * 1000.0f / (float)Stopwatch.Frequency;
         }
 
         public bool Update(double deltaTime)

Barotrauma/BarotraumaShared/SharedSource/GameAnalyticsManager.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Text;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;

Barotrauma/BarotraumaShared/SharedSource/GameSession/AutoItemPlacer.cs

@@ -160,7 +160,7 @@ namespace Barotrauma
             bool success = false;
             if (Rand.Value() > validContainer.Value.SpawnProbability) { return false; }
             // Don't add dangerously reactive materials in thalamus wrecks 
-            if (validContainer.Key.Item.Submarine.ThalamusAI != null && itemPrefab.Tags.Contains("explodesinwater"))
+            if (validContainer.Key.Item.Submarine.WreckAI != null && itemPrefab.Tags.Contains("explodesinwater"))
             {
                 return false;
             }
@@ -174,6 +174,10 @@ namespace Barotrauma
                 }
 
                 var item = new Item(itemPrefab, validContainer.Key.Item.Position, validContainer.Key.Item.Submarine);
+                foreach (WifiComponent wifiComponent in item.GetComponents<WifiComponent>())
+                {
+                    wifiComponent.TeamID = validContainer.Key.Item.Submarine.TeamID;
+                }
                 spawnedItems.Add(item);
 #if SERVER
                 Entity.Spawner.CreateNetworkEvent(item, remove: false);

Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs

@@ -1,4 +1,5 @@
 using Barotrauma.Items.Components;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -20,8 +21,9 @@ namespace Barotrauma
 
     class CargoManager
     {
-        private readonly List<PurchasedItem> purchasedItems;
+        public const int MaxQuantity = 100;
 
+        private readonly List<PurchasedItem> purchasedItems;
         private readonly CampaignMode campaign;
 
         public Action OnItemsChanged;
@@ -115,9 +117,25 @@ namespace Barotrauma
             ItemPrefab containerPrefab = null;
             foreach (PurchasedItem pi in itemsToSpawn)
             {
+                float floorPos = cargoRoom.Rect.Y - cargoRoom.Rect.Height;
+
                 Vector2 position = new Vector2(
                     Rand.Range(cargoRoom.Rect.X + 20, cargoRoom.Rect.Right - 20),
-                    cargoRoom.Rect.Y - cargoRoom.Rect.Height + pi.ItemPrefab.Size.Y / 2);
+                    floorPos);
+
+                //check where the actual floor structure is in case the bottom of the hull extends below it
+                if (Submarine.PickBody(
+                    ConvertUnits.ToSimUnits(new Vector2(position.X, cargoRoom.Rect.Y - cargoRoom.Rect.Height / 2)),
+                    ConvertUnits.ToSimUnits(position),
+                    collisionCategory: Physics.CollisionWall) != null)
+                {
+                    float floorStructurePos = ConvertUnits.ToDisplayUnits(Submarine.LastPickedPosition.Y);
+                    if (floorStructurePos > floorPos)
+                    {
+                        floorPos = floorStructurePos;
+                    }
+                }
+                position.Y = floorPos +  pi.ItemPrefab.Size.Y / 2;
 
                 ItemContainer itemContainer = null;
                 if (!string.IsNullOrEmpty(pi.ItemPrefab.CargoContainerIdentifier))

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -4,7 +4,7 @@ using System;
 using System.Linq;
 using System.Xml.Linq;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 
 namespace Barotrauma
 {
@@ -113,6 +113,7 @@ namespace Barotrauma
             {
                 if (c.Character?.Info != null && !c.Character.IsDead)
                 {
+                    c.Character.ResetCurrentOrder();
                     c.CharacterInfo = c.Character.Info;
                     characterData.Add(new CharacterCampaignData(c));
                 }

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs

@@ -1,4 +1,5 @@
-using Barotrauma.Items.Components;
+using Barotrauma.IO;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ namespace Barotrauma
 {
     partial class GameSession
     {
-        public enum InfoFrameTab { Crew, Mission, MyCharacter, ManagePlayers };
+        public enum InfoFrameTab { Crew, Mission, MyCharacter, Traitor };
 
         public readonly EventManager EventManager;
 
@@ -231,7 +232,7 @@ namespace Barotrauma
                         if (port.Item.WorldPosition.Y < Submarine.WorldPosition.Y) { continue; }
 
                         float dist = Vector2.DistanceSquared(port.Item.WorldPosition, level.StartOutpost.WorldPosition);
-                        if (myPort == null || dist < closestDistance || (port.MainDockingPort && !myPort.MainDockingPort))
+                        if ((myPort == null || dist < closestDistance || port.MainDockingPort) && !(myPort?.MainDockingPort ?? false))
                         {
                             myPort = port;
                             closestDistance = dist;
@@ -351,6 +352,8 @@ namespace Barotrauma
                     OnClicked = (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(summaryFrame); return true; }
                 };
             }
+
+            TabMenu.OnRoundEnded();
 #endif
 
             EventManager?.EndRound();
@@ -461,7 +464,7 @@ namespace Barotrauma
 
             try
             {
-                doc.Save(filePath);
+                doc.SaveSafe(filePath);
             }
             catch (Exception e)
             {

Barotrauma/BarotraumaShared/SharedSource/GameSettings.cs

@@ -2,8 +2,7 @@
 using System.Xml.Linq;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
-using System.Xml;
-using System.IO;
+using Barotrauma.IO;
 using Barotrauma.Extensions;
 #if CLIENT
 using Microsoft.Xna.Framework.Input;
@@ -37,6 +36,8 @@ namespace Barotrauma
 
         public bool VSyncEnabled { get; set; }
 
+        public bool TextureCompressionEnabled { get; set; }
+
         public bool EnableSplashScreen { get; set; }
 
         public int ParticleLimit { get; set; }
@@ -66,6 +67,7 @@ namespace Barotrauma
 
 #if CLIENT
         private KeyOrMouse[] keyMapping;
+        private KeyOrMouse[] inventoryKeyMapping;
 #endif
 
         private WindowMode windowMode;
@@ -91,6 +93,7 @@ namespace Barotrauma
             set { /*do nothing*/ }
         }
 #endif
+        public bool UseDualModeSockets { get; set; } = true;
 
         public bool AutoUpdateWorkshopItems;
 
@@ -117,6 +120,19 @@ namespace Barotrauma
             set { jobPreferences = value; }
         }
 
+        public bool AreJobPreferencesEqual(List<Pair<string, int>> compareTo)
+        {
+            if (jobPreferences == null || compareTo == null) return false;
+            if (jobPreferences.Count != compareTo.Count) return false;
+
+            for (int i = 0; i < jobPreferences.Count; i++)
+            {
+                if (jobPreferences[i].First != compareTo[i].First || jobPreferences[i].Second != compareTo[i].Second) return false;
+            }
+
+            return true;
+        }
+
         public int CharacterHeadIndex { get; set; }
         public int CharacterHairIndex { get; set; }
         public int CharacterBeardIndex { get; set; }
@@ -193,7 +209,7 @@ namespace Barotrauma
             {
                 musicVolume = MathHelper.Clamp(value, 0.0f, 1.0f);
 #if CLIENT
-                GameMain.SoundManager?.SetCategoryGainMultiplier("music", musicVolume, 0);
+                GameMain.SoundManager?.SetCategoryGainMultiplier("music", musicVolume * 0.7f, 0);
 #endif
             }
         }
@@ -203,13 +219,20 @@ namespace Barotrauma
             get { return voiceChatVolume; }
             set
             {
-                voiceChatVolume = MathHelper.Clamp(value, 0.0f, 1.0f);
+                voiceChatVolume = MathHelper.Clamp(value, 0.0f, 2.0f);
 #if CLIENT
-                GameMain.SoundManager?.SetCategoryGainMultiplier("voip", voiceChatVolume, 0);
+                GameMain.SoundManager?.SetCategoryGainMultiplier("voip", Math.Min(voiceChatVolume, 1.0f), 0);
 #endif
             }
         }
 
+
+        public int VoiceChatCutoffPrevention
+        {
+            get;
+            set;
+        }
+
         public const float MaxMicrophoneVolume = 10.0f;
         public float MicrophoneVolume
         {
@@ -246,7 +269,7 @@ namespace Barotrauma
         public bool TextManagerDebugModeEnabled { get; set; }
 #endif
 
-        private FileSystemWatcher modsFolderWatcher;
+        private System.IO.FileSystemWatcher modsFolderWatcher;
 
         private int ContentFileLoadOrder(ContentFile a)
         {
@@ -280,58 +303,11 @@ namespace Barotrauma
                 !otherCorePackage.Files.Any(f2 =>
                     Path.GetFullPath(f1.Path).CleanUpPath() == Path.GetFullPath(f2.Path).CleanUpPath())).ToList();
 
-            bool shouldRefreshSubs = false;
-            bool shouldRefreshFabricationRecipes = false;
-            bool shouldRefreshSoundPlayer = false;
-            bool shouldRefreshRuinGenerationParams = false;
-            bool shouldRefreshScriptedEventSets = false;
-            bool shouldRefreshMissionPrefabs = false;
-            bool shouldRefreshLevelObjectPrefabs = false;
-            bool shouldRefreshLocationTypes = false;
-            bool shouldRefreshMapGenerationParams = false;
-            bool shouldRefreshLevelGenerationParams = false;
-            bool shouldRefreshAfflictions = false;
+            DisableContentPackageItems(filesToRemove.OrderBy(ContentFileLoadOrder));
 
-            DisableContentPackageItems(filesToRemove.OrderBy(ContentFileLoadOrder),
-                                            ref shouldRefreshSubs,
-                                            ref shouldRefreshFabricationRecipes,
-                                            ref shouldRefreshSoundPlayer,
-                                            ref shouldRefreshRuinGenerationParams,
-                                            ref shouldRefreshScriptedEventSets,
-                                            ref shouldRefreshMissionPrefabs,
-                                            ref shouldRefreshLevelObjectPrefabs,
-                                            ref shouldRefreshLocationTypes,
-                                            ref shouldRefreshMapGenerationParams,
-                                            ref shouldRefreshLevelGenerationParams,
-                                            ref shouldRefreshAfflictions);
+            EnableContentPackageItems(filesToAdd.OrderBy(ContentFileLoadOrder));
 
-            EnableContentPackageItems(filesToAdd.OrderBy(ContentFileLoadOrder),
-                                            ref shouldRefreshSubs,
-                                            ref shouldRefreshFabricationRecipes,
-                                            ref shouldRefreshSoundPlayer,
-                                            ref shouldRefreshRuinGenerationParams,
-                                            ref shouldRefreshScriptedEventSets,
-                                            ref shouldRefreshMissionPrefabs,
-                                            ref shouldRefreshLevelObjectPrefabs,
-                                            ref shouldRefreshLocationTypes,
-                                            ref shouldRefreshMapGenerationParams,
-                                            ref shouldRefreshLevelGenerationParams,
-                                            ref shouldRefreshAfflictions);
-
-            if (shouldRefreshAfflictions) { AfflictionPrefab.LoadAll(GameMain.Instance.GetFilesOfType(ContentType.Afflictions)); }
-            if (shouldRefreshSubs) { SubmarineInfo.RefreshSavedSubs(); }
-            if (shouldRefreshFabricationRecipes) { ItemPrefab.InitFabricationRecipes(); }
-            if (shouldRefreshRuinGenerationParams) { RuinGeneration.RuinGenerationParams.ClearAll(); }
-            if (shouldRefreshScriptedEventSets) { ScriptedEventSet.LoadPrefabs(); }
-            if (shouldRefreshMissionPrefabs) { MissionPrefab.Init(); }
-            if (shouldRefreshLevelObjectPrefabs) { LevelObjectPrefab.LoadAll(); }
-            if (shouldRefreshLocationTypes) { LocationType.Init(); }
-            if (shouldRefreshMapGenerationParams) { MapGenerationParams.Init(); }
-            if (shouldRefreshLevelGenerationParams) { LevelGenerationParams.LoadPresets(); }
-
-#if CLIENT
-            if (shouldRefreshSoundPlayer) { SoundPlayer.Init().ForEach(_ => { return; }); }
-#endif
+            RefreshContentPackageItems(filesToAdd.Concat(filesToRemove));
 
         }
         public void SelectContentPackage(ContentPackage contentPackage)
@@ -341,45 +317,9 @@ namespace Barotrauma
                 SelectedContentPackages.Add(contentPackage);
                 ContentPackage.SortContentPackages();
 
-                bool shouldRefreshSubs = false;
-                bool shouldRefreshFabricationRecipes = false;
-                bool shouldRefreshSoundPlayer = false;
-                bool shouldRefreshRuinGenerationParams = false;
-                bool shouldRefreshScriptedEventSets = false;
-                bool shouldRefreshMissionPrefabs = false;
-                bool shouldRefreshLevelObjectPrefabs = false;
-                bool shouldRefreshLocationTypes = false;
-                bool shouldRefreshMapGenerationParams = false;
-                bool shouldRefreshLevelGenerationParams = false;
-                bool shouldRefreshAfflictions = false;
+                EnableContentPackageItems(contentPackage.Files.OrderBy(ContentFileLoadOrder));
 
-                EnableContentPackageItems(contentPackage.Files.OrderBy(ContentFileLoadOrder),
-                                            ref shouldRefreshSubs,
-                                            ref shouldRefreshFabricationRecipes,
-                                            ref shouldRefreshSoundPlayer,
-                                            ref shouldRefreshRuinGenerationParams,
-                                            ref shouldRefreshScriptedEventSets,
-                                            ref shouldRefreshMissionPrefabs,
-                                            ref shouldRefreshLevelObjectPrefabs,
-                                            ref shouldRefreshLocationTypes,
-                                            ref shouldRefreshMapGenerationParams,
-                                            ref shouldRefreshLevelGenerationParams,
-                                            ref shouldRefreshAfflictions);
-
-                if (shouldRefreshAfflictions) { AfflictionPrefab.LoadAll(GameMain.Instance.GetFilesOfType(ContentType.Afflictions)); }
-                if (shouldRefreshSubs) { SubmarineInfo.RefreshSavedSubs(); }
-                if (shouldRefreshFabricationRecipes) { ItemPrefab.InitFabricationRecipes(); }
-                if (shouldRefreshRuinGenerationParams) { RuinGeneration.RuinGenerationParams.ClearAll(); }
-                if (shouldRefreshScriptedEventSets) { ScriptedEventSet.LoadPrefabs(); }
-                if (shouldRefreshMissionPrefabs) { MissionPrefab.Init(); }
-                if (shouldRefreshLevelObjectPrefabs) { LevelObjectPrefab.LoadAll(); }
-                if (shouldRefreshLocationTypes) { LocationType.Init(); }
-                if (shouldRefreshMapGenerationParams) { MapGenerationParams.Init(); }
-                if (shouldRefreshLevelGenerationParams) { LevelGenerationParams.LoadPresets(); }
-
-#if CLIENT
-                if (shouldRefreshSoundPlayer) { SoundPlayer.Init().ForEach(_ => { return; }); }
-#endif
+                RefreshContentPackageItems(contentPackage.Files);
             }
         }
 
@@ -390,61 +330,14 @@ namespace Barotrauma
                 SelectedContentPackages.Remove(contentPackage);
                 ContentPackage.SortContentPackages();
 
-                bool shouldRefreshSubs = false;
-                bool shouldRefreshFabricationRecipes = false;
-                bool shouldRefreshSoundPlayer = false;
-                bool shouldRefreshRuinGenerationParams = false;
-                bool shouldRefreshScriptedEventSets = false;
-                bool shouldRefreshMissionPrefabs = false;
-                bool shouldRefreshLevelObjectPrefabs = false;
-                bool shouldRefreshLocationTypes = false;
-                bool shouldRefreshMapGenerationParams = false;
-                bool shouldRefreshLevelGenerationParams = false;
-                bool shouldRefreshAfflictions = false;
+                DisableContentPackageItems(contentPackage.Files.OrderBy(ContentFileLoadOrder));
 
-                DisableContentPackageItems(contentPackage.Files.OrderBy(ContentFileLoadOrder),
-                                            ref shouldRefreshSubs,
-                                            ref shouldRefreshFabricationRecipes,
-                                            ref shouldRefreshSoundPlayer,
-                                            ref shouldRefreshRuinGenerationParams,
-                                            ref shouldRefreshScriptedEventSets,
-                                            ref shouldRefreshMissionPrefabs,
-                                            ref shouldRefreshLevelObjectPrefabs,
-                                            ref shouldRefreshLocationTypes,
-                                            ref shouldRefreshMapGenerationParams,
-                                            ref shouldRefreshLevelGenerationParams,
-                                            ref shouldRefreshAfflictions);
-
-                if (shouldRefreshAfflictions) { AfflictionPrefab.LoadAll(GameMain.Instance.GetFilesOfType(ContentType.Afflictions)); }
-                if (shouldRefreshSubs) { SubmarineInfo.RefreshSavedSubs(); }
-                if (shouldRefreshFabricationRecipes) { ItemPrefab.InitFabricationRecipes(); }
-                if (shouldRefreshRuinGenerationParams) { RuinGeneration.RuinGenerationParams.ClearAll(); }
-                if (shouldRefreshScriptedEventSets) { ScriptedEventSet.LoadPrefabs(); }
-                if (shouldRefreshMissionPrefabs) { MissionPrefab.Init(); }
-                if (shouldRefreshLevelObjectPrefabs) { LevelObjectPrefab.LoadAll(); }
-                if (shouldRefreshLocationTypes) { LocationType.Init(); }
-                if (shouldRefreshMapGenerationParams) { MapGenerationParams.Init(); }
-                if (shouldRefreshLevelGenerationParams) { LevelGenerationParams.LoadPresets(); }
-
-#if CLIENT
-                if (shouldRefreshSoundPlayer) { SoundPlayer.Init().ForEach(_ => { return; }); }
-#endif
+                RefreshContentPackageItems(contentPackage.Files);
             }
         }
 
 
-        private void EnableContentPackageItems(IOrderedEnumerable<ContentFile> files,
-                                                ref bool shouldRefreshSubs,
-                                                ref bool shouldRefreshFabricationRecipes,
-                                                ref bool shouldRefreshSoundPlayer,
-                                                ref bool shouldRefreshRuinGenerationParams,
-                                                ref bool shouldRefreshScriptedEventSets,
-                                                ref bool shouldRefreshMissionPrefabs,
-                                                ref bool shouldRefreshLevelObjectPrefabs,
-                                                ref bool shouldRefreshLocationTypes,
-                                                ref bool shouldRefreshMapGenerationParams,
-                                                ref bool shouldRefreshLevelGenerationParams,
-                                                ref bool shouldRefreshAfflictions)
+        private void EnableContentPackageItems(IOrderedEnumerable<ContentFile> files)
         {
             foreach (ContentFile file in files)
             {
@@ -453,6 +346,9 @@ namespace Barotrauma
                     case ContentType.Character:
                         CharacterPrefab.LoadFromFile(file);
                         break;
+                    case ContentType.Corpses:
+                        CorpsePrefab.LoadFromFile(file);
+                        break;
                     case ContentType.NPCConversations:
                         NPCConversation.LoadFromFile(file);
                         break;
@@ -461,7 +357,6 @@ namespace Barotrauma
                         break;
                     case ContentType.Item:
                         ItemPrefab.LoadFromFile(file);
-                        shouldRefreshFabricationRecipes = true;
                         break;
                     case ContentType.ItemAssembly:
                         new ItemAssemblyPrefab(file.Path);
@@ -469,40 +364,10 @@ namespace Barotrauma
                     case ContentType.Structure:
                         StructurePrefab.LoadFromFile(file);
                         break;
-                    case ContentType.Submarine:
-                        shouldRefreshSubs = true;
-                        break;
                     case ContentType.Text:
                         TextManager.LoadTextPack(file.Path);
                         break;
-                    case ContentType.Afflictions:
-                        shouldRefreshAfflictions = true;
-                        break;
-                    case ContentType.RuinConfig:
-                        shouldRefreshRuinGenerationParams = true;
-                        break;
-                    case ContentType.RandomEvents:
-                        shouldRefreshScriptedEventSets = true;
-                        break;
-                    case ContentType.Missions:
-                        shouldRefreshMissionPrefabs = true;
-                        break;
-                    case ContentType.LevelObjectPrefabs:
-                        shouldRefreshLevelObjectPrefabs = true;
-                        break;
-                    case ContentType.LocationTypes:
-                        shouldRefreshLocationTypes = true;
-                        break;
-                    case ContentType.MapGenerationParameters:
-                        shouldRefreshMapGenerationParams = true;
-                        break;
-                    case ContentType.LevelGenerationParameters:
-                        shouldRefreshLevelGenerationParams = true;
-                        break;
 #if CLIENT
-                    case ContentType.Sounds:
-                        shouldRefreshSoundPlayer = true;
-                        break;
                     case ContentType.Particles:
                         GameMain.ParticleManager?.LoadPrefabsFromFile(file);
                         break;
@@ -516,18 +381,7 @@ namespace Barotrauma
             }
         }
 
-        private void DisableContentPackageItems(IOrderedEnumerable<ContentFile> files,
-                                                ref bool shouldRefreshSubs,
-                                                ref bool shouldRefreshFabricationRecipes,
-                                                ref bool shouldRefreshSoundPlayer,
-                                                ref bool shouldRefreshRuinGenerationParams,
-                                                ref bool shouldRefreshScriptedEventSets,
-                                                ref bool shouldRefreshMissionPrefabs,
-                                                ref bool shouldRefreshLevelObjectPrefabs,
-                                                ref bool shouldRefreshLocationTypes,
-                                                ref bool shouldRefreshMapGenerationParams,
-                                                ref bool shouldRefreshLevelGenerationParams,
-                                                ref bool shouldRefreshAfflictions)
+        private void DisableContentPackageItems(IOrderedEnumerable<ContentFile> files)
         {
             foreach (ContentFile file in files)
             {
@@ -536,6 +390,9 @@ namespace Barotrauma
                     case ContentType.Character:
                         CharacterPrefab.RemoveByFile(file.Path);
                         break;
+                    case ContentType.Corpses:
+                        CorpsePrefab.RemoveByFile(file.Path);
+                        break;
                     case ContentType.NPCConversations:
                         NPCConversation.RemoveByFile(file.Path);
                         break;
@@ -544,7 +401,6 @@ namespace Barotrauma
                         break;
                     case ContentType.Item:
                         ItemPrefab.RemoveByFile(file.Path);
-                        shouldRefreshFabricationRecipes = true;
                         break;
                     case ContentType.ItemAssembly:
                         ItemAssemblyPrefab.Remove(file.Path);
@@ -552,40 +408,10 @@ namespace Barotrauma
                     case ContentType.Structure:
                         StructurePrefab.RemoveByFile(file.Path);
                         break;
-                    case ContentType.Submarine:
-                        shouldRefreshSubs = true;
-                        break;
                     case ContentType.Text:
                         TextManager.RemoveTextPack(file.Path);
                         break;
-                    case ContentType.Afflictions:
-                        shouldRefreshAfflictions = true;
-                        break;
-                    case ContentType.RuinConfig:
-                        shouldRefreshRuinGenerationParams = true;
-                        break;
-                    case ContentType.RandomEvents:
-                        shouldRefreshScriptedEventSets = true;
-                        break;
-                    case ContentType.Missions:
-                        shouldRefreshMissionPrefabs = true;
-                        break;
-                    case ContentType.LevelObjectPrefabs:
-                        shouldRefreshLevelObjectPrefabs = true;
-                        break;
-                    case ContentType.LocationTypes:
-                        shouldRefreshLocationTypes = true;
-                        break;
-                    case ContentType.MapGenerationParameters:
-                        shouldRefreshMapGenerationParams = true;
-                        break;
-                    case ContentType.LevelGenerationParameters:
-                        shouldRefreshLevelGenerationParams = true;
-                        break;
 #if CLIENT
-                    case ContentType.Sounds:
-                        shouldRefreshSoundPlayer = true;
-                        break;
                     case ContentType.Particles:
                         GameMain.ParticleManager?.RemovePrefabsByFile(file.Path);
                         break;
@@ -599,39 +425,74 @@ namespace Barotrauma
             }
         }
 
+        private void RefreshContentPackageItems(IEnumerable<ContentFile> files)
+        {
+            if (files.Any(f => f.Type == ContentType.Afflictions)) { AfflictionPrefab.LoadAll(GameMain.Instance.GetFilesOfType(ContentType.Afflictions)); }
+            if (files.Any(f => f.Type == ContentType.Submarine)) { SubmarineInfo.RefreshSavedSubs(); }
+            if (files.Any(f => f.Type == ContentType.Item)) { ItemPrefab.InitFabricationRecipes(); }
+            if (files.Any(f => f.Type == ContentType.RuinConfig)) { RuinGeneration.RuinGenerationParams.ClearAll(); }
+            if (files.Any(f => f.Type == ContentType.RandomEvents)) { ScriptedEventSet.LoadPrefabs(); }
+            if (files.Any(f => f.Type == ContentType.Missions)) { MissionPrefab.Init(); }
+            if (files.Any(f => f.Type == ContentType.LevelObjectPrefabs)) { LevelObjectPrefab.LoadAll(); }
+            if (files.Any(f => f.Type == ContentType.LocationTypes)) { LocationType.Init(); }
+            if (files.Any(f => f.Type == ContentType.MapGenerationParameters)) { MapGenerationParams.Init(); }
+            if (files.Any(f => f.Type == ContentType.LevelGenerationParameters)) { LevelGenerationParams.LoadPresets(); }
+            if (files.Any(f => f.Type == ContentType.TraitorMissions)) { TraitorMissionPrefab.Init(); }
+            if (files.Any(f => f.Type == ContentType.Orders)) { Order.Init(); }
+            if (files.Any(f => f.Type == ContentType.EventManagerSettings)) { EventManagerSettings.Init(); }
+            if (files.Any(f => f.Type == ContentType.WreckAIConfig)) { WreckAIConfig.LoadAll(); }
+            if (files.Any(f => f.Type == ContentType.SkillSettings)) { SkillSettings.Load(GameMain.Instance.GetFilesOfType(ContentType.SkillSettings)); }
+
+#if CLIENT
+            if (files.Any(f => f.Type == ContentType.Tutorials)) { Tutorial.Init(); }
+            if (files.Any(f => f.Type == ContentType.Sounds)) { SoundPlayer.Init().ForEach(_ => { return; }); }
+#endif
+        }
+
+        private readonly static ContentType[] hotswappableContentTypes = new ContentType[]
+        {
+            ContentType.Character,
+            ContentType.Corpses,
+            ContentType.NPCConversations,
+            ContentType.Jobs,
+            ContentType.Orders,
+            ContentType.EventManagerSettings,
+            ContentType.Item,
+            ContentType.ItemAssembly,
+            ContentType.Structure,
+            ContentType.Submarine,
+            ContentType.Text,
+            ContentType.Afflictions,
+            ContentType.RuinConfig,
+            ContentType.RandomEvents,
+            ContentType.Missions,
+            ContentType.LevelObjectPrefabs,
+            ContentType.LocationTypes,
+            ContentType.MapGenerationParameters,
+            ContentType.LevelGenerationParameters,
+            ContentType.Sounds,
+            ContentType.Particles,
+            ContentType.Decals,
+            ContentType.Outpost,
+            ContentType.Wreck,
+            ContentType.WreckAIConfig,
+            ContentType.BackgroundCreaturePrefabs,
+            ContentType.ServerExecutable,
+            ContentType.TraitorMissions,
+            ContentType.Tutorials,
+            ContentType.SkillSettings,
+            ContentType.None
+        };
+
         private void UpdateContentPackageDirtyFlag(ContentFile file)
         {
-            switch (file.Type)
+            if (!hotswappableContentTypes.Contains(file.Type))
             {
-                case ContentType.Character:
-                case ContentType.NPCConversations:
-                case ContentType.Jobs:
-                case ContentType.Item:
-                case ContentType.ItemAssembly:
-                case ContentType.Structure:
-                case ContentType.Submarine:
-                case ContentType.Text:
-                case ContentType.Afflictions:
-                case ContentType.RuinConfig:
-                case ContentType.RandomEvents:
-                case ContentType.Missions:
-                case ContentType.LevelObjectPrefabs:
-                case ContentType.LocationTypes:
-                case ContentType.MapGenerationParameters:
-                case ContentType.LevelGenerationParameters:
-                case ContentType.Sounds:
-                case ContentType.Particles:
-                case ContentType.Decals:
-                case ContentType.Outpost:
-                case ContentType.Wreck:
-                case ContentType.BackgroundCreaturePrefabs:
-                case ContentType.ServerExecutable:
-                case ContentType.None:
-                    break; //do nothing here if the content type is supported
-                default:
+                if (ContentPackage.MultiplayerIncompatibleContent.Contains(file.Type))
+                {
                     ContentPackageSelectionDirty = true;
-                    ContentPackageSelectionDirtyNotification = true;
-                    break;
+                }
+                ContentPackageSelectionDirtyNotification = true;
             }
         }
 
@@ -661,6 +522,11 @@ namespace Barotrauma
             LocationType.Init();
             MapGenerationParams.Init();
             LevelGenerationParams.LoadPresets();
+            TraitorMissionPrefab.Init();
+            Order.Init();
+            EventManagerSettings.Init();
+            WreckAIConfig.LoadAll();
+            SkillSettings.Load(GameMain.Instance.GetFilesOfType(ContentType.SkillSettings));
 
 #if CLIENT
             GameMain.DecalManager.Prefabs.SortAll();
@@ -733,6 +599,10 @@ namespace Barotrauma
         public bool ShowLanguageSelectionPrompt { get; set; }
 
         private bool showTutorialSkipWarning = true;
+
+        public static bool EnableSubmarineAutoSave { get; set; }
+        public static Color SubEditorBackgroundColor { get; set; }
+
         public bool ShowTutorialSkipWarning
         {
             get { return showTutorialSkipWarning && CompletedTutorialNames.Count == 0; }
@@ -755,21 +625,21 @@ namespace Barotrauma
 
             LoadPlayerConfig();
 
-            modsFolderWatcher = new FileSystemWatcher("Mods");
+            modsFolderWatcher = new System.IO.FileSystemWatcher("Mods");
             modsFolderWatcher.Filter = "*";
-            modsFolderWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName;
+            modsFolderWatcher.NotifyFilter = System.IO.NotifyFilters.LastWrite | System.IO.NotifyFilters.FileName | System.IO.NotifyFilters.DirectoryName;
             modsFolderWatcher.Created += OnModFolderUpdate;
             modsFolderWatcher.Deleted += OnModFolderUpdate;
             modsFolderWatcher.Renamed += OnModFolderUpdate;
             modsFolderWatcher.EnableRaisingEvents = true;
         }
 
-        private void OnModFolderUpdate(object sender, FileSystemEventArgs e)
+        private void OnModFolderUpdate(object sender, System.IO.FileSystemEventArgs e)
         {
             if (SuppressModFolderWatcher || (GameMain.NetworkMember?.IsClient ?? false)) { return; }
             switch (e.ChangeType)
             {
-                case WatcherChangeTypes.Created:
+                case System.IO.WatcherChangeTypes.Created:
                     {
                         string cpPath = Path.GetFullPath(Path.Combine(e.FullPath, Steam.SteamManager.MetadataFileName)).CleanUpPath();
                         if (File.Exists(cpPath) && !ContentPackage.List.Any(cp => Path.GetFullPath(cp.Path).CleanUpPath() == cpPath))
@@ -779,7 +649,7 @@ namespace Barotrauma
                         }
                     }
                     break;
-                case WatcherChangeTypes.Deleted:
+                case System.IO.WatcherChangeTypes.Deleted:
                     {
                         string cpPath = Path.GetFullPath(Path.Combine(e.FullPath, Steam.SteamManager.MetadataFileName)).CleanUpPath();
                         var toRemove = ContentPackage.List.Where(cp => Path.GetFullPath(cp.Path).CleanUpPath() == cpPath).ToList();
@@ -802,9 +672,9 @@ namespace Barotrauma
                         }
                     }
                     break;
-                case WatcherChangeTypes.Renamed:
+                case System.IO.WatcherChangeTypes.Renamed:
                     {
-                        RenamedEventArgs renameArgs = e as RenamedEventArgs;
+                        System.IO.RenamedEventArgs renameArgs = e as System.IO.RenamedEventArgs;
 
                         string cpPath = Path.GetFullPath(Path.Combine(renameArgs.OldFullPath, Steam.SteamManager.MetadataFileName)).CleanUpPath();
                         var toRemove = ContentPackage.List.Where(cp => Path.GetFullPath(cp.Path).CleanUpPath() == cpPath).ToList();
@@ -884,8 +754,11 @@ namespace Barotrauma
                 new XAttribute("soundvolume", soundVolume),
                 new XAttribute("microphonevolume", microphoneVolume),
                 new XAttribute("voicechatvolume", voiceChatVolume),
+                new XAttribute("voicechatcutoffprevention", VoiceChatCutoffPrevention),
                 new XAttribute("verboselogging", VerboseLogging),
                 new XAttribute("savedebugconsolelogs", SaveDebugConsoleLogs),
+                new XAttribute("submarineautosave", EnableSubmarineAutoSave),
+                new XAttribute("subeditorbackground", XMLExtensions.ColorToString(SubEditorBackgroundColor)),
                 new XAttribute("enablesplashscreen", EnableSplashScreen),
                 new XAttribute("usesteammatchmaking", UseSteamMatchmaking),
                 new XAttribute("quickstartsub", QuickStartSubmarineName),
@@ -952,13 +825,29 @@ namespace Barotrauma
             doc.Root.Add(keyMappingElement);
             for (int i = 0; i < keyMapping.Length; i++)
             {
-                if (keyMapping[i].MouseButton == MouseButton.None)
+                KeyOrMouse bind = keyMapping[i];
+                if (bind.MouseButton == MouseButton.None)
                 {
-                    keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].Key));
+                    keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), bind.Key));
                 }
                 else
                 {
-                    keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].MouseButton));
+                    keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), bind.MouseButton));
+                }
+            }
+
+            var inventoryKeyMappingElement = new XElement("inventorykeymapping");
+            doc.Root.Add(inventoryKeyMappingElement);
+            for (int i = 0; i < inventoryKeyMapping.Length; i++)
+            {
+                KeyOrMouse bind = inventoryKeyMapping[i];
+                if (bind.MouseButton == MouseButton.None)
+                {
+                    inventoryKeyMappingElement.Add(new XAttribute($"slot{i}", bind.Key));
+                }
+                else
+                {
+                    inventoryKeyMappingElement.Add(new XAttribute($"slot{i}", bind.MouseButton));
                 }
             }
 #endif
@@ -986,7 +875,7 @@ namespace Barotrauma
                 new XAttribute("faceattachmentindex", CharacterFaceAttachmentIndex));
             doc.Root.Add(playerElement);
 
-            XmlWriterSettings settings = new XmlWriterSettings
+            System.Xml.XmlWriterSettings settings = new System.Xml.XmlWriterSettings
             {
                 Indent = true,
                 OmitXmlDeclaration = true,
@@ -1082,7 +971,7 @@ namespace Barotrauma
             SelectedContentPackages.Clear();
             foreach (string path in contentPackagePaths)
             {
-                var matchingContentPackage = ContentPackage.List.Find(cp => System.IO.Path.GetFullPath(cp.Path).CleanUpPath() == path.CleanUpPath());
+                var matchingContentPackage = ContentPackage.List.Find(cp => Barotrauma.IO.Path.GetFullPath(cp.Path).CleanUpPath() == path.CleanUpPath());
 
                 if (matchingContentPackage == null)
                 {
@@ -1196,6 +1085,8 @@ namespace Barotrauma
                 new XAttribute("soundvolume", soundVolume),
                 new XAttribute("verboselogging", VerboseLogging),
                 new XAttribute("savedebugconsolelogs", SaveDebugConsoleLogs),
+                new XAttribute("submarineautosave", EnableSubmarineAutoSave),
+                new XAttribute("subeditorbackground", XMLExtensions.ColorToString(SubEditorBackgroundColor)),
                 new XAttribute("enablesplashscreen", EnableSplashScreen),
                 new XAttribute("usesteammatchmaking", UseSteamMatchmaking),
                 new XAttribute("quickstartsub", QuickStartSubmarineName),
@@ -1210,7 +1101,8 @@ namespace Barotrauma
                 new XAttribute("editordisclaimershown", EditorDisclaimerShown),
                 new XAttribute("tutorialskipwarning", ShowTutorialSkipWarning),
                 new XAttribute("corpsedespawndelay", CorpseDespawnDelay),
-                new XAttribute("corpsespersubdespawnthreshold", CorpsesPerSubDespawnThreshold)
+                new XAttribute("corpsespersubdespawnthreshold", CorpsesPerSubDespawnThreshold),
+                new XAttribute("usedualmodesockets", UseDualModeSockets)
 #if DEBUG
                 , new XAttribute("automaticquickstartenabled", AutomaticQuickStartEnabled)
                 , new XAttribute("textmanagerdebugmodeenabled", TextManagerDebugModeEnabled)
@@ -1248,6 +1140,7 @@ namespace Barotrauma
                     new XAttribute("width", GraphicsWidth),
                     new XAttribute("height", GraphicsHeight),
                     new XAttribute("vsync", VSyncEnabled),
+                    new XAttribute("compresstextures", TextureCompressionEnabled),
                     new XAttribute("framelimit", Timing.FrameLimit),
                     new XAttribute("displaymode", windowMode));
             }
@@ -1262,13 +1155,14 @@ namespace Barotrauma
                 new XAttribute("musicvolume", musicVolume),
                 new XAttribute("soundvolume", soundVolume),
                 new XAttribute("voicechatvolume", voiceChatVolume),
+                new XAttribute("voicechatcutoffprevention", VoiceChatCutoffPrevention),
                 new XAttribute("microphonevolume", microphoneVolume),
                 new XAttribute("muteonfocuslost", MuteOnFocusLost),
                 new XAttribute("dynamicrangecompressionenabled", DynamicRangeCompressionEnabled),
                 new XAttribute("voipattenuationenabled", VoipAttenuationEnabled),
                 new XAttribute("usedirectionalvoicechat", UseDirectionalVoiceChat),
                 new XAttribute("voicesetting", VoiceSetting),
-                new XAttribute("voicecapturedevice", VoiceCaptureDevice ?? ""),
+                new XAttribute("voicecapturedevice", System.Xml.XmlConvert.EncodeName(VoiceCaptureDevice ?? "")),
                 new XAttribute("noisegatethreshold", NoiseGateThreshold));
 
             XElement gSettings = doc.Root.Element("graphicssettings");
@@ -1308,6 +1202,21 @@ namespace Barotrauma
                     keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].MouseButton));
                 }
             }
+
+            var inventoryKeyMappingElement = new XElement("inventorykeymapping");
+            doc.Root.Add(inventoryKeyMappingElement);
+            for (int i = 0; i < inventoryKeyMapping.Length; i++)
+            {
+                KeyOrMouse bind = inventoryKeyMapping[i];
+                if (bind.MouseButton == MouseButton.None)
+                {
+                    inventoryKeyMappingElement.Add(new XAttribute($"slot{i}", bind.Key));
+                }
+                else
+                {
+                    inventoryKeyMappingElement.Add(new XAttribute($"slot{i}", bind.MouseButton));
+                }
+            }
 #endif
 
             var gameplay = new XElement("gameplay");
@@ -1352,7 +1261,7 @@ namespace Barotrauma
             }
             doc.Root.Add(tutorialElement);
 
-            XmlWriterSettings settings = new XmlWriterSettings
+            System.Xml.XmlWriterSettings settings = new System.Xml.XmlWriterSettings
             {
                 Indent = true,
                 OmitXmlDeclaration = true,
@@ -1386,6 +1295,8 @@ namespace Barotrauma
             AutoCheckUpdates = doc.Root.GetAttributeBool("autocheckupdates", AutoCheckUpdates);
             sendUserStatistics = doc.Root.GetAttributeBool("senduserstatistics", sendUserStatistics);
             QuickStartSubmarineName = doc.Root.GetAttributeString("quickstartsub", QuickStartSubmarineName);
+            EnableSubmarineAutoSave = doc.Root.GetAttributeBool("submarineautosave", true);
+            SubEditorBackgroundColor = doc.Root.GetAttributeColor("subeditorbackground", new Color(0.051f, 0.149f, 0.271f, 1.0f));
             UseSteamMatchmaking = doc.Root.GetAttributeBool("usesteammatchmaking", UseSteamMatchmaking);
             RequireSteamAuthentication = doc.Root.GetAttributeBool("requiresteamauthentication", RequireSteamAuthentication);
             EnableSplashScreen = doc.Root.GetAttributeBool("enablesplashscreen", EnableSplashScreen);
@@ -1399,6 +1310,7 @@ namespace Barotrauma
             CampaignDisclaimerShown = doc.Root.GetAttributeBool("campaigndisclaimershown", CampaignDisclaimerShown);
             EditorDisclaimerShown = doc.Root.GetAttributeBool("editordisclaimershown", EditorDisclaimerShown);
             ShowTutorialSkipWarning = doc.Root.GetAttributeBool("tutorialskipwarning", true);
+            UseDualModeSockets = doc.Root.GetAttributeBool("usedualmodesockets", true);
 #if DEBUG
             AutomaticQuickStartEnabled = doc.Root.GetAttributeBool("automaticquickstartenabled", AutomaticQuickStartEnabled);
             TextManagerDebugModeEnabled = doc.Root.GetAttributeBool("textmanagerdebugmodeenabled", TextManagerDebugModeEnabled);
@@ -1450,6 +1362,7 @@ namespace Barotrauma
             GraphicsWidth = graphicsMode.GetAttributeInt("width", GraphicsWidth);
             GraphicsHeight = graphicsMode.GetAttributeInt("height", GraphicsHeight);
             VSyncEnabled = graphicsMode.GetAttributeBool("vsync", VSyncEnabled);
+            TextureCompressionEnabled = graphicsMode.GetAttributeBool("compresstextures", TextureCompressionEnabled);
             Timing.FrameLimit = graphicsMode.GetAttributeInt("framelimit", 200);
 
             XElement graphicsSettings = doc.Root.Element("graphicssettings");
@@ -1487,10 +1400,11 @@ namespace Barotrauma
                 DynamicRangeCompressionEnabled = audioSettings.GetAttributeBool("dynamicrangecompressionenabled", DynamicRangeCompressionEnabled);
                 VoipAttenuationEnabled = audioSettings.GetAttributeBool("voipattenuationenabled", VoipAttenuationEnabled);
                 VoiceChatVolume = audioSettings.GetAttributeFloat("voicechatvolume", VoiceChatVolume);
+                VoiceChatCutoffPrevention = audioSettings.GetAttributeInt("voicechatcutoffprevention", VoiceChatCutoffPrevention);
                 MuteOnFocusLost = audioSettings.GetAttributeBool("muteonfocuslost", MuteOnFocusLost);
 
                 UseDirectionalVoiceChat = audioSettings.GetAttributeBool("usedirectionalvoicechat", UseDirectionalVoiceChat);
-                VoiceCaptureDevice = audioSettings.GetAttributeString("voicecapturedevice", VoiceCaptureDevice);
+                VoiceCaptureDevice = System.Xml.XmlConvert.DecodeName(audioSettings.GetAttributeString("voicecapturedevice", VoiceCaptureDevice));
                 NoiseGateThreshold = audioSettings.GetAttributeFloat("noisegatethreshold", NoiseGateThreshold);
                 MicrophoneVolume = audioSettings.GetAttributeFloat("microphonevolume", MicrophoneVolume);
                 string voiceSettingStr = audioSettings.GetAttributeString("voicesetting", "");
@@ -1532,6 +1446,7 @@ namespace Barotrauma
             GraphicsWidth = 0;
             GraphicsHeight = 0;
             VSyncEnabled = true;
+            TextureCompressionEnabled = true;
             Timing.FrameLimit = 200;
 #if DEBUG
             EnableSplashScreen = false;

Barotrauma/BarotraumaShared/SharedSource/InputType.cs

@@ -13,6 +13,7 @@ namespace Barotrauma
         SelectNextCharacter,
         SelectPreviousCharacter,
         Voice,
+        LocalVoice,
         Deselect,
         Shoot,
         Command,

Barotrauma/BarotraumaShared/SharedSource/Items/CharacterInventory.cs

@@ -150,7 +150,15 @@ namespace Barotrauma
         /// </summary>
         public override bool TryPutItem(Item item, Character user, List<InvSlotType> allowedSlots = null, bool createNetworkEvent = true)
         {
-            if (allowedSlots == null || !allowedSlots.Any()) return false;
+            if (allowedSlots == null || !allowedSlots.Any()) { return false; }
+            if (item == null)
+            {
+#if DEBUG
+                throw new Exception("item null");
+#else
+                return false;
+#endif
+            }
 
             bool inSuitableSlot = false;
             bool inWrongSlot = false;
@@ -167,7 +175,7 @@ namespace Barotrauma
                 }
             }
             //all good
-            if (inSuitableSlot && !inWrongSlot) return true;
+            if (inSuitableSlot && !inWrongSlot) { return true; }
 
             //try to place the item in a LimbSlot.Any slot if that's allowed
             if (allowedSlots.Contains(InvSlotType.Any) && item.AllowedSlots.Contains(InvSlotType.Any))

Barotrauma/BarotraumaShared/SharedSource/Items/Components/DockingPort.cs

@@ -5,7 +5,7 @@ using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Xml.Linq;
 
@@ -29,6 +29,7 @@ namespace Barotrauma.Items.Components
         private Door door;
 
         private Body[] bodies;
+        private Fixture outsideBlocker;
         private Body doorBody;
 
         private bool docked;
@@ -58,7 +59,7 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        [Serialize(false, false, description: "If set to true, this docking port is used when spawning the submarine docked to an outpost (if possible).")]
+        [Editable, Serialize(false, true, description: "If set to true, this docking port is used when spawning the submarine docked to an outpost (if possible).")]
         public bool MainDockingPort
         {
             get;
@@ -113,6 +114,12 @@ namespace Barotrauma.Items.Components
         {
             if (DockingTarget != null)
             {
+                if (IsHorizontal) 
+                { 
+                    DockingDir = 0; 
+                    DockingDir = GetDir(DockingTarget);  
+                    DockingTarget.DockingDir = -DockingDir;
+                }
                 if (joint != null)
                 {
                     CreateJoint(joint is WeldJoint);
@@ -259,6 +266,12 @@ namespace Barotrauma.Items.Components
                 {
                     item.CreateServerEvent(this);
                 }
+#else
+                if (GameMain.Client != null && GameMain.Client.MidRoundSyncing && 
+                    (item.Submarine == Submarine.MainSub || DockingTarget.item.Submarine == Submarine.MainSub))
+                {
+                    Screen.Selected.Cam.Position = Submarine.MainSub.WorldPosition;
+                }
 #endif
             }
 
@@ -461,6 +474,12 @@ namespace Barotrauma.Items.Components
                     }
                 }
 
+                if (leftSubRightSide == int.MinValue || rightSubLeftSide == int.MaxValue)
+                {
+                    DebugConsole.NewMessage("Creating hulls between docking ports failed. Could not find a hull next to the docking port.");
+                    return;
+                }
+
                 //expand left hull to the rightmost hull of the sub at the left side
                 //(unless the difference is more than 100 units - if the distance is very large 
                 //there's something wrong with the positioning of the docking ports or submarine hulls)
@@ -469,7 +488,8 @@ namespace Barotrauma.Items.Components
                 {
                     if (leftHullDiff > 100)
                     {
-                        DebugConsole.ThrowError("Creating hulls between docking ports failed. The leftmost docking port seems to be very far from any hulls in the left-side submarine.");
+                        DebugConsole.NewMessage("Creating hulls between docking ports failed. The leftmost docking port seems to be very far from any hulls in the left-side submarine.");
+                        return;
                     }
                     else
                     {
@@ -483,7 +503,8 @@ namespace Barotrauma.Items.Components
                 {
                     if (rightHullDiff > 100)
                     {
-                        DebugConsole.ThrowError("Creating hulls between docking ports failed. The rightmost docking port seems to be very far from any hulls in the right-side submarine.");
+                        DebugConsole.NewMessage("Creating hulls between docking ports failed. The rightmost docking port seems to be very far from any hulls in the right-side submarine.");
+                        return;
                     }
                     else
                     {
@@ -506,6 +527,16 @@ namespace Barotrauma.Items.Components
                     }
                 }
 
+                if (rightHullDiff <= 100 && hulls[0].Submarine != null)
+                {
+                    outsideBlocker = hulls[0].Submarine.PhysicsBody.FarseerBody.CreateRectangle(
+                        ConvertUnits.ToSimUnits(hullRects[0].Width + hullRects[1].Width),
+                        ConvertUnits.ToSimUnits(hullRects[0].Height),
+                        density: 0.0f,
+                        offset: ConvertUnits.ToSimUnits(new Vector2(hullRects[0].Right, hullRects[0].Y - hullRects[0].Height / 2) - hulls[0].Submarine.HiddenSubPosition));
+                    outsideBlocker.UserData = this;
+                }
+
                 gap = new Gap(new Rectangle(hullRects[0].Right - 2, hullRects[0].Y, 4, hullRects[0].Height), true, subs[0]);
             }
             else
@@ -540,6 +571,12 @@ namespace Barotrauma.Items.Components
                     }
                 }
 
+                if (upperSubBottom == int.MaxValue || lowerSubTop == int.MinValue)
+                {
+                    DebugConsole.NewMessage("Creating hulls between docking ports failed. Could not find a hull next to the docking port.");
+                    return;
+                }
+
                 //expand lower hull to the topmost hull of the lower sub 
                 //(unless the difference is more than 100 units - if the distance is very large 
                 //there's something wrong with the positioning of the docking ports or submarine hulls)
@@ -548,7 +585,8 @@ namespace Barotrauma.Items.Components
                 {
                     if (lowerHullDiff > 100)
                     {
-                        DebugConsole.ThrowError("Creating hulls between docking ports failed. The lower docking port seems to be very far from any hulls in the lower submarine.");
+                        DebugConsole.NewMessage("Creating hulls between docking ports failed. The lower docking port seems to be very far from any hulls in the lower submarine.");
+                        return;
                     }
                     else
                     {
@@ -561,7 +599,8 @@ namespace Barotrauma.Items.Components
                 {
                     if (upperHullDiff > 100)
                     {
-                        DebugConsole.ThrowError("Creating hulls between docking ports failed. The upper docking port seems to be very far from any hulls in the upper submarine.");
+                        DebugConsole.NewMessage("Creating hulls between docking ports failed. The upper docking port seems to be very far from any hulls in the upper submarine.");
+                        return;
                     }
                     else
                     {
@@ -575,7 +614,8 @@ namespace Barotrauma.Items.Components
                 int midHullDiff = ((hullRects[1].Y - hullRects[1].Height) - hullRects[0].Y) + 2;
                 if (midHullDiff > 100)
                 {
-                    DebugConsole.ThrowError("Creating hulls between docking ports failed. The upper hull seems to be very far from the lower hull.");
+                    DebugConsole.NewMessage("Creating hulls between docking ports failed. The upper hull seems to be very far from the lower hull.");
+                    return;
                 }
                 else if (midHullDiff > 0)
                 {
@@ -584,15 +624,33 @@ namespace Barotrauma.Items.Components
                     hullRects[1].Height += midHullDiff / 2 + 1;
                 }
 
+
                 for (int i = 0; i < 2; i++)
                 {
                     hullRects[i].Location -= MathUtils.ToPoint((subs[i].WorldPosition - subs[i].HiddenSubPosition));
                     hulls[i] = new Hull(MapEntityPrefab.Find(null, "hull"), hullRects[i], subs[i]);
                     hulls[i].AddToGrid(subs[i]);
                     hulls[i].FreeID();
+
+                    for (int j = 0; j < 2; j++)
+                    {
+                        bodies[i + j * 2] = GameMain.World.CreateEdge(
+                            ConvertUnits.ToSimUnits(new Vector2(hullRects[i].X + hullRects[i].Width * j, hullRects[i].Y)),
+                            ConvertUnits.ToSimUnits(new Vector2(hullRects[i].X + hullRects[i].Width * j, hullRects[i].Y - hullRects[i].Height)));
+                    }
                 }
 
-                gap = new Gap(new Rectangle(hullRects[0].X, hullRects[0].Y+2, hullRects[0].Width, 4), false, subs[0]);
+                if (midHullDiff <= 100 && hulls[0].Submarine != null)
+                {
+                    outsideBlocker = hulls[0].Submarine.PhysicsBody.FarseerBody.CreateRectangle(
+                        ConvertUnits.ToSimUnits(hullRects[0].Width),
+                        ConvertUnits.ToSimUnits(hullRects[0].Height + hullRects[1].Height),
+                        density: 0.0f,
+                        offset: ConvertUnits.ToSimUnits(new Vector2(hullRects[0].Center.X, hullRects[0].Y) - hulls[0].Submarine.HiddenSubPosition));
+                    outsideBlocker.UserData = this;
+                }
+
+                gap = new Gap(new Rectangle(hullRects[0].X, hullRects[0].Y + 2, hullRects[0].Width, 4), false, subs[0]);
             }
 
             LinkHullsToGaps();
@@ -609,7 +667,7 @@ namespace Barotrauma.Items.Components
 
             foreach (Body body in bodies)
             {
-                if (body == null) continue;
+                if (body == null) { continue; }
                 body.BodyType = BodyType.Static;
                 body.Friction = 0.5f;
 
@@ -769,6 +827,9 @@ namespace Barotrauma.Items.Components
                 bodies = null;
             }
 
+            outsideBlocker?.Body.Remove(outsideBlocker);
+            outsideBlocker = null;
+
             Item.Submarine.EnableObstructedWaypoints();
             obstructedWayPointsDisabled = false;
 
@@ -880,12 +941,12 @@ namespace Barotrauma.Items.Components
             float closestDist = 30.0f * 30.0f;
             foreach (Item it in Item.ItemList)
             {
-                if (it.Submarine != item.Submarine) continue;
+                if (it.Submarine != item.Submarine) { continue; }
 
                 var doorComponent = it.GetComponent<Door>();
-                if (doorComponent == null) continue;
+                if (doorComponent == null || doorComponent.IsHorizontal == IsHorizontal) { continue; }
 
-                float distSqr = Vector2.Distance(item.Position, it.Position);
+                float distSqr = Vector2.DistanceSquared(item.Position, it.Position);
                 if (distSqr < closestDist)
                 {
                     door = doorComponent;
@@ -958,12 +1019,12 @@ namespace Barotrauma.Items.Components
                 if (docked)
                 {
                     if (item.Submarine != null && DockingTarget?.item?.Submarine != null)
-                        GameServer.Log(sender.LogName + " docked " + item.Submarine.Info.Name + " to " + DockingTarget.item.Submarine.Info.Name, ServerLog.MessageType.ItemInteraction);
+                        GameServer.Log(GameServer.CharacterLogName(sender) + " docked " + item.Submarine.Info.Name + " to " + DockingTarget.item.Submarine.Info.Name, ServerLog.MessageType.ItemInteraction);
                 }
                 else
                 {
                     if (item.Submarine != null && prevDockingTarget?.item?.Submarine != null)
-                        GameServer.Log(sender.LogName + " undocked " + item.Submarine.Info.Name + " from " + prevDockingTarget.item.Submarine.Info.Name, ServerLog.MessageType.ItemInteraction);
+                        GameServer.Log(GameServer.CharacterLogName(sender) + " undocked " + item.Submarine.Info.Name + " from " + prevDockingTarget.item.Submarine.Info.Name, ServerLog.MessageType.ItemInteraction);
                 }
             }
 #endif

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs

@@ -4,7 +4,7 @@ using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Xml.Linq;
 #if CLIENT
@@ -38,12 +38,17 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        //how much "less stuck" partially doors get when opened
+        const float StuckReductionOnOpen = 30.0f;
+
         private float resetPredictionTimer;
         private float toggleCooldownTimer;
         private Character lastUser;
 
         private float damageSoundCooldown;
 
+        private double lastBrokenTime;
+
         private Rectangle doorRect;
 
         private bool isBroken;
@@ -53,7 +58,7 @@ namespace Barotrauma.Items.Components
             get { return isBroken; }
             set
             {
-                if (isBroken == value) return;
+                if (isBroken == value) { return; }
                 isBroken = value;
                 if (isBroken)
                 {
@@ -63,6 +68,9 @@ namespace Barotrauma.Items.Components
                 {
                     EnableBody();
                 }
+#if SERVER
+                item.CreateServerEvent(this);
+#endif
             }
         }
 
@@ -85,7 +93,7 @@ namespace Barotrauma.Items.Components
                 if (isOpen || isBroken || !CanBeWelded) return;
                 stuck = MathHelper.Clamp(value, 0.0f, 100.0f);
                 if (stuck <= 0.0f) { IsStuck = false; }
-                if (stuck >= 100.0f) { IsStuck = true; }
+                if (stuck >= 99.0f) { IsStuck = true; }
             }
         }
 
@@ -203,10 +211,16 @@ namespace Barotrauma.Items.Components
                         break;
                 }
             }
+                        
+            IsActive = true;
+        }
 
+        public override void OnItemLoaded()
+        {
+            //do this here because the scale of the item might not be set to the final value yet in the constructor
             doorRect = new Rectangle(
                 item.Rect.Center.X - (int)(doorSprite.size.X / 2 * item.Scale),
-                item.Rect.Y - item.Rect.Height/2 + (int)(doorSprite.size.Y / 2.0f * item.Scale),
+                item.Rect.Y - item.Rect.Height / 2 + (int)(doorSprite.size.Y / 2.0f * item.Scale),
                 (int)(doorSprite.size.X * item.Scale),
                 (int)(doorSprite.size.Y * item.Scale));
 
@@ -224,8 +238,6 @@ namespace Barotrauma.Items.Components
             Body.SetTransformIgnoreContacts(
                 ConvertUnits.ToSimUnits(new Vector2(doorRect.Center.X, doorRect.Y - doorRect.Height / 2)),
                 0.0f);
-            
-            IsActive = true;
         }
 
         public override void Move(Vector2 amount)
@@ -295,6 +307,7 @@ namespace Barotrauma.Items.Components
                 PickingTime = 0;
                 ToggleState(ActionType.OnUse, character);
                 PickingTime = originalPickingTime;
+                StopPicking(picker);
             }
 #if CLIENT
             else if (hasRequiredItems && character != null && character == Character.Controlled)
@@ -313,8 +326,9 @@ namespace Barotrauma.Items.Components
 
             if (isBroken)
             {
+                lastBrokenTime = Timing.TotalTime;
                 //the door has to be restored to 50% health before collision detection on the body is re-enabled
-                if (item.ConditionPercentage > 50.0f)
+                if (item.ConditionPercentage > 50.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
                 {
                     IsBroken = false;
                 }
@@ -363,7 +377,10 @@ namespace Barotrauma.Items.Components
         public override void UpdateBroken(float deltaTime, Camera cam)
         {
             base.UpdateBroken(deltaTime, cam);
-            IsBroken = true;
+            if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
+            {
+                IsBroken = true;
+            }
         }
 
         private void EnableBody()
@@ -502,6 +519,7 @@ namespace Barotrauma.Items.Components
 
                 foreach (Limb limb in c.AnimController.Limbs)
                 {
+                    if (limb.IsSevered) { continue; }
                     if (PushBodyOutOfDoorway(c, limb.body, dir, simPos, simSize) && damageSoundCooldown <= 0.0f)
                     {
 #if CLIENT
@@ -564,7 +582,12 @@ namespace Barotrauma.Items.Components
                 body.ApplyLinearImpulse(new Vector2(dir * 2.0f, isOpen ? 0.0f : -1.0f), maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
             }
 
-            c.SetStun(0.2f);
+            //don't stun if the door was broken a moment ago
+            //otherwise enabling the door's collider and pushing the character away will interrupt repairing
+            if (lastBrokenTime < Timing.TotalTime - 1.0f)
+            {
+                c.SetStun(0.2f);
+            }
             return true;
         }
 
@@ -594,7 +617,7 @@ namespace Barotrauma.Items.Components
 #if SERVER
             if (sender != null && wasOpen != isOpen)
             {
-                GameServer.Log(sender.LogName + (isOpen ? " opened " : " closed ") + item.Name, ServerLog.MessageType.ItemInteraction);
+                GameServer.Log(GameServer.CharacterLogName(sender) + (isOpen ? " opened " : " closed ") + item.Name, ServerLog.MessageType.ItemInteraction);
             }
 #endif
         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs

@@ -1,13 +1,13 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
-    partial class ElectricalDischarger : Powered
+    partial class ElectricalDischarger : Powered, IServerSerializable
     {
         private static readonly List<ElectricalDischarger> list = new List<ElectricalDischarger>();
         public static IEnumerable<ElectricalDischarger> List
@@ -48,14 +48,14 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [Serialize(500.0f, true, description: "How far the discharge can travel from the item."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 5000.0f)]
+        [Serialize(500.0f, true, description: "How far the discharge can travel from the item.", alwaysUseInstanceValues: true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 5000.0f)]
         public float Range
         {
             get;
             set;
         }
 
-        [Serialize(25.0f, true, description: "How much further can the discharge be carried when moving across walls."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 1000.0f)]
+        [Serialize(25.0f, true, description: "How much further can the discharge be carried when moving across walls.", alwaysUseInstanceValues: true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 1000.0f)]
         public float RangeMultiplierInWalls
         {
             get;
@@ -115,10 +115,15 @@ namespace Barotrauma.Items.Components
             //already active, do nothing
             if (IsActive) { return false; }
 
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return false; }
+
             CurrPowerConsumption = powerConsumption;
             charging = true;
             timer = Duration;
             IsActive = true;
+#if SERVER
+            if (GameMain.Server != null) { item.CreateServerEvent(this); }
+#endif
             return false;
         }
 
@@ -150,14 +155,12 @@ namespace Barotrauma.Items.Components
                             neededPower -= takePower;
                             battery.Charge -= takePower / 3600.0f;
     #if SERVER
-                            if (GameMain.Server != null)
-                            {
-                                battery.Item.CreateServerEvent(battery);
-                            }
+                            if (GameMain.Server != null) { battery.Item.CreateServerEvent(battery); }
     #endif
                         }
                     }
                     Discharge();
+
                 }
                 else if (Voltage > MinVoltage)
                 {
@@ -478,5 +481,10 @@ namespace Barotrauma.Items.Components
             base.RemoveComponentSpecific();
             list.Remove(this);
         }
+
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        {
+            //no further data needed, the event just triggers the discharge
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs

@@ -3,6 +3,7 @@ using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
 
@@ -309,8 +310,13 @@ namespace Barotrauma.Items.Components
         {
             picker = character;
 
-            if (character != null) item.Submarine = character.Submarine;
+            if (item.Removed)
+            {
+                DebugConsole.ThrowError($"Attempted to equip a removed item ({item.Name})\n" + Environment.StackTrace);
+                return;
+            }
 
+            if (character != null) { item.Submarine = character.Submarine; }
             if (item.body == null)
             {
                 if (body != null)
@@ -344,7 +350,7 @@ namespace Barotrauma.Items.Components
                 IsActive = true;
 
 #if SERVER
-                if (!alreadyEquipped) GameServer.Log(character.LogName + " equipped " + item.Name, ServerLog.MessageType.ItemInteraction);
+                if (!alreadyEquipped) GameServer.Log(GameServer.CharacterLogName(character) + " equipped " + item.Name, ServerLog.MessageType.ItemInteraction);
 #endif
             }
         }
@@ -355,7 +361,7 @@ namespace Barotrauma.Items.Components
 
             picker.DeselectItem(item);
 #if SERVER
-            GameServer.Log(character.LogName + " unequipped " + item.Name, ServerLog.MessageType.ItemInteraction);
+            GameServer.Log(GameServer.CharacterLogName(character) + " unequipped " + item.Name, ServerLog.MessageType.ItemInteraction);
 #endif
 
             item.body.PhysEnabled = true;
@@ -365,23 +371,30 @@ namespace Barotrauma.Items.Components
 
         public bool CanBeAttached()
         {
-            if (!attachable || !Reattachable) return false;
+            if (!attachable || !Reattachable) { return false; }
 
             //can be attached anywhere in sub editor
-            if (Screen.Selected == GameMain.SubEditorScreen) return true;
+            if (Screen.Selected == GameMain.SubEditorScreen) { return true; }
 
             //can be attached anywhere inside hulls
-            if (item.CurrentHull != null) return true;
+            if (item.CurrentHull != null) { return true; }
 
             return Structure.GetAttachTarget(item.WorldPosition) != null;
         }
         
         public bool CanBeDeattached()
         {
-            if (!attachable || !attached) return true;
+            if (!attachable || !attached) { return true; }
 
             //allow deattaching everywhere in sub editor
-            if (Screen.Selected == GameMain.SubEditorScreen) return true;
+            if (Screen.Selected == GameMain.SubEditorScreen) { return true; }
+
+            //if the item has a connection panel and rewiring is disabled, don't allow deattaching
+            var connectionPanel = item.GetComponent<ConnectionPanel>();
+            if (connectionPanel != null && (connectionPanel.Locked || !(GameMain.NetworkMember?.ServerSettings?.AllowRewiring ?? true)))
+            {
+                return false;
+            }
 
             //don't allow deattaching if part of a sub and outside hulls
             return item.Submarine == null || item.CurrentHull != null;
@@ -389,12 +402,18 @@ namespace Barotrauma.Items.Components
 
         public override bool Pick(Character picker)
         {
+            if (item.Removed)
+            {
+                DebugConsole.ThrowError($"Attempted to pick up a removed item ({item.Name})\n" + Environment.StackTrace);
+                return false;
+            }
+
             if (!attachable)
             {
                 return base.Pick(picker);
             }
 
-            if (!CanBeDeattached()) return false;
+            if (!CanBeDeattached()) { return false; }
 
             if (Attached)
             {
@@ -419,7 +438,7 @@ namespace Barotrauma.Items.Components
                     item.CreateServerEvent(this);
                     if (picker != null)
                     {
-                        GameServer.Log(picker.LogName + " detached " + item.Name + " from a wall", ServerLog.MessageType.ItemInteraction);
+                        GameServer.Log(GameServer.CharacterLogName(picker) + " detached " + item.Name + " from a wall", ServerLog.MessageType.ItemInteraction);
                     }
                 }
 #endif

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs

@@ -1,4 +1,5 @@
-using FarseerPhysics;
+using Barotrauma.Networking;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using Microsoft.Xna.Framework;
@@ -94,6 +95,7 @@ namespace Barotrauma.Items.Components
             {
                 foreach (Limb l in character.AnimController.Limbs)
                 {
+                    if (l.IsSevered) { continue; }
                     if (l.type == LimbType.LeftFoot || l.type == LimbType.LeftThigh || l.type == LimbType.LeftLeg) { continue; }
                     if (l.type == LimbType.Head || l.type == LimbType.Torso)
                     {
@@ -310,70 +312,7 @@ namespace Barotrauma.Items.Components
                 return false;
             }
 
-            if (attack != null)
-            {
-                if (targetLimb == null && targetCharacter == null && targetStructure == null && (targetItem == null || ! targetItem.Prefab.DamagedByMeleeWeapons))
-                {
-                    return false;
-                }
-
-                if (targetLimb != null)
-                {
-                    targetLimb.character.LastDamageSource = item;
-                    attack.DoDamageToLimb(User, targetLimb, item.WorldPosition, 1.0f);
-                }
-                else if (targetCharacter != null)
-                {
-                    targetCharacter.LastDamageSource = item;
-                    attack.DoDamage(User, targetCharacter, item.WorldPosition, 1.0f);
-                }
-                else if (targetStructure != null)
-                {
-                    attack.DoDamage(User, targetStructure, item.WorldPosition, 1.0f);
-                }
-                else if (targetItem != null && targetItem.Prefab.DamagedByMeleeWeapons)
-                {
-                    attack.DoDamage(User, targetItem, item.WorldPosition, 1.0f);
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return true; }
-
-#if SERVER
-            if (GameMain.Server != null && targetCharacter != null) //TODO: Log structure hits
-            {
-
-                GameMain.Server.CreateEntityEvent(item, new object[] 
-                {
-                    Networking.NetEntityEvent.Type.ApplyStatusEffect,                    
-                    ActionType.OnUse,
-                    null, //itemcomponent
-                    targetCharacter.ID, targetLimb
-                });
-
-                string logStr = picker?.LogName + " used " + item.Name;
-                if (item.ContainedItems != null && item.ContainedItems.Any())
-                {
-                    logStr += " (" + string.Join(", ", item.ContainedItems.Select(i => i?.Name)) + ")";
-                }
-                logStr += " on " + targetCharacter.LogName + ".";
-                Networking.GameServer.Log(logStr, Networking.ServerLog.MessageType.Attack);
-            }
-#endif
-
-            if (targetCharacter != null) //TODO: Allow OnUse to happen on structures too maybe??
-            {
-                ApplyStatusEffects(ActionType.OnUse, 1.0f, targetCharacter, targetLimb, user: User);
-            }
-
-            if (DeleteOnUse)
-            {
-                Entity.Spawner.AddToRemoveQueue(item);
-            }
+            impactQueue.Enqueue(f2);
 
             return true;
         }
@@ -414,7 +353,7 @@ namespace Barotrauma.Items.Components
                     if (targetStructure.Removed) { return; }
                     attack.DoDamage(User, targetStructure, item.WorldPosition, 1.0f);
                 }
-                else if (targetItem != null && targetItem.Prefab.DamagedByMeleeWeapons)
+                else if (targetItem != null && targetItem.Prefab.DamagedByMeleeWeapons && targetItem.Condition > 0)
                 {
                     if (targetItem.Removed) { return; }
                     attack.DoDamage(User, targetItem, item.WorldPosition, 1.0f);

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs

@@ -65,7 +65,7 @@ namespace Barotrauma.Items.Components
 
             if (PickingTime > 0.0f)
             {
-                if (picker.PickingItem == null && PickingTime <= float.MaxValue)
+                if ((picker.PickingItem == null || picker.PickingItem == item) && PickingTime <= float.MaxValue)
                 {
 #if SERVER
                     item.CreateServerEvent(this);

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Propulsion.cs

@@ -65,7 +65,7 @@ namespace Barotrauma.Items.Components
 
             foreach (Limb limb in character.AnimController.Limbs)
             {
-                if (limb.WearingItems.Find(w => w.WearableComponent.Item == this.item) == null) continue;
+                if (limb.WearingItems.Find(w => w.WearableComponent.Item == item) == null) { continue; }
                 limb.body.ApplyForce(propulsion, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
             }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs

@@ -90,6 +90,7 @@ namespace Barotrauma.Items.Components
             return MathHelper.ToRadians(MathHelper.Lerp(Spread, UnskilledSpread, degreeOfFailure));
         }
 
+        private readonly List<Body> limbBodies = new List<Body>();
         public override bool Use(float deltaTime, Character character = null)
         {
             if (character == null || character.Removed) { return false; }
@@ -104,9 +105,10 @@ namespace Barotrauma.Items.Components
                 item.AiTarget.SightRange = item.AiTarget.MaxSightRange;
             }
 
-            List<Body> limbBodies = new List<Body>();
+            limbBodies.Clear();
             foreach (Limb l in character.AnimController.Limbs)
             {
+                if (l.IsSevered) { continue; }
                 limbBodies.Add(l.body.FarseerBody);
             }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs

@@ -22,6 +22,8 @@ namespace Barotrauma.Items.Components
 
         private Vector2 debugRayStartPos, debugRayEndPos;
 
+        private readonly List<Body> ignoredBodies = new List<Body>();
+
         [Serialize("Both", false, description: "Can the item be used in air, water or both.")]
         public UseEnvironment UsableIn
         {
@@ -114,8 +116,7 @@ namespace Barotrauma.Items.Components
                 }
             }
             item.IsShootable = true;
-            // TODO: should define this in xml if we have repair tools that don't require aim to use
-            item.RequireAimToUse = true;
+            item.RequireAimToUse = element.Parent.GetAttributeBool("requireaimtouse", true);
             InitProjSpecific(element);
         }
 
@@ -124,16 +125,17 @@ namespace Barotrauma.Items.Components
         public override void Update(float deltaTime, Camera cam)
         {
             activeTimer -= deltaTime;
-            if (activeTimer <= 0.0f) IsActive = false;
+            if (activeTimer <= 0.0f) { IsActive = false; }
         }
 
-        private List<Body> ignoredBodies = new List<Body>();
         public override bool Use(float deltaTime, Character character = null)
         {
-            if (character == null || character.Removed) return false;
-            if (item.RequireAimToUse && !character.IsKeyDown(InputType.Aim)) return false;
+            if (character != null)
+            {
+                if (item.RequireAimToUse && !character.IsKeyDown(InputType.Aim)) { return false; }
+            }
             
-            float degreeOfSuccess = DegreeOfSuccess(character);
+            float degreeOfSuccess = character == null ? 0.5f : DegreeOfSuccess(character);
 
             if (Rand.Range(0.0f, 0.5f) > degreeOfSuccess)
             {
@@ -187,12 +189,15 @@ namespace Barotrauma.Items.Components
                     (float)Math.Sin(angle)) * Range * item.body.Dir);
 
             ignoredBodies.Clear();
-            foreach (Limb limb in character.AnimController.Limbs)
+            if (character != null)
             {
-                if (Rand.Range(0.0f, 0.5f) > degreeOfSuccess) continue;
-                ignoredBodies.Add(limb.body.FarseerBody);
+                foreach (Limb limb in character.AnimController.Limbs)
+                {
+                    if (Rand.Range(0.0f, 0.5f) > degreeOfSuccess) continue;
+                    ignoredBodies.Add(limb.body.FarseerBody);
+                }
+                ignoredBodies.Add(character.AnimController.Collider.FarseerBody);
             }
-            ignoredBodies.Add(character.AnimController.Collider.FarseerBody);
 
             IsActive = true;
             activeTimer = 0.1f;
@@ -200,7 +205,8 @@ namespace Barotrauma.Items.Components
             debugRayStartPos = ConvertUnits.ToDisplayUnits(rayStart);
             debugRayEndPos = ConvertUnits.ToDisplayUnits(rayEnd);
 
-            if (character.Submarine == null)
+            Submarine parentSub = character?.Submarine ?? item.Submarine;
+            if (parentSub == null)
             {
                 foreach (Submarine sub in Submarine.Loaded)
                 {
@@ -216,7 +222,7 @@ namespace Barotrauma.Items.Components
             }
             else
             {
-                Repair(rayStart - character.Submarine.SimPosition, rayEnd - character.Submarine.SimPosition, deltaTime, character, degreeOfSuccess, ignoredBodies);
+                Repair(rayStart - parentSub.SimPosition, rayEnd - parentSub.SimPosition, deltaTime, character, degreeOfSuccess, ignoredBodies);
             }
             
             UseProjSpecific(deltaTime, rayStart);
@@ -439,18 +445,7 @@ namespace Barotrauma.Items.Components
                 return true;
             }
             else if (targetBody.UserData is Item targetItem)
-            {
-                targetItem.IsHighlighted = true;
-                
-                ApplyStatusEffectsOnTarget(user, deltaTime, ActionType.OnUse, targetItem.AllPropertyObjects);
-
-                if (targetItem.body != null && !MathUtils.NearlyEqual(TargetForce, 0.0f))
-                {
-                    Vector2 dir = targetItem.WorldPosition - item.WorldPosition;
-                    dir = dir.LengthSquared() < 0.0001f ? Vector2.UnitY : Vector2.Normalize(dir);
-                    targetItem.body.ApplyForce(dir * TargetForce, maxVelocity: 10.0f);
-                }
-
+            {                
                 var levelResource = targetItem.GetComponent<LevelResource>();
                 if (levelResource != null && levelResource.Attached &&
                     levelResource.requiredItems.Any() &&
@@ -464,7 +459,23 @@ namespace Barotrauma.Items.Components
                         levelResource.DeattachTimer / levelResource.DeattachDuration,
                         GUI.Style.Red, GUI.Style.Green);
 #endif
+                    return true;
                 }
+                
+                if (!targetItem.Prefab.DamagedByRepairTools) { return false; }
+                if (item.GetComponent<Door>() == null && item.Condition <= 0) { return false; }
+
+                targetItem.IsHighlighted = true;
+                
+                ApplyStatusEffectsOnTarget(user, deltaTime, ActionType.OnUse, targetItem.AllPropertyObjects);
+
+                if (targetItem.body != null && !MathUtils.NearlyEqual(TargetForce, 0.0f))
+                {
+                    Vector2 dir = targetItem.WorldPosition - item.WorldPosition;
+                    dir = dir.LengthSquared() < 0.0001f ? Vector2.UnitY : Vector2.Normalize(dir);
+                    targetItem.body.ApplyForce(dir * TargetForce, maxVelocity: 10.0f);
+                }
+
                 FixItemProjSpecific(user, deltaTime, targetItem);
                 return true;
             }
@@ -642,26 +653,26 @@ namespace Barotrauma.Items.Components
                 }
 
 #if CLIENT
+                if (user == null) { return; }
                 // Hard-coded progress bars for welding doors stuck.
                 // A general purpose system could be better, but it would most likely require changes in the way we define the status effects in xml.
                 foreach (ISerializableEntity target in targets)
                 {
-                    if (target is Door door)
+                    if (!(target is Door door)) { continue; }
+                    
+                    if (!door.CanBeWelded) { continue; }
+                    for (int i = 0; i < effect.propertyNames.Length; i++)
                     {
-                        if (!door.CanBeWelded) continue;
-                        for (int i = 0; i < effect.propertyNames.Length; i++)
+                        string propertyName = effect.propertyNames[i];
+                        if (propertyName != "stuck") { continue; }
+                        if (door.SerializableProperties == null || !door.SerializableProperties.TryGetValue(propertyName, out SerializableProperty property)) { continue; }
+                        object value = property.GetValue(target);
+                        if (door.Stuck > 0)
                         {
-                            string propertyName = effect.propertyNames[i];
-                            if (propertyName != "stuck") { continue; }
-                            if (door.SerializableProperties == null || !door.SerializableProperties.TryGetValue(propertyName, out SerializableProperty property)) { continue; }
-                            object value = property.GetValue(target);
-                            if (door.Stuck > 0)
-                            {
-                                var progressBar = user.UpdateHUDProgressBar(door, door.Item.WorldPosition, door.Stuck / 100, Color.DarkGray * 0.5f, Color.White);
-                                if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
-                            }
+                            var progressBar = user.UpdateHUDProgressBar(door, door.Item.WorldPosition, door.Stuck / 100, Color.DarkGray * 0.5f, Color.White);
+                            if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
                         }
-                    }
+                    }                    
                 }
 #endif
             }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Throwable.cs

@@ -115,7 +115,7 @@ namespace Barotrauma.Items.Components
                     if (!MathUtils.IsValid(throwVector)) { throwVector = Vector2.UnitY; }
 
 #if SERVER
-                    GameServer.Log(picker.LogName + " threw " + item.Name, ServerLog.MessageType.ItemInteraction);
+                    GameServer.Log(GameServer.CharacterLogName(picker) + " threw " + item.Name, ServerLog.MessageType.ItemInteraction);
 #endif
                     Character thrower = picker;
                     item.Drop(thrower, createNetworkEvent: GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer);

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs

@@ -421,7 +421,10 @@ namespace Barotrauma.Items.Components
                 case "activate":
                 case "use":
                 case "trigger_in":
-                    item.Use(1.0f, sender);
+                    if (signal != "0")
+                    {
+                        item.Use(1.0f, sender);
+                    }
                     break;
                 case "toggle":
                     if (signal != "0")
@@ -734,12 +737,15 @@ namespace Barotrauma.Items.Components
 
         public virtual void Load(XElement componentElement, bool usePrefabValues)
         {
-            if (componentElement != null && !usePrefabValues) 
+            if (componentElement != null) 
             { 
                 foreach (XAttribute attribute in componentElement.Attributes())
                 {
                     if (!SerializableProperties.TryGetValue(attribute.Name.ToString().ToLowerInvariant(), out SerializableProperty property)) { continue; }
-                    property.TrySetValue(this, attribute.Value);
+                    if (property.OverridePrefabValues || !usePrefabValues)
+                    {
+                        property.TrySetValue(this, attribute.Value);
+                    }
                 }
                 ParseMsg();
                 OverrideRequiredItems(componentElement);
@@ -908,49 +914,56 @@ namespace Barotrauma.Items.Components
         #region AI related
         protected const float AIUpdateInterval = 0.2f;
         protected float aiUpdateTimer;
-
         private int itemIndex;
-        private List<Item> ignoredContainers = new List<Item>();
         private Character previousUser;
         protected bool FindSuitableContainer(Character character, Func<Item, float> priority, out Item suitableContainer)
         {
-            if (previousUser != character)
-            {
-                ignoredContainers.Clear();
-                previousUser = character;
-            }
             suitableContainer = null;
-            if (character.FindItem(ref itemIndex, out Item targetContainer, ignoredItems: ignoredContainers, customPriorityFunction: priority))
+            if (character.AIController is HumanAIController aiController)
             {
-                suitableContainer = targetContainer;
-                return true;
+                if (previousUser != character)
+                {
+                    previousUser = character;
+                    itemIndex = 0;
+                }
+                if (character.FindItem(ref itemIndex, out Item targetContainer, ignoredItems: aiController.IgnoredItems, customPriorityFunction: priority))
+                {
+                    suitableContainer = targetContainer;
+                    return true;
+                }
             }
             return false;
         }
 
         protected AIObjectiveContainItem AIContainItems<T>(ItemContainer container, Character character, AIObjective objective, int itemCount, bool equip, bool removeEmpty) where T : ItemComponent
         {
-            var containObjective = new AIObjectiveContainItem(character, container.GetContainableItemIdentifiers.ToArray(), container, objective.objectiveManager)
+            AIObjectiveContainItem containObjective = null;
+            if (character.AIController is HumanAIController aiController)
             {
-                targetItemCount = itemCount,
-                Equip = equip,
-                RemoveEmpty = removeEmpty,
-                GetItemPriority = i =>
+                containObjective = new AIObjectiveContainItem(character, container.GetContainableItemIdentifiers.ToArray(), container, objective.objectiveManager)
                 {
-                    if (i.ParentInventory?.Owner is Item)
+                    targetItemCount = itemCount,
+                    Equip = equip,
+                    RemoveEmpty = removeEmpty,
+                    GetItemPriority = i =>
                     {
-                        //don't take items from other items of the same type
-                        if (((Item)i.ParentInventory.Owner).GetComponent<T>() != null)
+                        if (i.ParentInventory?.Owner is Item)
                         {
-                            return 0.0f;
+                            //don't take items from other items of the same type
+                            if (((Item)i.ParentInventory.Owner).GetComponent<T>() != null)
+                            {
+                                return 0.0f;
+                            }
                         }
+                        return 1.0f;
                     }
-                    return 1.0f;
-                }
-            };
-            // TODO: are we sure that we want to abandon the objective here?
-            containObjective.Abandoned += () => objective.Abandon = true;
-            objective.AddSubObjective(containObjective);
+                };
+                containObjective.Abandoned += () =>
+                {
+                    aiController.IgnoredItems.Add(container.Item);
+                };
+                objective.AddSubObjective(containObjective);
+            }
             return containObjective;
         }
 
@@ -959,68 +972,71 @@ namespace Barotrauma.Items.Components
         /// </summary>
         protected bool AIDecontainEmptyItems(Character character, AIObjective objective, bool equip, ItemContainer sourceContainer = null)
         {
-            ItemContainer sourceC = sourceContainer ?? (item.OwnInventory?.Owner is Item it ? it.GetComponent<ItemContainer>() : null);
-            var containedItems = sourceContainer != null ? sourceContainer.Inventory.Items : item.OwnInventory.Items;
-            foreach (Item containedItem in containedItems)
+            if (character.AIController is HumanAIController aiController)
             {
-                if (containedItem != null && containedItem.Condition <= 0.0f)
+                ItemContainer sourceC = sourceContainer ?? (item.OwnInventory?.Owner is Item it ? it.GetComponent<ItemContainer>() : null);
+                var containedItems = sourceContainer != null ? sourceContainer.Inventory.Items : item.OwnInventory.Items;
+                foreach (Item containedItem in containedItems)
                 {
-                    if (FindSuitableContainer(character,
-                        i =>
-                        {
-                            var container = i.GetComponent<ItemContainer>();
-                            if (container == null) { return 0; }
-                            if (container.Inventory.IsFull()) { return 0; }
+                    if (containedItem != null && containedItem.Condition <= 0.0f)
+                    {
+                        if (FindSuitableContainer(character,
+                            i =>
+                            {
+                                var container = i.GetComponent<ItemContainer>();
+                                if (container == null) { return 0; }
+                                if (container.Inventory.IsFull()) { return 0; }
                             // Ignore containers that are identical to the source container
                             if (sourceC != null && container.Item.Prefab == sourceC.Item.Prefab) { return 0; }
-                            if (container.ShouldBeContained(containedItem, out bool isRestrictionsDefined))
-                            {
-                                if (isRestrictionsDefined)
+                                if (container.ShouldBeContained(containedItem, out bool isRestrictionsDefined))
                                 {
-                                    return 4;
-                                }
-                                else
-                                {
-                                    if (containedItem.Prefab.IsContainerPreferred(container, out bool isPreferencesDefined, out bool isSecondary))
+                                    if (isRestrictionsDefined)
                                     {
-                                        return isPreferencesDefined ? isSecondary ? 2 : 3 : 1;
+                                        return 4;
                                     }
                                     else
                                     {
-                                        return isPreferencesDefined ? 0 : 1;
+                                        if (containedItem.Prefab.IsContainerPreferred(container, out bool isPreferencesDefined, out bool isSecondary))
+                                        {
+                                            return isPreferencesDefined ? isSecondary ? 2 : 3 : 1;
+                                        }
+                                        else
+                                        {
+                                            return isPreferencesDefined ? 0 : 1;
+                                        }
                                     }
                                 }
-                            }
-                            else
+                                else
+                                {
+                                    return 0;
+                                }
+                            }, out Item targetContainer))
+                        {
+                            var decontainObjective = new AIObjectiveDecontainItem(character, containedItem, objective.objectiveManager, sourceC, targetContainer?.GetComponent<ItemContainer>())
                             {
-                                return 0;
-                            }
-                        }, out Item targetContainer))
-                    {
-                        var decontainObjective = new AIObjectiveDecontainItem(character, containedItem, objective.objectiveManager, sourceC, targetContainer?.GetComponent<ItemContainer>())
-                        {
-                            Equip = equip
-                        };
-                        decontainObjective.Abandoned += () =>
-                        {
-                            itemIndex = 0;
-                            if (targetContainer != null)
-                            {
-                                ignoredContainers.Add(targetContainer);
-                            }
-                        };
-                        decontainObjective.Completed += () =>
-                        {
-                            if (targetContainer == null)
+                                Equip = equip
+                            };
+                            decontainObjective.Abandoned += () =>
                             {
                                 itemIndex = 0;
-                            }
-                        };
-                        objective.AddSubObjectiveInQueue(decontainObjective);
-                    }
-                    else
-                    {
-                        return false;
+                                if (targetContainer != null)
+                                {
+                                    aiController.IgnoredItems.Add(targetContainer);
+                                }
+                            };
+                            decontainObjective.Completed += () =>
+                            {
+                                if (targetContainer == null)
+                                {
+                                    itemIndex = 0;
+                                }
+                            };
+                            objective.AddSubObjectiveInQueue(decontainObjective);
+                        }
+                        else
+                        {
+                            return false;
+                        }
                     }
                 }
             }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs

@@ -80,6 +80,13 @@ namespace Barotrauma.Items.Components
             set { itemRotation = MathHelper.ToRadians(value); }
         }
 
+        [Serialize("", false, description: "Specify an item for the container to spawn with.")]
+        public string SpawnWithId
+        {
+            get;
+            set;
+        }
+
         public bool ShouldBeContained(string[] identifiersOrTags, out bool isRestrictionsDefined)
         {
             isRestrictionsDefined = containableRestrictions.Any();
@@ -143,7 +150,7 @@ namespace Barotrauma.Items.Components
             }
 
             //no need to Update() if this item has no statuseffects and no physics body
-            IsActive = itemsWithStatusEffects.Count > 0 || containedItem.body != null;
+            IsActive = itemsWithStatusEffects.Count > 0 || Inventory.Items.Any(it => it?.body != null);
         }
 
         public void OnItemRemoved(Item containedItem)
@@ -151,7 +158,7 @@ namespace Barotrauma.Items.Components
             itemsWithStatusEffects.RemoveAll(i => i.First == containedItem);
 
             //deactivate if the inventory is empty
-            IsActive = itemsWithStatusEffects.Count > 0 || containedItem.body != null;
+            IsActive = itemsWithStatusEffects.Count > 0 || Inventory.Items.Any(it => it?.body != null);
         }
 
         public bool CanBeContained(Item item)
@@ -200,6 +207,22 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public override void OnItemLoaded()
+        {
+            base.OnItemLoaded();
+            if (SpawnWithId.Length > 0)
+            {
+                ItemPrefab prefab = ItemPrefab.Prefabs.Find(m => m.Identifier == SpawnWithId);                
+                if (prefab != null)
+                {                    
+                    if (Inventory != null && Inventory.Items.Any(it => it == null))
+                    {
+                        Entity.Spawner?.AddToSpawnQueue(prefab, Inventory);
+                    }
+                }
+            }
+        }
+
         public override bool HasRequiredItems(Character character, bool addMessage, string msg = null)
         {
             return (!AccessOnlyWhenBroken || Item.Condition <= 0) && base.HasRequiredItems(character, addMessage, msg);
@@ -295,7 +318,7 @@ namespace Barotrauma.Items.Components
 
             foreach (Item contained in Inventory.Items)
             {
-                if (contained == null) continue;
+                if (contained == null) { continue; }
                 if (contained.body != null)
                 {
                     try
@@ -311,6 +334,7 @@ namespace Barotrauma.Items.Components
                             GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
                             "SetTransformIgnoreContacts threw an exception in SetContainedItemPositions (" + e.Message + ")\n" + e.StackTrace);
                     }
+                    contained.body.Submarine = item.Submarine;
                 }
 
                 contained.Rect =

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs

@@ -39,8 +39,6 @@ namespace Barotrauma.Items.Components
         private Item focusTarget;
         private float targetRotation;
 
-        private bool state;
-
         public Vector2 UserPos
         {
             get { return userPos; }
@@ -61,6 +59,18 @@ namespace Barotrauma.Items.Components
             set;
         }
 
+        [Editable, Serialize(false, false, description: "Whether the item is toggled on/off. Only valid if IsToggle is set to true.")]
+        public bool State
+        {
+            get;
+            set;
+        }
+
+        public bool ControlCharacterPose
+        {
+            get { return limbPositions.Count > 0; }
+        }
+
         public Controller(Item item, XElement element)
             : base(item, element)
         {
@@ -99,7 +109,7 @@ namespace Barotrauma.Items.Components
 
             if (IsToggle)
             {
-                item.SendSignal(0, state ? "1" : "0", "signal_out", sender: null);
+                item.SendSignal(0, State ? "1" : "0", "signal_out", sender: null);
             }
 
             if (user == null 
@@ -272,7 +282,7 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
-        private Item GetFocusTarget()
+        public Item GetFocusTarget()
         {
             item.SendSignal(0, MathHelper.ToDegrees(targetRotation).ToString("G", CultureInfo.InvariantCulture), "position_out", user);
 
@@ -294,7 +304,7 @@ namespace Barotrauma.Items.Components
             {
                 if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
                 {
-                    state = !state;
+                    State = !State;
 #if SERVER
                     item.CreateServerEvent(this);
 #endif

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs

@@ -113,7 +113,7 @@ namespace Barotrauma.Items.Components
 
                 if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
                 {
-                    if (targetItem.Prefab.DeconstructItems.Any())
+                    if (targetItem.Prefab.AllowDeconstruct)
                     {
                         //drop all items that are inside the deconstructed item
                         foreach (ItemContainer ic in targetItem.GetComponents<ItemContainer>())
@@ -200,7 +200,7 @@ namespace Barotrauma.Items.Components
 #if SERVER
             if (user != null)
             {
-                GameServer.Log(user.LogName + (IsActive ? " activated " : " deactivated ") + item.Name, ServerLog.MessageType.ItemInteraction);
+                GameServer.Log(GameServer.CharacterLogName(user) + (IsActive ? " activated " : " deactivated ") + item.Name, ServerLog.MessageType.ItemInteraction);
             }
 #endif
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Engine.cs

@@ -23,7 +23,7 @@ namespace Barotrauma.Items.Components
         private float prevVoltage;
 
         private float controlLockTimer;
-        
+
         [Editable(0.0f, 10000000.0f), 
         Serialize(2000.0f, true, description: "The amount of force exerted on the submarine when the engine is operating at full power.")]
         public float MaxForce
@@ -119,12 +119,15 @@ namespace Barotrauma.Items.Components
                 float max = 1 + maxChangeSpeed;
                 UpdateAITargets(Math.Clamp(noise, min, max), deltaTime);
 #if CLIENT
-                for (int i = 0; i < 5; i++)
+                particleTimer -= deltaTime;
+                if (particleTimer <= 0.0f)
                 {
+                    Vector2 particleVel = -currForce.ClampLength(5000.0f) / 5.0f;
                     GameMain.ParticleManager.CreateParticle("bubbles", item.WorldPosition + PropellerPos,
-                        -currForce / 5.0f + new Vector2(Rand.Range(-100.0f, 100.0f), Rand.Range(-50f, 50f)),
+                        particleVel * Rand.Range(0.9f, 1.1f),
                         0.0f, item.CurrentHull);
-                }
+                    particleTimer = 1.0f / particlesPerSec;
+                }                
 #endif
             }
         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Fabricator.cs

@@ -180,7 +180,7 @@ namespace Barotrauma.Items.Components
 #if SERVER
             if (user != null)
             {
-                GameServer.Log(user.LogName + " started fabricating " + selectedItem.DisplayName + " in " + item.Name, ServerLog.MessageType.ItemInteraction);
+                GameServer.Log(GameServer.CharacterLogName(user) + " started fabricating " + selectedItem.DisplayName + " in " + item.Name, ServerLog.MessageType.ItemInteraction);
             }
 #endif
         }
@@ -216,7 +216,7 @@ namespace Barotrauma.Items.Components
 #if SERVER
             if (user != null)
             {
-                GameServer.Log(user.LogName + " cancelled the fabrication of " + fabricatedItem.DisplayName + " in " + item.Name, ServerLog.MessageType.ItemInteraction);
+                GameServer.Log(GameServer.CharacterLogName(user) + " cancelled the fabrication of " + fabricatedItem.DisplayName + " in " + item.Name, ServerLog.MessageType.ItemInteraction);
             }
 #endif
         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/OxygenGenerator.cs

@@ -22,7 +22,7 @@ namespace Barotrauma.Items.Components
             private set;
         }
 
-        [Editable, Serialize(400.0f, true, description: "How much oxygen the machine generates when operating at full power.")]
+        [Editable, Serialize(400.0f, true, description: "How much oxygen the machine generates when operating at full power.", alwaysUseInstanceValues: true)]
         public float GeneratedAmount
         {
             get { return generatedAmount; }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Pump.cs

@@ -27,7 +27,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [Editable, Serialize(80.0f, false, description: "How fast the item pumps water in/out when operating at 100%.")]
+        [Editable, Serialize(80.0f, false, description: "How fast the item pumps water in/out when operating at 100%.", alwaysUseInstanceValues: true)]
         public float MaxFlow
         {
             get { return maxFlow; }
@@ -45,6 +45,7 @@ namespace Barotrauma.Items.Components
         }
 
         public bool HasPower => IsActive && Voltage >= MinVoltage;
+        public bool IsAutoControlled => pumpSpeedLockTimer > 0.0f || isActiveLockTimer > 0.0f;
 
         public Pump(Item item, XElement element)
             : base(item, element)
@@ -130,7 +131,7 @@ namespace Barotrauma.Items.Components
             if (objective.Option.Equals("stoppumping", StringComparison.OrdinalIgnoreCase))
             {
 #if SERVER
-                if (FlowPercentage > 0.0f)
+                if (objective.Override || FlowPercentage > 0.0f)
                 {
                     item.CreateServerEvent(this);
                 }
@@ -141,7 +142,7 @@ namespace Barotrauma.Items.Components
             else
             {
 #if SERVER
-                if (!IsActive || FlowPercentage > -100.0f)
+                if (objective.Override || !IsActive || FlowPercentage > -100.0f)
                 {
                     item.CreateServerEvent(this);
                 }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Reactor.cs

@@ -78,7 +78,7 @@ namespace Barotrauma.Items.Components
             }
         }
         
-        [Editable(0.0f, float.MaxValue), Serialize(10000.0f, true, description: "How much power (kW) the reactor generates when operating at full capacity.")]
+        [Editable(0.0f, float.MaxValue), Serialize(10000.0f, true, description: "How much power (kW) the reactor generates when operating at full capacity.", alwaysUseInstanceValues: true)]
         public float MaxPowerOutput
         {
             get { return maxPowerOutput; }
@@ -190,7 +190,7 @@ namespace Barotrauma.Items.Components
             {
                 if (Timing.TotalTime >= (float)nextServerLogWriteTime)
                 {
-                    GameServer.Log(lastUser.LogName + " adjusted reactor settings: " +
+                    GameServer.Log(GameServer.CharacterLogName(lastUser) + " adjusted reactor settings: " +
                             "Temperature: " + (int)(temperature * 100.0f) +
                             ", Fission rate: " + (int)targetFissionRate +
                             ", Turbine output: " + (int)targetTurbineOutput +
@@ -330,6 +330,8 @@ namespace Barotrauma.Items.Components
             }
 
             item.SendSignal(0, ((int)(temperature * 100.0f)).ToString(), "temperature_out", null);
+            item.SendSignal(0, ((int)-CurrPowerConsumption).ToString(), "power_value_out", null);
+            item.SendSignal(0, ((int)load).ToString(), "load_value_out", null);
 
             UpdateFailures(deltaTime);
 #if CLIENT
@@ -622,7 +624,8 @@ namespace Barotrauma.Items.Components
                     AutoTemp = false;
                     targetFissionRate = 0.0f;
                     targetTurbineOutput = 0.0f;
-                    break;
+                    unsentChanges = true;
+                    return true;
             }
 
             if (autoTemp != prevAutoTemp ||
@@ -653,17 +656,23 @@ namespace Barotrauma.Items.Components
                     }
                     break;
                 case "set_fissionrate":
-                    if (float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out float newFissionRate))
+                    if (PowerOn && float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out float newFissionRate))
                     {
-                        FissionRate = newFissionRate;
+                        targetFissionRate = newFissionRate;
                         unsentChanges = true;
+#if CLIENT
+                        FissionRateScrollBar.BarScroll = targetFissionRate / 100.0f;
+#endif
                     }
                     break;
                 case "set_turbineoutput":
-                    if (float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out float newTurbineOutput))
+                    if (PowerOn && float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out float newTurbineOutput))
                     {
-                        TurbineOutput = newTurbineOutput;
+                        targetTurbineOutput = newTurbineOutput;
                         unsentChanges = true;
+#if CLIENT
+                        TurbineOutputScrollBar.BarScroll = targetTurbineOutput / 100.0f;
+#endif
                     }
                     break;
             }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Steering.cs

@@ -108,10 +108,17 @@ namespace Barotrauma.Items.Components
 
         public Vector2 TargetVelocity
         {
-            get { return targetVelocity;}
-            set 
+            get { return targetVelocity; }
+            set
             {
-                if (!MathUtils.IsValid(value)) return;
+                if (!MathUtils.IsValid(value))
+                {
+                    if (!MathUtils.IsValid(targetVelocity))
+                    {
+                        targetVelocity = Vector2.Zero;
+                    }
+                    return;
+                }
                 targetVelocity.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
                 targetVelocity.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
             }
@@ -285,7 +292,7 @@ namespace Barotrauma.Items.Components
             if (AutoPilot)
             {
                 UpdateAutoPilot(deltaTime);
-                targetVelocity = targetVelocity.ClampLength(MathHelper.Lerp(AutoPilotMaxSpeed, AIPilotMaxSpeed, userSkill) * 100.0f);
+                TargetVelocity = TargetVelocity.ClampLength(MathHelper.Lerp(AutoPilotMaxSpeed, AIPilotMaxSpeed, userSkill) * 100.0f);
             }
             else
             {
@@ -443,41 +450,46 @@ namespace Barotrauma.Items.Components
             //steer away from other subs
             foreach (Submarine sub in Submarine.Loaded)
             {
-                if (sub == controlledSub) continue;
-                if (controlledSub.DockedTo.Contains(sub)) continue;
-
-                float thisSize = Math.Max(controlledSub.Borders.Width, controlledSub.Borders.Height);
-                float otherSize = Math.Max(sub.Borders.Width, sub.Borders.Height);
-
+                if (sub == controlledSub) { continue; }
+                if (controlledSub.DockedTo.Contains(sub)) { continue; }
+                Point sizeSum = controlledSub.Borders.Size + sub.Borders.Size;
+                Vector2 minDist = sizeSum.ToVector2() / 2;
                 Vector2 diff = controlledSub.WorldPosition - sub.WorldPosition;
-                float dist = diff == Vector2.Zero ? 0.0f : diff.Length();
-
-                //far enough -> ignore
-                if (dist > thisSize + otherSize) continue;
-
-                Vector2 dir = dist <= 0.0001f ? Vector2.UnitY : diff / dist;
-                float dot = controlledSub.Velocity == Vector2.Zero ?
-                    0.0f : Vector2.Dot(Vector2.Normalize(controlledSub.Velocity), -dir);
-
-                //heading away -> ignore
-                if (dot < 0.0f) continue;
-
-                targetVelocity += diff * 200.0f;
+                float xDist = Math.Abs(diff.X);
+                float yDist = Math.Abs(diff.Y);
+                Vector2 maxAvoidDistance = minDist * 2;
+                if (xDist > maxAvoidDistance.X || yDist > maxAvoidDistance.Y)
+                {
+                    //far enough -> ignore
+                    continue;
+                }
+                float dot = controlledSub.Velocity == Vector2.Zero ? 0.0f : Vector2.Dot(Vector2.Normalize(controlledSub.Velocity), -diff);
+                if (dot < 0.0f)
+                {
+                    //heading away -> ignore
+                    continue;
+                }
+                float distanceFactor = MathHelper.Lerp(0, 1, MathUtils.InverseLerp(maxAvoidDistance.X + maxAvoidDistance.Y, minDist.X + minDist.Y, xDist + yDist));
+                float velocityFactor = MathHelper.Lerp(0, 1, MathUtils.InverseLerp(0, 3, controlledSub.Velocity.Length()));
+                TargetVelocity += 100 * Vector2.Normalize(diff) * distanceFactor * velocityFactor;
             }
 
-            //clamp velocity magnitude to 100.0f
-            float velMagnitude = targetVelocity.Length();
+            //clamp velocity magnitude to 100.0f (Is this required? The X and Y components are clamped in the property setter)
+            float velMagnitude = TargetVelocity.Length();
             if (velMagnitude > 100.0f)
             {
-                targetVelocity *= 100.0f / velMagnitude;
+                TargetVelocity *= 100.0f / velMagnitude;
             }
         }
 
         private void UpdatePath()
         {
             if (Level.Loaded == null) { return; }
-            
-            if (pathFinder == null) pathFinder = new PathFinder(WayPoint.WayPointList, false);
+
+            if (pathFinder == null)
+            {
+                pathFinder = new PathFinder(WayPoint.WayPointList, false);
+            }
 
             Vector2 target;
             if (LevelEndSelected)

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerTransfer.cs

@@ -316,6 +316,8 @@ namespace Barotrauma.Items.Components
                 {
                     if (recipient.Item == item || recipient.Item == source) { continue; }
 
+                    source?.LastSentSignalRecipients.Add(recipient.Item);
+
                     foreach (ItemComponent ic in recipient.Item.Components)
                     {
                         //other junction boxes don't need to receive the signal in the pass-through signal connections

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/Powered.cs

@@ -140,6 +140,7 @@ namespace Barotrauma.Items.Components
 
         public override void Update(float deltaTime, Camera cam)
         {
+            currPowerConsumption = powerConsumption;
             UpdateOnActiveEffects(deltaTime);
         }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs

@@ -241,7 +241,6 @@ namespace Barotrauma.Items.Components
         private void Launch(Vector2 impulse)
         {
             hits.Clear();
-            MaxTargetsToHit = 2;
 
             if (item.AiTarget != null)
             {
@@ -294,6 +293,12 @@ namespace Barotrauma.Items.Components
             {
                 //shooting indoors, do a hitscan outside as well
                 hits.AddRange(DoRayCast(rayStart + item.Submarine.SimPosition, rayEnd + item.Submarine.SimPosition));
+                //also in the coordinate space of docked subs
+                foreach (Submarine dockedSub in item.Submarine.DockedTo)
+                {
+                    if (dockedSub == item.Submarine) { continue; }
+                    hits.AddRange(DoRayCast(rayStart + item.Submarine.SimPosition - dockedSub.SimPosition, rayEnd + item.Submarine.SimPosition - dockedSub.SimPosition));
+                }
             }
             else
             {
@@ -354,7 +359,7 @@ namespace Barotrauma.Items.Components
             {
                 //ignore sensors and items
                 if (fixture?.Body == null || fixture.IsSensor) { return true; }
-                if (fixture.Body.UserData is Item item  && item.GetComponent<Door>() == null && !item.Prefab.DamagedByProjectiles) { return true; }
+                if (fixture.Body.UserData is Item item && (item.GetComponent<Door>() == null && !item.Prefab.DamagedByProjectiles || item.Condition <= 0)) { return true; }
                 if (fixture.Body?.UserData as string == "ruinroom") { return true; }
 
                 //ignore everything else than characters, sub walls and level walls
@@ -374,7 +379,7 @@ namespace Barotrauma.Items.Components
                 //ignore sensors and items
                 if (fixture?.Body == null || fixture.IsSensor) { return -1; }
 
-                if (fixture.Body.UserData is Item item && item.GetComponent<Door>() == null && !item.Prefab.DamagedByProjectiles) { return -1; }
+                if (fixture.Body.UserData is Item item && (item.GetComponent<Door>() == null && !item.Prefab.DamagedByProjectiles || item.Condition <= 0)) { return -1; }
                 if (fixture.Body?.UserData as string == "ruinroom") { return -1; }
 
                 //ignore everything else than characters, sub walls and level walls
@@ -410,9 +415,9 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            if (stickJoint == null || StickPermanently) { return; }
+            if (stickJoint == null) { return; }
 
-            if (persistentStickJointTimer > 0.0f)
+            if (persistentStickJointTimer > 0.0f && !StickPermanently)
             {
                 persistentStickJointTimer -= deltaTime;
                 return;
@@ -420,20 +425,25 @@ namespace Barotrauma.Items.Components
 
             if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
             {
-                if (stickJoint.JointTranslation < stickJoint.LowerLimit * 0.9f ||
-                    stickJoint.JointTranslation > stickJoint.UpperLimit * 0.9f)
+                if (StickTargetRemoved() ||
+                    (!StickPermanently && (stickJoint.JointTranslation < stickJoint.LowerLimit * 0.9f || stickJoint.JointTranslation > stickJoint.UpperLimit * 0.9f)))
                 {
                     Unstick();
-                }
 #if SERVER
-                if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
-                {
-                    item.CreateServerEvent(this);
-                }
+                    item.CreateServerEvent(this);                
 #endif
+                }
             }
         }
 
+        private bool StickTargetRemoved()
+        {
+            if (StickTarget == null) { return true; }
+            if (StickTarget.UserData is Limb limb) { return limb.character.Removed; }
+            if (StickTarget.UserData is Entity entity) { return entity.Removed; }
+            return false;
+        }
+
 
         private bool OnProjectileCollision(Fixture f1, Fixture target, Contact contact)
         {
@@ -529,7 +539,7 @@ namespace Barotrauma.Items.Components
             }
             else if (target.Body.UserData is Item targetItem)
             {
-                if (attack != null && targetItem.Prefab.DamagedByProjectiles) 
+                if (attack != null && targetItem.Prefab.DamagedByProjectiles && targetItem.Condition > 0) 
                 {
                     attackResult = attack.DoDamage(User, targetItem, item.WorldPosition, 1.0f); 
                 }
@@ -604,7 +614,7 @@ namespace Barotrauma.Items.Components
             if (hits.Count() >= MaxTargetsToHit)
             {
                 item.body.FarseerBody.OnCollision -= OnProjectileCollision;
-                if (item.Prefab.DamagedByProjectiles || item.Prefab.DamagedByMeleeWeapons)
+                if ((item.Prefab.DamagedByProjectiles || item.Prefab.DamagedByMeleeWeapons) && item.Condition > 0)
                 {
                     item.body.CollisionCategories = Physics.CollisionCharacter;
                     item.body.CollidesWith = Physics.CollisionWall | Physics.CollisionLevel | Physics.CollisionPlatform | Physics.CollisionProjectile;
@@ -623,6 +633,7 @@ namespace Barotrauma.Items.Components
                 item.body.LinearVelocity *= 0.1f;
             }
             else if (Vector2.Dot(velocity, collisionNormal) < 0.0f && hits.Count() >= MaxTargetsToHit &&
+                        target.Body.Mass > item.body.Mass * 0.5f &&
                         (DoesStick ||
                         (StickToCharacters && target.Body.UserData is Limb) ||
                         (StickToStructures && target.Body.UserData is Structure) ||
@@ -692,6 +703,7 @@ namespace Barotrauma.Items.Components
             if (StickPermanently)
             {
                 stickJoint.LowerLimit = stickJoint.UpperLimit = 0.0f;
+                item.body.ResetDynamics();
             }
             else if (item.Sprite != null)
             {