From a070e817e2c57e4b18079d58ea625d72b5dbd233 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 25 Apr 2021 14:58:09 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.04.25.14.58.09"

---
 html/changelog.html                         | 25 +++++++++++++
 html/changelogs/.all_changelog.yml          | 19 ++++++++++
 html/changelogs/ColorVest.yml               |  6 ---
 html/changelogs/PassFix.yml                 |  6 ---
 html/changelogs/TempRagFix.yml              |  6 ---
 html/changelogs/geeves-diona_aesthetic.yml  |  6 ---
 html/changelogs/mattatlas-necessaryevil.yml | 41 ---------------------
 html/changelogs/omicega-fdsfdsfs.yml        | 41 ---------------------
 html/changelogs/wickedcybs_begone.yml       |  6 ---
 html/changelogs/wickedcybs_zippo.yml        |  6 ---
 10 files changed, 44 insertions(+), 118 deletions(-)
 delete mode 100644 html/changelogs/ColorVest.yml
 delete mode 100644 html/changelogs/PassFix.yml
 delete mode 100644 html/changelogs/TempRagFix.yml
 delete mode 100644 html/changelogs/geeves-diona_aesthetic.yml
 delete mode 100644 html/changelogs/mattatlas-necessaryevil.yml
 delete mode 100644 html/changelogs/omicega-fdsfdsfs.yml
 delete mode 100644 html/changelogs/wickedcybs_begone.yml
 delete mode 100644 html/changelogs/wickedcybs_zippo.yml

diff --git a/html/changelog.html b/html/changelog.html
index a08cb39d84c..424b256c982 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,31 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">25 April 2021</h2>
+			<h3 class="author">Geeves, SleepyWolf updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a lot of Diona customization options: Hair, Facial Hair, and Body Markings.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">The clown outfit has been removed from the game.</li>
+			</ul>
+			<h3 class="author">Omicega updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Black jeans shorts (and short shorts) now look more similar to the full-length black jeans themselves.</li>
+			</ul>
+			<h3 class="author">TheGreyWolf updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Human passports should now once again be visible.</li>
+				<li class="bugfix">The handkerchief now works! Temporarily.</li>
+				<li class="rscadd">Added a colorable vest to the loadout.</li>
+			</ul>
+			<h3 class="author">WickedCybs updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The breakfast wrap no longer has over twenty units of condesned capsaicin inside of it. That was over half of a pepperspray can. It now only has regular capsaicin and will still be spicy, but not to a paincrit level.</li>
+				<li class="rscadd">Added a NanoTrasen and Fisanduhian zippo lighter to the game. You can find these in the zippo selection in the loadout menu.</li>
+			</ul>
+
 			<h2 class="date">24 April 2021</h2>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 37be271d2fb..681f57ad2b3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -19629,3 +19629,22 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Ported max and min pressure tolerances for items and clothing, meaning
       that certain gear will now protect better from overpressure, such as atmos voidsuits,
       firesuits, bomb suits, and to a lesser extent, engineering voidsuits.
+2021-04-25:
+  Geeves, SleepyWolf:
+  - rscadd: 'Added a lot of Diona customization options: Hair, Facial Hair, and Body
+      Markings.'
+  MattAtlas:
+  - rscdel: The clown outfit has been removed from the game.
+  Omicega:
+  - tweak: Black jeans shorts (and short shorts) now look more similar to the full-length
+      black jeans themselves.
+  TheGreyWolf:
+  - bugfix: Human passports should now once again be visible.
+  - bugfix: The handkerchief now works! Temporarily.
+  - rscadd: Added a colorable vest to the loadout.
+  WickedCybs:
+  - tweak: The breakfast wrap no longer has over twenty units of condesned capsaicin
+      inside of it. That was over half of a pepperspray can. It now only has regular
+      capsaicin and will still be spicy, but not to a paincrit level.
+  - rscadd: Added a NanoTrasen and Fisanduhian zippo lighter to the game. You can
+      find these in the zippo selection in the loadout menu.
diff --git a/html/changelogs/ColorVest.yml b/html/changelogs/ColorVest.yml
deleted file mode 100644
index c2803f630ba..00000000000
--- a/html/changelogs/ColorVest.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - rscadd: "Added a colorable vest to the loadout."
diff --git a/html/changelogs/PassFix.yml b/html/changelogs/PassFix.yml
deleted file mode 100644
index 6be2f4d97f3..00000000000
--- a/html/changelogs/PassFix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - bugfix: "Human passports should now once again be visible."
diff --git a/html/changelogs/TempRagFix.yml b/html/changelogs/TempRagFix.yml
deleted file mode 100644
index 957e05b269a..00000000000
--- a/html/changelogs/TempRagFix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - bugfix: "The handkerchief now works! Temporarily."
diff --git a/html/changelogs/geeves-diona_aesthetic.yml b/html/changelogs/geeves-diona_aesthetic.yml
deleted file mode 100644
index 168e85081d9..00000000000
--- a/html/changelogs/geeves-diona_aesthetic.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves, SleepyWolf
-
-delete-after: True
-
-changes:
-  - rscadd: "Added a lot of Diona customization options: Hair, Facial Hair, and Body Markings."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-necessaryevil.yml b/html/changelogs/mattatlas-necessaryevil.yml
deleted file mode 100644
index 1e588766f86..00000000000
--- a/html/changelogs/mattatlas-necessaryevil.yml
+++ /dev/null
@@ -1,41 +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: MattAtlas
-
-# 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:
-  - rscdel: "The clown outfit has been removed from the game."
diff --git a/html/changelogs/omicega-fdsfdsfs.yml b/html/changelogs/omicega-fdsfdsfs.yml
deleted file mode 100644
index 45130fd5014..00000000000
--- a/html/changelogs/omicega-fdsfdsfs.yml
+++ /dev/null
@@ -1,41 +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: Omicega
-
-# 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:
-  - tweak: "Black jeans shorts (and short shorts) now look more similar to the full-length black jeans themselves."
diff --git a/html/changelogs/wickedcybs_begone.yml b/html/changelogs/wickedcybs_begone.yml
deleted file mode 100644
index ba8623bfcc3..00000000000
--- a/html/changelogs/wickedcybs_begone.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: WickedCybs
-
-delete-after: True
-
-changes:
-  - tweak: "The breakfast wrap no longer has over twenty units of condesned capsaicin inside of it. That was over half of a pepperspray can. It now only has regular capsaicin and will still be spicy, but not to a paincrit level."
\ No newline at end of file
diff --git a/html/changelogs/wickedcybs_zippo.yml b/html/changelogs/wickedcybs_zippo.yml
deleted file mode 100644
index 484261d164d..00000000000
--- a/html/changelogs/wickedcybs_zippo.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: WickedCybs
-
-delete-after: True
-
-changes:
-  - rscadd: "Added a NanoTrasen and Fisanduhian zippo lighter to the game. You can find these in the zippo selection in the loadout menu."
\ No newline at end of file