From 7bc2f5e0d508f58f678b14bd89af64767be99d9e Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Fri, 25 Nov 2016 00:28:02 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 38 +++++++++-------------
 html/changelogs/.all_changelog.yml         | 15 +++++++++
 html/changelogs/AutoChangeLog-pr-21646.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-21647.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-21689.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-21690.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-21699.yml |  4 ---
 7 files changed, 31 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21646.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21647.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21689.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21690.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-21699.yml

diff --git a/html/changelog.html b/html/changelog.html
index a6db59eac1a..c3cbf72252b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,22 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 November 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Clockcult AIs with borgs 'slaved' to them will convert them when hacking via the robotics console.</li>
+				<li class="experiment">Replaced the "No Cache" alert with an alert that will show what you need for the next tier of scripture.</li>
+			</ul>
+			<h3 class="author">Kor updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The captain may now purchase an unfinished shuttle chassis, which will dock immediately when bought, but will not launch until the end of the regular shuttle call procedure. The shuttle is empty and devoid of atmosphere however, so you'll need to do some work on it if you want a safe trip home.</li>
+			</ul>
+			<h3 class="author">Shadowlight213 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The activation button for the AI integrity restorer modular program actually works now!</li>
+				<li class="rscdel">The cortical borer event is now admin only</li>
+			</ul>
+
 			<h2 class="date">24 November 2016</h2>
 			<h3 class="author">Kor updated:</h3>
 			<ul class="changes bgimages16">
@@ -1095,28 +1111,6 @@
 				<li class="tweak">Changes cursed heart description to something slightly more clear.</li>
 				<li class="bugfix">Fixes a capitalization issue</li>
 			</ul>
-
-			<h2 class="date">23 September 2016</h2>
-			<h3 class="author">Cyberboss updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Wire layouts of NanoTransen devices for the round can now be found in the Station Blueprints</li>
-			</ul>
-			<h3 class="author">Incoming5643 + WJohnston updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Lizard sprites have received an overhaul, sprites courtesy of WJohnston!</li>
-				<li class="rscdel">While there are some new bits, a few old bits have gone by the wayside, if your lizard has been affected by this the specific feature will be randomized until you pick a new setting.</li>
-				<li class="rscadd">Lizards can now choose to have digitigrade legs (those weird backwards bending ones). Keep in mind that they can only be properly seen in rather short pants. They also preclude the use of shoes. By default no lizard will have these legs, you have to opt in.</li>
-				<li class="rscadd">All ash walker lizards however are forced to have these legs.</li>
-				<li class="experiment">There is absolutely no tactical benefits to using digitigrade legs, you are only crippling yourself if you use them.</li>
-			</ul>
-			<h3 class="author">Papa Bones updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">You can now quick-draw the officer's sabre from its sheath by alt-clicking it.</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Holy Water no longer leaves you stuttering for years.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 111ea6bf7b0..47d94f5a18c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8076,3 +8076,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscdel: Multiverse sword is no longer buyable by wizards
   erwgd:
   - rscadd: Plasmamen get their own random names.
+2016-11-25:
+  Joan:
+  - rscadd: Clockcult AIs with borgs 'slaved' to them will convert them when hacking
+      via the robotics console.
+  - experiment: Replaced the "No Cache" alert with an alert that will show what you
+      need for the next tier of scripture.
+  Kor:
+  - rscadd: The captain may now purchase an unfinished shuttle chassis, which will
+      dock immediately when bought, but will not launch until the end of the regular
+      shuttle call procedure. The shuttle is empty and devoid of atmosphere however,
+      so you'll need to do some work on it if you want a safe trip home.
+  Shadowlight213:
+  - bugfix: The activation button for the AI integrity restorer modular program actually
+      works now!
+  - rscdel: The cortical borer event is now admin only
diff --git a/html/changelogs/AutoChangeLog-pr-21646.yml b/html/changelogs/AutoChangeLog-pr-21646.yml
deleted file mode 100644
index b0ff4b2d2c7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21646.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscadd: "Clockcult AIs with borgs 'slaved' to them will convert them when hacking via the robotics console."
diff --git a/html/changelogs/AutoChangeLog-pr-21647.yml b/html/changelogs/AutoChangeLog-pr-21647.yml
deleted file mode 100644
index 0f494452b80..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21647.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kor"
-delete-after: True
-changes: 
-  - rscadd: "The captain may now purchase an unfinished shuttle chassis, which will dock immediately when bought, but will not launch until the end of the regular shuttle call procedure. The shuttle is empty and devoid of atmosphere however, so you'll need to do some work on it if you want a safe trip home."
diff --git a/html/changelogs/AutoChangeLog-pr-21689.yml b/html/changelogs/AutoChangeLog-pr-21689.yml
deleted file mode 100644
index 1b021723cbc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21689.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - experiment: "Replaced the \"No Cache\" alert with an alert that will show what you need for the next tier of scripture."
diff --git a/html/changelogs/AutoChangeLog-pr-21690.yml b/html/changelogs/AutoChangeLog-pr-21690.yml
deleted file mode 100644
index c30f6beceed..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21690.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Shadowlight213"
-delete-after: True
-changes: 
-  - bugfix: "The activation button for the AI integrity restorer modular program actually works now!"
diff --git a/html/changelogs/AutoChangeLog-pr-21699.yml b/html/changelogs/AutoChangeLog-pr-21699.yml
deleted file mode 100644
index 956935ae6dd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21699.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Shadowlight213"
-delete-after: True
-changes: 
-  - rscdel: "The cortical borer event is now admin only"