From 0563f2ec6a67abe2126f5d603a349fcd971ef6b9 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 27 Jan 2019 15:32:59 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.01.27.15.32.59"

---
 html/changelog.html                 |  6 ++++
 html/changelogs/.all_changelog.yml  |  7 +++++
 html/changelogs/Sindorman-tesla.yml | 43 -----------------------------
 html/changelogs/albery-box.yml      |  6 ----
 4 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 html/changelogs/Sindorman-tesla.yml
 delete mode 100644 html/changelogs/albery-box.yml

diff --git a/html/changelog.html b/html/changelog.html
index ed3122b7717..caaa9cc9654 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,7 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Black k'ois is faster but less lethal now.</li>
 				<li class="tweak">Pain related effects, such as stun batons and pepperspray, will now properly take in consideration other factors, like painkillers.</li>
+				<li class="tweak">Replaced the tranquilizer gun magazine in the head of security locker with a box full of darts.</li>
 			</ul>
 			<h3 class="author">Alberyk, Bygonehero updated:</h3>
 			<ul class="changes bgimages16">
@@ -70,6 +71,11 @@
 			<ul class="changes bgimages16">
 				<li class="backend">Changed the name of the logfiles to include the gameid.</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Tesla now can generate miniballs. And actually dies if it ha no energy</li>
+				<li class="tweak">There is no max limit of balls, but if Tesla has 9 or more balls it will start melting down tesla coils and grounding rods. If Tesla has 10 or more balls it will start to target emitters and melt them as well.</li>
+			</ul>
 
 			<h2 class="date">26 January 2019</h2>
 			<h3 class="author">Alberyk updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 07d9f426266..1c3757fdc0a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7158,7 +7158,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Black k'ois is faster but less lethal now.
   - tweak: Pain related effects, such as stun batons and pepperspray, will now properly
       take in consideration other factors, like painkillers.
+  - tweak: Replaced the tranquilizer gun magazine in the head of security locker with
+      a box full of darts.
   Alberyk, Bygonehero:
   - rscadd: Added two new vaurca body markings.
   Arrow768:
   - backend: Changed the name of the logfiles to include the gameid.
+  PoZe:
+  - bugfix: Tesla now can generate miniballs. And actually dies if it ha no energy
+  - tweak: There is no max limit of balls, but if Tesla has 9 or more balls it will
+      start melting down tesla coils and grounding rods. If Tesla has 10 or more balls
+      it will start to target emitters and melt them as well.
diff --git a/html/changelogs/Sindorman-tesla.yml b/html/changelogs/Sindorman-tesla.yml
deleted file mode 100644
index b0b60f9b62a..00000000000
--- a/html/changelogs/Sindorman-tesla.yml
+++ /dev/null
@@ -1,43 +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
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# 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: 
-  - bugfix: "Tesla now can generate miniballs. And actually dies if it ha no energy"
-  - tweak: "There is no max limit of balls, but if Tesla has 9 or more balls it will start melting down tesla coils and grounding rods. If Tesla has 10 or more balls it will start to target emitters and melt them as well."
-
diff --git a/html/changelogs/albery-box.yml b/html/changelogs/albery-box.yml
deleted file mode 100644
index 3d14cec053e..00000000000
--- a/html/changelogs/albery-box.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Alberyk
-
-delete-after: True
-
-changes: 
-  - tweak: "Replaced the tranquilizer gun magazine in the head of security locker with a box full of darts."