From 2dd49e518e41924c09fc23ef248b07615447f6ae Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Mon, 16 Nov 2015 03:31:25 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 16 ++++++++++++++++
 html/changelogs/.all_changelog.yml         | 18 ++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-12999.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-13026.yml | 13 -------------
 4 files changed, 34 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12999.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13026.yml

diff --git a/html/changelog.html b/html/changelog.html
index 85c1f0e3e66..2c98fd8776e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,22 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">16 November 2015</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Plasmamen can now man the bar.</li>
+				<li class="tweak">Defile no longer directly affects mobs. Instead, it rips up floors and opens most machines and lockers.</li>
+				<li class="rscadd">Blight added. Blight infects humans with a virus that does a set amount of damage over time and is relatively easily cured. Blight also badly affects nonhuman mobs and other living things.</li>
+				<li class="experiment">While the cure to Blight is simple, it's not in this changelog. Use a medical analyzer to find the cure.</li>
+				<li class="tweak">Tweaked costs and stuntimes of abilities;</li>
+				<li class="tweak">Defile now costs 30 essence and stuns for about a second.</li>
+				<li class="tweak">Overload Lights now costs 40 essence.</li>
+				<li class="tweak">Malfunction now costs 45 essence.</li>
+				<li class="rscadd">Blight costs 50 essence and 200 essence to unlock.</li>
+				<li class="imageadd">Transmit has a new, spookier icon.</li>
+				<li class="bugfix">Revenant abilities can be given to non-revenants, and will work as normal spells instead of runtiming.</li>
+			</ul>
+
 			<h2 class="date">15 November 2015</h2>
 			<h3 class="author">CosmicScientist updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index df2f22baf16..56268fcb971 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2410,3 +2410,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Followers are now informed of the location of their god's nexus when it
       is placed
   - tweak: Gods can no longer place structures near the enemy god's nexus
+2015-11-16:
+  Joan:
+  - tweak: Plasmamen can now man the bar.
+  - tweak: Defile no longer directly affects mobs. Instead, it rips up floors and
+      opens most machines and lockers.
+  - rscadd: Blight added. Blight infects humans with a virus that does a set amount
+      of damage over time and is relatively easily cured. Blight also badly affects
+      nonhuman mobs and other living things.
+  - experiment: While the cure to Blight is simple, it's not in this changelog. Use
+      a medical analyzer to find the cure.
+  - tweak: Tweaked costs and stuntimes of abilities;
+  - tweak: Defile now costs 30 essence and stuns for about a second.
+  - tweak: Overload Lights now costs 40 essence.
+  - tweak: Malfunction now costs 45 essence.
+  - rscadd: Blight costs 50 essence and 200 essence to unlock.
+  - imageadd: Transmit has a new, spookier icon.
+  - bugfix: Revenant abilities can be given to non-revenants, and will work as normal
+      spells instead of runtiming.
diff --git a/html/changelogs/AutoChangeLog-pr-12999.yml b/html/changelogs/AutoChangeLog-pr-12999.yml
deleted file mode 100644
index 29a7227d66c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-12999.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - tweak: "Plasmamen can now man the bar."
diff --git a/html/changelogs/AutoChangeLog-pr-13026.yml b/html/changelogs/AutoChangeLog-pr-13026.yml
deleted file mode 100644
index 99eebdd129c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13026.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - tweak: "Defile no longer directly affects mobs. Instead, it rips up floors and opens most machines and lockers."
-  - rscadd: "Blight added. Blight infects humans with a virus that does a set amount of damage over time and is relatively easily cured. Blight also badly affects nonhuman mobs and other living things."
-  - experiment: "While the cure to Blight is simple, it's not in this changelog. Use a medical analyzer to find the cure."
-  - tweak: "Tweaked costs and stuntimes of abilities;"
-  - tweak: "Defile now costs 30 essence and stuns for about a second."
-  - tweak: "Overload Lights now costs 40 essence."
-  - tweak: "Malfunction now costs 45 essence."
-  - rscadd: "Blight costs 50 essence and 200 essence to unlock."
-  - imageadd: "Transmit has a new, spookier icon."
-  - bugfix: "Revenant abilities can be given to non-revenants, and will work as normal spells instead of runtiming."