From 6c91fd2156d34eff4dc0a2ba20b3dc7a94766a0b Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 26 May 2018 03:26:34 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 25 +++++++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 17 +++++++++++++++
 html/changelogs/AutoChangeLog-pr-8967.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8984.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8990.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9026.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9063.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9065.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9067.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9068.yml |  4 ----
 10 files changed, 42 insertions(+), 32 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8967.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8984.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8990.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9026.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9063.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9065.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9067.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9068.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0a6ad665b97..464012c5cb9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,31 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">26 May 2018</h2>
+			<h3 class="author">Birdtalon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Holoparasite guide updated to include newer models. Small tooltip added for charger models.</li>
+				<li class="bugfix">laser tag gun projectiles now play appropriate sound when striking.</li>
+			</ul>
+			<h3 class="author">Citinited updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Hopefully fixes all issues with disposals sending you to disposals.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes not being able to propel yourself through space by farting if you possessed both superfart and toxic farts</li>
+			</ul>
+			<h3 class="author">Kyep and Bxil updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Prevents everyone and their mother from seeing through closed poddoors.</li>
+			</ul>
+			<h3 class="author">Tayyyyyyy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Most things will now use the correct pronouns.</li>
+				<li class="bugfix">Newscasters properly check for feed channel creation and wanted issue creation</li>
+				<li class="bugfix">ERT should deploy properly without admins now.</li>
+			</ul>
+
 			<h2 class="date">19 May 2018</h2>
 			<h3 class="author">Aurorablade updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f3142451491..04b66ec89a7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6420,3 +6420,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Unarmed attacks now have their own icons, as does disarming.
   - rscadd: Various mobs have their own custom icon attacks
   - tweak: Monkies now bite!
+2018-05-26:
+  Birdtalon:
+  - tweak: Holoparasite guide updated to include newer models. Small tooltip added
+      for charger models.
+  - bugfix: laser tag gun projectiles now play appropriate sound when striking.
+  Citinited:
+  - bugfix: Hopefully fixes all issues with disposals sending you to disposals.
+  Fox McCloud:
+  - bugfix: Fixes not being able to propel yourself through space by farting if you
+      possessed both superfart and toxic farts
+  Kyep and Bxil:
+  - bugfix: Prevents everyone and their mother from seeing through closed poddoors.
+  Tayyyyyyy:
+  - rscadd: Most things will now use the correct pronouns.
+  - bugfix: Newscasters properly check for feed channel creation and wanted issue
+      creation
+  - bugfix: ERT should deploy properly without admins now.
diff --git a/html/changelogs/AutoChangeLog-pr-8967.yml b/html/changelogs/AutoChangeLog-pr-8967.yml
deleted file mode 100644
index 912bd3c00a8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8967.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - rscadd: "Most things will now use the correct pronouns."
diff --git a/html/changelogs/AutoChangeLog-pr-8984.yml b/html/changelogs/AutoChangeLog-pr-8984.yml
deleted file mode 100644
index e66e196a9f7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8984.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Citinited"
-delete-after: True
-changes: 
-  - bugfix: "Hopefully fixes all issues with disposals sending you to disposals."
diff --git a/html/changelogs/AutoChangeLog-pr-8990.yml b/html/changelogs/AutoChangeLog-pr-8990.yml
deleted file mode 100644
index 84d1d3addc7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8990.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep and Bxil"
-delete-after: True
-changes: 
-  - bugfix: "Prevents everyone and their mother from seeing through closed poddoors."
diff --git a/html/changelogs/AutoChangeLog-pr-9026.yml b/html/changelogs/AutoChangeLog-pr-9026.yml
deleted file mode 100644
index 021760a48ae..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9026.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - bugfix: "ERT should deploy properly without admins now."
diff --git a/html/changelogs/AutoChangeLog-pr-9063.yml b/html/changelogs/AutoChangeLog-pr-9063.yml
deleted file mode 100644
index bb797c73130..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9063.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - bugfix: "Newscasters properly check for feed channel creation and wanted issue creation"
diff --git a/html/changelogs/AutoChangeLog-pr-9065.yml b/html/changelogs/AutoChangeLog-pr-9065.yml
deleted file mode 100644
index 71834d39f60..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9065.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - bugfix: "Fixes not being able to propel yourself through space by farting if you possessed both superfart and toxic farts"
diff --git a/html/changelogs/AutoChangeLog-pr-9067.yml b/html/changelogs/AutoChangeLog-pr-9067.yml
deleted file mode 100644
index bd1b0a7ad47..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9067.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes: 
-  - bugfix: "laser tag gun projectiles now play appropriate sound when striking."
diff --git a/html/changelogs/AutoChangeLog-pr-9068.yml b/html/changelogs/AutoChangeLog-pr-9068.yml
deleted file mode 100644
index 03e5a3a0186..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9068.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes: 
-  - tweak: "Holoparasite guide updated to include newer models. Small tooltip added for charger models."