From dc75f563788fa1bab001ae58e2c60557f14b91bd Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Mon, 22 Jun 2020 00:08:41 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 21 +++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-12488.yml |  9 ---------
 html/changelogs/AutoChangeLog-pr-12557.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12561.yml |  4 ----
 5 files changed, 40 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12488.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12557.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12561.yml

diff --git a/html/changelog.html b/html/changelog.html
index 00e2474b4b..e78ecfb9db 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,25 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">22 June 2020</h2>
+			<h3 class="author">Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Certain small items purchased through cargo now get grouped into a single box. They also are immune to the 10% private account fee.</li>
+				<li class="rscadd">Added single-order options for several existing products in the Cargo Catalog.</li>
+				<li class="tweak">Medkit listings are now single-pack items, and considered small items that get grouped into single boxes. Price for medkits is as close to unchanged as is reasonable.</li>
+				<li class="rscadd">You can now beat on vending machines to try and knock loose free stuff! You can also almost kill yourself doing it, so it's your call if your life is worth ten bucks.</li>
+				<li class="rscadd">Cigarette packets now have coupons on the back for small cargo items! Smoking DOES pay!</li>
+				<li class="tweak">Some single/small items in cargo have been rebranded as goodies, come in lockboxes rather than crates, and can only be purchased with private accounts.</li>
+			</ul>
+			<h3 class="author">kevinz000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="refactor">Life() is split into BiologicalLife() and PhysicalLife. A component signal has been added that can prevent either from ticking.</li>
+			</ul>
+			<h3 class="author">shellspeed1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds IV bags.</li>
+			</ul>
+
 			<h2 class="date">21 June 2020</h2>
 			<h3 class="author">kevinz000 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d27ebe89b0..95c8e72a54 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26026,3 +26026,24 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   kevinz000:
   - balance: calculations for punch hit chance has been drastically buffed in favor
       of the attacker.
+2020-06-22:
+  Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK):
+  - tweak: Certain small items purchased through cargo now get grouped into a single
+      box. They also are immune to the 10% private account fee.
+  - rscadd: Added single-order options for several existing products in the Cargo
+      Catalog.
+  - tweak: Medkit listings are now single-pack items, and considered small items that
+      get grouped into single boxes. Price for medkits is as close to unchanged as
+      is reasonable.
+  - rscadd: You can now beat on vending machines to try and knock loose free stuff!
+      You can also almost kill yourself doing it, so it's your call if your life is
+      worth ten bucks.
+  - rscadd: Cigarette packets now have coupons on the back for small cargo items!
+      Smoking DOES pay!
+  - tweak: Some single/small items in cargo have been rebranded as goodies, come in
+      lockboxes rather than crates, and can only be purchased with private accounts.
+  kevinz000:
+  - refactor: Life() is split into BiologicalLife() and PhysicalLife. A component
+      signal has been added that can prevent either from ticking.
+  shellspeed1:
+  - rscadd: Adds IV bags.
diff --git a/html/changelogs/AutoChangeLog-pr-12488.yml b/html/changelogs/AutoChangeLog-pr-12488.yml
deleted file mode 100644
index 7a710c83cc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12488.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK)"
-delete-after: True
-changes: 
-  - tweak: "Certain small items purchased through cargo now get grouped into a single box. They also are immune to the 10% private account fee."
-  - rscadd: "Added single-order options for several existing products in the Cargo Catalog."
-  - tweak: "Medkit listings are now single-pack items, and considered small items that get grouped into single boxes. Price for medkits is as close to unchanged as is reasonable."
-  - rscadd: "You can now beat on vending machines to try and knock loose free stuff! You can also almost kill yourself doing it, so it's your call if your life is worth ten bucks."
-  - rscadd: "Cigarette packets now have coupons on the back for small cargo items! Smoking DOES pay!"
-  - tweak: "Some single/small items in cargo have been rebranded as goodies, come in lockboxes rather than crates, and can only be purchased with private accounts."
diff --git a/html/changelogs/AutoChangeLog-pr-12557.yml b/html/changelogs/AutoChangeLog-pr-12557.yml
deleted file mode 100644
index 1872d7b9ae..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12557.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes: 
-  - refactor: "Life() is split into BiologicalLife() and PhysicalLife. A component signal has been added that can prevent either from ticking."
diff --git a/html/changelogs/AutoChangeLog-pr-12561.yml b/html/changelogs/AutoChangeLog-pr-12561.yml
deleted file mode 100644
index af5341e669..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12561.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes: 
-  - rscadd: "Adds IV bags."