From 5f40dd39bcd5a9288116cd1aedd1fdbbf3e18d3c Mon Sep 17 00:00:00 2001
From: Whitesands-Bot <60119942+Whitesands-Bot@users.noreply.github.com>
Date: Tue, 26 Jan 2021 00:38:46 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                      | 32 ++++++++++--------------
 html/changelogs/.all_changelog.yml       | 12 +++++++++
 html/changelogs/AutoChangeLog-pr-713.yml | 13 ----------
 3 files changed, 25 insertions(+), 32 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-713.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2001a5afc2a..ff70c7d49f2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">26 January 2021</h2>
+			<h3 class="author">stylemistake, SpaceManiac, Mothblocks, tralezab, Seris02, spookydonut, Cyberboss, LemonInTheDark, Timberpoes, Watermelon914 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">TGUI secrets panel for admins.</li>
+				<li class="rscadd">TGUI list input.</li>
+				<li class="rscadd">CBT, something that many of our coders have been wanting for the longest time.</li>
+				<li class="bugfix">TGchat lightmode tooltips work properly again.</li>
+				<li class="bugfix">You can actually pay off pirates again.</li>
+				<li class="tweak">The "who" verb's output is now in table form.</li>
+				<li class="code_imp">The mapmerge and other git hooks now support github desktop.</li>
+				<li class="server">Be sure to update TGS's event scripts to support CBT.</li>
+			</ul>
+
 			<h2 class="date">25 January 2021</h2>
 			<h3 class="author">MarkSuckerberg updated:</h3>
 			<ul class="changes bgimages16">
@@ -527,25 +540,6 @@ <h3 class="author">triplezeta updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">bicard plus no longer requires plasma as a catalyst</li>
 			</ul>
-
-			<h2 class="date">24 November 2020</h2>
-			<h3 class="author">Jared-Fogle, actioninja, Cyberboss, Crossedfall, Mark Suckerberg updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">CI has been changed somewhat.</li>
-				<li class="code_imp">To be closed, a PR needs to be stale (untouched for 7 days) and then untouched for another 14.</li>
-				<li class="server">Docker actually works now.</li>
-			</ul>
-			<h3 class="author">dinnerwoerror updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">the CMO hypospray kit comes with the upgraded chemicals instead of the basic ones, as is befitting of their status</li>
-			</ul>
-			<h3 class="author">untrius & wesoda24 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Ethereals can be the inducers they were born to be</li>
-				<li class="bugfix">Fixed charge cap on almost full APCs</li>
-				<li class="balance">Ethereals charging from power cells waste less power and charge slightly slower</li>
-				<li class="balance">Ethereals charging from lights gain slightly less power and charge slightly faster</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 83206b3a78b..b8bfb0b60d5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -39915,3 +39915,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - code_imp: All mentions of Waspstation have been replaced with White Sands.
   Vorak2:
   - tweak: expanded the asteroid with hostiles in it
+2021-01-26:
+  ? stylemistake, SpaceManiac, Mothblocks, tralezab, Seris02, spookydonut, Cyberboss,
+    LemonInTheDark, Timberpoes, Watermelon914
+  : - rscadd: TGUI secrets panel for admins.
+    - rscadd: TGUI list input.
+    - rscadd: CBT, something that many of our coders have been wanting for the longest
+        time.
+    - bugfix: TGchat lightmode tooltips work properly again.
+    - bugfix: You can actually pay off pirates again.
+    - tweak: The "who" verb's output is now in table form.
+    - code_imp: The mapmerge and other git hooks now support github desktop.
+    - server: Be sure to update TGS's event scripts to support CBT.
diff --git a/html/changelogs/AutoChangeLog-pr-713.yml b/html/changelogs/AutoChangeLog-pr-713.yml
deleted file mode 100644
index 4fb94bfa27d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-713.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: stylemistake, SpaceManiac, Mothblocks, tralezab, Seris02, spookydonut, Cyberboss,
-  LemonInTheDark, Timberpoes, Watermelon914
-delete-after: true
-changes:
-  - rscadd: TGUI secrets panel for admins.
-  - rscadd: TGUI list input.
-  - rscadd: CBT, something that many of our coders have been wanting for the longest
-      time.
-  - bugfix: TGchat lightmode tooltips work properly again.
-  - bugfix: You can actually pay off pirates again.
-  - tweak: The "who" verb's output is now in table form.
-  - code_imp: The mapmerge and other git hooks now support github desktop.
-  - server: Be sure to update TGS's event scripts to support CBT.