From 52e50ea28d57545548e5cccf8e119f13ed89ab11 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 24 Oct 2015 00:25:21 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                      | 10 +++++++
 html/changelogs/.all_changelog.yml       | 10 +++++++
 html/changelogs/Kor-PR-Xenobio.yml       | 36 ------------------------
 html/changelogs/phil235-AlcoholTweak.yml |  8 ------
 4 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 html/changelogs/Kor-PR-Xenobio.yml
 delete mode 100644 html/changelogs/phil235-AlcoholTweak.yml

diff --git a/html/changelog.html b/html/changelog.html
index 11440ceb467..7665e377ec9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">24 October 2015</h2>
+			<h3 class="author">Kor updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The friendly gold slime reaction now spawns three mobs.</li>
+			</ul>
+			<h3 class="author">phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Changed the effects of alcohol to be more realistic. The effects of alcohol now appear twice as fast. Drunkenness now scales with how much alcohol is in you, not how long you've been drinking. This means drinking very little but continuously no longer makes you very drunk, or confused/slurring for a long time or give you alcohol poisoning. The dizziness and slurring effects now properly scale with how drunk you are (and dizziness is generally more pronounced).</li>
+			</ul>
+
 			<h2 class="date">23 October 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 3dbe3930a38..05a28f81b40 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2152,3 +2152,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       they store, and rumor has it this can be used in nefarious ways...
   - tweak: When a mob is impacted by radiation, the radiation is now relayed to all
       items on the mob.
+2015-10-24:
+  Kor:
+  - rscadd: The friendly gold slime reaction now spawns three mobs.
+  phil235:
+  - tweak: Changed the effects of alcohol to be more realistic. The effects of alcohol
+      now appear twice as fast. Drunkenness now scales with how much alcohol is in
+      you, not how long you've been drinking. This means drinking very little but
+      continuously no longer makes you very drunk, or confused/slurring for a long
+      time or give you alcohol poisoning. The dizziness and slurring effects now properly
+      scale with how drunk you are (and dizziness is generally more pronounced).
diff --git a/html/changelogs/Kor-PR-Xenobio.yml b/html/changelogs/Kor-PR-Xenobio.yml
deleted file mode 100644
index cfcaeee418a..00000000000
--- a/html/changelogs/Kor-PR-Xenobio.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: 
-  - rscadd: "The friendly gold slime reaction now spawns three mobs."
diff --git a/html/changelogs/phil235-AlcoholTweak.yml b/html/changelogs/phil235-AlcoholTweak.yml
deleted file mode 100644
index d9c4c231ce3..00000000000
--- a/html/changelogs/phil235-AlcoholTweak.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-  
-author: phil235
-
-delete-after: True
-
-changes: 
-  - tweak: "Changed the effects of alcohol to be more realistic. The effects of alcohol now appear twice as fast. Drunkenness now scales with how much alcohol is in you, not how long you've been drinking. This means drinking very little but continuously no longer makes you very drunk, or confused/slurring for a long time or give you alcohol poisoning. The dizziness and slurring effects now properly scale with how drunk you are (and dizziness is generally more pronounced)."
-