From dba3d91bc7929789530fe2b8f1aacf759769e5db Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 22 Oct 2019 17:07:25 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.10.22.17.07.25"

---
 html/changelog.html                           |  4 ++
 html/changelogs/.all_changelog.yml            |  2 +
 .../changelogs/Fire-and-Glory-Vox-sprites.yml | 41 -------------------
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/Fire-and-Glory-Vox-sprites.yml

diff --git a/html/changelog.html b/html/changelog.html
index 1b67210252d..373f6b0d63e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,10 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">22 October 2019</h2>
+			<h3 class="author">Fire and Glory updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">New Vox sprites for bulletproof vests and riot armor.</li>
+			</ul>
 			<h3 class="author">Lady Fowl updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Ports chewing gum and chew.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 429df1d981d..16ae93d5e7e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9483,6 +9483,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Cent. Com. intercepts are no longer omniscient, and will no longer recommend
       rehabilitation for mercenaries and other off-station antagonists at round start.
 2019-10-22:
+  Fire and Glory:
+  - imageadd: New Vox sprites for bulletproof vests and riot armor.
   Lady Fowl:
   - rscadd: Ports chewing gum and chew.
   ParadoxSpace:
diff --git a/html/changelogs/Fire-and-Glory-Vox-sprites.yml b/html/changelogs/Fire-and-Glory-Vox-sprites.yml
deleted file mode 100644
index 50809eb552a..00000000000
--- a/html/changelogs/Fire-and-Glory-Vox-sprites.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: Fire and Glory
-
-# 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: 
-  - imageadd: "New Vox sprites for bulletproof vests and riot armor."