From 7e4041671ebc6443bc5d1e59782e05e66069c2cf Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 5 Nov 2018 20:40:17 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.11.05.20.40.17"

---
 html/changelog.html                   |  7 +++++
 html/changelogs/.all_changelog.yml    |  9 ++++++
 html/changelogs/Arrow768-Bugfixes.yml | 41 ---------------------------
 3 files changed, 16 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/Arrow768-Bugfixes.yml

diff --git a/html/changelog.html b/html/changelog.html
index e4a1d08fdae..2425c509da8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,13 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">05 November 2018</h2>
+			<h3 class="author">Arrow768 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">NanoTrasen Engineers have reevaluated their design and changed the networks of the cams in the bar/kitchen/hydro/library to service.</li>
+				<li class="bugfix">NanoTrasen Scientists have updated the L6-Saw to enalbe user to better determine how much ammunition remains.</li>
+				<li class="bugfix">CCIA has provided additional monkey cubes to xenobio in the hopes of reducing incidents where xenobiologists feed themselvs to the slimes.</li>
+				<li class="tweak">NanoTrasen Scientists have found a way to increase the burn duration of the flamethrower.</li>
+			</ul>
 			<h3 class="author">BurgerBB updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed inhalers not working. Fixed overmixing issue that caused issues with temperatures. Reduced burn damage from initial contact with hot reagents.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3fea2901d14..367b913cf69 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6465,6 +6465,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Zippo messages are no longer red. The description has been updated to make
       it more clear that it has flavor messages.
 2018-11-05:
+  Arrow768:
+  - bugfix: NanoTrasen Engineers have reevaluated their design and changed the networks
+      of the cams in the bar/kitchen/hydro/library to service.
+  - bugfix: NanoTrasen Scientists have updated the L6-Saw to enalbe user to better
+      determine how much ammunition remains.
+  - bugfix: CCIA has provided additional monkey cubes to xenobio in the hopes of reducing
+      incidents where xenobiologists feed themselvs to the slimes.
+  - tweak: NanoTrasen Scientists have found a way to increase the burn duration of
+      the flamethrower.
   BurgerBB:
   - bugfix: Fixed inhalers not working. Fixed overmixing issue that caused issues
       with temperatures. Reduced burn damage from initial contact with hot reagents.
diff --git a/html/changelogs/Arrow768-Bugfixes.yml b/html/changelogs/Arrow768-Bugfixes.yml
deleted file mode 100644
index f04f4ca4a6e..00000000000
--- a/html/changelogs/Arrow768-Bugfixes.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: Arrow768
-
-# 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: "NanoTrasen Engineers have reevaluated their design and changed the networks of the cams in the bar/kitchen/hydro/library to service."
-  - bugfix: "NanoTrasen Scientists have updated the L6-Saw to enalbe user to better determine how much ammunition remains."
-  - bugfix: "CCIA has provided additional monkey cubes to xenobio in the hopes of reducing incidents where xenobiologists feed themselvs to the slimes."
-  - tweak: "NanoTrasen Scientists have found a way to increase the burn duration of the flamethrower."
-