From 947e7fba7d66d334b86e17351dc48b82f6ec00ea Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 23 Jan 2020 13:23:21 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.01.23.13.23.21"

---
 html/changelog.html                           | 11 +++++
 html/changelogs/.all_changelog.yml            |  6 +++
 .../furrycactus - hot chocolate.yml           | 42 -------------------
 html/changelogs/goret-phonograph-fix.yml      | 41 ------------------
 4 files changed, 17 insertions(+), 83 deletions(-)
 delete mode 100644 html/changelogs/furrycactus - hot chocolate.yml
 delete mode 100644 html/changelogs/goret-phonograph-fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 7b6a246692f..2b1435470f4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">23 January 2020</h2>
+			<h3 class="author">Furrycactus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Added Hot Chocolate to the bar coffee machine and to soft drink dispensers.</li>
+				<li class="imageadd">Replaced the sprite for a glass of hot chocolate with a proper mug sprite.</li>
+			</ul>
+			<h3 class="author">Goret updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Bolted the phonograph in the bar.</li>
+			</ul>
+
 			<h2 class="date">22 January 2020</h2>
 			<h3 class="author">Ferner updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6e9e8426d61..0ebd1f4bc21 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11418,3 +11418,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Dying now properly stops your heartbeat.
   - bugfix: Fixes issue where diona regeneration triggering would depend upon the
       presence of brain damage, which they never have.
+2020-01-23:
+  Furrycactus:
+  - tweak: Added Hot Chocolate to the bar coffee machine and to soft drink dispensers.
+  - imageadd: Replaced the sprite for a glass of hot chocolate with a proper mug sprite.
+  Goret:
+  - tweak: Bolted the phonograph in the bar.
diff --git a/html/changelogs/furrycactus - hot chocolate.yml b/html/changelogs/furrycactus - hot chocolate.yml
deleted file mode 100644
index 71e9b3658fb..00000000000
--- a/html/changelogs/furrycactus - hot chocolate.yml	
+++ /dev/null
@@ -1,42 +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: Furrycactus
-
-# 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: 
-  - tweak: "Added Hot Chocolate to the bar coffee machine and to soft drink dispensers."
-  - imageadd: "Replaced the sprite for a glass of hot chocolate with a proper mug sprite."
diff --git a/html/changelogs/goret-phonograph-fix.yml b/html/changelogs/goret-phonograph-fix.yml
deleted file mode 100644
index 64a5d47dd60..00000000000
--- a/html/changelogs/goret-phonograph-fix.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: Goret
-
-# 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: 
-  - tweak: "Bolted the phonograph in the bar."
\ No newline at end of file