From 770e22e75e08dd079ba0e6da1b6ce40734b84ab6 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 30 Jan 2016 04:55:47 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 13 +++++++++++++
 html/changelogs/.all_changelog.yml         | 11 +++++++++++
 html/changelogs/AutoChangeLog-pr-14962.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-14996.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-15023.yml |  4 ----
 5 files changed, 24 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14962.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14996.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-15023.yml

diff --git a/html/changelog.html b/html/changelog.html
index 838bbf7d26c..e87e7c89b71 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,10 +56,23 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">30 January 2016</h2>
+			<h3 class="author">Boredone updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Due to an experiment gone wrong, the Research Director's Teleport Armor now causes some mild radiation poisoning on teleportation to the wearer.</li>
+			</ul>
 			<h3 class="author">Francinum updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added two new female underwear styles.</li>
 			</ul>
+			<h3 class="author">Kor updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now use the abandoned white ship as an escape route at round end. This is possible on Box, Meta, and Dream.</li>
+				<li class="rscadd">Added support so that mappers can make any shuttle function as an escape shuttle.</li>
+			</ul>
+			<h3 class="author">MMMiracles updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Three new bra sets have been added for the ladies out there who want to show their patriotism.</li>
+			</ul>
 			<h3 class="author">xxalpha updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Blueprints will now allow the expansion of an existing area by giving its name to a new adjacent area.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 96f5ea92748..4c67ccdca7d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3320,8 +3320,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       causing them to go faster.
   - rscadd: Stuffing people in bins uses clickdrag instead of grab.
 2016-01-30:
+  Boredone:
+  - tweak: Due to an experiment gone wrong, the Research Director's Teleport Armor
+      now causes some mild radiation poisoning on teleportation to the wearer.
   Francinum:
   - rscadd: Added two new female underwear styles.
+  Kor:
+  - rscadd: You can now use the abandoned white ship as an escape route at round end.
+      This is possible on Box, Meta, and Dream.
+  - rscadd: Added support so that mappers can make any shuttle function as an escape
+      shuttle.
+  MMMiracles:
+  - rscadd: Three new bra sets have been added for the ladies out there who want to
+      show their patriotism.
   xxalpha:
   - rscadd: Blueprints will now allow the expansion of an existing area by giving
       its name to a new adjacent area.
diff --git a/html/changelogs/AutoChangeLog-pr-14962.yml b/html/changelogs/AutoChangeLog-pr-14962.yml
deleted file mode 100644
index ab366df1deb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-14962.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Boredone
-delete-after: True
-changes: 
-  - tweak: "Due to an experiment gone wrong, the Research Director's Teleport Armor now causes some mild radiation poisoning on teleportation to the wearer."
diff --git a/html/changelogs/AutoChangeLog-pr-14996.yml b/html/changelogs/AutoChangeLog-pr-14996.yml
deleted file mode 100644
index edd6c428c48..00000000000
--- a/html/changelogs/AutoChangeLog-pr-14996.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Kor
-delete-after: True
-changes: 
-  - rscadd: "You can now use the abandoned white ship as an escape route at round end. This is possible on Box, Meta, and Dream."
-  - rscadd: "Added support so that mappers can make any shuttle function as an escape shuttle."
diff --git a/html/changelogs/AutoChangeLog-pr-15023.yml b/html/changelogs/AutoChangeLog-pr-15023.yml
deleted file mode 100644
index c4510696396..00000000000
--- a/html/changelogs/AutoChangeLog-pr-15023.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: MMMiracles
-delete-after: True
-changes: 
-  - rscadd: "Three new bra sets have been added for the ladies out there who want to show their patriotism."