From 3fcd56242b95b2d3470a1a3e77716edb2984de90 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Mon, 29 May 2017 12:36:01 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 1fd9488c696..d10649fd340 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 May 2017</h2>
+			<h3 class="author">Jovaniph updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Two welding goggles on in the atmos room</li>
+			</ul>
+
 			<h2 class="date">28 May 2017</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c25a2587ee3..0a4ca3de547 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4786,3 +4786,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-05-28:
   Fox McCloud:
   - bugfix: Fixes various mobs moving around faster than intended
+2017-05-29:
+  Jovaniph:
+  - rscadd: Two welding goggles on in the atmos room
diff --git a/html/changelogs/AutoChangeLog-pr-7151.yml b/html/changelogs/AutoChangeLog-pr-7151.yml
deleted file mode 100644
index 1302da95888..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7151.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Jovaniph"
-delete-after: True
-changes: 
-  - rscadd: "Two welding goggles on in the atmos room"