From 6032167c8ffcfbf006abbeaeef8a27421515256d Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 6 Jan 2020 19:24:44 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.01.06.19.24.44"

---
 html/changelog.html                     |  9 ++++++
 html/changelogs/.all_changelog.yml      |  6 ++++
 html/changelogs/geeves - mechdiddle.yml |  6 ----
 html/changelogs/mattatlas-monkey.yml    | 42 -------------------------
 4 files changed, 15 insertions(+), 48 deletions(-)
 delete mode 100644 html/changelogs/geeves - mechdiddle.yml
 delete mode 100644 html/changelogs/mattatlas-monkey.yml

diff --git a/html/changelog.html b/html/changelog.html
index 019af17171d..fb8513f4a47 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,10 @@
 			<ul class="changes bgimages16">
 				<li class="rscdel">Removed DNAChange Effect from Artifacts.</li>
 			</ul>
+			<h3 class="author">Code by Geeves, Sprites by Kyres updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added mech passenger compartments.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Examining yourself for injuries will now show you whether your limb is bleeding or not.</li>
@@ -48,6 +52,11 @@
 			<ul class="changes bgimages16">
 				<li class="maptweak">Adds a first aid kit to Red Dock.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Human NPCs and monkeys now have some more interactions.</li>
+				<li class="rscadd">Monkeys can now take items and throw them. Or shoot guns. Or activate things.</li>
+			</ul>
 
 			<h2 class="date">05 January 2020</h2>
 			<h3 class="author">Alberyk updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4a1803b2aee..1858049347e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11156,8 +11156,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-01-06:
   Aticius:
   - rscdel: Removed DNAChange Effect from Artifacts.
+  Code by Geeves, Sprites by Kyres:
+  - rscadd: Added mech passenger compartments.
   Geeves:
   - rscadd: Examining yourself for injuries will now show you whether your limb is
       bleeding or not.
   Leudoberct:
   - maptweak: Adds a first aid kit to Red Dock.
+  MattAtlas:
+  - rscadd: Human NPCs and monkeys now have some more interactions.
+  - rscadd: Monkeys can now take items and throw them. Or shoot guns. Or activate
+      things.
diff --git a/html/changelogs/geeves - mechdiddle.yml b/html/changelogs/geeves - mechdiddle.yml
deleted file mode 100644
index fad48355d8a..00000000000
--- a/html/changelogs/geeves - mechdiddle.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Code by Geeves, Sprites by Kyres
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added mech passenger compartments."
diff --git a/html/changelogs/mattatlas-monkey.yml b/html/changelogs/mattatlas-monkey.yml
deleted file mode 100644
index 1e344d35885..00000000000
--- a/html/changelogs/mattatlas-monkey.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: MattAtlas
-
-# 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: "Human NPCs and monkeys now have some more interactions."
-  - rscadd: "Monkeys can now take items and throw them. Or shoot guns. Or activate things."