From 70ff77ae12e741a75336ee6b0c576bf7ea0844b9 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 21 Apr 2017 12:06:08 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index d883140c0ef..0a716a0bf0f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,10 +56,18 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">21 April 2017</h2>
+			<h3 class="author">Anticept updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Alternate Job Preference now defaults to "Return to Lobby if Preferences Unavailable". Only affects new players.</li>
+			</ul>
 			<h3 class="author">Spacemanspark updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Permits hoodies to carry flashlights.</li>
 			</ul>
+			<h3 class="author">Twinmold93 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds attack options for deep fryers, grills, and ovens. Those breaking into the kitchen beware.</li>
+			</ul>
 
 			<h2 class="date">19 April 2017</h2>
 			<h3 class="author">IK3I updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9adeb1c3429..d5f714da88b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4499,5 +4499,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Xantholne:
   - bugfix: You now correctly spawn with the CMO Skirt if selected in loadout menu
 2017-04-21:
+  Anticept:
+  - tweak: Alternate Job Preference now defaults to "Return to Lobby if Preferences
+      Unavailable". Only affects new players.
   Spacemanspark:
   - rscadd: Permits hoodies to carry flashlights.
+  Twinmold93:
+  - rscadd: Adds attack options for deep fryers, grills, and ovens. Those breaking
+      into the kitchen beware.
diff --git a/html/changelogs/AutoChangeLog-pr-7055.yml b/html/changelogs/AutoChangeLog-pr-7055.yml
deleted file mode 100644
index f0c37fe3382..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7055.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Twinmold93"
-delete-after: True
-changes: 
-  - rscadd: "Adds attack options for deep fryers, grills, and ovens. Those breaking into the kitchen beware."
diff --git a/html/changelogs/AutoChangeLog-pr-7133.yml b/html/changelogs/AutoChangeLog-pr-7133.yml
deleted file mode 100644
index da0e4d32891..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7133.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Anticept"
-delete-after: True
-changes: 
-  - tweak: "Alternate Job Preference now defaults to \"Return to Lobby if Preferences Unavailable\". Only affects new players."