Merge remote-tracking branch 'upstream/master' into develop

2024-06-18 12:19:13 -03:00
parent 60d0a8d453 230d1b6e78
commit e163f7ed73
263 changed files with 7788 additions and 2849 deletions
@@ -231,6 +231,12 @@ namespace Barotrauma
                {
                    campaign.Bank.Deduct(selectedSub.Price);
                    campaign.Bank.Balance = Math.Max(campaign.Bank.Balance, 0);
+#if SERVER
+                    if (GameMain.Server?.ServerSettings?.NewCampaignDefaultSalary is { } salary)
+                    {
+                        campaign.Bank.SetRewardDistribution((int)Math.Round(salary, digits: 0));
+                    }
+#endif
                }
                return campaign;
            }
@@ -970,6 +976,8 @@ namespace Barotrauma
                {
                    ToggleTabMenu();
                }
+                DeathPrompt?.Close();
+                DeathPrompt.CloseBotPanel();

                GUI.PreventPauseMenuToggle = true;