From 1c29dea2677ee7a9cee97f62ebae4e2c543cc7f8 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 5 Nov 2016 16:44:36 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 31 ++++++++--------------
 html/changelogs/.all_changelog.yml         |  9 +++++++
 html/changelogs/AutoChangeLog-pr-21334.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-21344.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-21357.yml |  4 ---
 5 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21334.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21344.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21357.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9fc098c25ca..04151a20c73 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 November 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Proselytizer conversion now accounts for existing materials, and deconstructing a wall, a girder, or a window for its materials is no longer more efficient than just converting it.</li>
+				<li class="imageadd">Heal glows now appear when mending motors repair clockwork mobs and objects.</li>
+			</ul>
+			<h3 class="author">Lzimann updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">You can no longer walk holding shift.</li>
+			</ul>
+
 			<h2 class="date">03 November 2016</h2>
 			<h3 class="author">Cobby updated:</h3>
 			<ul class="changes bgimages16">
@@ -1026,26 +1037,6 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Nanotrasen has now stocked the DNA Manipulators with potassium iodide instead of epinephrine as rejuvenators.</li>
 			</ul>
-
-			<h2 class="date">02 September 2016</h2>
-			<h3 class="author">A-t48 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed cyborgs being able to use Power Warning emote when broken.</li>
-			</ul>
-			<h3 class="author">Iamgoofball updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="experiment">Freon has been reworked completely.</li>
-				<li class="rscadd">Water Vapor has been added to the Janitor's Closet.</li>
-			</ul>
-			<h3 class="author">RemieRichards updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Cutting bedsheets with a sharp object/wirecutters no longer puts the resulting cloth INSIDE OF YOU if you're holding it, what a bug.</li>
-			</ul>
-			<h3 class="author">bgobandit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">You can hide small items in urinals now. Use a screwdriver to screw open the drain enclosure.</li>
-				<li class="rscadd">Every space urinal comes complete with space urinal cake. Do not eat.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3d1d83ae522..7279cb3ae4b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7745,3 +7745,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       Application scripture is unlocked.
   - wip: The "Convert All Silicons" objective will also only be given if there is
       an AI, instead of only if there is a silicon.
+2016-11-05:
+  Joan:
+  - rscadd: Proselytizer conversion now accounts for existing materials, and deconstructing
+      a wall, a girder, or a window for its materials is no longer more efficient
+      than just converting it.
+  - imageadd: Heal glows now appear when mending motors repair clockwork mobs and
+      objects.
+  Lzimann:
+  - rscdel: You can no longer walk holding shift.
diff --git a/html/changelogs/AutoChangeLog-pr-21334.yml b/html/changelogs/AutoChangeLog-pr-21334.yml
deleted file mode 100644
index a561c790688..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21334.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscadd: "Proselytizer conversion now accounts for existing materials, and deconstructing a wall, a girder, or a window for its materials is no longer more efficient than just converting it."
diff --git a/html/changelogs/AutoChangeLog-pr-21344.yml b/html/changelogs/AutoChangeLog-pr-21344.yml
deleted file mode 100644
index 622aba00ed1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21344.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - imageadd: "Heal glows now appear when mending motors repair clockwork mobs and objects."
diff --git a/html/changelogs/AutoChangeLog-pr-21357.yml b/html/changelogs/AutoChangeLog-pr-21357.yml
deleted file mode 100644
index ce40ac0dc53..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21357.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Lzimann"
-delete-after: True
-changes: 
-  - rscdel: "You can no longer walk holding shift."