From a4e2154f515a239171ab198d680bbc4c8c81e757 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 22 Aug 2020 03:37:42 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.08.22.03.37.42"

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

diff --git a/html/changelog.html b/html/changelog.html
index 49d046bda8e..663da491185 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -39,6 +39,7 @@
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="soundadd">Adds new generic pickup and drop sounds.</li>
+				<li class="soundadd">New sounds for using bottles as a weapon.</li>
 			</ul>
 			<h3 class="author">mikomyazaki updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 425eac25143..742380da9a1 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15007,5 +15007,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-08-22:
   Wowzewow (Wezzy):
   - soundadd: Adds new generic pickup and drop sounds.
+  - soundadd: New sounds for using bottles as a weapon.
   mikomyazaki:
   - backend: Prevents mapping multiple turfs per tile.
diff --git a/html/changelogs/wezzy_bottlesmash.yml b/html/changelogs/wezzy_bottlesmash.yml
deleted file mode 100644
index cfc6dc7eb4c..00000000000
--- a/html/changelogs/wezzy_bottlesmash.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: 
-  - soundadd: "New sounds for using bottles as a weapon."
\ No newline at end of file