From 0ff8e84fcd995d1317010ecc27b93ef7345aac44 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 15 Sep 2019 13:09:00 -0800
Subject: [PATCH] changelog (#6448)

---
 html/changelog.html                           | 29 ++++++++++++++
 html/changelogs/.all_changelog.yml            | 21 ++++++++++
 html/changelogs/Heroman3003 - bellfixes.yml   | 38 ------------------
 .../MisterLayne - conductivity_fix.yml        | 36 -----------------
 .../MisterLayne - glass_shard_self_harm.yml   | 36 -----------------
 html/changelogs/Novacat - MREs.yml            | 37 ------------------
 html/changelogs/Woodrat - Vendor Addition.yml | 39 -------------------
 html/changelogs/chaoko99 - stomach_pump.yml   | 36 -----------------
 8 files changed, 50 insertions(+), 222 deletions(-)
 delete mode 100644 html/changelogs/Heroman3003 - bellfixes.yml
 delete mode 100644 html/changelogs/MisterLayne - conductivity_fix.yml
 delete mode 100644 html/changelogs/MisterLayne - glass_shard_self_harm.yml
 delete mode 100644 html/changelogs/Novacat - MREs.yml
 delete mode 100644 html/changelogs/Woodrat - Vendor Addition.yml
 delete mode 100644 html/changelogs/chaoko99 - stomach_pump.yml

diff --git a/html/changelog.html b/html/changelog.html
index a1b7e3bd02d..71ae05fb380 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,35 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">07 September 2019</h2>
+			<h3 class="author">Heroman3003 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Desk bells can now be picked up like normal items.</li>
+				<li class="tweak">Desk bells can now be deconstructed with a wrench while on the ground.</li>
+				<li class="tweak">Desk bells can now only be made out of steel.</li>
+			</ul>
+			<h3 class="author">MisterLayne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Material weapons that should not conduct, do not conduct.</li>
+				<li class="tweak">Glass shards now do damage when you attack with them, based on the type of gloves you are wearing.</li>
+			</ul>
+			<h3 class="author">Novacat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ports MREs from Baystation, and adds a few supply crates with them to cargo.</li>
+				<li class="rscadd">Adds liquidprotein rations, currently only found in emergency MREs.</li>
+			</ul>
+			<h3 class="author">Woodrat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Mining vendor added to cargo foyer.</li>
+				<li class="rscadd">Explorer vendor added to research foyer.</li>
+				<li class="rscadd">Handful of more pipe clamps added to engineering (atmos monitoring and EVA storage).</li>
+				<li class="tweak">Adjustment to layout of chapel mass driver.</li>
+			</ul>
+			<h3 class="author">chaoko99 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ported Bay's stomach pump.</li>
+			</ul>
+
 			<h2 class="date">21 August 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 fe2730f0679..7c6b2ae448d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4743,3 +4743,24 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       for the solgov uniforms to their own dmi.
   - bugfix: Fixed storage vests and drop pouches disappearing when one rolls down
       a uniform.
+2019-09-07:
+  Heroman3003:
+  - tweak: Desk bells can now be picked up like normal items.
+  - tweak: Desk bells can now be deconstructed with a wrench while on the ground.
+  - tweak: Desk bells can now only be made out of steel.
+  MisterLayne:
+  - tweak: Material weapons that should not conduct, do not conduct.
+  - tweak: Glass shards now do damage when you attack with them, based on the type
+      of gloves you are wearing.
+  Novacat:
+  - rscadd: Ports MREs from Baystation, and adds a few supply crates with them to
+      cargo.
+  - rscadd: Adds liquidprotein rations, currently only found in emergency MREs.
+  Woodrat:
+  - rscadd: Mining vendor added to cargo foyer.
+  - rscadd: Explorer vendor added to research foyer.
+  - rscadd: Handful of more pipe clamps added to engineering (atmos monitoring and
+      EVA storage).
+  - tweak: Adjustment to layout of chapel mass driver.
+  chaoko99:
+  - rscadd: Ported Bay's stomach pump.
diff --git a/html/changelogs/Heroman3003 - bellfixes.yml b/html/changelogs/Heroman3003 - bellfixes.yml
deleted file mode 100644
index dd3a5a712e0..00000000000
--- a/html/changelogs/Heroman3003 - bellfixes.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: Heroman3003
-
-# 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: "Desk bells can now be picked up like normal items."
-  - tweak: "Desk bells can now be deconstructed with a wrench while on the ground."
-  - tweak: "Desk bells can now only be made out of steel."
diff --git a/html/changelogs/MisterLayne - conductivity_fix.yml b/html/changelogs/MisterLayne - conductivity_fix.yml
deleted file mode 100644
index 5d8d4a06b7c..00000000000
--- a/html/changelogs/MisterLayne - conductivity_fix.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: MisterLayne
-
-# 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: "Material weapons that should not conduct, do not conduct."
diff --git a/html/changelogs/MisterLayne - glass_shard_self_harm.yml b/html/changelogs/MisterLayne - glass_shard_self_harm.yml
deleted file mode 100644
index dd0c47bf857..00000000000
--- a/html/changelogs/MisterLayne - glass_shard_self_harm.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: MisterLayne
-
-# 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: "Glass shards now do damage when you attack with them, based on the type of gloves you are wearing."
diff --git a/html/changelogs/Novacat - MREs.yml b/html/changelogs/Novacat - MREs.yml
deleted file mode 100644
index 869135e3fbb..00000000000
--- a/html/changelogs/Novacat - MREs.yml	
+++ /dev/null
@@ -1,37 +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: Novacat
-
-# 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: "Ports MREs from Baystation, and adds a few supply crates with them to cargo."
-  - rscadd: "Adds liquidprotein rations, currently only found in emergency MREs."
\ No newline at end of file
diff --git a/html/changelogs/Woodrat - Vendor Addition.yml b/html/changelogs/Woodrat - Vendor Addition.yml
deleted file mode 100644
index fd3b106f49d..00000000000
--- a/html/changelogs/Woodrat - Vendor Addition.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: Woodrat
-
-# 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: "Mining vendor added to cargo foyer."
-  - rscadd: "Explorer vendor added to research foyer."
-  - rscadd: "Handful of more pipe clamps added to engineering (atmos monitoring and EVA storage)."
-  - tweak: "Adjustment to layout of chapel mass driver."
\ No newline at end of file
diff --git a/html/changelogs/chaoko99 - stomach_pump.yml b/html/changelogs/chaoko99 - stomach_pump.yml
deleted file mode 100644
index ff753858ebb..00000000000
--- a/html/changelogs/chaoko99 - stomach_pump.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
-################################# hey can we PLEASE get a changelog bot already
-
-# Your name.  
-author: chaoko99
-
-# 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: "Ported Bay's stomach pump."
\ No newline at end of file