From 7d087574b607a5d3e6adfb53d3760ec138e58724 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Wed, 17 May 2017 17:29:34 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 13 +++++++++++++
 html/changelogs/.all_changelog.yml        |  8 ++++++++
 html/changelogs/AutoChangeLog-pr-7313.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7321.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7329.yml |  5 -----
 5 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7313.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7321.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7329.yml

diff --git a/html/changelog.html b/html/changelog.html
index 894140feb54..c82cdbe6f12 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,10 +56,23 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">17 May 2017</h2>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">MORE GREY SPRITES!</li>
+			</ul>
 			<h3 class="author">FlattestGuitar updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">You can now silence shoes just by using some duct tape on them! Shoe rags no longer exist.</li>
 			</ul>
+			<h3 class="author">Purpose2 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Makes the new posters actually spawnable.</li>
+				<li class="bugfix">Fixes far more spelling errors than there ever should have been on the posters.</li>
+			</ul>
+			<h3 class="author">Travelling Merchant updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a hiss emote for Unathi.</li>
+			</ul>
 
 			<h2 class="date">16 May 2017</h2>
 			<h3 class="author">FlattestGuitar updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9685dd3258c..fc32c63cd88 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4681,6 +4681,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: You can now resist out of straightjackets
   - tweak: Straightjacketed people can be handcuffed
 2017-05-17:
+  Fethas:
+  - rscadd: MORE GREY SPRITES!
   FlattestGuitar:
   - tweak: You can now silence shoes just by using some duct tape on them! Shoe rags
       no longer exist.
+  Purpose2:
+  - bugfix: Makes the new posters actually spawnable.
+  - bugfix: Fixes far more spelling errors than there ever should have been on the
+      posters.
+  Travelling Merchant:
+  - rscadd: Adds a hiss emote for Unathi.
diff --git a/html/changelogs/AutoChangeLog-pr-7313.yml b/html/changelogs/AutoChangeLog-pr-7313.yml
deleted file mode 100644
index 876d6261017..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7313.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Travelling Merchant"
-delete-after: True
-changes: 
-  - rscadd: "Adds a hiss emote for Unathi."
diff --git a/html/changelogs/AutoChangeLog-pr-7321.yml b/html/changelogs/AutoChangeLog-pr-7321.yml
deleted file mode 100644
index 544e9c5ee23..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7321.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - rscadd: "MORE GREY SPRITES!"
diff --git a/html/changelogs/AutoChangeLog-pr-7329.yml b/html/changelogs/AutoChangeLog-pr-7329.yml
deleted file mode 100644
index d05e3354eb5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7329.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - bugfix: "Makes the new posters actually spawnable."
-  - bugfix: "Fixes far more spelling errors than there ever should have been on the posters."