From b823bbce5c33218efeb37718cc2558982f83eb70 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 2 Jul 2020 00:09:31 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 25 ++++++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 23 ++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-12407.yml | 13 -----------
 html/changelogs/AutoChangeLog-pr-12654.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12656.yml |  6 ------
 5 files changed, 48 insertions(+), 23 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12407.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12654.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12656.yml

diff --git a/html/changelog.html b/html/changelog.html
index 36a001bf00..66f8141f28 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,31 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">02 July 2020</h2>
+			<h3 class="author">Ghommie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixing a few issues with twohanded items.</li>
+				<li class="bugfix">Unum decks now work correctly.</li>
+				<li class="bugfix">Abductor walls are once again buildable with alien alloy.</li>
+			</ul>
+			<h3 class="author">Trilbyspaceclone updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Makes pride and envy ruin a bit smaller!</li>
+				<li class="rscadd">Pride now has rings, lipstick wigs and silver walls/door making a nice and polished look then cyan blue walls.</li>
+				<li class="rscadd">more trash and better dagger placement on food ruin</li>
+				<li class="rscadd">Snowboim now has snowballs and toy gifts for the two skeles daw!</li>
+				<li class="tweak">Beach boim now has carp light branding beer, as well as soap!</li>
+				<li class="tweak">Greed ruin now uses nice slick walls and carpet!</li>
+				<li class="tweak">Founten ruin looks a lot better with its carpets and well maintained fluff things, but walls suffered and no longer can salvage ruined metal...</li>
+				<li class="rscadd">Alien nest has a bit more glowy floors of resin looking a bit more lived in by the drones. As well as the "door" now being see through resin rather then the thicker stuff that you cant see through</li>
+				<li class="rscadd">Pizza party has a few more gifts, some candy and snap pops yay!</li>
+				<li class="balance">Sloth ruin is about 15~ tiles shorter, has and has more fruit for a bowl. How lazy!</li>
+			</ul>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">bohbombing is a thing now</li>
+			</ul>
+
 			<h2 class="date">30 June 2020</h2>
 			<h3 class="author">Fikou updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9cd1987327..921f9ce233 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26185,3 +26185,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: skeleton is now split into two more types, greater and lesser
   - bugfix: non-carbon blood is now not white
   - spellcheck: fixed a bunch of grammar/spelling mistakes
+2020-07-02:
+  Ghommie:
+  - bugfix: Fixing a few issues with twohanded items.
+  - bugfix: Unum decks now work correctly.
+  - bugfix: Abductor walls are once again buildable with alien alloy.
+  Trilbyspaceclone:
+  - tweak: Makes pride and envy ruin a bit smaller!
+  - rscadd: Pride now has rings, lipstick wigs and silver walls/door making a nice
+      and polished look then cyan blue walls.
+  - rscadd: more trash and better dagger placement on food ruin
+  - rscadd: Snowboim now has snowballs and toy gifts for the two skeles daw!
+  - tweak: Beach boim now has carp light branding beer, as well as soap!
+  - tweak: Greed ruin now uses nice slick walls and carpet!
+  - tweak: Founten ruin looks a lot better with its carpets and well maintained fluff
+      things, but walls suffered and no longer can salvage ruined metal...
+  - rscadd: Alien nest has a bit more glowy floors of resin looking a bit more lived
+      in by the drones. As well as the "door" now being see through resin rather then
+      the thicker stuff that you cant see through
+  - rscadd: Pizza party has a few more gifts, some candy and snap pops yay!
+  - balance: Sloth ruin is about 15~ tiles shorter, has and has more fruit for a bowl.
+      How lazy!
+  silicons:
+  - bugfix: bohbombing is a thing now
diff --git a/html/changelogs/AutoChangeLog-pr-12407.yml b/html/changelogs/AutoChangeLog-pr-12407.yml
deleted file mode 100644
index 658bd15f25..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12407.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes: 
-  - tweak: "Makes pride and envy ruin a bit smaller!"
-  - rscadd: "Pride now has rings, lipstick wigs and silver walls/door making a nice and polished look then cyan blue walls."
-  - rscadd: "more trash and better dagger placement on food ruin"
-  - rscadd: "Snowboim now has snowballs and toy gifts for the two skeles daw!"
-  - tweak: "Beach boim now has carp light branding beer, as well as soap!"
-  - tweak: "Greed ruin now uses nice slick walls and carpet!"
-  - tweak: "Founten ruin looks a lot better with its carpets and well maintained fluff things, but walls suffered and no longer can salvage ruined metal..."
-  - rscadd: "Alien nest has a bit more glowy floors of resin looking a bit more lived in by the drones. As well as the \"door\" now being see through resin rather then the thicker stuff that you cant see through"
-  - rscadd: "Pizza party has a few more gifts, some candy and snap pops yay!"
-  - balance: "Sloth ruin is about 15~ tiles shorter, has and has more fruit for a bowl. How lazy!"
diff --git a/html/changelogs/AutoChangeLog-pr-12654.yml b/html/changelogs/AutoChangeLog-pr-12654.yml
deleted file mode 100644
index c6437ac335..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12654.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - bugfix: "bohbombing is a thing now"
diff --git a/html/changelogs/AutoChangeLog-pr-12656.yml b/html/changelogs/AutoChangeLog-pr-12656.yml
deleted file mode 100644
index a7779223a5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12656.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes: 
-  - bugfix: "Fixing a few issues with twohanded items."
-  - bugfix: "Unum decks now work correctly."
-  - bugfix: "Abductor walls are once again buildable with alien alloy."