From 2846c3ea4d15e510af91a97e0a60237c7d4e42bb Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Sun, 4 Feb 2018 00:10:23 +0200
Subject: [PATCH] Changelogs, 03FEB2018

---
 html/changelog.html                | 12 ++++++++++
 html/changelogs/.all_changelog.yml |  8 +++++++
 html/changelogs/alberyk-nokois.yml |  5 ----
 html/changelogs/kois.yml           | 38 ------------------------------
 4 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/alberyk-nokois.yml
 delete mode 100644 html/changelogs/kois.yml

diff --git a/html/changelog.html b/html/changelog.html
index 59cae6eb432..5eeda39e7ca 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">04 February 2018</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Sharp weapons and welders are twice as effective in destroying plants.</li>
+				<li class="rscdel">Removed k'ois seeds from the botany's seed storage.</li>
+			</ul>
+			<h3 class="author">LordFowl updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The number of spores released by a plant is now dependent on the plants potency.</li>
+				<li class="balance">K'ois health has been reduced by half.</li>
+			</ul>
+
 			<h2 class="date">31 January 2018</h2>
 			<h3 class="author">LordFowl updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 26456d99312..b52c766edeb 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5127,3 +5127,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   LordFowl:
   - balance: Both versions of K'ois mycosis will mature at a doubled rate.
   - rscadd: Added SSD timers for when examining inactive/disconnected mobs.
+2018-02-04:
+  Alberyk:
+  - rscadd: Sharp weapons and welders are twice as effective in destroying plants.
+  - rscdel: Removed k'ois seeds from the botany's seed storage.
+  LordFowl:
+  - tweak: The number of spores released by a plant is now dependent on the plants
+      potency.
+  - balance: K'ois health has been reduced by half.
diff --git a/html/changelogs/alberyk-nokois.yml b/html/changelogs/alberyk-nokois.yml
deleted file mode 100644
index deba6d68fe0..00000000000
--- a/html/changelogs/alberyk-nokois.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Alberyk
-delete-after: True
-changes: 
-  - rscadd: "Sharp weapons and welders are twice as effective in destroying plants."
-  - rscdel: "Removed k'ois seeds from the botany's seed storage."
diff --git a/html/changelogs/kois.yml b/html/changelogs/kois.yml
deleted file mode 100644
index c91fa9eb4d5..00000000000
--- a/html/changelogs/kois.yml
+++ /dev/null
@@ -1,38 +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
-#################################
-
-# Your name.  
-author: LordFowl
-
-# 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: "The number of spores released by a plant is now dependent on the plants potency."
-  - balance: "K'ois health has been reduced by half."