From fce89164bf4fbd6ec74ae091e1faf690a145ea35 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 29 Oct 2015 01:34:09 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                |  6 +++++
 html/changelogs/.all_changelog.yml |  4 ++++
 html/changelogs/Kor-PR-Captain.yml | 36 ------------------------------
 3 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/Kor-PR-Captain.yml

diff --git a/html/changelog.html b/html/changelog.html
index d65397f3fe7..70886d75149 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 October 2015</h2>
+			<h3 class="author">Kor updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Slightly changed what items spawn on the captain vs in his locker, hopefully saving some annoying inventory shuffle at roundstart.</li>
+			</ul>
+
 			<h2 class="date">28 October 2015</h2>
 			<h3 class="author">Tkdrg updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ed6ff8bdca2..19de93ec4c9 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2220,3 +2220,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Ghost will now get clickable icon alerts from events such as being put
       in a cloner, drones being created, Nar-sie being summoned, among others. The
       older chat messages were kept. These alerts can not be toggled.
+2015-10-29:
+  Kor:
+  - tweak: Slightly changed what items spawn on the captain vs in his locker, hopefully
+      saving some annoying inventory shuffle at roundstart.
diff --git a/html/changelogs/Kor-PR-Captain.yml b/html/changelogs/Kor-PR-Captain.yml
deleted file mode 100644
index 173b1da13a0..00000000000
--- a/html/changelogs/Kor-PR-Captain.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: Kor
-
-# 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: "Slightly changed what items spawn on the captain vs in his locker, hopefully saving some annoying inventory shuffle at roundstart."