From 1fb01e79ccf348a0530d39e9ace073444729371b Mon Sep 17 00:00:00 2001
From: TheDZD <leonardo.o.costa7@gmail.com>
Date: Wed, 13 Jan 2016 22:14:04 -0500
Subject: [PATCH] Removes fun

---
 html/changelog.html                         | 18 +++++++++++
 html/changelogs/.all_changelog.yml          | 15 +++++++++
 html/changelogs/Kyep-3179.yml               |  9 ------
 html/changelogs/Tastyfish-PR-multipens.yml  | 35 ---------------------
 html/changelogs/clone-damage-mccloud.yml    |  8 -----
 html/changelogs/explosion-tweak-mccloud.yml |  7 -----
 html/changelogs/revolver-fix-mccloud.yml    |  7 -----
 html/changelogs/startup-fix-mccloud.yml     |  7 -----
 8 files changed, 33 insertions(+), 73 deletions(-)
 delete mode 100644 html/changelogs/Kyep-3179.yml
 delete mode 100644 html/changelogs/Tastyfish-PR-multipens.yml
 delete mode 100644 html/changelogs/clone-damage-mccloud.yml
 delete mode 100644 html/changelogs/explosion-tweak-mccloud.yml
 delete mode 100644 html/changelogs/revolver-fix-mccloud.yml
 delete mode 100644 html/changelogs/startup-fix-mccloud.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3a475e8d2cb..e9d8690a977 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,24 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">13 January 2016</h2>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Rezadone not clearing mutated organs.</li>
+				<li class="tweak">Clone damage immunity removed from Slime People, Shadowlings, Golems, and Vox</li>
+				<li class="tweak">Explosions will no longer destroy things underneath turfs until the turf is exposed.</li>
+				<li class="bugfix">fixes a runtime related to revolver spinning.</li>
+				<li class="bugfix">fixes server loading taking an abnormally long time.</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Blob, vine and virus outbreaks are now more clearly labeled as such, to avoid people confusing them with each other</li>
+			</ul>
+			<h3 class="author">Tastyfish updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">NT Rep fountain pens and magistrate gold pens can now write in 5 different colors. The IAA gets a cheap plastic equivalent.</li>
+			</ul>
+
 			<h2 class="date">11 January 2016</h2>
 			<h3 class="author">CrAzYPiLoT updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1e3523bca7d..0da7cceab4e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -91,3 +91,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: IPC's positronic brains start off toggled off.
   - bugfix: Fixes the supermatter announcement causing massive amounts of server lag.
   - rscadd: Adds in tradable telecrystals.
+2016-01-13:
+  Fox McCloud:
+  - bugfix: Fixes Rezadone not clearing mutated organs.
+  - tweak: Clone damage immunity removed from Slime People, Shadowlings, Golems, and
+      Vox
+  - tweak: Explosions will no longer destroy things underneath turfs until the turf
+      is exposed.
+  - bugfix: fixes a runtime related to revolver spinning.
+  - bugfix: fixes server loading taking an abnormally long time.
+  Kyep:
+  - rscadd: Blob, vine and virus outbreaks are now more clearly labeled as such, to
+      avoid people confusing them with each other
+  Tastyfish:
+  - tweak: NT Rep fountain pens and magistrate gold pens can now write in 5 different
+      colors. The IAA gets a cheap plastic equivalent.
diff --git a/html/changelogs/Kyep-3179.yml b/html/changelogs/Kyep-3179.yml
deleted file mode 100644
index de81dc614b5..00000000000
--- a/html/changelogs/Kyep-3179.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
-author: Kyep
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-changes:
-  - rscadd: "Blob, vine and virus outbreaks are now more clearly labeled as such, to avoid people confusing them with each other"
diff --git a/html/changelogs/Tastyfish-PR-multipens.yml b/html/changelogs/Tastyfish-PR-multipens.yml
deleted file mode 100644
index 59db542a02e..00000000000
--- a/html/changelogs/Tastyfish-PR-multipens.yml
+++ /dev/null
@@ -1,35 +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
-#################################
-
-# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
-author: Tastyfish
-
-# 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: 
-  - tweak: "NT Rep fountain pens and magistrate gold pens can now write in 5 different colors. The IAA gets a cheap plastic equivalent."
diff --git a/html/changelogs/clone-damage-mccloud.yml b/html/changelogs/clone-damage-mccloud.yml
deleted file mode 100644
index f0c9bcfc040..00000000000
--- a/html/changelogs/clone-damage-mccloud.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-author: Fox McCloud
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixes Rezadone not clearing mutated organs."
-  - tweak: "Clone damage immunity removed from Slime People, Shadowlings, Golems, and Vox" 
\ No newline at end of file
diff --git a/html/changelogs/explosion-tweak-mccloud.yml b/html/changelogs/explosion-tweak-mccloud.yml
deleted file mode 100644
index 7587fa8ce32..00000000000
--- a/html/changelogs/explosion-tweak-mccloud.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Fox McCloud
-
-delete-after: True
-
-changes: 
-  - tweak: "Explosions will no longer destroy things underneath turfs until the turf is exposed." 
\ No newline at end of file
diff --git a/html/changelogs/revolver-fix-mccloud.yml b/html/changelogs/revolver-fix-mccloud.yml
deleted file mode 100644
index 06e337695ab..00000000000
--- a/html/changelogs/revolver-fix-mccloud.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Fox McCloud
-
-delete-after: True
-
-changes: 
-  - bugfix: "fixes a runtime related to revolver spinning."
\ No newline at end of file
diff --git a/html/changelogs/startup-fix-mccloud.yml b/html/changelogs/startup-fix-mccloud.yml
deleted file mode 100644
index 93e2ea217d1..00000000000
--- a/html/changelogs/startup-fix-mccloud.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Fox McCloud
-
-delete-after: True
-
-changes: 
-  - bugfix: "fixes server loading taking an abnormally long time."
\ No newline at end of file