From f759bf23d59cd3ca91977466f207559e8aef0fee Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Mon, 3 Apr 2017 22:45:44 +0300
Subject: [PATCH] Changelogs, 03APR2017

---
 html/changelog.html                  | 11 +++++++++
 html/changelogs/.all_changelog.yml   |  8 +++++++
 html/changelogs/Nanako-Pylonsuck.yml | 36 ----------------------------
 html/changelogs/lohikar-PR-2043.yml  |  5 ----
 4 files changed, 19 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/Nanako-Pylonsuck.yml
 delete mode 100644 html/changelogs/lohikar-PR-2043.yml

diff --git a/html/changelog.html b/html/changelog.html
index 92e1da8fcb5..42567054684 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">03 April 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed a bug where holstering didn't quite work right with tactical armor.</li>
+				<li class="bugfix">Industrial IPC units' eye controller firmware has been upgraded, fixing a bug where a unit's configured eye color would not display.</li>
+			</ul>
+			<h3 class="author">Nanako updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed some issues where creatures being sacrificed to pylons could bug out.</li>
+			</ul>
+
 			<h2 class="date">02 April 2017</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2d980084953..dd19d32d349 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4056,3 +4056,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Industrials now actually have visible eyes.
   - tweak: ERT, CCIA, BSTs, Wizards, and other non-station human-types now no longer
       skip breakfast before arriving at the station.
+2017-04-03:
+  Lohikar:
+  - bugfix: Fixed a bug where holstering didn't quite work right with tactical armor.
+  - bugfix: Industrial IPC units' eye controller firmware has been upgraded, fixing
+      a bug where a unit's configured eye color would not display.
+  Nanako:
+  - bugfix: Fixed some issues where creatures being sacrificed to pylons could bug
+      out.
diff --git a/html/changelogs/Nanako-Pylonsuck.yml b/html/changelogs/Nanako-Pylonsuck.yml
deleted file mode 100644
index 2201c546446..00000000000
--- a/html/changelogs/Nanako-Pylonsuck.yml
+++ /dev/null
@@ -1,36 +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 some issues where creatures being sacrificed to pylons could bug out."
diff --git a/html/changelogs/lohikar-PR-2043.yml b/html/changelogs/lohikar-PR-2043.yml
deleted file mode 100644
index 44e3a7c6f17..00000000000
--- a/html/changelogs/lohikar-PR-2043.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Lohikar
-delete-after: True
-changes: 
-  - bugfix: "Fixed a bug where holstering didn't quite work right with tactical armor."
-  - bugfix: "Industrial IPC units' eye controller firmware has been upgraded, fixing a bug where a unit's configured eye color would not display."