From fc04df1beb7011f0871e5a66ebb22c9706bc77ee Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 21 Dec 2018 22:29:51 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.21.22.29.51"

---
 html/changelog.html                           |  5 +++
 html/changelogs/.all_changelog.yml            |  4 ++
 .../burgerbb - tesla buff or nerf.yml         | 38 -------------------
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 html/changelogs/burgerbb - tesla buff or nerf.yml

diff --git a/html/changelog.html b/html/changelog.html
index 60329ae6c2e..0e8c0072ff2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,11 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes the roof above the command surface airlock.</li>
 			</ul>
+			<h3 class="author">BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The Tesla can now go up and down z-levels if there isn't an containment in range.</li>
+				<li class="rscadd">The Tesla can not phase throw reinforced floors or reinforced walls.</li>
+			</ul>
 			<h3 class="author">Conspiir updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Moved ponchos up precisely 1 pixel. They fit now. You're welcome.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bcf86d95316..edb084d9fb6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6875,5 +6875,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2018-12-21:
   Arrow768:
   - bugfix: Fixes the roof above the command surface airlock.
+  BurgerBB:
+  - rscadd: The Tesla can now go up and down z-levels if there isn't an containment
+      in range.
+  - rscadd: The Tesla can not phase throw reinforced floors or reinforced walls.
   Conspiir:
   - tweak: Moved ponchos up precisely 1 pixel. They fit now. You're welcome.
diff --git a/html/changelogs/burgerbb - tesla buff or nerf.yml b/html/changelogs/burgerbb - tesla buff or nerf.yml
deleted file mode 100644
index df27ccede70..00000000000
--- a/html/changelogs/burgerbb - tesla buff or nerf.yml	
+++ /dev/null
@@ -1,38 +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: 
-  - rscadd: "The Tesla can now go up and down z-levels if there isn't an containment in range."
-  - rscadd: "The Tesla can not phase throw reinforced floors or reinforced walls."