From 58988ba500d436d1f3406682b59a2fa01face0e4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 26 Oct 2019 22:19:58 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.10.26.22.19.58"

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

diff --git a/html/changelog.html b/html/changelog.html
index 4af551b3a04..7e2168f1cb2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -44,6 +44,8 @@
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">You can now build improvised swords. The hilt determines the integrity thereof, while the blade determines the damage it does.</li>
+				<li class="rscadd">Disarming now takes a portion of your stamina. You cannot disarm if your stamina is near-empty.</li>
+				<li class="rscadd">Disarming someone with a weapon in their hand has a chance for them to retaliate by bashing you with it.</li>
 			</ul>
 			<h3 class="author">JohnWildkins updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7077226e9f6..b81288aa228 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9569,6 +9569,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Geeves:
   - rscadd: You can now build improvised swords. The hilt determines the integrity
       thereof, while the blade determines the damage it does.
+  - rscadd: Disarming now takes a portion of your stamina. You cannot disarm if your
+      stamina is near-empty.
+  - rscadd: Disarming someone with a weapon in their hand has a chance for them to
+      retaliate by bashing you with it.
   JohnWildkins:
   - bugfix: Hephaestus atmospheric technicians should now spawn with the proper uniform
       and ID.
diff --git a/html/changelogs/geeves-geevesDisarmsDisarming.yml b/html/changelogs/geeves-geevesDisarmsDisarming.yml
deleted file mode 100644
index f757c27d9f7..00000000000
--- a/html/changelogs/geeves-geevesDisarmsDisarming.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: Geeves
-
-# 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: "Disarming now takes a portion of your stamina. You cannot disarm if your stamina is near-empty."
-  - rscadd: "Disarming someone with a weapon in their hand has a chance for them to retaliate by bashing you with it."