From 4602d8c527d4df85a9329dcd124b968c8f6e8aa3 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 24 Sep 2019 17:03:28 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.09.24.17.03.28"

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

diff --git a/html/changelog.html b/html/changelog.html
index 2e85eb2a250..ecd4ed7a358 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed missing impact wrench sprites, fixed rfd-s not working for stationbounds, fixed pixel-precision when placing material sheets on tables.</li>
 			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes the IE Shocker. Give 'em an inch and they take a mile.</li>
+			</ul>
 			<h3 class="author">Scheveningen updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="balance">Force gloves will no longer amplify their damage to melee weapons.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c09d1d29b86..8c68ea9f433 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9149,6 +9149,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Ferner:
   - bugfix: Fixed missing impact wrench sprites, fixed rfd-s not working for stationbounds,
       fixed pixel-precision when placing material sheets on tables.
+  Geeves:
+  - rscdel: Removes the IE Shocker. Give 'em an inch and they take a mile.
   Scheveningen:
   - balance: Force gloves will no longer amplify their damage to melee weapons.
   - balance: Force gloves have their TC cost reduced to compensate.
diff --git a/html/changelogs/geeves-shockfuck.yml b/html/changelogs/geeves-shockfuck.yml
deleted file mode 100644
index ff14852d576..00000000000
--- a/html/changelogs/geeves-shockfuck.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: 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: 
-  - rscdel: "Removes the IE Shocker. Give 'em an inch and they take a mile."