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

---
 html/changelog.html                       | 6 ++++++
 html/changelogs/.all_changelog.yml        | 3 +++
 html/changelogs/AutoChangeLog-pr-8298.yml | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-8298.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4953838d050..3accdbdc538 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">29 October 2017</h2>
+			<h3 class="author">Alffd updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ion Rifles are no longer pistols</li>
+			</ul>
+
 			<h2 class="date">28 October 2017</h2>
 			<h3 class="author">Anasari updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 37227d531db..1a4e7f13624 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5666,3 +5666,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Squirgenheimer:
   - bugfix: Fixed a typo causing the inability to create the large energy crossbow
       in the protolathe.
+2017-10-29:
+  Alffd:
+  - bugfix: Ion Rifles are no longer pistols
diff --git a/html/changelogs/AutoChangeLog-pr-8298.yml b/html/changelogs/AutoChangeLog-pr-8298.yml
deleted file mode 100644
index 6281fe00e9f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-8298.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Alffd"
-delete-after: True
-changes: 
-  - bugfix: "Ion Rifles are no longer pistols"