From 3a02ab2db0f01c0b5ef24de07389967e73ef42b2 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Thu, 7 Dec 2017 10:14:36 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 24 ++++++++++++++++
 html/changelogs/.all_changelog.yml         | 32 ++++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-32935.yml | 16 -----------
 html/changelogs/AutoChangeLog-pr-33316.yml |  6 ----
 4 files changed, 56 insertions(+), 22 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-32935.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-33316.yml

diff --git a/html/changelog.html b/html/changelog.html
index 46c2a76a544..f65b262e3aa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,30 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">07 December 2017</h2>
+			<h3 class="author">ShizCalev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Games vending machines can now properly be rebuilt.</li>
+				<li class="bugfix">Games vending machines can now be refilled via supply crates.</li>
+				<li class="rscadd">Games Supply Crates have been added to the cargo console.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added the Eminence role to clockcult! Players can elect themselves or ghosts as the Eminence from the eminence spire structure on Reebe.</li>
+				<li class="rscadd">The Eminence is incorporeal and invisible, and directs the entire cult. Anything they say is heard over the Hierophant network, and they can issue commands by middle-clicking themselves or different turfs.</li>
+				<li class="rscadd">The Eminence also has a single-use mass recall that warps all servants to the Ark chamber.</li>
+				<li class="rscadd">Added traps, triggers, and brass filaments to link them. They can all be constructed from brass sheets, and do different things and trigger in different ways. Current traps include the brass skewer and steam vent, and triggers include the pressure sensor, lever, and repeater.</li>
+				<li class="rscadd">The Eminence can activate trap triggers by clicking on them!</li>
+				<li class="rscadd">Servants can deconstruct traps instantly with a wrench.</li>
+				<li class="rscdel">Mending Mantra has been removed.</li>
+				<li class="tweak">Clockwork scriptures have been recolored and sorted based on their functions; yellow scriptures are for construction, red for offense, blue for defense, and purple for niche.</li>
+				<li class="balance">Servants now spawn with a PDA and black shoes to make disguise more feasible.</li>
+				<li class="balance">The Eminence can superheat up to 20 clockwork walls at a time. Superheated walls are immune to hulk and mech punches, but can still be broken conventionally.</li>
+				<li class="balance">Clockwork walls are slightly faster to build before the Ark activates, taking an extra second less.</li>
+				<li class="bugfix">Poly no longer continually undergoes binary fission when Ratvar is in range.</li>
+				<li class="code_imp">The global records alert for servants will no longer display info that doesn't affect them since the rework.</li>
+			</ul>
+
 			<h2 class="date">06 December 2017</h2>
 			<h3 class="author">Dax Dupont & Alek2ander updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 778c1652b12..39ac630d40c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14155,3 +14155,35 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   coiax:
   - rscadd: The drone dispenser on Metastation has been moved to the maintenance by
       Robotics.
+2017-12-07:
+  ShizCalev:
+  - bugfix: Games vending machines can now properly be rebuilt.
+  - bugfix: Games vending machines can now be refilled via supply crates.
+  - rscadd: Games Supply Crates have been added to the cargo console.
+  Xhuis:
+  - rscadd: Added the Eminence role to clockcult! Players can elect themselves or
+      ghosts as the Eminence from the eminence spire structure on Reebe.
+  - rscadd: The Eminence is incorporeal and invisible, and directs the entire cult.
+      Anything they say is heard over the Hierophant network, and they can issue commands
+      by middle-clicking themselves or different turfs.
+  - rscadd: The Eminence also has a single-use mass recall that warps all servants
+      to the Ark chamber.
+  - rscadd: Added traps, triggers, and brass filaments to link them. They can all
+      be constructed from brass sheets, and do different things and trigger in different
+      ways. Current traps include the brass skewer and steam vent, and triggers include
+      the pressure sensor, lever, and repeater.
+  - rscadd: The Eminence can activate trap triggers by clicking on them!
+  - rscadd: Servants can deconstruct traps instantly with a wrench.
+  - rscdel: Mending Mantra has been removed.
+  - tweak: Clockwork scriptures have been recolored and sorted based on their functions;
+      yellow scriptures are for construction, red for offense, blue for defense, and
+      purple for niche.
+  - balance: Servants now spawn with a PDA and black shoes to make disguise more feasible.
+  - balance: The Eminence can superheat up to 20 clockwork walls at a time. Superheated
+      walls are immune to hulk and mech punches, but can still be broken conventionally.
+  - balance: Clockwork walls are slightly faster to build before the Ark activates,
+      taking an extra second less.
+  - bugfix: Poly no longer continually undergoes binary fission when Ratvar is in
+      range.
+  - code_imp: The global records alert for servants will no longer display info that
+      doesn't affect them since the rework.
diff --git a/html/changelogs/AutoChangeLog-pr-32935.yml b/html/changelogs/AutoChangeLog-pr-32935.yml
deleted file mode 100644
index 7539b323a81..00000000000
--- a/html/changelogs/AutoChangeLog-pr-32935.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-author: "Xhuis"
-delete-after: True
-changes: 
-  - rscadd: "Added the Eminence role to clockcult! Players can elect themselves or ghosts as the Eminence from the eminence spire structure on Reebe."
-  - rscadd: "The Eminence is incorporeal and invisible, and directs the entire cult. Anything they say is heard over the Hierophant network, and they can issue commands by middle-clicking themselves or different turfs."
-  - rscadd: "The Eminence also has a single-use mass recall that warps all servants to the Ark chamber."
-  - rscadd: "Added traps, triggers, and brass filaments to link them. They can all be constructed from brass sheets, and do different things and trigger in different ways. Current traps include the brass skewer and steam vent, and triggers include the pressure sensor, lever, and repeater."
-  - rscadd: "The Eminence can activate trap triggers by clicking on them!"
-  - rscadd: "Servants can deconstruct traps instantly with a wrench."
-  - rscdel: "Mending Mantra has been removed."
-  - tweak: "Clockwork scriptures have been recolored and sorted based on their functions; yellow scriptures are for construction, red for offense, blue for defense, and purple for niche."
-  - balance: "Servants now spawn with a PDA and black shoes to make disguise more feasible."
-  - balance: "The Eminence can superheat up to 20 clockwork walls at a time. Superheated walls are immune to hulk and mech punches, but can still be broken conventionally."
-  - balance: "Clockwork walls are slightly faster to build before the Ark activates, taking an extra second less."
-  - bugfix: "Poly no longer continually undergoes binary fission when Ratvar is in range."
-  - code_imp: "The global records alert for servants will no longer display info that doesn't affect them since the rework."
diff --git a/html/changelogs/AutoChangeLog-pr-33316.yml b/html/changelogs/AutoChangeLog-pr-33316.yml
deleted file mode 100644
index cdfa4c7c0ba..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33316.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes: 
-  - bugfix: "Games vending machines can now properly be rebuilt."
-  - bugfix: "Games vending machines can now be refilled via supply crates."
-  - rscadd: "Games Supply Crates have been added to the cargo console."