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

2023-10-19 13:36:40 -03:00
parent a65d99021c 72f860acfd
commit 7f311a6526
21 changed files with 196 additions and 89 deletions
@@ -265,7 +265,7 @@ namespace Barotrauma
        {
            if (!IgnoreAtOutpost) { return false; }
            if (!Level.IsLoadedFriendlyOutpost) { return false; }
-            if (!character.IsOnPlayerTeam) { return false; }
+            if (!character.IsOnPlayerTeam || character.IsFriendlyNPCTurnedHostile) { return false; }
            if (character.Submarine?.Info == null) { return false; }
            return character.Submarine.Info.IsOutpost && character.Submarine.TeamID == CharacterTeamType.FriendlyNPC;
        }