From 4c1de5f69d41bb84acf84bb16a731bced0ad9397 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 1 Jul 2017 23:48:10 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index baba4a216ef..27d9c4a207c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,14 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">01 July 2017</h2>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Re-enables object embedding system; embedding objects now cause more damage than before</li>
+				<li class="rscadd">Adds in throwing stars kit to the traitor uplink</li>
+				<li class="rscdel">bullets no longer leave shrapnel</li>
+			</ul>
+
 			<h2 class="date">30 June 2017</h2>
 			<h3 class="author">fludd12 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ac07255e3f8..60ccc2e7d3b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5078,3 +5078,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       formatting changes!
   - bugfix: Remote Talk no longer lets you magically know the true name of whoever
       you speak with.
+2017-07-01:
+  Fox McCloud:
+  - bugfix: Re-enables object embedding system; embedding objects now cause more damage
+      than before
+  - rscadd: Adds in throwing stars kit to the traitor uplink
+  - rscdel: bullets no longer leave shrapnel
diff --git a/html/changelogs/AutoChangeLog-pr-7480.yml b/html/changelogs/AutoChangeLog-pr-7480.yml
deleted file mode 100644
index 324e8a777d4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7480.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - bugfix: "Re-enables object embedding system; embedding objects now cause more damage than before"
-  - rscadd: "Adds in throwing stars kit to the traitor uplink"
-  - rscdel: "bullets no longer leave shrapnel"