From 83899a9336939ce6c37a3a01a5fd7611fd96a0cf Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Sun, 7 Apr 2024 20:03:14 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]
---
html/changelog.html | 5 +++++
html/changelogs/.all_changelog.yml | 3 +++
html/changelogs/AutoChangeLog-pr-10862.yml | 5 -----
3 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-10862.yml
diff --git a/html/changelog.html b/html/changelog.html
index 09c45c337c53b..5c13e6eb71376 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,11 @@
LemonInTheDark (port by EvilDragonfiend) updated:
- dev protection to master is added to prevent a dev to try merging master instead of a branch
+ Twaticus, Fikou, Miliviu updated:
+
+ - 4 new stamps! centcom, syndicate, mime and chaplain
+ - new stamp sprites by Twaticus
+
rkz. Tastyfish, Mothblocks updated:
- added annotations and colorized pass/fail to integration tests
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2f45b45e3d95d..81fc959a9da68 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -43004,5 +43004,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
LemonInTheDark (port by EvilDragonfiend):
- code_imp: dev protection to master is added to prevent a dev to try merging master
instead of a branch
+ Twaticus, Fikou, Miliviu:
+ - rscadd: 4 new stamps! centcom, syndicate, mime and chaplain
+ - imageadd: new stamp sprites by Twaticus
rkz. Tastyfish, Mothblocks:
- server: added annotations and colorized pass/fail to integration tests
diff --git a/html/changelogs/AutoChangeLog-pr-10862.yml b/html/changelogs/AutoChangeLog-pr-10862.yml
deleted file mode 100644
index 707c7c81c2718..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-10862.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Twaticus, Fikou, Miliviu
-delete-after: true
-changes:
- - rscadd: 4 new stamps! centcom, syndicate, mime and chaplain
- - imageadd: new stamp sprites by Twaticus