From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 22 Apr 2025 12:36:01 +0000 (+0000)
Subject: Automatic changelog update
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=44c8004cfe27189f9ad1bc7cca4f1a624e416b1a;p=space-station-14.git

Automatic changelog update
---

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index c0e4a5c5d6..3eaf627d38 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1093,5 +1093,19 @@ Entries:
   id: 132
   time: '2025-04-20T19:08:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36776
+- author: sowelipililimute
+  changes:
+  - message: The Funding Allocation Computer now has a CVar to enable configuring
+      the primary cut (off by default)
+    type: Add
+  - message: The Funding Allocation Computer now has a CVar to enable configuring
+      the lockbox cut (on by default)
+    type: Add
+  - message: The Funding Allocation Computer now has a CVar to enable hiding the primary
+      account from the funding splits (on by default)
+    type: Add
+  id: 133
+  time: '2025-04-22T12:34:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36790
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index faa92cd462..4c87de07be 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: Mime PDA item interactions (insertions/ejections of IDs, pens, etc.)
-      are now silent.
-    type: Tweak
-  id: 7811
-  time: '2025-01-15T18:03:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34426
 - author: Alpaccalypse
   changes:
   - message: Smite soda vending machines have been added to the game.
@@ -3914,3 +3906,14 @@
   id: 8312
   time: '2025-04-22T06:33:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36811
+- author: sowelipililimute
+  changes:
+  - message: The Funding Allocation Computer can now adjust the cut Cargo takes from
+      lockbox sales
+    type: Add
+  - message: The Funding Allocation Computer doesn't show Cargo separately from its
+      75% cut
+    type: Tweak
+  id: 8313
+  time: '2025-04-22T12:34:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36790