From 73aec2d8e815d6eb512e0cb5bc6fa26e2fd10805 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 2 Jun 2016 23:03:08 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 9 +++++++++
 html/changelogs/.all_changelog.yml         | 6 ++++++
 html/changelogs/AutoChangeLog-pr-18130.yml | 5 -----
 html/changelogs/AutoChangeLog-pr-18136.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-18137.yml | 4 ----
 5 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-18130.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-18136.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-18137.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0a4b54fc47e..3f66e45582e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,10 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">02 June 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Closed false walls will block air.</li>
+			</ul>
 			<h3 class="author">Lati updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">R&D required levels and origin tech levels have been rebalanced</li>
@@ -70,6 +74,10 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Letterman jackets are now available from the ClothesMate.</li>
 			</ul>
+			<h3 class="author">Quiltyquilty updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The bar has seen a redesign.</li>
+			</ul>
 			<h3 class="author">coiax updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Clone pods now notify the medical channel on a successful clone. They also notify the medical channel if the clone dies or is horribly mutilated; but not if it is ejected early by authorised medical personnel.</li>
@@ -77,6 +85,7 @@
 				<li class="bugfix">You can only be damaged once by a shuttle's arrival. It is still unpleasant to be in the path of one though; try to avoid it.</li>
 				<li class="rscadd">Adds Asteroid emergency shuttle to shuttle templates. It is a very oddly shaped one though, it might not be compatible with all stations.</li>
 				<li class="rscdel">The Chaplain soulshard can only turn a body into a shade once. A released shade can still be reabsorbed by the stone to heal it.</li>
+				<li class="rscadd">The shuttle manipulator now has a Fast Travel button, for those admins that really want a shuttle to get to where its going FAST.</li>
 			</ul>
 
 			<h2 class="date">01 June 2016</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c18f868cf47..9e532fa5765 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5248,6 +5248,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   pudl:
   - rscadd: The brig infirmary has received a redesign.
 2016-06-02:
+  Joan:
+  - tweak: Closed false walls will block air.
   Lati:
   - rscadd: R&D required levels and origin tech levels have been rebalanced
   - experiment: Overall, items buildable in R&D have lower tech levels and items in
@@ -5263,6 +5265,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Most bugs in R&D machines should be fixed
   PKPenguin321 & Nienhaus:
   - rscadd: Letterman jackets are now available from the ClothesMate.
+  Quiltyquilty:
+  - rscadd: The bar has seen a redesign.
   coiax:
   - rscadd: Clone pods now notify the medical channel on a successful clone. They
       also notify the medical channel if the clone dies or is horribly mutilated;
@@ -5275,3 +5279,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       shaped one though, it might not be compatible with all stations.
   - rscdel: The Chaplain soulshard can only turn a body into a shade once. A released
       shade can still be reabsorbed by the stone to heal it.
+  - rscadd: The shuttle manipulator now has a Fast Travel button, for those admins
+      that really want a shuttle to get to where its going FAST.
diff --git a/html/changelogs/AutoChangeLog-pr-18130.yml b/html/changelogs/AutoChangeLog-pr-18130.yml
deleted file mode 100644
index 06fc8b40573..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18130.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: coiax
-delete-after: True
-changes: 
-  - rscadd: "The shuttle manipulator now has a Fast Travel button, for those
-admins that really want a shuttle to get to where its going FAST."
diff --git a/html/changelogs/AutoChangeLog-pr-18136.yml b/html/changelogs/AutoChangeLog-pr-18136.yml
deleted file mode 100644
index 603e6819cbe..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18136.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Quiltyquilty
-delete-after: True
-changes: 
-  - rscadd: "The bar has seen a redesign."
diff --git a/html/changelogs/AutoChangeLog-pr-18137.yml b/html/changelogs/AutoChangeLog-pr-18137.yml
deleted file mode 100644
index a4118c95a22..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18137.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - tweak: "Closed false walls will block air."