From 3dcae83515e02a25720ed3db7e1f16e798523b4c Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Thu, 7 Jun 2018 22:51:09 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 18 ++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 12 ++++++++++++
 html/changelogs/AutoChangeLog-pr-38277.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-38289.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-38308.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-38309.yml |  4 ----
 6 files changed, 30 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38277.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38289.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38308.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-38309.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2fd45e5a0a1..b5a159162e7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,24 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">07 June 2018</h2>
+			<h3 class="author">Cruix updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Picture-in-picture objects now are no longer overlapped by other certain objects</li>
+			</ul>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">It is now possible to access the wires of RND machines in order to repair them if they have been EMP'd.</li>
+			</ul>
+			<h3 class="author">Tlaltecuhtli updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">rad collectors set to research point gen are somewhat ok now</li>
+			</ul>
+			<h3 class="author">kevinz000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Vehicle speed changes now happen immediately instead of on the next movement cycle</li>
+			</ul>
+
 			<h2 class="date">06 June 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 0e82256c48f..1a144d309c3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18310,3 +18310,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       top efficiency, even while starving to death. This is no longer the case, Nanotrasen
       Scientists say.
   - admin: Hunger slowdown only applies if mood is disabled in the config.
+2018-06-07:
+  Cruix:
+  - bugfix: Picture-in-picture objects now are no longer overlapped by other certain
+      objects
+  SpaceManiac:
+  - bugfix: It is now possible to access the wires of RND machines in order to repair
+      them if they have been EMP'd.
+  Tlaltecuhtli:
+  - bugfix: rad collectors set to research point gen are somewhat ok now
+  kevinz000:
+  - tweak: Vehicle speed changes now happen immediately instead of on the next movement
+      cycle
diff --git a/html/changelogs/AutoChangeLog-pr-38277.yml b/html/changelogs/AutoChangeLog-pr-38277.yml
deleted file mode 100644
index a51f2b356b5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38277.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "It is now possible to access the wires of RND machines in order to repair them if they have been EMP'd."
diff --git a/html/changelogs/AutoChangeLog-pr-38289.yml b/html/changelogs/AutoChangeLog-pr-38289.yml
deleted file mode 100644
index 3fedf0ce4b4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38289.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tlaltecuhtli"
-delete-after: True
-changes: 
-  - bugfix: "rad collectors set to research point gen are somewhat ok now"
diff --git a/html/changelogs/AutoChangeLog-pr-38308.yml b/html/changelogs/AutoChangeLog-pr-38308.yml
deleted file mode 100644
index 173d0884d77..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38308.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cruix"
-delete-after: True
-changes: 
-  - bugfix: "Picture-in-picture objects now are no longer overlapped by other certain objects"
diff --git a/html/changelogs/AutoChangeLog-pr-38309.yml b/html/changelogs/AutoChangeLog-pr-38309.yml
deleted file mode 100644
index 4de2992af42..00000000000
--- a/html/changelogs/AutoChangeLog-pr-38309.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes: 
-  - tweak: "Vehicle speed changes now happen immediately instead of on the next movement cycle"