From efab079c3f8c880ac83394841d6958b014fba1b4 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 13 Jan 2018 14:32:15 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 12 ++++++++++++
 html/changelogs/.all_changelog.yml        |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-8524.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-8548.yml |  5 -----
 4 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8524.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8548.yml

diff --git a/html/changelog.html b/html/changelog.html
index 24427b0244a..950024426de 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">13 January 2018</h2>
+			<h3 class="author">Citinited updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The ocean and the pool are no longer colder than outer space.</li>
+				<li class="tweak">Water now cools or heats you gradually, not all at once.</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Refactored Paranormal/Janitor dress code, and Cyborg ERT spawn code.</li>
+				<li class="rscadd">Signing up for ERT, then going AFK, such that your AFKness prevents you and/or others spawning as ERT within a reasonable (2 minute) period of time, now generates a warning to online admins.</li>
+			</ul>
+
 			<h2 class="date">11 January 2018</h2>
 			<h3 class="author">Bxil updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dd5f9103878..e179f142b46 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5944,3 +5944,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   uraniummeltdown:
   - bugfix: Freezers and other atmos machines will drop frame and parts correctly
       again
+2018-01-13:
+  Citinited:
+  - bugfix: The ocean and the pool are no longer colder than outer space.
+  - tweak: Water now cools or heats you gradually, not all at once.
+  Kyep:
+  - tweak: Refactored Paranormal/Janitor dress code, and Cyborg ERT spawn code.
+  - rscadd: Signing up for ERT, then going AFK, such that your AFKness prevents you
+      and/or others spawning as ERT within a reasonable (2 minute) period of time,
+      now generates a warning to online admins.
diff --git a/html/changelogs/AutoChangeLog-pr-8524.yml b/html/changelogs/AutoChangeLog-pr-8524.yml
deleted file mode 100644
index d9395294ca4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8524.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - tweak: "Refactored Paranormal/Janitor dress code, and Cyborg ERT spawn code."
-  - rscadd: "Signing up for ERT, then going AFK, such that your AFKness prevents you and/or others spawning as ERT within a reasonable (2 minute) period of time, now generates a warning to online admins."
diff --git a/html/changelogs/AutoChangeLog-pr-8548.yml b/html/changelogs/AutoChangeLog-pr-8548.yml
deleted file mode 100644
index 2849bb826f3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8548.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Citinited"
-delete-after: True
-changes: 
-  - bugfix: "The ocean and the pool are no longer colder than outer space."
-  - tweak: "Water now cools or heats you gradually, not all at once."