From 918ff5099cf93852bc8aa81d69250087efca9c94 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Thu, 24 Mar 2016 18:23:15 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                        | 30 ++++++++++++++++
 html/changelogs/.all_changelog.yml         | 40 ++++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-16147.yml | 14 --------
 html/changelogs/AutoChangeLog-pr-16257.yml |  5 ---
 html/changelogs/AutoChangeLog-pr-16280.yml |  5 ---
 html/changelogs/AutoChangeLog-pr-16291.yml |  4 ---
 6 files changed, 70 insertions(+), 28 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16147.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16257.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16280.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-16291.yml

diff --git a/html/changelog.html b/html/changelog.html
index e8309994c88..dacbb86f2ba 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,36 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">24 March 2016</h2>
+			<h3 class="author">Iamgoofball updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">CLF3 now melts, burns, and destroys floors a lot more often, as it should be.</li>
+				<li class="rscadd">CLF3 now makes 3x3 fireballs on tiles it touches now, instead of a single fireball.</li>
+			</ul>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Lightning Holoparasites will actually shock relatively often instead of 'sometimes, maybe, if you're really lucky'</li>
+			</ul>
+			<h3 class="author">PKPenguin321 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Sand now fits in your pockets</li>
+				<li class="rscadd">Sand can now be thrown into people's eyes, doing slight stamina damage, making their vision slightly blurry, and making them stumble when they walk for a short time.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="experiment">Alcohol has received multiple tweaks.</li>
+				<li class="tweak">Drunkenness will now be displayed on examine as long as the target's face is not hidden, ranging from a slight flush to being a completely drunken wreck. This also helps to measure alcohol poisoning, although the appearance will remain for thirty seconds after the alcohol leaves the imbiber's bloodstream.</li>
+				<li class="tweak">Alcohol poisoning now has different effects. It begins with standard things such as confusion, dizziness, and slurring, but eventually escalates to constant vomiting, blacking out, and toxin damage.</li>
+				<li class="tweak">Drinks now have a wide variety of alcoholism. Grog is barely a drink whatsoever, for instance, but Manly Dorf will completely floor you with too much consumption. Note that drinks based off of whiskey and vodka are the hardest, whereas beer and wine are the softest.</li>
+				<li class="tweak">The speed of alcohol poisoning has been slightly reduced.</li>
+				<li class="rscadd">Some drinks have received unique effects. Experiment!</li>
+				<li class="rscadd">A new base alcohol joins the lineup! Absinthe has been added, and is very strong.</li>
+				<li class="rscadd">Whiskey Sour, made with Whiskey, Lemon Juice, and Sugar, simply expands the existing whiskey-based lineup.</li>
+				<li class="rscadd">Fetching Fizz, made with Nuka-Cola and Iron, will pull all nearby ores in the direction of the imbiber.</li>
+				<li class="rscadd">Hearty Punch, made with Brave Bull, Syndicate Bomb, and Absinthe, will provide extreme healing in critical condition.</li>
+				<li class="rscadd">Bacchus' Blessing, made with four of the most powerful alcohols on the station, is over three times stronger than any other alcohol on the station. Consume in small amounts or risk death.</li>
+			</ul>
+
 			<h2 class="date">23 March 2016</h2>
 			<h3 class="author">Iamgoofball updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 571db8c7686..deeb937367d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4073,3 +4073,43 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Cargo now works off of Credits.
   - rscadd: Cargo now plays the Stock Market.
   - rscadd: Buy Low, Sell High
+2016-03-24:
+  Iamgoofball:
+  - rscadd: CLF3 now melts, burns, and destroys floors a lot more often, as it should
+      be.
+  - rscadd: CLF3 now makes 3x3 fireballs on tiles it touches now, instead of a single
+      fireball.
+  Joan:
+  - tweak: Lightning Holoparasites will actually shock relatively often instead of
+      'sometimes, maybe, if you're really lucky'
+  PKPenguin321:
+  - tweak: Sand now fits in your pockets
+  - rscadd: Sand can now be thrown into people's eyes, doing slight stamina damage,
+      making their vision slightly blurry, and making them stumble when they walk
+      for a short time.
+  Xhuis:
+  - experiment: Alcohol has received multiple tweaks.
+  - tweak: Drunkenness will now be displayed on examine as long as the target's face
+      is not hidden, ranging from a slight flush to being a completely drunken wreck.
+      This also helps to measure alcohol poisoning, although the appearance will remain
+      for thirty seconds after the alcohol leaves the imbiber's bloodstream.
+  - tweak: Alcohol poisoning now has different effects. It begins with standard things
+      such as confusion, dizziness, and slurring, but eventually escalates to constant
+      vomiting, blacking out, and toxin damage.
+  - tweak: Drinks now have a wide variety of alcoholism. Grog is barely a drink whatsoever,
+      for instance, but Manly Dorf will completely floor you with too much consumption.
+      Note that drinks based off of whiskey and vodka are the hardest, whereas beer
+      and wine are the softest.
+  - tweak: The speed of alcohol poisoning has been slightly reduced.
+  - rscadd: Some drinks have received unique effects. Experiment!
+  - rscadd: A new base alcohol joins the lineup! Absinthe has been added, and is very
+      strong.
+  - rscadd: Whiskey Sour, made with Whiskey, Lemon Juice, and Sugar, simply expands
+      the existing whiskey-based lineup.
+  - rscadd: Fetching Fizz, made with Nuka-Cola and Iron, will pull all nearby ores
+      in the direction of the imbiber.
+  - rscadd: Hearty Punch, made with Brave Bull, Syndicate Bomb, and Absinthe, will
+      provide extreme healing in critical condition.
+  - rscadd: Bacchus' Blessing, made with four of the most powerful alcohols on the
+      station, is over three times stronger than any other alcohol on the station.
+      Consume in small amounts or risk death.
diff --git a/html/changelogs/AutoChangeLog-pr-16147.yml b/html/changelogs/AutoChangeLog-pr-16147.yml
deleted file mode 100644
index b4ee2dd58c8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16147.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-author: Xhuis
-delete-after: True
-changes: 
-  - experiment: "Alcohol has received multiple tweaks."
-  - tweak: "Drunkenness will now be displayed on examine as long as the target's face is not hidden, ranging from a slight flush to being a completely drunken wreck. This also helps to measure alcohol poisoning, although the appearance will remain for thirty seconds after the alcohol leaves the imbiber's bloodstream."
-  - tweak: "Alcohol poisoning now has different effects. It begins with standard things such as confusion, dizziness, and slurring, but eventually escalates to constant vomiting, blacking out, and toxin damage."
-  - tweak: "Drinks now have a wide variety of alcoholism. Grog is barely a drink whatsoever, for instance, but Manly Dorf will completely floor you with too much consumption. Note that drinks based off of whiskey and vodka are the hardest, whereas beer and wine are the softest."
-  - tweak: "The speed of alcohol poisoning has been slightly reduced."
-  - rscadd: "Some drinks have received unique effects. Experiment!"
-  - rscadd: "A new base alcohol joins the lineup! Absinthe has been added, and is very strong."
-  - rscadd: "Whiskey Sour, made with Whiskey, Lemon Juice, and Sugar, simply expands the existing whiskey-based lineup."
-  - rscadd: "Fetching Fizz, made with Nuka-Cola and Iron, will pull all nearby ores in the direction of the imbiber."
-  - rscadd: "Hearty Punch, made with Brave Bull, Syndicate Bomb, and Absinthe, will provide extreme healing in critical condition."
-  - rscadd: "Bacchus' Blessing, made with four of the most powerful alcohols on the station, is over three times stronger than any other alcohol on the station. Consume in small amounts or risk death."
diff --git a/html/changelogs/AutoChangeLog-pr-16257.yml b/html/changelogs/AutoChangeLog-pr-16257.yml
deleted file mode 100644
index d21d3f30110..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16257.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: PKPenguin321
-delete-after: True
-changes: 
-  - tweak: "Sand now fits in your pockets"
-  - rscadd: "Sand can now be thrown into people's eyes, doing slight stamina damage, making their vision slightly blurry, and making them stumble when they walk for a short time."
diff --git a/html/changelogs/AutoChangeLog-pr-16280.yml b/html/changelogs/AutoChangeLog-pr-16280.yml
deleted file mode 100644
index 2e2fb622387..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16280.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Iamgoofball
-delete-after: True
-changes: 
-  - rscadd: "CLF3 now melts, burns, and destroys floors a lot more often, as it should be."
-  - rscadd: "CLF3 now makes 3x3 fireballs on tiles it touches now, instead of a single fireball."
diff --git a/html/changelogs/AutoChangeLog-pr-16291.yml b/html/changelogs/AutoChangeLog-pr-16291.yml
deleted file mode 100644
index 01f1b037edf..00000000000
--- a/html/changelogs/AutoChangeLog-pr-16291.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - tweak: "Lightning Holoparasites will actually shock relatively often instead of 'sometimes, maybe, if you're really lucky'"