From 999c8d090e43a5b44ee99711f472072dd737f511 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 12 Mar 2017 04:00:13 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 13 +++++++++++++
 html/changelogs/.all_changelog.yml        | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-6736.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-6746.yml |  7 -------
 4 files changed, 23 insertions(+), 11 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6736.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6746.yml

diff --git a/html/changelog.html b/html/changelog.html
index d0596a31475..94cb3a31b95 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,19 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">12 March 2017</h2>
+			<h3 class="author">Jovaniph updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds Vulpkanin EVA suit sprite</li>
+			</ul>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The system for picking ghosts to inhabit cultist slaughter demons now shows a confirmation prompt like most other role checks.</li>
+				<li class="bugfix">Fixed an issue where you could join as a cultist slaughter demon despite having antagHUD enabled.</li>
+				<li class="bugfix">Fixed an issue where it was possible to weld statues without any fuel.</li>
+				<li class="tweak">It is no longer possible to spam the firelock force message.</li>
+			</ul>
+
 			<h2 class="date">11 March 2017</h2>
 			<h3 class="author">Developed by XDTM, ported by davipatury updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2a73003b14c..098ba428e97 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4090,3 +4090,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: EVA has 2 more EVA Suits
   - rscdel: Removed Vox-only EVA suits (the grey ones in EVA)
   - tweak: Vox can now wear EVA suits
+2017-03-12:
+  Jovaniph:
+  - rscadd: Adds Vulpkanin EVA suit sprite
+  Markolie:
+  - tweak: The system for picking ghosts to inhabit cultist slaughter demons now shows
+      a confirmation prompt like most other role checks.
+  - bugfix: Fixed an issue where you could join as a cultist slaughter demon despite
+      having antagHUD enabled.
+  - bugfix: Fixed an issue where it was possible to weld statues without any fuel.
+  - tweak: It is no longer possible to spam the firelock force message.
diff --git a/html/changelogs/AutoChangeLog-pr-6736.yml b/html/changelogs/AutoChangeLog-pr-6736.yml
deleted file mode 100644
index cf279baadd3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6736.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Jovaniph"
-delete-after: True
-changes: 
-  - rscadd: "Adds Vulpkanin EVA suit sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-6746.yml b/html/changelogs/AutoChangeLog-pr-6746.yml
deleted file mode 100644
index b901de79f72..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6746.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Markolie"
-delete-after: True
-changes: 
-  - tweak: "The system for picking ghosts to inhabit cultist slaughter demons now shows a confirmation prompt like most other role checks."
-  - bugfix: "Fixed an issue where you could join as a cultist slaughter demon despite having antagHUD enabled."
-  - bugfix: "Fixed an issue where it was possible to weld statues without any fuel."
-  - tweak: "It is no longer possible to spam the firelock force message."