From af318acfc15a1d773f2d98f01f5e1d3def4fe1f3 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <action@github.com>
Date: Mon, 25 Dec 2023 17:15:04 +0000
Subject: [PATCH] Automatic Changelog compile [ci skip]

---
 html/changelog.html                           |  4 ++
 html/changelogs/.all_changelog.yml            |  3 ++
 ...LynxSolstice-Tajara-Smuggler-Power-Fix.yml | 41 -------------------
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/LynxSolstice-Tajara-Smuggler-Power-Fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 81f1b3b45d4..3047187e2f5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,6 +51,10 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">You now need a direct line of sight to establish and use the Psi Grip (crush) ability. You do not have to maintain line of sight to keep the grip active, however.</li>
 			</ul>
+			<h3 class="author">LynxSolstice updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Added a beefier SMES to the Tajaran Smuggler ship to keep the engines from turning off and as recommended by HazelMouse, a breakerbox.</li>
+			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added Dominian Imperial Army gear, which can also be bought on the uplink as part of the Imperial Army gear crate.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bd44c7a3b65..682a4ff0704 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -32890,6 +32890,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: You now need a direct line of sight to establish and use the Psi Grip (crush)
       ability. You do not have to maintain line of sight to keep the grip active,
       however.
+  LynxSolstice:
+  - tweak: Added a beefier SMES to the Tajaran Smuggler ship to keep the engines from
+      turning off and as recommended by HazelMouse, a breakerbox.
   MattAtlas:
   - rscadd: Added Dominian Imperial Army gear, which can also be bought on the uplink
       as part of the Imperial Army gear crate.
diff --git a/html/changelogs/LynxSolstice-Tajara-Smuggler-Power-Fix.yml b/html/changelogs/LynxSolstice-Tajara-Smuggler-Power-Fix.yml
deleted file mode 100644
index 0330947c991..00000000000
--- a/html/changelogs/LynxSolstice-Tajara-Smuggler-Power-Fix.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: LynxSolstice
-
-# 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: "Added a beefier SMES to the Tajaran Smuggler ship to keep the engines from turning off and as recommended by HazelMouse, a breakerbox."