From 975d32e5a1680a0b72116708ffdef9cd87f2f8ae Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <action@github.com>
Date: Mon, 4 Sep 2023 08:48:46 +0000
Subject: [PATCH] Automatic Changelog compile [ci skip]

---
 html/changelog.html                           | 14 ++++++
 html/changelogs/.all_changelog.yml            | 16 ++++++
 .../GeneralCamo - Suppressor Rework.yml       | 49 -------------------
 3 files changed, 30 insertions(+), 49 deletions(-)
 delete mode 100644 html/changelogs/GeneralCamo - Suppressor Rework.yml

diff --git a/html/changelog.html b/html/changelog.html
index db452f5a5f7..a6f6aa136ea 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">04 September 2023</h2>
+			<h3 class="author">GeneralCamo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="refactor">Refactored how weapon sounds are handled to be less hardcoded.</li>
+				<li class="tweak">Renamed the silencer to the suppressor.</li>
+				<li class="tweak">The suppressor can now be attached to most pistol-caliber weapons, with the notable exceptions of revolvers.</li>
+				<li class="tweak">Suppressors are now removed with Alt-Click.</li>
+				<li class="rscadd">Added a suppressor to the antagonist uplink, under &quot;Highly Visible and Dangerous Weapons&quot;. It costs either 1 telecrystal or 1 bluecrystal.</li>
+				<li class="rscdel">The 9mm pistol no longer comes with a suppressor. The 9mm pistol&#x27;s cost has been reduced from 2 telecrystals to 1 to compensate.</li>
+				<li class="rscadd">Added a permanently suppressed .45 pistol to the uplink.</li>
+				<li class="rscadd">The holographic ammo display and bayonet now add their weights to a weapon when attached (and vice versa and detached).</li>
+				<li class="balance">The holographic ammo display&#x27;s weight has been reduced from &#x27;small&#x27; to &#x27;tiny&#x27;.</li>
+			</ul>
+
 			<h2 class="date">03 September 2023</h2>
 			<h3 class="author">FluffyGhost updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b02b7cc128f..afabced1652 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -30972,3 +30972,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   SleepyGemmy:
   - bugfix: Fixed the mailroom conveyor having low visibility for potentially stuck
       packages.
+2023-09-04:
+  GeneralCamo:
+  - refactor: Refactored how weapon sounds are handled to be less hardcoded.
+  - tweak: Renamed the silencer to the suppressor.
+  - tweak: The suppressor can now be attached to most pistol-caliber weapons, with
+      the notable exceptions of revolvers.
+  - tweak: Suppressors are now removed with Alt-Click.
+  - rscadd: Added a suppressor to the antagonist uplink, under &quot;Highly Visible
+      and Dangerous Weapons&quot;. It costs either 1 telecrystal or 1 bluecrystal.
+  - rscdel: The 9mm pistol no longer comes with a suppressor. The 9mm pistol&#x27;s
+      cost has been reduced from 2 telecrystals to 1 to compensate.
+  - rscadd: Added a permanently suppressed .45 pistol to the uplink.
+  - rscadd: The holographic ammo display and bayonet now add their weights to a weapon
+      when attached (and vice versa and detached).
+  - balance: The holographic ammo display&#x27;s weight has been reduced from &#x27;small&#x27;
+      to &#x27;tiny&#x27;.
diff --git a/html/changelogs/GeneralCamo - Suppressor Rework.yml b/html/changelogs/GeneralCamo - Suppressor Rework.yml
deleted file mode 100644
index 0610199776f..00000000000
--- a/html/changelogs/GeneralCamo - Suppressor Rework.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: GeneralCamo
-
-# 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:
-  - refactor: "Refactored how weapon sounds are handled to be less hardcoded."
-  - tweak: "Renamed the silencer to the suppressor."
-  - tweak: "The suppressor can now be attached to most pistol-caliber weapons, with the notable exceptions of revolvers."
-  - tweak: "Suppressors are now removed with Alt-Click."
-  - rscadd: "Added a suppressor to the antagonist uplink, under \"Highly Visible and Dangerous Weapons\". It costs either 1 telecrystal or 1 bluecrystal."
-  - rscdel: "The 9mm pistol no longer comes with a suppressor. The 9mm pistol's cost has been reduced from 2 telecrystals to 1 to compensate."
-  - rscadd: "Added a permanently suppressed .45 pistol to the uplink."
-  - rscadd: "The holographic ammo display and bayonet now add their weights to a weapon when attached (and vice versa and detached)."
-  - balance: "The holographic ammo display's weight has been reduced from 'small' to 'tiny'."