From ff3ea26a3faf7835421202ebbc0ef748cdf74ac2 Mon Sep 17 00:00:00 2001
From: sybil tgstation13 <sybil@tgstation13.org>
Date: Fri, 22 May 2015 02:59:38 -0400
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                | 7 +++++++
 html/changelogs/.all_changelog.yml | 7 +++++++
 html/changelogs/jordie stuff.yml   | 7 -------
 3 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/jordie stuff.yml

diff --git a/html/changelog.html b/html/changelog.html
index 767a97c21b9..4ed0980a784 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">22 May 2015</h2>
+			<h3 class="author">Jordie0608 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Smothering someone with a damp rag when in harm intent will apply reagents onto them, for acid-burning their face; otherwise it will inject them, for drugging with chloral hydrate.</li>
+				<li class="imageadd">The healthdoll is now blue when at full health to make it more clear when a body part is injured.</li>
+			</ul>
+
 			<h2 class="date">20 May 2015</h2>
 			<h3 class="author">xxalpha updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7721b9a3859..144313a37f5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2587,3 +2587,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2015-05-20:
   xxalpha:
   - rscadd: Added three drone shells to the derelict.
+2015-05-22:
+  Jordie0608:
+  - tweak: Smothering someone with a damp rag when in harm intent will apply reagents
+      onto them, for acid-burning their face; otherwise it will inject them, for drugging
+      with chloral hydrate.
+  - imageadd: The healthdoll is now blue when at full health to make it more clear
+      when a body part is injured.
diff --git a/html/changelogs/jordie stuff.yml b/html/changelogs/jordie stuff.yml
deleted file mode 100644
index 316a2b7fc1f..00000000000
--- a/html/changelogs/jordie stuff.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Jordie0608
-
-delete-after: True
-
-changes: 
-  - tweak: "Smothering someone with a damp rag when in harm intent will apply reagents onto them, for acid-burning their face; otherwise it will inject them, for drugging with chloral hydrate."
-  - imageadd: "The healthdoll is now blue when at full health to make it more clear when a body part is injured."
\ No newline at end of file