From f6cca01bc9cc5934ea14707971019eedb8cd0301 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 9 Mar 2017 22:00:14 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 11 +++++++++++
 html/changelogs/.all_changelog.yml        | 11 +++++++++++
 html/changelogs/AutoChangeLog-pr-6678.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-6711.yml |  5 -----
 4 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6678.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6711.yml

diff --git a/html/changelog.html b/html/changelog.html
index d13d886de36..6f43af9d99b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">09 March 2017</h2>
+			<h3 class="author">Crazylemon64 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds an "ethereal beacon", an admin-only structure usable to attract ghosts to an area.</li>
+				<li class="rscadd">Adds several transformer machines to streamline the ghost-to-PC process.</li>
+			</ul>
+			<h3 class="author">LordJike updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Space Fries are now made by deep-frying potato wedges instead of processing them.</li>
+				<li class="rscadd">Introducing carrots inside the food processor gives you carrot wedges now.</li>
+				<li class="tweak">Now you can make carrot fries by deep-frying carrot wedges instead of formerly processing the whole carrots.</li>
+			</ul>
 			<h3 class="author">Markolie updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Tools now have a "usesound" and "toolspeed" variable which allows different tool (levels) to have different sounds and speeds.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 92654fb69a1..c272cbcb925 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4004,6 +4004,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   uraniummeltdown:
   - rscadd: Wizard Hardsuit helmet and suit now have inhand sprites
 2017-03-09:
+  Crazylemon64:
+  - rscadd: Adds an "ethereal beacon", an admin-only structure usable to attract ghosts
+      to an area.
+  - rscadd: Adds several transformer machines to streamline the ghost-to-PC process.
+  LordJike:
+  - tweak: Space Fries are now made by deep-frying potato wedges instead of processing
+      them.
+  - rscadd: Introducing carrots inside the food processor gives you carrot wedges
+      now.
+  - tweak: Now you can make carrot fries by deep-frying carrot wedges instead of formerly
+      processing the whole carrots.
   Markolie:
   - tweak: Tools now have a "usesound" and "toolspeed" variable which allows different
       tool (levels) to have different sounds and speeds.
diff --git a/html/changelogs/AutoChangeLog-pr-6678.yml b/html/changelogs/AutoChangeLog-pr-6678.yml
deleted file mode 100644
index 328635a1086..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6678.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "LordJike"
-delete-after: True
-changes: 
-  - tweak: "Space Fries are now made by deep-frying potato wedges instead of processing them."
-  - rscadd: "Introducing carrots inside the food processor gives you carrot wedges now."
-  - tweak: "Now you can make carrot fries by deep-frying carrot wedges instead of formerly processing the whole carrots."
diff --git a/html/changelogs/AutoChangeLog-pr-6711.yml b/html/changelogs/AutoChangeLog-pr-6711.yml
deleted file mode 100644
index 328c7b5e797..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6711.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Crazylemon64"
-delete-after: True
-changes: 
-  - rscadd: "Adds an \"ethereal beacon\", an admin-only structure usable to attract ghosts to an area."
-  - rscadd: "Adds several transformer machines to streamline the ghost-to-PC process."