From 97407d5b962358fe100cfb6bd808e37ab0ceae96 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 20 Jul 2020 08:47:09 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.20.08.47.09"

---
 html/changelog.html                         | 2 ++
 html/changelogs/.all_changelog.yml          | 5 +++++
 html/changelogs/fakedeath_no_emotes.yml     | 6 ------
 html/changelogs/maint_drone_diagnostics.yml | 6 ------
 4 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/fakedeath_no_emotes.yml
 delete mode 100644 html/changelogs/maint_drone_diagnostics.yml

diff --git a/html/changelog.html b/html/changelog.html
index eecefa4ed2c..2b91b26a889 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -43,6 +43,8 @@
 			<h3 class="author">mikomyazaki updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Items held in grippers (e.g. beakers) will now properly update the gripper's icon with their own changes while being held and used.</li>
+				<li class="bugfix">Maintenance Drone diagnostic screen now shows overall status rather than individual component status, as they cannot actually take component damage, only overall damage.</li>
+				<li class="bugfix">Changelings that are faking being dead will no longer perform emotes (e.g. screaming).</li>
 			</ul>
 
 			<h2 class="date">19 July 2020</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bf01b4d0ffc..fc870ee3bb3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14275,3 +14275,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   mikomyazaki:
   - bugfix: Items held in grippers (e.g. beakers) will now properly update the gripper's
       icon with their own changes while being held and used.
+  - bugfix: Maintenance Drone diagnostic screen now shows overall status rather than
+      individual component status, as they cannot actually take component damage,
+      only overall damage.
+  - bugfix: Changelings that are faking being dead will no longer perform emotes (e.g.
+      screaming).
diff --git a/html/changelogs/fakedeath_no_emotes.yml b/html/changelogs/fakedeath_no_emotes.yml
deleted file mode 100644
index d7cae7e2bb8..00000000000
--- a/html/changelogs/fakedeath_no_emotes.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: mikomyazaki
-
-delete-after: True
-
-changes: 
-  - bugfix: "Changelings that are faking being dead will no longer perform emotes (e.g. screaming)."
\ No newline at end of file
diff --git a/html/changelogs/maint_drone_diagnostics.yml b/html/changelogs/maint_drone_diagnostics.yml
deleted file mode 100644
index 4f73736cc6a..00000000000
--- a/html/changelogs/maint_drone_diagnostics.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: mikomyazaki
-
-delete-after: True
-
-changes: 
-  - bugfix: "Maintenance Drone diagnostic screen now shows overall status rather than individual component status, as they cannot actually take component damage, only overall damage."
\ No newline at end of file