From 10a2fab154e0bad88e45cd9f933ea2ceb97e6138 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Wed, 27 May 2015 17:53:39 +0200
Subject: [PATCH] Generate changelog.

---
 html/changelog.html                 | 15 +++++++++++----
 html/changelogs/.all_changelog.yml  |  4 ++++
 html/changelogs/Zuhayr-pAIScoop.yml |  5 -----
 3 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/Zuhayr-pAIScoop.yml

diff --git a/html/changelog.html b/html/changelog.html
index d5d61dd043e..cfde784c57c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">27 May 2015</h2>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.</li>
+			</ul>
+			<h3 class="author">Zuhayr updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Unfolded pAIs can now be scooped up and worn as hats.</li>
+				<li class="tweak">Scoop-up behavior is now standardized to selecting help intent and dragging their icon onto yours.</li>
+			</ul>
+
 			<h2 class="date">26 May 2015</h2>
 			<h3 class="author">Atlantis updated:</h3>
 			<ul class="changes bgimages16">
@@ -102,10 +113,6 @@
 				<li class="rscadd">Cyborg analyzers now show damage to prosthetic limbs and organs on humans.</li>
 				<li class="tweak">Prosthetic EMP damage was reduced.</li>
 				<li class="tweak">Several organ files were split up/moved around.</li>
-			<h2 class="date">27 May 2015</h2>
-			<h3 class="author">PsiOmegaDelta updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.</li>
 			</ul>
 
 			<h2 class="date">22 May 2015</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c80ec23ec02..ffa438a005c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1907,3 +1907,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   PsiOmegaDelta:
   - tweak: The inactive check process now respects client holder status and can be
       configured how long clients may remain inactive before being kicked.
+  Zuhayr:
+  - rscadd: Unfolded pAIs can now be scooped up and worn as hats.
+  - tweak: Scoop-up behavior is now standardized to selecting help intent and dragging
+      their icon onto yours.
diff --git a/html/changelogs/Zuhayr-pAIScoop.yml b/html/changelogs/Zuhayr-pAIScoop.yml
deleted file mode 100644
index ae728a09520..00000000000
--- a/html/changelogs/Zuhayr-pAIScoop.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Zuhayr
-delete-after: True
-changes: 
-  - rscadd: "Unfolded pAIs can now be scooped up and worn as hats."
-  - tweak: "Scoop-up behavior is now standardized to selecting help intent and dragging their icon onto yours."
\ No newline at end of file