From fdd47cd861660c0074be7c363a032c3330d27c4e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 1 Oct 2020 04:46:34 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.10.01.04.46.34"

---
 html/changelog.html                      | 14 ++++++++
 html/changelogs/.all_changelog.yml       | 20 +++++++++++
 html/changelogs/alberyk-creaturenerf.yml |  6 ----
 html/changelogs/chemistry_changes.yml    | 45 ------------------------
 4 files changed, 34 insertions(+), 51 deletions(-)
 delete mode 100644 html/changelogs/alberyk-creaturenerf.yml
 delete mode 100644 html/changelogs/chemistry_changes.yml

diff --git a/html/changelog.html b/html/changelog.html
index db7503199ae..d96feb09ae0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">01 October 2020</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Summon creature swarm should no longer summon ten mobs, it will only spawn two now.</li>
+			</ul>
+			<h3 class="author">Kermit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Pill labels now have doses listed on them. Vague pill names such as 'sleeping pill' and 'anti-toxin' have been replaced with the proper names; 'soporific', 'dylovene'.</li>
+				<li class="tweak">RMT has been tweaked to avoid throwing up due to pills going over the stomach capacity. 1 pill now contains 15u, as opposed to 30u; 10 pills per bottle, instead of 7 - should last 4 hours.</li>
+				<li class="balance">Saline Plus has been nerfed and is no longer equivalanet to 3 blood bags. The metabolisation rate has been increased to achieve this, so drips should be set to ~1.5u/t instead of ~0.8u/t.</li>
+				<li class="tweak">Saline Plus' recipe has been simplified a tad following feedback, but remains expensive and a degree difficult to make. It is now 2 parts Water, 0.2 parts Sugar, 0.4 parts Salt.</li>
+				<li class="tweak">Perconol bottles will now appear in NanoMed Venders for use treating minor pain. Mortaphenyl is more suited for treating severe pain due to the side-effects that come with it.</li>
+			</ul>
+
 			<h2 class="date">29 September 2020</h2>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1214ed01fb0..7ab4606b3bf 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15880,3 +15880,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   mikomyazaki:
   - bugfix: Faction job-species blacklists will no longer be nulled under some circumstances,
       allowing invalid job-species combinations.
+2020-10-01:
+  Alberyk:
+  - tweak: Summon creature swarm should no longer summon ten mobs, it will only spawn
+      two now.
+  Kermit:
+  - tweak: Pill labels now have doses listed on them. Vague pill names such as 'sleeping
+      pill' and 'anti-toxin' have been replaced with the proper names; 'soporific',
+      'dylovene'.
+  - tweak: RMT has been tweaked to avoid throwing up due to pills going over the stomach
+      capacity. 1 pill now contains 15u, as opposed to 30u; 10 pills per bottle, instead
+      of 7 - should last 4 hours.
+  - balance: Saline Plus has been nerfed and is no longer equivalanet to 3 blood bags.
+      The metabolisation rate has been increased to achieve this, so drips should
+      be set to ~1.5u/t instead of ~0.8u/t.
+  - tweak: Saline Plus' recipe has been simplified a tad following feedback, but remains
+      expensive and a degree difficult to make. It is now 2 parts Water, 0.2 parts
+      Sugar, 0.4 parts Salt.
+  - tweak: Perconol bottles will now appear in NanoMed Venders for use treating minor
+      pain. Mortaphenyl is more suited for treating severe pain due to the side-effects
+      that come with it.
diff --git a/html/changelogs/alberyk-creaturenerf.yml b/html/changelogs/alberyk-creaturenerf.yml
deleted file mode 100644
index 83ebec33d95..00000000000
--- a/html/changelogs/alberyk-creaturenerf.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Alberyk
-
-delete-after: True
-
-changes: 
-  - tweak: "Summon creature swarm should no longer summon ten mobs, it will only spawn two now."
diff --git a/html/changelogs/chemistry_changes.yml b/html/changelogs/chemistry_changes.yml
deleted file mode 100644
index c64c47cb70b..00000000000
--- a/html/changelogs/chemistry_changes.yml
+++ /dev/null
@@ -1,45 +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: Kermit
-
-# 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: "Pill labels now have doses listed on them. Vague pill names such as 'sleeping pill' and 'anti-toxin' have been replaced with the proper names; 'soporific', 'dylovene'."
-  - tweak: "RMT has been tweaked to avoid throwing up due to pills going over the stomach capacity. 1 pill now contains 15u, as opposed to 30u; 10 pills per bottle, instead of 7 - should last 4 hours."
-  - balance: "Saline Plus has been nerfed and is no longer equivalanet to 3 blood bags. The metabolisation rate has been increased to achieve this, so drips should be set to ~1.5u/t instead of ~0.8u/t."
-  - tweak: "Saline Plus' recipe has been simplified a tad following feedback, but remains expensive and a degree difficult to make. It is now 2 parts Water, 0.2 parts Sugar, 0.4 parts Salt."
-  - tweak: "Perconol bottles will now appear in NanoMed Venders for use treating minor pain. Mortaphenyl is more suited for treating severe pain due to the side-effects that come with it."