diff --git a/html/changelog.html b/html/changelog.html
index fdd5b3c80d..0661780413 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,18 @@
-->
+
21 April 2021
+
necromanceranne updated:
+
+ - Stun batons (not police batons/telebatons) no longer knockdown on leftclick.
+ - Stun batons apply a knockdown and tase effect on right click, but once every few seconds (they still don't disarm). They are vulnerable to a shove disarm briefly, however. Standard batons have a cooldown of 5 seconds. Stun prods have a cooldown of 7 seconds.
+ - Taser resistance prevents the knockdown, so any chem that grants this (like adrenals) protects you from this knockdown.
+ - Stun batons apply a stagger when they hit someone, preventing sprinting for a few seconds.
+ - Stun batons respect melee armor for their stamina damage, but their cells, based on max charge, grant armor penetration. For every 1000 charge, they gain 1 armor pen. (Roundstart batons have 15 pen, just fyi)
+ - Shoves can disarm you of any item, not just guns.
+ - Removes a duplicate trait definition for TRAIT_NICE_SHOT.
+
+
20 April 2021
BlueWildrose updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 78391070a8..4070c6af4f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -29107,3 +29107,19 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
users
zeroisthebiggay:
- rscdel: the box ghost burger
+2021-04-21:
+ necromanceranne:
+ - balance: Stun batons (not police batons/telebatons) no longer knockdown on leftclick.
+ - balance: Stun batons apply a knockdown and tase effect on right click, but once
+ every few seconds (they still don't disarm). They are vulnerable to a shove
+ disarm briefly, however. Standard batons have a cooldown of 5 seconds. Stun
+ prods have a cooldown of 7 seconds.
+ - balance: Taser resistance prevents the knockdown, so any chem that grants this
+ (like adrenals) protects you from this knockdown.
+ - balance: Stun batons apply a stagger when they hit someone, preventing sprinting
+ for a few seconds.
+ - balance: Stun batons respect melee armor for their stamina damage, but their cells,
+ based on max charge, grant armor penetration. For every 1000 charge, they gain
+ 1 armor pen. (Roundstart batons have 15 pen, just fyi)
+ - balance: Shoves can disarm you of any item, not just guns.
+ - bugfix: Removes a duplicate trait definition for TRAIT_NICE_SHOT.
diff --git a/html/changelogs/AutoChangeLog-pr-14443.yml b/html/changelogs/AutoChangeLog-pr-14443.yml
deleted file mode 100644
index a145903c14..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14443.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - balance: "Stun batons (not police batons/telebatons) no longer knockdown on leftclick."
- - balance: "Stun batons apply a knockdown and tase effect on right click, but once every few seconds (they still don't disarm). They are vulnerable to a shove disarm briefly, however. Standard batons have a cooldown of 5 seconds. Stun prods have a cooldown of 7 seconds."
- - balance: "Taser resistance prevents the knockdown, so any chem that grants this (like adrenals) protects you from this knockdown."
- - balance: "Stun batons apply a stagger when they hit someone, preventing sprinting for a few seconds."
- - balance: "Stun batons respect melee armor for their stamina damage, but their cells, based on max charge, grant armor penetration. For every 1000 charge, they gain 1 armor pen. (Roundstart batons have 15 pen, just fyi)"
- - balance: "Shoves can disarm you of any item, not just guns."
- - bugfix: "Removes a duplicate trait definition for TRAIT_NICE_SHOT."