From 62696c59bf9f865c851ad599cf68ee67aa9d1cfe Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 16 Apr 2017 20:00:42 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 31 +++++++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 26 +++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-6867.yml |  5 ----
 html/changelogs/AutoChangeLog-pr-7007.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-7090.yml |  7 -----
 html/changelogs/AutoChangeLog-pr-7093.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-7097.yml |  5 ----
 html/changelogs/AutoChangeLog-pr-7106.yml |  4 ---
 8 files changed, 57 insertions(+), 29 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6867.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7007.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7090.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7093.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7097.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7106.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2c6921bdff1..f96602b15d6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,37 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">16 April 2017</h2>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Potential collaborators for traitors now are informed they are potentially a collaborator for a potential increase in them potentially helping the traitors potentially do potentially bad things. Potentially.</li>
+				<li class="rscadd">Potential collaborators are given a single code word and response set so they can discretely find out that their best friend is a filthy traitor.</li>
+			</ul>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds secondary (facial) hair colours to the genome (UI). There are 6 new blocks.</li>
+				<li class="bugfix">Characters with secondary (facial) hair colours won't find they've turned black after cloning anymore.</li>
+			</ul>
+			<h3 class="author">Twinmold93 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Missing sprite for pod pilot Drask now added.</li>
+			</ul>
+			<h3 class="author">Xantholne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds Medical Beret available via loadout menu</li>
+			</ul>
+			<h3 class="author">ZomgPonies updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Superhero ID cards</li>
+				<li class="bugfix">Fixes Griffin missing his Freedom Implant</li>
+				<li class="bugfix">Fixes ElectroNegmatic's Ability not working at all.</li>
+				<li class="tweak">Changes LightnIan's ability into a non-damaging stun lasting 2 ticks, with the amount of people affected depending on how long you hold the power in for.</li>
+			</ul>
+			<h3 class="author">uraniummeltdown updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now create heat-proof glass airlocks by using a sheet of reinforced glass on the assembly during construction. Regular glass airlocks just require a sheet of glass.</li>
+			</ul>
+
 			<h2 class="date">11 April 2017</h2>
 			<h3 class="author">FalseIncarnate updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 54b7742ff91..29e467427ea 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4459,3 +4459,29 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   FalseIncarnate:
   - tweak: Damage done to the shuttle engines by a shadowling's "Extend Shuttle" ability
       now prevent the shuttle from being recalled to CentComm.
+2017-04-16:
+  FalseIncarnate:
+  - tweak: Potential collaborators for traitors now are informed they are potentially
+      a collaborator for a potential increase in them potentially helping the traitors
+      potentially do potentially bad things. Potentially.
+  - rscadd: Potential collaborators are given a single code word and response set
+      so they can discretely find out that their best friend is a filthy traitor.
+  KasparoVy:
+  - rscadd: Adds secondary (facial) hair colours to the genome (UI). There are 6 new
+      blocks.
+  - bugfix: Characters with secondary (facial) hair colours won't find they've turned
+      black after cloning anymore.
+  Twinmold93:
+  - bugfix: Missing sprite for pod pilot Drask now added.
+  Xantholne:
+  - rscadd: Adds Medical Beret available via loadout menu
+  ZomgPonies:
+  - bugfix: Fixes Superhero ID cards
+  - bugfix: Fixes Griffin missing his Freedom Implant
+  - bugfix: Fixes ElectroNegmatic's Ability not working at all.
+  - tweak: Changes LightnIan's ability into a non-damaging stun lasting 2 ticks, with
+      the amount of people affected depending on how long you hold the power in for.
+  uraniummeltdown:
+  - rscadd: You can now create heat-proof glass airlocks by using a sheet of reinforced
+      glass on the assembly during construction. Regular glass airlocks just require
+      a sheet of glass.
diff --git a/html/changelogs/AutoChangeLog-pr-6867.yml b/html/changelogs/AutoChangeLog-pr-6867.yml
deleted file mode 100644
index be9e215fb9a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6867.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "FalseIncarnate"
-delete-after: True
-changes: 
-  - tweak: "Potential collaborators for traitors now are informed they are potentially a collaborator for a potential increase in them potentially helping the traitors potentially do potentially bad things. Potentially."
-  - rscadd: "Potential collaborators are given a single code word and response set so they can discretely find out that their best friend is a filthy traitor."
diff --git a/html/changelogs/AutoChangeLog-pr-7007.yml b/html/changelogs/AutoChangeLog-pr-7007.yml
deleted file mode 100644
index 6a253e62f6b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7007.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes: 
-  - rscadd: "You can now create heat-proof glass airlocks by using a sheet of reinforced glass on the assembly during construction. Regular glass airlocks just require a sheet of glass."
diff --git a/html/changelogs/AutoChangeLog-pr-7090.yml b/html/changelogs/AutoChangeLog-pr-7090.yml
deleted file mode 100644
index b2f16a308d9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7090.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "ZomgPonies"
-delete-after: True
-changes: 
-  - bugfix: "Fixes Superhero ID cards"
-  - bugfix: "Fixes Griffin missing his Freedom Implant"
-  - bugfix: "Fixes ElectroNegmatic's Ability not working at all."
-  - tweak: "Changes LightnIan's ability into a non-damaging stun lasting 2 ticks, with the amount of people affected depending on how long you hold the power in for."
diff --git a/html/changelogs/AutoChangeLog-pr-7093.yml b/html/changelogs/AutoChangeLog-pr-7093.yml
deleted file mode 100644
index 3c8d74ba610..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7093.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes: 
-  - rscadd: "Adds Medical Beret available via loadout menu"
diff --git a/html/changelogs/AutoChangeLog-pr-7097.yml b/html/changelogs/AutoChangeLog-pr-7097.yml
deleted file mode 100644
index a785b9005e8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7097.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "KasparoVy"
-delete-after: True
-changes: 
-  - rscadd: "Adds secondary (facial) hair colours to the genome (UI). There are 6 new blocks."
-  - bugfix: "Characters with secondary (facial) hair colours won't find they've turned black after cloning anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-7106.yml b/html/changelogs/AutoChangeLog-pr-7106.yml
deleted file mode 100644
index 1d1690d0423..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7106.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Twinmold93"
-delete-after: True
-changes: 
-  - bugfix: "Missing sprite for pod pilot Drask now added."