From c0f2dbed59d4962cd38b2fa5f6a52d4c7ef80d8c Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 5 Jan 2020 15:08:05 -0800
Subject: [PATCH] last changelog of the year (#6594)

---
 html/changelog.html                           | 19 +++++++++
 html/changelogs/.all_changelog.yml            | 17 ++++++++
 html/changelogs/Cerebulon - Coffee Shop.yml   | 40 -------------------
 .../TheFurryFeline - Bulbs_Recycling.yml      | 36 -----------------
 .../TheFurryFeline - Print_Da_Sprayers.yml    | 36 -----------------
 html/changelogs/atermonera - rad_buff.yml     |  4 --
 6 files changed, 36 insertions(+), 116 deletions(-)
 delete mode 100644 html/changelogs/Cerebulon - Coffee Shop.yml
 delete mode 100644 html/changelogs/TheFurryFeline - Bulbs_Recycling.yml
 delete mode 100644 html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml
 delete mode 100644 html/changelogs/atermonera - rad_buff.yml

diff --git a/html/changelog.html b/html/changelog.html
index f0d7aa83e0..e40bd40264 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,25 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">31 December 2019</h2>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Radiation has been made more potent and is no longer defeated by a thin sheet of lead.</li>
+			</ul>
+			<h3 class="author">Cerebulon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added decaf coffee to the coffee shop.</li>
+				<li class="rscadd">Added 6 types of bagel</li>
+				<li class="maptweak">Modified the coffee shop to have extra counter space and a microwave for bagels.</li>
+				<li class="tweak">Removed chef lock on kitchen cabinet.</li>
+				<li class="spellcheck">Removed reference to outdated skrell lore from naewa cube box.</li>
+			</ul>
+			<h3 class="author">TheFurryFeline updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Changes light replacers to allow you to automatically transfer used bulbs into the item and get a new one every 4 bulbs replaced. Additionally, this allows you to both use the replacer on a box of bulbs to get the bulbs added as well as clicking the item with a box of bulbs to put them inside it.</li>
+				<li class="rscadd">Spray bottles can now be printed in the Autolathe.</li>
+			</ul>
+
 			<h2 class="date">16 December 2019</h2>
 			<h3 class="author">Atermonera updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 274bbd5d28..c229806ec3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4843,3 +4843,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: One holster to each explorer locker.
   - rscdel: Removed the old size modifier traits for mobs.
   - rscadd: Port and tweak of the size modifiers from World Server for mobs.
+2019-12-31:
+  Atermonera:
+  - bugfix: Radiation has been made more potent and is no longer defeated by a thin
+      sheet of lead.
+  Cerebulon:
+  - rscadd: Added decaf coffee to the coffee shop.
+  - rscadd: Added 6 types of bagel
+  - maptweak: Modified the coffee shop to have extra counter space and a microwave
+      for bagels.
+  - tweak: Removed chef lock on kitchen cabinet.
+  - spellcheck: Removed reference to outdated skrell lore from naewa cube box.
+  TheFurryFeline:
+  - tweak: Changes light replacers to allow you to automatically transfer used bulbs
+      into the item and get a new one every 4 bulbs replaced. Additionally, this allows
+      you to both use the replacer on a box of bulbs to get the bulbs added as well
+      as clicking the item with a box of bulbs to put them inside it.
+  - rscadd: Spray bottles can now be printed in the Autolathe.
diff --git a/html/changelogs/Cerebulon - Coffee Shop.yml b/html/changelogs/Cerebulon - Coffee Shop.yml
deleted file mode 100644
index 94650de1f4..0000000000
--- a/html/changelogs/Cerebulon - Coffee Shop.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
-#################################
-
-# Your name.  
-author: Cerebulon
-
-# 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: "Added decaf coffee to the coffee shop."
-  - rscadd: "Added 6 types of bagel"
-  - maptweak: "Modified the coffee shop to have extra counter space and a microwave for bagels."
-  - tweak: "Removed chef lock on kitchen cabinet."
-  - spellcheck: "Removed reference to outdated skrell lore from naewa cube box."
diff --git a/html/changelogs/TheFurryFeline - Bulbs_Recycling.yml b/html/changelogs/TheFurryFeline - Bulbs_Recycling.yml
deleted file mode 100644
index 3e887d8d87..0000000000
--- a/html/changelogs/TheFurryFeline - Bulbs_Recycling.yml	
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.  
-author: TheFurryFeline
-
-# 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: "Changes light replacers to allow you to automatically transfer used bulbs into the item and get a new one every 4 bulbs replaced. Additionally, this allows you to both use the replacer on a box of bulbs to get the bulbs added as well as clicking the item with a box of bulbs to put them inside it."
\ No newline at end of file
diff --git a/html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml b/html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml
deleted file mode 100644
index 338cf0d9e4..0000000000
--- a/html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml	
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.  
-author: TheFurryFeline
-
-# 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: "Allows printing of a spray bottle in the Autolathe."
\ No newline at end of file
diff --git a/html/changelogs/atermonera - rad_buff.yml b/html/changelogs/atermonera - rad_buff.yml
deleted file mode 100644
index 9b8c3b8afa..0000000000
--- a/html/changelogs/atermonera - rad_buff.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Atermonera
-delete-after: True
-changes: 
-  - bugfix: "Radiation has been made more potent and is no longer defeated by a thin sheet of lead."