From a69aecf720db6f16b3be27cdd71a7dbf794b685c Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 6 Jun 2017 18:08:25 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 12 ++++++++++++
 html/changelogs/.all_changelog.yml        |  8 ++++++++
 html/changelogs/AutoChangeLog-pr-7439.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7448.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7471.yml |  4 ----
 5 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7439.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7448.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7471.yml

diff --git a/html/changelog.html b/html/changelog.html
index d8d0b9c6d6c..c9e960dfa84 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,18 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">06 June 2017</h2>
+			<h3 class="author">DarkPyrolord updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Plasmamen should be able to become vampires on normal vampire rounds.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">adjust the mech tesla, immolator, and disabler techs to bring it in line with the tech refactor</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Instagib lasers now work against non-carbon mobs, such as animals and borgs.</li>
+			</ul>
 			<h3 class="author">imsxz updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Sergeant Araneus now spawns at full HP.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 31655ea577f..f09a60ca6d2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4845,5 +4845,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   FreeStylaLT:
   - bugfix: Cell 6 is now connected to the atmos system properly.
 2017-06-06:
+  DarkPyrolord:
+  - bugfix: Plasmamen should be able to become vampires on normal vampire rounds.
+  Fox McCloud:
+  - tweak: adjust the mech tesla, immolator, and disabler techs to bring it in line
+      with the tech refactor
+  Kyep:
+  - bugfix: Instagib lasers now work against non-carbon mobs, such as animals and
+      borgs.
   imsxz:
   - bugfix: Sergeant Araneus now spawns at full HP.
diff --git a/html/changelogs/AutoChangeLog-pr-7439.yml b/html/changelogs/AutoChangeLog-pr-7439.yml
deleted file mode 100644
index fb64ca8684d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7439.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DarkPyrolord"
-delete-after: True
-changes: 
-  - bugfix: "Plasmamen should be able to become vampires on normal vampire rounds."
diff --git a/html/changelogs/AutoChangeLog-pr-7448.yml b/html/changelogs/AutoChangeLog-pr-7448.yml
deleted file mode 100644
index 924fb3803a5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7448.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - tweak: "adjust the mech tesla, immolator, and disabler techs to bring it in line with the tech refactor"
diff --git a/html/changelogs/AutoChangeLog-pr-7471.yml b/html/changelogs/AutoChangeLog-pr-7471.yml
deleted file mode 100644
index fefc93d6d83..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7471.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "Instagib lasers now work against non-carbon mobs, such as animals and borgs."