From 96a86e1f690906910a406d624f61da52b9aabb5c Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Fri, 11 Oct 2024 02:25:48 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 17 +++++++++++++++++
 html/changelogs/.all_changelog.yml         | 18 ++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-11642.yml | 16 ----------------
 html/changelogs/AutoChangeLog-pr-11650.yml |  5 -----
 4 files changed, 35 insertions(+), 21 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11642.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11650.yml

diff --git a/html/changelog.html b/html/changelog.html
index d4576193faa70..756c0a4afb610 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,23 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">11 October 2024</h2>
+			<h3 class="author">MarkusLarsson421 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Standardized all Security Outposts to use Security access along with the related Head of Staff for the department they are in.</li>
+			</ul>
+			<h3 class="author">rkz, coiledlamb, MTandi updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">added new salt, pepper, and empty shaker sprites.</li>
+				<li class="imageadd">Resprited most condiment containers</li>
+				<li class="imageadd">Added sprites for cooking oil, ketchup, bbq, jelly, honey & hotsauce condiment bottles</li>
+				<li class="imageadd">Replaced old condiment bottles with the newer bottles in Condi Master</li>
+				<li class="rscdel">Condiment containers no longer change icon when their main ingredient changes (eg. salt saker no longer turns into flour sack when you refill it with flour)</li>
+				<li class="rscadd">Condiment bottle style can be specified when creating via CondiMaster</li>
+				<li class="bugfix">Name given to bottle created through CondiMaster now actually applied to it</li>
+				<li class="bugfix">Name given to condiment container by pen persists when container contents changed</li>
+			</ul>
+
 			<h2 class="date">10 October 2024</h2>
 			<h3 class="author">Aramix updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 10181247a4e41..3c1123726b14f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -44536,3 +44536,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Readds station-researchable missiles, the Breaching missile! Used to breach
       walls.
   - tweak: tweaks mech projectile values
+2024-10-11:
+  MarkusLarsson421:
+  - tweak: Standardized all Security Outposts to use Security access along with the
+      related Head of Staff for the department they are in.
+  rkz, coiledlamb, MTandi:
+  - imageadd: added new salt, pepper, and empty shaker sprites.
+  - imageadd: Resprited most condiment containers
+  - imageadd: Added sprites for cooking oil, ketchup, bbq, jelly, honey & hotsauce
+      condiment bottles
+  - imageadd: Replaced old condiment bottles with the newer bottles in Condi Master
+  - rscdel: Condiment containers no longer change icon when their main ingredient
+      changes (eg. salt saker no longer turns into flour sack when you refill it with
+      flour)
+  - rscadd: Condiment bottle style can be specified when creating via CondiMaster
+  - bugfix: Name given to bottle created through CondiMaster now actually applied
+      to it
+  - bugfix: Name given to condiment container by pen persists when container contents
+      changed
diff --git a/html/changelogs/AutoChangeLog-pr-11642.yml b/html/changelogs/AutoChangeLog-pr-11642.yml
deleted file mode 100644
index 3b3cda4dc6bb0..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11642.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-author: rkz, coiledlamb, MTandi
-delete-after: true
-changes:
-  - imageadd: added new salt, pepper, and empty shaker sprites.
-  - imageadd: Resprited most condiment containers
-  - imageadd: Added sprites for cooking oil, ketchup, bbq, jelly, honey & hotsauce
-      condiment bottles
-  - imageadd: Replaced old condiment bottles with the newer bottles in Condi Master
-  - rscdel: Condiment containers no longer change icon when their main ingredient
-      changes (eg. salt saker no longer turns into flour sack when you refill it with
-      flour)
-  - rscadd: Condiment bottle style can be specified when creating via CondiMaster
-  - bugfix: Name given to bottle created through CondiMaster now actually applied
-      to it
-  - bugfix: Name given to condiment container by pen persists when container contents
-      changed
diff --git a/html/changelogs/AutoChangeLog-pr-11650.yml b/html/changelogs/AutoChangeLog-pr-11650.yml
deleted file mode 100644
index 03368a793889a..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11650.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: MarkusLarsson421
-delete-after: true
-changes:
-  - tweak: Standardized all Security Outposts to use Security access along with the
-      related Head of Staff for the department they are in.