From bab5637520b738b2583ba229b4e0705abe2d0854 Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant2@gmail.com>
Date: Fri, 20 May 2016 22:40:57 -0700
Subject: [PATCH] CHANGELOG MATES

---
 html/changelog.html                       | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 11 +++++++++++
 html/changelogs/AutoChangeLog-pr-4433.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4438.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4458.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4464.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4465.yml |  4 ----
 7 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4433.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4438.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4458.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4464.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4465.yml

diff --git a/html/changelog.html b/html/changelog.html
index 00c5ed89885..0930debbc21 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,25 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">20 May 2016</h2>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Chaplains being able to be vampires</li>
+				<li class="bugfix">Cryopods will now always display the occupant's name</li>
+			</ul>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes a runtime with Dioneae by repathing their limbs.</li>
+			</ul>
+			<h3 class="author">QuinnAggeler updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Makes dehydrated space carp description more accurate and informative</li>
+			</ul>
+			<h3 class="author">monster860 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds the permanent teleporter. Use the circuitboard on a teleporter hub to set the target before constructing it.</li>
+			</ul>
+
 			<h2 class="date">17 May 2016</h2>
 			<h3 class="author">AugRob updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3a4d178d4fb..a8361706d21 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1518,3 +1518,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   monster860:
   - bugfix: Fixes sleep() in telecomms
   - rscadd: Windows can now be constructed and deconstructed using RCD's.
+2016-05-20:
+  Fox McCloud:
+  - bugfix: Fixes Chaplains being able to be vampires
+  - bugfix: Cryopods will now always display the occupant's name
+  KasparoVy:
+  - bugfix: Fixes a runtime with Dioneae by repathing their limbs.
+  QuinnAggeler:
+  - bugfix: Makes dehydrated space carp description more accurate and informative
+  monster860:
+  - rscadd: Adds the permanent teleporter. Use the circuitboard on a teleporter hub
+      to set the target before constructing it.
diff --git a/html/changelogs/AutoChangeLog-pr-4433.yml b/html/changelogs/AutoChangeLog-pr-4433.yml
deleted file mode 100644
index dc4c338b220..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4433.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: monster860
-delete-after: True
-changes: 
-  - rscadd: "Adds the permanent teleporter. Use the circuitboard on a teleporter hub to set the target before constructing it."
diff --git a/html/changelogs/AutoChangeLog-pr-4438.yml b/html/changelogs/AutoChangeLog-pr-4438.yml
deleted file mode 100644
index d7241afb491..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4438.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: QuinnAggeler
-delete-after: True
-changes: 
-  - bugfix: "Makes dehydrated space carp description more accurate and informative"
diff --git a/html/changelogs/AutoChangeLog-pr-4458.yml b/html/changelogs/AutoChangeLog-pr-4458.yml
deleted file mode 100644
index dedcc4c9598..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4458.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: KasparoVy
-delete-after: True
-changes: 
-  - bugfix: "Fixes a runtime with Dioneae by repathing their limbs."
diff --git a/html/changelogs/AutoChangeLog-pr-4464.yml b/html/changelogs/AutoChangeLog-pr-4464.yml
deleted file mode 100644
index 1bc7198e001..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4464.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes: 
-  - bugfix: "Fixes Chaplains being able to be vampires"
diff --git a/html/changelogs/AutoChangeLog-pr-4465.yml b/html/changelogs/AutoChangeLog-pr-4465.yml
deleted file mode 100644
index a0f6d53904f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4465.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes: 
-  - bugfix: "Cryopods will now always display the occupant's name"