Automatic changelog update

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 7c766a96e520d0aef404561e4c69a32f609e941f..c1170dd8877825bafda6b15a590cd8da9c0e1a6d 100644 (file)
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1582,5 +1582,13 @@ Entries:
   id: 192
   time: '2026-01-05T21:13:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41936
+- author: mikeysaurus
+  changes:
+  - message: Admins can now vvwrite FTLCooldownOverride to override the FTL Cooldown's
+      timer.
+    type: Add
+  id: 193
+  time: '2026-01-09T06:58:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42209
 Name: Admin
 Order: 3

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9b5bbe837f4692635f29853b47f811e736941e85..ed71df09bbfdfbb901398d6cc946519166d47c73 100644 (file)
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Stamina resistance has been removed from cardboard armor and gorillas.
-    type: Tweak
-  id: 8863
-  time: '2025-08-18T14:33:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39727
 - author: SlamBamActionman
   changes:
   - message: Aiming with the Hristov is now working correctly when using the Separated
@@ -3892,3 +3885,11 @@
   id: 9366
   time: '2026-01-09T04:14:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42211
+- author: mikeysaurus
+  changes:
+  - message: All non-arrivals shuttles are defaulted to have a 60 second cooldown
+      before they can FTL again.
+    type: Tweak
+  id: 9367
+  time: '2026-01-09T06:58:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42209