From 37207416e1c8ea45296071010629c37eb494bd0f Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 23 Jun 2021 00:22:43 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 28 ++++++++++++----------
 html/changelogs/.all_changelog.yml         | 12 ++++++++++
 html/changelogs/AutoChangeLog-pr-14877.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-14880.yml | 10 --------
 4 files changed, 28 insertions(+), 26 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14877.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14880.yml

diff --git a/html/changelog.html b/html/changelog.html
index bc2ecc16d3..ed723d0575 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,22 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">23 June 2021</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">A bunch of small nanite things should be less wonky</li>
+				<li class="bugfix">Slimes are no longer immune to vomiting (undocumented change from a previous PR)</li>
+				<li class="bugfix">Fruit wine exists again.</li>
+				<li class="code_imp">Airlock hacking no longer sleeps.</li>
+				<li class="code_imp">The clockwork gateway deconstruction no longer sleeps.</li>
+				<li class="code_imp">Teslium reactions and Holywater booms no longer sleep.</li>
+				<li class="code_imp">Slime timestop no longer sleeps.</li>
+			</ul>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">inelastic exports no longer uselessly do exponential functions</li>
+			</ul>
+
 			<h2 class="date">22 June 2021</h2>
 			<h3 class="author">bunny232 updated:</h3>
 			<ul class="changes bgimages16">
@@ -621,18 +637,6 @@
 				<li class="balance">triple fire breath for the lava swoop only happens below half health now</li>
 				<li class="bugfix">The arena attack not making safespots when you fight it in a mech</li>
 			</ul>
-
-			<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>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4bb53330d5..52962b89e1 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -29548,3 +29548,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Adds a missing win door to meta xenobiology pen 6
   silicons:
   - bugfix: no more doubleroasting
+2021-06-23:
+  DeltaFire15:
+  - bugfix: A bunch of small nanite things should be less wonky
+  - bugfix: Slimes are no longer immune to vomiting (undocumented change from a previous
+      PR)
+  - bugfix: Fruit wine exists again.
+  - code_imp: Airlock hacking no longer sleeps.
+  - code_imp: The clockwork gateway deconstruction no longer sleeps.
+  - code_imp: Teslium reactions and Holywater booms no longer sleep.
+  - code_imp: Slime timestop no longer sleeps.
+  Putnam3145:
+  - bugfix: inelastic exports no longer uselessly do exponential functions
diff --git a/html/changelogs/AutoChangeLog-pr-14877.yml b/html/changelogs/AutoChangeLog-pr-14877.yml
deleted file mode 100644
index 1f58e8a102..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14877.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes: 
-  - bugfix: "inelastic exports no longer uselessly do exponential functions"
diff --git a/html/changelogs/AutoChangeLog-pr-14880.yml b/html/changelogs/AutoChangeLog-pr-14880.yml
deleted file mode 100644
index da0e9b405f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14880.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "A bunch of small nanite things should be less wonky"
-  - bugfix: "Slimes are no longer immune to vomiting (undocumented change from a previous PR)"
-  - bugfix: "Fruit wine exists again."
-  - code_imp: "Airlock hacking no longer sleeps."
-  - code_imp: "The clockwork gateway deconstruction no longer sleeps."
-  - code_imp: "Teslium reactions and Holywater booms no longer sleep."
-  - code_imp: "Slime timestop no longer sleeps."