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

---
 html/changelog.html                       | 9 +++++++++
 html/changelogs/.all_changelog.yml        | 6 ++++++
 html/changelogs/AutoChangeLog-pr-7390.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-7399.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-7405.yml | 4 ----
 5 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7390.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7399.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7405.yml

diff --git a/html/changelog.html b/html/changelog.html
index d10649fd340..c30f65b5fb7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,6 +60,15 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Two welding goggles on in the atmos room</li>
 			</ul>
+			<h3 class="author">Purpose2 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Increases the size of Megaphones.</li>
+				<li class="tweak">Headset encryption keys are now 'small' items.</li>
+			</ul>
+			<h3 class="author">Tayyyyyyy, FlattestGuitar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">A targeting mode-esque message and sound when you point at something with a gun in your active hand</li>
+			</ul>
 
 			<h2 class="date">28 May 2017</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0a4ca3de547..6c7a3bfe43f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4789,3 +4789,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-05-29:
   Jovaniph:
   - rscadd: Two welding goggles on in the atmos room
+  Purpose2:
+  - tweak: Increases the size of Megaphones.
+  - tweak: Headset encryption keys are now 'small' items.
+  Tayyyyyyy, FlattestGuitar:
+  - rscadd: A targeting mode-esque message and sound when you point at something with
+      a gun in your active hand
diff --git a/html/changelogs/AutoChangeLog-pr-7390.yml b/html/changelogs/AutoChangeLog-pr-7390.yml
deleted file mode 100644
index 0164b0df98e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7390.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy, FlattestGuitar"
-delete-after: True
-changes: 
-  - rscadd: "A targeting mode-esque message and sound when you point at something with a gun in your active hand"
diff --git a/html/changelogs/AutoChangeLog-pr-7399.yml b/html/changelogs/AutoChangeLog-pr-7399.yml
deleted file mode 100644
index d2c822aa080..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7399.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - tweak: "Headset encryption keys are now 'small' items."
diff --git a/html/changelogs/AutoChangeLog-pr-7405.yml b/html/changelogs/AutoChangeLog-pr-7405.yml
deleted file mode 100644
index e5474e08e89..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7405.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - tweak: "Increases the size of Megaphones."