From 609cccbf096fe90de5578ff3a531c4370e345a34 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 17 Dec 2019 15:19:53 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.12.17.15.19.53"

---
 html/changelog.html                      | 13 +++++++
 html/changelogs/.all_changelog.yml       |  9 +++++
 html/changelogs/geeves - epistolbuff.yml |  7 ----
 html/changelogs/wezzy_new_forensics.yml  | 43 ------------------------
 4 files changed, 22 insertions(+), 50 deletions(-)
 delete mode 100644 html/changelogs/geeves - epistolbuff.yml
 delete mode 100644 html/changelogs/wezzy_new_forensics.yml

diff --git a/html/changelog.html b/html/changelog.html
index f457b0860dc..740a6244a18 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 December 2019</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The e-pistol now has seven shots, up from five.</li>
+				<li class="tweak">The lethal e-pistol now does 35 damage, up from 30.</li>
+			</ul>
+			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds new forensic cards! Mark out your crimescene with these useless plastic cards! Can be found in boxes in Forensics.</li>
+				<li class="rscadd">Dropsounds. Again.</li>
+				<li class="tweak">Tweaks some sprites regarding forensics.</li>
+			</ul>
+
 			<h2 class="date">16 December 2019</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 098d0d96aaf..1f01885da6a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10678,3 +10678,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Burns now evaporate people's blood. Lasers evaporate less as they are
       more concentrated, while wide burns evaporate more.
   - tweak: Adrenaline has been nerfed.
+2019-12-17:
+  Geeves:
+  - tweak: The e-pistol now has seven shots, up from five.
+  - tweak: The lethal e-pistol now does 35 damage, up from 30.
+  Wowzewow (Wezzy):
+  - rscadd: Adds new forensic cards! Mark out your crimescene with these useless plastic
+      cards! Can be found in boxes in Forensics.
+  - rscadd: Dropsounds. Again.
+  - tweak: Tweaks some sprites regarding forensics.
diff --git a/html/changelogs/geeves - epistolbuff.yml b/html/changelogs/geeves - epistolbuff.yml
deleted file mode 100644
index 2226a5d0585..00000000000
--- a/html/changelogs/geeves - epistolbuff.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - tweak: "The e-pistol now has seven shots, up from five."
-  - tweak: "The lethal e-pistol now does 35 damage, up from 30."
diff --git a/html/changelogs/wezzy_new_forensics.yml b/html/changelogs/wezzy_new_forensics.yml
deleted file mode 100644
index 007cffbaf55..00000000000
--- a/html/changelogs/wezzy_new_forensics.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: Wowzewow (Wezzy)
-
-# 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: "Adds new forensic cards! Mark out your crimescene with these useless plastic cards! Can be found in boxes in Forensics."
-  - rscadd: "Dropsounds. Again."
-  - tweak: "Tweaks some sprites regarding forensics."