Unstable 0.1300.0.3

2021-03-25 15:40:24 +02:00
parent 874616027b
commit 58c50a235d
136 changed files with 2486 additions and 1008 deletions
@@ -178,7 +178,7 @@ namespace Barotrauma
                {
                    if (Timing.TotalTime < GameMain.GameSession.RoundStartTime + 120.0f && 
                        speaker?.CurrentHull != null && 
-                        speaker.TeamID == CharacterTeamType.FriendlyNPC && 
+                        (speaker.TeamID == CharacterTeamType.FriendlyNPC || speaker.TeamID == CharacterTeamType.None) && 
                        Character.CharacterList.Any(c => c.TeamID != speaker.TeamID && c.CurrentHull == speaker.CurrentHull)) 
                    {
                        currentFlags.Add("EnterOutpost"); 
@@ -188,6 +188,11 @@ namespace Barotrauma
                {
                    currentFlags.Add("Casual");
                }
+
+                if (GameMain.GameSession.IsCurrentLocationRadiated())
+                {
+                    currentFlags.Add("InRadiation");
+                }
            }

            if (speaker != null)