From 0cffe9edce41155e73eaa87ba7f93e6ce030a38e Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 4 Jul 2015 12:00:44 -0400
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                |  8 ++++++
 html/changelogs/.all_changelog.yml |  8 ++++++
 html/changelogs/ikarrus-fixes.yml  | 40 ------------------------------
 3 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 html/changelogs/ikarrus-fixes.yml

diff --git a/html/changelog.html b/html/changelog.html
index 37be20b83f5..c14fa2aba21 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,14 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">04 July 2015</h2>
+			<h3 class="author">Ikarrus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed items that logically shouldn't spill, spilling their contents when thrown</li>
+				<li class="bugfix">Fixed Bartender's non-spilling powers</li>
+				<li class="bugfix">Fixed thrown beakers not applying their contents onto floors</li>
+				<li class="bugfix">Fixed unable to transfer reagents between beakers you are holding</li>
+				<li class="bugfix">Fixed bombs shredding clothes that should have been protected by covering clothes</li>
+			</ul>
 			<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>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d9d5bab4523..ab80ad7d4fb 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3118,6 +3118,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       refused to comment on rumours that the previous trigger design was the work
       of a saboteur.
 2015-07-04:
+  Ikarrus:
+  - bugfix: Fixed items that logically shouldn't spill, spilling their contents when
+      thrown
+  - bugfix: Fixed Bartender's non-spilling powers
+  - bugfix: Fixed thrown beakers not applying their contents onto floors
+  - bugfix: Fixed unable to transfer reagents between beakers you are holding
+  - bugfix: Fixed bombs shredding clothes that should have been protected by covering
+      clothes
   MMMiracles:
   - rscadd: Added patriotic underwear apparel due to the most god damn american holiday
       being just around the corner.
diff --git a/html/changelogs/ikarrus-fixes.yml b/html/changelogs/ikarrus-fixes.yml
deleted file mode 100644
index f44b913fe89..00000000000
--- a/html/changelogs/ikarrus-fixes.yml
+++ /dev/null
@@ -1,40 +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: Ikarrus
-
-# 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: 
-  - bugfix: "Fixed items that logically shouldn't spill, spilling their contents when thrown"
-  - bugfix: "Fixed Bartender's non-spilling powers"
-  - bugfix: "Fixed thrown beakers not applying their contents onto floors"
-  - bugfix: "Fixed unable to transfer reagents between beakers you are holding"
-  - bugfix: "Fixed bombs shredding clothes that should have been protected by covering clothes"
\ No newline at end of file