From 8bf791c275632095d2f454506fbb1721d9f6cdb2 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Thu, 5 Jul 2018 01:22:14 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-38897.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-38901.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-38911.yml |  4 ----
 5 files changed, 24 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38897.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38901.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38911.yml

diff --git a/html/changelog.html b/html/changelog.html
index eab3de191f341..40e08d8751fa5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,20 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 July 2018</h2>
+			<h3 class="author">Cyberboss updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Setting "default" in maps.txt now will load that map as the first fallback when a next_map.json is missing</li>
+			</ul>
+			<h3 class="author">Jared-Fogle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the "Remove IV Container" verb on IV drips from showing every nearby mob</li>
+			</ul>
+			<h3 class="author">Naksu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">shuttles now move the air along with their occupants, instead of magicking up new air.</li>
+			</ul>
+
 			<h2 class="date">03 July 2018</h2>
 			<h3 class="author">Dax Dupont updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6bfa959cb2d79..7645736ef66ae 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18807,3 +18807,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Tables and racks on shuttles have been installed with inertia dampeners.
   - bugfix: Some very thin barriers didn't stop mobs from being thrown by the shuttle
       under certain circumstances, this has been fixed.
+2018-07-05:
+  Cyberboss:
+  - bugfix: Setting "default" in maps.txt now will load that map as the first fallback
+      when a next_map.json is missing
+  Jared-Fogle:
+  - bugfix: Fixed the "Remove IV Container" verb on IV drips from showing every nearby
+      mob
+  Naksu:
+  - tweak: shuttles now move the air along with their occupants, instead of magicking
+      up new air.
diff --git a/html/changelogs/AutoChangeLog-pr-38897.yml b/html/changelogs/AutoChangeLog-pr-38897.yml
deleted file mode 100644
index eb9151c19ff9d..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-38897.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cyberboss"
-delete-after: True
-changes: 
-  - bugfix: "Setting \"default\" in maps.txt now will load that map as the first fallback when a next_map.json is missing"
diff --git a/html/changelogs/AutoChangeLog-pr-38901.yml b/html/changelogs/AutoChangeLog-pr-38901.yml
deleted file mode 100644
index 414f65a396600..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-38901.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - tweak: "shuttles now move the air along with their occupants, instead of magicking up new air."
diff --git a/html/changelogs/AutoChangeLog-pr-38911.yml b/html/changelogs/AutoChangeLog-pr-38911.yml
deleted file mode 100644
index aa74052ce2f72..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-38911.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Jared-Fogle"
-delete-after: True
-changes: 
-  - bugfix: "Fixed the \"Remove IV Container\" verb on IV drips from showing every nearby mob"