From 386e4abe193aefda1e2c688fc88d1f3845e2f03c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 11 Jul 2022 10:35:16 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.07.11.10.35.16"

---
 html/changelog.html                        |  5 +++
 html/changelogs/.all_changelog.yml         |  6 ++++
 html/changelogs/bluntforce420_tec9.yml     | 41 ----------------------
 html/changelogs/dansemacabre-militsiya.yml | 41 ----------------------
 4 files changed, 11 insertions(+), 82 deletions(-)
 delete mode 100644 html/changelogs/bluntforce420_tec9.yml
 delete mode 100644 html/changelogs/dansemacabre-militsiya.yml

diff --git a/html/changelog.html b/html/changelog.html
index b19dafd5bdf..58e9f20b32d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,10 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">11 July 2022</h2>
+			<h3 class="author">BLUNTFORCE420 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Updates the Tanto/c05r to better fit the Aurora artstyle, mimicking the design of the new Everyman sprite.</li>
+			</ul>
 			<h3 class="author">Connorjg1 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">K&#x27;lax and C&#x27;thur language augments no longer cost 2 loadout points, instead now costing 0.</li>
@@ -55,6 +59,7 @@
 			<h3 class="author">TheDanseMacabre updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added a civilian station away site. It&#x27;s part gas station, part strip mall, part motel!</li>
+				<li class="rscadd">Added a local militia third party ship. They&#x27;re neutral towards Biesel and the SCC, and mostly focus on protecting their region of space from pirates. They can also double as mercenaries.</li>
 			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6567a327988..1a63b738a76 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25128,6 +25128,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       duffels and rucksacks should have their inhands display properly.
   - bugfix: Fixes broken job-specific satchels and bags.
 2022-07-11:
+  BLUNTFORCE420:
+  - tweak: Updates the Tanto/c05r to better fit the Aurora artstyle, mimicking the
+      design of the new Everyman sprite.
   Connorjg1:
   - tweak: K&#x27;lax and C&#x27;thur language augments no longer cost 2 loadout points,
       instead now costing 0.
@@ -25144,6 +25147,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   TheDanseMacabre:
   - rscadd: Added a civilian station away site. It&#x27;s part gas station, part strip
       mall, part motel!
+  - rscadd: Added a local militia third party ship. They&#x27;re neutral towards Biesel
+      and the SCC, and mostly focus on protecting their region of space from pirates.
+      They can also double as mercenaries.
   Wowzewow (Wezzy):
   - bugfix: Fixes duffel bags.
   - bugfix: Fixes CE uniform being unable to be unrolled.
diff --git a/html/changelogs/bluntforce420_tec9.yml b/html/changelogs/bluntforce420_tec9.yml
deleted file mode 100644
index cdebd8b5e31..00000000000
--- a/html/changelogs/bluntforce420_tec9.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:
-  - tweak: "Updates the Tanto/c05r to better fit the Aurora artstyle, mimicking the design of the new Everyman sprite."
diff --git a/html/changelogs/dansemacabre-militsiya.yml b/html/changelogs/dansemacabre-militsiya.yml
deleted file mode 100644
index 0c3e9b9cc08..00000000000
--- a/html/changelogs/dansemacabre-militsiya.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:
-  - rscadd: "Added a local militia third party ship. They're neutral towards Biesel and the SCC, and mostly focus on protecting their region of space from pirates. They can also double as mercenaries."