From d6dd80e8e7ce4dc3f3347db598b9cf3cfd7ef728 Mon Sep 17 00:00:00 2001
From: Jordie0608 <jordie0608@gmail.com>
Date: Fri, 7 Aug 2015 20:43:20 +1000
Subject: [PATCH] changelog

---
 html/changelog.html                | 39 ++++++++++++++++++++++++++++--
 html/changelogs/.all_changelog.yml | 33 ++++++++++++++++++++++---
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 43ab33ac4bf..3ce048bd829 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,20 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">07 August 2015</h2>
+			<h3 class="author">KorPhaeron updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new Guardian Mob that can be summoned to manifest inside a mob.</li>
+				<li class="rscadd">Guardians can communicate with their host and materialize themselves to protect their host with magic powers.</li>
+				<li class="rscadd">Guardians are invincible but cannot live without or too far from their host, they also relay injuries they suffer to the host.</li>
+			</ul>
+			<h3 class="author">Phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed being able to run into your own bullet.</li>
+			</ul>
+			<h3 class="author">RemieRichards updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You no longer need to click on an item in a storage container to remove it, clicking anywhere around the item works.</li>
+			</ul>
 			<h3 class="author">bustygoku updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscdel">Removed the chance for a disease to make you a carrier on transfer.</li>
@@ -65,6 +79,27 @@
 				<li class="tweak">The plasma cutter's fire rate is now a bit lower but its projectile can pierce multiple asteroid walls and its range isn't lowered in pressurized environment anymore.</li>
 			</ul>
 
+			<h2 class="date">06 August 2015</h2>
+			<h3 class="author">AnturK updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds the voodoo doll as a mining treasure, link it with a victim with an item previously held by them.</li>
+				<li class="rscadd">Once linked the voodoo doll can be used to injure, confuse and control the victim.</li>
+			</ul>
+			<h3 class="author">Core0verlad updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Items can now be removed from storage containers inside storage containers.</li>
+				<li class="imageadd">Beds and bedsheets have new sprites.</li>
+				<li class="rscdel">MMIs are no longer ID locked.</li>
+			</ul>
+			<h3 class="author">KorPhaeron updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Slaughter Demon's have had their health reduced to 200 and their speed reduced but they get a speed boost when exiting blood.</li>
+			</ul>
+			<h3 class="author">MrPerson updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Items stacks now automatically merge unless thrown when moved onto the same tile.</li>
+			</ul>
+
 			<h2 class="date">05 August 2015</h2>
 			<h3 class="author">CoreOverload updated:</h3>
 			<ul class="changes bgimages16">
@@ -82,7 +117,7 @@
 			</ul>
 			<h3 class="author">LordPidey updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Added a new chemical.  Spray tan.  It is made by mixing orange juice with oil or corn oil.  Warning: overexposure may result in orange douchebaggery.</li>
+				<li class="rscadd">Added a new chemical. Spray tan. It is made by mixing orange juice with oil or corn oil. Warning: overexposure may result in orange douchebaggery.</li>
 			</ul>
 			<h3 class="author">Xhuis updated:</h3>
 			<ul class="changes bgimages16">
@@ -122,7 +157,7 @@
 			<h3 class="author">Steelpoint updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed multiple mapping errors for Boxstation and the mining base.</li>
-				<li class="resadd">A circuit imprinter and exosuit fabrication board have been added to tech storage.</li>
+				<li class="rscadd">A circuit imprinter and exosuit fabrication board have been added to tech storage.</li>
 			</ul>
 			<h3 class="author">SvartaSvansen updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ea102965e48..30c91c7ebd4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1429,7 +1429,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Syndicate toolboxes now come with never before seen red insulated gloves.
   Steelpoint:
   - bugfix: Fixed multiple mapping errors for Boxstation and the mining base.
-  - resadd: A circuit imprinter and exosuit fabrication board have been added to tech
+  - rscadd: A circuit imprinter and exosuit fabrication board have been added to tech
       storage.
   SvartaSvansen:
   - rscadd: Our lizard engineers have worked hard and managed to improve Centcom airlocks
@@ -1464,8 +1464,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Ikarrus:
   - rscdel: Head beatings no longer deconvert gangsters.
   LordPidey:
-  - rscadd: 'Added a new chemical.  Spray tan.  It is made by mixing orange juice
-      with oil or corn oil.  Warning: overexposure may result in orange douchebaggery.'
+  - rscadd: 'Added a new chemical. Spray tan. It is made by mixing orange juice with
+      oil or corn oil. Warning: overexposure may result in orange douchebaggery.'
   Xhuis:
   - rscadd: Shadowling thralls can now be deconverted via surgery or borging.
   - rscadd: Thralls can be revealed by examining them. They can hide this by wearing
@@ -1484,7 +1484,34 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   bgobandit:
   - rscadd: Nanotrasen scientists have achieved the tremendous breakthrough of injecting
       gold slime extracts with water. Pets ensued.
+2015-08-06:
+  AnturK:
+  - rscadd: Adds the voodoo doll as a mining treasure, link it with a victim with
+      an item previously held by them.
+  - rscadd: Once linked the voodoo doll can be used to injure, confuse and control
+      the victim.
+  Core0verlad:
+  - tweak: Items can now be removed from storage containers inside storage containers.
+  - imageadd: Beds and bedsheets have new sprites.
+  - rscdel: MMIs are no longer ID locked.
+  KorPhaeron:
+  - tweak: Slaughter Demon's have had their health reduced to 200 and their speed
+      reduced but they get a speed boost when exiting blood.
+  MrPerson:
+  - rscadd: Items stacks now automatically merge unless thrown when moved onto the
+      same tile.
 2015-08-07:
+  KorPhaeron:
+  - rscadd: Added a new Guardian Mob that can be summoned to manifest inside a mob.
+  - rscadd: Guardians can communicate with their host and materialize themselves to
+      protect their host with magic powers.
+  - rscadd: Guardians are invincible but cannot live without or too far from their
+      host, they also relay injuries they suffer to the host.
+  Phil235:
+  - bugfix: Fixed being able to run into your own bullet.
+  RemieRichards:
+  - rscadd: You no longer need to click on an item in a storage container to remove
+      it, clicking anywhere around the item works.
   bustygoku:
   - rscdel: Removed the chance for a disease to make you a carrier on transfer.
   phil235: