From f35a5427fdc99cc20d33f9809dd7693d3eaddcaa Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Wed, 29 Jun 2016 16:32:23 -0400
Subject: [PATCH] Changelogs - 28JUN2016

---
 html/changelog.html                   |  7 +++++++
 html/changelogs/.all_changelog.yml    |  6 ++++++
 html/changelogs/skull132-pull_499.yml | 13 -------------
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/skull132-pull_499.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0fc6d02a274..56f7b774c61 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 June 2016</h2>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Vampires can no longer have negative amounts of blood or frenzy. This also means that frenzy from low levels of blood is acheivable again.</li>
+				<li class="bugfix">Dominate and presence no longer affect loyalty implanted personnel, unless the casting vampire has attained full power.</li>
+			</ul>
+
 			<h2 class="date">27 June 2016</h2>
 			<h3 class="author">Nanako updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a849770b92a..25b8646bd5d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2122,3 +2122,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed being unable to place held animals into disposal units
   - bugfix: Fixed missing held/onhead icons for cats
   - bugfix: Fixed being unable to install robot cameras
+2016-06-29:
+  Skull132:
+  - bugfix: Vampires can no longer have negative amounts of blood or frenzy. This
+      also means that frenzy from low levels of blood is acheivable again.
+  - bugfix: Dominate and presence no longer affect loyalty implanted personnel, unless
+      the casting vampire has attained full power.
diff --git a/html/changelogs/skull132-pull_499.yml b/html/changelogs/skull132-pull_499.yml
deleted file mode 100644
index e6c31999169..00000000000
--- a/html/changelogs/skull132-pull_499.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: Skull132
-
-# 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: "Vampires can no longer have negative amounts of blood or frenzy. This also means that frenzy from low levels of blood is acheivable again."
-  - bugfix: "Dominate and presence no longer affect loyalty implanted personnel, unless the casting vampire has attained full power."