From 2c88598fde5c745d493835d68a8738fcfcb4bf0e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 13 Jun 2020 07:12:29 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.13.07.12.29"

---
 html/changelog.html                           | 5 +++++
 html/changelogs/.all_changelog.yml            | 4 ++++
 html/changelogs/Printer16-RFDPFix.yml         | 7 -------
 html/changelogs/geeves-grab_stripping_fix.yml | 6 ------
 4 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/Printer16-RFDPFix.yml
 delete mode 100644 html/changelogs/geeves-grab_stripping_fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 980d34ed31c..7fa2c0e07c7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -39,6 +39,11 @@
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Weapons analyzers will now longer swallow your things.</li>
+				<li class="bugfix">Attempting to strip someone while holding a grab will now properly strip them, instead of trying to put a grab on them.</li>
+			</ul>
+			<h3 class="author">Printer16 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The RFD-P can now be used more than once.</li>
 			</ul>
 
 			<h2 class="date">12 June 2020</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 252f1ce7275..7a14b2d5528 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13624,3 +13624,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-06-13:
   Geeves:
   - bugfix: Weapons analyzers will now longer swallow your things.
+  - bugfix: Attempting to strip someone while holding a grab will now properly strip
+      them, instead of trying to put a grab on them.
+  Printer16:
+  - bugfix: The RFD-P can now be used more than once.
diff --git a/html/changelogs/Printer16-RFDPFix.yml b/html/changelogs/Printer16-RFDPFix.yml
deleted file mode 100644
index 3da8a8a5058..00000000000
--- a/html/changelogs/Printer16-RFDPFix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: Printer16
-
-delete-after: True
-
-changes:
-  - bugfix: "The RFD-P can now be used more than once."
diff --git a/html/changelogs/geeves-grab_stripping_fix.yml b/html/changelogs/geeves-grab_stripping_fix.yml
deleted file mode 100644
index de7ed5acd5e..00000000000
--- a/html/changelogs/geeves-grab_stripping_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Attempting to strip someone while holding a grab will now properly strip them, instead of trying to put a grab on them."
\ No newline at end of file