From e7107af0a409c7a7b02414c8b799d9d3a435c2dc Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 12 May 2021 00:18:48 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 17 +++++++----------
 html/changelogs/.all_changelog.yml         |  7 +++++++
 html/changelogs/AutoChangeLog-pr-14706.yml |  7 -------
 3 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14706.yml

diff --git a/html/changelog.html b/html/changelog.html
index 61681621e7..b6b794f5ec 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">12 May 2021</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">find_safe_turf no longer always fails on safe oxygen levels(??)</li>
+				<li class="bugfix">Heretic bladeshatters now actually take the heretic's z into account as intended, instead of always being station z tweak: Message for failing the bladeshatter despite succeeding the do_after tweak: Improves bladeshatter a bit by making it safer codewise</li>
+			</ul>
+
 			<h2 class="date">11 May 2021</h2>
 			<h3 class="author">LetterN updated:</h3>
 			<ul class="changes bgimages16">
@@ -761,16 +768,6 @@
 			<ul class="changes bgimages16">
 				<li class="spellcheck">Adds Periods and moves some words around.</li>
 			</ul>
-
-			<h2 class="date">10 March 2021</h2>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The femur breaker now actually breaks legs by applying a compound fracture.</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">uncapped TEG power, buffing high-temp TEGs</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ae29db429c..768a1cfda6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -29276,3 +29276,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   bunny232:
   - rscadd: Delta station xenobiology department has received enhanced scrubbing and
       ventilation capabilities similar to box and meta
+2021-05-12:
+  DeltaFire15:
+  - bugfix: find_safe_turf no longer always fails on safe oxygen levels(??)
+  - bugfix: 'Heretic bladeshatters now actually take the heretic''s z into account
+      as intended, instead of always being station z tweak: Message for failing the
+      bladeshatter despite succeeding the do_after tweak: Improves bladeshatter a
+      bit by making it safer codewise'
diff --git a/html/changelogs/AutoChangeLog-pr-14706.yml b/html/changelogs/AutoChangeLog-pr-14706.yml
deleted file mode 100644
index ecea6647ec..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14706.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "find_safe_turf no longer always fails on safe oxygen levels(??)"
-  - bugfix: "Heretic bladeshatters now actually take the heretic's z into account as intended, instead of always being station z
-tweak: Message for failing the bladeshatter despite succeeding the do_after
-tweak: Improves bladeshatter a bit by making it safer codewise"