(5c35a640e) Update tutorial-rework with dev

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

@@ -115,6 +115,7 @@ namespace Barotrauma
                         unreachable.Add(goToObjective.Target as Hull);
                     }
                     goToObjective = null;
+                    SteeringManager.SteeringWander();
                 }
             }
             else if (currentHull != null)
@@ -131,6 +132,11 @@ namespace Barotrauma
 
                 foreach (Character enemy in Character.CharacterList)
                 {
+                    //don't run from friendly NPCs
+                    if (enemy.TeamID == Character.TeamType.FriendlyNPC) { continue; }
+                    //friendly NPCs don't run away from anything but characters controlled by EnemyAIController (= monsters)
+                    if (character.TeamID == Character.TeamType.FriendlyNPC && !(enemy.AIController is EnemyAIController)) { continue; }
+
                     if (enemy.CurrentHull == currentHull && !enemy.IsDead && !enemy.IsUnconscious && 
                         (enemy.AIController is EnemyAIController || enemy.TeamID != character.TeamID))
                     {