diff --git a/html/changelogs/AutoChangeLog-pr-17547.yml b/html/changelogs/AutoChangeLog-pr-17547.yml
deleted file mode 100644
index 6181aefa6ac..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17547.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TeleTubby2"
-delete-after: True
-changes:
-  - bugfix: "mob holders play nice with disposals again"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17647.yml b/html/changelogs/AutoChangeLog-pr-17647.yml
deleted file mode 100644
index 2d66beebf6e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17647.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Diana"
-delete-after: True
-changes:
-  - qol: "Guns that do bonus damage to simple_mob/animal (phaseguns) now do bonus damage to any simple_mob"
-  - qol: "Survey Vendor and Mining Vendor have had some adjustments. PSGs are now available in them. Some price adjustments. Mining gets a expensive version of their rig."
-  - qol: "Kinetic Gauntlets can fit in your backpack now."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17707.yml b/html/changelogs/AutoChangeLog-pr-17707.yml
deleted file mode 100644
index eb20202c22d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17707.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Willburd"
-delete-after: True
-changes:
-  - refactor: "Overmap shuttle star movement overlay is not controlled by a subsystem"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17709.yml b/html/changelogs/AutoChangeLog-pr-17709.yml
deleted file mode 100644
index 96285b552d4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17709.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "TheCaramelion"
-delete-after: True
-changes:
-  - code_imp: "RemoveDisease proc now uses LAZYREMOVE"
-  - code_imp: "HasResistance proc now uses LAZYFIND"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17712.yml b/html/changelogs/AutoChangeLog-pr-17712.yml
deleted file mode 100644
index 639d1d1d5e5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17712.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Willburd"
-delete-after: True
-changes:
-  - refactor: "Photosynthesis code moved to component"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17713.yml b/html/changelogs/AutoChangeLog-pr-17713.yml
deleted file mode 100644
index 2cfd059bd19..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17713.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Willburd"
-delete-after: True
-changes:
-  - rscadd: "Nutrition resizing traits, disabled on virgo"
-  - refactor: "Moved nutrition resizing code to components"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17714.yml b/html/changelogs/AutoChangeLog-pr-17714.yml
deleted file mode 100644
index a229af8ccc3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17714.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Willburd"
-delete-after: True
-changes:
-  - rscadd: "Photodegeneration genetrait, cannot be selected from round start"
-  - bugfix: "Drippy trait will no longer drop drips into the cryopod when a human with it is in the pod"
-  - refactor: "inStasisNow() has a base proc on mob, for ease of component compatibility between simple and human mobs"
-  - refactor: "Moved species/shadow and zaddat light-based damage code to a component"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-17716.yml b/html/changelogs/AutoChangeLog-pr-17716.yml
deleted file mode 100644
index 075ae34fc7f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17716.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Willburd"
-delete-after: True
-changes:
-  - bugfix: "mobs can be extinguished by hand when beneath paincrit threshold"
\ No newline at end of file
diff --git a/html/changelogs/archive/2025-05.yml b/html/changelogs/archive/2025-05.yml
index b3669091c5b..8c3fb3cbb37 100644
--- a/html/changelogs/archive/2025-05.yml
+++ b/html/changelogs/archive/2025-05.yml
@@ -136,3 +136,27 @@
       definitions
   crabcube:
   - rscadd: New moth eyes marking!
+2025-05-17:
+  Diana:
+  - qol: Guns that do bonus damage to simple_mob/animal (phaseguns) now do bonus damage
+      to any simple_mob
+  - qol: Survey Vendor and Mining Vendor have had some adjustments. PSGs are now available
+      in them. Some price adjustments. Mining gets a expensive version of their rig.
+  - qol: Kinetic Gauntlets can fit in your backpack now.
+  TeleTubby2:
+  - bugfix: mob holders play nice with disposals again
+  TheCaramelion:
+  - code_imp: RemoveDisease proc now uses LAZYREMOVE
+  - code_imp: HasResistance proc now uses LAZYFIND
+  Willburd:
+  - rscadd: Nutrition resizing traits, disabled on virgo
+  - refactor: Moved nutrition resizing code to components
+  - rscadd: Photodegeneration genetrait, cannot be selected from round start
+  - bugfix: Drippy trait will no longer drop drips into the cryopod when a human with
+      it is in the pod
+  - refactor: inStasisNow() has a base proc on mob, for ease of component compatibility
+      between simple and human mobs
+  - refactor: Moved species/shadow and zaddat light-based damage code to a component
+  - refactor: Overmap shuttle star movement overlay is not controlled by a subsystem
+  - bugfix: mobs can be extinguished by hand when beneath paincrit threshold
+  - refactor: Photosynthesis code moved to component