From ced3f83bf99be13f14b3617ddb5216c820db00f8 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Mon, 26 Oct 2015 01:05:46 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                   |  4 ++++
 html/changelogs/.all_changelog.yml    |  9 +++++++++
 html/changelogs/Incoming-NERFBOYS.yml | 10 ----------
 3 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/Incoming-NERFBOYS.yml

diff --git a/html/changelog.html b/html/changelog.html
index e18b0547429..18833f7188c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -64,6 +64,10 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">48x48 pixel mode (x1.5 zoom) has been added to the Icons menu (top left). While playing in 32x32 or 64x64 will still provide a clearer looking station, for those of us with resolutions that fall into the gap between the two zooms this can provide a more consistant looking station than stretch to fit.</li>
 				<li class="rscadd">96x96 pixel mode (x3 zoom) has also been added for our players who enjoy looking at spacemen on their 4k monitors at a crisp and consistent scale.</li>
+				<li class="tweak">The lich spell has been subjected to some gentle nerfing. When you die a string of energy will tie your new body to your old body for a short time, aiding others in determining your location. The duration of this beam scales with the number of deaths you've avoided.</li>
+				<li class="tweak">Additionally the post revival stun now also scales in this way.</li>
+				<li class="tweak">The spell will also fail if the item and the wizard don't share the same z level, though the nature of space means the odds of the item (or the wizard) looping around back to the station is pretty high.</li>
+				<li class="rscadd">The spell is still really good.</li>
 			</ul>
 
 			<h2 class="date">25 October 2015</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b427a90f789..3f7e9a763e6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2187,3 +2187,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       this can provide a more consistant looking station than stretch to fit.
   - rscadd: 96x96 pixel mode (x3 zoom) has also been added for our players who enjoy
       looking at spacemen on their 4k monitors at a crisp and consistent scale.
+  - tweak: The lich spell has been subjected to some gentle nerfing. When you die
+      a string of energy will tie your new body to your old body for a short time,
+      aiding others in determining your location. The duration of this beam scales
+      with the number of deaths you've avoided.
+  - tweak: Additionally the post revival stun now also scales in this way.
+  - tweak: The spell will also fail if the item and the wizard don't share the same
+      z level, though the nature of space means the odds of the item (or the wizard)
+      looping around back to the station is pretty high.
+  - rscadd: The spell is still really good.
diff --git a/html/changelogs/Incoming-NERFBOYS.yml b/html/changelogs/Incoming-NERFBOYS.yml
deleted file mode 100644
index 34232aaa1c1..00000000000
--- a/html/changelogs/Incoming-NERFBOYS.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-author: Incoming5643
-
-delete-after: True
-
-changes: 
-  - tweak: "The lich spell has been subjected to some gentle nerfing. When you die a string of energy will tie your new body to your old body for a short time, aiding others in determining your location. The duration of this beam scales with the number of deaths you've avoided."
-  - tweak: "Additionally the post revival stun now also scales in this way."
-  - tweak: "The spell will also fail if the item and the wizard don't share the same z level, though the nature of space means the odds of the item (or the wizard) looping around back to the station is pretty high."
-  - rscadd: "The spell is still really good."
\ No newline at end of file