From afdb91d9af9f54ae4bed5874e08e1fa43cbe3f19 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 22 Jul 2020 20:21:31 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.22.20.21.31"

---
 html/changelog.html                |  6 +++++
 html/changelogs/.all_changelog.yml |  6 +++++
 html/changelogs/kyres1-#9367.yml   | 43 ------------------------------
 3 files changed, 12 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/kyres1-#9367.yml

diff --git a/html/changelog.html b/html/changelog.html
index d6e01467313..dd60236600c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -59,6 +59,12 @@
 				<li class="bugfix">Fixes chewables not spawning in their trash item. i.e, chewing gum should give you gum wads once you finished chewing them.</li>
 				<li class="bugfix">Lollipops now show up onmob.</li>
 			</ul>
+			<h3 class="author">kyres1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a Dominian gear loadout for mercenaries. One is 25TC for a solo mercenary, 100TC for a kit of four loadouts plus a powerful RIG similar to the bunker suit. Both loadouts come with fancy red e-shields and energy cutlasses.</li>
+				<li class="rscadd">Added two Dominian dresses to the Dominian outfit selection.</li>
+				<li class="bugfix">Fixed the Himean cap description.</li>
+			</ul>
 			<h3 class="author">mikomyazaki updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Airlocks will no longer produce a message saying you have insufficient rights when using the AI/cyborg airlock menu.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c5499c96038..1650c9c0f68 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14346,6 +14346,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes chewables not spawning in their trash item. i.e, chewing gum should
       give you gum wads once you finished chewing them.
   - bugfix: Lollipops now show up onmob.
+  kyres1:
+  - rscadd: Added a Dominian gear loadout for mercenaries. One is 25TC for a solo
+      mercenary, 100TC for a kit of four loadouts plus a powerful RIG similar to the
+      bunker suit. Both loadouts come with fancy red e-shields and energy cutlasses.
+  - rscadd: Added two Dominian dresses to the Dominian outfit selection.
+  - bugfix: Fixed the Himean cap description.
   mikomyazaki:
   - bugfix: Airlocks will no longer produce a message saying you have insufficient
       rights when using the AI/cyborg airlock menu.
diff --git a/html/changelogs/kyres1-#9367.yml b/html/changelogs/kyres1-#9367.yml
deleted file mode 100644
index 802d255c252..00000000000
--- a/html/changelogs/kyres1-#9367.yml
+++ /dev/null
@@ -1,43 +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: kyres1
-
-# 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 a Dominian gear loadout for mercenaries. One is 25TC for a solo mercenary, 100TC for a kit of four loadouts plus a powerful RIG similar to the bunker suit. Both loadouts come with fancy red e-shields and energy cutlasses."
-  - rscadd: "Added two Dominian dresses to the Dominian outfit selection."
-  - bugfix: "Fixed the Himean cap description."