From ab3187bf60e9755d7fa20efc82eff8ec2e82ea37 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 12 May 2017 15:21:50 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 12 ++++++++++++
 html/changelogs/.all_changelog.yml        |  8 ++++++++
 html/changelogs/AutoChangeLog-pr-7281.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7284.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-7287.yml |  4 ----
 5 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7281.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7284.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7287.yml

diff --git a/html/changelog.html b/html/changelog.html
index 224df0af4e3..4b47592f247 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,18 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">12 May 2017</h2>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Makes thrall examine use MASKCOVERMOUTH and HIDEFACE flags</li>
+				<li class="bugfix">fixes hudsunglass goof with vox.</li>
+			</ul>
+			<h3 class="author">Xantholne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Changes name from dark brown to brown for the default cowboy boots</li>
+				<li class="bugfix">Gives a hint that the cowboy shirts are meant to be clipped on to your uniform</li>
+			</ul>
+
 			<h2 class="date">11 May 2017</h2>
 			<h3 class="author">Fethas updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 12843903fb4..7639814769a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4645,3 +4645,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: can no longer make lethal medical patches with droppers
   - tweak: dripping reagents on someone with a dropper now incurs a 3 second delay
       like syringes
+2017-05-12:
+  Fethas:
+  - bugfix: Makes thrall examine use MASKCOVERMOUTH and HIDEFACE flags
+  - bugfix: fixes hudsunglass goof with vox.
+  Xantholne:
+  - bugfix: Changes name from dark brown to brown for the default cowboy boots
+  - bugfix: Gives a hint that the cowboy shirts are meant to be clipped on to your
+      uniform
diff --git a/html/changelogs/AutoChangeLog-pr-7281.yml b/html/changelogs/AutoChangeLog-pr-7281.yml
deleted file mode 100644
index 9e4855d5ce8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7281.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - bugfix: "Makes thrall examine use MASKCOVERMOUTH and HIDEFACE flags"
diff --git a/html/changelogs/AutoChangeLog-pr-7284.yml b/html/changelogs/AutoChangeLog-pr-7284.yml
deleted file mode 100644
index b55b843a530..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7284.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes: 
-  - bugfix: "Changes name from dark brown to brown for the default cowboy boots"
-  - bugfix: "Gives a hint that the cowboy shirts are meant to be clipped on to your uniform"
diff --git a/html/changelogs/AutoChangeLog-pr-7287.yml b/html/changelogs/AutoChangeLog-pr-7287.yml
deleted file mode 100644
index b8bfefacc61..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7287.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - bugfix: "fixes hudsunglass goof with vox."