From c7c4aecf837dc294933a983033017fe28e44cd03 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Sat, 4 Jun 2016 16:35:01 -0400
Subject: [PATCH] Changelogs - 04JUN2016

---
 html/changelog.html                         | 11 +++++++
 html/changelogs/.all_changelog.yml          |  6 ++++
 html/changelogs/arrow768-telesciencefix.yml | 36 ---------------------
 html/changelogs/skull132-fixes-370.yml      | 12 -------
 html/changelogs/skull132-pr379.yml          | 12 -------
 5 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 html/changelogs/arrow768-telesciencefix.yml
 delete mode 100644 html/changelogs/skull132-fixes-370.yml
 delete mode 100644 html/changelogs/skull132-pr379.yml

diff --git a/html/changelog.html b/html/changelog.html
index c0030e5988e..b84c8faa08b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">04 June 2016</h2>
+			<h3 class="author">Arrow768 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed telescience</li>
+			</ul>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Saving characters that use species without hair is now fixed.</li>
+				<li class="rscdel">Cleanbots are temporarily disabled, due to infinite loops.</li>
+			</ul>
+
 			<h2 class="date">01 June 2016</h2>
 			<h3 class="author">LordFowl updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index affcc0d8833..01acd652454 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1965,3 +1965,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Skull132:
   - bugfix: Skills are now properly loaded from SQL.
   - bugfix: Skills are no longer nuked whenever importing characters onto SQL.
+2016-06-04:
+  Arrow768:
+  - bugfix: Fixed telescience
+  Skull132:
+  - bugfix: Saving characters that use species without hair is now fixed.
+  - rscdel: Cleanbots are temporarily disabled, due to infinite loops.
diff --git a/html/changelogs/arrow768-telesciencefix.yml b/html/changelogs/arrow768-telesciencefix.yml
deleted file mode 100644
index 78b94f70e28..00000000000
--- a/html/changelogs/arrow768-telesciencefix.yml
+++ /dev/null
@@ -1,36 +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: Arrow768
-
-# 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 telescience"
diff --git a/html/changelogs/skull132-fixes-370.yml b/html/changelogs/skull132-fixes-370.yml
deleted file mode 100644
index 6b368bd2a04..00000000000
--- a/html/changelogs/skull132-fixes-370.yml
+++ /dev/null
@@ -1,12 +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: "Saving characters that use species without hair is now fixed."
diff --git a/html/changelogs/skull132-pr379.yml b/html/changelogs/skull132-pr379.yml
deleted file mode 100644
index 7af57bfdd3e..00000000000
--- a/html/changelogs/skull132-pr379.yml
+++ /dev/null
@@ -1,12 +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:
-  - rscdel: "Cleanbots are temporarily disabled, due to infinite loops."