From 8b8866f8b0767a6a982eb78843b2df4e7a8f374c Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Mon, 30 Oct 2017 02:06:00 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 10 ++++++++++
 html/changelogs/.all_changelog.yml         |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-32143.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-32200.yml |  4 ----
 4 files changed, 19 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-32143.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-32200.yml

diff --git a/html/changelog.html b/html/changelog.html
index e616a7ff51a..0b3ca0e767e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">30 October 2017</h2>
+			<h3 class="author">PKPenguin321 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them.</li>
+			</ul>
+			<h3 class="author">bgobandit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Due to cuts to Nanotrasen's Occupational Safety and Health Administration (NO-SHA) budget, station fixtures no longer undergo as much safety testing. (Translation for rank and file staff: More objects on the station will hurt you.)</li>
+			</ul>
+
 			<h2 class="date">29 October 2017</h2>
 			<h3 class="author">Armhulen updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e6b4152161b..f01392f4218 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13499,3 +13499,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Water vapor now freezes the tile it is on when it is cooled heavily.
   naltronix:
   - bugfix: fixes that table that wasnt accessible in Metastation
+2017-10-30:
+  PKPenguin321:
+  - tweak: You can now use beakers/cups/etc that have welding fuel in them on welders
+      to refuel them.
+  bgobandit:
+  - tweak: 'Due to cuts to Nanotrasen''s Occupational Safety and Health Administration
+      (NO-SHA) budget, station fixtures no longer undergo as much safety testing.
+      (Translation for rank and file staff: More objects on the station will hurt
+      you.)'
diff --git a/html/changelogs/AutoChangeLog-pr-32143.yml b/html/changelogs/AutoChangeLog-pr-32143.yml
deleted file mode 100644
index 2beb4d6c2a2..00000000000
--- a/html/changelogs/AutoChangeLog-pr-32143.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "PKPenguin321"
-delete-after: True
-changes: 
-  - tweak: "You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them."
diff --git a/html/changelogs/AutoChangeLog-pr-32200.yml b/html/changelogs/AutoChangeLog-pr-32200.yml
deleted file mode 100644
index 8e2ffe71164..00000000000
--- a/html/changelogs/AutoChangeLog-pr-32200.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "bgobandit"
-delete-after: True
-changes: 
-  - tweak: "Due to cuts to Nanotrasen's Occupational Safety and Health Administration (NO-SHA) budget, station fixtures no longer undergo as much safety testing. (Translation for rank and file staff: More objects on the station will hurt you.)"