diff --git a/html/changelog.html b/html/changelog.html
index 07120cae2ad..5918bf36972 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,19 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed flashlights in PDAs not creating lighting nor being installable as components once removed.</li>
 			</ul>
+			<h3 class="author">KingOfThePing updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="soundadd">Added a lot (around 65) new gun related sounds. Including but not limited to: dry firing and reloading for all gun types, shotgun pumping, casings and shells hitting the ground, as well as some gun specific uniques.</li>
+				<li class="sounddel">Deleted a very sharp and old shotgun pumping sound that didn&#x27;t fit in anywhere anymore.</li>
+				<li class="backend">Re-organized a lot of sound categories.</li>
+				<li class="backend">Re-organized the gun magazine code while I was at it.</li>
+			</ul>
+			<h3 class="author">Vrow updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Tweaked the IV drip tank indicator icon to use the percentage helper instead of the exact gauge updating, and some IV drip code clean up and oversight patching.</li>
+				<li class="bugfix">Fixed the IV drip not automatically retracting the installed mask if you stripped it from someone and then wearing it yourself.</li>
+				<li class="bugfix">Fixed the IV drip outputting a specific message even though the installed tank gets spilled everywhere when not secured.</li>
+			</ul>
 			<h3 class="author">WickedCybs updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Live surgery is more painful in general now. Light painkillers will not cut it if you want it to be safe for your patient. Assuming you want it to be safe, anyway</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ecb1e80131e..e509d6c85f5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24877,6 +24877,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   JohnWildkins:
   - bugfix: Fixed flashlights in PDAs not creating lighting nor being installable
       as components once removed.
+  KingOfThePing:
+  - soundadd: 'Added a lot (around 65) new gun related sounds. Including but not limited
+      to: dry firing and reloading for all gun types, shotgun pumping, casings and
+      shells hitting the ground, as well as some gun specific uniques.'
+  - sounddel: Deleted a very sharp and old shotgun pumping sound that didn&#x27;t
+      fit in anywhere anymore.
+  - backend: Re-organized a lot of sound categories.
+  - backend: Re-organized the gun magazine code while I was at it.
+  Vrow:
+  - tweak: Tweaked the IV drip tank indicator icon to use the percentage helper instead
+      of the exact gauge updating, and some IV drip code clean up and oversight patching.
+  - bugfix: Fixed the IV drip not automatically retracting the installed mask if you
+      stripped it from someone and then wearing it yourself.
+  - bugfix: Fixed the IV drip outputting a specific message even though the installed
+      tank gets spilled everywhere when not secured.
   WickedCybs:
   - rscadd: Live surgery is more painful in general now. Light painkillers will not
       cut it if you want it to be safe for your patient. Assuming you want it to be
diff --git a/html/changelogs/IV_drip_cleanup.yml b/html/changelogs/IV_drip_cleanup.yml
deleted file mode 100644
index 14267866ff1..00000000000
--- a/html/changelogs/IV_drip_cleanup.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Vrow
-
-delete-after: True
-
-changes:
-  - tweak: "Tweaked the IV drip tank indicator icon to use the percentage helper instead of the exact gauge updating, and some IV drip code clean up and oversight patching."
-  - bugfix: "Fixed the IV drip not automatically retracting the installed mask if you stripped it from someone and then wearing it yourself."
-  - bugfix: "Fixed the IV drip outputting a specific message even though the installed tank gets spilled everywhere when not secured."
diff --git a/html/changelogs/KingOfThePing - high_maintenance_gun_fetish_bait.yml b/html/changelogs/KingOfThePing - high_maintenance_gun_fetish_bait.yml
deleted file mode 100644
index f10450425e6..00000000000
--- a/html/changelogs/KingOfThePing - high_maintenance_gun_fetish_bait.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: KingOfThePing
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - soundadd: "Added a lot (around 65) new gun related sounds. Including but not limited to: dry firing and reloading for all gun types, shotgun pumping, casings and shells hitting the ground, as well as some gun specific uniques."
-  - sounddel: "Deleted a very sharp and old shotgun pumping sound that didn't fit in anywhere anymore."
-  - backend: "Re-organized a lot of sound categories."
-  - backend: "Re-organized the gun magazine code while I was at it."