From 907f4b39cd40eb0ca4a555400e8088faa3d61d7d Mon Sep 17 00:00:00 2001 From: pathetic meowmeow Date: Tue, 22 Apr 2025 08:34:53 -0400 Subject: [PATCH] Make funding allocation computer more configurable (#36790) * Make funding allocation computer more configurable * admin logging * unused * ccvar enabled --------- Co-authored-by: ScarKy0 --- ...dingAllocationConsoleBoundUserInterface.cs | 4 +- .../Cargo/UI/FundingAllocationMenu.xaml | 13 ++-- .../Cargo/UI/FundingAllocationMenu.xaml.cs | 74 +++++++++++++++++-- .../Cargo/Systems/CargoSystem.Funds.cs | 28 ++++++- .../Cargo/Systems/CargoSystem.Shuttle.cs | 9 ++- Content.Server/Cargo/Systems/CargoSystem.cs | 3 + Content.Shared/CCVar/CCVars.Cargo.cs | 26 +++++++ .../FundingAllocationConsoleComponent.cs | 6 +- .../Cargo/Components/OverrideSellComponent.cs | 6 -- .../Components/StationBankAccountComponent.cs | 6 ++ .../en-US/cargo/cargo-console-component.ftl | 6 +- 11 files changed, 155 insertions(+), 26 deletions(-) create mode 100644 Content.Shared/CCVar/CCVars.Cargo.cs diff --git a/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs index eb65be40d3..49a545b480 100644 --- a/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs @@ -17,9 +17,9 @@ public sealed class FundingAllocationConsoleBoundUserInterface(EntityUid owner, _menu = this.CreateWindow(); - _menu.OnSavePressed += d => + _menu.OnSavePressed += (dicts, primary, lockbox) => { - SendMessage(new SetFundingAllocationBuiMessage(d)); + SendMessage(new SetFundingAllocationBuiMessage(dicts, primary, lockbox)); }; } diff --git a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml index 0686ea77d8..62f0ae924a 100644 --- a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml +++ b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml @@ -1,15 +1,18 @@  + Title="{Loc 'cargo-funding-alloc-console-menu-title'}"> -