From 16c9cfe8999c67a920a015c00f941e1642ff7799 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Jan 2026 06:59:29 +0000 Subject: [PATCH] Automatic changelog update --- Resources/Changelog/Admin.yml | 8 ++++++++ Resources/Changelog/Changelog.yml | 15 ++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 7c766a96e5..c1170dd887 100644 --- 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 9b5bbe837f..ed71df09bb 100644 --- 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 -- 2.52.0