From a666c23ccc1456e93a579e7ff8d27d5011bd6fd2 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 16 Apr 2016 21:16:51 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 9 +++++++++
 html/changelogs/.all_changelog.yml         | 5 +++++
 html/changelogs/AutoChangeLog-pr-16879.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-16883.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-16900.yml | 4 ----
 5 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16879.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16883.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16900.yml

diff --git a/html/changelog.html b/html/changelog.html
index eb8d16524e7..1fd7ef9b9c6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -83,6 +83,10 @@
 				<li class="rscadd">Geo_Jerkal requested that you be able to mix Arnold Palmers with Tea and Lemon Juice.</li>
 				<li class="rscadd">Tanquetsunami25 requested that cyborg be able to boop.</li>
 			</ul>
+			<h3 class="author">Incoming5643 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed the horrible meme skeletons, please don't sue us.</li>
+			</ul>
 			<h3 class="author">Kor updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adrenals, no slips, surplus crates and SUHTANDOS now have minimum population requirements before they can be purchased.</li>
@@ -109,6 +113,11 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Meth labs can now blow up if you don't purify the ingredients or over-heat the end product.</li>
 			</ul>
+			<h3 class="author">nullbear updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added attack verbs for heart and tongue organs</li>
+				<li class="tweak">Maximum output of air pumps has been raised.</li>
+			</ul>
 
 			<h2 class="date">12 April 2016</h2>
 			<h3 class="author">Incoming5643 updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5e43f6e9216..b63c097de7f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4489,6 +4489,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Geo_Jerkal requested that you be able to mix Arnold Palmers with Tea and
       Lemon Juice.
   - rscadd: Tanquetsunami25 requested that cyborg be able to boop.
+  Incoming5643:
+  - rscdel: Removed the horrible meme skeletons, please don't sue us.
   Kor:
   - rscadd: Adrenals, no slips, surplus crates and SUHTANDOS now have minimum population
       requirements before they can be purchased.
@@ -4516,3 +4518,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   lordpidey:
   - rscadd: Meth labs can now blow up if you don't purify the ingredients or over-heat
       the end product.
+  nullbear:
+  - rscadd: Added attack verbs for heart and tongue organs
+  - tweak: Maximum output of air pumps has been raised.
diff --git a/html/changelogs/AutoChangeLog-pr-16879.yml b/html/changelogs/AutoChangeLog-pr-16879.yml
deleted file mode 100644
index 5a4580ae783..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16879.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: nullbear
-delete-after: True
-changes: 
-  - rscadd: "Added attack verbs for heart and tongue organs"
diff --git a/html/changelogs/AutoChangeLog-pr-16883.yml b/html/changelogs/AutoChangeLog-pr-16883.yml
deleted file mode 100644
index 9fe6e0e0273..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16883.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: nullbear
-delete-after: True
-changes: 
-  - tweak: "Maximum output of air pumps has been raised."
diff --git a/html/changelogs/AutoChangeLog-pr-16900.yml b/html/changelogs/AutoChangeLog-pr-16900.yml
deleted file mode 100644
index 1242a9905c5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16900.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Incoming5643
-delete-after: True
-changes: 
-  - rscdel: "Removed the horrible meme skeletons, please don't sue us."