From a48deff531b6ea54227156549ad04da83f3c8ddf Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 23 Jul 2015 19:59:56 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                           | 17 +++++++++++++++++
 html/changelogs/.all_changelog.yml            | 17 +++++++++++++++++
 html/changelogs/freerealestate - RESIST.yml   |  6 ------
 html/changelogs/nullquery-hi-extended.yml     | 10 ----------
 html/changelogs/xxalpha-changeling_vision.yml |  6 ------
 5 files changed, 34 insertions(+), 22 deletions(-)
 delete mode 100644 html/changelogs/freerealestate - RESIST.yml
 delete mode 100644 html/changelogs/nullquery-hi-extended.yml
 delete mode 100644 html/changelogs/xxalpha-changeling_vision.yml

diff --git a/html/changelog.html b/html/changelog.html
index c71fef2dfb1..a5d405680d2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,23 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">23 July 2015</h2>
+			<h3 class="author">NullQuery updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Crew monitoring: The minimap now supports scaling. You can zoom in and out using the buttons. Hovering over an entry in the table centers the minimap on that part of the screen.</li>
+				<li class="tweak">Crew monitoring: If the window is wide enough the health indicator will expand to show full health data (if available).</li>
+				<li class="tweak">Crew monitoring: Clicking on the area name will now copy the coordinates to your clipboard.</li>
+				<li class="tweak">Crew monitoring: The AI can view health information again, but there is a 5 second delay between updates for everyone watching.</li>
+			</ul>
+			<h3 class="author">freerealestate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added resist hotkeys for borgs and humans. With hotkeys mode, use CTRL+C or C as a human and CTRL+C, C or END as a borg. With hotkeys mode off, use CTRL+C as a human and END as a borg.</li>
+			</ul>
+			<h3 class="author">xxalpha updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Changeling augmented eyesight night vision is now working.</li>
+			</ul>
+
 			<h2 class="date">21 July 2015</h2>
 			<h3 class="author">Fayrik updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f96ce8cfadd..1b486a0c6b8 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1306,3 +1306,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       land on. Throwing a mob onto a mob in no gravity will push each one in opposite
       direction. Thrown mobs landing on wall, or dense object or mob gets stunned
       and a bit injured. The damage when mob hit a wall is nerfed.
+2015-07-23:
+  NullQuery:
+  - tweak: 'Crew monitoring: The minimap now supports scaling. You can zoom in and
+      out using the buttons. Hovering over an entry in the table centers the minimap
+      on that part of the screen.'
+  - tweak: 'Crew monitoring: If the window is wide enough the health indicator will
+      expand to show full health data (if available).'
+  - tweak: 'Crew monitoring: Clicking on the area name will now copy the coordinates
+      to your clipboard.'
+  - tweak: 'Crew monitoring: The AI can view health information again, but there is
+      a 5 second delay between updates for everyone watching.'
+  freerealestate:
+  - rscadd: Added resist hotkeys for borgs and humans. With hotkeys mode, use CTRL+C
+      or C as a human and CTRL+C, C or END as a borg. With hotkeys mode off, use CTRL+C
+      as a human and END as a borg.
+  xxalpha:
+  - bugfix: Changeling augmented eyesight night vision is now working.
diff --git a/html/changelogs/freerealestate - RESIST.yml b/html/changelogs/freerealestate - RESIST.yml
deleted file mode 100644
index f3dde428797..00000000000
--- a/html/changelogs/freerealestate - RESIST.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: freerealestate
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added resist hotkeys for borgs and humans. With hotkeys mode, use CTRL+C or C as a human and CTRL+C, C or END as a borg. With hotkeys mode off, use CTRL+C as a human and END as a borg."
diff --git a/html/changelogs/nullquery-hi-extended.yml b/html/changelogs/nullquery-hi-extended.yml
deleted file mode 100644
index 592b15ae7fd..00000000000
--- a/html/changelogs/nullquery-hi-extended.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: NullQuery
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-changes: 
-  - tweak: "Crew monitoring: The minimap now supports scaling. You can zoom in and out using the buttons. Hovering over an entry in the table centers the minimap on that part of the screen."
-  - tweak: "Crew monitoring: If the window is wide enough the health indicator will expand to show full health data (if available)."
-  - tweak: "Crew monitoring: Clicking on the area name will now copy the coordinates to your clipboard."
-  - tweak: "Crew monitoring: The AI can view health information again, but there is a 5 second delay between updates for everyone watching."
diff --git a/html/changelogs/xxalpha-changeling_vision.yml b/html/changelogs/xxalpha-changeling_vision.yml
deleted file mode 100644
index 94ab8979902..00000000000
--- a/html/changelogs/xxalpha-changeling_vision.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: xxalpha
-
-delete-after: True
-
-changes: 
-  - bugfix: "Changeling augmented eyesight night vision is now working."