From 8916f13d712936a82e953cf4513d381c2e2dbd5b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 24 Jun 2019 11:40:46 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.06.24.11.40.46"

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

diff --git a/html/changelog.html b/html/changelog.html
index 900a269dfaf..c1c88ab0662 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -66,6 +66,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed the roof z-level always having air in it due to some unsimulated plating tiles being exposed to space, also replaced roof z-level open turfs with airless ones.</li>
 			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed antagonist ambitions to actually appear at round end. Remember to set them in the IC tab!</li>
+			</ul>
 			<h3 class="author">Wowzewow updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Fixes mop sound artifacting, pen clicking doesn't spam logs anymore.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cf416d06053..948d5a8c687 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8199,5 +8199,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed the roof z-level always having air in it due to some unsimulated
       plating tiles being exposed to space, also replaced roof z-level open turfs
       with airless ones.
+  Geeves:
+  - bugfix: Fixed antagonist ambitions to actually appear at round end. Remember to
+      set them in the IC tab!
   Wowzewow:
   - tweak: Fixes mop sound artifacting, pen clicking doesn't spam logs anymore.
diff --git a/html/changelogs/geeves-ambitionfix.yml b/html/changelogs/geeves-ambitionfix.yml
deleted file mode 100644
index d008a092634..00000000000
--- a/html/changelogs/geeves-ambitionfix.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: 
-  - bugfix: "Fixed antagonist ambitions to actually appear at round end. Remember to set them in the IC tab!"