OBT/1.2.0(Spring Update)

Sync with Upstream

Barotrauma/BarotraumaServer/ServerSource/Events/EventManager.cs

@@ -79,6 +79,15 @@ namespace Barotrauma
                             convAction.SelectedOption = selectedOption;
                             if (convAction.Options.Any() && !convAction.GetEndingOptions().Contains(selectedOption))
                             {
+                                var option = convAction.Options[selectedOption];
+                                if (option.ForceSay && sender.Character != null)
+                                {
+                                    sender.Character.ForceSay(
+                                        option.ForceSayText.IsNullOrEmpty() ? TextManager.Get(option.Text).Fallback(option.Text) : TextManager.Get(option.ForceSayText).Fallback(option.ForceSayText),
+                                        option.ForceSayInRadio,
+                                        option.ForceSayRemoveQuotes);
+                                }
+
                                 foreach (Client c in convAction.TargetClients)
                                 {
                                     if (c == sender) { continue; }                                    

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/CombatMission.cs

@@ -133,7 +133,7 @@ namespace Barotrauma
             switch (winCondition)
             {
                 case WinCondition.LastManStanding:
-                    if (crews[0].Count == 0 || crews[1].Count == 0)
+                    if (crews[0].Count == 0 && crews[1].Count == 0)
                     {
                         //if there are no characters in either crew, end the round
                         teamDead[0] = teamDead[1] = true;