From 68d9f474b59f8364af26593ded2d258f66cd4637 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 21 Sep 2019 17:29:55 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.09.21.17.29.55"

---
 html/changelog.html                          |  9 +++++
 html/changelogs/.all_changelog.yml           |  7 ++++
 html/changelogs/190921-bugfix_energy.yml     | 40 -------------------
 html/changelogs/190921-bugfix_exoduscont.yml | 41 --------------------
 html/changelogs/apcs and photos.yml          |  4 --
 5 files changed, 16 insertions(+), 85 deletions(-)
 delete mode 100644 html/changelogs/190921-bugfix_energy.yml
 delete mode 100644 html/changelogs/190921-bugfix_exoduscont.yml
 delete mode 100644 html/changelogs/apcs and photos.yml

diff --git a/html/changelog.html b/html/changelog.html
index 780d1a5c660..349315a60dd 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,15 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">21 September 2019</h2>
+			<h3 class="author">Ferner updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed some energy melee weapons being unable to be picked up after they've been dropped, e.g. e-axe, e-glaive and power swords.</li>
+				<li class="maptweak">Fixed engine blast doors opening during power failures, added a request console to the rep office, added chem heaters to the chem labs, misc fixes.</li>
+			</ul>
+			<h3 class="author">Karolis2011 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Now APCs look decently on cameras.</li>
+			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">The gatling laser no longer gets stuck in a state of locked up when you move while charging it.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6e3a6b20799..c13e119d67b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9089,6 +9089,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Karolis2011:
   - rscadd: Added custom announcement with custom sound tool for more immersive events.
 2019-09-21:
+  Ferner:
+  - bugfix: Fixed some energy melee weapons being unable to be picked up after they've
+      been dropped, e.g. e-axe, e-glaive and power swords.
+  - maptweak: Fixed engine blast doors opening during power failures, added a request
+      console to the rep office, added chem heaters to the chem labs, misc fixes.
+  Karolis2011:
+  - bugfix: Now APCs look decently on cameras.
   Skull132:
   - bugfix: The gatling laser no longer gets stuck in a state of locked up when you
       move while charging it.
diff --git a/html/changelogs/190921-bugfix_energy.yml b/html/changelogs/190921-bugfix_energy.yml
deleted file mode 100644
index 01009f5d93f..00000000000
--- a/html/changelogs/190921-bugfix_energy.yml
+++ /dev/null
@@ -1,40 +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: Ferner
-# 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: "Fixed some energy melee weapons being unable to be picked up after they've been dropped, e.g. e-axe, e-glaive and power swords."
diff --git a/html/changelogs/190921-bugfix_exoduscont.yml b/html/changelogs/190921-bugfix_exoduscont.yml
deleted file mode 100644
index 81a7faf0b6b..00000000000
--- a/html/changelogs/190921-bugfix_exoduscont.yml
+++ /dev/null
@@ -1,41 +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: Ferner
-
-# 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: 
-  - maptweak: "Fixed engine blast doors opening during power failures, added a request console to the rep office, added chem heaters to the chem labs, misc fixes."
diff --git a/html/changelogs/apcs and photos.yml b/html/changelogs/apcs and photos.yml
deleted file mode 100644
index 373459711fd..00000000000
--- a/html/changelogs/apcs and photos.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Karolis2011
-delete-after: True
-changes: 
-  - bugfix: "Now APCs look decently on cameras."