From dc34804571b9cd17574afaf3b43dfe348fec223e Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 21 Feb 2017 16:00:11 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       |  9 +++++++++
 html/changelogs/.all_changelog.yml        | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-6470.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-6544.yml |  7 -------
 4 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6470.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6544.yml

diff --git a/html/changelog.html b/html/changelog.html
index 58bd23aabaf..1884cd27fad 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -67,6 +67,15 @@
 			<h3 class="author">Kyep updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscdel">Deleted clown planet away mission.</li>
+				<li class="tweak">blobs now spawn with a player in control, instantly. There is no longer a 30 second period where they exist, but nobody is controlling them.</li>
+				<li class="tweak">blobs now get extra time after spawn, before they are announced.</li>
+			</ul>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Megaphones can no longer be used by mute people.</li>
+				<li class="bugfix">Rechargers will no longer recharge stacks beyond their max amount or restack 0.5 sheets.</li>
+				<li class="bugfix">Ranged guardians now have a proper one second cooldown instead of 0.1 seconds.</li>
+				<li class="bugfix">Cult can no longer soul stone manifested ghosts.</li>
 			</ul>
 			<h3 class="author">davipatury updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e5e01018f5f..4588b97ce7d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3802,5 +3802,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       and south facing sprites.
   Kyep:
   - rscdel: Deleted clown planet away mission.
+  - tweak: blobs now spawn with a player in control, instantly. There is no longer
+      a 30 second period where they exist, but nobody is controlling them.
+  - tweak: blobs now get extra time after spawn, before they are announced.
+  Markolie:
+  - bugfix: Megaphones can no longer be used by mute people.
+  - bugfix: Rechargers will no longer recharge stacks beyond their max amount or restack
+      0.5 sheets.
+  - bugfix: Ranged guardians now have a proper one second cooldown instead of 0.1
+      seconds.
+  - bugfix: Cult can no longer soul stone manifested ghosts.
   davipatury:
   - rscadd: Autolathe now uses Nano-UI.
diff --git a/html/changelogs/AutoChangeLog-pr-6470.yml b/html/changelogs/AutoChangeLog-pr-6470.yml
deleted file mode 100644
index f3d6b8102a6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6470.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - tweak: "blobs now spawn with a player in control, instantly. There is no longer a 30 second period where they exist, but nobody is controlling them."
-  - tweak: "blobs now get extra time after spawn, before they are announced."
diff --git a/html/changelogs/AutoChangeLog-pr-6544.yml b/html/changelogs/AutoChangeLog-pr-6544.yml
deleted file mode 100644
index 6ac37cc703b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6544.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - bugfix: "Megaphones can no longer be used by mute people."
-  - bugfix: "Rechargers will no longer recharge stacks beyond their max amount or restack 0.5 sheets."
-  - bugfix: "Ranged guardians now have a proper one second cooldown instead of 0.1 seconds."
-  - bugfix: "Cult can no longer soul stone manifested ghosts."