From 454d5731fbf3809f4356079bcdfcbbe79f5fe5c8 Mon Sep 17 00:00:00 2001
From: TheDZD <leonardo.o.costa7@gmail.com>
Date: Sun, 31 Jan 2016 22:15:58 -0500
Subject: [PATCH] Updates Changelog

---
 html/changelog.html                           | 28 ++++++++++++++
 html/changelogs/.all_changelog.yml            | 21 +++++++++++
 html/changelogs/AutoChangeLog-pr-3435.yml     |  5 ---
 html/changelogs/AutoChangeLog-pr-3437.yml     |  4 --
 html/changelogs/AutoChangeLog-pr-3439.yml     |  4 --
 html/changelogs/AutoChangeLog-pr-3440.yml     |  4 --
 html/changelogs/AutoChangeLog-pr-3445.yml     |  5 ---
 html/changelogs/AutoChangeLog-pr-3458.yml     |  5 ---
 ...atacolada-pr-usefulishsurgerycomputers.yml | 37 -------------------
 9 files changed, 49 insertions(+), 64 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3435.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3437.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3439.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3440.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3445.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3458.yml
 delete mode 100644 html/changelogs/pinatacolada-pr-usefulishsurgerycomputers.yml

diff --git a/html/changelog.html b/html/changelog.html
index 866190c8971..56172c88974 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,34 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">31 January 2016</h2>
+			<h3 class="author">Crazylemon64 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Syndicate borgs can now interact with station machinery</li>
+				<li class="rscadd">People with slime people limbs can now *squish</li>
+				<li class="tweak">Skrell's vulnerability to alcohol is checked on their liver, now - a liver transplant will let them take alcohol like a champ - lacking a liver will have the same effect as being a skrell, when drinking</li>
+			</ul>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds in the Magic Eight Ball toy, found in Claw Game prize orbs.</li>
+				<li class="rscadd">Adds in the Magic Conch Shell, an admin-only shell of power.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Updates Summon Guns and Magic to include many of the new guns</li>
+				<li class="tweak">Summon Guns/Magic can no longer be used during Ragin' Mages</li>
+			</ul>
+			<h3 class="author">Tastyfish updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The emergency shuttle status in the Status tab now has ETA/ETD/etc like before.</li>
+				<li class="tweak">Code Gamma+ now has a 5 minute emergency shuttle call, like Red.</li>
+			</ul>
+			<h3 class="author">pinatacolada updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds NanoUI to the operating computer</li>
+				<li class="rscadd">Adds health announcing, critical and oxygen damage aural alerts to the computer, with a menu to selectively turn them on and off</li>
+			</ul>
+
 			<h2 class="date">29 January 2016</h2>
 			<h3 class="author">Crazylemon updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 18a867d7ab6..70cedd14768 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -358,3 +358,24 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       bullets to reach a state of what our scientists refer to as "enough dakka,"
       Syndicate High Command has decided to restore the Syndicate Strike Team arsenal
       to using standard-issue L6 SAW ammunition.
+2016-01-31:
+  Crazylemon64:
+  - bugfix: Syndicate borgs can now interact with station machinery
+  - rscadd: People with slime people limbs can now *squish
+  - tweak: Skrell's vulnerability to alcohol is checked on their liver, now - a liver
+      transplant will let them take alcohol like a champ - lacking a liver will have
+      the same effect as being a skrell, when drinking
+  FalseIncarnate:
+  - rscadd: Adds in the Magic Eight Ball toy, found in Claw Game prize orbs.
+  - rscadd: Adds in the Magic Conch Shell, an admin-only shell of power.
+  Fox McCloud:
+  - rscadd: Updates Summon Guns and Magic to include many of the new guns
+  - tweak: Summon Guns/Magic can no longer be used during Ragin' Mages
+  Tastyfish:
+  - rscadd: The emergency shuttle status in the Status tab now has ETA/ETD/etc like
+      before.
+  - tweak: Code Gamma+ now has a 5 minute emergency shuttle call, like Red.
+  pinatacolada:
+  - rscadd: Adds NanoUI to the operating computer
+  - rscadd: Adds health announcing, critical and oxygen damage aural alerts to the
+      computer, with a menu to selectively turn them on and off
diff --git a/html/changelogs/AutoChangeLog-pr-3435.yml b/html/changelogs/AutoChangeLog-pr-3435.yml
deleted file mode 100644
index beda6bf8456..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3435.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: FalseIncarnate
-delete-after: True
-changes: 
-  - rscadd: "Adds in the Magic Eight Ball toy, found in Claw Game prize orbs."
-  - rscadd: "Adds in the Magic Conch Shell, an admin-only shell of power."
diff --git a/html/changelogs/AutoChangeLog-pr-3437.yml b/html/changelogs/AutoChangeLog-pr-3437.yml
deleted file mode 100644
index 1e3f8bc77a3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3437.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Crazylemon64
-delete-after: True
-changes: 
-  - bugfix: "Syndicate borgs can now interact with station machinery"
diff --git a/html/changelogs/AutoChangeLog-pr-3439.yml b/html/changelogs/AutoChangeLog-pr-3439.yml
deleted file mode 100644
index f01e07d7320..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3439.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Crazylemon64
-delete-after: True
-changes: 
-  - rscadd: "People with slime people limbs can now *squish"
diff --git a/html/changelogs/AutoChangeLog-pr-3440.yml b/html/changelogs/AutoChangeLog-pr-3440.yml
deleted file mode 100644
index 3295b84f92a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3440.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Crazylemon64
-delete-after: True
-changes: 
-  - tweak: "Skrell's vulnerability to alcohol is checked on their liver, now - a liver transplant will let them take alcohol like a champ - lacking a liver will have the same effect as being a skrell, when drinking"
diff --git a/html/changelogs/AutoChangeLog-pr-3445.yml b/html/changelogs/AutoChangeLog-pr-3445.yml
deleted file mode 100644
index 45122dd2391..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3445.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes: 
-  - rscadd: "Updates Summon Guns and Magic to include many of the new guns"
-  - tweak: "Summon Guns/Magic can no longer be used during Ragin' Mages"
diff --git a/html/changelogs/AutoChangeLog-pr-3458.yml b/html/changelogs/AutoChangeLog-pr-3458.yml
deleted file mode 100644
index 403bc6e073b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3458.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Tastyfish
-delete-after: True
-changes: 
-  - rscadd: "The emergency shuttle status in the Status tab now has ETA/ETD/etc like before."
-  - tweak: "Code Gamma+ now has a 5 minute emergency shuttle call, like Red."
diff --git a/html/changelogs/pinatacolada-pr-usefulishsurgerycomputers.yml b/html/changelogs/pinatacolada-pr-usefulishsurgerycomputers.yml
deleted file mode 100644
index 70246bcf1fd..00000000000
--- a/html/changelogs/pinatacolada-pr-usefulishsurgerycomputers.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
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
-author: "pinatacolada"
-
-# 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: 
-  - rscadd: "Adds NanoUI to the operating computer"
-  - rscadd: "Adds health announcing, critical and oxygen damage aural alerts to the computer, with a menu to selectively turn them on and off"
-