From 0f3b8f37a63f3e992a1d057ddb3582ec6d23b167 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 17:33:29 +0000
Subject: [PATCH] Automatic changelog update

---
 Resources/Changelog/Admin.yml     |  5 ++---
 Resources/Changelog/Changelog.yml | 19 ++++++++-----------
 Resources/Changelog/Maps.yml      |  5 ++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 474a16da3a..b2ebdecbfd 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,7 +1,4 @@
 AdminOnly: true
-Name: Admin
-Order: 2
-# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
 Entries:
 - author: DrSmugleaf
   changes:
@@ -1464,3 +1461,5 @@ Entries:
   id: 177
   time: '2025-10-05T07:40:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40709
+Name: Admin
+Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 603ebfd2ea..1043d32de0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
-# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
-Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG's efficiency in extracting power from gasses has been tweaked
-      to promote dual-loop designs that recycle the waste heat of gasses, and punish
-      "meta" single loop designs.
-    type: Tweak
-  id: 8570
-  time: '2025-05-26T11:53:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37728
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The TEG now outputs smoother power when pressure across the circulators
@@ -3953,3 +3943,10 @@ Entries:
   id: 9072
   time: '2025-10-11T05:14:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40822
+- author: TrixxedHeart
+  changes:
+  - message: Updated Xenoarchaeology guidebook page to current system.
+    type: Tweak
+  id: 9073
+  time: '2025-10-11T17:32:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40621
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 557a260ac4..0c8783e4a5 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -1,6 +1,4 @@
-Order: 1
-# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
-Entries:
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The mapping changelog has been added! This primarily serves as a way
@@ -780,3 +778,4 @@ Entries:
   id: 94
   time: '2025-10-10T20:33:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40821
+Order: 1