From b3b04f02e3a392570a93897422224ebf46245e29 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 7 Jul 2020 00:09:53 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 16 ++++++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-12688.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-12698.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12699.yml |  4 ----
 5 files changed, 26 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12688.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12698.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12699.yml

diff --git a/html/changelog.html b/html/changelog.html
index 43271e20ff..f12ab97b29 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,22 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 July 2020</h2>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Fixes misaligned south-facing silver legwraps sprite.</li>
+			</ul>
+			<h3 class="author">Owai-Seek updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Bee Balm is now visible.</li>
+			</ul>
+			<h3 class="author">Weblure updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the slowdown formula for small character sprites; you guys don't use custom sprite sizes so just ignore these changes.</li>
+				<li class="bugfix">Fixed the "Move it to the threshold" button; it now does what it says.</li>
+				<li class="tweak">Reworded some text to be clearer.</li>
+			</ul>
+
 			<h2 class="date">05 July 2020</h2>
 			<h3 class="author">Ghommie updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c0d0bc99f2..383bc23a00 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26264,3 +26264,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   timothyteakettle:
   - tweak: cooking oil is now far less lethal, requiring a higher volume of the reagent
       to deal more damage
+2020-07-07:
+  KasparoVy:
+  - tweak: Fixes misaligned south-facing silver legwraps sprite.
+  Owai-Seek:
+  - bugfix: Bee Balm is now visible.
+  Weblure:
+  - bugfix: Fixed the slowdown formula for small character sprites; you guys don't
+      use custom sprite sizes so just ignore these changes.
+  - bugfix: Fixed the "Move it to the threshold" button; it now does what it says.
+  - tweak: Reworded some text to be clearer.
diff --git a/html/changelogs/AutoChangeLog-pr-12688.yml b/html/changelogs/AutoChangeLog-pr-12688.yml
deleted file mode 100644
index 28d005e84a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12688.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Weblure"
-delete-after: True
-changes: 
-  - bugfix: "Fixed the slowdown formula for small character sprites; you guys don't use custom sprite sizes so just ignore these changes."
-  - bugfix: "Fixed the \"Move it to the threshold\" button; it now does what it says."
-  - tweak: "Reworded some text to be clearer."
diff --git a/html/changelogs/AutoChangeLog-pr-12698.yml b/html/changelogs/AutoChangeLog-pr-12698.yml
deleted file mode 100644
index 58c7e59970..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12698.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes: 
-  - bugfix: "Bee Balm is now visible."
diff --git a/html/changelogs/AutoChangeLog-pr-12699.yml b/html/changelogs/AutoChangeLog-pr-12699.yml
deleted file mode 100644
index d4efec4bbf..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12699.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "KasparoVy"
-delete-after: True
-changes: 
-  - tweak: "Fixes misaligned south-facing silver legwraps sprite."