From ebe9ff4afc2ec13b349fba093de26eaf5c5536c8 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 18 Jun 2015 08:54:20 -0400
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 25 +++++++++++++++
 html/changelogs/.all_changelog.yml         | 22 +++++++++++++
 html/changelogs/AnturK-pda.yml             | 36 ----------------------
 html/changelogs/Ikarrus-deptmanagement.yml | 36 ----------------------
 html/changelogs/Miauw-AINerfTweaks.yml     |  7 -----
 html/changelogs/Xhuis-Superlarity.yml      |  5 ---
 html/changelogs/phil235-XrayGunNerf.yml    |  6 ----
 7 files changed, 47 insertions(+), 90 deletions(-)
 delete mode 100644 html/changelogs/AnturK-pda.yml
 delete mode 100644 html/changelogs/Ikarrus-deptmanagement.yml
 delete mode 100644 html/changelogs/Miauw-AINerfTweaks.yml
 delete mode 100644 html/changelogs/Xhuis-Superlarity.yml
 delete mode 100644 html/changelogs/phil235-XrayGunNerf.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6845a7e00f6..457de93df40 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,31 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">18 June 2015</h2>
+			<h3 class="author">AnturK updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new photo-over-pda function. Apply the photo to PDA to send it with your next message!</li>
+			</ul>
+			<h3 class="author">Ikarrus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Department Management consoles have been added to Head of Staff offices. These will enable heads to modify ID's access to their department, as well as preform demotions.</li>
+			</ul>
+			<h3 class="author">Miauw updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Bullets can now damage cameras.</li>
+				<li class="tweak">Camera alarms now trigger 90 seconds after the first EMP pulse, instead of when all EMP pulses run out.</li>
+				<li class="tweak">Makes the force required to damage cameras greater than or equal to ten instead of greater than ten.</li>
+				<li class="tweak">Camera alarms now trigger when cameras are disabled with brute force or bullets.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Nanotrasen scientists have determined that a delaminating supermatter shard combining with a gravitational singularity is an extremely bad idea. They advise keeping the two as far apart as possible.</li>
+			</ul>
+			<h3 class="author">phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Nerfed the xray gun. Its range is now 15 tiles.</li>
+			</ul>
+
 			<h2 class="date">15 June 2015</h2>
 			<h3 class="author">Incoming5643 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a366f49f229..bd40cc75ed7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2774,3 +2774,25 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Added a new sepia slime plasma reaction. Try it out!
   spasticVerbalizer:
   - rscfix: Drones can now properly quick-equip.
+2015-06-18:
+  AnturK:
+  - rscadd: Added new photo-over-pda function. Apply the photo to PDA to send it with
+      your next message!
+  Ikarrus:
+  - rscadd: Department Management consoles have been added to Head of Staff offices.
+      These will enable heads to modify ID's access to their department, as well as
+      preform demotions.
+  Miauw:
+  - tweak: Bullets can now damage cameras.
+  - tweak: Camera alarms now trigger 90 seconds after the first EMP pulse, instead
+      of when all EMP pulses run out.
+  - tweak: Makes the force required to damage cameras greater than or equal to ten
+      instead of greater than ten.
+  - tweak: Camera alarms now trigger when cameras are disabled with brute force or
+      bullets.
+  Xhuis:
+  - rscadd: Nanotrasen scientists have determined that a delaminating supermatter
+      shard combining with a gravitational singularity is an extremely bad idea. They
+      advise keeping the two as far apart as possible.
+  phil235:
+  - rscdel: Nerfed the xray gun. Its range is now 15 tiles.
diff --git a/html/changelogs/AnturK-pda.yml b/html/changelogs/AnturK-pda.yml
deleted file mode 100644
index ea5c073af7c..00000000000
--- a/html/changelogs/AnturK-pda.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
-#   spellcheck (typo fixes)
-#   experiment
-#   tgs (TG-ported fixes?)
-#################################
-
-# Your name.  
-author: AnturK
-
-# 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: 
-  - rscadd: "Added new photo-over-pda function. Apply the photo to PDA to send it with your next message!"
diff --git a/html/changelogs/Ikarrus-deptmanagement.yml b/html/changelogs/Ikarrus-deptmanagement.yml
deleted file mode 100644
index 7cbd7300139..00000000000
--- a/html/changelogs/Ikarrus-deptmanagement.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
-#   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: 
-  - rscadd: "Department Management consoles have been added to Head of Staff offices. These will enable heads to modify ID's access to their department, as well as preform demotions."
\ No newline at end of file
diff --git a/html/changelogs/Miauw-AINerfTweaks.yml b/html/changelogs/Miauw-AINerfTweaks.yml
deleted file mode 100644
index 02b290595d3..00000000000
--- a/html/changelogs/Miauw-AINerfTweaks.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Miauw
-delete-after: True
-changes:
-  - tweak: "Bullets can now damage cameras."
-  - tweak: "Camera alarms now trigger 90 seconds after the first EMP pulse, instead of when all EMP pulses run out."
-  - tweak: "Makes the force required to damage cameras greater than or equal to ten instead of greater than ten."
-  - tweak: "Camera alarms now trigger when cameras are disabled with brute force or bullets."
\ No newline at end of file
diff --git a/html/changelogs/Xhuis-Superlarity.yml b/html/changelogs/Xhuis-Superlarity.yml
deleted file mode 100644
index 79559c527c3..00000000000
--- a/html/changelogs/Xhuis-Superlarity.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Xhuis
-delete-after: True
-
-changes: 
-  - rscadd: "Nanotrasen scientists have determined that a delaminating supermatter shard combining with a gravitational singularity is an extremely bad idea. They advise keeping the two as far apart as possible."
diff --git a/html/changelogs/phil235-XrayGunNerf.yml b/html/changelogs/phil235-XrayGunNerf.yml
deleted file mode 100644
index 0cdfb5b9318..00000000000
--- a/html/changelogs/phil235-XrayGunNerf.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes: 
-  - rscdel: "Nerfed the xray gun. Its range is now 15 tiles."