From d75922ed61d2beeb6be079e447761168f0e23170 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Wed, 19 Sep 2018 14:04:57 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 47 +++++-----------------
 html/changelogs/.all_changelog.yml         |  6 +++
 html/changelogs/AutoChangeLog-pr-40310.yml |  4 --
 html/changelogs/AutoChangeLog-pr-40330.yml |  4 --
 4 files changed, 16 insertions(+), 45 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-40310.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-40330.yml

diff --git a/html/changelog.html b/html/changelog.html
index bc67c05ca1b..11ca9ca77fb 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">19 September 2018</h2>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Non-TGM format shuttle templates no longer leave some of their turfs behind.</li>
+			</ul>
+			<h3 class="author">cacogen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The luxury shuttle now accepts dragged money. Useful for mobs without hands.</li>
+			</ul>
+
 			<h2 class="date">18 September 2018</h2>
 			<h3 class="author">ShizCalev updated:</h3>
 			<ul class="changes bgimages16">
@@ -1424,43 +1434,6 @@
 			<ul class="changes bgimages16">
 				<li class="balance">Visible indications of cultist status during deconversion using holy water happen more often.</li>
 			</ul>
-
-			<h2 class="date">18 July 2018</h2>
-			<h3 class="author">Cyberboss updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Deaths now lag the server less</li>
-				<li class="bugfix">Ban checks cause less lag</li>
-			</ul>
-			<h3 class="author">Denton updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">RCDs can now also be loaded with reinforced glass and reinforced plasma glass sheets.</li>
-			</ul>
-			<h3 class="author">Irafas updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">players can construct while standing on top of a directional window. (machine frames, computer frames, etc)</li>
-			</ul>
-			<h3 class="author">MrStonedOne updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">synchronizing admin ranks with the database now lags the server less</li>
-				<li class="bugfix">saving stats now lags the server less</li>
-				<li class="bugfix">jobexp updating now lags the server less</li>
-				<li class="bugfix">poll creation now lags the server less.</li>
-			</ul>
-			<h3 class="author">Tlaltecuhtli updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">putting a cell and other not intended actions dont open the  circuit window</li>
-			</ul>
-			<h3 class="author">WJohnston updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Abandoned box ship space ruin consoles have been turned into something more obviously broken so people stop complaining the ship doesn't work when it's not meant to anyway.</li>
-				<li class="rscdel">Removed the extra syndie headset from the syndicate listening post space ruin so people stumbling on the ruin won't be able to ruin your channel's security as often.</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed a few bugs with imaginary friends, including them not being able to hear anyone or surviving past the owner's death.</li>
-				<li class="rscadd">Imaginary friends can now move into the owner's head.</li>
-				<li class="rscadd">Imaginary friends can now choose to become invisible to the owner at will.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 344adb104ac..0be8bfd6bee 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -20164,3 +20164,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Flying and ventcrawling mobs will no longer make footstep sounds.
   ShizClaev:
   - bugfix: Bloodcrawling and jaunting mobs will no longer be consumed by chasms.
+2018-09-19:
+  SpaceManiac:
+  - bugfix: Non-TGM format shuttle templates no longer leave some of their turfs behind.
+  cacogen:
+  - rscadd: The luxury shuttle now accepts dragged money. Useful for mobs without
+      hands.
diff --git a/html/changelogs/AutoChangeLog-pr-40310.yml b/html/changelogs/AutoChangeLog-pr-40310.yml
deleted file mode 100644
index d66085016a3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-40310.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "Non-TGM format shuttle templates no longer leave some of their turfs behind."
diff --git a/html/changelogs/AutoChangeLog-pr-40330.yml b/html/changelogs/AutoChangeLog-pr-40330.yml
deleted file mode 100644
index 39179e31606..00000000000
--- a/html/changelogs/AutoChangeLog-pr-40330.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "cacogen"
-delete-after: True
-changes: 
-  - rscadd: "The luxury shuttle now accepts dragged money. Useful for mobs without hands."