From 928189a0b60c8b138ce5337f1e7e369d3ea6a830 Mon Sep 17 00:00:00 2001
From: TheDZD <leonardo.o.costa7@gmail.com>
Date: Sun, 24 Jan 2016 19:16:47 -0500
Subject: [PATCH] Updates Changelog

---
 html/changelog.html                       | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml        | 14 +++++++++++++-
 html/changelogs/AutoChangeLog-pr-3359.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-3362.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3366.yml |  6 ------
 5 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3359.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3362.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3366.yml

diff --git a/html/changelog.html b/html/changelog.html
index e31ed7b5096..5b3b5c496a2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,20 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">24 January 2016</h2>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes markings overlaying underwear.</li>
+				<li class="rscadd">Nude icon in underwear.dmi</li>
+				<li class="bugfix">Fixes Vox robes not using the correct on-mob sprites.</li>
+				<li class="bugfix">Fixes unreported bug where there was a slim chance during character preview icon generation that a character with Security Officer set to high would get rendered with either the wrong beret sprite or no beret sprite at all.</li>
+				<li class="bugfix">Fixes an issue where Sigholt's fluff beret wasn't using the correct sprites.</li>
+			</ul>
+			<h3 class="author">Tastyfish updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Passively power-consuming borg modules, such as the peacekeeper movement and shield module, won't spam the user infinitely if they're low on power anymore.</li>
+			</ul>
+
 			<h2 class="date">23 January 2016</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1d4a3a85e5d..f4354614ba6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -259,7 +259,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       knight armor
   - tweak: Chaplain's closet is now a secure closet
   - rscadd: Adds in Assault Gear crate to cargo
-  - rscadd: Adds in military assault belt 
+  - rscadd: Adds in military assault belt
   - rcsadd: Adds in spaceworthy swat suits
   - tweak: tweaks bandolier to hold 2 additional shotgun shells
   - tweak: bartender starts off with +2 additional shells
@@ -274,3 +274,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: The nuclear disk escaping on the shuttle no longer counts as a syndicate
       minor victory.
   - bugfix: Cultists can once again actually greentext the escape objective.
+2016-01-24:
+  KasparoVy:
+  - bugfix: Fixes markings overlaying underwear.
+  - rscadd: Nude icon in underwear.dmi
+  - bugfix: Fixes Vox robes not using the correct on-mob sprites.
+  - bugfix: Fixes unreported bug where there was a slim chance during character preview
+      icon generation that a character with Security Officer set to high would get
+      rendered with either the wrong beret sprite or no beret sprite at all.
+  - bugfix: Fixes an issue where Sigholt's fluff beret wasn't using the correct sprites.
+  Tastyfish:
+  - bugfix: Passively power-consuming borg modules, such as the peacekeeper movement
+      and shield module, won't spam the user infinitely if they're low on power anymore.
diff --git a/html/changelogs/AutoChangeLog-pr-3359.yml b/html/changelogs/AutoChangeLog-pr-3359.yml
deleted file mode 100644
index 1233c1001f6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3359.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: KasparoVy
-delete-after: True
-changes: 
-  - bugfix: "Fixes markings overlaying underwear."
-  - rscadd: "Nude icon in underwear.dmi"
diff --git a/html/changelogs/AutoChangeLog-pr-3362.yml b/html/changelogs/AutoChangeLog-pr-3362.yml
deleted file mode 100644
index ee730d23549..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3362.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Tastyfish
-delete-after: True
-changes: 
-  - bugfix: "Passively power-consuming borg modules, such as the peacekeeper movement and shield module, won't spam the user infinitely if they're low on power anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-3366.yml b/html/changelogs/AutoChangeLog-pr-3366.yml
deleted file mode 100644
index d6a977331f1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3366.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: KasparoVy
-delete-after: True
-changes: 
-  - bugfix: "Fixes Vox robes not using the correct on-mob sprites."
-  - bugfix: "Fixes unreported bug where there was a slim chance during character preview icon generation that a character with Security Officer set to high would get rendered with either the wrong beret sprite or no beret sprite at all."
-  - bugfix: "Fixes an issue where Sigholt's fluff beret wasn't using the correct sprites."