diff --git a/html/changelog.html b/html/changelog.html
index 082e9ae44d7..d379afc0706 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -73,6 +73,29 @@ ADDING CREDITS?  EDIT templates/changelog.tmpl.html
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">2025.05.06</h2>
+			<h3 class="author">Eneocho updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Aminocorydon, made by mixing Aminomicin and Banana Juice, in a jar with a Bananium sheet in it as a catalyst. This is the same mixing mechanism as Midazoline.</li>
+				<li class="rscadd">Aminocoydon reacts with Nutriment and &#34;Nothing&#34; to make Clowns and Mimes respectively.</li>
+				<li class="rscadd">Do NOT mix Aminocorydon with 10 parts Honk Serum.</li>
+			</ul>
+			<h3 class="author">ShiftyRail updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Ankh Horn using all the sand available in a stack instead of just one stack.</li>
+				<li class="experiment">Port the game to BYOND 516 for better features, in particular improved HTML UI responsiveness. Please report any bugs.</li>
+				<li class="imageadd">Norwood curse now has a proper spell icon, courtesy of Blithering.</li>
+				<li class="bugfix">Simple mobs, including grues, can now remove floor tiles</li>
+				<li class="bugfix">Wrapped items should no longer behave erratically after being unwrapped.</li>
+				<li class="tweak">You can now wrap items while holding them.</li>
+			</ul>
+			<h3 class="author">Silkizuad updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Derelict Update - derelict maps are now randomly picked each round.</li>
+				<li class="rscadd">Added a new derelict map.</li>
+				<li class="rscadd">Derelicts are somewhat profitable to visit now.</li>
+				<li class="bugfix">Safes now properly take in items in vaults.</li>
+			</ul>
 			<h2 class="date">2025.05.05</h2>
 			<h3 class="author">ShiftyRail updated:</h3>
 			<ul class="changes bgimages16">
@@ -1337,18 +1360,6 @@ ADDING CREDITS?  EDIT templates/changelog.tmpl.html
 				<li class="tweak">Point blank shots now have an accuracy boost, such that under normal conditions they should never miss.</li>
 				<li class="bugfix">APCs with their covers knocked off will now properly unexpose the wires.</li>
 			</ul>
-			<h2 class="date">2024.07.09</h2>
-			<h3 class="author">boy2mantwicethefam updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Martians will now properly block projectile effects using their shields.</li>
-				<li class="bugfix">Fixed a few instances in the code where having full protection against a projectile attack would still cause projectile effects to happen, even when it should be completely blocked.</li>
-				<li class="bugfix">Fixed a 5-year-old bug where silicons were unintentionally subjected to various projectile effects such as syringes from syringe guns. However, they have retained their weakness to slowdown caused by tasers.</li>
-				<li class="bugfix">Force Wall will now only pick one character on its turf to deal damage to if it is impacted by a projectile, as opposed to affecting every single character, and will now respect whether the user could block the attack or not.</li>
-			</ul>
-			<h3 class="author">falcon2346 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Vegans can now eat walking vegetables.</li>
-			</ul>
 		</div>
 		<!--
 		Credits Section
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c802b51af25..b892db1c4a1 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1,19 +1,5 @@
 DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 ---
-2024-07-09:
-  boy2mantwicethefam:
-  - bugfix: Martians will now properly block projectile effects using their shields.
-  - bugfix: Fixed a few instances in the code where having full protection against
-      a projectile attack would still cause projectile effects to happen, even when
-      it should be completely blocked.
-  - bugfix: Fixed a 5-year-old bug where silicons were unintentionally subjected to
-      various projectile effects such as syringes from syringe guns. However, they
-      have retained their weakness to slowdown caused by tasers.
-  - bugfix: Force Wall will now only pick one character on its turf to deal damage
-      to if it is impacted by a projectile, as opposed to affecting every single character,
-      and will now respect whether the user could block the attack or not.
-  falcon2346:
-  - tweak: Vegans can now eat walking vegetables.
 2024-07-15:
   boy2mantwicethefam:
   - rscadd: The laser pistol and laser rifle from R&D now have extremely poor accuracy
@@ -1341,3 +1327,24 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   ShiftyRail:
   - experiment: 516 clients should no longer have broken HTML windows in some cases
       (such as using admin verbs).
+2025-05-06:
+  Eneocho:
+  - rscadd: Aminocorydon, made by mixing Aminomicin and Banana Juice, in a jar with
+      a Bananium sheet in it as a catalyst. This is the same mixing mechanism as Midazoline.
+  - rscadd: Aminocoydon reacts with Nutriment and "Nothing" to make Clowns and Mimes
+      respectively.
+  - rscadd: Do NOT mix Aminocorydon with 10 parts Honk Serum.
+  ShiftyRail:
+  - bugfix: Fixes Ankh Horn using all the sand available in a stack instead of just
+      one stack.
+  - experiment: Port the game to BYOND 516 for better features, in particular improved
+      HTML UI responsiveness. Please report any bugs.
+  - imageadd: Norwood curse now has a proper spell icon, courtesy of Blithering.
+  - bugfix: Simple mobs, including grues, can now remove floor tiles
+  - bugfix: Wrapped items should no longer behave erratically after being unwrapped.
+  - tweak: You can now wrap items while holding them.
+  Silkizuad:
+  - rscadd: Derelict Update - derelict maps are now randomly picked each round.
+  - rscadd: Added a new derelict map.
+  - rscadd: Derelicts are somewhat profitable to visit now.
+  - bugfix: Safes now properly take in items in vaults.
diff --git a/html/changelogs/AutoChangeLog-pr-37501.yml b/html/changelogs/AutoChangeLog-pr-37501.yml
deleted file mode 100644
index e76ff8d1dc0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37501.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: ShiftyRail
-delete-after: true
-changes:
-- experiment: Port the game to BYOND 516 for better features, in particular improved
-    HTML UI responsiveness. Please report any bugs.
diff --git a/html/changelogs/AutoChangeLog-pr-37512.yml b/html/changelogs/AutoChangeLog-pr-37512.yml
deleted file mode 100644
index 2a689ec6894..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37512.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Eneocho
-delete-after: true
-changes:
-- rscadd: Aminocorydon, made by mixing Aminomicin and Banana Juice, in a jar with
-    a Bananium sheet in it as a catalyst. This is the same mixing mechanism as Midazoline.
-- rscadd: Aminocoydon reacts with Nutriment and "Nothing" to make Clowns and Mimes
-    respectively.
-- rscadd: Do NOT mix Aminocorydon with 10 parts Honk Serum.
diff --git a/html/changelogs/AutoChangeLog-pr-37516.yml b/html/changelogs/AutoChangeLog-pr-37516.yml
deleted file mode 100644
index 8a979cb8c51..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37516.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Silkizuad
-delete-after: true
-changes:
-- rscadd: Derelict Update - derelict maps are now randomly picked each round.
-- rscadd: Added a new derelict map.
-- rscadd: Derelicts are somewhat profitable to visit now.
-- bugfix: Safes now properly take in items in vaults.
diff --git a/html/changelogs/AutoChangeLog-pr-37519.yml b/html/changelogs/AutoChangeLog-pr-37519.yml
deleted file mode 100644
index b764587296e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37519.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: ShiftyRail
-delete-after: true
-changes:
-- imageadd: Norwood curse now has a proper spell icon, courtesy of Blithering.
diff --git a/html/changelogs/AutoChangeLog-pr-37520.yml b/html/changelogs/AutoChangeLog-pr-37520.yml
deleted file mode 100644
index 9c7c6c6f9c7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37520.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: ShiftyRail
-delete-after: true
-changes:
-- bugfix: Fixes Ankh Horn using all the sand available in a stack instead of just
-    one stack.
diff --git a/html/changelogs/AutoChangeLog-pr-37524.yml b/html/changelogs/AutoChangeLog-pr-37524.yml
deleted file mode 100644
index f9c401736db..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37524.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: ShiftyRail
-delete-after: true
-changes:
-- bugfix: Simple mobs, including grues, can now remove floor tiles
diff --git a/html/changelogs/AutoChangeLog-pr-37525.yml b/html/changelogs/AutoChangeLog-pr-37525.yml
deleted file mode 100644
index 24783bd5eab..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37525.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: ShiftyRail
-delete-after: true
-changes:
-- bugfix: Wrapped items should no longer behave erratically after being unwrapped.
-- tweak: You can now wrap items while holding them.