From 903ea5d2ad8c05fcf35af43bb48c0f08ef8d1d87 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 7 Oct 2019 21:34:37 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.10.07.21.34.37"

---
 html/changelog.html                           |  7 ++++
 html/changelogs/.all_changelog.yml            |  6 +++
 .../schev-decreasebaton-07july2019.yml        | 42 -------------------
 3 files changed, 13 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/schev-decreasebaton-07july2019.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3647bb63e6d..5f6217b1b7d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 October 2019</h2>
+			<h3 class="author">Scheveningen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Almost all stun baton variants in the game have been rebalanced. It is no longer possible to one-shot stun someone with a baton in the face.</li>
+				<li class="balance">Almost all clothing items have had their electroshock resistance modified in some way or another. Unapologetic malf AI nerf, sorry.</li>
+			</ul>
+
 			<h2 class="date">06 October 2019</h2>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e27e5a4c346..873c2e2c142 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9260,3 +9260,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2019-10-06:
   MattAtlas:
   - rscadd: You can no longer select jobs that your character is too young for.
+2019-10-07:
+  Scheveningen:
+  - balance: Almost all stun baton variants in the game have been rebalanced. It is
+      no longer possible to one-shot stun someone with a baton in the face.
+  - balance: Almost all clothing items have had their electroshock resistance modified
+      in some way or another. Unapologetic malf AI nerf, sorry.
diff --git a/html/changelogs/schev-decreasebaton-07july2019.yml b/html/changelogs/schev-decreasebaton-07july2019.yml
deleted file mode 100644
index 26ac0b759a9..00000000000
--- a/html/changelogs/schev-decreasebaton-07july2019.yml
+++ /dev/null
@@ -1,42 +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: Scheveningen
-
-# 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: 
-  - balance: "Almost all stun baton variants in the game have been rebalanced. It is no longer possible to one-shot stun someone with a baton in the face."
-  - balance: "Almost all clothing items have had their electroshock resistance modified in some way or another. Unapologetic malf AI nerf, sorry."