From 053aa03647be20dfb7ed936ab1bf76d01f2a9f67 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 17 Dec 2020 15:25:57 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.12.17.15.25.57"

---
 html/changelog.html                        |  5 +++
 html/changelogs/.all_changelog.yml         |  8 +++++
 html/changelogs/furrycactus - chrimmas.yml | 42 ----------------------
 3 files changed, 13 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/furrycactus - chrimmas.yml

diff --git a/html/changelog.html b/html/changelog.html
index 28fbb7518bf..eb3f0c73536 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,11 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">17 December 2020</h2>
+			<h3 class="author">Furrycactus, Ferner, Happy_Fox updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">NanoTrasen finally began decorating for Christmas time, everyone's favourite commercial holiday. There were some delays due to the whole war and everything, but nothing will stop the Christmas cheer. Not even the mix-up from the fake-snow guy that's led to piles of Moghean sand filling the greenery areas. Whatever. Surely Unathi and people who usually celebrate the holiday during the Summer will be pleased.</li>
+				<li class="imageadd">Added some additional gift sprites by Happy_Fox</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed a maths error that caused flamethrower minimum fuel requirement to be too high.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1f21269fc1c..b42c64d6e0d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17487,6 +17487,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Wowzewow (Wezzy):
   - rscadd: Adds party poppers and confetti. Hooray!
 2020-12-17:
+  Furrycactus, Ferner, Happy_Fox:
+  - maptweak: NanoTrasen finally began decorating for Christmas time, everyone's favourite
+      commercial holiday. There were some delays due to the whole war and everything,
+      but nothing will stop the Christmas cheer. Not even the mix-up from the fake-snow
+      guy that's led to piles of Moghean sand filling the greenery areas. Whatever.
+      Surely Unathi and people who usually celebrate the holiday during the Summer
+      will be pleased.
+  - imageadd: Added some additional gift sprites by Happy_Fox
   Geeves:
   - bugfix: Fixed a maths error that caused flamethrower minimum fuel requirement
       to be too high.
diff --git a/html/changelogs/furrycactus - chrimmas.yml b/html/changelogs/furrycactus - chrimmas.yml
deleted file mode 100644
index 0f6f7483b2c..00000000000
--- a/html/changelogs/furrycactus - chrimmas.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, Ferner, Happy_Fox
-
-# 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: "NanoTrasen finally began decorating for Christmas time, everyone's favourite commercial holiday. There were some delays due to the whole war and everything, but nothing will stop the Christmas cheer. Not even the mix-up from the fake-snow guy that's led to piles of Moghean sand filling the greenery areas. Whatever. Surely Unathi and people who usually celebrate the holiday during the Summer will be pleased."
-  - imageadd: "Added some additional gift sprites by Happy_Fox"
\ No newline at end of file