From 0c61bc68d35dc3e3189f9183e867da7ece4af299 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 6 Jan 2017 13:00:10 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 8 ++++++++
 html/changelogs/.all_changelog.yml        | 9 +++++++++
 html/changelogs/AutoChangeLog-pr-6037.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-6052.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-6062.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-6067.yml | 5 -----
 6 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6037.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6052.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6062.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6067.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2a5b02a9b43..70ef3118f03 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,11 +62,19 @@
 				<li class="bugfix">The chem dispenser's UI now displays the remaining energy again</li>
 				<li class="bugfix">Shuttles no longer make buckling useless</li>
 				<li class="bugfix">You should no longer go mute randomly</li>
+				<li class="tweak">You can now opt out of all requests on a role for a round</li>
+				<li class="tweak">Morgue trays now have descriptions that correspond to each of the morgue light states</li>
+				<li class="tweak">Waking up no longer auto-cancels resting.</li>
 			</ul>
 			<h3 class="author">Fethas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">ports parts TG neo-oldcult rscadd:Ports parts of cult from VG</li>
 			</ul>
+			<h3 class="author">KasparoVy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Grey sprites have been tidied up and no longer have any random pixels hanging off.</li>
+				<li class="rscadd">Grey species-fitted tattoo sprites and the last Vox species-fitted tattoo sprite.</li>
+			</ul>
 			<h3 class="author">Krausus updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">SDQL2 can now directly manipulate clients.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7e13540a483..d800b0af963 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3264,8 +3264,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: The chem dispenser's UI now displays the remaining energy again
   - bugfix: Shuttles no longer make buckling useless
   - bugfix: You should no longer go mute randomly
+  - tweak: You can now opt out of all requests on a role for a round
+  - tweak: Morgue trays now have descriptions that correspond to each of the morgue
+      light states
+  - tweak: Waking up no longer auto-cancels resting.
   Fethas:
   - rscadd: ports parts TG neo-oldcult rscadd:Ports parts of cult from VG
+  KasparoVy:
+  - bugfix: Grey sprites have been tidied up and no longer have any random pixels
+      hanging off.
+  - rscadd: Grey species-fitted tattoo sprites and the last Vox species-fitted tattoo
+      sprite.
   Krausus:
   - bugfix: SDQL2 can now directly manipulate clients.
   Kyep:
diff --git a/html/changelogs/AutoChangeLog-pr-6037.yml b/html/changelogs/AutoChangeLog-pr-6037.yml
deleted file mode 100644
index b60a7296ecf..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6037.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Crazylemon64"
-delete-after: True
-changes: 
-  - tweak: "You can now opt out of all requests on a role for a round"
diff --git a/html/changelogs/AutoChangeLog-pr-6052.yml b/html/changelogs/AutoChangeLog-pr-6052.yml
deleted file mode 100644
index 592ba763342..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6052.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Crazylemon64"
-delete-after: True
-changes: 
-  - tweak: "Morgue trays now have descriptions that correspond to each of the morgue light states"
diff --git a/html/changelogs/AutoChangeLog-pr-6062.yml b/html/changelogs/AutoChangeLog-pr-6062.yml
deleted file mode 100644
index cd11ac4127f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6062.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Crazylemon64"
-delete-after: True
-changes: 
-  - tweak: "Waking up no longer auto-cancels resting."
diff --git a/html/changelogs/AutoChangeLog-pr-6067.yml b/html/changelogs/AutoChangeLog-pr-6067.yml
deleted file mode 100644
index 32b92acc367..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6067.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "KasparoVy"
-delete-after: True
-changes: 
-  - bugfix: "Grey sprites have been tidied up and no longer have any random pixels hanging off."
-  - rscadd: "Grey species-fitted tattoo sprites and the last Vox species-fitted tattoo sprite."