From d15f8d7c62a95ac4ee8e06d330075eb01beaf2f4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 9 Oct 2018 18:00:50 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.10.09.18.00.50"

---
 html/changelog.html                          |  7 ++++
 html/changelogs/.all_changelog.yml           |  4 +++
 html/changelogs/burgerbb - forcefeed fix.yml | 38 --------------------
 3 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 html/changelogs/burgerbb - forcefeed fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6c0bedcc5c1..3a04e9f544e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">09 October 2018</h2>
+			<h3 class="author">BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed forcefeeding logic in feeding people food.</li>
+				<li class="tweak">Reverted nutrition loss from bloodloss changes to what it was before.</li>
+			</ul>
+
 			<h2 class="date">08 October 2018</h2>
 			<h3 class="author">PoZe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f9f348db7ce..e3de9929463 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6260,3 +6260,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Regular ERT members no longer has access to Admin Shuttle(HAP) blast door
       remote button. ERT commander and CCIA are the only people whose ID has access
       to it.
+2018-10-09:
+  BurgerBB:
+  - bugfix: Fixed forcefeeding logic in feeding people food.
+  - tweak: Reverted nutrition loss from bloodloss changes to what it was before.
diff --git a/html/changelogs/burgerbb - forcefeed fix.yml b/html/changelogs/burgerbb - forcefeed fix.yml
deleted file mode 100644
index a8e2587b3c7..00000000000
--- a/html/changelogs/burgerbb - forcefeed fix.yml	
+++ /dev/null
@@ -1,38 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#################################
-
-# Your name.  
-author: BurgerBB
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Fixed forcefeeding logic in feeding people food."
-  - tweak: "Reverted nutrition loss from bloodloss changes to what it was before."
\ No newline at end of file