From c0aa68a47a43ae1e5cc4cc0411c83cf3dbbd5bd4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 29 Nov 2018 07:46:55 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.11.29.07.46.55"

---
 html/changelog.html                           |  5 +++
 html/changelogs/.all_changelog.yml            |  6 +++
 html/changelogs/paradoxspace-youreakidnow.yml | 38 -------------------
 3 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 html/changelogs/paradoxspace-youreakidnow.yml

diff --git a/html/changelog.html b/html/changelog.html
index afc98befd11..36c05115f1f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,6 +62,11 @@
 				<li class="bugfix">Removes Nitroglycerin from the cargo bounty list.</li>
 				<li class="bugfix">Fixes the company / boss name not being displayed properly in the virus bounties.</li>
 			</ul>
+			<h3 class="author">ParadoxSpace updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds two new headtail styles, three new headdress garments, and a bunch of cloths/bands.</li>
+				<li class="bugfix">Darkens and brings in line the Skrell sprite with every other species sprite. Colors will now be more accurate, and you can now actually find a good green.</li>
+			</ul>
 
 			<h2 class="date">28 November 2018</h2>
 			<h3 class="author">PoZe updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c26bbd5a92a..c41991a5f47 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6629,3 +6629,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Removes Nitroglycerin from the cargo bounty list.
   - bugfix: Fixes the company / boss name not being displayed properly in the virus
       bounties.
+  ParadoxSpace:
+  - rscadd: Adds two new headtail styles, three new headdress garments, and a bunch
+      of cloths/bands.
+  - bugfix: Darkens and brings in line the Skrell sprite with every other species
+      sprite. Colors will now be more accurate, and you can now actually find a good
+      green.
diff --git a/html/changelogs/paradoxspace-youreakidnow.yml b/html/changelogs/paradoxspace-youreakidnow.yml
deleted file mode 100644
index 34fb7baf59e..00000000000
--- a/html/changelogs/paradoxspace-youreakidnow.yml
+++ /dev/null
@@ -1,38 +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: ParadoxSpace
-
-# 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: "Adds two new headtail styles, three new headdress garments, and a bunch of cloths/bands."
-  - bugfix: "Darkens and brings in line the Skrell sprite with every other species sprite. Colors will now be more accurate, and you can now actually find a good green."