From 355504dabb9342cb2f2f34fddab38853e73c7c64 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Fri, 18 Nov 2016 15:05:53 -0500
Subject: [PATCH] Changelogs - 18NOV2016

---
 html/changelog.html                      | 11 +++++++
 html/changelogs/.all_changelog.yml       |  7 +++++
 html/changelogs/Bedshaped-PR-1166.yml    |  6 ----
 html/changelogs/Nanako-Animalhealing.yml | 37 ------------------------
 4 files changed, 18 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/Bedshaped-PR-1166.yml
 delete mode 100644 html/changelogs/Nanako-Animalhealing.yml

diff --git a/html/changelog.html b/html/changelog.html
index 11a804af9e7..106dc47c087 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">18 November 2016</h2>
+			<h3 class="author">Bedshaped updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed bitten blood bag message displaying incorrectly.</li>
+			</ul>
+			<h3 class="author">Nanako updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed healing of animals with food, bandages, ointment, and trauma/burn kits. All of these things should work now.</li>
+				<li class="rscadd">Animals will now show if they're wounded upon examination.</li>
+			</ul>
+
 			<h2 class="date">11 November 2016</h2>
 			<h3 class="author">Bedshaped updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 21be99fa33b..6bfc401e327 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3029,3 +3029,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed floor painters being able to be used on non-valid tiles.
   - bugfix: Fixed magnetic locks unable to be damaged and increased their health.
   - tweak: Quietened Bosun's whistle.
+2016-11-18:
+  Bedshaped:
+  - bugfix: Fixed bitten blood bag message displaying incorrectly.
+  Nanako:
+  - bugfix: Fixed healing of animals with food, bandages, ointment, and trauma/burn
+      kits. All of these things should work now.
+  - rscadd: Animals will now show if they're wounded upon examination.
diff --git a/html/changelogs/Bedshaped-PR-1166.yml b/html/changelogs/Bedshaped-PR-1166.yml
deleted file mode 100644
index bb7c89d7deb..00000000000
--- a/html/changelogs/Bedshaped-PR-1166.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Bedshaped
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixed bitten blood bag message displaying incorrectly."
diff --git a/html/changelogs/Nanako-Animalhealing.yml b/html/changelogs/Nanako-Animalhealing.yml
deleted file mode 100644
index 290b2a5c9f8..00000000000
--- a/html/changelogs/Nanako-Animalhealing.yml
+++ /dev/null
@@ -1,37 +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
-#################################
-
-# Your name.  
-author: Nanako
-
-# 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 healing of animals with food, bandages, ointment, and trauma/burn kits. All of these things should work now."
-  - rscadd: "Animals will now show if they're wounded upon examination."