From 9127d07b4edcae372dbfecd6f4e72e0f21c118ef Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 5 Feb 2017 05:40:10 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 16 ++++++++++++++++
 html/changelogs/.all_changelog.yml        | 20 ++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-6236.yml | 16 ----------------
 3 files changed, 36 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6236.yml

diff --git a/html/changelog.html b/html/changelog.html
index a85680fcc94..332bc3e6ddf 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,6 +60,22 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Brings unholy water in line with its description.</li>
 			</ul>
+			<h3 class="author">Fox McCloud and Core0verload updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Dramatically overhauls the botany system; features more user friendly gene modification methods, more control over attributes and reagents in your plants, and more</li>
+				<li class="rscadd">Adds in drying rack for drying growns for smoking with rolled papers</li>
+				<li class="tweak">Store spare seeds in the seed extractor</li>
+				<li class="rscadd">Adds in cloth; make clothing, satchels, backpacks, duffelbags and more.</li>
+				<li class="tweak">Upgrading hydroponics trays impacts how quickly plants degrade</li>
+				<li class="tweak">Bees slightly more effective at increasing plant yields</li>
+				<li class="tweak">Overall growth rate of plants dramatically increased</li>
+				<li class="rscadd">Adds in the ability to construct bonfires with wooden logs; perfect for keeping you our your fellow spessman warm---forever</li>
+				<li class="rscadd">Adds in a few new bartender drinks and recipes, such as chocolate pudding, vanilla pudding, and pumpkin spice</li>
+				<li class="tweak">Can now wear some flowers/ambrosia in your hair</li>
+				<li class="tweak">Combining genes form different plants has unique effects (For instance, the battery gene with the recharging gene allows you to make insanely potent batteries)</li>
+				<li class="tweak">Vines are now purely handled by the Kudzu plant</li>
+				<li class="tweak">Botanists have been given morgue access</li>
+			</ul>
 			<h3 class="author">Ported by Markolie, developed by KorPhaeron and others from /tg/. The Hierophant was developed by ChangelingRain. updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Megafauna and their rewards have been added to the code. These are not on the map yet.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2d6d1264eff..991f3e1ff7c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3475,6 +3475,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-02-05:
   Fethas:
   - tweak: Brings unholy water in line with its description.
+  Fox McCloud and Core0verload:
+  - rscadd: Dramatically overhauls the botany system; features more user friendly
+      gene modification methods, more control over attributes and reagents in your
+      plants, and more
+  - rscadd: Adds in drying rack for drying growns for smoking with rolled papers
+  - tweak: Store spare seeds in the seed extractor
+  - rscadd: Adds in cloth; make clothing, satchels, backpacks, duffelbags and more.
+  - tweak: Upgrading hydroponics trays impacts how quickly plants degrade
+  - tweak: Bees slightly more effective at increasing plant yields
+  - tweak: Overall growth rate of plants dramatically increased
+  - rscadd: Adds in the ability to construct bonfires with wooden logs; perfect for
+      keeping you our your fellow spessman warm---forever
+  - rscadd: Adds in a few new bartender drinks and recipes, such as chocolate pudding,
+      vanilla pudding, and pumpkin spice
+  - tweak: Can now wear some flowers/ambrosia in your hair
+  - tweak: Combining genes form different plants has unique effects (For instance,
+      the battery gene with the recharging gene allows you to make insanely potent
+      batteries)
+  - tweak: Vines are now purely handled by the Kudzu plant
+  - tweak: Botanists have been given morgue access
   Ported by Markolie, developed by KorPhaeron and others from /tg/. The Hierophant was developed by ChangelingRain.:
   - rscadd: Megafauna and their rewards have been added to the code. These are not
       on the map yet.
diff --git a/html/changelogs/AutoChangeLog-pr-6236.yml b/html/changelogs/AutoChangeLog-pr-6236.yml
deleted file mode 100644
index 5e1852376f3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6236.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-author: "Fox McCloud and Core0verload"
-delete-after: True
-changes: 
-  - rscadd: "Dramatically overhauls the botany system; features more user friendly gene modification methods, more control over attributes and reagents in your plants, and more"
-  - rscadd: "Adds in drying rack for drying growns for smoking with rolled papers"
-  - tweak: "Store spare seeds in the seed extractor"
-  - rscadd: "Adds in cloth; make clothing, satchels, backpacks, duffelbags and more."
-  - tweak: "Upgrading hydroponics trays impacts how quickly plants degrade"
-  - tweak: "Bees slightly more effective at increasing plant yields"
-  - tweak: "Overall growth rate of plants dramatically increased"
-  - rscadd: "Adds in the ability to construct bonfires with wooden logs; perfect for keeping you our your fellow spessman warm---forever"
-  - rscadd: "Adds in a few new bartender drinks and recipes, such as chocolate pudding, vanilla pudding, and pumpkin spice"
-  - tweak: "Can now wear some flowers/ambrosia in your hair"
-  - tweak: "Combining genes form different plants has unique effects (For instance, the battery gene with the recharging gene allows you to make insanely potent batteries)"
-  - tweak: "Vines are now purely handled by the Kudzu plant"
-  - tweak: "Botanists have been given morgue access"