From f58f91f2240f89542cd56808488cb65e9075d5e1 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 17 Dec 2018 10:27:08 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.17.10.27.08"

---
 html/changelog.html                           |  8 ++++
 html/changelogs/.all_changelog.yml            |  5 +++
 .../POSIXCompliant-BugFixPALevelThree.yml     | 37 -------------------
 html/changelogs/burgerbb - vending.yml        | 37 -------------------
 4 files changed, 13 insertions(+), 74 deletions(-)
 delete mode 100644 html/changelogs/POSIXCompliant-BugFixPALevelThree.yml
 delete mode 100644 html/changelogs/burgerbb - vending.yml

diff --git a/html/changelog.html b/html/changelog.html
index 1a94b5665f5..73294e8ec16 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,14 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">17 December 2018</h2>
+			<h3 class="author">BurgerBB, alsoandanswer updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new vending machine sprites.</li>
+			</ul>
+			<h3 class="author">POSIXCompliant updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Particle Accelerators not working when hacked to particle strength level 3. Strength 3 works now, though it is not necessarily a good idea.</li>
+			</ul>
 			<h3 class="author">PoZe updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes hostile mobs not attacking people. My fuckup!</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7f55c1e2d60..8bf40a4cb5a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6857,5 +6857,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: 'Ports three hairstyles from Baystation: Gentle 2, Gentle 2 (Long) and
       Donut Bun.'
 2018-12-17:
+  BurgerBB, alsoandanswer:
+  - rscadd: Added new vending machine sprites.
+  POSIXCompliant:
+  - bugfix: Fixes Particle Accelerators not working when hacked to particle strength
+      level 3. Strength 3 works now, though it is not necessarily a good idea.
   PoZe:
   - bugfix: Fixes hostile mobs not attacking people. My fuckup!
diff --git a/html/changelogs/POSIXCompliant-BugFixPALevelThree.yml b/html/changelogs/POSIXCompliant-BugFixPALevelThree.yml
deleted file mode 100644
index 99cf6c664c7..00000000000
--- a/html/changelogs/POSIXCompliant-BugFixPALevelThree.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: POSIXCompliant
-
-# 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 Particle Accelerators not working when hacked to particle strength level 3. Strength 3 works now, though it is not necessarily a good idea."
diff --git a/html/changelogs/burgerbb - vending.yml b/html/changelogs/burgerbb - vending.yml
deleted file mode 100644
index 3e50e34a033..00000000000
--- a/html/changelogs/burgerbb - vending.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, alsoandanswer
-
-# 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: "Added new vending machine sprites."
\ No newline at end of file