From 961bb7c2fc3cb9fbb626a07f4b54d4c2021a9ffd Mon Sep 17 00:00:00 2001
From: sybil <sybil@tgstation13.org>
Date: Fri, 9 Jun 2017 22:02:46 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 5b167ceac50..7b6e57733bb 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -67,9 +67,15 @@
 				<li class="tweak">Refactored the outfit datum to allow accessories as part of an outfit.</li>
 				<li class="bugfix">The Captain spawns with the Medal of Captaincy again.</li>
 			</ul>
+			<h3 class="author">TrustyGun updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Some of the clown's toys have been moved into a crate in the theater. If you think you are missing something, check in there.</li>
+				<li class="rscadd">Wooden crates have been added. You can construct them with 6 wooden planks, and deconstruct them the same way as regular crates</li>
+			</ul>
 			<h3 class="author">oranges updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Security minor and major crime descriptors are now a single line input, making it easier to add them</li>
+				<li class="tweak">Medical record descriptions are single inputs now</li>
 			</ul>
 
 			<h2 class="date">08 June 2017</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 23e6baaaa0e..06ab34c2bf7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11803,6 +11803,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Medal commendations will be displayed when the round ends.
   - tweak: Refactored the outfit datum to allow accessories as part of an outfit.
   - bugfix: The Captain spawns with the Medal of Captaincy again.
+  TrustyGun:
+  - rscadd: Some of the clown's toys have been moved into a crate in the theater.
+      If you think you are missing something, check in there.
+  - rscadd: Wooden crates have been added. You can construct them with 6 wooden planks,
+      and deconstruct them the same way as regular crates
   oranges:
   - tweak: Security minor and major crime descriptors are now a single line input,
       making it easier to add them
+  - tweak: Medical record descriptions are single inputs now
diff --git a/html/changelogs/AutoChangeLog-pr-28207.yml b/html/changelogs/AutoChangeLog-pr-28207.yml
deleted file mode 100644
index e78a6ca5e46..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28207.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "oranges"
-delete-after: True
-changes: 
-  - tweak: "Medical record descriptions are single inputs now"
diff --git a/html/changelogs/AutoChangeLog-pr-28227.yml b/html/changelogs/AutoChangeLog-pr-28227.yml
deleted file mode 100644
index 6c4248bd654..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28227.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "TrustyGun"
-delete-after: True
-changes: 
-  - rscadd: "Some of the clown's toys have been moved into a crate in the theater. If you think you are missing something, check in there."
-  - rscadd: "Wooden crates have been added. You can construct them with 6 wooden planks, and deconstruct them the same way as regular crates"