From 538751ae92824e72f6ee1211129ed7b04e6f70bc Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 11 Dec 2018 19:44:36 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.11.19.44.36"

---
 html/changelog.html                |  1 +
 html/changelogs/.all_changelog.yml |  2 ++
 html/changelogs/burgerbb- epi.yml  | 37 ------------------------------
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/burgerbb- epi.yml

diff --git a/html/changelog.html b/html/changelog.html
index ff23f9752e5..d608c26e0a1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,6 +65,7 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Improved the gamemode start fail messages to better explain why a gamemode failed to start.</li>
 				<li class="tweak">Ninja requires at least 15 players to start on secret. Wizard requires at least 15 players to start on secret as well.</li>
+				<li class="experiment">Reworked atropine and epinephrine so it works as intended. Epinephrine overdose can now cause heart damage as well as hyperzine-like effects.</li>
 			</ul>
 			<h3 class="author">Scheveningen updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f345f7f2768..d6640585151 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6783,6 +6783,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       failed to start.
   - tweak: Ninja requires at least 15 players to start on secret. Wizard requires
       at least 15 players to start on secret as well.
+  - experiment: Reworked atropine and epinephrine so it works as intended. Epinephrine
+      overdose can now cause heart damage as well as hyperzine-like effects.
   Scheveningen:
   - bugfix: Fixes an issue with pins not spawning in the RD's firing pin box.
   - bugfix: Adds in a fix PoZe made to the formula for farmbot behavior. You could
diff --git a/html/changelogs/burgerbb- epi.yml b/html/changelogs/burgerbb- epi.yml
deleted file mode 100644
index 74afe3edf39..00000000000
--- a/html/changelogs/burgerbb- epi.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: 
-  - experiment: "Reworked atropine and epinephrine so it works as intended. Epinephrine overdose can now cause heart damage as well as hyperzine-like effects."