From f34d4a5bbb8aedc237881c006d293bfb27f02199 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 15 Nov 2022 22:04:46 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.11.15.22.04.46"

---
 html/changelog.html                      | 14 +++++++
 html/changelogs/.all_changelog.yml       | 14 +++++++
 html/changelogs/mattatlas-nomorelarp.yml | 49 ------------------------
 3 files changed, 28 insertions(+), 49 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-nomorelarp.yml

diff --git a/html/changelog.html b/html/changelog.html
index b5d084a0a04..c3d10c62784 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">15 November 2022</h2>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Bridge crew no longer have access to the flak cannon or to ammunition storage.</li>
+				<li class="tweak">Leviathan powerup is now a global effect.</li>
+				<li class="tweak">Lowered the sound of most guns.</li>
+				<li class="tweak">Ammunition loaders no longer instantly explode and die when hit.</li>
+				<li class="bugfix">Fixes ship weapons not being anchored.</li>
+				<li class="bugfix">Fixes projectiles not deleting when they reach the Overmap edge area. They now wrap around and delete after a certain amount of steps (30 for leviathan shots, 10 for normal shots).</li>
+				<li class="tweak">Finished longbow shells will now have the impact type in the name.</li>
+				<li class="tweak">Leviathan projectiles have been sped up.</li>
+				<li class="tweak">Targeted overmap objects are now detargeted if they go past the 7 tile range.</li>
+			</ul>
+
 			<h2 class="date">14 November 2022</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f30b46d5d17..4c53cba2e32 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26628,3 +26628,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   TheDanseMacabre:
   - maptweak: Made a number of minor fixes to various third party ships. Most notably,
       their rotary guns should no longer fall off.
+2022-11-15:
+  MattAtlas:
+  - tweak: Bridge crew no longer have access to the flak cannon or to ammunition storage.
+  - tweak: Leviathan powerup is now a global effect.
+  - tweak: Lowered the sound of most guns.
+  - tweak: Ammunition loaders no longer instantly explode and die when hit.
+  - bugfix: Fixes ship weapons not being anchored.
+  - bugfix: Fixes projectiles not deleting when they reach the Overmap edge area.
+      They now wrap around and delete after a certain amount of steps (30 for leviathan
+      shots, 10 for normal shots).
+  - tweak: Finished longbow shells will now have the impact type in the name.
+  - tweak: Leviathan projectiles have been sped up.
+  - tweak: Targeted overmap objects are now detargeted if they go past the 7 tile
+      range.
diff --git a/html/changelogs/mattatlas-nomorelarp.yml b/html/changelogs/mattatlas-nomorelarp.yml
deleted file mode 100644
index 1602466c90e..00000000000
--- a/html/changelogs/mattatlas-nomorelarp.yml
+++ /dev/null
@@ -1,49 +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:
-  - tweak: "Bridge crew no longer have access to the flak cannon or to ammunition storage."
-  - tweak: "Leviathan powerup is now a global effect."
-  - tweak: "Lowered the sound of most guns."
-  - tweak: "Ammunition loaders no longer instantly explode and die when hit."
-  - bugfix: "Fixes ship weapons not being anchored."
-  - bugfix: "Fixes projectiles not deleting when they reach the Overmap edge area. They now wrap around and delete after a certain amount of steps (30 for leviathan shots, 10 for normal shots)."
-  - tweak: "Finished longbow shells will now have the impact type in the name."
-  - tweak: "Leviathan projectiles have been sped up."
-  - tweak: "Targeted overmap objects are now detargeted if they go past the 7 tile range."