From 1044d20a2741270797f7f01ecce2aef42f8ee44a Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 10 Jan 2017 17:00:16 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       |  9 +++++++++
 html/changelogs/.all_changelog.yml        | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-6085.yml |  9 ---------
 3 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6085.yml

diff --git a/html/changelog.html b/html/changelog.html
index 78f1439999b..3601610e17a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,6 +65,15 @@
 				<li class="bugfix">Non-respawnable players are no longer prompted to submit a pAI when the opportunity is available</li>
 				<li class="bugfix">Borg sight modules work again</li>
 			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">different alert levels for how full you are from starving all the way to fat</li>
+				<li class="rscadd">There is now satiety and nutrition; being satisfied and full has a number of positive benefits; being unsatisfied and hungry has negative side effects</li>
+				<li class="rscadd">Some foods have vitamins in them which provide little nutrition, but greatly increase your satisfaction</li>
+				<li class="tweak">Some food reagents have had their nutritional values tweaked</li>
+				<li class="tweak">reagent numbers tweaked on most food items</li>
+				<li class="bugfix">Fixes the floral gun not properly working on Diona</li>
+			</ul>
 			<h3 class="author">TullyBurnalot updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Wand of Death now reliably kills people by adding 300 Burn Damage. This includes self-casting</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0d48efa494b..7772296df64 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3299,6 +3299,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Non-respawnable players are no longer prompted to submit a pAI when the
       opportunity is available
   - bugfix: Borg sight modules work again
+  Fox McCloud:
+  - rscadd: different alert levels for how full you are from starving all the way
+      to fat
+  - rscadd: There is now satiety and nutrition; being satisfied and full has a number
+      of positive benefits; being unsatisfied and hungry has negative side effects
+  - rscadd: Some foods have vitamins in them which provide little nutrition, but greatly
+      increase your satisfaction
+  - tweak: Some food reagents have had their nutritional values tweaked
+  - tweak: reagent numbers tweaked on most food items
+  - bugfix: Fixes the floral gun not properly working on Diona
   TullyBurnalot:
   - bugfix: Wand of Death now reliably kills people by adding 300 Burn Damage. This
       includes self-casting
diff --git a/html/changelogs/AutoChangeLog-pr-6085.yml b/html/changelogs/AutoChangeLog-pr-6085.yml
deleted file mode 100644
index 367f6de1320..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6085.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - rscadd: "different alert levels for how full you are from starving all the way to fat"
-  - rscadd: "There is now satiety and nutrition; being satisfied and full has a number of positive benefits; being unsatisfied and hungry has negative side effects"
-  - rscadd: "Some foods have vitamins in them which provide little nutrition, but greatly increase your satisfaction"
-  - tweak: "Some food reagents have had their nutritional values tweaked"
-  - tweak: "reagent numbers tweaked on most food items"
-  - bugfix: "Fixes the floral gun not properly working on Diona"