From b84edc18214d08d0c85e22fd8d57153c25a0b484 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 10 Jan 2017 04:00:12 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 15 +++++++++++++++
 html/changelogs/.all_changelog.yml        | 13 +++++++++++++
 html/changelogs/AutoChangeLog-pr-6074.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-6117.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-6128.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-6130.yml |  4 ----
 6 files changed, 28 insertions(+), 21 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6074.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6117.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6128.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6130.yml

diff --git a/html/changelog.html b/html/changelog.html
index 57a51c03ae6..aa78af43982 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,21 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">10 January 2017</h2>
+			<h3 class="author">Crazylemon64 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">pAIs can now adjust their radios</li>
+				<li class="bugfix">pAIs can now more reliably hear nearby whispers</li>
+				<li class="bugfix">pAIs can now whisper while inside a PDA</li>
+				<li class="bugfix">pAIs can no longer change their icon from being dead, while dead</li>
+				<li class="bugfix">Non-respawnable players are no longer prompted to submit a pAI when the opportunity is available</li>
+				<li class="bugfix">Borg sight modules work again</li>
+			</ul>
+			<h3 class="author">TullyBurnalot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Wand of Death now reliably kills people by adding 300 Burn Damage. This includes self-casting</li>
+				<li class="rscadd">Minor flavour text visible on impact of target</li>
+				<li class="tweak">pAI HUDs are now visual-only, restricting their access to editable records</li>
+			</ul>
 			<h3 class="author">pinatacolada updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">IV drips now have adjustable rates</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f8273f92967..b2a82e43cdd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3291,5 +3291,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Antags should no longer get bounced to lobby at round start in certain
       rare situations.
 2017-01-10:
+  Crazylemon64:
+  - bugfix: pAIs can now adjust their radios
+  - bugfix: pAIs can now more reliably hear nearby whispers
+  - bugfix: pAIs can now whisper while inside a PDA
+  - bugfix: pAIs can no longer change their icon from being dead, while dead
+  - bugfix: Non-respawnable players are no longer prompted to submit a pAI when the
+      opportunity is available
+  - bugfix: Borg sight modules work again
+  TullyBurnalot:
+  - bugfix: Wand of Death now reliably kills people by adding 300 Burn Damage. This
+      includes self-casting
+  - rscadd: Minor flavour text visible on impact of target
+  - tweak: pAI HUDs are now visual-only, restricting their access to editable records
   pinatacolada:
   - tweak: IV drips now have adjustable rates
diff --git a/html/changelogs/AutoChangeLog-pr-6074.yml b/html/changelogs/AutoChangeLog-pr-6074.yml
deleted file mode 100644
index 23e676f8751..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6074.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "TullyBurnalot"
-delete-after: True
-changes: 
-  - bugfix: "Wand of Death now reliably kills people by adding 300 Burn Damage. This includes self-casting"
-  - rscadd: "Minor flavour text visible on impact of target"
diff --git a/html/changelogs/AutoChangeLog-pr-6117.yml b/html/changelogs/AutoChangeLog-pr-6117.yml
deleted file mode 100644
index 446b127124e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6117.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TullyBurnalot"
-delete-after: True
-changes: 
-  - tweak: "pAI HUDs are now visual-only, restricting their access to editable records"
diff --git a/html/changelogs/AutoChangeLog-pr-6128.yml b/html/changelogs/AutoChangeLog-pr-6128.yml
deleted file mode 100644
index cf2bc38d06a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6128.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Crazylemon64"
-delete-after: True
-changes: 
-  - bugfix: "pAIs can now adjust their radios"
-  - bugfix: "pAIs can now more reliably hear nearby whispers"
-  - bugfix: "pAIs can now whisper while inside a PDA"
-  - bugfix: "pAIs can no longer change their icon from being dead, while dead"
-  - bugfix: "Non-respawnable players are no longer prompted to submit a pAI when the opportunity is available"
diff --git a/html/changelogs/AutoChangeLog-pr-6130.yml b/html/changelogs/AutoChangeLog-pr-6130.yml
deleted file mode 100644
index bc9d2010481..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6130.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Crazylemon64"
-delete-after: True
-changes: 
-  - bugfix: "Borg sight modules work again"