From 1a054c6e2cc08970ad9a3ccc665b4c69a5c84aca Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 18 May 2017 00:52:57 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 11 +++++++++++
 html/changelogs/.all_changelog.yml        |  7 +++++++
 html/changelogs/AutoChangeLog-pr-7255.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-7326.yml |  4 ----
 4 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7255.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7326.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6a09fea1fc7..0403d56483c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">18 May 2017</h2>
+			<h3 class="author">FreeStylaLT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a Newscaster to Brig Toilet.</li>
+			</ul>
+			<h3 class="author">Purpose2 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds a subtle chat-window reminder for karma on Shuttle departure. Disable/enable via preferences tab.</li>
+				<li class="rscdel">Removes the ugly round-end karma popup.</li>
+			</ul>
+
 			<h2 class="date">17 May 2017</h2>
 			<h3 class="author">Fethas updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index daac8321743..5e97186453e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4694,3 +4694,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       posters.
   Travelling Merchant:
   - rscadd: Adds a hiss emote for Unathi.
+2017-05-18:
+  FreeStylaLT:
+  - rscadd: Added a Newscaster to Brig Toilet.
+  Purpose2:
+  - rscadd: Adds a subtle chat-window reminder for karma on Shuttle departure. Disable/enable
+      via preferences tab.
+  - rscdel: Removes the ugly round-end karma popup.
diff --git a/html/changelogs/AutoChangeLog-pr-7255.yml b/html/changelogs/AutoChangeLog-pr-7255.yml
deleted file mode 100644
index 95151089e1f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7255.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - rscadd: "Adds a subtle chat-window reminder for karma on Shuttle departure. Disable/enable via preferences tab."
-  - rscdel: "Removes the ugly round-end karma popup."
diff --git a/html/changelogs/AutoChangeLog-pr-7326.yml b/html/changelogs/AutoChangeLog-pr-7326.yml
deleted file mode 100644
index 4a9febc8109..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7326.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "FreeStylaLT"
-delete-after: True
-changes: 
-  - rscadd: "Added a Newscaster to Brig Toilet."