From cb3bd306d0a7c7e27f152f7ab7f8906dac0df01d Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 22 May 2020 15:06:20 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.05.22.15.06.20"

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

diff --git a/html/changelog.html b/html/changelog.html
index 6f178467661..df6c914d532 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,10 @@
 				<li class="rscadd">Full pain overlays have been added, or rather fixed, since they never worked before. They're just small flashes of pain with an accompanying overlay.</li>
 				<li class="rscadd">Remotely controlled stuff will now have a neat scanline overlay, a gentle reminder that this isn't your actual physical body.</li>
 			</ul>
+			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Adds new sprites for combat hyposprays.</li>
+			</ul>
 
 			<h2 class="date">21 May 2020</h2>
 			<h3 class="author">Skull132 updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e6a6094b158..3f98a7fb299 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13219,3 +13219,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       worked before. They're just small flashes of pain with an accompanying overlay.
   - rscadd: Remotely controlled stuff will now have a neat scanline overlay, a gentle
       reminder that this isn't your actual physical body.
+  Wowzewow (Wezzy):
+  - imageadd: Adds new sprites for combat hyposprays.
diff --git a/html/changelogs/wezzy_combat_hyposprays.yml b/html/changelogs/wezzy_combat_hyposprays.yml
deleted file mode 100644
index eeae940ab61..00000000000
--- a/html/changelogs/wezzy_combat_hyposprays.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: Wowzewow (Wezzy)
-
-# 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: "Adds new sprites for combat hyposprays."