From 67399dcf635dca34616aeff62ef3edc1795e599b Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Tue, 14 Jul 2015 08:12:29 +0200
Subject: [PATCH] Updates changelog.

---
 html/changelog.html                            | 11 +++++++++++
 html/changelogs/.all_changelog.yml             |  7 +++++++
 html/changelogs/HarpyEagle-decacode.yml        | 18 ------------------
 .../PsiOmegaDelta-SolidTeleportation.yml       |  5 -----
 4 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 html/changelogs/HarpyEagle-decacode.yml
 delete mode 100644 html/changelogs/PsiOmegaDelta-SolidTeleportation.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8e35f57b965..b1fb843f989 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">14 July 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes wrong information being reported when analyzing locked abandoned crates with a multitool.</li>
+			</ul>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Ninjas can no longer teleport unto turfs that contain solid objects.</li>
+				<li class="tweak">Wizards can no longer etheral jaunt unto turfs that contain solid objects.</li>
+			</ul>
+
 			<h2 class="date">11 July 2015</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 269e5ecf87a..b30d3cebf5b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1968,3 +1968,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Turrets no longer burn holes through the AI.
   - tweak: Projectiles now have a chance of hitting mobs riding cargo trains.
   - bugfix: Fixed visual bugs with projectile effects.
+2015-07-14:
+  HarpyEagle:
+  - bugfix: Fixes wrong information being reported when analyzing locked abandoned
+      crates with a multitool.
+  PsiOmegaDelta:
+  - tweak: Ninjas can no longer teleport unto turfs that contain solid objects.
+  - tweak: Wizards can no longer etheral jaunt unto turfs that contain solid objects.
diff --git a/html/changelogs/HarpyEagle-decacode.yml b/html/changelogs/HarpyEagle-decacode.yml
deleted file mode 100644
index b16cfc3b8d0..00000000000
--- a/html/changelogs/HarpyEagle-decacode.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-
-author: HarpyEagle
-delete-after: True
-
-changes: 
-  - bugfix: "Fixes wrong information being reported when analyzing locked abandoned crates with a multitool."
diff --git a/html/changelogs/PsiOmegaDelta-SolidTeleportation.yml b/html/changelogs/PsiOmegaDelta-SolidTeleportation.yml
deleted file mode 100644
index 204fabbbaa1..00000000000
--- a/html/changelogs/PsiOmegaDelta-SolidTeleportation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: PsiOmegaDelta
-changes:
-  - tweak: "Ninjas can no longer teleport unto turfs that contain solid objects."
-  - tweak: "Wizards can no longer etheral jaunt unto turfs that contain solid objects."
-delete-after: true