From 48a5cdf4fbfabe26e37c3e82570f6ad727e0e477 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Sun, 25 Sep 2016 09:43:48 -0400
Subject: [PATCH] Changelogs - 25SEP2016

---
 html/changelog.html                  | 11 +++++++++
 html/changelogs/.all_changelog.yml   | 10 ++++++++
 html/changelogs/Nanako-Borgfixes.yml | 37 ----------------------------
 html/changelogs/Skull132-rules.yml   | 12 ---------
 4 files changed, 21 insertions(+), 49 deletions(-)
 delete mode 100644 html/changelogs/Nanako-Borgfixes.yml
 delete mode 100644 html/changelogs/Skull132-rules.yml

diff --git a/html/changelog.html b/html/changelog.html
index 63120c49a61..1d61847e13a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 September 2016</h2>
+			<h3 class="author">Nanako updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added several new items to research and engineering grippers, allows research borgs to build some bots and work in xenoflora. Engineering units can make motion sensing cameras. Also added some small items to research module to assist in robotics/xenoflora, and a rollingpin+knife to the service borg for kitchen work.</li>
+				<li class="bugfix">Fixed borgs being unable to set transfer amount on beakers. Beakers can now be alt-clicked to set the transfer amount, including when held in a gripper.</li>
+			</ul>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Rules viewport enlarged, to make space for the prettier rules formatting.</li>
+			</ul>
+
 			<h2 class="date">21 September 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 eb1606f10fc..ea2459d6a10 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2837,3 +2837,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed Diona Nymphs not having vision while ventcrawling.
   - bugfix: 'Thanks Zuhayr: Fixed behaviour where interacting with some atmos machinery
       caused you to pseudo ventcrawl.'
+2016-09-25:
+  Nanako:
+  - rscadd: Added several new items to research and engineering grippers, allows research
+      borgs to build some bots and work in xenoflora. Engineering units can make motion
+      sensing cameras. Also added some small items to research module to assist in
+      robotics/xenoflora, and a rollingpin+knife to the service borg for kitchen work.
+  - bugfix: Fixed borgs being unable to set transfer amount on beakers. Beakers can
+      now be alt-clicked to set the transfer amount, including when held in a gripper.
+  Skull132:
+  - tweak: Rules viewport enlarged, to make space for the prettier rules formatting.
diff --git a/html/changelogs/Nanako-Borgfixes.yml b/html/changelogs/Nanako-Borgfixes.yml
deleted file mode 100644
index 6ea2797f3d7..00000000000
--- a/html/changelogs/Nanako-Borgfixes.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: 
-  - rscadd: "Added several new items to research and engineering grippers, allows research borgs to build some bots and work in xenoflora. Engineering units can make motion sensing cameras. Also added some small items to research module to assist in robotics/xenoflora, and a rollingpin+knife to the service borg for kitchen work."
-  - bugfix: "Fixed borgs being unable to set transfer amount on beakers. Beakers can now be alt-clicked to set the transfer amount, including when held in a gripper."
diff --git a/html/changelogs/Skull132-rules.yml b/html/changelogs/Skull132-rules.yml
deleted file mode 100644
index e7ad07b1868..00000000000
--- a/html/changelogs/Skull132-rules.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-author: Skull132
-
-# 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:
-  - tweak: "Rules viewport enlarged, to make space for the prettier rules formatting."