From 687466c5aab24ec84d287ae5bfdbc71bc1fbed53 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 29 May 2021 00:54:02 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 20 ++++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 12 ++++++++++++
 html/changelogs/AutoChangeLog-pr-14750.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-14751.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-14755.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-14756.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-14757.yml |  4 ----
 7 files changed, 32 insertions(+), 22 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14750.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14751.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14755.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14756.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14757.yml

diff --git a/html/changelog.html b/html/changelog.html
index 46d1ab1089..69b514b5f9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,26 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">29 May 2021</h2>
+			<h3 class="author">Kraseo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">No more slamming into people while bloodcrawled.</li>
+			</ul>
+			<h3 class="author">Linzolle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">brand intelligence event works again</li>
+			</ul>
+			<h3 class="author">keronshb updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">swag outfit available in clothesmate</li>
+				<li class="rscadd">swag shoes availble in clothesmate resprite: changed swag shoes icon to the one twaticus made.</li>
+				<li class="rscadd">Adds the clown mob spawner for admins</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">puglism damage can no longer stack with scarp</li>
+			</ul>
+
 			<h2 class="date">26 May 2021</h2>
 			<h3 class="author">bunny232 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5855b178ce..475730286e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -29352,3 +29352,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-05-26:
   bunny232:
   - bugfix: Removed two random 'captain's office' tiles from space on meta station
+2021-05-29:
+  Kraseo:
+  - bugfix: No more slamming into people while bloodcrawled.
+  Linzolle:
+  - bugfix: brand intelligence event works again
+  keronshb:
+  - rscadd: swag outfit available in clothesmate
+  - rscadd: 'swag shoes availble in clothesmate resprite: changed swag shoes icon
+      to the one twaticus made.'
+  - rscadd: Adds the clown mob spawner for admins
+  zeroisthebiggay:
+  - balance: puglism damage can no longer stack with scarp
diff --git a/html/changelogs/AutoChangeLog-pr-14750.yml b/html/changelogs/AutoChangeLog-pr-14750.yml
deleted file mode 100644
index f43fbe8c44..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14750.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes: 
-  - rscadd: "swag outfit available in clothesmate"
-  - rscadd: "swag shoes availble in clothesmate
-resprite: changed swag shoes icon to the one twaticus made."
diff --git a/html/changelogs/AutoChangeLog-pr-14751.yml b/html/changelogs/AutoChangeLog-pr-14751.yml
deleted file mode 100644
index 91a2ff6234..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14751.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes: 
-  - rscadd: "Adds the clown mob spawner for admins"
diff --git a/html/changelogs/AutoChangeLog-pr-14755.yml b/html/changelogs/AutoChangeLog-pr-14755.yml
deleted file mode 100644
index 8b231db995..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14755.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes: 
-  - bugfix: "brand intelligence event works again"
diff --git a/html/changelogs/AutoChangeLog-pr-14756.yml b/html/changelogs/AutoChangeLog-pr-14756.yml
deleted file mode 100644
index 265a808d04..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14756.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes: 
-  - balance: "puglism damage can no longer stack with scarp"
diff --git a/html/changelogs/AutoChangeLog-pr-14757.yml b/html/changelogs/AutoChangeLog-pr-14757.yml
deleted file mode 100644
index 2952474330..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14757.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kraseo"
-delete-after: True
-changes: 
-  - bugfix: "No more slamming into people while bloodcrawled."