From c2ca7e2655bea81b219645c8b2a1bc0727dfae90 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 30 Apr 2021 17:33:47 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.04.30.17.33.47"

---
 html/changelog.html                        | 6 ++++++
 html/changelogs/.all_changelog.yml         | 6 ++++++
 html/changelogs/geeves-roller_bed_fix.yml  | 6 ------
 html/changelogs/geeves-tool_resprite.yml   | 6 ------
 html/changelogs/johnwildkins-sanitize2.yml | 6 ------
 5 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 html/changelogs/geeves-roller_bed_fix.yml
 delete mode 100644 html/changelogs/geeves-tool_resprite.yml
 delete mode 100644 html/changelogs/johnwildkins-sanitize2.yml

diff --git a/html/changelog.html b/html/changelog.html
index 971af0f71dc..b2efeba9ddf 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,11 +46,17 @@
 				<li class="rscadd">Antags that don&#x27;t appear at roundstart no longer appear in the Role menu in character creation.</li>
 				<li class="rscadd">Added buddy tags to the utility loadout. They&#x27;re small devices that can be attached to uniforms that will beep if they don&#x27;t have a paired buddy in range.</li>
 				<li class="imageadd">Ported various sprites related to robotics, cyborgs, and exosuits.</li>
+				<li class="bugfix">You can now collapse rollerbeds.</li>
+				<li class="imageadd">Ported and tweaked sprites for: Toolbelts, Belt Overlays, Welding Tools, Impact Wrench, Air Analyzer, T-ray Scanner, Flamethrower, Multitool.</li>
 			</ul>
 			<h3 class="author">Geeves, SleepyWolf updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed diona blinking helmethead and blinking p-body blinking very rapidly.</li>
 			</ul>
+			<h3 class="author">JohnWildkins updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Adminhelps/PMs should no longer have issues displaying apostrophes and other special characters.</li>
+			</ul>
 			<h3 class="author">MoondancerPony updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes an infinite recursion in vendor spritesheet code.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f6fde8ead18..c21ee12c73b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -19736,8 +19736,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       can be attached to uniforms that will beep if they don&#x27;t have a paired
       buddy in range.
   - imageadd: Ported various sprites related to robotics, cyborgs, and exosuits.
+  - bugfix: You can now collapse rollerbeds.
+  - imageadd: 'Ported and tweaked sprites for: Toolbelts, Belt Overlays, Welding Tools,
+      Impact Wrench, Air Analyzer, T-ray Scanner, Flamethrower, Multitool.'
   Geeves, SleepyWolf:
   - bugfix: Fixed diona blinking helmethead and blinking p-body blinking very rapidly.
+  JohnWildkins:
+  - bugfix: Adminhelps/PMs should no longer have issues displaying apostrophes and
+      other special characters.
   MoondancerPony:
   - bugfix: Fixes an infinite recursion in vendor spritesheet code.
   - bugfix: Fixes missing placeholder item sprites causing SSassets warnings.
diff --git a/html/changelogs/geeves-roller_bed_fix.yml b/html/changelogs/geeves-roller_bed_fix.yml
deleted file mode 100644
index 17e5d93ab05..00000000000
--- a/html/changelogs/geeves-roller_bed_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - bugfix: "You can now collapse rollerbeds."
\ No newline at end of file
diff --git a/html/changelogs/geeves-tool_resprite.yml b/html/changelogs/geeves-tool_resprite.yml
deleted file mode 100644
index 294adfac249..00000000000
--- a/html/changelogs/geeves-tool_resprite.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - imageadd: "Ported and tweaked sprites for: Toolbelts, Belt Overlays, Welding Tools, Impact Wrench, Air Analyzer, T-ray Scanner, Flamethrower, Multitool."
\ No newline at end of file
diff --git a/html/changelogs/johnwildkins-sanitize2.yml b/html/changelogs/johnwildkins-sanitize2.yml
deleted file mode 100644
index 4f9dcd7f5c8..00000000000
--- a/html/changelogs/johnwildkins-sanitize2.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: JohnWildkins
-
-delete-after: True
-
-changes:
-  - bugfix: "Adminhelps/PMs should no longer have issues displaying apostrophes and other special characters."