From ed25929fec98010ee38d394845f6d932d716a39d Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 23 Jul 2020 00:10:46 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 18 ++++++++++++++++++
 html/changelogs/.all_changelog.yml         |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-12835.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12847.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12851.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12855.yml |  4 ----
 6 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12835.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12847.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12851.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12855.yml

diff --git a/html/changelog.html b/html/changelog.html
index cc62c1b4c3..d0731d740c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,24 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">23 July 2020</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Traits are no longer fucked</li>
+			</ul>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Slight optimization in chat code.</li>
+			</ul>
+			<h3 class="author">kappa-sama updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">tendril chests being empty</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">fetish content</li>
+			</ul>
+
 			<h2 class="date">22 July 2020</h2>
 			<h3 class="author">Ludox updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a1b46b13b9..45d8e6ebe5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26467,3 +26467,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   kappa-sama:
   - balance: brainwashing disk has lost its cost buffs (3->5) and is role restricted
       once more (medical doctor/roboticist)
+2020-07-23:
+  DeltaFire15:
+  - bugfix: Traits are no longer fucked
+  Putnam3145:
+  - tweak: Slight optimization in chat code.
+  kappa-sama:
+  - bugfix: tendril chests being empty
+  zeroisthebiggay:
+  - rscadd: fetish content
diff --git a/html/changelogs/AutoChangeLog-pr-12835.yml b/html/changelogs/AutoChangeLog-pr-12835.yml
deleted file mode 100644
index 7532264f47..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12835.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes: 
-  - bugfix: "tendril chests being empty"
diff --git a/html/changelogs/AutoChangeLog-pr-12847.yml b/html/changelogs/AutoChangeLog-pr-12847.yml
deleted file mode 100644
index 2c8f0f1381..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12847.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes: 
-  - tweak: "Slight optimization in chat code."
diff --git a/html/changelogs/AutoChangeLog-pr-12851.yml b/html/changelogs/AutoChangeLog-pr-12851.yml
deleted file mode 100644
index 8b5cb06ec2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12851.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes: 
-  - rscadd: "fetish content"
diff --git a/html/changelogs/AutoChangeLog-pr-12855.yml b/html/changelogs/AutoChangeLog-pr-12855.yml
deleted file mode 100644
index 7c91444962..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12855.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "Traits are no longer fucked"