From de1bc6f3dca4d3015819011cf359052dbd082a28 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 3 Dec 2015 03:41:31 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 13 +++++++++++++
 html/changelogs/.all_changelog.yml         | 11 +++++++++++
 html/changelogs/AutoChangeLog-pr-13358.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-13361.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-13381.yml |  7 -------
 5 files changed, 24 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13358.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13361.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13381.yml

diff --git a/html/changelog.html b/html/changelog.html
index dba46f45dd4..df3be924d52 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,10 +56,23 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">03 December 2015</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Artificers now have feedback when healing other constructs, showing how much health the target has.</li>
+				<li class="tweak">Constructs can move in space.</li>
+				<li class="imageadd">Fixes cult flooring not lining up with normal floors.</li>
+				<li class="imageadd">Fixes a juggernaut back spine not glowing where it should.</li>
+			</ul>
 			<h3 class="author">Swankcookie updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Cakehat now creates light</li>
 			</ul>
+			<h3 class="author">neersighted updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Dominator now shows the correct area name on non-Box maps.</li>
+				<li class="bugfix">Unwrenching atmos pipes is less... nuts...</li>
+				<li class="bugfix">You don't get hopelessly spun when standing on a unwrenched pipe... Don't try it, though.</li>
+			</ul>
 
 			<h2 class="date">02 December 2015</h2>
 			<h3 class="author">GunHog updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 18b9e99d6bd..8956f9b828a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2716,5 +2716,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Nanotrasen is proud to announce that even the dead can use our state of
       the art NanoUI technology.
 2015-12-03:
+  Joan:
+  - rscadd: Artificers now have feedback when healing other constructs, showing how
+      much health the target has.
+  - tweak: Constructs can move in space.
+  - imageadd: Fixes cult flooring not lining up with normal floors.
+  - imageadd: Fixes a juggernaut back spine not glowing where it should.
   Swankcookie:
   - bugfix: Cakehat now creates light
+  neersighted:
+  - bugfix: Dominator now shows the correct area name on non-Box maps.
+  - bugfix: Unwrenching atmos pipes is less... nuts...
+  - bugfix: You don't get hopelessly spun when standing on a unwrenched pipe... Don't
+      try it, though.
diff --git a/html/changelogs/AutoChangeLog-pr-13358.yml b/html/changelogs/AutoChangeLog-pr-13358.yml
deleted file mode 100644
index 2915152955b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13358.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: neersighted
-delete-after: True
-changes: 
-  - bugfix: "Dominator now shows the correct area name on non-Box maps."
diff --git a/html/changelogs/AutoChangeLog-pr-13361.yml b/html/changelogs/AutoChangeLog-pr-13361.yml
deleted file mode 100644
index a6ff7a3e38d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13361.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: neersighted
-delete-after: True
-changes: 
-  - bugfix: "Unwrenching atmos pipes is less... nuts..."
-  - bugfix: "You don't get hopelessly spun when standing on a unwrenched pipe... Don't try it, though."
diff --git a/html/changelogs/AutoChangeLog-pr-13381.yml b/html/changelogs/AutoChangeLog-pr-13381.yml
deleted file mode 100644
index 31f2e598f77..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13381.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - rscadd: "Artificers now have feedback when healing other constructs, showing how much health the target has."
-  - tweak: "Constructs can move in space."
-  - imageadd: "Fixes cult flooring not lining up with normal floors."
-  - imageadd: "Fixes a juggernaut back spine not glowing where it should."