From 13f8b97595a83597fac3aecba771c14b3c70399d Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Fri, 8 Jul 2016 18:18:51 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                        | 29 +++++++++++++++
 html/changelogs/.all_changelog.yml         | 31 ++++++++++++++++
 html/changelogs/EmperorJon - beruang.yml   | 39 --------------------
 html/changelogs/Neerti-AICoreUpdate.yml    | 41 ----------------------
 html/changelogs/Sin4_cooler-bench-lamp.yml | 38 --------------------
 html/changelogs/Yoshax - drinks.yml        | 36 -------------------
 html/changelogs/Yoshax - tajhair.yml       | 36 -------------------
 7 files changed, 60 insertions(+), 190 deletions(-)
 delete mode 100644 html/changelogs/EmperorJon - beruang.yml
 delete mode 100644 html/changelogs/Neerti-AICoreUpdate.yml
 delete mode 100644 html/changelogs/Sin4_cooler-bench-lamp.yml
 delete mode 100644 html/changelogs/Yoshax - drinks.yml
 delete mode 100644 html/changelogs/Yoshax - tajhair.yml

diff --git a/html/changelog.html b/html/changelog.html
index 60e522a07a8..a39eaffd7a1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,35 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">08 July 2016</h2>
+			<h3 class="author">EmperorJon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds admin functionality to call a trader ship event with the Beruang in the same manner as ERT dispatches.</li>
+				<li class="rscadd">Adds a Trader 'antagonist' as they use the antagonist framework. Not considered an actual antagonist, like the ERT.</li>
+				<li class="maptweak">Alters Beruang base to provide some clothing for Traders plus a locked-down area for admins to spawn cargo.</li>
+				<li class="maptweak">Alters Beruang access to a new Trader-ID-only access requirement.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">Restructred the AI core massively, and the upload slightly.</li>
+				<li class="rscadd">Adds a new material type, called Durasteel, which is made from plasteel and diamonds.  It's incredibly tough and also reflective.  The inner walls of the AI core contain this new material to protect it.</li>
+				<li class="rscadd">New turret subtype just for the AI core, that is more durable, has a chance to shrug off EMP, and fires xray lasers.  They even turn green.</li>
+				<li class="tweak">Turrets now wait to go back down in their covers upon losing sight of a target.</li>
+				<li class="tweak">Emitters now have health, and can be damaged by projectiles.  They will explode on death.</li>
+				<li class="tweak">Critical APCs (the type found in the engine and AI core) are now more resistant to EMP.  Equipment and Enviroment stays on during an EMP, and less of the cell is drained.</li>
+			</ul>
+			<h3 class="author">Sin4 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added benches.</li>
+				<li class="rscadd">Added floor lamps.</li>
+				<li class="rscadd">Added water-cooler cup dispenser.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds recipes for four new non-alcoholic cocktails. Shirley Temples, Roy Rogers, Arnold Palmers and Collins Mixes.</li>
+				<li class="rscadd">Adds five new Tajaran hairstyles ported from Aurora.</li>
+			</ul>
+
 			<h2 class="date">01 July 2016</h2>
 			<h3 class="author">Aztectornado updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b6192832205..5b93c03c73f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2466,3 +2466,34 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       takes 60 seconds.
   Zuhayr:
   - rscadd: Ports/adapted several kitchen machines from Apollo Station.
+2016-07-08:
+  EmperorJon:
+  - rscadd: Adds admin functionality to call a trader ship event with the Beruang
+      in the same manner as ERT dispatches.
+  - rscadd: Adds a Trader 'antagonist' as they use the antagonist framework. Not considered
+      an actual antagonist, like the ERT.
+  - maptweak: Alters Beruang base to provide some clothing for Traders plus a locked-down
+      area for admins to spawn cargo.
+  - maptweak: Alters Beruang access to a new Trader-ID-only access requirement.
+  Neerti:
+  - maptweak: Restructred the AI core massively, and the upload slightly.
+  - rscadd: Adds a new material type, called Durasteel, which is made from plasteel
+      and diamonds.  It's incredibly tough and also reflective.  The inner walls of
+      the AI core contain this new material to protect it.
+  - rscadd: New turret subtype just for the AI core, that is more durable, has a chance
+      to shrug off EMP, and fires xray lasers.  They even turn green.
+  - tweak: Turrets now wait to go back down in their covers upon losing sight of a
+      target.
+  - tweak: Emitters now have health, and can be damaged by projectiles.  They will
+      explode on death.
+  - tweak: Critical APCs (the type found in the engine and AI core) are now more resistant
+      to EMP.  Equipment and Enviroment stays on during an EMP, and less of the cell
+      is drained.
+  Sin4:
+  - rscadd: Added benches.
+  - rscadd: Added floor lamps.
+  - rscadd: Added water-cooler cup dispenser.
+  Yoshax:
+  - rscadd: Adds recipes for four new non-alcoholic cocktails. Shirley Temples, Roy
+      Rogers, Arnold Palmers and Collins Mixes.
+  - rscadd: Adds five new Tajaran hairstyles ported from Aurora.
diff --git a/html/changelogs/EmperorJon - beruang.yml b/html/changelogs/EmperorJon - beruang.yml
deleted file mode 100644
index e553db6a37d..00000000000
--- a/html/changelogs/EmperorJon - beruang.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: EmperorJon
-
-# 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: "Adds admin functionality to call a trader ship event with the Beruang in the same manner as ERT dispatches."
-  - rscadd: "Adds a Trader 'antagonist' as they use the antagonist framework. Not considered an actual antagonist, like the ERT."
-  - maptweak: "Alters Beruang base to provide some clothing for Traders plus a locked-down area for admins to spawn cargo."
-  - maptweak: "Alters Beruang access to a new Trader-ID-only access requirement."
\ No newline at end of file
diff --git a/html/changelogs/Neerti-AICoreUpdate.yml b/html/changelogs/Neerti-AICoreUpdate.yml
deleted file mode 100644
index 163d0b88baa..00000000000
--- a/html/changelogs/Neerti-AICoreUpdate.yml
+++ /dev/null
@@ -1,41 +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: Neerti
-
-# 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: 
-  - maptweak: "Restructred the AI core massively, and the upload slightly."
-  - rscadd: "Adds a new material type, called Durasteel, which is made from plasteel and diamonds.  It's incredibly tough and also reflective.  The inner walls of the AI core contain this new material to protect it."
-  - rscadd: "New turret subtype just for the AI core, that is more durable, has a chance to shrug off EMP, and fires xray lasers.  They even turn green."
-  - tweak: "Turrets now wait to go back down in their covers upon losing sight of a target."
-  - tweak: "Emitters now have health, and can be damaged by projectiles.  They will explode on death."
-  - tweak: "Critical APCs (the type found in the engine and AI core) are now more resistant to EMP.  Equipment and Enviroment stays on during an EMP, and less of the cell is drained."
diff --git a/html/changelogs/Sin4_cooler-bench-lamp.yml b/html/changelogs/Sin4_cooler-bench-lamp.yml
deleted file mode 100644
index 66c08024d23..00000000000
--- a/html/changelogs/Sin4_cooler-bench-lamp.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: Sin4
-
-# 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 benches."
-  - rscadd: "Added floor lamps."
-  - rscadd: "Added water-cooler cup dispenser."
\ No newline at end of file
diff --git a/html/changelogs/Yoshax - drinks.yml b/html/changelogs/Yoshax - drinks.yml
deleted file mode 100644
index d24482d9f2d..00000000000
--- a/html/changelogs/Yoshax - drinks.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: Yoshax
-
-# 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: "Adds recipes for four new non-alcoholic cocktails. Shirley Temples, Roy Rogers, Arnold Palmers and Collins Mixes."
\ No newline at end of file
diff --git a/html/changelogs/Yoshax - tajhair.yml b/html/changelogs/Yoshax - tajhair.yml
deleted file mode 100644
index 381af4fb2ca..00000000000
--- a/html/changelogs/Yoshax - tajhair.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: Yoshax
-
-# 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: "Adds five new Tajaran hairstyles ported from Aurora."
\ No newline at end of file