From d6287b115b8d4dc85e3a3e7eece23d56a4191bd8 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Wed, 25 Oct 2017 17:57:07 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 13 +++++++++++++
 html/changelogs/.all_changelog.yml        | 12 ++++++++++++
 html/changelogs/AutoChangeLog-pr-8218.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8220.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8266.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8269.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8270.yml |  4 ----
 7 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8218.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8220.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8266.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8269.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8270.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3d29a1ab29c..4b29675cbbc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">25 October 2017</h2>
+			<h3 class="author">Anasari updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Flavour text description in character setup now consistent with rules.</li>
+				<li class="rscadd">Grenade reagent are also logged when they are primed</li>
+				<li class="tweak">TC from war op increased by 2 per player above 50.</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">ERTs now support janitor, paranormal, and cyborg ERT units, as well as specific slot configurations.</li>
+				<li class="tweak">Heads of staff who are editing another admin's permissions in the admin panel can now toggle several permissions for a person without re-finding them in the list. Hitting 'cancel' at any point drops out of the loop. It also notifies admins whether they're toggling a permission on, or off.</li>
+			</ul>
+
 			<h2 class="date">22 October 2017</h2>
 			<h3 class="author">Crazylemon64 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5700f198f45..07b8f54fdde 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5616,3 +5616,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Buff Terror Spiders against space wind.
   - tweak: Buff some blobmobs aginst space wind.
   - tweak: Frost requires heat to remove.
+2017-10-25:
+  Anasari:
+  - tweak: Flavour text description in character setup now consistent with rules.
+  - rscadd: Grenade reagent are also logged when they are primed
+  - tweak: TC from war op increased by 2 per player above 50.
+  Kyep:
+  - rscadd: ERTs now support janitor, paranormal, and cyborg ERT units, as well as
+      specific slot configurations.
+  - tweak: Heads of staff who are editing another admin's permissions in the admin
+      panel can now toggle several permissions for a person without re-finding them
+      in the list. Hitting 'cancel' at any point drops out of the loop. It also notifies
+      admins whether they're toggling a permission on, or off.
diff --git a/html/changelogs/AutoChangeLog-pr-8218.yml b/html/changelogs/AutoChangeLog-pr-8218.yml
deleted file mode 100644
index dfd32c71c3b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8218.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Anasari"
-delete-after: True
-changes: 
-  - tweak: "TC from war op increased by 2 per player above 50."
diff --git a/html/changelogs/AutoChangeLog-pr-8220.yml b/html/changelogs/AutoChangeLog-pr-8220.yml
deleted file mode 100644
index 1d332e0c1e3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8220.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Anasari"
-delete-after: True
-changes: 
-  - rscadd: "Grenade reagent are also logged when they are primed"
diff --git a/html/changelogs/AutoChangeLog-pr-8266.yml b/html/changelogs/AutoChangeLog-pr-8266.yml
deleted file mode 100644
index 862cb650d15..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8266.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - tweak: "Heads of staff who are editing another admin's permissions in the admin panel can now toggle several permissions for a person without re-finding them in the list. Hitting 'cancel' at any point drops out of the loop. It also notifies admins whether they're toggling a permission on, or off."
diff --git a/html/changelogs/AutoChangeLog-pr-8269.yml b/html/changelogs/AutoChangeLog-pr-8269.yml
deleted file mode 100644
index af322fa4ec1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8269.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Anasari"
-delete-after: True
-changes: 
-  - tweak: "Flavour text description in character setup now consistent with rules."
diff --git a/html/changelogs/AutoChangeLog-pr-8270.yml b/html/changelogs/AutoChangeLog-pr-8270.yml
deleted file mode 100644
index 053c01eed2b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8270.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - rscadd: "ERTs now support janitor, paranormal, and cyborg ERT units, as well as specific slot configurations."