diff --git a/html/changelog.html b/html/changelog.html
index a19bed4578..2f926fd9e8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,15 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">21 December 2021</h2>
+			<h3 class="author">ShizCalev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed an issue where you were able to remove flashlights/bayonets that were supposed to be permanently attached to a gun.</li>
+				<li class="bugfix">Fixed an issue where you were unable to remove flashlights & bayonets from certain weapons.</li>
+				<li class="bugfix">Fixed a potential issue where adding a flashlight to your helmet would've caused you to lose other action buttons.</li>
+				<li class="bugfix">Fixed a issue where guns with multiple action buttons would break all but one of those action buttons. tweak: If you have both a bayonet and a flashlight attached to your gun, you'll now be given a prompt on which you'd like to remove when using a screwdriver on it. tweak: Hacking a firing pin out of a gun is no longer done via a crafting menu - you can now do it by simply holding the gun in your hand and clicking it with a welder/screwdriver/wirecutters.</li>
+			</ul>
+
 			<h2 class="date">17 December 2021</h2>
 			<h3 class="author">DeltaFire15 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0c24ab2b14..50caa2d448 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -30403,3 +30403,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: The time for admins to cancel events is 30 seconds again.
   SandPoot:
   - bugfix: Fixes assembly holders.
+2021-12-21:
+  ShizCalev:
+  - bugfix: Fixed an issue where you were able to remove flashlights/bayonets that
+      were supposed to be permanently attached to a gun.
+  - bugfix: Fixed an issue where you were unable to remove flashlights & bayonets
+      from certain weapons.
+  - bugfix: Fixed a potential issue where adding a flashlight to your helmet would've
+      caused you to lose other action buttons.
+  - bugfix: 'Fixed a issue where guns with multiple action buttons would break all
+      but one of those action buttons. tweak: If you have both a bayonet and a flashlight
+      attached to your gun, you''ll now be given a prompt on which you''d like to
+      remove when using a screwdriver on it. tweak: Hacking a firing pin out of a
+      gun is no longer done via a crafting menu - you can now do it by simply holding
+      the gun in your hand and clicking it with a welder/screwdriver/wirecutters.'
diff --git a/html/changelogs/AutoChangeLog-pr-15402.yml b/html/changelogs/AutoChangeLog-pr-15402.yml
deleted file mode 100644
index 6081ecbd33..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15402.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes: 
-  - bugfix: "Fixed an issue where you were able to remove flashlights/bayonets that were supposed to be permanently attached to a gun."
-  - bugfix: "Fixed an issue where you were unable to remove flashlights & bayonets from certain weapons."
-  - bugfix: "Fixed a potential issue where adding a flashlight to your helmet would've caused you to lose other action buttons."
-  - bugfix: "Fixed a issue where guns with multiple action buttons would break all but one of those action buttons.
-tweak: If you have both a bayonet and a flashlight attached to your gun, you'll now be given a prompt on which you'd like to remove when using a screwdriver on it.
-tweak: Hacking a firing pin out of a gun is no longer done via a crafting menu - you can now do it by simply holding the gun in your hand and clicking it with a welder/screwdriver/wirecutters."