From 32d8f4092eb948fea231eb5a0e75c8c567ad61d8 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 17 Jun 2018 22:59:44 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 11 +++++++++++
 html/changelogs/.all_changelog.yml        |  6 ++++++
 html/changelogs/AutoChangeLog-pr-9112.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9122.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9123.yml |  4 ----
 5 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9112.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9122.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9123.yml

diff --git a/html/changelog.html b/html/changelog.html
index c661f36509d..7f3d57e8808 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 June 2018</h2>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes wizards not spawning with their clothes and backpack</li>
+				<li class="bugfix">It no longer snows on away missions</li>
+			</ul>
+			<h3 class="author">variableundefined updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Nuclear challenge time limit now depends on round start time.</li>
+			</ul>
+
 			<h2 class="date">13 June 2018</h2>
 			<h3 class="author">Aurorablade updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6cec07f4761..15d5824d09f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6514,3 +6514,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Tayyyyyyy:
   - tweak: Shadowling dethrall has been shortened to scalpel, hemostat, retractor,
       shine light, cautery
+2018-06-17:
+  Fox McCloud:
+  - bugfix: Fixes wizards not spawning with their clothes and backpack
+  - bugfix: It no longer snows on away missions
+  variableundefined:
+  - tweak: Nuclear challenge time limit now depends on round start time.
diff --git a/html/changelogs/AutoChangeLog-pr-9112.yml b/html/changelogs/AutoChangeLog-pr-9112.yml
deleted file mode 100644
index 2df5c4bf75a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9112.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "variableundefined"
-delete-after: True
-changes: 
-  - tweak: "Nuclear challenge time limit now depends on round start time."
diff --git a/html/changelogs/AutoChangeLog-pr-9122.yml b/html/changelogs/AutoChangeLog-pr-9122.yml
deleted file mode 100644
index f93d8000ebb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9122.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - bugfix: "It no longer snows on away missions"
diff --git a/html/changelogs/AutoChangeLog-pr-9123.yml b/html/changelogs/AutoChangeLog-pr-9123.yml
deleted file mode 100644
index 3bb89e99829..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9123.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - bugfix: "Fixes wizards not spawning with their clothes and backpack"