From 8277f28f2f8cb2301764665e4d482b67ba1f0dcb Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Sat, 29 Apr 2017 01:30:42 +0300
Subject: [PATCH] Changelogs, 28APR2017

---
 html/changelog.html                  | 12 +++++++++
 html/changelogs/.all_changelog.yml   |  9 +++++++
 html/changelogs/Lordfowl - Lobos.yml | 37 ----------------------------
 html/changelogs/lohikar-fox.yml      |  5 ----
 4 files changed, 21 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/Lordfowl - Lobos.yml
 delete mode 100644 html/changelogs/lohikar-fox.yml

diff --git a/html/changelog.html b/html/changelog.html
index 20551010480..f5ef44ab3a1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">29 April 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed an issue where Chauncey's name was not set correctly.</li>
+				<li class="spellcheck">Tweaked the grammar of fox and corgi vocalizations slightly.</li>
+			</ul>
+			<h3 class="author">LordFowl updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Lobotomy is now a surgical operation. Dislocated brains can also be lobotomized. Lobotomy will permanently damage the brain and remove a target's memories.</li>
+				<li class="tweak">Placing a brain into an MMI will require a lobotomy to be performed on the brain first.</li>
+			</ul>
+
 			<h2 class="date">19 April 2017</h2>
 			<h3 class="author">Ccomp5950 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2f103c25b13..e6e935a7d75 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4136,3 +4136,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Objects in bags and other containers (including your hands and pocket)
       will now hear speach again.  This impacts radios, explosive implants, and the
       universal recorder.
+2017-04-29:
+  Lohikar:
+  - bugfix: Fixed an issue where Chauncey's name was not set correctly.
+  - spellcheck: Tweaked the grammar of fox and corgi vocalizations slightly.
+  LordFowl:
+  - rscadd: Lobotomy is now a surgical operation. Dislocated brains can also be lobotomized.
+      Lobotomy will permanently damage the brain and remove a target's memories.
+  - tweak: Placing a brain into an MMI will require a lobotomy to be performed on
+      the brain first.
diff --git a/html/changelogs/Lordfowl - Lobos.yml b/html/changelogs/Lordfowl - Lobos.yml
deleted file mode 100644
index 33ffdaa2e07..00000000000
--- a/html/changelogs/Lordfowl - Lobos.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: LordFowl
-
-# 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: 
-  - rscadd: "Lobotomy is now a surgical operation. Dislocated brains can also be lobotomized. Lobotomy will permanently damage the brain and remove a target's memories."
-  - tweak: "Placing a brain into an MMI will require a lobotomy to be performed on the brain first."
diff --git a/html/changelogs/lohikar-fox.yml b/html/changelogs/lohikar-fox.yml
deleted file mode 100644
index 8ea41b57b97..00000000000
--- a/html/changelogs/lohikar-fox.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Lohikar
-delete-after: True
-changes: 
-  - bugfix: "Fixed an issue where Chauncey's name was not set correctly."
-  - spellcheck: "Tweaked the grammar of fox and corgi vocalizations slightly."