From fbbdccb07bc580cc89cc5cc6ce83088174ed03dd Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Tue, 12 Jul 2016 07:14:12 -0400
Subject: [PATCH] Changelogs - 12JUL2016

---
 html/changelog.html                 |  7 ++++++
 html/changelogs/.all_changelog.yml  |  4 ++++
 html/changelogs/LordFowl Staves.yml | 37 -----------------------------
 html/changelogs/example - Copy.yml  | 37 -----------------------------
 4 files changed, 11 insertions(+), 74 deletions(-)
 delete mode 100644 html/changelogs/LordFowl Staves.yml
 delete mode 100644 html/changelogs/example - Copy.yml

diff --git a/html/changelog.html b/html/changelog.html
index 159c5da91ac..32d7f70c384 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">12 July 2016</h2>
+			<h3 class="author">LordFowl updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed Vaurca being immune to tasers and stun batons.</li>
+				<li class="bugfix">Fixed Magic Missile and Fireball.</li>
+			</ul>
+
 			<h2 class="date">10 July 2016</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d333c09c23f..363e23e5907 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2167,3 +2167,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Mobs can no longer be painted via paint-cans.
   - rscadd: Quartermasters now start with the cargo account details in their memory
       notes.
+2016-07-12:
+  LordFowl:
+  - bugfix: Fixed Vaurca being immune to tasers and stun batons.
+  - bugfix: Fixed Magic Missile and Fireball.
diff --git a/html/changelogs/LordFowl Staves.yml b/html/changelogs/LordFowl Staves.yml
deleted file mode 100644
index 0b2dbb35a8a..00000000000
--- a/html/changelogs/LordFowl Staves.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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: LordFowl
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Fixed Magic Missile and Fireball."
-
diff --git a/html/changelogs/example - Copy.yml b/html/changelogs/example - Copy.yml
deleted file mode 100644
index ac7eebad10e..00000000000
--- a/html/changelogs/example - Copy.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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: LordFowl
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Fixed Vaurca being immune to tasers and stun batons."
-