From 7b5f82d504e735937edada34feedb722d95366bb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 17 Nov 2018 19:41:11 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.11.17.19.41.11"

---
 html/changelog.html                         |  9 +++++
 html/changelogs/.all_changelog.yml          | 10 ++++++
 html/changelogs/burgerbb - BRAIN DAMAGE.yml | 37 -------------------
 html/changelogs/burgerbb-changelog.yml      | 39 ---------------------
 4 files changed, 19 insertions(+), 76 deletions(-)
 delete mode 100644 html/changelogs/burgerbb - BRAIN DAMAGE.yml
 delete mode 100644 html/changelogs/burgerbb-changelog.yml

diff --git a/html/changelog.html b/html/changelog.html
index ce663529771..7ec7549eaea 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,15 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 November 2018</h2>
+			<h3 class="author">BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The piano in the bar display case can no longer be played (For real this time).</li>
+				<li class="balance">Reduces maximum possible telecrystals in the vault from 75 to 45. Removes HAPT, military, and combat rigsuit from the vault.</li>
+				<li class="maptweak">Added one additional turret to the vault interior. Readds missing money freezer to the vault and improves its contents. Added a randomly spawned prototype gun/kinetic accelerator to the vault.</li>
+				<li class="bugfix">Fixes Mannitol and Epinephrine killing people instead of healing them.</li>
+			</ul>
+
 			<h2 class="date">16 November 2018</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7ae485d4dd0..3670ba11c0d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6569,3 +6569,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed the access for xenobiology Nanomeds.
   - maptweak: Completely overhauled the vault by moving it to the main level and adding
       various ways for antags to break in.
+2018-11-17:
+  BurgerBB:
+  - bugfix: The piano in the bar display case can no longer be played (For real this
+      time).
+  - balance: Reduces maximum possible telecrystals in the vault from 75 to 45. Removes
+      HAPT, military, and combat rigsuit from the vault.
+  - maptweak: Added one additional turret to the vault interior. Readds missing money
+      freezer to the vault and improves its contents. Added a randomly spawned prototype
+      gun/kinetic accelerator to the vault.
+  - bugfix: Fixes Mannitol and Epinephrine killing people instead of healing them.
diff --git a/html/changelogs/burgerbb - BRAIN DAMAGE.yml b/html/changelogs/burgerbb - BRAIN DAMAGE.yml
deleted file mode 100644
index d0e3c17b5bf..00000000000
--- a/html/changelogs/burgerbb - BRAIN DAMAGE.yml	
+++ /dev/null
@@ -1,37 +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: BurgerBB
-
-# 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: "Fixes Mannitol and Epinephrine killing people instead of healing them."
diff --git a/html/changelogs/burgerbb-changelog.yml b/html/changelogs/burgerbb-changelog.yml
deleted file mode 100644
index c819b28d17c..00000000000
--- a/html/changelogs/burgerbb-changelog.yml
+++ /dev/null
@@ -1,39 +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: BurgerBB
-
-# 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: "The piano in the bar display case can no longer be played (For real this time)."
-  - balance: "Reduces maximum possible telecrystals in the vault from 75 to 45. Removes HAPT, military, and combat rigsuit from the vault."
-  - maptweak: "Added one additional turret to the vault interior. Readds missing money freezer to the vault and improves its contents. Added a randomly spawned prototype gun/kinetic accelerator to the vault."