From 8184f10d2a666a7705aa8eaaee6986c130d594eb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 4 Dec 2018 18:49:31 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.04.18.49.31"

---
 html/changelog.html                |  8 ++++++
 html/changelogs/.all_changelog.yml |  9 +++++++
 html/changelogs/Sidnorman-bot.yml  | 41 ------------------------------
 3 files changed, 17 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/Sidnorman-bot.yml

diff --git a/html/changelog.html b/html/changelog.html
index 25868ec9e0f..fde1bd6f88a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -66,6 +66,14 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Trashcats and guwan can now look just as stupid in galoshes as everyone else. Janitors unite!</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Farmbot now have their own harvest animation.</li>
+				<li class="bugfix">Farmbots now only have one water and use it(they had two because of stupid old code).</li>
+				<li class="bugfix">Merchant now can buy Ultra AC 2 and LBX AC 10 scatterbox instead of generic mech weapon(which doesn't exist)</li>
+				<li class="bugfix">Vendors now accept specific items. For example Chef' cleaver will not be treated as kitchen knife by the Dinnerware vendor.</li>
+				<li class="bugfix">Ghost cannot be teleported by the telescience.</li>
+			</ul>
 			<h3 class="author">Scheveningen updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes an issue where certain R&D parts were not appearing in the protolathe to be built.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8a062b96731..07e11db1e7e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6689,6 +6689,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Kaedwuff:
   - rscadd: Trashcats and guwan can now look just as stupid in galoshes as everyone
       else. Janitors unite!
+  PoZe:
+  - imageadd: Farmbot now have their own harvest animation.
+  - bugfix: Farmbots now only have one water and use it(they had two because of stupid
+      old code).
+  - bugfix: Merchant now can buy Ultra AC 2 and LBX AC 10 scatterbox instead of generic
+      mech weapon(which doesn't exist)
+  - bugfix: Vendors now accept specific items. For example Chef' cleaver will not
+      be treated as kitchen knife by the Dinnerware vendor.
+  - bugfix: Ghost cannot be teleported by the telescience.
   Scheveningen:
   - bugfix: Fixes an issue where certain R&D parts were not appearing in the protolathe
       to be built.
diff --git a/html/changelogs/Sidnorman-bot.yml b/html/changelogs/Sidnorman-bot.yml
deleted file mode 100644
index d439351ff4e..00000000000
--- a/html/changelogs/Sidnorman-bot.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
-#################################
-
-# Your name.
-author: PoZe
-
-# 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:
-  - imageadd: "Farmbot now have their own harvest animation."
-  - bugfix: "Farmbots now only have one water and use it(they had two because of stupid old code)."
-  - bugfix: "Merchant now can buy Ultra AC 2 and LBX AC 10 scatterbox instead of generic mech weapon(which doesn't exist)"
-  - bugfix: "Vendors now accept specific items. For example Chef' cleaver will not be treated as kitchen knife by the Dinnerware vendor."
-  - bugfix: "Ghost cannot be teleported by the telescience."