From 4b2c98f919680960bcdf1b3f2a4d770cf45a77e1 Mon Sep 17 00:00:00 2001
From: atermonera <atermonera@gmail.com>
Date: Fri, 8 Jun 2018 12:14:11 -0700
Subject: [PATCH] Updates changelog

---
 html/changelog.html                          | 17 +++++++++
 html/changelogs/.all_changelog.yml           | 16 ++++++++
 html/changelogs/Anewbe - Merc PoIs.yml       | 39 --------------------
 html/changelogs/Anewbe - More Merc PoIs.yml  | 37 -------------------
 html/changelogs/Mechoid - EventBox.yml       |  7 ----
 html/changelogs/Mechoid - Ionrifle.yml       | 36 ------------------
 html/changelogs/Mechoid - Seedvendorhack.yml |  7 ----
 7 files changed, 33 insertions(+), 126 deletions(-)
 delete mode 100644 html/changelogs/Anewbe - Merc PoIs.yml
 delete mode 100644 html/changelogs/Anewbe - More Merc PoIs.yml
 delete mode 100644 html/changelogs/Mechoid - EventBox.yml
 delete mode 100644 html/changelogs/Mechoid - Ionrifle.yml
 delete mode 100644 html/changelogs/Mechoid - Seedvendorhack.yml

diff --git a/html/changelog.html b/html/changelog.html
index d93e00f98cf..9c933a1741d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,23 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">08 June 2018</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Merc mobs in PoIs no longer drop gear. This is to help us balance the PoIs that contain them, and by extension every other PoI.</li>
+				<li class="tweak">Merc mobs have been shuffled around in their PoIs. At some point, this may actually be randomized, but for now, expect slightly different placements.</li>
+				<li class="rscadd">Adds a laser rifle and ion rifle version of the Merc mob, for variety.</li>
+				<li class="tweak">PoI turrets are lethal again, and will likely shoot crawlers.</li>
+				<li class="rscadd">Certain mobs, namely robots and mercs, now have some amount of armor.</li>
+				<li class="rscadd">Ranged mercs will now knife people when cornered, rather than punch them really hard.</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added some background things for Events.</li>
+				<li class="bugfix">Ion rifles hit the correct 3x3 instead of 5x5</li>
+				<li class="rscadd">Seed Storage Vendors are now hackable. Can choose from various lists of concerning plants.</li>
+			</ul>
+
 			<h2 class="date">24 May 2018</h2>
 			<h3 class="author">Anewbe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 88ae4c130d2..56db08c0243 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4140,3 +4140,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   lorwp:
   - tweak: Search and Rescue can now add certain medical restricted items to their
       loadouts
+2018-06-08:
+  Anewbe:
+  - tweak: Merc mobs in PoIs no longer drop gear. This is to help us balance the PoIs
+      that contain them, and by extension every other PoI.
+  - tweak: Merc mobs have been shuffled around in their PoIs. At some point, this
+      may actually be randomized, but for now, expect slightly different placements.
+  - rscadd: Adds a laser rifle and ion rifle version of the Merc mob, for variety.
+  - tweak: PoI turrets are lethal again, and will likely shoot crawlers.
+  - rscadd: Certain mobs, namely robots and mercs, now have some amount of armor.
+  - rscadd: Ranged mercs will now knife people when cornered, rather than punch them
+      really hard.
+  Mechoid:
+  - rscadd: Added some background things for Events.
+  - bugfix: Ion rifles hit the correct 3x3 instead of 5x5
+  - rscadd: Seed Storage Vendors are now hackable. Can choose from various lists of
+      concerning plants.
diff --git a/html/changelogs/Anewbe - Merc PoIs.yml b/html/changelogs/Anewbe - Merc PoIs.yml
deleted file mode 100644
index 464052961f8..00000000000
--- a/html/changelogs/Anewbe - Merc PoIs.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: Anewbe
-
-# 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: "Merc mobs in PoIs no longer drop gear. This is to help us balance the PoIs that contain them, and by extension every other PoI."
-  - tweak: "Merc mobs have been shuffled around in their PoIs. At some point, this may actually be randomized, but for now, expect slightly different placements."
-  - rscadd: "Adds a laser rifle and ion rifle version of the Merc mob, for variety."
-  - tweak: "PoI turrets are lethal again, and will likely shoot crawlers."
diff --git a/html/changelogs/Anewbe - More Merc PoIs.yml b/html/changelogs/Anewbe - More Merc PoIs.yml
deleted file mode 100644
index d13768b1e0b..00000000000
--- a/html/changelogs/Anewbe - More Merc PoIs.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: Anewbe
-
-# 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: "Certain mobs, namely robots and mercs, now have some amount of armor."
-  - rscadd: "Ranged mercs will now knife people when cornered, rather than punch them really hard."
diff --git a/html/changelogs/Mechoid - EventBox.yml b/html/changelogs/Mechoid - EventBox.yml
deleted file mode 100644
index 0cfd1dc7f1a..00000000000
--- a/html/changelogs/Mechoid - EventBox.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Mechoid
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added some background things for Events."
diff --git a/html/changelogs/Mechoid - Ionrifle.yml b/html/changelogs/Mechoid - Ionrifle.yml
deleted file mode 100644
index 3be45359a23..00000000000
--- a/html/changelogs/Mechoid - Ionrifle.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: 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: 
-  - bugfix: "Ion rifles hit the correct 3x3 instead of 5x5"
diff --git a/html/changelogs/Mechoid - Seedvendorhack.yml b/html/changelogs/Mechoid - Seedvendorhack.yml
deleted file mode 100644
index e115c57fa84..00000000000
--- a/html/changelogs/Mechoid - Seedvendorhack.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Mechoid
-
-delete-after: True
-
-changes: 
-  - rscadd: "Seed Storage Vendors are now hackable. Can choose from various lists of concerning plants."