From 00db1679fc9513bfb89d89a5203c96d1f40c5899 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 21 Apr 2021 00:06:45 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 12 ++++++++++++
 html/changelogs/.all_changelog.yml         | 16 ++++++++++++++++
 html/changelogs/AutoChangeLog-pr-14443.yml | 10 ----------
 3 files changed, 28 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14443.yml

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 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">21 April 2021</h2>
+			<h3 class="author">necromanceranne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Stun batons (not police batons/telebatons) no longer knockdown on leftclick.</li>
+				<li class="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.</li>
+				<li class="balance">Taser resistance prevents the knockdown, so any chem that grants this (like adrenals) protects you from this knockdown.</li>
+				<li class="balance">Stun batons apply a stagger when they hit someone, preventing sprinting for a few seconds.</li>
+				<li class="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)</li>
+				<li class="balance">Shoves can disarm you of any item, not just guns.</li>
+				<li class="bugfix">Removes a duplicate trait definition for TRAIT_NICE_SHOT.</li>
+			</ul>
+
 			<h2 class="date">20 April 2021</h2>
 			<h3 class="author">BlueWildrose updated:</h3>
 			<ul class="changes bgimages16">
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."