From c64b8166fe20fc41b7eba350fef84cd5a768c90e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 22 Nov 2018 14:27:21 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.11.22.14.27.21"

---
 html/changelog.html                          |  6 ++++
 html/changelogs/.all_changelog.yml           |  4 +++
 html/changelogs/Kaedwuff - Pink Lemonade.yml | 37 --------------------
 3 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/Kaedwuff - Pink Lemonade.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9f258aed24f..6fd9ab643e6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">22 November 2018</h2>
+			<h3 class="author">Kaedwuff updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Pink lemonade can now be made by mixing in grenadine to lemonade, if you want to make a girly fruit drink.</li>
+			</ul>
+
 			<h2 class="date">21 November 2018</h2>
 			<h3 class="author">BurgerBB updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cb47efdf14c..5f97b97e32b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6612,3 +6612,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - balance: Increases the minimum explosion power of phoron salts from 1 to 3, equivalent
       to a 1 tile wide light explosion.
   - experiment: Those who voted for a round type are no longer drafted for antag status.
+2018-11-22:
+  Kaedwuff:
+  - rscadd: Pink lemonade can now be made by mixing in grenadine to lemonade, if you
+      want to make a girly fruit drink.
diff --git a/html/changelogs/Kaedwuff - Pink Lemonade.yml b/html/changelogs/Kaedwuff - Pink Lemonade.yml
deleted file mode 100644
index 399f9d5403e..00000000000
--- a/html/changelogs/Kaedwuff - Pink Lemonade.yml	
+++ /dev/null
@@ -1,37 +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
-#   balance
-#################################
-
-# Your name.  
-author: Kaedwuff
-
-# 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: "Pink lemonade can now be made by mixing in grenadine to lemonade, if you want to make a girly fruit drink."