From 4eb3ba1cdc256164f0004c652c81cbf40c2ee68b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 22 May 2020 19:40:11 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.05.22.19.40.11"

---
 html/changelog.html                     |  4 +++
 html/changelogs/.all_changelog.yml      |  3 ++
 html/changelogs/dansemacabre-master.yml | 41 -------------------------
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/dansemacabre-master.yml

diff --git a/html/changelog.html b/html/changelog.html
index ee4936186b8..f683afeb3e5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,10 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">22 May 2020</h2>
+			<h3 class="author">DanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Fully automatic drag-to-fire for a number of burst-capable weapons. Including, but not limited to: SMGs, the STS-35, ZI-550, gatling gun, and the SAW.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<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>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6039a510cb9..3fb6c26fb0c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13214,6 +13214,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       desc_ infront instead. No front-facing changes, but it'll be easier to implement
       descriptions.
 2020-05-22:
+  DanseMacabre:
+  - rscadd: 'Fully automatic drag-to-fire for a number of burst-capable weapons. Including,
+      but not limited to: SMGs, the STS-35, ZI-550, gatling gun, and the SAW.'
   Geeves:
   - 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.
diff --git a/html/changelogs/dansemacabre-master.yml b/html/changelogs/dansemacabre-master.yml
deleted file mode 100644
index 69336376e87..00000000000
--- a/html/changelogs/dansemacabre-master.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: DanseMacabre
-
-# 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: "Fully automatic drag-to-fire for a number of burst-capable weapons. Including, but not limited to: SMGs, the STS-35, ZI-550, gatling gun, and the SAW."