From fd728fdd08cbbd566ef4edd163b1ccae2f2761df Mon Sep 17 00:00:00 2001
From: pathetic meowmeow <uhhadd@gmail.com>
Date: Wed, 16 Apr 2025 18:05:13 -0400
Subject: [PATCH] Early cherrypick of Departmental Economy (#36445) (#3458)

* Departmental Economy (#36445)

* Cargo Accounts, Request Consoles, and lock boxes

* Funding Allocation Computer

* final changes

* test fix

* remove dumb code

* ScarKy0 review

* first cour

* second cour

* Update machines.yml

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
(cherry picked from commit 12b75beeab27f8905d6d3f07b7bbda2cfd859b5e)

* Fix station income instantly accumulating roundstart (#36572)

Fix station money accumulating roundstart

(cherry picked from commit ed3e4c7d4ea82f000ef963e393d01f73484417a9)

* DeltaV departmental economy

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---
 .../CargoOrderConsoleBoundUserInterface.cs    |  33 ++-
 ...dingAllocationConsoleBoundUserInterface.cs |  35 +++
 Content.Client/Cargo/UI/CargoConsoleMenu.xaml | 117 ++++----
 .../Cargo/UI/CargoConsoleMenu.xaml.cs         | 139 +++++++--
 Content.Client/Cargo/UI/CargoOrderRow.xaml    |   8 +-
 Content.Client/Cargo/UI/CargoProductRow.xaml  |   6 +-
 .../Cargo/UI/FundingAllocationMenu.xaml       |  29 ++
 .../Cargo/UI/FundingAllocationMenu.xaml.cs    | 169 +++++++++++
 .../Cargo/Components/CargoPalletComponent.cs  |   2 -
 .../Components/CargoPalletConsoleComponent.cs |   6 +-
 .../Components/StationBankAccountComponent.cs |  19 --
 .../StationCargoOrderDatabaseComponent.cs     |  12 +-
 .../Cargo/Systems/CargoSystem.Bounty.cs       |  17 +-
 .../Cargo/Systems/CargoSystem.Funds.cs        | 144 +++++++++
 .../Cargo/Systems/CargoSystem.Orders.cs       | 159 +++++-----
 .../Cargo/Systems/CargoSystem.Shuttle.cs      | 108 ++++---
 .../Cargo/Systems/CargoSystem.Telepad.cs      |  36 ++-
 Content.Server/Cargo/Systems/CargoSystem.cs   |  43 +--
 Content.Server/Delivery/DeliverySystem.cs     |   0
 Content.Server/Stack/StackSystem.cs           |   2 +-
 .../Station/Systems/StationSystem.cs          |   4 +-
 .../Components/CargoGiftsRuleComponent.cs     |   6 +
 .../StationEvents/Events/CargoGiftsRule.cs    |   3 +-
 .../StationLogisticStatsDatabaseComponent.cs  |   3 +-
 .../_DV/Cargo/Systems/LogisticStatsSystem.cs  |   2 +-
 .../_DV/Cargo/Systems/StockMarketSystem.cs    |   5 +-
 .../Cartridges/StockTradingCartridgeSystem.cs |   6 +-
 .../_DV/Mail/EntitySystems/MailSystem.cs      |  11 +-
 .../_DV/Shipyard/ShipyardConsoleSystem.cs     |  22 +-
 .../Components/IdCardConsoleComponent.cs      |   1 +
 .../Cargo/BUI/CargoConsoleInterfaceState.cs   |   8 +-
 .../Cargo/Components/BankClientComponent.cs   |  25 --
 .../Components/CargoOrderConsoleComponent.cs  | 100 ++++++-
 .../FundingAllocationConsoleComponent.cs      |  49 ++++
 .../Cargo/Components/OverrideSellComponent.cs |  17 ++
 .../Components/StationBankAccountComponent.cs |  79 +++++
 .../Cargo/Prototypes/CargoAccountPrototype.cs |  39 +++
 Content.Shared/Cargo/SharedCargoSystem.cs     |  65 ++++-
 .../Locale/en-US/_DV/cargo/cargo-accounts.ftl |   8 +
 .../_DV/cargo/cargo-console-component.ftl     |   1 +
 .../Locale/en-US/_DV/cargo/overrides.ftl      |  10 +
 .../catalog/cargo/cargoproduct-categories.ftl |   1 +
 .../Locale/en-US/cargo/cargo-accounts.ftl     |  17 ++
 .../en-US/cargo/cargo-console-component.ftl   |  49 +++-
 .../en-US/prototypes/access/accesses.ftl      |   2 +
 Resources/Prototypes/Access/cargo.yml         |   4 +
 Resources/Prototypes/Access/misc.yml          |   1 +
 .../Catalog/Cargo/cargo_lockbox.yml           |  49 ++++
 .../Catalog/Fills/Lockers/heads.yml           |   6 +
 .../Prototypes/Catalog/cargo_accounts.yml     |  42 +++
 .../Entities/Mobs/Player/admin_ghost.yml      |   1 -
 .../Devices/Circuitboards/computer.yml        |  78 +++++
 .../Entities/Objects/Misc/paper.yml           |   2 +-
 .../Prototypes/Entities/Stations/base.yml     |   8 +
 .../Machines/Computers/computers.yml          | 206 ++++++++++++-
 .../Structures/Storage/Crates/crates.yml      | 188 ++++++++++++
 .../Prototypes/SoundCollections/machines.yml  |  14 +
 .../_DV/Catalog/Cargo/cargo_lockbox.yml       |   9 +
 .../Catalog/Fills/Lockers/chiefjustice.yml    |   1 +
 .../_DV/Catalog/Fills/Lockers/heads.yml       |   1 +
 .../Prototypes/_DV/Catalog/cargo_accounts.yml |   6 +
 .../Devices/CircuitBoards/computer.yml        |  14 +
 .../Entities/Objects/Devices/cartridges.yml   |   1 -
 .../Structures/Machines/computers.yml         |  34 ++-
 .../Structures/Storage/Crates/crates.yml      |  30 ++
 .../Machines/computers.rsi/allocate.png       | Bin 0 -> 971 bytes
 .../Machines/computers.rsi/meta.json          | 276 +++++++++++++++++-
 .../Machines/computers.rsi/request-eng.png    | Bin 0 -> 1502 bytes
 .../Machines/computers.rsi/request-med.png    | Bin 0 -> 1448 bytes
 .../Machines/computers.rsi/request-sci.png    | Bin 0 -> 1371 bytes
 .../Machines/computers.rsi/request-sec.png    | Bin 0 -> 1417 bytes
 .../Machines/computers.rsi/request-srv.png    | Bin 0 -> 1511 bytes
 .../Machines/computers.rsi/transfer.png       | Bin 0 -> 1776 bytes
 .../Storage/Crates/lockbox.rsi/base.png       | Bin 0 -> 361 bytes
 .../Storage/Crates/lockbox.rsi/closed.png     | Bin 0 -> 187 bytes
 .../Storage/Crates/lockbox.rsi/icon.png       | Bin 0 -> 370 bytes
 .../Storage/Crates/lockbox.rsi/locked.png     | Bin 0 -> 144 bytes
 .../Storage/Crates/lockbox.rsi/meta.json      |  51 ++++
 .../Storage/Crates/lockbox.rsi/open.png       | Bin 0 -> 240 bytes
 .../Crates/lockbox.rsi/overlay-closed.png     | Bin 0 -> 155 bytes
 .../Storage/Crates/lockbox.rsi/overlay.png    | Bin 0 -> 144 bytes
 .../Storage/Crates/lockbox.rsi/sparking.png   | Bin 0 -> 221 bytes
 .../Storage/Crates/lockbox.rsi/unlocked.png   | Bin 0 -> 139 bytes
 .../Storage/Crates/lockbox.rsi/welded.png     | Bin 0 -> 274 bytes
 .../Objects/Misc/module.rsi/cpu_justice.png   | Bin 0 -> 269 bytes
 .../_DV/Objects/Misc/module.rsi/meta.json     |  14 +
 .../Machines/computers.rsi/meta.json          |  49 ++++
 .../Machines/computers.rsi/request-jst.png    | Bin 0 -> 723 bytes
 88 files changed, 2344 insertions(+), 358 deletions(-)
 create mode 100644 Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs
 create mode 100644 Content.Client/Cargo/UI/FundingAllocationMenu.xaml
 create mode 100644 Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs
 delete mode 100644 Content.Server/Cargo/Components/StationBankAccountComponent.cs
 create mode 100644 Content.Server/Cargo/Systems/CargoSystem.Funds.cs
 create mode 100644 Content.Server/Delivery/DeliverySystem.cs
 delete mode 100644 Content.Shared/Cargo/Components/BankClientComponent.cs
 create mode 100644 Content.Shared/Cargo/Components/FundingAllocationConsoleComponent.cs
 create mode 100644 Content.Shared/Cargo/Components/OverrideSellComponent.cs
 create mode 100644 Content.Shared/Cargo/Components/StationBankAccountComponent.cs
 create mode 100644 Content.Shared/Cargo/Prototypes/CargoAccountPrototype.cs
 create mode 100644 Resources/Locale/en-US/_DV/cargo/cargo-accounts.ftl
 create mode 100644 Resources/Locale/en-US/_DV/cargo/cargo-console-component.ftl
 create mode 100644 Resources/Locale/en-US/_DV/cargo/overrides.ftl
 create mode 100644 Resources/Locale/en-US/_DV/prototypes/catalog/cargo/cargoproduct-categories.ftl
 create mode 100644 Resources/Locale/en-US/cargo/cargo-accounts.ftl
 create mode 100644 Resources/Prototypes/Catalog/Cargo/cargo_lockbox.yml
 create mode 100644 Resources/Prototypes/Catalog/cargo_accounts.yml
 create mode 100644 Resources/Prototypes/SoundCollections/machines.yml
 create mode 100644 Resources/Prototypes/_DV/Catalog/Cargo/cargo_lockbox.yml
 create mode 100644 Resources/Prototypes/_DV/Catalog/cargo_accounts.yml
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/allocate.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/request-eng.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/request-med.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/request-sci.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/request-sec.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/request-srv.png
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/transfer.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/icon.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/overlay-closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/overlay.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/sparking.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/lockbox.rsi/welded.png
 create mode 100644 Resources/Textures/_DV/Objects/Misc/module.rsi/cpu_justice.png
 create mode 100644 Resources/Textures/_DV/Objects/Misc/module.rsi/meta.json
 create mode 100644 Resources/Textures/_DV/Structures/Machines/computers.rsi/meta.json
 create mode 100644 Resources/Textures/_DV/Structures/Machines/computers.rsi/request-jst.png

diff --git a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
index 0be3ebd97f8..52846cefdb9 100644
--- a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Cargo;
 using Content.Client.Cargo.UI;
 using Content.Shared.Cargo.BUI;
+using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Events;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.IdentityManagement;
@@ -14,6 +15,8 @@ namespace Content.Client.Cargo.BUI
 {
     public sealed class CargoOrderConsoleBoundUserInterface : BoundUserInterface
     {
+        private readonly SharedCargoSystem _cargoSystem;
+
         [ViewVariables]
         private CargoConsoleMenu? _menu;
 
@@ -43,6 +46,7 @@ namespace Content.Client.Cargo.BUI
 
         public CargoOrderConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
+            _cargoSystem = EntMan.System<SharedCargoSystem>();
         }
 
         protected override void Open()
@@ -57,7 +61,7 @@ namespace Content.Client.Cargo.BUI
 
             string orderRequester;
 
-            if (EntMan.TryGetComponent<MetaDataComponent>(localPlayer, out var metadata))
+            if (EntMan.EntityExists(localPlayer))
                 orderRequester = Identity.Name(localPlayer.Value, EntMan);
             else
                 orderRequester = string.Empty;
@@ -96,41 +100,54 @@ namespace Content.Client.Cargo.BUI
                 }
             };
 
+            _menu.OnAccountAction += (account, amount) =>
+            {
+                SendMessage(new CargoConsoleWithdrawFundsMessage(account, amount));
+            };
+
+            _menu.OnToggleUnboundedLimit += _ =>
+            {
+                SendMessage(new CargoConsoleToggleLimitMessage());
+            };
+
             _menu.OpenCentered();
         }
 
         private void Populate(List<CargoOrderData> orders)
         {
-            if (_menu == null) return;
+            if (_menu == null)
+                return;
 
             _menu.PopulateProducts();
             _menu.PopulateCategories();
             _menu.PopulateOrders(orders);
+            _menu.PopulateAccountActions();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
 
-            if (state is not CargoConsoleInterfaceState cState)
+            if (state is not CargoConsoleInterfaceState cState || !EntMan.TryGetComponent<CargoOrderConsoleComponent>(Owner, out var orderConsole))
                 return;
+            var station = EntMan.GetEntity(cState.Station);
 
             OrderCapacity = cState.Capacity;
             OrderCount = cState.Count;
-            BankBalance = cState.Balance;
+            BankBalance = _cargoSystem.GetBalanceFromAccount(station, orderConsole.Account);
 
             AccountName = cState.Name;
 
+            _menu?.UpdateStation(station);
             Populate(cState.Orders);
-            _menu?.UpdateCargoCapacity(OrderCount, OrderCapacity);
-            _menu?.UpdateBankData(AccountName, BankBalance);
         }
 
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
 
-            if (!disposing) return;
+            if (!disposing)
+                return;
 
             _menu?.Dispose();
             _orderMenu?.Dispose();
@@ -170,8 +187,6 @@ namespace Content.Client.Cargo.BUI
                 return;
 
             SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderId));
-            // Most of the UI isn't predicted anyway so.
-            // _menu?.UpdateCargoCapacity(OrderCount + row.Order.Amount, OrderCapacity);
         }
     }
 }
diff --git a/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs
new file mode 100644
index 00000000000..eb65be40d37
--- /dev/null
+++ b/Content.Client/Cargo/BUI/FundingAllocationConsoleBoundUserInterface.cs
@@ -0,0 +1,35 @@
+using Content.Client.Cargo.UI;
+using Content.Shared.Cargo.Components;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Cargo.BUI;
+
+[UsedImplicitly]
+public sealed class FundingAllocationConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
+{
+    [ViewVariables]
+    private FundingAllocationMenu? _menu;
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<FundingAllocationMenu>();
+
+        _menu.OnSavePressed += d =>
+        {
+            SendMessage(new SetFundingAllocationBuiMessage(d));
+        };
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState message)
+    {
+        base.UpdateState(message);
+
+        if (message is not FundingAllocationConsoleBuiState state)
+            return;
+
+        _menu?.Update(state);
+    }
+}
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index dd7a9f110ca..72d8cf7daf0 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -3,66 +3,83 @@
                            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            SetSize="600 600"
                            MinSize="600 600">
-    <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
+    <BoxContainer Orientation="Vertical" Margin="15 5 15 10">
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-console-menu-account-name-label'}"
                    StyleClasses="LabelKeyText" />
-            <Label Name="AccountNameLabel"
+            <RichTextLabel Name="AccountNameLabel"
                    Text="{Loc 'cargo-console-menu-account-name-none-text'}" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-console-menu-points-label'}"
                    StyleClasses="LabelKeyText" />
-            <Label Name="PointsLabel"
+            <RichTextLabel Name="PointsLabel"
                    Text="$0" />
         </BoxContainer>
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc 'cargo-console-menu-order-capacity-label'}"
-                   StyleClasses="LabelKeyText" />
-            <Label Name="ShuttleCapacityLabel"
-                   Text="0/20" />
-        </BoxContainer>
-        <BoxContainer Orientation="Horizontal">
-            <OptionButton Name="Categories"
-                          Prefix="{Loc 'cargo-console-menu-categories-label'}"
-                          HorizontalExpand="True" />
-            <LineEdit Name="SearchBar"
-                      PlaceHolder="{Loc 'cargo-console-menu-search-bar-placeholder'}"
-                      HorizontalExpand="True" />
-        </BoxContainer>
-        <ScrollContainer HorizontalExpand="True"
-                         VerticalExpand="True"
-                         SizeFlagsStretchRatio="6">
-            <BoxContainer Name="Products"
-                          Orientation="Vertical"
-                          HorizontalExpand="True"
-                          VerticalExpand="True">
-                <!-- Products get added here by code -->
-            </BoxContainer>
-        </ScrollContainer>
-        <PanelContainer VerticalExpand="True"
-                        SizeFlagsStretchRatio="6">
-            <PanelContainer.PanelOverride>
-                <gfx:StyleBoxFlat BackgroundColor="#000000" />
-            </PanelContainer.PanelOverride>
-            <ScrollContainer VerticalExpand="True">
-                <BoxContainer Orientation="Vertical">
-                    <Label Text="{Loc 'cargo-console-menu-requests-label'}" />
-                    <BoxContainer Name="Requests"
-                                  Orientation="Vertical"
-                                  VerticalExpand="True">
-                        <!-- Requests are added here by code -->
-                    </BoxContainer>
-                    <Label Text="{Loc 'cargo-console-menu-orders-label'}" />
-                    <BoxContainer Name="Orders"
-                                  Orientation="Vertical"
-                                  StyleClasses="transparentItemList"
-                                  VerticalExpand="True">
-                        <!-- Orders are added here by code -->
-                    </BoxContainer>
+        <Control MinHeight="10"/>
+        <TabContainer Name="TabContainer" VerticalExpand="True">
+            <BoxContainer Orientation="Vertical" VerticalExpand="True">
+                <BoxContainer Orientation="Horizontal">
+                    <OptionButton Name="Categories"
+                                  Prefix="{Loc 'cargo-console-menu-categories-label'}"
+                                  HorizontalExpand="True" />
+                    <LineEdit Name="SearchBar"
+                              PlaceHolder="{Loc 'cargo-console-menu-search-bar-placeholder'}"
+                              HorizontalExpand="True" />
                 </BoxContainer>
-            </ScrollContainer>
-        </PanelContainer>
-        <TextureButton VerticalExpand="True" />
+                <Control MinHeight="5"/>
+                <ScrollContainer HorizontalExpand="True"
+                                 VerticalExpand="True"
+                                 SizeFlagsStretchRatio="2">
+                    <BoxContainer Name="Products"
+                                  Orientation="Vertical"
+                                  HorizontalExpand="True"
+                                  VerticalExpand="True">
+                        <!-- Products get added here by code -->
+                    </BoxContainer>
+                </ScrollContainer>
+                <Control MinHeight="5"/>
+                <PanelContainer VerticalExpand="True"
+                                SizeFlagsStretchRatio="1">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat BackgroundColor="#000000" />
+                    </PanelContainer.PanelOverride>
+                    <ScrollContainer VerticalExpand="True">
+                        <BoxContainer Orientation="Vertical" Margin="5">
+                            <Label Text="{Loc 'cargo-console-menu-requests-label'}" />
+                            <BoxContainer Name="Requests"
+                                          Orientation="Vertical"
+                                          VerticalExpand="True">
+                                <!-- Requests are added here by code -->
+                            </BoxContainer>
+                        </BoxContainer>
+                    </ScrollContainer>
+                </PanelContainer>
+            </BoxContainer>
+            <!-- Funds tab -->
+            <BoxContainer Orientation="Vertical" Margin="15">
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Name="TransferLimitLabel" Margin="0 0 15 0"/>
+                    <RichTextLabel Name="UnlimitedNotifier" Text="{Loc 'cargo-console-menu-account-action-transfer-limit-unlimited-notifier'}"/>
+                </BoxContainer>
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Text="{Loc 'cargo-console-menu-account-action-select'}" Margin="0 0 10 0"/>
+                    <OptionButton Name="ActionOptions"/>
+                </BoxContainer>
+                <Control MinHeight="5"/>
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Name="AmountText" Text="{ Loc 'cargo-console-menu-account-action-amount'}"/>
+                    <SpinBox Name="TransferSpinBox" MinWidth="100" Value="10"/>
+                </BoxContainer>
+                <Control MinHeight="15"/>
+                <BoxContainer HorizontalAlignment="Center">
+                    <Button Name="AccountActionButton" Text="{ Loc 'cargo-console-menu-account-action-button'}" MinHeight="45" MinWidth="120"/>
+                </BoxContainer>
+                <Control VerticalExpand="True"/>
+                <BoxContainer VerticalAlignment="Bottom" HorizontalAlignment="Center">
+                    <Button Name="AccountLimitToggleButton" Text="{ Loc 'cargo-console-menu-toggle-account-lock-button'}" MinHeight="45" MinWidth="120"/>
+                </BoxContainer>
+            </BoxContainer>
+        </TabContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index e60335bc45c..b837d59855f 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.Cargo.Systems;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
@@ -8,6 +9,7 @@ using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
 namespace Content.Client.Cargo.UI
@@ -15,30 +17,83 @@ namespace Content.Client.Cargo.UI
     [GenerateTypedNameReferences]
     public sealed partial class CargoConsoleMenu : FancyWindow
     {
-        private IEntityManager _entityManager;
-        private IPrototypeManager _protoManager;
-        private SpriteSystem _spriteSystem;
+        [Dependency] private readonly IGameTiming _timing = default!;
+
+        private readonly IEntityManager _entityManager;
+        private readonly IPrototypeManager _protoManager;
+        private readonly CargoSystem _cargoSystem;
+        private readonly SpriteSystem _spriteSystem;
         private EntityUid _owner;
+        private EntityUid? _station;
+
+        private readonly EntityQuery<CargoOrderConsoleComponent> _orderConsoleQuery;
+        private readonly EntityQuery<StationBankAccountComponent> _bankQuery;
 
         public event Action<ButtonEventArgs>? OnItemSelected;
         public event Action<ButtonEventArgs>? OnOrderApproved;
         public event Action<ButtonEventArgs>? OnOrderCanceled;
 
+        public event Action<ProtoId<CargoAccountPrototype>?, int>? OnAccountAction;
+
+        public event Action<ButtonEventArgs>? OnToggleUnboundedLimit;
+
         private readonly List<string> _categoryStrings = new();
         private string? _category;
 
         public CargoConsoleMenu(EntityUid owner, IEntityManager entMan, IPrototypeManager protoManager, SpriteSystem spriteSystem)
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
             _entityManager = entMan;
             _protoManager = protoManager;
+            _cargoSystem = entMan.System<CargoSystem>();
             _spriteSystem = spriteSystem;
             _owner = owner;
 
-            Title = Loc.GetString("cargo-console-menu-title");
+            _orderConsoleQuery = _entityManager.GetEntityQuery<CargoOrderConsoleComponent>();
+            _bankQuery = _entityManager.GetEntityQuery<StationBankAccountComponent>();
+
+            Title = entMan.GetComponent<MetaDataComponent>(owner).EntityName;
 
             SearchBar.OnTextChanged += OnSearchBarTextChanged;
             Categories.OnItemSelected += OnCategoryItemSelected;
+
+            if (entMan.TryGetComponent<CargoOrderConsoleComponent>(owner, out var orderConsole))
+            {
+                var accountProto = _protoManager.Index(orderConsole.Account);
+                AccountNameLabel.Text = Loc.GetString("cargo-console-menu-account-name-format",
+                    ("color", accountProto.Color),
+                    ("name", Loc.GetString(accountProto.Name)),
+                    ("code", Loc.GetString(accountProto.Code)));
+            }
+
+            TabContainer.SetTabTitle(0, Loc.GetString("cargo-console-menu-tab-title-orders"));
+            TabContainer.SetTabTitle(1, Loc.GetString("cargo-console-menu-tab-title-funds"));
+
+            ActionOptions.OnItemSelected += idx =>
+            {
+                ActionOptions.SelectId(idx.Id);
+            };
+
+            TransferSpinBox.IsValid = val =>
+            {
+                if (!_entityManager.TryGetComponent<CargoOrderConsoleComponent>(owner, out var console) ||
+                    !_entityManager.TryGetComponent<StationBankAccountComponent>(_station, out var bank))
+                    return true;
+
+                return val >= 0 && val <= (int) (console.TransferLimit * bank.Accounts[console.Account]);
+            };
+
+            AccountActionButton.OnPressed += _ =>
+            {
+                var account = (ProtoId<CargoAccountPrototype>?) ActionOptions.SelectedMetadata;
+                OnAccountAction?.Invoke(account, TransferSpinBox.Value);
+            };
+
+            AccountLimitToggleButton.OnPressed += a =>
+            {
+                OnToggleUnboundedLimit?.Invoke(a);
+            };
         }
 
         private void OnCategoryItemSelected(OptionButton.ItemSelectedEventArgs args)
@@ -144,11 +199,13 @@ namespace Content.Client.Cargo.UI
         /// </summary>
         public void PopulateOrders(IEnumerable<CargoOrderData> orders)
         {
-            Orders.DisposeAllChildren();
             Requests.DisposeAllChildren();
 
             foreach (var order in orders)
             {
+                if (order.Approved)
+                    continue;
+
                 var product = _protoManager.Index<EntityPrototype>(order.ProductId);
                 var productName = product.Name;
 
@@ -164,35 +221,67 @@ namespace Content.Client.Cargo.UI
                             ("orderAmount", order.OrderQuantity),
                             ("orderRequester", order.Requester))
                     },
-                    Description = {Text = Loc.GetString("cargo-console-menu-order-reason-description",
-                                                        ("reason", order.Reason))}
+                    Description =
+                    {
+                        Text = Loc.GetString("cargo-console-menu-order-reason-description",
+                                                        ("reason", order.Reason))
+                    }
                 };
                 row.Cancel.OnPressed += (args) => { OnOrderCanceled?.Invoke(args); };
-                if (order.Approved)
-                {
-                    row.Approve.Visible = false;
-                    row.Cancel.Visible = false;
-                    Orders.AddChild(row);
-                }
-                else
-                {
-                    // TODO: Disable based on access.
-                    row.Approve.OnPressed += (args) => { OnOrderApproved?.Invoke(args); };
-                    Requests.AddChild(row);
-                }
+
+                // TODO: Disable based on access.
+                row.Approve.OnPressed += (args) => { OnOrderApproved?.Invoke(args); };
+                Requests.AddChild(row);
             }
         }
 
-        public void UpdateCargoCapacity(int count, int capacity)
+        public void PopulateAccountActions()
         {
-            // TODO: Rename + Loc.
-            ShuttleCapacityLabel.Text = $"{count}/{capacity}";
+            if (!_entityManager.TryGetComponent<StationBankAccountComponent>(_station, out var bank) ||
+                !_entityManager.TryGetComponent<CargoOrderConsoleComponent>(_owner, out var console))
+                return;
+
+            var i = 0;
+            ActionOptions.Clear();
+            ActionOptions.AddItem(Loc.GetString("cargo-console-menu-account-action-option-withdraw"), i);
+            i++;
+            foreach (var account in bank.Accounts.Keys)
+            {
+                if (account == console.Account)
+                    continue;
+                var accountProto = _protoManager.Index(account);
+                ActionOptions.AddItem(Loc.GetString("cargo-console-menu-account-action-option-transfer",
+                    ("code", Loc.GetString(accountProto.Code))),
+                    i);
+                ActionOptions.SetItemMetadata(i, account);
+                i++;
+            }
         }
 
-        public void UpdateBankData(string name, int points)
+        public void UpdateStation(EntityUid station)
         {
-            AccountNameLabel.Text = name;
-            PointsLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", points.ToString()));
+            _station = station;
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            if (!_bankQuery.TryComp(_station, out var bankAccount) ||
+                !_orderConsoleQuery.TryComp(_owner, out var orderConsole))
+            {
+                return;
+            }
+
+            var balance = _cargoSystem.GetBalanceFromAccount((_station.Value, bankAccount), orderConsole.Account);
+            PointsLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", balance));
+            TransferLimitLabel.Text = Loc.GetString("cargo-console-menu-account-action-transfer-limit",
+                ("limit", (int) (balance * orderConsole.TransferLimit)));
+
+            UnlimitedNotifier.Visible = orderConsole.TransferUnbounded;
+            AccountActionButton.Disabled = TransferSpinBox.Value <= 0 ||
+                                           TransferSpinBox.Value > bankAccount.Accounts[orderConsole.Account] * orderConsole.TransferLimit ||
+                                           _timing.CurTime < orderConsole.NextAccountActionTime;
         }
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml b/Content.Client/Cargo/UI/CargoOrderRow.xaml
index 1d636a1a292..22bd2291aef 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml
@@ -1,11 +1,13 @@
 <PanelContainer xmlns="https://spacestation14.io"
-                HorizontalExpand="True">
+                HorizontalExpand="True"
+                Margin="0 1">
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True">
         <TextureRect Name="Icon"
                      Access="Public"
                      MinSize="32 32"
                      RectClipContent="True" />
+        <Control MinWidth="5"/>
         <BoxContainer Orientation="Vertical"
                       HorizontalExpand="True"
                       VerticalExpand="True">
@@ -23,10 +25,10 @@
         <Button Name="Approve"
                 Access="Public"
                 Text="{Loc 'cargo-console-menu-cargo-order-row-approve-button'}"
-                StyleClasses="LabelSubText" />
+                StyleClasses="OpenRight" />
         <Button Name="Cancel"
                 Access="Public"
                 Text="{Loc 'cargo-console-menu-cargo-order-row-cancel-button'}"
-                StyleClasses="LabelSubText" />
+                StyleClasses="OpenLeft" />
     </BoxContainer>
 </PanelContainer>
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml b/Content.Client/Cargo/UI/CargoProductRow.xaml
index b47a1e8db22..4ae7a76e1d4 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml
@@ -4,7 +4,8 @@
             ToolTip=""
             Access="Public"
             HorizontalExpand="True"
-            VerticalExpand="True" />
+            VerticalExpand="True"
+            StyleClasses="OpenBoth"/>
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True">
         <TextureRect Name="Icon"
@@ -18,7 +19,8 @@
             <Label Name="PointCost"
                    Access="Public"
                    MinSize="52 32"
-                   Align="Right" />
+                   Align="Right"
+                   Margin="0 0 5 0"/>
         </PanelContainer>
     </BoxContainer>
 </PanelContainer>
diff --git a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml
new file mode 100644
index 00000000000..0686ea77d81
--- /dev/null
+++ b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml
@@ -0,0 +1,29 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                      Title="{Loc 'cargo-funding-alloc-console-menu-title'}"
+                      SetSize="680 310"
+                      MinSize="680 310">
+    <BoxContainer Orientation="Vertical"
+                  VerticalExpand="True"
+                  HorizontalExpand="True"
+                  Margin="10 5 10 10">
+        <Label Name="HelpLabel" HorizontalAlignment="Center" StyleClasses="LabelSubText"/>
+        <Control MinHeight="10"/>
+        <PanelContainer VerticalExpand="True" HorizontalExpand="True" VerticalAlignment="Top" MaxHeight="250">
+            <PanelContainer.PanelOverride>
+                <graphics:StyleBoxFlat BackgroundColor="#1B1B1E"/>
+            </PanelContainer.PanelOverride>
+            <controls:TableContainer Name="EntriesContainer" Columns="4" HorizontalExpand="True" VerticalExpand="True" Margin="5 0">
+                <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-account'}" HorizontalAlignment="Center"/>
+                <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-code'}" HorizontalAlignment="Center"/>
+                <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-balance'}" HorizontalAlignment="Center"/>
+                <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-cut'}" HorizontalAlignment="Center"/>
+            </controls:TableContainer>
+        </PanelContainer>
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5 0">
+            <Button Name="SaveButton" Text="{Loc 'cargo-funding-alloc-console-button-save'}"  Disabled="True"/>
+            <RichTextLabel Name="SaveAlertLabel" HorizontalExpand="True" HorizontalAlignment="Right" Visible="False"/>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs
new file mode 100644
index 00000000000..f55be2721e4
--- /dev/null
+++ b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs
@@ -0,0 +1,169 @@
+using System.Linq;
+using Content.Client.Message;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Cargo.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class FundingAllocationMenu : FancyWindow
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private readonly EntityQuery<StationBankAccountComponent> _bankQuery;
+
+    public event Action<Dictionary<ProtoId<CargoAccountPrototype>, int>>? OnSavePressed;
+
+    private EntityUid? _station;
+
+    private readonly HashSet<Control> _addedControls = new();
+    private readonly List<SpinBox> _spinBoxes = new();
+    private readonly Dictionary<ProtoId<CargoAccountPrototype>, RichTextLabel> _balanceLabels = new();
+
+    public FundingAllocationMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _bankQuery = _entityManager.GetEntityQuery<StationBankAccountComponent>();
+
+        SaveButton.OnPressed += _ =>
+        {
+            if (!_entityManager.TryGetComponent<StationBankAccountComponent>(_station, out var bank))
+                return;
+            var accounts = bank.Accounts.Keys.OrderBy(p => p.Id).ToList();
+            var dicts = new Dictionary<ProtoId<CargoAccountPrototype>, int>();
+            for (var i = 0; i< accounts.Count; i++)
+            {
+                dicts.Add(accounts[i], _spinBoxes[i].Value);
+            }
+
+            OnSavePressed?.Invoke(dicts);
+            SaveButton.Disabled = true;
+        };
+
+        BuildEntries();
+    }
+
+    private void BuildEntries()
+    {
+        if (!_entityManager.TryGetComponent<StationBankAccountComponent>(_station, out var bank))
+            return;
+        HelpLabel.Text = Loc.GetString("cargo-funding-alloc-console-label-help-dv", // DeltaV - it's logistics and also that is an unhelpful string
+            ("percent", (int) (bank.PrimaryCut * 100)));
+
+        foreach (var ctrl in _addedControls)
+        {
+            ctrl.Orphan();
+        }
+
+        _addedControls.Clear();
+        _spinBoxes.Clear();
+        _balanceLabels.Clear();
+
+        var accounts = bank.Accounts.ToList().OrderBy(p => p.Key);
+        foreach (var (account, balance) in accounts)
+        {
+            var accountProto = _prototypeManager.Index(account);
+
+            var accountNameLabel = new RichTextLabel
+            {
+                Modulate = accountProto.Color,
+                Margin = new Thickness(0, 0, 10, 0)
+            };
+            accountNameLabel.SetMarkup($"[bold]{Loc.GetString(accountProto.Name)}[/bold]");
+            EntriesContainer.AddChild(accountNameLabel);
+
+            var codeLabel = new RichTextLabel
+            {
+                Text = $"[font=\"Monospace\"]{Loc.GetString(accountProto.Code)}[/font]",
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(5, 0),
+            };
+            EntriesContainer.AddChild(codeLabel);
+
+            var balanceLabel = new RichTextLabel
+            {
+                Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", balance)),
+                HorizontalExpand = true,
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(5, 0),
+            };
+            EntriesContainer.AddChild(balanceLabel);
+
+            var box = new SpinBox
+            {
+                HorizontalAlignment = HAlignment.Center,
+                HorizontalExpand = true,
+                Value = (int) (bank.RevenueDistribution[account] * 100),
+                IsValid = val => val is >= 0 and <= 100,
+            };
+            box.ValueChanged += _ => UpdateButtonDisabled();
+            EntriesContainer.AddChild(box);
+
+            _spinBoxes.Add(box);
+            _balanceLabels.Add(account, balanceLabel);
+            _addedControls.Add(accountNameLabel);
+            _addedControls.Add(codeLabel);
+            _addedControls.Add(balanceLabel);
+            _addedControls.Add(box);
+        }
+    }
+
+    private void UpdateButtonDisabled()
+    {
+        if (!_entityManager.TryGetComponent<StationBankAccountComponent>(_station, out var bank))
+            return;
+
+        var sum = _spinBoxes.Sum(s => s.Value);
+        var incorrectSum = sum != 100;
+
+        var differs = false;
+        var accounts = bank.Accounts.Keys.OrderBy(p => p.Id).ToList();
+        for (var i = 0; i < accounts.Count; i++)
+        {
+            var percent = _spinBoxes[i].Value;
+            if (percent != (int) Math.Round(bank.RevenueDistribution[accounts[i]] * 100))
+            {
+                differs = true;
+                break;
+            }
+        }
+
+        SaveButton.Disabled = !differs || incorrectSum;
+
+        var diff = sum - 100;
+        SaveAlertLabel.Visible = incorrectSum;
+        SaveAlertLabel.SetMarkup(Loc.GetString("cargo-funding-alloc-console-label-save-fail",
+            ("pos", Math.Sign(diff)),
+            ("val", Math.Abs(diff))));
+    }
+
+    public void Update(FundingAllocationConsoleBuiState state)
+    {
+        _station = _entityManager.GetEntity(state.Station);
+        BuildEntries();
+        UpdateButtonDisabled();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (!_bankQuery.TryComp(_station, out var bank))
+            return;
+
+        foreach (var (account, label) in _balanceLabels)
+        {
+            label.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", bank.Accounts[account]));
+        }
+    }
+}
diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs
index cdfd0a3874f..d9827ee3bfc 100644
--- a/Content.Server/Cargo/Components/CargoPalletComponent.cs
+++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs
@@ -1,6 +1,4 @@
 namespace Content.Server.Cargo.Components;
-using Content.Shared.Actions;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 /// <summary>
 /// Any entities intersecting when a shuttle is recalled will be sold.
diff --git a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
index 6092ea0c3ed..da82c7e5460 100644
--- a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
+++ b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
@@ -6,8 +6,4 @@ namespace Content.Server.Cargo.Components;
 
 [RegisterComponent]
 [Access(typeof(CargoSystem))]
-public sealed partial class CargoPalletConsoleComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
-    public string CashType = "Credit";
-}
+public sealed partial class CargoPalletConsoleComponent : Component;
diff --git a/Content.Server/Cargo/Components/StationBankAccountComponent.cs b/Content.Server/Cargo/Components/StationBankAccountComponent.cs
deleted file mode 100644
index fe9be19b19a..00000000000
--- a/Content.Server/Cargo/Components/StationBankAccountComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Cargo;
-
-namespace Content.Server.Cargo.Components;
-
-/// <summary>
-/// Added to the abstract representation of a station to track its money.
-/// </summary>
-[RegisterComponent, Access(typeof(SharedCargoSystem))]
-public sealed partial class StationBankAccountComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite), DataField("balance")]
-    public int Balance = 2000;
-
-    /// <summary>
-    /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")]
-    public int IncreasePerSecond = 1;
-}
diff --git a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
index 2e3b2c21157..36db3b83f2d 100644
--- a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
@@ -1,9 +1,9 @@
+using System.Linq;
 using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Cargo.Components;
 
@@ -16,15 +16,19 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component
     /// <summary>
     /// Maximum amount of orders a station is allowed, approved or not.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("capacity")]
+    [DataField]
     public int Capacity = 20;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("orders")]
-    public List<CargoOrderData> Orders = new();
+    [ViewVariables]
+    public IEnumerable<CargoOrderData> AllOrders => Orders.SelectMany(p => p.Value);
+
+    [DataField]
+    public Dictionary<ProtoId<CargoAccountPrototype>, List<CargoOrderData>> Orders = new();
 
     /// <summary>
     /// Used to determine unique order IDs
     /// </summary>
+    [ViewVariables]
     public int NumOrdersCreated;
 
     // TODO: Can probably dump this
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 7f74fe269d4..691190bea9e 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -27,7 +27,6 @@ public sealed partial class CargoSystem
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
 
     [ValidatePrototypeId<NameIdentifierGroupPrototype>]
     private const string BountyNameIdentifierGroup = "Bounty";
@@ -56,13 +55,13 @@ public sealed partial class CargoSystem
             !TryComp<StationCargoBountyDatabaseComponent>(station, out var bountyDb))
             return;
 
-        var untilNextSkip = bountyDb.NextSkipTime - _timing.CurTime;
+        var untilNextSkip = bountyDb.NextSkipTime - Timing.CurTime;
         _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties, bountyDb.History, untilNextSkip));
     }
 
     private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent component, BountyPrintLabelMessage args)
     {
-        if (_timing.CurTime < component.NextPrintTime)
+        if (Timing.CurTime < component.NextPrintTime)
             return;
 
         if (_station.GetOwningStation(uid) is not { } station)
@@ -72,7 +71,7 @@ public sealed partial class CargoSystem
             return;
 
         var label = Spawn(component.BountyLabelId, Transform(uid).Coordinates);
-        component.NextPrintTime = _timing.CurTime + component.PrintDelay;
+        component.NextPrintTime = Timing.CurTime + component.PrintDelay;
         SetupBountyLabel(label, station, bounty.Value);
         _audio.PlayPvs(component.PrintSound, uid);
     }
@@ -82,7 +81,7 @@ public sealed partial class CargoSystem
         if (_station.GetOwningStation(uid) is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
             return;
 
-        if (_timing.CurTime < db.NextSkipTime)
+        if (Timing.CurTime < db.NextSkipTime)
             return;
 
         if (!TryGetBountyFromId(station, args.BountyId, out var bounty))
@@ -102,8 +101,8 @@ public sealed partial class CargoSystem
             return;
 
         FillBountyDatabase(station);
-        db.NextSkipTime = _timing.CurTime + db.SkipDelay;
-        var untilNextSkip = db.NextSkipTime - _timing.CurTime;
+        db.NextSkipTime = Timing.CurTime + db.SkipDelay;
+        var untilNextSkip = db.NextSkipTime - Timing.CurTime;
         _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, db.History, untilNextSkip));
         _audio.PlayPvs(component.SkipSound, uid);
     }
@@ -472,7 +471,7 @@ public sealed partial class CargoSystem
                     skipped
                         ? CargoBountyHistoryData.BountyResult.Skipped
                         : CargoBountyHistoryData.BountyResult.Completed,
-                    _gameTiming.CurTime,
+                    Timing.CurTime,
                     actorName));
                 ent.Comp.Bounties.RemoveAt(i);
                 return true;
@@ -514,7 +513,7 @@ public sealed partial class CargoSystem
                 continue;
             }
 
-            var untilNextSkip = db.NextSkipTime - _timing.CurTime;
+            var untilNextSkip = db.NextSkipTime - Timing.CurTime;
             _uiSystem.SetUiState((uid, ui), CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, db.History, untilNextSkip));
         }
     }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Funds.cs b/Content.Server/Cargo/Systems/CargoSystem.Funds.cs
new file mode 100644
index 00000000000..7990fbce1c0
--- /dev/null
+++ b/Content.Server/Cargo/Systems/CargoSystem.Funds.cs
@@ -0,0 +1,144 @@
+using System.Linq;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Database;
+using Content.Shared.Emag.Systems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.UserInterface;
+
+namespace Content.Server.Cargo.Systems;
+
+public sealed partial class CargoSystem
+{
+    public void InitializeFunds()
+    {
+        SubscribeLocalEvent<CargoOrderConsoleComponent, CargoConsoleWithdrawFundsMessage>(OnWithdrawFunds);
+        SubscribeLocalEvent<CargoOrderConsoleComponent, CargoConsoleToggleLimitMessage>(OnToggleLimit);
+        SubscribeLocalEvent<FundingAllocationConsoleComponent, SetFundingAllocationBuiMessage>(OnSetFundingAllocation);
+        SubscribeLocalEvent<FundingAllocationConsoleComponent, BeforeActivatableUIOpenEvent>(OnFundAllocationBuiOpen);
+    }
+
+    private void OnWithdrawFunds(Entity<CargoOrderConsoleComponent> ent, ref CargoConsoleWithdrawFundsMessage args)
+    {
+        if (_station.GetOwningStation(ent) is not { } station ||
+            !TryComp<StationBankAccountComponent>(station, out var bank))
+            return;
+
+        if (args.Account == ent.Comp.Account ||
+            args.Amount <= 0 ||
+            args.Amount > GetBalanceFromAccount((station, bank), ent.Comp.Account) * ent.Comp.TransferLimit)
+            return;
+
+        if (Timing.CurTime < ent.Comp.NextAccountActionTime)
+            return;
+
+        if (!_accessReaderSystem.IsAllowed(args.Actor, ent))
+        {
+            ConsolePopup(args.Actor, Loc.GetString("cargo-console-order-not-allowed"));
+            PlayDenySound(ent, ent.Comp);
+            return;
+        }
+
+        ent.Comp.NextAccountActionTime = Timing.CurTime + ent.Comp.AccountActionDelay;
+        Dirty(ent);
+        UpdateBankAccount((station, bank), -args.Amount, CreateAccountDistribution(ent.Comp.Account, bank));
+        _audio.PlayPvs(ApproveSound, ent);
+
+        var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(ent, args.Actor);
+        RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+
+        var ourAccount = _protoMan.Index(ent.Comp.Account);
+        if (args.Account == null)
+        {
+            var stackPrototype = _protoMan.Index(ent.Comp.CashType);
+            _stack.Spawn(args.Amount, stackPrototype, Transform(ent).Coordinates);
+
+            if (!_emag.CheckFlag(ent, EmagType.Interaction))
+            {
+                var msg = Loc.GetString("cargo-console-fund-withdraw-broadcast",
+                    ("name", tryGetIdentityShortInfoEvent.Title ?? Loc.GetString("cargo-console-fund-transfer-user-unknown")),
+                    ("amount", args.Amount),
+                    ("name1", Loc.GetString(ourAccount.Name)),
+                    ("code1", Loc.GetString(ourAccount.Code)));
+                _radio.SendRadioMessage(ent, msg, ourAccount.RadioChannel, ent, escapeMarkup: false);
+            }
+        }
+        else
+        {
+            var otherAccount = _protoMan.Index(args.Account.Value);
+            UpdateBankAccount((station, bank), args.Amount, CreateAccountDistribution(args.Account.Value, bank));
+
+            if (!_emag.CheckFlag(ent, EmagType.Interaction))
+            {
+                var msg = Loc.GetString("cargo-console-fund-transfer-broadcast",
+                    ("name", tryGetIdentityShortInfoEvent.Title ?? Loc.GetString("cargo-console-fund-transfer-user-unknown")),
+                    ("amount", args.Amount),
+                    ("name1", Loc.GetString(ourAccount.Name)),
+                    ("code1", Loc.GetString(ourAccount.Code)),
+                    ("name2", Loc.GetString(otherAccount.Name)),
+                    ("code2", Loc.GetString(otherAccount.Code)));
+                _radio.SendRadioMessage(ent, msg, ourAccount.RadioChannel, ent, escapeMarkup: false);
+                _radio.SendRadioMessage(ent, msg, otherAccount.RadioChannel, ent, escapeMarkup: false);
+            }
+        }
+    }
+
+    private void OnToggleLimit(Entity<CargoOrderConsoleComponent> ent, ref CargoConsoleToggleLimitMessage args)
+    {
+        if (!_accessReaderSystem.FindAccessTags(args.Actor).Intersect(ent.Comp.RemoveLimitAccess).Any())
+        {
+            ConsolePopup(args.Actor, Loc.GetString("cargo-console-order-not-allowed"));
+            PlayDenySound(ent, ent.Comp);
+            return;
+        }
+
+        _audio.PlayPvs(ent.Comp.ToggleLimitSound, ent);
+        ent.Comp.TransferUnbounded = !ent.Comp.TransferUnbounded;
+        Dirty(ent);
+    }
+
+
+    private void OnSetFundingAllocation(Entity<FundingAllocationConsoleComponent> ent, ref SetFundingAllocationBuiMessage args)
+    {
+        if (_station.GetOwningStation(ent) is not { } station ||
+            !TryComp<StationBankAccountComponent>(station, out var bank))
+            return;
+
+        if (args.Percents.Count != bank.RevenueDistribution.Count)
+            return;
+
+        var differs = false;
+        foreach (var (account, percent) in args.Percents)
+        {
+            if (percent != (int) Math.Round(bank.RevenueDistribution[account] * 100))
+            {
+                differs = true;
+                break;
+            }
+        }
+
+        if (!differs)
+            return;
+
+        if (args.Percents.Values.Sum() != 100)
+            return;
+
+        bank.RevenueDistribution.Clear();
+        foreach (var (account, percent )in args.Percents)
+        {
+            bank.RevenueDistribution.Add(account, percent / 100.0);
+        }
+        Dirty(station, bank);
+
+        _audio.PlayPvs(ent.Comp.SetDistributionSound, ent);
+        _adminLogger.Add(
+            LogType.Action,
+            LogImpact.Medium,
+            $"{ToPrettyString(args.Actor):player} set station {ToPrettyString(station)} fund distribution: {string.Join(',', bank.RevenueDistribution.Select(p => $"{p.Key}: {p.Value}").ToList())}");
+    }
+
+    private void OnFundAllocationBuiOpen(Entity<FundingAllocationConsoleComponent> ent, ref BeforeActivatableUIOpenEvent args)
+    {
+        if (_station.GetOwningStation(ent) is { } station)
+            _uiSystem.SetUiState(ent.Owner, FundingAllocationConsoleUiKey.Key, new FundingAllocationConsoleBuiState(GetNetEntity(station)));
+    }
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 108b132a94b..d22711307b6 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -12,6 +12,7 @@ using Content.Shared.Emag.Systems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Paper;
+using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -23,16 +24,6 @@ namespace Content.Server.Cargo.Systems
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly EmagSystem _emag = default!;
 
-        /// <summary>
-        /// How much time to wait (in seconds) before increasing bank accounts balance.
-        /// </summary>
-        private const int Delay = 10;
-
-        /// <summary>
-        /// Keeps track of how much time has elapsed since last balance increase.
-        /// </summary>
-        private float _timer;
-
         private void InitializeConsole()
         {
             SubscribeLocalEvent<CargoOrderConsoleComponent, CargoConsoleAddOrderMessage>(OnAddOrderMessage);
@@ -41,9 +32,7 @@ namespace Content.Server.Cargo.Systems
             SubscribeLocalEvent<CargoOrderConsoleComponent, BoundUIOpenedEvent>(OnOrderUIOpened);
             SubscribeLocalEvent<CargoOrderConsoleComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<CargoOrderConsoleComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<CargoOrderConsoleComponent, BankBalanceUpdatedEvent>(OnOrderBalanceUpdated);
             SubscribeLocalEvent<CargoOrderConsoleComponent, GotEmaggedEvent>(OnEmagged);
-            Reset();
         }
 
         private void OnInteractUsing(EntityUid uid, CargoOrderConsoleComponent component, ref InteractUsingEvent args)
@@ -61,8 +50,8 @@ namespace Content.Server.Cargo.Systems
             if (!TryComp(stationUid, out StationBankAccountComponent? bank))
                 return;
 
-            _audio.PlayPvs(component.ConfirmSound, uid);
-            UpdateBankAccount((stationUid.Value, bank), (int) price);
+            _audio.PlayPvs(ApproveSound, uid);
+            UpdateBankAccount((stationUid.Value, bank), (int) price, CreateAccountDistribution(component.Account, bank));
             QueueDel(args.Used);
             args.Handled = true;
         }
@@ -73,11 +62,6 @@ namespace Content.Server.Cargo.Systems
             UpdateOrderState(uid, station);
         }
 
-        private void Reset()
-        {
-            _timer = 0;
-        }
-
         private void OnEmagged(Entity<CargoOrderConsoleComponent> ent, ref GotEmaggedEvent args)
         {
             if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
@@ -89,31 +73,17 @@ namespace Content.Server.Cargo.Systems
             args.Handled = true;
         }
 
-        private void UpdateConsole(float frameTime)
+        private void UpdateConsole()
         {
-            _timer += frameTime;
-
-            // TODO: Doesn't work with serialization and shouldn't just be updating every delay
-            // client can just interp this just fine on its own.
-            while (_timer > Delay)
+            var stationQuery = EntityQueryEnumerator<StationBankAccountComponent>();
+            while (stationQuery.MoveNext(out var uid, out var bank))
             {
-                _timer -= Delay;
+                if (Timing.CurTime < bank.NextIncomeTime)
+                    continue;
+                bank.NextIncomeTime += bank.IncomeDelay;
 
-                var stationQuery = EntityQueryEnumerator<StationBankAccountComponent>();
-                while (stationQuery.MoveNext(out var uid, out var bank))
-                {
-                    var balanceToAdd = bank.IncreasePerSecond * Delay;
-                    UpdateBankAccount((uid, bank), balanceToAdd);
-                }
-
-                var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();
-                while (query.MoveNext(out var uid, out var _))
-                {
-                    if (!_uiSystem.IsUiOpen(uid, CargoConsoleUiKey.Orders)) continue;
-
-                    var station = _station.GetOwningStation(uid);
-                    UpdateOrderState(uid, station);
-                }
+                var balanceToAdd = (int) Math.Round(bank.IncreasePerSecond * bank.IncomeDelay.TotalSeconds);
+                UpdateBankAccount((uid, bank), balanceToAdd, bank.RevenueDistribution);
             }
         }
 
@@ -144,7 +114,7 @@ namespace Content.Server.Cargo.Systems
             }
 
             // Find our order again. It might have been dispatched or approved already
-            var order = orderDatabase.Orders.Find(order => args.OrderId == order.OrderId && !order.Approved);
+            var order = orderDatabase.Orders[component.Account].Find(order => args.OrderId == order.OrderId && !order.Approved);
             if (order == null)
             {
                 return;
@@ -158,7 +128,7 @@ namespace Content.Server.Cargo.Systems
                 return;
             }
 
-            var amount = GetOutstandingOrderCount(orderDatabase);
+            var amount = GetOutstandingOrderCount(orderDatabase, component.Account);
             var capacity = orderDatabase.Capacity;
 
             // Too many orders, avoid them getting spammed in the UI.
@@ -180,9 +150,10 @@ namespace Content.Server.Cargo.Systems
             }
 
             var cost = order.Price * order.OrderQuantity;
+            var accountBalance = GetBalanceFromAccount((station.Value, bank), component.Account);
 
             // Not enough balance
-            if (cost > bank.Balance)
+            if (cost > accountBalance)
             {
                 ConsolePopup(args.Actor, Loc.GetString("cargo-console-insufficient-funds", ("cost", cost)));
                 PlayDenySound(uid, component);
@@ -195,7 +166,7 @@ namespace Content.Server.Cargo.Systems
 
             if (!ev.Handled)
             {
-                ev.FulfillmentEntity = TryFulfillOrder((station.Value, stationData), order, orderDatabase);
+                ev.FulfillmentEntity = TryFulfillOrder((station.Value, stationData), component.Account, order, orderDatabase);
 
                 if (ev.FulfillmentEntity == null)
                 {
@@ -206,7 +177,7 @@ namespace Content.Server.Cargo.Systems
             }
 
             order.Approved = true;
-            _audio.PlayPvs(component.ConfirmSound, uid);
+            _audio.PlayPvs(ApproveSound, uid);
 
             if (!_emag.CheckFlag(uid, EmagType.Interaction))
             {
@@ -220,20 +191,23 @@ namespace Content.Server.Cargo.Systems
                     ("approver", order.Approver ?? string.Empty),
                     ("cost", cost));
                 _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+                if (CargoOrderConsoleComponent.BaseAnnouncementChannel != component.AnnouncementChannel)
+                    _radio.SendRadioMessage(uid, message, CargoOrderConsoleComponent.BaseAnnouncementChannel, uid, escapeMarkup: false);
             }
 
             ConsolePopup(args.Actor, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(ev.FulfillmentEntity.Value).EntityName)));
 
             // Log order approval
-            _adminLogger.Add(LogType.Action, LogImpact.Low,
-                $"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bank.Balance}");
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Low,
+                $"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] on account {component.Account} with balance at {accountBalance}");
 
-            orderDatabase.Orders.Remove(order);
-            UpdateBankAccount((station.Value, bank), -cost);
+            orderDatabase.Orders[component.Account].Remove(order);
+            UpdateBankAccount((station.Value, bank), -cost, CreateAccountDistribution(component.Account, bank));
             UpdateOrders(station.Value);
         }
 
-        private EntityUid? TryFulfillOrder(Entity<StationDataComponent> stationData, CargoOrderData order, StationCargoOrderDatabaseComponent orderDatabase)
+        private EntityUid? TryFulfillOrder(Entity<StationDataComponent> stationData, ProtoId<CargoAccountPrototype> account, CargoOrderData order, StationCargoOrderDatabaseComponent orderDatabase)
         {
             // No slots at the trade station
             _listEnts.Clear();
@@ -253,7 +227,7 @@ namespace Content.Server.Cargo.Systems
                     {
                         var coordinates = new EntityCoordinates(trade, pad.Transform.LocalPosition);
 
-                        if (FulfillOrder(order, coordinates, orderDatabase.PrinterOutput))
+                        if (FulfillOrder(order, account, coordinates, orderDatabase.PrinterOutput))
                         {
                             tradeDestination = trade;
                             order.NumDispatched++;
@@ -288,7 +262,7 @@ namespace Content.Server.Cargo.Systems
             if (!TryGetOrderDatabase(station, out var orderDatabase))
                 return;
 
-            RemoveOrder(station.Value, args.OrderId, orderDatabase);
+            RemoveOrder(station.Value, component.Account, args.OrderId, orderDatabase);
         }
 
         private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleAddOrderMessage args)
@@ -315,14 +289,15 @@ namespace Content.Server.Cargo.Systems
 
             var data = GetOrderData(args, product, GenerateOrderId(orderDatabase));
 
-            if (!TryAddOrder(stationUid.Value, data, orderDatabase))
+            if (!TryAddOrder(stationUid.Value, component.Account, data, orderDatabase))
             {
                 PlayDenySound(uid, component);
                 return;
             }
 
             // Log order addition
-            _adminLogger.Add(LogType.Action, LogImpact.Low,
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Low,
                 $"{ToPrettyString(player):user} added order [orderId:{data.OrderId}, quantity:{data.OrderQuantity}, product:{data.ProductId}, requester:{data.Requester}, reason:{data.Reason}]");
 
         }
@@ -335,29 +310,24 @@ namespace Content.Server.Cargo.Systems
 
         #endregion
 
-
-        private void OnOrderBalanceUpdated(Entity<CargoOrderConsoleComponent> ent, ref BankBalanceUpdatedEvent args)
-        {
-            if (!_uiSystem.IsUiOpen(ent.Owner, CargoConsoleUiKey.Orders))
-                return;
-
-            UpdateOrderState(ent, args.Station);
-        }
-
         private void UpdateOrderState(EntityUid consoleUid, EntityUid? station)
         {
-            if (station == null ||
-                !TryComp<StationCargoOrderDatabaseComponent>(station, out var orderDatabase) ||
-                !TryComp<StationBankAccountComponent>(station, out var bankAccount)) return;
+            if (!TryComp<CargoOrderConsoleComponent>(consoleUid, out var console))
+                return;
+
+            if (!TryComp<StationCargoOrderDatabaseComponent>(station, out var orderDatabase))
+                return;
 
             if (_uiSystem.HasUi(consoleUid, CargoConsoleUiKey.Orders))
             {
-                _uiSystem.SetUiState(consoleUid, CargoConsoleUiKey.Orders, new CargoConsoleInterfaceState(
+                _uiSystem.SetUiState(consoleUid,
+                    CargoConsoleUiKey.Orders,
+                    new CargoConsoleInterfaceState(
                     MetaData(station.Value).EntityName,
-                    GetOutstandingOrderCount(orderDatabase),
+                    GetOutstandingOrderCount(orderDatabase, console.Account),
                     orderDatabase.Capacity,
-                    bankAccount.Balance,
-                    orderDatabase.Orders
+                    GetNetEntity(station.Value),
+                    orderDatabase.Orders[console.Account]
                 ));
             }
         }
@@ -377,11 +347,11 @@ namespace Content.Server.Cargo.Systems
             return new CargoOrderData(id, cargoProduct.Product, cargoProduct.Name, cargoProduct.Cost, args.Amount, args.Requester, args.Reason);
         }
 
-        public static int GetOutstandingOrderCount(StationCargoOrderDatabaseComponent component)
+        public static int GetOutstandingOrderCount(StationCargoOrderDatabaseComponent component, ProtoId<CargoAccountPrototype> account)
         {
             var amount = 0;
 
-            foreach (var order in component.Orders)
+            foreach (var order in component.Orders[account])
             {
                 if (!order.Approved)
                     continue;
@@ -430,6 +400,7 @@ namespace Content.Server.Cargo.Systems
             string description,
             string dest,
             StationCargoOrderDatabaseComponent component,
+            ProtoId<CargoAccountPrototype> account,
             Entity<StationDataComponent> stationData
         )
         {
@@ -443,16 +414,17 @@ namespace Content.Server.Cargo.Systems
             order.Approved = true;
 
             // Log order addition
-            _adminLogger.Add(LogType.Action, LogImpact.Low,
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Low,
                 $"AddAndApproveOrder {description} added order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}]");
 
             // Add it to the list
-            return TryAddOrder(dbUid, order, component) && TryFulfillOrder(stationData, order, component).HasValue;
+            return TryAddOrder(dbUid, account, order, component) && TryFulfillOrder(stationData, account, order, component).HasValue;
         }
 
-        private bool TryAddOrder(EntityUid dbUid, CargoOrderData data, StationCargoOrderDatabaseComponent component)
+        private bool TryAddOrder(EntityUid dbUid, ProtoId<CargoAccountPrototype> account, CargoOrderData data, StationCargoOrderDatabaseComponent component)
         {
-            component.Orders.Add(data);
+            component.Orders[account].Add(data);
             UpdateOrders(dbUid);
             return true;
         }
@@ -464,12 +436,12 @@ namespace Content.Server.Cargo.Systems
             return ++orderDB.NumOrdersCreated;
         }
 
-        public void RemoveOrder(EntityUid dbUid, int index, StationCargoOrderDatabaseComponent orderDB)
+        public void RemoveOrder(EntityUid dbUid, ProtoId<CargoAccountPrototype> account, int index, StationCargoOrderDatabaseComponent orderDB)
         {
-            var sequenceIdx = orderDB.Orders.FindIndex(order => order.OrderId == index);
+            var sequenceIdx = orderDB.Orders[account].FindIndex(order => order.OrderId == index);
             if (sequenceIdx != -1)
             {
-                orderDB.Orders.RemoveAt(sequenceIdx);
+                orderDB.Orders[account].RemoveAt(sequenceIdx);
             }
             UpdateOrders(dbUid);
         }
@@ -482,22 +454,22 @@ namespace Content.Server.Cargo.Systems
             component.Orders.Clear();
         }
 
-        private static bool PopFrontOrder(StationCargoOrderDatabaseComponent orderDB, [NotNullWhen(true)] out CargoOrderData? orderOut)
+        private static bool PopFrontOrder(StationCargoOrderDatabaseComponent orderDB, ProtoId<CargoAccountPrototype> account, [NotNullWhen(true)] out CargoOrderData? orderOut)
         {
-            var orderIdx = orderDB.Orders.FindIndex(order => order.Approved);
+            var orderIdx = orderDB.Orders[account].FindIndex(order => order.Approved);
             if (orderIdx == -1)
             {
                 orderOut = null;
                 return false;
             }
 
-            orderOut = orderDB.Orders[orderIdx];
+            orderOut = orderDB.Orders[account][orderIdx];
             orderOut.NumDispatched++;
 
             if (orderOut.NumDispatched >= orderOut.OrderQuantity)
             {
                 // Order is complete. Remove from the queue.
-                orderDB.Orders.RemoveAt(orderIdx);
+                orderDB.Orders[account].RemoveAt(orderIdx);
             }
             return true;
         }
@@ -505,18 +477,19 @@ namespace Content.Server.Cargo.Systems
         /// <summary>
         /// Tries to fulfill the next outstanding order.
         /// </summary>
-        private bool FulfillNextOrder(StationCargoOrderDatabaseComponent orderDB, EntityCoordinates spawn, string? paperProto)
+        [PublicAPI]
+        private bool FulfillNextOrder(StationCargoOrderDatabaseComponent orderDB, ProtoId<CargoAccountPrototype> account, EntityCoordinates spawn, string? paperProto)
         {
-            if (!PopFrontOrder(orderDB, out var order))
+            if (!PopFrontOrder(orderDB, account, out var order))
                 return false;
 
-            return FulfillOrder(order, spawn, paperProto);
+            return FulfillOrder(order, account, spawn, paperProto);
         }
 
         /// <summary>
         /// Fulfills the specified cargo order and spawns paper attached to it.
         /// </summary>
-        private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string? paperProto)
+        private bool FulfillOrder(CargoOrderData order, ProtoId<CargoAccountPrototype> account, EntityCoordinates spawn, string? paperProto)
         {
             // Create the item itself
             var item = Spawn(order.ProductId, spawn);
@@ -532,14 +505,18 @@ namespace Content.Server.Cargo.Systems
                 var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderId));
                 _metaSystem.SetEntityName(printed, val);
 
-                _paperSystem.SetContent((printed, paper), Loc.GetString(
+                var accountProto = _protoMan.Index(account);
+                _paperSystem.SetContent((printed, paper),
+                    Loc.GetString(
                         "cargo-console-paper-print-text",
                         ("orderNumber", order.OrderId),
                         ("itemName", MetaData(item).EntityName),
                         ("orderQuantity", order.OrderQuantity),
                         ("requester", order.Requester),
-                        ("reason", order.Reason),
-                        ("approver", order.Approver ?? string.Empty)));
+                        ("reason", string.IsNullOrWhiteSpace(order.Reason) ? Loc.GetString("cargo-console-paper-reason-default") : order.Reason),
+                        ("account", Loc.GetString(accountProto.Name)),
+                        ("accountcode", Loc.GetString(accountProto.Code)),
+                        ("approver", string.IsNullOrWhiteSpace(order.Approver) ? Loc.GetString("cargo-console-paper-approver-default") : order.Approver)));
 
                 // attempt to attach the label to the item
                 if (TryComp<PaperLabelComponent>(item, out var label))
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 5730ac3a1d1..84319ab7933 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -1,13 +1,13 @@
+using System.Linq;
 using Content.Server.Cargo.Components;
-using Content.Shared.Stacks;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Events;
-using Content.Shared.GameTicking;
-using Robust.Shared.Map;
-using Robust.Shared.Random;
+using Content.Shared.Cargo.Prototypes;
+using JetBrains.Annotations;
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -28,12 +28,11 @@ public sealed partial class CargoSystem
         SubscribeLocalEvent<CargoPalletConsoleComponent, CargoPalletSellMessage>(OnPalletSale);
         SubscribeLocalEvent<CargoPalletConsoleComponent, CargoPalletAppraiseMessage>(OnPalletAppraise);
         SubscribeLocalEvent<CargoPalletConsoleComponent, BoundUIOpenedEvent>(OnPalletUIOpen);
-
-        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
     }
 
     #region Console
 
+    [PublicAPI]
     private void UpdateCargoShuttleConsoles(EntityUid shuttleUid, CargoShuttleComponent _)
     {
         // Update pilot consoles that are already open.
@@ -54,15 +53,18 @@ public sealed partial class CargoSystem
 
     private void UpdatePalletConsoleInterface(EntityUid uid)
     {
-        if (Transform(uid).GridUid is not EntityUid gridUid)
+        if (Transform(uid).GridUid is not { } gridUid)
         {
-            _uiSystem.SetUiState(uid, CargoPalletConsoleUiKey.Sale,
-            new CargoPalletConsoleInterfaceState(0, 0, false));
+            _uiSystem.SetUiState(uid,
+                CargoPalletConsoleUiKey.Sale,
+                new CargoPalletConsoleInterfaceState(0, 0, false));
             return;
         }
-        GetPalletGoods(gridUid, out var toSell, out var amount);
-        _uiSystem.SetUiState(uid, CargoPalletConsoleUiKey.Sale,
-            new CargoPalletConsoleInterfaceState((int) amount, toSell.Count, true));
+        GetPalletGoods(gridUid, out var toSell, out var goods);
+        var totalAmount = goods.Sum(t => t.Item3);
+        _uiSystem.SetUiState(uid,
+            CargoPalletConsoleUiKey.Sale,
+            new CargoPalletConsoleInterfaceState((int) totalAmount, toSell.Count, true));
     }
 
     private void OnPalletUIOpen(EntityUid uid, CargoPalletConsoleComponent component, BoundUIOpenedEvent args)
@@ -98,11 +100,15 @@ public sealed partial class CargoSystem
         var shuttleName = orderDatabase?.Shuttle != null ? MetaData(orderDatabase.Shuttle.Value).EntityName : string.Empty;
 
         if (_uiSystem.HasUi(uid, CargoConsoleUiKey.Shuttle))
-            _uiSystem.SetUiState(uid, CargoConsoleUiKey.Shuttle, new CargoShuttleConsoleBoundUserInterfaceState(
+        {
+            _uiSystem.SetUiState(uid,
+                CargoConsoleUiKey.Shuttle,
+                new CargoShuttleConsoleBoundUserInterfaceState(
                 station != null ? MetaData(station.Value).EntityName : Loc.GetString("cargo-shuttle-console-station-unknown"),
                 string.IsNullOrEmpty(shuttleName) ? Loc.GetString("cargo-shuttle-console-shuttle-not-found") : shuttleName,
                 orders
             ));
+        }
     }
 
     #endregion
@@ -132,9 +138,10 @@ public sealed partial class CargoSystem
             return orders;
 
         var spaceRemaining = GetCargoSpace(shuttleUid);
-        for (var i = 0; i < component.Orders.Count && spaceRemaining > 0; i++)
+        var allOrders = component.AllOrders.ToList();
+        for (var i = 0; i < allOrders.Count && spaceRemaining > 0; i++)
         {
-            var order = component.Orders[i];
+            var order = allOrders[i];
             if (order.Approved)
             {
                 var numToShip = order.OrderQuantity - order.NumDispatched;
@@ -142,8 +149,14 @@ public sealed partial class CargoSystem
                 {
                     // We won't be able to fit the whole order on, so make one
                     // which represents the space we do have left:
-                    var reducedOrder = new CargoOrderData(order.OrderId,
-                            order.ProductId, order.ProductName, order.Price, spaceRemaining, order.Requester, order.Reason);
+                    var reducedOrder = new CargoOrderData(
+                        order.OrderId,
+                        order.ProductId,
+                        order.ProductName,
+                        order.Price,
+                        spaceRemaining,
+                        order.Requester,
+                        order.Reason);
                     orders.Add(reducedOrder);
                 }
                 else
@@ -219,16 +232,13 @@ public sealed partial class CargoSystem
 
     #region Station
 
-    private bool SellPallets(EntityUid gridUid, out double amount)
+    private bool SellPallets(EntityUid gridUid, out HashSet<(EntityUid, OverrideSellComponent?, double)> goods)
     {
-        GetPalletGoods(gridUid, out var toSell, out amount);
-
-        Log.Debug($"Cargo sold {toSell.Count} entities for {amount}");
+        GetPalletGoods(gridUid, out var toSell, out goods);
 
         if (toSell.Count == 0)
             return false;
 
-
         var ev = new EntitySoldEvent(toSell);
         RaiseLocalEvent(ref ev);
 
@@ -240,9 +250,9 @@ public sealed partial class CargoSystem
         return true;
     }
 
-    private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, out double amount)
+    private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell,  out HashSet<(EntityUid, OverrideSellComponent?, double)> goods)
     {
-        amount = 0;
+        goods = new HashSet<(EntityUid, OverrideSellComponent?, double)>();
         toSell = new HashSet<EntityUid>();
 
         foreach (var (palletUid, _, _) in GetCargoPallets(gridUid, BuySellType.Sell))
@@ -250,7 +260,9 @@ public sealed partial class CargoSystem
             // Containers should already get the sell price of their children so can skip those.
             _setEnts.Clear();
 
-            _lookup.GetEntitiesIntersecting(palletUid, _setEnts,
+            _lookup.GetEntitiesIntersecting(
+                palletUid,
+                _setEnts,
                 LookupFlags.Dynamic | LookupFlags.Sundries);
 
             foreach (var ent in _setEnts)
@@ -273,7 +285,7 @@ public sealed partial class CargoSystem
                 if (price == 0)
                     continue;
                 toSell.Add(ent);
-                amount += price;
+                goods.Add((ent, CompOrNull<OverrideSellComponent>(ent), price));
             }
         }
     }
@@ -305,29 +317,49 @@ public sealed partial class CargoSystem
     {
         var xform = Transform(uid);
 
-        if (xform.GridUid is not EntityUid gridUid)
+        if (_station.GetOwningStation(uid) is not { } station ||
+            !TryComp<StationBankAccountComponent>(station, out var bankAccount))
         {
-            _uiSystem.SetUiState(uid, CargoPalletConsoleUiKey.Sale,
-            new CargoPalletConsoleInterfaceState(0, 0, false));
             return;
         }
 
-        if (!SellPallets(gridUid, out var price))
+        if (xform.GridUid is not { } gridUid)
+        {
+            _uiSystem.SetUiState(uid,
+                CargoPalletConsoleUiKey.Sale,
+                new CargoPalletConsoleInterfaceState(0, 0, false));
+            return;
+        }
+
+        if (!SellPallets(gridUid, out var goods))
             return;
 
-        var stackPrototype = _protoMan.Index<StackPrototype>(component.CashType);
-        _stack.Spawn((int) price, stackPrototype, xform.Coordinates);
+        var baseDistribution = CreateAccountDistribution(bankAccount.PrimaryAccount, bankAccount, bankAccount.PrimaryCut);
+        foreach (var (_, sellComponent, value) in goods)
+        {
+            Dictionary<ProtoId<CargoAccountPrototype>, double> distribution;
+            if (sellComponent != null)
+            {
+                distribution = new Dictionary<ProtoId<CargoAccountPrototype>, double>()
+                {
+                    { sellComponent.OverrideAccount, bankAccount.PrimaryCut },
+                    { bankAccount.PrimaryAccount, 1.0 - bankAccount.PrimaryCut },
+                };
+            }
+            else
+            {
+                distribution = baseDistribution;
+            }
+
+            UpdateBankAccount((station, bankAccount), (int) Math.Round(value), distribution, false);
+        }
+
+        Dirty(station, bankAccount);
         _audio.PlayPvs(ApproveSound, uid);
         UpdatePalletConsoleInterface(uid);
     }
 
     #endregion
-
-    private void OnRoundRestart(RoundRestartCleanupEvent ev)
-    {
-        Reset();
-        CleanupTradeStation(); // DeltaV
-    }
 }
 
 /// <summary>
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index 41fbf12a0c6..25fb514db6d 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Cargo.Components;
 using Content.Server.Power.Components;
@@ -40,9 +41,8 @@ public sealed partial class CargoSystem
                 continue;
 
             // todo cannot be fucking asked to figure out device linking rn but this shouldn't just default to the first port.
-            if (!TryComp<DeviceLinkSinkComponent>(uid, out var sinkComponent) ||
-                sinkComponent.LinkedSources.FirstOrNull() is not { } console ||
-                console != args.OrderConsole.Owner)
+            if (!TryGetLinkedConsole((uid, tele), out var console) ||
+                console.Value.Owner != args.OrderConsole.Owner)
                 continue;
 
             for (var i = 0; i < args.Order.OrderQuantity; i++)
@@ -56,10 +56,26 @@ public sealed partial class CargoSystem
         }
     }
 
+    private bool TryGetLinkedConsole(Entity<CargoTelepadComponent> ent,
+        [NotNullWhen(true)] out Entity<CargoOrderConsoleComponent>? console)
+    {
+        console = null;
+        if (!TryComp<DeviceLinkSinkComponent>(ent, out var sinkComponent) ||
+            sinkComponent.LinkedSources.FirstOrNull() is not { } linked)
+            return false;
+
+        if (!TryComp<CargoOrderConsoleComponent>(linked, out var consoleComp))
+            return false;
+
+        console = (linked, consoleComp);
+        return true;
+    }
+
+
     private void UpdateTelepad(float frameTime)
     {
-        var query = EntityQueryEnumerator<CargoTelepadComponent>();
-        while (query.MoveNext(out var uid, out var comp))
+        var query = EntityQueryEnumerator<CargoTelepadComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var xform))
         {
             // Don't EntityQuery for it as it's not required.
             TryComp<AppearanceComponent>(uid, out var appearance);
@@ -82,15 +98,14 @@ public sealed partial class CargoSystem
                 continue;
             }
 
-            if (comp.CurrentOrders.Count == 0)
+            if (comp.CurrentOrders.Count == 0 || !TryGetLinkedConsole((uid, comp), out var console))
             {
                 comp.Accumulator += comp.Delay;
                 continue;
             }
 
-            var xform = Transform(uid);
             var currentOrder = comp.CurrentOrders.First();
-            if (FulfillOrder(currentOrder, xform.Coordinates, comp.PrinterOutput))
+            if (FulfillOrder(currentOrder, console.Value.Comp.Account, xform.Coordinates, comp.PrinterOutput))
             {
                 _audio.PlayPvs(_audio.ResolveSound(comp.TeleportSound), uid, AudioParams.Default.WithVolume(-8f));
 
@@ -128,9 +143,12 @@ public sealed partial class CargoSystem
             !TryComp<StationDataComponent>(station, out var data))
             return;
 
+        if (!TryGetLinkedConsole(ent, out var console))
+            return;
+
         foreach (var order in ent.Comp.CurrentOrders)
         {
-            TryFulfillOrder((station, data), order, db);
+            TryFulfillOrder((station, data), console.Value.Comp.Account, order, db);
         }
     }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index ba39787395a..10d7dcde355 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Administration.Logs;
 using Content.Server.Radio.EntitySystems;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Paper;
@@ -16,14 +17,12 @@ using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Random;
 
 namespace Content.Server.Cargo.Systems;
 
 public sealed partial class CargoSystem : SharedCargoSystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
@@ -65,37 +64,47 @@ public sealed partial class CargoSystem : SharedCargoSystem
         InitializeShuttle();
         InitializeTelepad();
         InitializeBounty();
+        InitializeFunds();
         InitializeATS(); // DeltaV
     }
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        UpdateConsole(frameTime);
+        UpdateConsole();
         UpdateTelepad(frameTime);
         UpdateBounty();
     }
 
+    /// <summary>
+    /// Adds or removes funds from the <see cref="StationBankAccountComponent"/>.
+    /// </summary>
+    /// <param name="ent">The station.</param>
+    /// <param name="balanceAdded">The amount of funds to add or remove.</param>
+    /// <param name="accountDistribution">The distribution between individual <see cref="CargoAccountPrototype"/>.</param>
+    /// <param name="dirty">Whether to mark the bank accoujnt component as dirty.</param>
     [PublicAPI]
-    public void UpdateBankAccount(Entity<StationBankAccountComponent?> ent, int balanceAdded)
+    public void UpdateBankAccount(
+        Entity<StationBankAccountComponent?> ent,
+        int balanceAdded,
+        Dictionary<ProtoId<CargoAccountPrototype>, double> accountDistribution,
+        bool dirty = true)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
 
-        ent.Comp.Balance += balanceAdded;
-
-        var ev = new BankBalanceUpdatedEvent(ent, ent.Comp.Balance);
-
-        var query = EntityQueryEnumerator<BankClientComponent, TransformComponent>();
-        while (query.MoveNext(out var client, out var comp, out var xform))
+        foreach (var (account, percent) in accountDistribution)
         {
-            var station = _station.GetOwningStation(client, xform);
-            if (station != ent)
-                continue;
-
-            comp.Balance = ent.Comp.Balance;
-            Dirty(client, comp);
-            RaiseLocalEvent(client, ref ev);
+            var accountBalancedAdded = (int) Math.Round(percent * balanceAdded);
+            ent.Comp.Accounts[account] += accountBalancedAdded;
         }
+
+        var ev = new BankBalanceUpdatedEvent(ent, ent.Comp.Accounts);
+        RaiseLocalEvent(ent, ref ev, true);
+
+        if (!dirty)
+            return;
+
+        Dirty(ent);
     }
 }
diff --git a/Content.Server/Delivery/DeliverySystem.cs b/Content.Server/Delivery/DeliverySystem.cs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index bc1800ffd1e..61153be4010 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -86,7 +86,7 @@ namespace Content.Server.Stack
         public EntityUid Spawn(int amount, StackPrototype prototype, EntityCoordinates spawnPosition)
         {
             // Set the output result parameter to the new stack entity...
-            var entity = Spawn(prototype.Spawn, spawnPosition);
+            var entity = SpawnAtPosition(prototype.Spawn, spawnPosition);
             var stack = Comp<StackComponent>(entity);
 
             // And finally, set the correct amount!
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index a61adb78abe..d80e2d08d1c 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Station;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Server.GameStates;
 using Robust.Server.Player;
 using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
@@ -34,6 +35,7 @@ public sealed class StationSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!;
 
     private ISawmill _sawmill = default!;
 
@@ -97,7 +99,7 @@ public sealed class StationSystem : EntitySystem
         var metaData = MetaData(uid);
         RaiseLocalEvent(new StationInitializedEvent(uid));
         _sawmill.Info($"Set up station {metaData.EntityName} ({uid}).");
-
+        _pvsOverride.AddGlobalOverride(uid);
     }
 
     private void OnStationDeleted(EntityUid uid, StationDataComponent component, ComponentShutdown args)
diff --git a/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs b/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs
index ab5d722a737..01d67f61cfa 100644
--- a/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs
@@ -34,6 +34,12 @@ public sealed partial class CargoGiftsRuleComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public LocId Dest = "cargo-gift-default-dest";
 
+    /// <summary>
+    /// Account the gifts are deposited into
+    /// </summary>
+    [DataField]
+    public ProtoId<CargoAccountPrototype> Account = "Cargo";
+
     /// <summary>
     /// Cargo that you would like gifted to the station, with the quantity for each
     /// Use Ids from cargoProduct Prototypes
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index ff2d1ca6311..f8a718a536c 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -53,7 +53,7 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
         }
 
         // Add some presents
-        var outstanding = CargoSystem.GetOutstandingOrderCount(cargoDb);
+        var outstanding = CargoSystem.GetOutstandingOrderCount(cargoDb, component.Account);
         while (outstanding < cargoDb.Capacity - component.OrderSpaceToLeave && component.Gifts.Count > 0)
         {
             // I wish there was a nice way to pop this
@@ -72,6 +72,7 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
                     Loc.GetString(component.Description),
                     Loc.GetString(component.Dest),
                     cargoDb,
+                    component.Account,
                     (station.Value, stationData)
             ))
             {
diff --git a/Content.Server/_DV/Cargo/Components/StationLogisticStatsDatabaseComponent.cs b/Content.Server/_DV/Cargo/Components/StationLogisticStatsDatabaseComponent.cs
index 19d4f22004e..108ff627acb 100644
--- a/Content.Server/_DV/Cargo/Components/StationLogisticStatsDatabaseComponent.cs
+++ b/Content.Server/_DV/Cargo/Components/StationLogisticStatsDatabaseComponent.cs
@@ -1,3 +1,4 @@
+using Content.Server._DV.Cargo.Systems;
 using Content.Shared.Cargo;
 using Content.Shared.CartridgeLoader.Cartridges;
 
@@ -6,7 +7,7 @@ namespace Content.Server._DV.Cargo.Components;
 /// <summary>
 /// Added to the abstract representation of a station to track stats related to mail delivery and income
 /// </summary>
-[RegisterComponent, Access(typeof(SharedCargoSystem))]
+[RegisterComponent, Access(typeof(LogisticStatsSystem))]
 public sealed partial class StationLogisticStatsComponent : Component
 {
     [DataField]
diff --git a/Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs b/Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs
index cf115a4900a..dd9f536d8f5 100644
--- a/Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs
+++ b/Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 
 namespace Content.Server._DV.Cargo.Systems;
 
-public sealed partial class LogisticStatsSystem : SharedCargoSystem
+public sealed partial class LogisticStatsSystem : EntitySystem
 {
     public override void Initialize()
     {
diff --git a/Content.Server/_DV/Cargo/Systems/StockMarketSystem.cs b/Content.Server/_DV/Cargo/Systems/StockMarketSystem.cs
index 7c879461cb5..ec8984750db 100644
--- a/Content.Server/_DV/Cargo/Systems/StockMarketSystem.cs
+++ b/Content.Server/_DV/Cargo/Systems/StockMarketSystem.cs
@@ -6,6 +6,7 @@ using Content.Server._DV.Cargo.Components;
 using Content.Server._DV.CartridgeLoader.Cartridges;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Cargo.Components;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.Database;
@@ -150,7 +151,7 @@ public sealed class StockMarketSystem : EntitySystem
         if (amount > 0)
         {
             // Buying: see if we can afford it
-            if (bank.Balance < totalValue)
+            if (bank.Accounts[bank.PrimaryAccount] < totalValue)
                 return false;
         }
         else
@@ -168,7 +169,7 @@ public sealed class StockMarketSystem : EntitySystem
             stockMarket.StockOwnership.Remove(companyIndex);
 
         // Update the bank account (take away for buying and give for selling)
-        _cargo.UpdateBankAccount((station, bank), -totalValue);
+        _cargo.UpdateBankAccount((station, bank), -totalValue, _cargo.CreateAccountDistribution(bank.PrimaryAccount, bank));
 
         // Log the transaction
         var verb = amount > 0 ? "bought" : "sold";
diff --git a/Content.Server/_DV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs b/Content.Server/_DV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
index e8677ea01b7..e3892b9a40d 100644
--- a/Content.Server/_DV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
+++ b/Content.Server/_DV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
@@ -22,10 +22,10 @@ public sealed class StockTradingCartridgeSystem : EntitySystem
         SubscribeLocalEvent<StockTradingCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
         SubscribeLocalEvent<StockMarketUpdatedEvent>(OnStockMarketUpdated);
         SubscribeLocalEvent<StationStockMarketComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<StockTradingCartridgeComponent, BankBalanceUpdatedEvent>(OnBalanceUpdated);
+        SubscribeLocalEvent<BankBalanceUpdatedEvent>(OnBalanceUpdated);
     }
 
-    private void OnBalanceUpdated(Entity<StockTradingCartridgeComponent> ent, ref BankBalanceUpdatedEvent args)
+    private void OnBalanceUpdated(ref BankBalanceUpdatedEvent args)
     {
         UpdateAllCartridges(args.Station);
     }
@@ -85,7 +85,7 @@ public sealed class StockTradingCartridgeSystem : EntitySystem
         var state = new StockTradingUiState(
             entries: stockMarket.Companies,
             ownedStocks: stockMarket.StockOwnership,
-            balance: bankAccount.Balance
+            balance: bankAccount.Accounts[bankAccount.PrimaryAccount]
         );
 
         _cartridgeLoader.UpdateCartridgeUiState(loader, state);
diff --git a/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs
index abe553d491f..245990b0be1 100644
--- a/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs
+++ b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs
@@ -19,6 +19,7 @@ using Content.Server.Station.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Access;
+using Content.Shared.Cargo.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared._DV.Mail;
@@ -249,7 +250,10 @@ namespace Content.Server._DV.Mail.EntitySystems
                 if (_stationSystem.GetOwningStation(uid) != station)
                     continue;
 
-                _cargoSystem.UpdateBankAccount((station, account), component.Bounty);
+                _cargoSystem.UpdateBankAccount(
+                    (station, account),
+                    component.Bounty,
+                    _cargoSystem.CreateAccountDistribution(account.PrimaryAccount, account, account.PrimaryCut));
             }
         }
 
@@ -306,7 +310,10 @@ namespace Content.Server._DV.Mail.EntitySystems
                 if (_stationSystem.GetOwningStation(uid) != station)
                     continue;
 
-                _cargoSystem.UpdateBankAccount((station, account), component.Penalty);
+                _cargoSystem.UpdateBankAccount(
+                    (station, account),
+                    component.Penalty,
+                    _cargoSystem.CreateAccountDistribution(account.PrimaryAccount, account, account.PrimaryCut));
                 return;
             }
         }
diff --git a/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs b/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs
index cb83825199d..c7ead0d0902 100644
--- a/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs
+++ b/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs
@@ -25,7 +25,7 @@ public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ShipyardConsoleComponent, BankBalanceUpdatedEvent>(OnBalanceUpdated);
+        SubscribeLocalEvent<BankBalanceUpdatedEvent>(OnBalanceUpdated);
         Subs.BuiEvents<ShipyardConsoleComponent>(ShipyardConsoleUiKey.Key,
             subs =>
         {
@@ -42,7 +42,7 @@ public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem
         if (GetBankAccount(ent) is not {} bank)
             return;
 
-        if (bank.Comp.Balance < vessel.Price)
+        if (bank.Comp.Accounts[bank.Comp.PrimaryAccount] < vessel.Price)
         {
             var popup = Loc.GetString("cargo-console-insufficient-funds", ("cost", vessel.Price));
             Popup.PopupEntity(popup, ent, user);
@@ -60,19 +60,25 @@ public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem
 
         _meta.SetEntityName(shuttle, $"{vessel.Name} {_random.Next(1000):000}");
 
-        _cargo.UpdateBankAccount((bank, bank), -vessel.Price);
+        _cargo.UpdateBankAccount((bank, bank), -vessel.Price, _cargo.CreateAccountDistribution(bank.Comp.PrimaryAccount, bank.Comp));
 
         var message = Loc.GetString("shipyard-console-docking", ("vessel", vessel.Name));
         _radio.SendRadioMessage(ent, message, ent.Comp.Channel, ent);
         Audio.PlayPvs(ent.Comp.ConfirmSound, ent);
     }
 
-    private void OnBalanceUpdated(Entity<ShipyardConsoleComponent> ent, ref BankBalanceUpdatedEvent args)
+    private void OnBalanceUpdated(ref BankBalanceUpdatedEvent args)
     {
-        if (!_ui.IsUiOpen(ent.Owner, ShipyardConsoleUiKey.Key))
-            return;
+        var query = EntityQueryEnumerator<ShipyardConsoleComponent>();
 
-        UpdateUI(ent, args.Balance);
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (!_ui.IsUiOpen(uid, ShipyardConsoleUiKey.Key))
+                return;
+
+            if (GetBankAccount(uid) is {} bank)
+                UpdateUI(uid, args.Balance[bank.Comp.PrimaryAccount]);
+        }
     }
 
     private void OnOpened(Entity<ShipyardConsoleComponent> ent, ref BoundUIOpenedEvent args)
@@ -83,7 +89,7 @@ public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem
     private void UpdateUI(EntityUid uid)
     {
         if (GetBankAccount(uid) is {} bank)
-            UpdateUI(uid, bank.Comp.Balance);
+            UpdateUI(uid, bank.Comp.Accounts[bank.Comp.PrimaryAccount]);
     }
 
     private void UpdateUI(EntityUid uid, int balance)
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index c8e9b395bd0..9890b731a13 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -93,6 +93,7 @@ public sealed partial class IdCardConsoleComponent : Component
         "Robotics", // DeltaV
         "Clerk", // Delta V - Add Clerk access
         "Surgery", // Delta V - Add Surgery access
+        "Funding", // DeltaV - Add Funding access
     };
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs b/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs
index a1e61772cd6..7084477f246 100644
--- a/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs
+++ b/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs
@@ -8,15 +8,15 @@ public sealed class CargoConsoleInterfaceState : BoundUserInterfaceState
     public string Name;
     public int Count;
     public int Capacity;
-    public int Balance;
+    public NetEntity Station;
     public List<CargoOrderData> Orders;
 
-    public CargoConsoleInterfaceState(string name, int count, int capacity, int balance, List<CargoOrderData> orders)
+    public CargoConsoleInterfaceState(string name, int count, int capacity, NetEntity station, List<CargoOrderData> orders)
     {
         Name = name;
         Count = count;
         Capacity = capacity;
-        Balance = balance;
+        Station = station;
         Orders = orders;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Cargo/Components/BankClientComponent.cs b/Content.Shared/Cargo/Components/BankClientComponent.cs
deleted file mode 100644
index a2bf8045704..00000000000
--- a/Content.Shared/Cargo/Components/BankClientComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Cargo.Components;
-
-/// <summary>
-/// Makes an entity a client of the station's bank account.
-/// When its balance changes it will have <see cref="BankBalanceUpdatedEvent"/> raised on it.
-/// Other systems can then use this for logic or to update ui states.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))]
-[AutoGenerateComponentState]
-public sealed partial class BankClientComponent : Component
-{
-    /// <summary>
-    /// The balance updated for the last station this entity was a part of.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public int Balance;
-}
-
-/// <summary>
-/// Raised on an entity with <see cref="BankClientComponent"/> when the bank's balance is updated.
-/// </summary>
-[ByRefEvent]
-public readonly record struct BankBalanceUpdatedEvent(EntityUid Station, int Balance);
diff --git a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs
index 873e9bb7b9d..90abfe8bfa3 100644
--- a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs
+++ b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs
@@ -1,33 +1,121 @@
+using Content.Shared.Access;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Content.Shared.Radio;
+using Content.Shared.Stacks;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Cargo.Components;
 
 /// <summary>
 /// Handles sending order requests to cargo. Doesn't handle orders themselves via shuttle or telepads.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(SharedCargoSystem))]
 public sealed partial class CargoOrderConsoleComponent : Component
 {
-    [DataField("soundError")] public SoundSpecifier ErrorSound =
-        new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_sigh.ogg");
+    /// <summary>
+    /// The account that this console pulls from for ordering.
+    /// </summary>
+    [DataField]
+    public ProtoId<CargoAccountPrototype> Account = "Cargo";
 
-    [DataField("soundConfirm")]
-    public SoundSpecifier ConfirmSound = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
+    [DataField]
+    public SoundSpecifier ErrorSound = new SoundCollectionSpecifier("CargoError");
+
+    /// <summary>
+    /// Sound made when <see cref="TransferUnbounded"/> is toggled.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier ToggleLimitSound = new SoundCollectionSpecifier("CargoToggleLimit");
+
+    /// <summary>
+    /// If true, account transfers have no limit and a lower cooldown.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TransferUnbounded;
+
+    [ViewVariables]
+    public float TransferLimit => TransferUnbounded ? 1 : BaseTransferLimit;
+
+    /// <summary>
+    /// The maximum percent of total funds that can be transferred or withdrawn in one action.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BaseTransferLimit = 0.20f;
+
+    /// <summary>
+    /// The time at which account actions can be performed again.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextAccountActionTime;
+
+    [ViewVariables]
+    public TimeSpan AccountActionDelay => TransferUnbounded ? UnboundedAccountActionDelay : BaseAccountActionDelay;
+
+    /// <summary>
+    /// The minimum time between account actions when <see cref="TransferUnbounded"/> is false
+    /// </summary>
+    [DataField]
+    public TimeSpan BaseAccountActionDelay = TimeSpan.FromMinutes(1);
+
+    /// <summary>
+    /// The minimum time between account actions when <see cref="TransferUnbounded"/> is true
+    /// </summary>
+    [DataField]
+    public TimeSpan UnboundedAccountActionDelay = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// The stack representing cash dispensed on withdrawals.
+    /// </summary>
+    [DataField]
+    public ProtoId<StackPrototype> CashType = "Credit";
 
     /// <summary>
     /// All of the <see cref="CargoProductPrototype.Group"/>s that are supported.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public List<string> AllowedGroups = new() { "market" };
 
+    /// <summary>
+    /// Access needed to toggle the limit on this console.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<AccessLevelPrototype>> RemoveLimitAccess = new();
+
     /// <summary>
     /// Radio channel on which order approval announcements are transmitted
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public ProtoId<RadioChannelPrototype> AnnouncementChannel = "Supply";
+
+    /// <summary>
+    /// Secondary radio channel which always receives order announcements.
+    /// </summary>
+    public static readonly ProtoId<RadioChannelPrototype> BaseAnnouncementChannel = "Supply";
 }
 
+/// <summary>
+/// Withdraw funds from an account
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CargoConsoleWithdrawFundsMessage : BoundUserInterfaceMessage
+{
+    public ProtoId<CargoAccountPrototype>? Account;
+    public int Amount;
+
+    public CargoConsoleWithdrawFundsMessage(ProtoId<CargoAccountPrototype>? account, int amount)
+    {
+        Account = account;
+        Amount = amount;
+    }
+}
+
+/// <summary>
+/// Toggle the limit on withdrawals and transfers.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CargoConsoleToggleLimitMessage : BoundUserInterfaceMessage;
diff --git a/Content.Shared/Cargo/Components/FundingAllocationConsoleComponent.cs b/Content.Shared/Cargo/Components/FundingAllocationConsoleComponent.cs
new file mode 100644
index 00000000000..65fd09a1b71
--- /dev/null
+++ b/Content.Shared/Cargo/Components/FundingAllocationConsoleComponent.cs
@@ -0,0 +1,49 @@
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.Components;
+
+/// <summary>
+/// A console that manipulates the distribution of revenue on the station.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedCargoSystem))]
+public sealed partial class FundingAllocationConsoleComponent : Component
+{
+    /// <summary>
+    /// Sound played when the budget distribution is set.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SetDistributionSound = new SoundCollectionSpecifier("CargoPing");
+}
+
+[Serializable, NetSerializable]
+public sealed class SetFundingAllocationBuiMessage : BoundUserInterfaceMessage
+{
+    public Dictionary<ProtoId<CargoAccountPrototype>, int> Percents;
+
+    public SetFundingAllocationBuiMessage(Dictionary<ProtoId<CargoAccountPrototype>, int> percents)
+    {
+        Percents = percents;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class FundingAllocationConsoleBuiState : BoundUserInterfaceState
+{
+    public NetEntity Station;
+
+    public FundingAllocationConsoleBuiState(NetEntity station)
+    {
+        Station = station;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum FundingAllocationConsoleUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/Cargo/Components/OverrideSellComponent.cs b/Content.Shared/Cargo/Components/OverrideSellComponent.cs
new file mode 100644
index 00000000000..7d798c9ad10
--- /dev/null
+++ b/Content.Shared/Cargo/Components/OverrideSellComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Cargo.Components;
+
+/// <summary>
+/// Makes a sellable object portion out its value to a specified department rather than the station default
+/// </summary>
+[RegisterComponent]
+public sealed partial class OverrideSellComponent : Component
+{
+    /// <summary>
+    /// The account that will receive the primary funds from this being sold.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<CargoAccountPrototype> OverrideAccount;
+}
diff --git a/Content.Shared/Cargo/Components/StationBankAccountComponent.cs b/Content.Shared/Cargo/Components/StationBankAccountComponent.cs
new file mode 100644
index 00000000000..4bbd71d2e99
--- /dev/null
+++ b/Content.Shared/Cargo/Components/StationBankAccountComponent.cs
@@ -0,0 +1,79 @@
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Cargo.Components;
+
+/// <summary>
+/// Added to the abstract representation of a station to track its money.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem)), AutoGenerateComponentPause, AutoGenerateComponentState]
+public sealed partial class StationBankAccountComponent : Component
+{
+    /// <summary>
+    /// The account that receives funds by default
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<CargoAccountPrototype> PrimaryAccount = "Cargo";
+
+    /// <summary>
+    /// When giving funds to a particular account, the proportion of funds they should receive compared to remaining accounts.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public double PrimaryCut = 0.75;
+
+    /// <summary>
+    /// A dictionary corresponding to the money held by each cargo account.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Dictionary<ProtoId<CargoAccountPrototype>, int> Accounts = new()
+    {
+        { "Cargo",       2000 },
+        { "Engineering", 1000 },
+        { "Medical",     1000 },
+        { "Science",     1000 },
+        { "Security",    1000 },
+        { "Service",     1000 },
+        { "Justice",     1000 }, // DeltaV - Justice
+    };
+
+    /// <summary>
+    /// A baseline distribution used for income and dispersing leftovers after sale.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Dictionary<ProtoId<CargoAccountPrototype>, double> RevenueDistribution = new()
+    {
+        { "Cargo",       0.00 },
+        { "Engineering", 0.25 },
+        { "Medical",     0.30 },
+        { "Science",     0.15 },
+        { "Security",    0.15 }, // DeltaV - was 0.20, we took a cut for Justice
+        { "Service",     0.10 },
+        { "Justice",     0.05 }, // DeltaV - Justice
+    };
+
+    /// <summary>
+    /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied.
+    /// </summary>
+    [DataField]
+    public int IncreasePerSecond = 2;
+
+    /// <summary>
+    /// The time at which the station will receive its next deposit of passive income
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextIncomeTime;
+
+    /// <summary>
+    /// How much time to wait (in seconds) before increasing bank accounts balance.
+    /// </summary>
+    [DataField]
+    public TimeSpan IncomeDelay = TimeSpan.FromSeconds(50);
+}
+
+/// <summary>
+/// Broadcast and raised on station ent whenever its balance is updated.
+/// </summary>
+[ByRefEvent]
+public readonly record struct BankBalanceUpdatedEvent(EntityUid Station, Dictionary<ProtoId<CargoAccountPrototype>, int> Balance);
diff --git a/Content.Shared/Cargo/Prototypes/CargoAccountPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoAccountPrototype.cs
new file mode 100644
index 00000000000..185c8f909a4
--- /dev/null
+++ b/Content.Shared/Cargo/Prototypes/CargoAccountPrototype.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Cargo.Prototypes;
+
+/// <summary>
+/// This is a prototype for a single account that stores money on StationBankAccountComponent
+/// </summary>
+[Prototype]
+public sealed partial class CargoAccountPrototype : IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    /// Full IC name of the account.
+    /// </summary>
+    [DataField]
+    public LocId Name;
+
+    /// <summary>
+    /// A shortened code used to refer to the account in UIs
+    /// </summary>
+    [DataField]
+    public LocId Code;
+
+    /// <summary>
+    /// Color corresponding to the account.
+    /// </summary>
+    [DataField]
+    public Color Color;
+
+    /// <summary>
+    /// Channel used for announcing transactions.
+    /// </summary>
+    [DataField]
+    public ProtoId<RadioChannelPrototype> RadioChannel;
+}
diff --git a/Content.Shared/Cargo/SharedCargoSystem.cs b/Content.Shared/Cargo/SharedCargoSystem.cs
index 5351932cdf6..8f76f778881 100644
--- a/Content.Shared/Cargo/SharedCargoSystem.cs
+++ b/Content.Shared/Cargo/SharedCargoSystem.cs
@@ -1,7 +1,70 @@
+using System.Linq;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Cargo;
 
+public abstract class SharedCargoSystem : EntitySystem
+{
+    [Dependency] protected readonly IGameTiming Timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StationBankAccountComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<StationBankAccountComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextIncomeTime = Timing.CurTime + ent.Comp.IncomeDelay;
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// For a given station, retrieves the balance in a specific account.
+    /// </summary>
+    public int GetBalanceFromAccount(Entity<StationBankAccountComponent?> station, ProtoId<CargoAccountPrototype> account)
+    {
+        if (!Resolve(station, ref station.Comp))
+            return 0;
+
+        return station.Comp.Accounts.GetValueOrDefault(account);
+    }
+
+    /// <summary>
+    /// For a station, creates a distribution between one "primary" account and the other accounts.
+    /// The primary account receives the majority cut specified, with the remaining accounts getting cuts
+    /// distributed through the remaining amount, based on <see cref="StationBankAccountComponent.RevenueDistribution"/>
+    /// </summary>
+    public Dictionary<ProtoId<CargoAccountPrototype>, double> CreateAccountDistribution(
+        ProtoId<CargoAccountPrototype> primary,
+        StationBankAccountComponent stationBank,
+        double primaryCut = 1.0)
+    {
+        var distribution = new Dictionary<ProtoId<CargoAccountPrototype>, double>
+        {
+            { primary, primaryCut }
+        };
+        var remaining = 1.0 - primaryCut;
+
+        var allAccountPercentages = new Dictionary<ProtoId<CargoAccountPrototype>, double>(stationBank.RevenueDistribution);
+        allAccountPercentages.Remove(primary);
+        var weightsSum = allAccountPercentages.Values.Sum();
+
+        foreach (var (account, percentage) in allAccountPercentages)
+        {
+            var adjustedPercentage = percentage / weightsSum;
+
+            distribution.Add(account, remaining * adjustedPercentage);
+        }
+        return distribution;
+    }
+}
+
 [NetSerializable, Serializable]
 public enum CargoConsoleUiKey : byte
 {
@@ -17,8 +80,6 @@ public enum CargoPalletConsoleUiKey : byte
     Sale
 }
 
-public abstract class SharedCargoSystem : EntitySystem {}
-
 [Serializable, NetSerializable]
 public enum CargoTelepadState : byte
 {
diff --git a/Resources/Locale/en-US/_DV/cargo/cargo-accounts.ftl b/Resources/Locale/en-US/_DV/cargo/cargo-accounts.ftl
new file mode 100644
index 00000000000..178b88618cb
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/cargo/cargo-accounts.ftl
@@ -0,0 +1,8 @@
+cargo-account-justice-name = Legal Services Fund
+cargo-account-justice-code = JST
+
+cargo-account-logistics-name = Station Logistics Budget
+cargo-account-logistics-code = LGI
+
+cargo-account-epistemics-name = Interstellar Epistemology Funding
+cargo-account-epistemics-code = EPI
diff --git a/Resources/Locale/en-US/_DV/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/_DV/cargo/cargo-console-component.ftl
new file mode 100644
index 00000000000..e049cf5eb53
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/cargo/cargo-console-component.ftl
@@ -0,0 +1 @@
+cargo-funding-alloc-console-label-help-dv = Logistics receives {$percent}% of all mail profits and all proceeds from non-lockbox sales. The rest is split as specified below:
diff --git a/Resources/Locale/en-US/_DV/cargo/overrides.ftl b/Resources/Locale/en-US/_DV/cargo/overrides.ftl
new file mode 100644
index 00000000000..0e33db9fa91
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/cargo/overrides.ftl
@@ -0,0 +1,10 @@
+ent-CrateBaseLockBox = lock box
+    .desc = A secure lock box. Funds from its sale will be distributed back to the department. Just remember: Logistics always takes a cut.
+
+ent-CrateLockBoxScience = epistemics lock box
+
+ent-CargoRequestScienceComputerCircuitboard = epistemics request computer board
+    .desc = A computer printed circuit board for a epistemics request computer.
+
+ent-ComputerCargoOrdersScience = epistemics request computer
+    .desc = Used by the epistemics department to order supplies.
diff --git a/Resources/Locale/en-US/_DV/prototypes/catalog/cargo/cargoproduct-categories.ftl b/Resources/Locale/en-US/_DV/prototypes/catalog/cargo/cargoproduct-categories.ftl
new file mode 100644
index 00000000000..708d78b05e7
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/prototypes/catalog/cargo/cargoproduct-categories.ftl
@@ -0,0 +1 @@
+cargoproduct-category-name-justice = Justice
diff --git a/Resources/Locale/en-US/cargo/cargo-accounts.ftl b/Resources/Locale/en-US/cargo/cargo-accounts.ftl
new file mode 100644
index 00000000000..fbad9cda9bf
--- /dev/null
+++ b/Resources/Locale/en-US/cargo/cargo-accounts.ftl
@@ -0,0 +1,17 @@
+cargo-account-cargo-name = Station Supply Budget
+cargo-account-cargo-code = SUP
+
+cargo-account-engineering-name = Maintenance Savings
+cargo-account-engineering-code = ENG
+
+cargo-account-medical-name = Crew Healthcare Fund
+cargo-account-medical-code = MED
+
+cargo-account-science-name = Interstellar Development Funding
+cargo-account-science-code = RND
+
+cargo-account-security-name = Station Defense Reserves
+cargo-account-security-code = SEC
+
+cargo-account-service-name = Collective Service Holdings
+cargo-account-service-code = SRV
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index 7114924c026..b7467771d95 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -1,10 +1,11 @@
 ## UI
 cargo-console-menu-title = Cargo request console
-cargo-console-menu-account-name-label = Account name:{" "}
+cargo-console-menu-account-name-label = Account:{" "}
 cargo-console-menu-account-name-none-text = None
+cargo-console-menu-account-name-format = [bold][color={$color}]{$name}[/color][/bold] [font="Monospace"]\[{$code}\][/font]
 cargo-console-menu-shuttle-name-label = Shuttle name:{" "}
 cargo-console-menu-shuttle-name-none-text = None
-cargo-console-menu-points-label = Spesos:{" "}
+cargo-console-menu-points-label = Balance:{" "}
 cargo-console-menu-points-amount = ${$amount}
 cargo-console-menu-shuttle-status-label = Shuttle status:{" "}
 cargo-console-menu-shuttle-status-away-text = Away
@@ -20,6 +21,16 @@ cargo-console-menu-populate-categories-all-text = All
 cargo-console-menu-populate-orders-cargo-order-row-product-name-text = {$productName} (x{$orderAmount}) by {$orderRequester}
 cargo-console-menu-cargo-order-row-approve-button = Approve
 cargo-console-menu-cargo-order-row-cancel-button = Cancel
+cargo-console-menu-tab-title-orders = Orders
+cargo-console-menu-tab-title-funds = Transfers
+cargo-console-menu-account-action-transfer-limit = [bold]Transfer Limit:[/bold] ${$limit}
+cargo-console-menu-account-action-transfer-limit-unlimited-notifier = [color=gold](Unlimited)[/color]
+cargo-console-menu-account-action-select = [bold]Account Action:[/bold]
+cargo-console-menu-account-action-amount = [bold]Amount:[/bold] $
+cargo-console-menu-account-action-button = Transfer
+cargo-console-menu-toggle-account-lock-button = Toggle Transfer Limit
+cargo-console-menu-account-action-option-withdraw = Withdraw Cash
+cargo-console-menu-account-action-option-transfer = Transfer Funds to {$code}
 
 # Orders
 cargo-console-order-not-allowed = Access not allowed
@@ -31,15 +42,21 @@ cargo-console-insufficient-funds = Insufficient funds (require {$cost})
 cargo-console-unfulfilled = No room to fulfill order
 cargo-console-trade-station = Sent to {$destination}
 cargo-console-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approver}[/bold]
+cargo-console-fund-withdraw-broadcast = [bold]{$name} withdrew {$amount} spesos from {$name1} \[{$code1}\]
+cargo-console-fund-transfer-broadcast = [bold]{$name} transferred {$amount} spesos from {$name1} \[{$code1}\] to {$name2} \[{$code2}\][/bold]
+cargo-console-fund-transfer-user-unknown = Unknown
 
+cargo-console-paper-reason-default = None
+cargo-console-paper-approver-default = Self
 cargo-console-paper-print-name = Order #{$orderNumber}
-cargo-console-paper-print-text =
-    Order #{$orderNumber}
-    Item: {$itemName}
-    Quantity: {$orderQuantity}
-    Requested by: {$requester}
-    Reason: {$reason}
-    Approved by: {$approver}
+cargo-console-paper-print-text = [head=2]Order #{$orderNumber}[/head]
+    {"[bold]Item:[/bold]"} {$itemName} (x{$orderQuantity})
+    {"[bold]Requested by:[/bold]"} {$requester}
+
+    {"[head=3]Order Information[/head]"}
+    {"[bold]Payer[/bold]:"} {$account} [font="Monospace"]\[{$accountcode}\][/font]
+    {"[bold]Approved by:[/bold]"} {$approver}
+    {"[bold]Reason:[/bold]"} {$reason}
 
 # Cargo shuttle console
 cargo-shuttle-console-menu-title = Cargo shuttle console
@@ -47,3 +64,17 @@ cargo-shuttle-console-station-unknown = Unknown
 cargo-shuttle-console-shuttle-not-found = Not found
 cargo-shuttle-console-organics = Detected organic lifeforms on the shuttle
 cargo-no-shuttle = No cargo shuttle found!
+
+# Funding allocation console
+cargo-funding-alloc-console-menu-title = Funding Allocation Console
+cargo-funding-alloc-console-label-account = [bold]Account[/bold]
+cargo-funding-alloc-console-label-code = [bold] Code [/bold]
+cargo-funding-alloc-console-label-balance = [bold] Balance [/bold]
+cargo-funding-alloc-console-label-cut = [bold] Revenue Division (%) [/bold]
+
+cargo-funding-alloc-console-label-help = Cargo receives {$percent}% of all profits. The rest is split as specified below:
+cargo-funding-alloc-console-button-save = Save Changes
+cargo-funding-alloc-console-label-save-fail = [bold]Revenue Divisions Invalid![/bold] [color=red]({$pos ->
+    [1] +
+    *[-1] -
+}{$val}%)[/color]
diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl
index 5641686abc5..f52cde61e48 100644
--- a/Resources/Locale/en-US/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl
@@ -27,6 +27,8 @@ id-card-access-level-quartermaster = Logistics Officer
 id-card-access-level-cargo = Logistics
 id-card-access-level-salvage = Salvage
 
+id-card-access-level-funding = Funding
+
 id-card-access-level-bar = Bar
 id-card-access-level-boxer = Boxer
 id-card-access-level-clown = Clown
diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml
index 83158cd7d82..9a7d3838291 100644
--- a/Resources/Prototypes/Access/cargo.yml
+++ b/Resources/Prototypes/Access/cargo.yml
@@ -10,6 +10,10 @@
   id: Salvage
   name: id-card-access-level-salvage
 
+- type: accessLevel
+  id: Funding
+  name: id-card-access-level-funding
+
 - type: accessGroup
   id: Cargo
   tags:
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index d6e630f1784..9628f8ee18f 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -51,3 +51,4 @@
   - Corpsman # DeltaV - Add Corpsman access
   - Robotics # DeltaV: Robotics access
   - Surgery # DeltaV: Surgery access
+  - Funding # DeltaV: Funding access
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_lockbox.yml b/Resources/Prototypes/Catalog/Cargo/cargo_lockbox.yml
new file mode 100644
index 00000000000..92e8e8e72bf
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_lockbox.yml
@@ -0,0 +1,49 @@
+- type: cargoProduct
+  id: CrateLockBoxEngineering
+  icon:
+    sprite: Structures/Storage/Crates/lockbox.rsi
+    state: icon
+  product: CrateLockBoxEngineering
+  cost: 100
+  category: cargoproduct-category-name-engineering
+  group: market
+
+- type: cargoProduct
+  id: CrateLockBoxMedical
+  icon:
+    sprite: Structures/Storage/Crates/lockbox.rsi
+    state: icon
+  product: CrateLockBoxMedical
+  cost: 100
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CrateLockBoxScience
+  icon:
+    sprite: Structures/Storage/Crates/lockbox.rsi
+    state: icon
+  product: CrateLockBoxScience
+  cost: 100
+  category: cargoproduct-category-name-science
+  group: market
+
+- type: cargoProduct
+  id: CrateLockBoxSecurity
+  icon:
+    sprite: Structures/Storage/Crates/lockbox.rsi
+    state: icon
+  product: CrateLockBoxSecurity
+  cost: 100
+  category: cargoproduct-category-name-security
+  group: market
+
+- type: cargoProduct
+  id: CrateLockBoxService
+  icon:
+    sprite: Structures/Storage/Crates/lockbox.rsi
+    state: icon
+  product: CrateLockBoxService
+  cost: 100
+  category: cargoproduct-category-name-service
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index b66cb44221c..89586c8041b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -135,6 +135,8 @@
     - id: DoorRemoteService
     - id: HoPIDCard
     - id: IDComputerCircuitboard
+    # - id: FundingAllocationComputerCircuitboard # DeltaV - HoP doesn't get funding allocation
+    - id: CargoRequestServiceComputerCircuitboard
     - id: RubberStampApproved
     - id: RubberStampDenied
     - id: RubberStampHop
@@ -167,6 +169,7 @@
     - id: ClothingHandsGlovesColorYellow
     - id: ClothingHeadsetAltEngineering
     - id: DoorRemoteEngineering
+    - id: CargoRequestEngineeringComputerCircuitboard
     - id: RCD
     - id: RCDAmmo
     - id: RubberStampCE
@@ -227,6 +230,7 @@
     - id: HandheldCrewMonitor
     - id: Hypospray
     - id: MedicalTechFabCircuitboard
+    - id: CargoRequestMedicalComputerCircuitboard
     - id: MedkitFilled
     - id: RubberStampCMO
     - id: MedTekCartridge
@@ -284,6 +288,7 @@
     - id: HandTeleporter
     #- id: ProtolatheMachineCircuitboard # DeltaV
     - id: ResearchComputerCircuitboard
+    - id: CargoRequestScienceComputerCircuitboard
     - id: RubberStampRd
     - id: BibleMystagogue  # DeltaV - steal objective and source of abilities
 
@@ -345,6 +350,7 @@
     - id: HoloprojectorSecurity
     - id: RubberStampHos
     - id: SecurityTechFabCircuitboard
+    - id: CargoRequestSecurityComputerCircuitboard
     - id: WeaponDisabler
     #- id: WantedListCartridge # DeltaV - replaced by secwatch
     - id: DrinkHosFlask
diff --git a/Resources/Prototypes/Catalog/cargo_accounts.yml b/Resources/Prototypes/Catalog/cargo_accounts.yml
new file mode 100644
index 00000000000..ce5d7d8f51e
--- /dev/null
+++ b/Resources/Prototypes/Catalog/cargo_accounts.yml
@@ -0,0 +1,42 @@
+- type: cargoAccount
+  id: Cargo
+  name: cargo-account-logistics-name # DeltaV - Cargo -> Logistics
+  code: cargo-account-logistics-code # DeltaV - Cargo -> Logistics
+  color: "#b48b57"
+  radioChannel: Supply
+
+- type: cargoAccount
+  id: Engineering
+  name: cargo-account-engineering-name
+  code: cargo-account-engineering-code
+  color: "#ff733c"
+  radioChannel: Engineering
+
+- type: cargoAccount
+  id: Medical
+  name: cargo-account-medical-name
+  code: cargo-account-medical-code
+  color: "#57b8f0"
+  radioChannel: Medical
+
+- type: cargoAccount
+  id: Science
+  name: cargo-account-epistemics-name # DeltaV - Science -> Epistemics
+  code: cargo-account-epistemics-code # DeltaV - Science -> Epistemics
+  color: "#cd7ccd"
+  radioChannel: Science
+
+- type: cargoAccount
+  id: Security
+  name: cargo-account-security-name
+  code: cargo-account-security-code
+  color: "#ff4242"
+  radioChannel: Security
+
+- type: cargoAccount
+  id: Service
+  name: cargo-account-service-name
+  code: cargo-account-service-code
+  color: "#539c00"
+  radioChannel: Service
+
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 7714c0c7e10..389214bc749 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -91,7 +91,6 @@
   - type: RadarConsole
     followEntity: true
   - type: CargoOrderConsole
-  - type: BankClient
   - type: CrewMonitoringConsole
     alertsEnabled: false # DeltaV - crew monitors beeping is specific to deltaV, and we don't want it for aghost.
   - type: GeneralStationRecordConsole
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index b63f43a3bed..a5544c8b9ab 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -97,6 +97,84 @@
     - type: StaticPrice
       price: 750
 
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoRequestEngineeringComputerCircuitboard
+  name: engineering request computer board
+  description: A computer printed circuit board for an engineering request computer.
+  components:
+  - type: Sprite
+    state: cpu_engineering
+  - type: ComputerBoard
+    prototype: ComputerCargoOrdersEngineering
+  - type: StaticPrice
+    price: 750
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoRequestMedicalComputerCircuitboard
+  name: medical request computer board
+  description: A computer printed circuit board for a medical request computer.
+  components:
+  - type: Sprite
+    state: cpu_medical
+  - type: ComputerBoard
+    prototype: ComputerCargoOrdersMedical
+  - type: StaticPrice
+    price: 750
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoRequestScienceComputerCircuitboard
+  name: science request computer board
+  description: A computer printed circuit board for a science request computer.
+  components:
+  - type: Sprite
+    state: cpu_science
+  - type: ComputerBoard
+    prototype: ComputerCargoOrdersScience
+  - type: StaticPrice
+    price: 750
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoRequestSecurityComputerCircuitboard
+  name: security request computer board
+  description: A computer printed circuit board for a security request computer.
+  components:
+  - type: Sprite
+    state: cpu_security
+  - type: ComputerBoard
+    prototype: ComputerCargoOrdersSecurity
+  - type: StaticPrice
+    price: 750
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoRequestServiceComputerCircuitboard
+  name: service request computer board
+  description: A computer printed circuit board for a service request computer.
+  components:
+  - type: Sprite
+    state: cpu_service
+  - type: ComputerBoard
+    prototype: ComputerCargoOrdersService
+  - type: StaticPrice
+    price: 750
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: FundingAllocationComputerCircuitboard
+  name: funding allocation computer board
+  description: A computer printed circuit board for a funding allocation card console.
+  components:
+  - type: Sprite
+    state: cpu_command
+  - type: ComputerBoard
+    prototype: ComputerFundingAllocation
+  - type: StaticPrice
+    price: 750
+
 - type: entity
   parent: BaseComputerCircuitboard
   id: CargoSaleComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index de4e38cc7a2..7974d70a27a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -599,7 +599,7 @@
           tags:
           - Write
   - type: CargoOrderConsole
-  - type: BankClient
+    removeLimitAccess: [ "Quartermaster" ]
   - type: ActivatableUI
     verbText: qm-clipboard-computer-verb-text
     key: enum.CargoConsoleUiKey.Orders
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 5ef840beac4..f93396b05e8 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -10,6 +10,14 @@
   components:
     - type: StationBankAccount
     - type: StationCargoOrderDatabase
+      orders:
+        Cargo: [ ]
+        Engineering: [ ]
+        Medical: [ ]
+        Science: [ ]
+        Security: [ ]
+        Service: [ ]
+        Justice: [ ] # DeltaV - Justice
     - type: StationCargoBountyDatabase
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 959991e64a6..d6968fb06af 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -934,11 +934,11 @@
     - map: ["computerLayerScreen"]
       state: request
     - map: ["computerLayerKeys"]
-      state: tech_key
+      state: generic_keys
     - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       state: generic_panel_open
   - type: CargoOrderConsole
-  - type: BankClient
+    removeLimitAccess: [ "Quartermaster" ]
   - type: ActiveRadio
     channels:
     - Supply
@@ -971,6 +971,167 @@
     guides:
     - Cargo
 
+# Request console variants.
+- type: entity
+  id: ComputerCargoOrdersEngineering
+  parent: ComputerCargoOrders
+  name: engineering request computer
+  description: Used by the engineering department to order supplies.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-eng
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: CargoOrderConsole
+    account: Engineering
+    announcementChannel: Engineering
+    removeLimitAccess: [ "ChiefEngineer" ]
+  - type: ActiveRadio
+    channels:
+    - Engineering
+  - type: Computer
+    board: CargoRequestEngineeringComputerCircuitboard
+  - type: PointLight
+    color: "#c9c042"
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  id: ComputerCargoOrdersMedical
+  parent: ComputerCargoOrders
+  name: medical request computer
+  description: Used by the medical department to order supplies.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-med
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: CargoOrderConsole
+    account: Medical
+    announcementChannel: Medical
+    removeLimitAccess: [ "ChiefMedicalOfficer" ]
+  - type: ActiveRadio
+    channels:
+    - Medical
+  - type: Computer
+    board: CargoRequestMedicalComputerCircuitboard
+  - type: PointLight
+    color: "#41e0fc"
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  id: ComputerCargoOrdersScience
+  parent: ComputerCargoOrders
+  name: science request computer
+  description: Used by the science department to order supplies.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-sci
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: CargoOrderConsole
+    account: Science
+    announcementChannel: Science
+    removeLimitAccess: [ "ResearchDirector" ]
+  - type: ActiveRadio
+    channels:
+    - Science
+  - type: Computer
+    board: CargoRequestScienceComputerCircuitboard
+  - type: PointLight
+    color: "#b53ca1"
+  - type: AccessReader
+    access: [["Research"]]
+
+- type: entity
+  id: ComputerCargoOrdersSecurity
+  parent: ComputerCargoOrders
+  name: security request computer
+  description: Used by the security department to order supplies.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-sec
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: CargoOrderConsole
+    account: Security
+    announcementChannel: Security
+    removeLimitAccess: [ "HeadOfSecurity" ]
+  - type: ActiveRadio
+    channels:
+    - Security
+  - type: Computer
+    board: CargoRequestSecurityComputerCircuitboard
+  - type: PointLight
+    color: "#d11d00"
+  - type: AccessReader
+    access: [["Security"]]
+
+- type: entity
+  id: ComputerCargoOrdersService
+  parent: ComputerCargoOrders
+  name: service request computer
+  description: Used by the service department to order supplies.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-srv
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: CargoOrderConsole
+    account: Service
+    announcementChannel: Service
+    removeLimitAccess: [ "HeadOfPersonnel" ]
+  - type: ActiveRadio
+    channels:
+    - Service
+  - type: Computer
+    board: CargoRequestServiceComputerCircuitboard
+  - type: PointLight
+    color: "#afe837"
+  - type: AccessReader
+    access: [["Service"]]
+
 - type: entity
   id: ComputerCargoBounty
   parent: BaseComputerAiAccess
@@ -1011,6 +1172,43 @@
     - CargoBounties
     - Cargo
 
+- type: entity
+  parent: BaseComputerAiAccess
+  id: ComputerFundingAllocation
+  name: funding allocation computer
+  description: Terminal for controlling the distribution of funds and pay to departments.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: allocate # ALLOCATION !!!
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: FundingAllocationConsole
+  - type: ActivatableUI
+    key: enum.FundingAllocationConsoleUiKey.Key
+  - type: ActivatableUIRequiresAccess
+  - type: AccessReader
+    access: [["Funding"]] # DeltaV - separate funding access
+  - type: UserInterface
+    interfaces:
+      enum.FundingAllocationConsoleUiKey.Key:
+        type: FundingAllocationConsoleBoundUserInterface
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
+  - type: Computer
+    board: FundingAllocationComputerCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#3c5eb5"
+
 - type: entity
   parent: BaseComputerAiAccess
   id: ComputerCloningConsole
@@ -1210,9 +1408,9 @@
     - map: ["computerLayerKeyboard"]
       state: generic_keyboard
     - map: ["computerLayerScreen"]
-      state: request
+      state: transfer
     - map: ["computerLayerKeys"]
-      state: tech_key
+      state: generic_keys
     - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       state: generic_panel_open
   - type: Anchorable
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 7bbd1f25867..ef66dd7c1a3 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -430,6 +430,194 @@
   - type: StaticPrice
     price: 75
 
+- type: entity
+  id: CrateBaseLockBox
+  parent: CrateBaseSecure
+  name: lock box
+  description: "A secure lock box. Funds from its sale will be distributed back to the department. Just remember: Cargo always takes a cut."
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Crates/lockbox.rsi
+  - type: GenericVisualizer
+    visuals:
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
+      enum.StorageVisuals.Open:
+        lid_overlay:
+          True: { visible: false }
+          False: { visible: true }
+  - type: OverrideSell
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.4,0.3,0.19"
+        density: 50
+        mask:
+        - CrateMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
+
+- type: entity
+  id: CrateLockBoxEngineering
+  parent: CrateBaseLockBox
+  name: engineering lock box
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#ad8c27"
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: overlay-closed
+      color: "#ad8c27"
+      map: [ lid_overlay ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.46875,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: OverrideSell
+    overrideAccount: Engineering
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  id: CrateLockBoxMedical
+  parent: CrateBaseLockBox
+  name: medical lock box
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#92c7e8"
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: overlay-closed
+      color: "#92c7e8"
+      map: [ lid_overlay ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.46875,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: OverrideSell
+    overrideAccount: Medical
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  id: CrateLockBoxScience
+  parent: CrateBaseLockBox
+  name: science lock box
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#ba4bf0"
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: overlay-closed
+      color: "#ba4bf0"
+      map: [ lid_overlay ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.46875,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: OverrideSell
+    overrideAccount: Science
+  - type: AccessReader
+    access: [["Research"]]
+
+- type: entity
+  id: CrateLockBoxSecurity
+  parent: CrateBaseLockBox
+  name: security lock box
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#c12d30"
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: overlay-closed
+      color: "#c12d30"
+      map: [ lid_overlay ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.46875,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: OverrideSell
+    overrideAccount: Security
+  - type: AccessReader
+    access: [["Security"]]
+
+- type: entity
+  id: CrateLockBoxService
+  parent: CrateBaseLockBox
+  name: service lock box
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#53b723"
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: overlay-closed
+      color: "#53b723"
+      map: [ lid_overlay ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.46875,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: OverrideSell
+    overrideAccount: Service
+  - type: AccessReader
+    access: [["Service"]]
+
 - type: entity
   parent: CrateGeneric
   id: CratePirate
diff --git a/Resources/Prototypes/SoundCollections/machines.yml b/Resources/Prototypes/SoundCollections/machines.yml
new file mode 100644
index 00000000000..7848da0268e
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/machines.yml
@@ -0,0 +1,14 @@
+- type: soundCollection
+  id: CargoPing
+  files:
+  - /Audio/Effects/Cargo/ping.ogg
+
+- type: soundCollection
+  id: CargoError
+  files:
+  - /Audio/Effects/Cargo/buzz_sigh.ogg
+
+- type: soundCollection
+  id: CargoToggleLimit
+  files:
+  - /Audio/Machines/quickbeep.ogg
diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_lockbox.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_lockbox.yml
new file mode 100644
index 00000000000..0d6edf209a0
--- /dev/null
+++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_lockbox.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: CrateLockBoxJustice
+  icon:
+    sprite: Structures/Storage/Crates/lockbox.rsi
+    state: icon
+  product: CrateLockBoxJustice
+  cost: 100
+  category: cargoproduct-category-name-justice
+  group: market
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml
index f804df1cf29..28bd186dbbe 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml
@@ -20,5 +20,6 @@
     - id: DoorRemoteJustice
     - id: Gavel
     - id: RubberStampChiefJustice
+    - id: CargoRequestJusticeComputerCircuitboard
     - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
       prob: 0.3
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
index 9b63b643d96..a12ea5e1887 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
@@ -24,6 +24,7 @@
     - id: ClothingShoesLeather # fancy shoes for HoP and cap TODO: move to dresser
     - id: ClothingShoesMiscWhite
     - id: ClothingShoesBootsWinterCap
+    - id: FundingAllocationComputerCircuitboard # To be removed when it's in techvault on all maps
     - id: LunchboxCommandFilledRandom
       prob: 0.3
 
diff --git a/Resources/Prototypes/_DV/Catalog/cargo_accounts.yml b/Resources/Prototypes/_DV/Catalog/cargo_accounts.yml
new file mode 100644
index 00000000000..a81e18e3a4e
--- /dev/null
+++ b/Resources/Prototypes/_DV/Catalog/cargo_accounts.yml
@@ -0,0 +1,6 @@
+- type: cargoAccount
+  id: Justice
+  name: cargo-account-justice-name
+  code: cargo-account-justice-code
+  color: "#813659"
+  radioChannel: Justice
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/computer.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/computer.yml
index 69a3a91e7e3..d8b93d28e7a 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/computer.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/computer.yml
@@ -19,3 +19,17 @@
     state: cpu_supply
   - type: ComputerBoard
     prototype: ComputerShuttleMining
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoRequestJusticeComputerCircuitboard
+  name: justice request computer board
+  description: A computer printed circuit board for a justice request computer.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/module.rsi
+    state: cpu_justice
+  - type: ComputerBoard
+    prototype: ComputerCargoOrdersJustice
+  - type: StaticPrice
+    price: 750
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/cartridges.yml
index 49e0fa0b59a..0a0c72345e9 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/cartridges.yml
@@ -80,7 +80,6 @@
     icon:
       sprite: _DV/Misc/program_icons.rsi
       state: stock_trading
-  - type: BankClient
   - type: AccessReader # This is so that we can restrict who can buy stocks
     access: [["Quartermaster"]] # Was Orders, should be reverted if order access is removed from cargo technicians.
 
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml
index 907b9d0924c..3f7e6ce8e1d 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml
@@ -5,7 +5,6 @@
   description: Used to purchase and sell shuttles
   components:
   - type: ShipyardConsole
-  - type: BankClient
   - type: AccessReader
     access: [[ Captain ]]
   - type: ActivatableUI
@@ -94,3 +93,36 @@
     access:
     - [ Cargo ]
   # lets hope nobody deconstructs it to reset the name + access...
+
+- type: entity
+  id: ComputerCargoOrdersJustice
+  parent: ComputerCargoOrders
+  name: justice request computer
+  description: Used by the justice department to order supplies.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      sprite: _DV/Structures/Machines/computers.rsi
+      state: request-jst
+    - map: ["computerLayerKeys"]
+      state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: CargoOrderConsole
+    account: Justice
+    announcementChannel: Justice
+    removeLimitAccess: [ "ChiefJustice" ]
+  - type: ActiveRadio
+    channels:
+    - Justice
+  - type: Computer
+    board: CargoRequestJusticeComputerCircuitboard
+  - type: PointLight
+    color: "#641327"
+  - type: AccessReader
+    access: [["Justice"]]
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/crates.yml
index 7bda3ce24b3..4d13d217db8 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/crates.yml
@@ -146,3 +146,33 @@
       - entity_storage
   - type: StaticPrice
     price: 800
+
+- type: entity
+  id: CrateLockBoxJustice
+  parent: CrateBaseLockBox
+  name: justice lock box
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#7e0e5b"
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: overlay-closed
+      color: "#7e0e5b"
+      map: [ lid_overlay ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.46875,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: OverrideSell
+    overrideAccount: Justice
+  - type: AccessReader
+    access: [["Justice"]]
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/allocate.png b/Resources/Textures/Structures/Machines/computers.rsi/allocate.png
new file mode 100644
index 0000000000000000000000000000000000000000..6743d295feaf472083a650e5502ee03b764216de
GIT binary patch
literal 971
zcmV;+12p`JP)<h;3K|Lk000e1NJLTq003YB004jp1^@s6^xSN^00001b5ch_0Itp)
z=>Px&g-Jv~RCt{2-Mv!VKoo}I<4me_naMTKde967O@<q=8~1Wg3IaosOGpE@3+l|c
zSA#FW0}Y)?TCO2=+D#!ZKSF=rUFm@IK23rh{H?Uw#qpdYL;wH)0QAiu_tC>MBYUH;
zNe?TLyUYB%9_N3|{l|MFiN;5-9-d9o?>|jUVa{eTmgwaA_2btfa(7v8um$;bG?5=~
zk9%2i+^+fg6A-}W=eNhdM?bEDzIL4x(qw)eb@NLnpz4Y*dp_hrSDo;@=bJd`b#{PV
z^PN_JJ>W7Su0VUh_XS@!onIw8p63@pkQHFnIpJAtEc>zv36Wp)`gP7nqbndQZwq)Y
zd$4vsZ$p*y^H;#XzaqbXg&n{y`koH}0000000000000000N^ISSaldzcOba<v#eJf
z+oSya;@nSPq><|2x_Xpf+N77QakmX<wjW@B`<!iHDEj&|F-}c#eaJ6u&?sswu#Fh|
z1)U;Q&(~GeSYdm$Tsn9{<Xc6@Tc?+-bONfnJhA~U18~VNYSzo<ExppK^Rut-azW4`
z^A_^~00000000000LbB4Gqp24%m3i~oqHpZ>00k3bR^$>0z}dqTq~Z0e&<iuMh=cm
zlo+G39dsn$YXyj;wKLKAMRWC(9nbgMg0{s<&kLB^)P;Pn3D_*gD)(h3UqocOPWQjB
zqx8?Vw}6i1d*3}hI=Pn3Vk{z`eP7DS{B|YZ<^AS+{}7%{1~R|hq4qwYcruV>V$||Q
z(h_u^e6I<ZO$Kr=Pj&EZTP8;0$v`b%B&~?{$@iK78(!yEiZn$tKb{O8FG5%D6R>T$
z@x20k^VL@1!%CKkQQZMVrfYK}V&)?4zYBRI`B7r@^6emQGzZZ4d=W`Mn$;XY-}6O8
z?Xwv20RR9100000Xh}zE^)>Rn>w;vu4u5~O9_9N@z;tb*@sZa{knig7EUk$=I5sLx
z3LVLJTLHt^MCTW3W#L`Qciw_*xK?>~SMt3ZG}6jw9sSK8#xHB*+unmal<&R;ZSN$m
zWwRKomZgWvcb<Ux?Mh}1-L<@KzAaDJ$`4VL>pTIrEL>|6_T{NTLo46+?(iZW6JX1-
zLkz+vUyHr?d{>~?3V1yEyZm~PKwdOvDCRE{qmVz0&0Hic%hvc`=o`sbc?V_(pmy-&
trvp&^2)OV0>b3BF&j$bi0001R^B>dio8sSwxEufg002ovPDHLkV1lp8&GG;M

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index e0127936dd1..0502bd36619 100644
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0, request- variants transfer made by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -131,6 +131,32 @@
                 ]
             ]
         },
+        {
+            "name": "allocate",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "area_atmos",
             "directions": 4,
@@ -1452,6 +1478,196 @@
                 ]
             ]
         },
+        {
+            "name": "request-eng",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "request-med",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "request-sci",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "request-sec",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "request-srv",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
         {
             "name": "robot",
             "directions": 4
@@ -1654,6 +1870,64 @@
             "name": "telesci_key_off",
             "directions": 4
         },
+        {
+            "name": "transfer",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
         {
             "name": "turbinecomp",
             "directions": 4
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-eng.png b/Resources/Textures/Structures/Machines/computers.rsi/request-eng.png
new file mode 100644
index 0000000000000000000000000000000000000000..845311209f1e14df51fb35e4724c6e9e3a1011e3
GIT binary patch
literal 1502
zcmZ9M2~d+)5XTV&6pTnImq>$%0%8bWTuOo*Qto4{Ood1k6{KLSfKU@6BO;@=97PO=
zm?#JqkW;RNBp_DKBoGATjF1ov5hx)MKfVO|sneP2n|Zr$-t6qY-+$ij?EpUyn8tPu
zB_$=8=Z|hdkf(gwo75nCmlJ`2+=kd74;Q6M_70Jfl4`D}+p!ag59TM@{H8+<UM&sx
zr`F{)nfH5|8RFWIO{RG?n<c&r<?_y`0|{rQH6Ay<Ro1yUJxMUa^hrZ<`L9P^L=Msz
z{2KF|=?$qvs;lK7YL_xp1X`5&tF@I|(m(LmDB1YZv7QJ|-otpz>Idx7{X7o_6UbA^
zPtV{_wA05^-KT=MjRj&q<PQwFTp_#dHWkD^o{{>4l0?zP@pYglW`g2uf6YTY&K``m
zHZaSy($;PUmljLGbBLbtQVWTqlT(;{;h0Eu57Vx#T#bB~Vj3-B8PqO>xf54CccFQW
zEk?aAQ2qnRyDd!R-g4}qNq2QuBddXh1dD0i3H#N?<d4JOL~7=q#!gzb{;ks|An1o*
zu357Ue>%6si-g<I|B<4chd4M#6N#dG)@BP(1~ltbcRJhEcd0l-IA5T@u^%7bH!o?2
z*S}Z4iH;i6+JugN2DcG2oKH<5u#zj2dNw%20`9_|olL5H^n=PJzUwwX*27V3;~KGJ
z!Kq&Lbb(&=U%N*HVqwHd>EvltPc%2jBD6c2tB@i!NLTQ{zQCq?qMl}-Fg6-PS_1@0
zwpqb2TA8V>7=f-jRKo&935Y*r{zOa;`3P&+H@9NUuJByBfG*QVSR%nzTIVMT68f`Z
zz>oUIuELEK?Hl+N?P&2<mEGizg5g@-dRw4tCX;!_y~=i;_cD`%d+`lo^3}1S<~qhq
z#6#UQ*=kC<Pe(^oHU$CrIBU|<@MYN)7<BZePld|n`&I}zRS&S{*94hW<*H|-H!7s{
z&(#!m2T)_}w-H&eIBk~5lFOC1Rn+5~%<DW?y#2j$fWW2`<!!N99KAm7NE^I)vz~x-
z55t-YL}Pw#Byl81?7!2_;<W|Nd@9<!Xv~lf<P5^&%rr=*>VEoS3{kl8y_TcZ$}hE-
z?1pD#?J{-a&CuUcdr}y70%uPW6<bMMBjD9ApczcIUS0AD#^`{+ohBwKYw~hsgVxY3
zdA%;Z+`4KmO~*0}Cfs|yfV>rlB%hZ`_nMj(l?EHG%Ng|*wzE|e$`@qwh9X3!nCLi0
zh+U8Id5K+W2v1MB80k$!te2Y2%YAcEGX>a3-0QP=lt7_c1b_j&<(=~Y*is@?`AXOB
z{xuNETh4yoaW*@QYWN7Di1TIHmGJpFrO4M#yt4cv7<9uXLmdP?Q+LsfM>RT5gR_U_
zZzIu@PU8bdto$69hoP8WyOD%o=CpnK;LwCSV-RJcNW2ETisoW|bBvl;e&*%=u490e
z@nWXKAU_{R*Lou*QcHvx*NLRM6m-rkm5p@TkR2aUVqWRRm^D9$3FiEihpX3mS}!tR
zud)a&TTmGlhR{`4ZpG#?9*pgKac2=2AjJkcZGC6Ln;S?GrIk~+|4zt)s3k+>Ubqu|
zh;L63)>y!o#nlT!1IqmVK5j@WB-8*oj^A=>JZ9M`Opv6xBh@?S)S)_d18@>djwtFd
zX7RC%S&z?iVQ(Q}W!U^cLENAO-M^5wjNmoO5N>#9)C~B%@+%dS=OWjW3;>n_JSx6$
zvt(r;tEwkTx#1Bxoq%~_PPvNS0dy+}`J=D>Js8&Fq}Kl;@`?5csOM+_*OVKcd<n*e
ztcp5^&wm!kQ4&95tR8&~Z46Mo{97S5stQ48U$NbTa%1)7Bn8G&u_^uGX|y%iq$L1X
zX=f)gN2NqZBSsZd^Q2AyjqG<Y?4~TZXhO?_2m^t#V!A|tKl;B3^8FH;7H{X`N+}n9
O;_-C%bE|a0-uM?feh0t+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-med.png b/Resources/Textures/Structures/Machines/computers.rsi/request-med.png
new file mode 100644
index 0000000000000000000000000000000000000000..29ee175a9769c4935989c43550252feb8e14dea8
GIT binary patch
literal 1448
zcmY+E3pCVO9LEQtXqvTbD~d&rl~-HHdi@busnH?iF^!}sg+i0p%*00Wrm!Y!GOf`X
zk342PGNW~57|$F@8j~2qgwYH$`=19p&h9yT+;i^tchC9Vd%oxMJ@?+s^Kf^lnvNO-
z0)cw`;_5B0_^r89MXp)H;b!up5bN#k0;wC?zX*XShkCd=U%2;lnfcOt)=%rr*Y0o0
zXK;R6LZjBM6P4J)+T-x@)WT3Zp}}YKo?@*Rm%Ysn8LwtjR*g!3>$&ye0^>OR*~e^B
zXX7D6fcsl;Q>P(k9q}x3vT!hCr`$?DuvEKML_*x{#$0n^8!C_)>?yp<il3Z9t^i2_
zIt90x#>*fuUbqsz78{78yy}u{9HlG7;R>W%*ikPLF{s#s+LO%Np{0>v<M>#>naELY
zXLP&W0qc>Ny&45gz{bbcyy$=xN4J7#BLJn?u6*_TQtDDF1v-5aZ|K5jYA1`L4S|kP
z`mpFQPlb}7F?)(9GVC+za!?~fD<9=cN0vsUf9iJDNp0VJQ-+M&{f7`csXXtX$bAn%
z4Ao!R9Z$m0wadh^l0;}J;-1h7%i}QiJWLJ(pQalit>l(__eBI;MJvor4XXZ&yj{Cc
zfndgB1L27b+dycM%jIYpmMT#Ucp$<q@&rO`0^>)|4&1NOd4A9otTiv~2mVwEs~_#O
zEMGnG?Ds!8ar|+ZwPcT8;iUbO*AiGCyGOeDg}=wT-%&BeOXdbkB_FT}po^Ha#r0vd
z8N!<y`Pbi37IuB)z9g<ip!e^TlTn6%rJW@$H+N}-g&F<n-jNVpxVA)S*r9iS5n8bk
z*ivbI5a`^`_w-x4F@`>po;<xvX*&f(d<%)O^K?|(_tCLVm6CTu_n8G4&DGBK9gQ$8
zE5gITvt3RM50W@8%z;HBWEHi<3fWWbi#Z_<EPIg-{d%HOtF+02Wm`V%6N8PgES_PW
ztxY%A$+_B6in0YLWlBBvvJD&wEyYP6z0w@<1`xhAxX8@YCp0uNfuXRw-%Yec_<(Im
zPA0NAU$+vU0JHfP^RZC0iD!R{AS)0ay6;`PYZBO|Y5?oa(1rR;zB4X(exT3lVB1uq
z?<L=wel8t#rJ7JTz>$K!#YL@Oi8MzxkF>xP%E)M&0`7Q7Jewz2h>4FiV|ehj*4D>@
zr>Rrq-owD~kORIxdbn@pK6izvK8O;rdR>#-Hk0uQYE>4Xok`*W|1&nhOSDRVJ6bgn
z35U%IZ>N|KuB6a=(+OFc<CIDg=hPaYAMT*PEz|QkLJp0@AzsgOJ4CaP#UTcx88$A0
zwD!y55w8ih^!4&=;?JXC(Lg&tjgi?bnIX;VBc757qZgO!KQ{};B{Qa+j+?bN$hHC#
zo`U=h?dBEUDNC_}Y4x$f1<p7@`3&=B<PrFkAPuSXHjh|B3mibjEi?l_tA4|mEkBGT
z%G6?0dT=y1v5?I1pH`~EseI0B!aL_9FWJWG*TT-RRXbIdP5}siLHT%Soml6XC9q)J
z3X>lm(tov?pFL9tI>aDAXU&oIZYu=zG?l(|)GvYS#lgs)qaftldS?Z}k9(xnqz*gP
zYBAtqx#{(QEnUkD$)PBY!656RZszHcM6HVhC{3rx*$xN1crJE}lpPera%ol#GiJSQ
zSKO9b89@df<9A5FSD&u!5WQR?O2$@4^I2`u^Ulm;DGNj+q(6ICH52Aey#rKKIj)Zt
z)SI*#w8(kqzNnR9|Jy<ML|v12YWR8$^5o?mH1z#C+Lj;xpj=g2uMbxT+rjv1dxdcS
zmt6HvlfI_%t9@5*KrF6loc0P&k&OrNh)vWDE=e>NfW*Xqkj2bV8Y=2NKA3n>XZrsC
c2k;Lu3g@a~uhD5f>RT8dZgAH+mypzd0M3r%X8-^I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-sci.png b/Resources/Textures/Structures/Machines/computers.rsi/request-sci.png
new file mode 100644
index 0000000000000000000000000000000000000000..c395cfc04c22b301f61d4aee01daf1ba00601de6
GIT binary patch
literal 1371
zcmY*YeKeB`7$1(^ZkLM?VRtS`C#O3peK~o3m3%bI#ZK~(=q`1V7UpB#b&0sKk|c&j
z;!0t~$gp)4OPCrqlNBvXjMHAx?48{?_m6u#=RCjP^T%_Z=lT84d2(@BZ~cuH8xaVE
zzRyvwKn>qp%MC~kUgr^ZYDnvHptlF2VbE#@fzUPe@p2DJE|X167CqT-o;@izH2z}r
z&kO#Rm3fWS>ipQuVaAyz!0|W7A9c3MwVyR!p3b{(8-O$MN-@#W%+f?W>4vc6i2ubr
zpNLln?4j4u(g6%<swzbyprKJXLVHAMmQiW}x|lt9zMtoiDm~o6<sZUNAS8l9HEGBF
zUHQpUdt*I{a`bu*m!vc?D!_~%YcMVkQ9`htL{LBvLv&xAHnviuGK!IC%OQ&ciYPtC
zEV=+-^SJ>^heY?gN25zW#}-T)8UCW{mnpQh2llz_qb!t1>|nnzCqe>h6o2;zaz>rE
zTdvE8K80Nm?)2*Ap7>!IJJvGZ^{Zm9+nl=f=N!0QKBn*4bq*wIh3y`C%zUT0kY@0o
z#`SmwjZHaq@XMt>&~5l*v+By<-MuSX(E{D+5I_fuwXe|noiFrd(XPTD<pJXc-*e5}
zC3Fm+u&HMJq>67evnnKTuHT6%Y^0$de@-0KuRj4iit7cYBK@A4DV)m5C2>SCthN`7
zSqJO0f{ZLreya5~UMK@1&&T$wzb^-ZL{oTN+n7b3^<Zvo`4V|DuxmLRQ$VMc(;};E
zU6z+HyO7T1Gb@b2B>wxFS(ou|6t5M)CY``qPT4g{l=F%yeW-5H!i$?cm#Fp15S-5R
zFTxXYhA)AMBDjNLi%tHIhC8U0c9eaaIsW+<g7DrgQvB<j604--#d2I4`0by)xcEhs
zp}d>Xh93ynYkMkddc>qASbK<zyH*vPiMOWfI`Ui7`q;Nzt!eO?H@ZzVVEY80h|NRA
zB}eDCF~cy}V~SS<PUy<al2eafQH<~WEi?tW=Z{OQZAmHnF(U?qyc3;<XQhoJ!XsX9
z^^en&uE7$Jvq_a)SwH`mihMp<`hYPoS<iO)qz-+<N=U6kV`C`Z33YHl*TICrT-oEC
z9HH1(c^0@691b2+B|K{_90l8061tprs~KwDklxoYGQ+MvgqEjrws)BZr@4Bmp-U}N
zopt6cy;+6vGDWl~`uHohA21ON@tmmd;Eq(L<sv`)0DE^hU`0!tfagFr8Q2yI<=>64
z=sayBBYy+iN+D0?=&vPq5DCz+h|WIelq-lLhjP_1(DM>V=l#md?&G`)I-Yj~sEF%Q
zQ}plyy!jtGQrDJ@dpoFelr0sKIRy*<{9{eskTI!R1of6YILW5=^F+uF&$YJqFtK=Q
z40;;!ob<VtMO-bOsb&l)Uw$x!o^Iw08ITg3%@v+oZuUH+lwC|qqpGfyDyz=*1Kk}r
z9H3$GhBnO*Q>fP^!&$tsZ0@Q6e%Mf(=DKG&bEE>Z>Ws`kD}C7-v6JG#LN_pB(KN|a
zrZsXqlHZ}d&LZl4mBLZ(uu2w>C}+5WqC|f#YDH7Du(wpo!FCZ8JW)rdlEcUJ>+lP;
zwvl+Tw)x6r^UX$DBxhc?DZN=PtFY_!Sk03Ajj3%U+f)gX**-B+V+2ak{$x!@Z5DX~
z-n4{YWMUI_ge`H~y@NysAxgOT3G3e5rKR-to(uOxQugh+?4YkU*mskr;R_4XxIVL}
zRX?t>6!{4}H~>c(7V+4dW#E2!fRIPpDl4&PPi6i8=o|~R*0P$=2{}*Itf})kjP+{p
HIF<1)RQ$OO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-sec.png b/Resources/Textures/Structures/Machines/computers.rsi/request-sec.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a2c8e0d39a712ea632dbfc405e4853ec3db2b0d
GIT binary patch
literal 1417
zcmY*Zdr;B`90yBJ%~!|TmD?h%E-Q=77(PyMi9=GO)P+5Kq@`v)ngWVBaK4@ML8j$n
z;%%v8KF}4Idf?1b#22QE2_o46mV^|F^h1&1?T?+`yYKh&z3(5NyU*u7_bt9~9&K%D
zZwUf{tTFzmU?VnewYiybmQ2Q-FakI&7=0GhG4bU)5XjUQgZd^kqh2X?Nfr9+Em(-G
z34G{shPd>}e0c=?zTxp9Cgzv={P|_b)+NaP!_U)Brt=4+RTV^>u1T!Dm6$u#o#S`*
zS=Q%ZBek*Y`o@S0ni}Z}MpOC<<|tDnJ*Z;zQ&@{sTJq*y5p42^W65Rxfg}Me))7|@
z)Qv(<YJ0Skn$bf@c9vr2XS1-k3#UD=Gy)_-SLEx(@lX_s9R9v6Ip%70Pf&=og&OG&
z9?#+Ja^6hLQJAHCaRK5D#9FaLT52Sj&t<H2ELlFTXdRx@vALW3q8dyIxpx*SRdvcb
zm9DXnXX|1n*=UZ5XPP?0I+ym@y#en{BNw^kg;8iOs{})Lrgd0E1^~}iYDG3h8&A~k
z*1ntsvTSGKX+BFh2bQ+f+5RVU`^-j|0R#9)F%|l3|KX^0FtuPp2TtlX<=LlzOC-1?
zaBKBcH4$L}=w-GnXlF_80d?U6B$w=?G;UP^JORvcR3L6sz8)Bp!=P)B6sFg;ON7p;
zwSDm-4Z_R(56?U293;ebj-Y>oNx%Sfi<mx+@=$9CQ;~8dID!dZJ}5zm5J(i7rP53A
zR<A7F@*qR3b}l_G>f?_vGNJu<%?Rvd;YRfyw(yCh*nyV*Y`X$b_EUmpc6LTB$q)1Y
zNe-ck(%2Zg0B;C?FuK{(BAOd#l6fUL^>6X@C19l2yK?T69;4<!^TO1#CLXm|8|7{X
zZ}a6^=o{Y;wLsOlxm%Kp2x;Du8QMD*ndFC}o54^<uIcjrkju#LaG@2ElOEuZrIs`%
z+5HUa2ZNJZb9Cn3G><W7()<#;nBYwk>z#@ZQz{P2gh0><L{Cw)mS6=`p$Ckaxi}cw
zLpXOsQg*}s-WWl43?}&Pk)1IF;a?s0z83rEoRqEFjOH=wvt!l&a1h4y<lvtZsw6it
zI-RVOoZh#I&3%54lDaEiA#&wiZRG3m96-Jn9{7AcZe)yf%DPKRYkLd7l+T;*IG)K|
zsne~YPwyUKP7F3Rl;Z?(`u;uNdY8o`LG;BP+f1B`H|TLofS)kt<4F2)L2(l;xeXXn
z_DBh|!u^>Xocl#9Jw9fl-|InE&(vL;Jgzo*_~mk80NkJpRKI8wl{eV9BWuaMF7mqf
z653iM^OYBhBe?CO`?#tumHAx~6}zrxsRY@z(6X=fc)FayYVpJuG^oV3ZfoS;F1aMo
z6{rci>ENN*e@sH!6_#lKX>;nfmDJNImN=#3<BVK??bW>-s!eHQY1l=+lUkwaFdvJM
zZ@{2Lqirdf_@VnMI5-G7Hy*lZ<L_=zR8DmCKcsXknn`WcH>6YJX%~;mZLf>R-F-^a
zIt}8665$B{{z}P_9QeGYvo|<vg-sj~>hI7O87#vvzprpK5N;?UBCjO?^!Aj4!X4+1
zBAW=N+gw{kud4>RP?cnn)E!gGrj=!dM?g*$kUi7{cdU<+?53_-2hO~h!J;`Q4Fxk)
z?KG7!dfQ}(zjau&$Z#E(4ohxvyDE^sZd|B866LJNOBHIewb2tJ1u4j9+O{P>OT1xM
zKUy5DY6<v3@B4j2c6#5SE9`~9ht8ll&0Eu3+qwEQ!=7+CB`sc7(z%&1R+G_gsEoDu
xfUkr^PzXj%Qrk`%11mg^B|oeD{|Wd&44~AjPj9i%AMS3+!uXv>b)1dL`4^!X&^`bF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-srv.png b/Resources/Textures/Structures/Machines/computers.rsi/request-srv.png
new file mode 100644
index 0000000000000000000000000000000000000000..46468ec5d53eff00f5318b692c2d379b45293de9
GIT binary patch
literal 1511
zcmZ8g2~d+)5C*A;2mxCJhEu|2%Mq>sA|!$!a*8Momw=)M6rsow0ZF1mD{VNWRV&bh
zOA<zoa7h3qK`3%19C9^58j&M}E1GchhlDh#Go8^l^LBT>w{P~_@9q0Jz~56@QA<%q
zMn>7|jC-KOmrA#Syu{*$kromsn-u8jCQ~=0!<CWQU*_fRdg1mTYctmVbH19dKmI;}
z7zs4+Ic%o2bnxpqSwwJiC`c9+g<Am4tJYvUx&qBTN>!9Y)%wf4eH<bWA6I-0YCyi9
zvK5G-S&mz_Cf{Vl^+LdsD$?af3EY@xF8t(WkMKcymqZxDJC@pn8-h7bmotBkAto>N
z^e;X$!aqOmr=#Ip;*4rWZ?8`{Kz6}4geGTxGy}4V1%o|TP`3n);%j%AypGwH?Cd)Q
zY%rLQpi&D-F(FK692lM_d;@x7ag5f<WH-G_%Y|GY0mt#1?9~`-cl4g0A?+=x@gUPJ
zZ<42|kMo7eGD%SphRgN+6h;e!yi0sBfEtyb7J5tv#2$JQ8O1d1?9qOgM8(;+24jlt
z?KZc`cJg$HGhF^ydgg?Dfj$C8y3~hYKxXz4&yth0L+nHqY0r+r*YA94`V0GVbU=IT
zaQ^p`2i%=Q!}L`XgF`br%hT?@{E>of${%dOULCAjUcJ?Qfe<Sj^o!sD+ZTOfMb2{W
zXtr=`fzk*o-Evh020RAFNC<BK6^F3o4^~`8blb1psNqMtaTi2isjuy5xF{5%-l?5J
zj|%<Bm_6hIc!9M!JCG{EsecQZ)^aFFD85<DD?i<`#%6nHkB4ti=rt>&e;1c%h%Ay^
zShf|TeL1HMB~dX9VN~po-sOj-U3J^_RszBg%6-vKS4&L>GI~%vf7!s=+a6Ilkf}be
zQ6U$4#_2{o{wVg2Q)%UI>nBrCOBpcTdg2B*C7ri2<of2ese*9{DENG1+jkwi{WE)7
z4wsOCW&FJ<I;1uSn{SMVa%U1S0iIXe0PYXw4&~?Nhdp3nCw<sXnE6?IV;Zr`BFcA@
zyDXg|uCE?X$0!$dFM#iZdetyasy1VWKT38~=Q>`DO9pDq1MBd#Dk%#kO*b@G^Fxd%
ze&^bvK9btUi_L9~3#C3p%v2a@03q6sQy$(HG(t>g?y@w^v!r8`LMZPor14W?q3^@z
zAx&p?R@3TB*kTI{(+!~t1q)aVzqAM#og~JW-O>P<!oj6%PVcZ8GtEl5Y@Wi08^>}G
ziKA>AFQlJd{P{;as0Pj{6Map_N`oZm0?-69@R^|4^k$m)NXDM|T1%ChsbVDzPX-Ec
zdy{XcHCTj%pd!Ppon#m%Qu1P6sL~@mBX+xe4sVlthXH@_)=E-jt<DhvJU<b2OoGv+
z7_*~Q@?nMs^Xv)}pz=>)ga|YdMRVCs9dF@;<;y}7@(7b8oE=<OeWLH989QBRDI?P<
zQh*Wem`k+Q8cxAWuF+R@j3$*0Xhlpqu@`G8sC|v)j%4=R@~ge>M^9Ln-lR@g{`2(2
zgX-Bb2Ds)=0tV`=#t>jF`L#|_3Q~5MR=*&XlM)4vb3v>`y%Ek%GIdcb+)F6p2{h}s
zXt9oPbcEN=G_l5fy|IS?v0?5bbvJm2G{<r%bP8*K$vUhqhHwDq0@ux3NZvkIX~Jd<
zQa9EqwSwAVIl_OZ_i<2hFM0Sn{_GVS`Efd?m&1DsJk}p;-}jlqMHM2E6<;JmN33PI
z*|4DezA5s#nC@jWz+jwY7>QT|X?kZm@m-Qr+b-o;FQzvmbF7J6YXzVkunb`z;Yj4+
zr-Y<*sxFTekgHP<C{@CAf%faD&HyPe_({MoGw^<B`U=l`%_p%5`th=kTn}}xF8Jah
zP#FxL`_~kEe>JG;Vu`<PWY#9?)v|LGeUp1R5);Il((B*eW<mbvk3B6^85;L>HDR7o
Pmx5j%{_b^dQTP4@3Hj`*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/transfer.png b/Resources/Textures/Structures/Machines/computers.rsi/transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..86bb37653ef4ea415ae9979f5eff0195fade697c
GIT binary patch
literal 1776
zcmaKrdr(tX8o)20SW9dgw(FCctxQ!q7P_m3B4a`e3<A4=5sbBls8kriklF+gAql&7
zA`YvWt?s5Zfh;H@vL?mILn67jAhcz8XbiWI!u1sciQ$=t+?#vv-pjau?9A?df1Jm6
z&iNj{?>px*(vnuax&BQ609GaMN#FuNz+rM-@kTH??&KOylT(10oAfE58w{HQfZ!X+
z37=%1(zwP2X&ZPOx}HE;tP0MLhnoL*sNERn2>m82BXLu~--Va{u?Y_49td8u4bbIB
zNLDtik#w~`o16PN??QFy#)#i}w2Pf*T+hy(j9*52cr9O^*euK&%r&^5U`Ji&+0yDn
z$mT3G9N2cS3?U`wC3xI8f7VxZ%9jegVDTqpYNcRa*QnR)ISM@8sgo7g)TFC9P4+0k
z#4)qY=oaU09fx;xzm4hEDI9wBksoAMTD*^!cm09L=o-dsR@J0vdwip88vA~5Z27Av
zx%1^?{?FLp=<NJ42BV~HVZ<!7xy5-~EuvPzQN=IV(08?&@*<`$rn?n|cg8p39eoHp
zchX3pm)~pCE}4?<y#+eQpweY`r?Tv%MaNyEwe)T^jN5N3f8lj%)}?sVQtJ-#?Y!5R
zyVW8X?<?AV$<Zd&TB)7yfS|fI6Lc=NI%#)?K<c`9q}mh(+`;&eX~b8-TQRc>Im8B6
z>T0}yF-OJ37jp6xT+HU0DSI6tC}jF}z79|Z<w#2v?5e{sCQ{cbHL^jm3<`g&lTFk3
zBavMUSGVZkpT}O#e{j1|YjAyoX<VvlQ9kX#jDu!@i*=z`YrkSzpPhXLOf3;${JgbC
zu>yVthb&Fcrl+5ytF%$@KUr-LAP8c{gDoGa2M}VswwtBxHdCq`=D$n(|K_cQ4~t)%
zV5Po)wCa9cO9NHTUR+(o!)Im9mR{0V(ZmZgG`inP*(4sIH$!I0CTRC-o<7ONLV8CR
z%~d_!1J7aombqz_YC*MIn8#p(l9%^ZV>WNUoNg8f>7$|ox<vqOtb;9)<M5-%QMnZL
zq<EuSQoRe-z4b(gMNgQo9hok)-)v|~zhKj=`^R*K^O|CD_Bov83dJ<u3>0kS*J;g>
zox~kVQ9OkW300H!+s3y-Q*LsEE)#Y>WY)SUbWU}IpRrw07#8mGn)zb`rSBuwR^Ry0
zae508<C6NsWA#3{+G|2%Tn|z34`ncE-0_svgBWz<4KT90$Bh1ZLomTA^>~`B<!ZmZ
zBVA?h)Zc0bi_suAuWk1i;LY8ca(-E*jAxX{_ZcOezHd>Y^@dxu3w;^%KTyXl-(o&a
zz;24K9)>N6SDUJ?v%WT&On9>|8sGmsQl;JZ$iI2g>2xy1@&@WVgp#V3?vqmNGFCav
zoWnpRo)+?DLXU^Z>3imzv6xmO9wg5mv9WOT6<2icn7sYFOjq>wFflP;QdE9BowF~=
z!ii01{C1s?IHowA?^Q3qK0<3j8R;tkk-crNbFQQ$R#|ykN$}Cw54#2eGg4i6KaIg4
zHt<1jV1|)-(jNj8xyqNF2)G4&R&l-78*spalf4pAFOk0+QGZDxqrb>N<TyLs2i591
zKjByr8A0!e91lAr-a^}5L8f=aU9c@KXC~=aqO^kYAh*ZkQQiSnLjl^Fn(15Xq@-X%
z&F>qs;2^4xIbPXJ_+yaC+yY{|O7Ud>@Y0J;(A+o7mYqvZxLWd8cJNiIOGj|S#VN@v
zZJ>i><^*ZA6k7U!<8OO}w|zu9_9Tsh9hH(Ih9!8I@->2|fq%mtn;zQi9aZ2`Exct>
zU1X&?{F)osey$XYpM>h<Ykh<c%MO|SQF3`BC|5c;vWbWZ6`2{caP!Gxw*TU62GSD7
z1$zVA%L(ZFAu5G~vGP4w+k*9jkgoUK;dS}w+Xy}S;tgf@W$dgvxh1ILn!F^IgWzd1
z0Z=xO?;RT4=ea)=m{}5lFjfN&M<+n3ec{{UR{th{y({1`>71J~h412~L=5B_K56*)
zYm)X=j$G?>Dq98UBE0r<V)3m#5%uerzQ5ion&iC-`)Yfa<$nK}H~}g0SP?QY>vr$J
zk){dzECn`cR3N2)F-fdBNS+f(lRkFfg;Pkfn*bC2*xIaY#nL56Bzq&n$-GBFV-|4I
tu9@%AQHrN0=Q)92Bf+u%6MI|?0n|s`#!Anwc!xSkPE1SCeR}v${{s14$XEaX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..1088abb903770ec59e6463a53ac55138dcac2fcb
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$BS}O-R9J=Wlre6^AP`0WTDb?7D@(qC%ee`MNR?u5u+{b)VQ;`KyrMCJ(sgWY
znN(|G2kaHWN(z1n!~8ch0FafHm6etC$2$2I>$?6r!b~ak!|yE=Ohie|rIg<FAOHY#
zU6;hXX`0~P0$|<xX_}G%tn<60DBMlXdGgk~A|i0k7ljsXfVFlpt8pBEZR+NbQo>rh
z*x$SZsUWtr0AP%Ph~_SE&VvVq5c9aCl$){7s)-1UF+YG(>Li4iXJd@nrFUc2t@Xt{
z3v(}F@FS|K3T0V(6RxY+gD}QGYwi7r3g3ZO)b~9A;QYAZ{J6!Yi3b>l0RV8h-f_9!
zqXBkbK}c=e0subWKcdZ}0k$q&Qh--p!eIbf>%+~n{)N5))2wrXCfUhX00000NkvXX
Hu0mjf+jOIn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..c081d66c80abd254b76118f5a403bf98334d4e19
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rJgR1ArY-_
zFB|e6FyLWv*sj&a@Ij>Qpg@pf0@FMm1r;fVt*iO+cK_*J@A1FcnT3JD{`Q^?*Q)jf
zE?YHypK{fmC~w{Odv{k_B%GURrLd{~QWK;39qEKLt))xE42@U5+RT{drZmawz?nNX
ie^`@yt}p`aoX9$Thq(Q;v!}y=90pHUKbLh*2~7Z06hZg^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..53bfb094317349ea5e779dd95f41138926b47b53
GIT binary patch
literal 370
zcmV-&0ge8NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$EJ;K`R9J=WlreIHFc3w*Gd=^Y7%I*{shj8!8HyCHX<WJ25qtw(fZn5q9jS!Y
zg-fRr1Bnze8kD%uFPCNiW7%CGD=RB2>z{S-1?#$grZCf5fAc$rlH0c3)x7IEZ#)Pv
zP1CLbA-(;H%PRw{enG0?`&xfFjK}3eAq1?oFvg%Lie1gCszO<oV2nXZ`E(Gg4p?iU
zlmY<seZMOJ5rK%nIbX$tTi`%aYX!g<1Lqt{DR9og7z@5ArJTP;DFq=!FxPd~S91o?
zS|6m8^AH+iHtCl+*4oWH*VW|^22ZgY8lOU)2|*ZRKt$eC9DN6dVE_P}9#@<m*Vr=g
z0OL3U0M3^i&X-#>KyVAT)HDqM;Qsy*Z5|Eq)4=Tt@S9CY20%o~&9h!YpU<3ku3)NG
Qp8x;=07*qoM6N<$f>+{}O#lD@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..747da48d9bfc92ef5abda759fd0036d535fc8095
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_
zFD~S52oQ0;*mS&n>iI9B8%}-CXXN2NpnUMo<E&X~Q-LZOOjH7IE`BrdN$BxQk^$c)
pl-w!2|IB87*_yeG`+q-TVh~SzCS0=nZ|-}LT2EI$mvv4FO#r*{HJtze

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/meta.json
new file mode 100644
index 00000000000..6d33e62374a
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/meta.json
@@ -0,0 +1,51 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "overlay"
+    },
+    {
+      "name": "overlay-closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c14d5d41a7aef2554ce9796887f551d92d6c228
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t2|vCLn2z=
zPFcuzSV6?~{WMFPSqnU}ezVqC#0PjcDV_gRQoH<Gilpk>7eO1#WyIyab1*6VvECkK
z(f9aM_omEQcE9AdHh;D`TwR}4$+2)&IBT4M;EbKCBeHpu&pfLOZkV}n$}6FSXUh)k
zef>>Xpz$=TnY^N)qh@QO#4fI+9)(4ZnJm*895h+4-74KXeXnt7<CIIkk}aQ$CG!-W
l%dhOtPh)Wu03yA|oUEs<^tNw%x*h0h22WQ%mvv4FO#mrNTnYdH

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/overlay-closed.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/overlay-closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f8745c83883fa93fd9ee7089554550964a29aa7
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArY-_
zFBx(jFyL@|xP>KV&wt*%jorb!%2xepxwP>8Z6^Q16A}y!`>l5^Sat1hZd$)_mi=yK
zqs`vieg&_JKfw4_zMwpF;jQiLE-hOE-ZC=$xWl?8T)3!L{m40>1q`09elF{r5}E)^
Ck2)s+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/overlay.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a0495b8b106d80ba4a099213f26eed77246a26f
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_
zFK^^zP~c&`sF63}?{)80XBMoTs@O60yVb)f_cfRp7#i+x)#>QiIY0Dk#qwMIISn&Y
rPln$2{>sdg;P8w4&fYHxTiL~ay9+()?n^!mG?l^A)z4*}Q$iB}r7kro

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..c31e3a18722e4b56ef8643a97fe5a747ee43a5c2
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a@YcVLR^9L
z|Nk=?IifcJSxhBCe!&d?qbDkD1@g*0T^vIqTHjuG<ZCeCaJg9Y-@CfW=*5LwYX8>?
z3MMfnGcYuC{@C5%v(Q3tk?|72PaiKBZaQ>SnIo_{wtl7eeBqK3_wyBpdDfNvWd|yi
zbJt-_6a4uqa~}Uv2KSInvtL)%*-x>0^5*|9*?Wywjpr-Zv7Xs0cY*nX1cRx|Cu0|&
P6Bs;Q{an^LB{Ts5AKXu4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..11715f9f4352101797f4ce5f16adfaefcd4e7915
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uAVNAArY-_
zFFFb`DDpU8Y*?zHaVU~CVo^pz+_w++ZGF?U7=g+(K9yBi$9-NKwQiZFr&sUQ>*dvp
j!`c2cU4B?o&)C2$p~^Fh_oUrSph^Z$S3j3^P6<r_dekhc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/lockbox.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8ae93c0060592da51932bd2a55ea707620f8e53
GIT binary patch
literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#%t=H+R9J=W&@l?aFcik|e?f?XO45272k8-Vi@KDq4uXP$9>E^S!QH_N2u`J_
z;P~8vV4>(B4(|tnki5K)7f?zmrIh+dBJ%Z`W|@4F6}1(-Hr$nEG|e*Em1TJ6y%%RK
z#u!G<g?G2dBkW`6SS*)~S&fI@doi63E=fYu<LLxIUDsG^L+$-~r9T`3Fd2`js){&{
z*&hx7q-h#z^E`jcYyE-wY$mVM40=7*+ig@7g#cX6XIzqCy4`TU+H9JqjauWBQcC^a
Y6Py)a42?POzW@LL07*qoM6N<$f>@Gtv;Y7A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Misc/module.rsi/cpu_justice.png b/Resources/Textures/_DV/Objects/Misc/module.rsi/cpu_justice.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab5f769d5f5dc70f6cf537445a614cdddd6f12b0
GIT binary patch
literal 269
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!FNR
zfUvy0hN*?4yLWi2y7yAO*lnQ(zfRkI`H{S6<;I84UtJA*s|8fYQxfDC%<vxpIFAIV
z0mbV*T^vI!df!esDAb_9;Ub!>`{VzA-bvm`bFID=%wY@{(|!6pcm`v1qq+^}vCb8)
z9cl-+nKrOBq;6htjcehv2?sW%B&vCxU1t_FKPgpFae_KGFL!L@j`kxH9`XI08McP`
z*u~2{_ZlC|S6n^l9bWs!Gr-F}&rp7L!hTn=KYNOq_Dp4YU31I(3D7AFp00i_>zopr
E0Nhz>8UO$Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Misc/module.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/module.rsi/meta.json
new file mode 100644
index 00000000000..1dbc0dc4b91
--- /dev/null
+++ b/Resources/Textures/_DV/Objects/Misc/module.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "cpu_justice modified from cpu_security by Janet Blackquill <uhhadd@gmail.com>",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cpu_justice"
+        }
+    ]
+}
diff --git a/Resources/Textures/_DV/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/_DV/Structures/Machines/computers.rsi/meta.json
new file mode 100644
index 00000000000..1dcf8fa010f
--- /dev/null
+++ b/Resources/Textures/_DV/Structures/Machines/computers.rsi/meta.json
@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "request-jst variant made by Janet Blackquill <uhhadd@gmail.com> based on the request- variants made by EmoGarbage404 (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "request-jst",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/_DV/Structures/Machines/computers.rsi/request-jst.png b/Resources/Textures/_DV/Structures/Machines/computers.rsi/request-jst.png
new file mode 100644
index 0000000000000000000000000000000000000000..f05eff80a2c7fb668ca4205baf74ae7e89c69d48
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq005u>005u}0{{R3yb+fl00001b5ch_0Itp)
z=>Px#5>QN3MF0Q*3kwS}3?W+<FqtD*|NsA#1~~Nq000JbQchC<|NsC0|9W}g{r~_1
zT}ebiRCt{2nt^hIAP_{Aga7~KVyw2K@iuX}!le7!Nv2&TU<kqs(<FotVw#ezr2S!e
z9w(nHuh{xf7P5_#Pga(H=3;rCbNyqX*f{y21@*|~=dy*hfa2$+alW>o{%$Qe74T+$
zYQXXQ;{`aC53b<pE$Ezo_kr3kA1!#&i96@rhY>i;q^FFN3n7FMLI@#*5Rt%zb8n!Z
z>kagCy*c~2(JBc1Uw1cy{9Jdt1^pfP5QR&0)B-DOAGlV)@8xGjd^rE0h+!Y-E!iRV
zIAd$!Gld(QL%M%Rgb+dqA%yrJpjj}R(->GtusMx^r4F0Z)D@ZgF0naHs>?<171*4{
z>I&C;0Rxu^<utVqxmSSAX)Mp~mZrNo?eF#j^X&Jrn|U)eVdhuhZch8V{lEhH*v<Ux
z_l}!jegF5XB?a`cd-?nR?n1KHam*bi?&j_MUC^zhp}#}p7@PB;t(|PnGyI%T2qA<J
zLR|6(b2+Yvc)v%M5bpO3Z03M@u-{ABZvo1q{az}515h6B_i6>)K8Esezn6;NNl_l>
z_qGb8*{>kT<NRKu;^X|@PX+uw2=X|;w^zU)=TIK!_qGZof7e|~XwzGi-+T4+48JCc
zy_KK~R2zVA=8=9cf!9y3d{r0e_u9C@z&WARpb$a`A;kDZD?)b87i|dH9fGvKBXb1n
z?`Z!AVErBM{{XDN<NY6i^>@7g1F-&%_kVz3J@|tE1F-&%_kRG^-|_wr!1_Dh{{dKk
z*TDbzu>P)v|8rseT@(N377)DmkKP+N`dm;5A%yrmz5uKHCGW0Hjnn`D002ovPDHLk
FV1lP!Yh3^U

literal 0
HcmV?d00001