From b6813ff0e4e2e4b7cf388a133a527378bd549d20 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 4 Jul 2015 05:35:30 -0400
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                           |  7 ++++
 html/changelogs/.all_changelog.yml            |  5 +++
 .../MMMiracles-assblastusausausa.yml          | 37 -------------------
 3 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/MMMiracles-assblastusausausa.yml

diff --git a/html/changelog.html b/html/changelog.html
index de8667ca016..37be20b83f5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">04 July 2015</h2>
+			<h3 class="author">MMMiracles updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added patriotic underwear apparel due to the most god damn american holiday being just around the corner.</li>
+				<li class="rscadd">Also adds some other stuff for those inferior countires too, I guess.</li>
+			</ul>
+
 			<h2 class="date">03 July 2015</h2>
 			<h3 class="author">Ikarrus updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ca05b948591..d9d5bab4523 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3117,3 +3117,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       suffered from a long line of misfire problems were recalled enmasse. Nanotrasen
       refused to comment on rumours that the previous trigger design was the work
       of a saboteur.
+2015-07-04:
+  MMMiracles:
+  - rscadd: Added patriotic underwear apparel due to the most god damn american holiday
+      being just around the corner.
+  - rscadd: Also adds some other stuff for those inferior countires too, I guess.
diff --git a/html/changelogs/MMMiracles-assblastusausausa.yml b/html/changelogs/MMMiracles-assblastusausausa.yml
deleted file mode 100644
index 3c55863417e..00000000000
--- a/html/changelogs/MMMiracles-assblastusausausa.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   spellcheck (typo fixes)
-#   experiment
-#   tgs (TG-ported fixes?)
-#################################
-
-# Your name.  
-author: MMMiracles
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added patriotic underwear apparel due to the most god damn american holiday being just around the corner."
-  - rscadd: "Also adds some other stuff for those inferior countires too, I guess."