From 3d9a17098cb557a36d136be51bfd24755141ccc2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 9 Jun 2022 10:43:17 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.06.09.10.43.17"

---
 html/changelog.html                          |  8 ++++
 html/changelogs/.all_changelog.yml           |  5 +++
 html/changelogs/connorjg1-diplomacy.yml      | 42 --------------------
 html/changelogs/dansemacabre-lowroleplay.yml | 41 -------------------
 4 files changed, 13 insertions(+), 83 deletions(-)
 delete mode 100644 html/changelogs/connorjg1-diplomacy.yml
 delete mode 100644 html/changelogs/dansemacabre-lowroleplay.yml

diff --git a/html/changelog.html b/html/changelog.html
index 06dfad2137a..01de789ce6b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,14 @@
 				<li class="rscadd">Added a crayon augment to loadout.</li>
 				<li class="imageadd">New Integrated Crayon sprite.</li>
 			</ul>
+			<h3 class="author">Connorjg1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Removed mentions of NanoTrasen and station in Consular directives. Replaced them with the SCC and Horizon respectively.</li>
+			</ul>
+			<h3 class="author">TheDanseMacabre updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">The bee gun has been removed.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed some sol uniforms being unable to have their sleeves rolled.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 22be4bd220c..ce3094eac6d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24672,6 +24672,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Ben10083:
   - rscadd: Added a crayon augment to loadout.
   - imageadd: New Integrated Crayon sprite.
+  Connorjg1:
+  - tweak: Removed mentions of NanoTrasen and station in Consular directives. Replaced
+      them with the SCC and Horizon respectively.
+  TheDanseMacabre:
+  - rscdel: The bee gun has been removed.
   Wowzewow (Wezzy):
   - bugfix: Fixed some sol uniforms being unable to have their sleeves rolled.
   - bugfix: Fixes Zavodskoi cap and beret being unable to spawn.
diff --git a/html/changelogs/connorjg1-diplomacy.yml b/html/changelogs/connorjg1-diplomacy.yml
deleted file mode 100644
index a024a849a0c..00000000000
--- a/html/changelogs/connorjg1-diplomacy.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: Connorjg1
-
-# 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: "Removed mentions of NanoTrasen and station in Consular directives. Replaced them with the SCC and Horizon respectively."
-  
diff --git a/html/changelogs/dansemacabre-lowroleplay.yml b/html/changelogs/dansemacabre-lowroleplay.yml
deleted file mode 100644
index 7374ad25ca1..00000000000
--- a/html/changelogs/dansemacabre-lowroleplay.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: TheDanseMacabre
-
-# 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 bee gun has been removed."