From 5ca0351a8bc970b074eb1c3eb4cd22798e5d6da6 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Fri, 27 Nov 2015 10:57:48 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml         | 14 ++++++++++++++
 html/changelogs/AutoChangeLog-pr-13102.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-13205.yml |  4 ----
 4 files changed, 28 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13102.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13205.yml

diff --git a/html/changelog.html b/html/changelog.html
index 47072d0817a..adbb1719a19 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,20 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">27 November 2015</h2>
+			<h3 class="author">JJRcop updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Restores golem shock immunity.</li>
+			</ul>
+			<h3 class="author">bgobandit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Due to changes in Nanotrasen's mining supply chain, ore redemption machines now offer a variety of upgraded items! However, certain items are more expensive. Point values for minerals have been adjusted to reflect their scarcity.</li>
+				<li class="rscadd">Nanotrasen R&D has discovered how to improve upon the resonator and kinetic accelerator.</li>
+				<li class="rscadd">After a colossal tectonic event on Nanotrasen's asteroid, ores are distributed more randomly.</li>
+				<li class="rscadd">Bluespace crystals have been discovered to be ore. They will now fit into satchels and ore boxes.</li>
+				<li class="rscadd">Mech advanced mining scanners now include meson functionality.</li>
+			</ul>
+
 			<h2 class="date">26 November 2015</h2>
 			<h3 class="author">neersighted updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0dd36f9defc..7f534221d0e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2567,3 +2567,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       was a blouse basically
   - tweak: Made the skirt on the blue/red skirts less blocky,
   - tweak: Made the striped dress consistent at every direction
+2015-11-27:
+  JJRcop:
+  - bugfix: Restores golem shock immunity.
+  bgobandit:
+  - rscadd: Due to changes in Nanotrasen's mining supply chain, ore redemption machines
+      now offer a variety of upgraded items! However, certain items are more expensive.
+      Point values for minerals have been adjusted to reflect their scarcity.
+  - rscadd: Nanotrasen R&D has discovered how to improve upon the resonator and kinetic
+      accelerator.
+  - rscadd: After a colossal tectonic event on Nanotrasen's asteroid, ores are distributed
+      more randomly.
+  - rscadd: Bluespace crystals have been discovered to be ore. They will now fit into
+      satchels and ore boxes.
+  - rscadd: Mech advanced mining scanners now include meson functionality.
diff --git a/html/changelogs/AutoChangeLog-pr-13102.yml b/html/changelogs/AutoChangeLog-pr-13102.yml
deleted file mode 100644
index 02491f51e91..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13102.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: bgobandit
-delete-after: True
-changes: 
-  - rscadd: "Due to changes in Nanotrasen's mining supply chain, ore redemption machines now offer a variety of upgraded items! However, certain items are more expensive. Point values for minerals have been adjusted to reflect their scarcity."
-  - rscadd: "Nanotrasen R&D has discovered how to improve upon the resonator and kinetic accelerator."
-  - rscadd: "After a colossal tectonic event on Nanotrasen's asteroid, ores are distributed more randomly."
-  - rscadd: "Bluespace crystals have been discovered to be ore. They will now fit into satchels and ore boxes."
-  - rscadd: "Mech advanced mining scanners now include meson functionality."
diff --git a/html/changelogs/AutoChangeLog-pr-13205.yml b/html/changelogs/AutoChangeLog-pr-13205.yml
deleted file mode 100644
index fa88a0b79f0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13205.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: JJRcop
-delete-after: True
-changes: 
-  - bugfix: "Restores golem shock immunity."