From ba9f2b7c489a2ed39ca522ed950e53ab0f0911a9 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 22 Jun 2021 00:22:24 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 61 ++++------------------
 html/changelogs/.all_changelog.yml         |  5 ++
 html/changelogs/AutoChangeLog-pr-14850.yml |  4 --
 html/changelogs/AutoChangeLog-pr-14870.yml |  4 --
 4 files changed, 15 insertions(+), 59 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14850.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14870.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9a219e200e..bc2ecc16d3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">22 June 2021</h2>
+			<h3 class="author">bunny232 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Adds a missing win door to meta xenobiology pen 6</li>
+			</ul>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">no more doubleroasting</li>
+			</ul>
+
 			<h2 class="date">21 June 2021</h2>
 			<h3 class="author">silicons updated:</h3>
 			<ul class="changes bgimages16">
@@ -623,57 +633,6 @@
 				<li class="balance">Shoves can disarm you of any item, not just guns.</li>
 				<li class="bugfix">Removes a duplicate trait definition for TRAIT_NICE_SHOT.</li>
 			</ul>
-
-			<h2 class="date">20 April 2021</h2>
-			<h3 class="author">BlueWildrose updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">New slimeperson organs that aren't really that different from humans for now.</li>
-				<li class="imageadd">Some blue organs for slimepeople.</li>
-				<li class="rscadd">Space pirate sleepers can now be crowbared to be destroyed.</li>
-			</ul>
-			<h3 class="author">DrPainis updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">ash drake meat</li>
-			</ul>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Plastitanium glass now properly applies the *2 bonus for integrity and efficiency when used as a solar panel.</li>
-			</ul>
-			<h3 class="author">HeroWithYay updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">replaced some icons</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Bluespace pipes, which can teleport gas over long distances</li>
-				<li class="rscadd">Donk co traitor class (assassin-heavy)</li>
-				<li class="rscadd">Waffle co traitor class (freeform)</li>
-				<li class="rscadd">Admin-only activity tracking system only attached to antags for now tweak: Objective rerolling can now be done twice</li>
-				<li class="bugfix">Sabotage objectives won't give "free objective" anymore</li>
-			</ul>
-			<h3 class="author">The0bserver, TripleZeta, and AsciiSquid updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">New, easily concealable weapons, chambered in .38, .357, and .45-70 Govt. Fun for the whole family!</li>
-				<li class="rscadd">Some smugglers seem to have acquired a high amount of .38 derringers, and are looking to offload them to those of gray morality, with no questions asked!</li>
-				<li class="rscadd">An enigmatic gun collector has seen fit to do special acquisition work for the Gorlex Marauders, selling the fruits of his labor for a premium price. If you have the right electomagnetic sequence, you might be able to contact him to acquire a piece of his armory.</li>
-			</ul>
-			<h3 class="author">coiax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Nuke ops can now purchase a box of "deathrattle implants". When an implanted person dies, all the other users of the implant will get a message, saying who died and where they died.</li>
-			</ul>
-			<h3 class="author">keronshb updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Weight per blood is .03 now instead of .05</li>
-				<li class="balance">Dragnet Snare breakout timer is now 2.5 seconds down from 5 seconds.</li>
-			</ul>
-			<h3 class="author">qweq12yt updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed a bug where some cargo crates would never arrive and still charge users</li>
-			</ul>
-			<h3 class="author">zeroisthebiggay updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscdel">the box ghost burger</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 585e0b37c8..4bb53330d5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -29543,3 +29543,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: glowshroom scaling
   timothyteakettle:
   - bugfix: vore is 0.1% less shitcode
+2021-06-22:
+  bunny232:
+  - bugfix: Adds a missing win door to meta xenobiology pen 6
+  silicons:
+  - bugfix: no more doubleroasting
diff --git a/html/changelogs/AutoChangeLog-pr-14850.yml b/html/changelogs/AutoChangeLog-pr-14850.yml
deleted file mode 100644
index dbb8c5ec56..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14850.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - bugfix: "no more doubleroasting"
diff --git a/html/changelogs/AutoChangeLog-pr-14870.yml b/html/changelogs/AutoChangeLog-pr-14870.yml
deleted file mode 100644
index a9da9b4acb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14870.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "bunny232"
-delete-after: True
-changes: 
-  - bugfix: "Adds a missing win door to meta xenobiology pen 6"