From 1fa3e29cbd34efb6b51ca0fdcc89da20256899d5 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 26 Aug 2021 05:29:12 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.08.26.05.29.12"

---
 html/changelog.html                           | 22 ++++++++++
 html/changelogs/.all_changelog.yml            | 12 ++++++
 .../BLUNTFORCE420 - Whip&NaeNae.yml           | 41 -------------------
 html/changelogs/EaselMaterial.yml             |  7 ----
 html/changelogs/alberyk-holster.yml           |  6 ---
 html/changelogs/desven-bugscreens.yml         |  4 --
 html/changelogs/desven-drinks.yml             |  4 --
 7 files changed, 34 insertions(+), 62 deletions(-)
 delete mode 100644 html/changelogs/BLUNTFORCE420 - Whip&NaeNae.yml
 delete mode 100644 html/changelogs/EaselMaterial.yml
 delete mode 100644 html/changelogs/alberyk-holster.yml
 delete mode 100644 html/changelogs/desven-bugscreens.yml
 delete mode 100644 html/changelogs/desven-drinks.yml

diff --git a/html/changelog.html b/html/changelog.html
index eea35c5ac29..46b81aeea2a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,28 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">26 August 2021</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Holsters can no longer fit inside pockets.</li>
+			</ul>
+			<h3 class="author">BLUNTFORCE420 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a modified assault rifle for Coalition/Frontier factions.</li>
+			</ul>
+			<h3 class="author">CodePanter updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed a missing material definition for easels causing them to be dismantled into a steel plate.</li>
+			</ul>
+			<h3 class="author">Desven updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new drinks to the Robust Softdrinks vendor.</li>
+			</ul>
+			<h3 class="author">Desven & 50Noob updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new Vaurca lobby screens.</li>
+			</ul>
+
 			<h2 class="date">25 August 2021</h2>
 			<h3 class="author">Desven updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f2c6346a805..fea5a676e43 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -21252,3 +21252,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - balance: Zeng-Hu Mobility Frames use twice as much power for sprinting.
   - balance: Zeng-Hu Mobility Frames use twice as much power when moving normally.
   - rscdel: Zeng-Hu Mobility Frames may no longer be played in security roles.
+2021-08-26:
+  Alberyk:
+  - tweak: Holsters can no longer fit inside pockets.
+  BLUNTFORCE420:
+  - rscadd: Added a modified assault rifle for Coalition/Frontier factions.
+  CodePanter:
+  - bugfix: Fixed a missing material definition for easels causing them to be dismantled
+      into a steel plate.
+  Desven:
+  - rscadd: Added a new drinks to the Robust Softdrinks vendor.
+  Desven & 50Noob:
+  - rscadd: Added new Vaurca lobby screens.
diff --git a/html/changelogs/BLUNTFORCE420 - Whip&NaeNae.yml b/html/changelogs/BLUNTFORCE420 - Whip&NaeNae.yml
deleted file mode 100644
index 7d1cc899a21..00000000000
--- a/html/changelogs/BLUNTFORCE420 - Whip&NaeNae.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: BLUNTFORCE420
-
-# 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: "Added a modified assault rifle for Coalition/Frontier factions."
diff --git a/html/changelogs/EaselMaterial.yml b/html/changelogs/EaselMaterial.yml
deleted file mode 100644
index 2fd7a3481f2..00000000000
--- a/html/changelogs/EaselMaterial.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: CodePanter
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-changes:
-  - bugfix: "Fixed a missing material definition for easels causing them to be dismantled into a steel plate."
diff --git a/html/changelogs/alberyk-holster.yml b/html/changelogs/alberyk-holster.yml
deleted file mode 100644
index 86b6970b9df..00000000000
--- a/html/changelogs/alberyk-holster.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Alberyk
-
-delete-after: True
-
-changes:
-  - tweak: "Holsters can no longer fit inside pockets."
diff --git a/html/changelogs/desven-bugscreens.yml b/html/changelogs/desven-bugscreens.yml
deleted file mode 100644
index 2ff7e47a187..00000000000
--- a/html/changelogs/desven-bugscreens.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Desven & 50Noob
-delete-after: True
-changes:
-  - rscadd: "Added new Vaurca lobby screens."
diff --git a/html/changelogs/desven-drinks.yml b/html/changelogs/desven-drinks.yml
deleted file mode 100644
index 7f66de57803..00000000000
--- a/html/changelogs/desven-drinks.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Desven
-delete-after: True
-changes:
-  - rscadd: "Added a new drinks to the Robust Softdrinks vendor."