From 48eb65633c0fafef97f0d4949f0f74937a5bca2b Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Wed, 20 Nov 2019 07:24:58 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 13 +++++++++++++
 html/changelogs/.all_changelog.yml         | 12 ++++++++++++
 html/changelogs/AutoChangeLog-pr-47866.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-47868.yml |  7 -------
 4 files changed, 25 insertions(+), 11 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-47866.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-47868.yml

diff --git a/html/changelog.html b/html/changelog.html
index eb35c35168e..39cd2bcb10d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,6 +51,19 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">20 November 2019</h2>
+			<h3 class="author">actioninja updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">cyborgs spinning off riders now knocks down for 3 seconds instead of stunning for 6</li>
+			</ul>
+			<h3 class="author">ninjanomnom updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Keybound emotes now count as intentional. This means emotes that don't play a sound when you type the emote also don't play a sound when you use the keybinding.</li>
+				<li class="bugfix">Emotes can no longer be stacked on one key.</li>
+				<li class="tweak">Emotes have been given cooldowns. Each emote has their own cooldown so you can still do your flip and scream.</li>
+				<li class="tweak">You can fall over if you try to flip too much.</li>
+			</ul>
+
 			<h2 class="date">19 November 2019</h2>
 			<h3 class="author">ATHATH updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e5dee1d67a7..c196422f378 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28624,3 +28624,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   tmtmtl30:
   - bugfix: Nanotransen cyborgs have recovered from butchering-induced trauma and
       are now able to joust again.
+2019-11-20:
+  actioninja:
+  - balance: cyborgs spinning off riders now knocks down for 3 seconds instead of
+      stunning for 6
+  ninjanomnom:
+  - bugfix: Keybound emotes now count as intentional. This means emotes that don't
+      play a sound when you type the emote also don't play a sound when you use the
+      keybinding.
+  - bugfix: Emotes can no longer be stacked on one key.
+  - tweak: Emotes have been given cooldowns. Each emote has their own cooldown so
+      you can still do your flip and scream.
+  - tweak: You can fall over if you try to flip too much.
diff --git a/html/changelogs/AutoChangeLog-pr-47866.yml b/html/changelogs/AutoChangeLog-pr-47866.yml
deleted file mode 100644
index 8d69f4550d8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-47866.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "actioninja"
-delete-after: True
-changes: 
-  - balance: "cyborgs spinning off riders now knocks down for 3 seconds instead of stunning for 6"
diff --git a/html/changelogs/AutoChangeLog-pr-47868.yml b/html/changelogs/AutoChangeLog-pr-47868.yml
deleted file mode 100644
index 989c8b569aa..00000000000
--- a/html/changelogs/AutoChangeLog-pr-47868.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "ninjanomnom"
-delete-after: True
-changes: 
-  - bugfix: "Keybound emotes now count as intentional. This means emotes that don't play a sound when you type the emote also don't play a sound when you use the keybinding."
-  - bugfix: "Emotes can no longer be stacked on one key."
-  - tweak: "Emotes have been given cooldowns. Each emote has their own cooldown so you can still do your flip and scream."
-  - tweak: "You can fall over if you try to flip too much."