From e674e5fbb526f98b942eb93ca6eca72f2bb2b50c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 3 Dec 2019 17:31:27 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.12.03.17.31.27"

---
 html/changelog.html                           | 15 +++++++
 html/changelogs/.all_changelog.yml            | 10 +++++
 ...ehab - Response teams species adjusted.yml | 42 -------------------
 html/changelogs/geeves - sandals.yml          |  6 ---
 html/changelogs/wezzy_xmaslightsfix.yml       | 41 ------------------
 5 files changed, 25 insertions(+), 89 deletions(-)
 delete mode 100644 html/changelogs/Aboshehab - Response teams species adjusted.yml
 delete mode 100644 html/changelogs/geeves - sandals.yml
 delete mode 100644 html/changelogs/wezzy_xmaslightsfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 713fd8c57c7..88c4b11f0ba 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,21 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">03 December 2019</h2>
+			<h3 class="author">Aboshehab updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">TCFL are now properly inclusive. You can select any of the station species when joining as the TCFL.</li>
+				<li class="bugfix">You can now properly join freelancer mercenaries as an IPC</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Unathi, Vaurca and Tajara no longer always spawn with sandals, loadout shoes will replace them properly.</li>
+			</ul>
+			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes christmas lights north sprite flipping for no reason.</li>
+			</ul>
+
 			<h2 class="date">02 December 2019</h2>
 			<h3 class="author">Doxxmedearly updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index adf7fd7b378..0372a8996d4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10364,3 +10364,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes invisible surgeon shoes.
   - bugfix: Fixes donut boxes examine not working properly, and surgery tray description
       being one of a donut box.
+2019-12-03:
+  Aboshehab:
+  - bugfix: TCFL are now properly inclusive. You can select any of the station species
+      when joining as the TCFL.
+  - bugfix: You can now properly join freelancer mercenaries as an IPC
+  Geeves:
+  - bugfix: Unathi, Vaurca and Tajara no longer always spawn with sandals, loadout
+      shoes will replace them properly.
+  Wowzewow (Wezzy):
+  - bugfix: Fixes christmas lights north sprite flipping for no reason.
diff --git a/html/changelogs/Aboshehab - Response teams species adjusted.yml b/html/changelogs/Aboshehab - Response teams species adjusted.yml
deleted file mode 100644
index e6b77f22867..00000000000
--- a/html/changelogs/Aboshehab - Response teams species adjusted.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: Aboshehab
-
-# 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: "TCFL are now properly inclusive. You can select any of the station species when joining as the TCFL."
-  - bugfix: "You can now properly join freelancer mercenaries as an IPC"
diff --git a/html/changelogs/geeves - sandals.yml b/html/changelogs/geeves - sandals.yml
deleted file mode 100644
index 3553205d52d..00000000000
--- a/html/changelogs/geeves - sandals.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Unathi, Vaurca and Tajara no longer always spawn with sandals, loadout shoes will replace them properly."
diff --git a/html/changelogs/wezzy_xmaslightsfix.yml b/html/changelogs/wezzy_xmaslightsfix.yml
deleted file mode 100644
index 53562242ace..00000000000
--- a/html/changelogs/wezzy_xmaslightsfix.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: 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: 
-  - bugfix: "Fixes christmas lights north sprite flipping for no reason."