Merge branch 'CBT' into dev_itemrefactor

2026-04-30 22:15:38 +08:00
parent d5d14e9684 b5b25a2ccb
commit f9ad542029
427 changed files with 24386 additions and 11539 deletions
@@ -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; }