From 8dbed0ede461fef777cd3eacee923912fce3f69e Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 15 Oct 2017 23:13:10 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 13 +++++++++++++
 html/changelogs/.all_changelog.yml        | 17 +++++++++++++++++
 html/changelogs/AutoChangeLog-pr-7735.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-7800.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-8248.yml |  4 ----
 5 files changed, 30 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7735.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7800.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8248.yml

diff --git a/html/changelog.html b/html/changelog.html
index 55fe8138291..8c76e4414af 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,19 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">15 October 2017</h2>
+			<h3 class="author">Citinited updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Clipboards now have more functionality. You can now stamp them, attach paper bundles to them, write on any contained paper by clicking on the paper's name using a pen, add pens directly to them, and rearrange what piece of paper is on top!</li>
+				<li class="bugfix">Full-sized plasma windows are fire-resistant, and full-sized reinforced windows are fully fireproof.</li>
+				<li class="bugfix">You can now remove facehuggers from corgis. Corgis that have been glomped by multiple facehuggers will now work as you'd expect them to.</li>
+				<li class="bugfix">Radiation mines no longer change the DNA of species that don't have it.</li>
+				<li class="bugfix">Firedoors and other doors will no longer close when a shuttle docks. Open firelocks can no longer be welded. Welded firelocks should no longer open under any circumstances.</li>
+				<li class="bugfix">Open airlocks no longer spark when you throw something conductive through them.</li>
+			</ul>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Many things use sleeping. Surgry pain fail fix.</li>
+			</ul>
 			<h3 class="author">Imsxz updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Ballistic mech weapons now all use the ammo system</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d5bff93f483..8349fe78be7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5557,6 +5557,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Gives a choice whether to mangle black gloves, or to completely cut of
       the fingertips
 2017-10-15:
+  Citinited:
+  - tweak: Clipboards now have more functionality. You can now stamp them, attach
+      paper bundles to them, write on any contained paper by clicking on the paper's
+      name using a pen, add pens directly to them, and rearrange what piece of paper
+      is on top!
+  - bugfix: Full-sized plasma windows are fire-resistant, and full-sized reinforced
+      windows are fully fireproof.
+  - bugfix: You can now remove facehuggers from corgis. Corgis that have been glomped
+      by multiple facehuggers will now work as you'd expect them to.
+  - bugfix: Radiation mines no longer change the DNA of species that don't have it.
+  - bugfix: Firedoors and other doors will no longer close when a shuttle docks. Open
+      firelocks can no longer be welded. Welded firelocks should no longer open under
+      any circumstances.
+  - bugfix: Open airlocks no longer spark when you throw something conductive through
+      them.
+  Fethas:
+  - bugfix: Many things use sleeping. Surgry pain fail fix.
   Imsxz:
   - bugfix: Ballistic mech weapons now all use the ammo system
   Kyep:
diff --git a/html/changelogs/AutoChangeLog-pr-7735.yml b/html/changelogs/AutoChangeLog-pr-7735.yml
deleted file mode 100644
index 145ff7d27fd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7735.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Citinited"
-delete-after: True
-changes: 
-  - bugfix: "Full-sized plasma windows are fire-resistant, and full-sized reinforced windows are fully fireproof."
-  - bugfix: "You can now remove facehuggers from corgis. Corgis that have been glomped by multiple facehuggers will now work as you'd expect them to."
-  - bugfix: "Radiation mines no longer change the DNA of species that don't have it."
-  - bugfix: "Firedoors and other doors will no longer close when a shuttle docks. Open firelocks can no longer be welded. Welded firelocks should no longer open under any circumstances."
-  - bugfix: "Open airlocks no longer spark when you throw something conductive through them."
diff --git a/html/changelogs/AutoChangeLog-pr-7800.yml b/html/changelogs/AutoChangeLog-pr-7800.yml
deleted file mode 100644
index 6b20f32988e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7800.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Citinited"
-delete-after: True
-changes: 
-  - tweak: "Clipboards now have more functionality. You can now stamp them, attach paper bundles to them, write on any contained paper by clicking on the paper's name using a pen, add pens directly to them, and rearrange what piece of paper is on top!"
diff --git a/html/changelogs/AutoChangeLog-pr-8248.yml b/html/changelogs/AutoChangeLog-pr-8248.yml
deleted file mode 100644
index 715d05433b8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8248.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - bugfix: "Many things use sleeping. Surgry pain fail fix."