From 1d36bf5f9abba869ac8e3962d052a7d7bb8d6dc0 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Thu, 6 Aug 2020 21:24:21 -0700
Subject: [PATCH] Merge pull request #7438 from Atermonera/changelog

Changelog update
---
 html/changelog.html                           | 23 +++++++++++
 html/changelogs/.all_changelog.yml            | 20 ++++++++++
 html/changelogs/cerebulon - schnemobs.yml     | 36 -----------------
 .../changelogs/forfoxsake - fastmagazines.yml |  6 ---
 html/changelogs/mechoid - exointernals.yml    | 39 -------------------
 html/changelogs/rykka-stormheart-pr-7380.yml  | 38 ------------------
 6 files changed, 43 insertions(+), 119 deletions(-)
 delete mode 100644 html/changelogs/cerebulon - schnemobs.yml
 delete mode 100644 html/changelogs/forfoxsake - fastmagazines.yml
 delete mode 100644 html/changelogs/mechoid - exointernals.yml
 delete mode 100644 html/changelogs/rykka-stormheart-pr-7380.yml

diff --git a/html/changelog.html b/html/changelog.html
index 125d7e4cb19..39c9522a1d7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,29 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">06 August 2020</h2>
+			<h3 class="author">Cerebulon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new mobs Fire Bugs, Ice Hares, Tymisian Moths and Siffets to surface spawnlists. Also added a new dog breed, woof.</li>
+			</ul>
+			<h3 class="author">ForFoxSake updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ported tgstation styled magazine restocking. Hit a bullet on a table or floor with a partially empty magazine to start restocking.</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Exosuits now have internal components, mostly like borgs, but larger.</li>
+				<li class="rscadd">Autolathes can use plastic and plasteel.</li>
+				<li class="rscadd">Autolathes can have tiered recipes, based on their manipulator rating.</li>
+				<li class="tweak">Exosuit base health has been lowered due to the changes to damage processing.</li>
+			</ul>
+			<h3 class="author">Rykka Stormheart updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Blast Doors will now crush people, if they are on the same turf when it closes, and throw them to an adjacent open turf.</li>
+				<li class="rscadd">The damage should be delayed enough that you can walk out of the door before the sprite animation finishes and you will be safe. The delay is being reviewed, and will likely be adjusted after sufficient feedback is gathered.</li>
+				<li class="rscadd">Blast doors and shutters (the types that go on bar/kitchen/etc) will also throw items on their tiles.</li>
+			</ul>
+
 			<h2 class="date">03 August 2020</h2>
 			<h3 class="author">Cerebulon updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c850795c289..0ca89eb0666 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5220,3 +5220,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: The largest change - Cooking takes TIME. Around 6 minutes for the largest
       recipes in the game.
   - rscadd: 'Too many other changes to list - refer to PR #7344 https://github.com/PolarisSS13/Polaris/pull/7344'
+2020-08-06:
+  Cerebulon:
+  - rscadd: Added new mobs Fire Bugs, Ice Hares, Tymisian Moths and Siffets to surface
+      spawnlists. Also added a new dog breed, woof.
+  ForFoxSake:
+  - rscadd: Ported tgstation styled magazine restocking. Hit a bullet on a table or
+      floor with a partially empty magazine to start restocking.
+  Mechoid:
+  - rscadd: Exosuits now have internal components, mostly like borgs, but larger.
+  - rscadd: Autolathes can use plastic and plasteel.
+  - rscadd: Autolathes can have tiered recipes, based on their manipulator rating.
+  - tweak: Exosuit base health has been lowered due to the changes to damage processing.
+  Rykka Stormheart:
+  - rscadd: Blast Doors will now crush people, if they are on the same turf when it
+      closes, and throw them to an adjacent open turf.
+  - rscadd: The damage should be delayed enough that you can walk out of the door
+      before the sprite animation finishes and you will be safe. The delay is being
+      reviewed, and will likely be adjusted after sufficient feedback is gathered.
+  - rscadd: Blast doors and shutters (the types that go on bar/kitchen/etc) will also
+      throw items on their tiles.
diff --git a/html/changelogs/cerebulon - schnemobs.yml b/html/changelogs/cerebulon - schnemobs.yml
deleted file mode 100644
index 76eb15dda69..00000000000
--- a/html/changelogs/cerebulon - schnemobs.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: 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 new mobs Fire Bugs, Ice Hares, Tymisian Moths and Siffets to surface spawnlists. Also added a new dog breed, woof."
diff --git a/html/changelogs/forfoxsake - fastmagazines.yml b/html/changelogs/forfoxsake - fastmagazines.yml
deleted file mode 100644
index a56e4dbaf8b..00000000000
--- a/html/changelogs/forfoxsake - fastmagazines.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: ForFoxSake
-
-delete-after: True
-
-changes: 
-  - rscadd: "Ported tgstation styled magazine restocking. Hit a bullet on a table or floor with a partially empty magazine to start restocking."
diff --git a/html/changelogs/mechoid - exointernals.yml b/html/changelogs/mechoid - exointernals.yml
deleted file mode 100644
index dd25e29efb3..00000000000
--- a/html/changelogs/mechoid - exointernals.yml	
+++ /dev/null
@@ -1,39 +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: Mechoid
-
-# 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: "Exosuits now have internal components."
-  - rscadd: "Autolathes can use plastic and plasteel."
-  - rscadd: "Autolathes can have tiered recipes, based on their manipulator rating."
-  - tweak: "Exosuit base health has been lowered due to the changes to damage processing."
diff --git a/html/changelogs/rykka-stormheart-pr-7380.yml b/html/changelogs/rykka-stormheart-pr-7380.yml
deleted file mode 100644
index d707d2478d0..00000000000
--- a/html/changelogs/rykka-stormheart-pr-7380.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
-#################################
-
-# Your name.  
-author: Rykka Stormheart
-
-# 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: "Blast Doors will now crush someone and yeet them if they are stood inside while closed."
-  - rscadd: "The damage is delayed enough that you can walk out of the door before the sprite animation finishes and you will be safe."
-  - rscadd: "They will also yeet items on their respective tiles, as will shutters (the types that go on bar/kitchen/etc."