From 9ed423ec418342c6be0627545604fbd2cc39817e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 31 Aug 2019 22:00:18 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.08.31.22.00.18"

---
 html/changelog.html                    |  5 +++
 html/changelogs/.all_changelog.yml     |  5 +++
 html/changelogs/geeves-meleeTweaks.yml | 42 --------------------------
 3 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/geeves-meleeTweaks.yml

diff --git a/html/changelog.html b/html/changelog.html
index 212ad351c77..401026e06c8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,11 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">31 August 2019</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">It is no longer possible to choke out a species that doesn't breathe, popping their lung. Nor does sleeping carp knock their air out anymore.</li>
+				<li class="tweak">Fixed text error when you get hit in the teabag, in the crown jewels, in the future bloodline.</li>
+			</ul>
 			<h3 class="author">MoondancerPony updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes a myriad of circuit-related bugs.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 140ff81878f..9323c655bd5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8863,5 +8863,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Skull132:
   - tweak: Shrapnel no longer causes direct damage. Instead, it causes HALLOSS.
 2019-08-31:
+  Geeves:
+  - tweak: It is no longer possible to choke out a species that doesn't breathe, popping
+      their lung. Nor does sleeping carp knock their air out anymore.
+  - tweak: Fixed text error when you get hit in the teabag, in the crown jewels, in
+      the future bloodline.
   MoondancerPony:
   - bugfix: Fixes a myriad of circuit-related bugs.
diff --git a/html/changelogs/geeves-meleeTweaks.yml b/html/changelogs/geeves-meleeTweaks.yml
deleted file mode 100644
index 4c29c501d68..00000000000
--- a/html/changelogs/geeves-meleeTweaks.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: 
-  - tweak: "It is no longer possible to choke out a species that doesn't breathe, popping their lung. Nor does sleeping carp knock their air out anymore."
-  - tweak: "Fixed text error when you get hit in the teabag, in the crown jewels, in the future bloodline."