From 5af35ff53ff3fc58fc3513586117711908b1e104 Mon Sep 17 00:00:00 2001
From: TheDZD <leonardo.o.costa7@gmail.com>
Date: Wed, 6 Jan 2016 15:36:12 -0500
Subject: [PATCH] Updates changelog

---
 html/changelog.html                      | 16 +++++++++++
 html/changelogs/.all_changelog.yml       | 10 +++++++
 html/changelogs/Certhic-PR-3122.yml      |  6 ----
 html/changelogs/Certhic-PR-3136.yml      |  6 ----
 html/changelogs/Crazylemon64-PR-3119.yml | 35 ------------------------
 html/changelogs/Tastyfish-PR-3120.yml    | 35 ------------------------
 html/changelogs/Tastyfish-PR-3132.yml    | 35 ------------------------
 7 files changed, 26 insertions(+), 117 deletions(-)
 delete mode 100644 html/changelogs/Certhic-PR-3122.yml
 delete mode 100644 html/changelogs/Certhic-PR-3136.yml
 delete mode 100644 html/changelogs/Crazylemon64-PR-3119.yml
 delete mode 100644 html/changelogs/Tastyfish-PR-3120.yml
 delete mode 100644 html/changelogs/Tastyfish-PR-3132.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4869aec91da..d0fc040ac51 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,22 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">06 January 2016</h2>
+			<h3 class="author">Certhic updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Corrected some air alarms so that atmos computer can access them</li>
+				<li class="bugfix">Bodyscanner now sees mechanical parts in internal organs</li>
+			</ul>
+			<h3 class="author">Crazylemon64 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Sleeping simple animals should tick down sleeping as normal - deaf simple mobs are no longer a thing</li>
+			</ul>
+			<h3 class="author">Tastyfish updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Instruments now use NanoUI.</li>
+				<li class="spellcheck">Corrected the blueshield mission briefing.</li>
+			</ul>
+
 			<h2 class="date">03 January 2016</h2>
 			<h3 class="author">TheDZD updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 94a90aa89b0..99b75309bef 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3,3 +3,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2016-01-03:
   TheDZD:
   - rscadd: Ports over changelog system from /tg/station.
+2016-01-06:
+  Certhic:
+  - bugfix: Corrected some air alarms so that atmos computer can access them
+  - bugfix: Bodyscanner now sees mechanical parts in internal organs
+  Crazylemon64:
+  - bugfix: Sleeping simple animals should tick down sleeping as normal - deaf simple
+      mobs are no longer a thing
+  Tastyfish:
+  - tweak: Instruments now use NanoUI.
+  - spellcheck: Corrected the blueshield mission briefing.
diff --git a/html/changelogs/Certhic-PR-3122.yml b/html/changelogs/Certhic-PR-3122.yml
deleted file mode 100644
index 2259255f75f..00000000000
--- a/html/changelogs/Certhic-PR-3122.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Certhic
-
-delete-after: True
-
-changes:
-  - bugfix: "Corrected some air alarms so that atmos computer can access them"
diff --git a/html/changelogs/Certhic-PR-3136.yml b/html/changelogs/Certhic-PR-3136.yml
deleted file mode 100644
index feac7e74d52..00000000000
--- a/html/changelogs/Certhic-PR-3136.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Certhic
-
-delete-after: True
-
-changes:
-  - bugfix: "Bodyscanner now sees mechanical parts in internal organs"
diff --git a/html/changelogs/Crazylemon64-PR-3119.yml b/html/changelogs/Crazylemon64-PR-3119.yml
deleted file mode 100644
index 55040c7f45a..00000000000
--- a/html/changelogs/Crazylemon64-PR-3119.yml
+++ /dev/null
@@ -1,35 +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
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
-author: Crazylemon64
-
-# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Sleeping simple animals should tick down sleeping as normal - deaf simple mobs are no longer a thing"
diff --git a/html/changelogs/Tastyfish-PR-3120.yml b/html/changelogs/Tastyfish-PR-3120.yml
deleted file mode 100644
index e5b28e0d983..00000000000
--- a/html/changelogs/Tastyfish-PR-3120.yml
+++ /dev/null
@@ -1,35 +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
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
-author: Tastyfish
-
-# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Instruments now use NanoUI."
\ No newline at end of file
diff --git a/html/changelogs/Tastyfish-PR-3132.yml b/html/changelogs/Tastyfish-PR-3132.yml
deleted file mode 100644
index 88e27ab1992..00000000000
--- a/html/changelogs/Tastyfish-PR-3132.yml
+++ /dev/null
@@ -1,35 +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
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
-author: Tastyfish
-
-# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - spellcheck: "Corrected the blueshield mission briefing."