From f3e9641a3c8d87e9a1d5bcda0e4f86da8886c94a Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 28 Mar 2020 14:38:51 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.03.28.14.38.51"

---
 html/changelog.html                           |  5 +++
 html/changelogs/.all_changelog.yml            |  3 ++
 html/changelogs/paradoxspace-catchingfish.yml | 42 -------------------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/paradoxspace-catchingfish.yml

diff --git a/html/changelog.html b/html/changelog.html
index d2f4e78eadc..8260f21067b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,11 @@
 				<li class="tweak">Everything in mechfab and RnD consoles has been re-ordered and tweaked in some way, it should be organized better now.</li>
 				<li class="bugfix">Fixes the Circuit Imprinter not printing.</li>
 			</ul>
+			<h3 class="author">ParadoxSpace updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds some more underwear options, one courtesy of Aticius.</li>
+				<li class="rscadd">Makes tight tanktops and binders recolorable.</li>
+			</ul>
 			<h3 class="author">YourDaddy117 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="imageadd">Updated the Green Trenchcoat to make it less awful.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 90b7525fe43..e4fd686e201 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -12408,5 +12408,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Everything in mechfab and RnD consoles has been re-ordered and tweaked
       in some way, it should be organized better now.
   - bugfix: Fixes the Circuit Imprinter not printing.
+  ParadoxSpace:
+  - rscadd: Adds some more underwear options, one courtesy of Aticius.
+  - rscadd: Makes tight tanktops and binders recolorable.
   YourDaddy117:
   - imageadd: Updated the Green Trenchcoat to make it less awful.
diff --git a/html/changelogs/paradoxspace-catchingfish.yml b/html/changelogs/paradoxspace-catchingfish.yml
deleted file mode 100644
index b6e8c33f9d0..00000000000
--- a/html/changelogs/paradoxspace-catchingfish.yml
+++ /dev/null
@@ -1,42 +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
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# 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 some more underwear options, one courtesy of Aticius."
-  - rscadd: "Makes tight tanktops and binders recolorable."