From 6549358c31210c71fd30c06cf828f998f95fc341 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Mon, 16 May 2016 01:17:29 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                        |  9 +++++
 html/changelogs/.all_changelog.yml         | 11 ++++++
 html/changelogs/yoshax - uplinkchanges.yml | 39 ----------------------
 3 files changed, 20 insertions(+), 39 deletions(-)
 delete mode 100644 html/changelogs/yoshax - uplinkchanges.yml

diff --git a/html/changelog.html b/html/changelog.html
index 07fb9c343cc..f164041dd8a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,15 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">16 May 2016</h2>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Uplinks now have a discounted item every 15 minutes. This is per uplink, and random, the discount is also random, but weighted as such that a low discount such as 10% off, or 20% off has a higher chance of happening than a high discount such as 90% of. An item will never cost less than 1.</li>
+				<li class="tweak">Mercenaries now spawn with their own, personal uplinks.</li>
+				<li class="bugfix">Faked announcements are now once again purchasable from the uplink, and actually work.</li>
+				<li class="rscadd">Adds several new items to the uplink including tactical knives, metal foam grenades, ambrosia seeds and much more.</li>
+			</ul>
+
 			<h2 class="date">13 May 2016</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 090b42444c9..d985e94abad 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2286,3 +2286,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       when they absorb and transform into them.
   - rscadd: Gives Diona a starting funds wage the same as Tajaran and Unathi.
   - bugfix: Brain damage no longer prevent implant removal surgery.
+2016-05-16:
+  Yoshax:
+  - rscadd: Uplinks now have a discounted item every 15 minutes. This is per uplink,
+      and random, the discount is also random, but weighted as such that a low discount
+      such as 10% off, or 20% off has a higher chance of happening than a high discount
+      such as 90% of. An item will never cost less than 1.
+  - tweak: Mercenaries now spawn with their own, personal uplinks.
+  - bugfix: Faked announcements are now once again purchasable from the uplink, and
+      actually work.
+  - rscadd: Adds several new items to the uplink including tactical knives, metal
+      foam grenades, ambrosia seeds and much more.
diff --git a/html/changelogs/yoshax - uplinkchanges.yml b/html/changelogs/yoshax - uplinkchanges.yml
deleted file mode 100644
index 6ad0968665c..00000000000
--- a/html/changelogs/yoshax - uplinkchanges.yml	
+++ /dev/null
@@ -1,39 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Yoshax
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Uplinks now have a discounted item every 15 minutes. This is per uplink, and random, the discount is also random, but weighted as such that a low discount such as 10% off, or 20% off has a higher chance of happening than a high discount such as 90% of. An item will never cost less than 1."
-  - tweak: "Mercenaries now spawn with their own, personal uplinks."
-  - bugfix: "Faked announcements are now once again purchasable from the uplink, and actually work."
-  - rscadd: "Adds several new items to the uplink including tactical knives, metal foam grenades, ambrosia seeds and much more."
\ No newline at end of file