From a895de9c480b6d054b9fd1dabc0a8186a36573a2 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 1 Feb 2018 11:50:29 -0500
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 15 +++++++++++++++
 html/changelogs/.all_changelog.yml        | 13 +++++++++++++
 html/changelogs/AutoChangeLog-pr-8424.yml | 11 -----------
 html/changelogs/AutoChangeLog-pr-8433.yml |  4 ----
 4 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8424.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8433.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6a8127a5e11..b38cdcb8061 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,21 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Using the 'tear reality' rune as cult should now be punished when the invokers do not have the god summoning objective</li>
 			</ul>
+			<h3 class="author">Tayyyyyyy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Players job banned from syndicate can no longer play emagged drones</li>
+			</ul>
+			<h3 class="author">uraniummeltdown updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Examining an airlock assembly gives construction hints and shows what pen name is set. Mineral airlocks can have glass added to them.</li>
+				<li class="rscadd">Added public and external maintenance airlock assemblies to metal recipes</li>
+				<li class="rscadd">Maintenance, standard and external airlocks now have glass versions. Multi-tile airlock has a solid version.</li>
+				<li class="rscadd">Added more airlocks to RCD</li>
+				<li class="rscadd">You can attach paper and photos to airlocks, wirecutters to remove them</li>
+				<li class="tweak">Airlocks open faster</li>
+				<li class="tweak">Vault and high-security airlocks are made with 6 plasteel up from 4</li>
+				<li class="bugfix">Plasteel should have the correct amount of materials in it now</li>
+			</ul>
 
 			<h2 class="date">29 January 2018</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4c8c2b47621..5a188ce0582 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6019,3 +6019,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Squirgenheimer:
   - bugfix: Using the 'tear reality' rune as cult should now be punished when the
       invokers do not have the god summoning objective
+  Tayyyyyyy:
+  - bugfix: Players job banned from syndicate can no longer play emagged drones
+  uraniummeltdown:
+  - rscadd: Examining an airlock assembly gives construction hints and shows what
+      pen name is set. Mineral airlocks can have glass added to them.
+  - rscadd: Added public and external maintenance airlock assemblies to metal recipes
+  - rscadd: Maintenance, standard and external airlocks now have glass versions. Multi-tile
+      airlock has a solid version.
+  - rscadd: Added more airlocks to RCD
+  - rscadd: You can attach paper and photos to airlocks, wirecutters to remove them
+  - tweak: Airlocks open faster
+  - tweak: Vault and high-security airlocks are made with 6 plasteel up from 4
+  - bugfix: Plasteel should have the correct amount of materials in it now
diff --git a/html/changelogs/AutoChangeLog-pr-8424.yml b/html/changelogs/AutoChangeLog-pr-8424.yml
deleted file mode 100644
index bbb5f17eb69..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8424.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes: 
-  - rscadd: "Examining an airlock assembly gives construction hints and shows what pen name is set. Mineral airlocks can have glass added to them."
-  - rscadd: "Added public and external maintenance airlock assemblies to metal recipes"
-  - rscadd: "Maintenance, standard and external airlocks now have glass versions. Multi-tile airlock has a solid version."
-  - rscadd: "Added more airlocks to RCD"
-  - rscadd: "You can attach paper and photos to airlocks, wirecutters to remove them"
-  - tweak: "Airlocks open faster"
-  - tweak: "Vault and high-security airlocks are made with 6 plasteel up from 4"
-  - bugfix: "Plasteel should have the correct amount of materials in it now"
diff --git a/html/changelogs/AutoChangeLog-pr-8433.yml b/html/changelogs/AutoChangeLog-pr-8433.yml
deleted file mode 100644
index c1b4a573bd5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8433.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - bugfix: "Players job banned from syndicate can no longer play emagged drones"