From e22c1e62faaf5566c25d53a7cde08e86b60ae7da Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 7 Aug 2021 11:57:28 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.08.07.11.57.28"

---
 html/changelog.html                |  5 ++++
 html/changelogs/.all_changelog.yml |  4 +++
 html/changelogs/EmotionFreq.yml    |  6 -----
 html/changelogs/desven-donut.yml   | 41 ------------------------------
 4 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/EmotionFreq.yml
 delete mode 100644 html/changelogs/desven-donut.yml

diff --git a/html/changelog.html b/html/changelog.html
index dffd194a6cc..a19c7150e27 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,10 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">07 August 2021</h2>
+			<h3 class="author">Desven updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added in-hand sprites for k&#x27;ois donuts.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">You can now actually inhabit matriarch maintenance drones, if you have the command whitelist.</li>
@@ -44,6 +48,7 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Nanotrasen relations in the char setup has now been changed into economic status.</li>
 				<li class="rscdel">The NTCC report spawning in the bridge at roundstart has been removed.</li>
+				<li class="tweak">Based on feedback, the frequency of the emotional manipulator&#x27;s messages were toned back down a little.</li>
 			</ul>
 
 			<h2 class="date">06 August 2021</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8856a46dd2e..4f819627daf 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -21074,6 +21074,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Cleared up the description of the Jaws of Life to indicate when it can
       be used.
 2021-08-07:
+  Desven:
+  - rscadd: Added in-hand sprites for k&#x27;ois donuts.
   Geeves:
   - bugfix: You can now actually inhabit matriarch maintenance drones, if you have
       the command whitelist.
@@ -21081,3 +21083,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Nanotrasen relations in the char setup has now been changed into economic
       status.
   - rscdel: The NTCC report spawning in the bridge at roundstart has been removed.
+  - tweak: Based on feedback, the frequency of the emotional manipulator&#x27;s messages
+      were toned back down a little.
diff --git a/html/changelogs/EmotionFreq.yml b/html/changelogs/EmotionFreq.yml
deleted file mode 100644
index 639dbecd70e..00000000000
--- a/html/changelogs/EmotionFreq.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - tweak: "Based on feedback, the frequency of the emotional manipulator's messages were toned back down a little."
diff --git a/html/changelogs/desven-donut.yml b/html/changelogs/desven-donut.yml
deleted file mode 100644
index e40bcdd58b1..00000000000
--- a/html/changelogs/desven-donut.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: Desven
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - rscadd: "Added in-hand sprites for k'ois donuts."