From 9750580fb5b71bab6e080dfd3bfc3fbdae463f28 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 24 Mar 2021 00:02:11 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 42 +++++++++++++---------
 html/changelogs/.all_changelog.yml         | 25 +++++++++++++
 html/changelogs/AutoChangeLog-pr-14447.yml |  5 ---
 html/changelogs/AutoChangeLog-pr-14473.yml | 14 --------
 html/changelogs/AutoChangeLog-pr-14475.yml |  6 ----
 html/changelogs/AutoChangeLog-pr-14491.yml |  4 ---
 6 files changed, 51 insertions(+), 45 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14447.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14473.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14475.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-14491.yml

diff --git a/html/changelog.html b/html/changelog.html
index b240141879..28d851b295 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,27 +50,37 @@
 		-->
 		<div class="commit sansserif">
 
-			<h2 class="date">11 March 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
+			<h2 class="date">24 March 2021</h2>
+			<h3 class="author">Hatterhat updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Supernova event</li>
-				<li class="refactor">Bloodsucker day/night cycle now processes on a subsystem instead of using while and sleep (!!)</li>
+				<li class="bugfix">The NOGUNS trait now takes precedence over the triggerguard checks.</li>
 			</ul>
-			<h3 class="author">Sneakyrat updated:</h3>
+			<h3 class="author">ItzGabby updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="bugfix">Fixes precise insertion ui(when it asks you how many sheets you want to put in the mat container) so you can actually choose how much to put in and it will still work if your stack is bigger than the remaining space</li>
-				<li class="bugfix">Fixes precise insertion not working for remote mat containers</li>
-				<li class="bugfix">Fixes Protolathe/mechfab insert material animations not working</li>
-				<li class="bugfix">Fixes the material insertion animation for protolathes occurring on the circuit printer</li>
-				<li class="bugfix">Fixes the material insertion animation not actually playing when it was started</li>
-				<li class="bugfix">Fixes the material insertion animation for iron not being made</li>
-				<li class="bugfix">Fixes the material insertion animation sometimes not picking the right material for sheets that have multiple different materials in them</li>
+				<li class="rscadd">Fluff Items with polychromic support</li>
+				<li class="rscadd">A new vendor called Bark box</li>
+				<li class="rscadd">A new form of snack with it's own box</li>
+				<li class="rscadd">Two harness, one of them being lewd</li>
+				<li class="rscadd">One new collar, with a ribbon. Classy.</li>
+				<li class="rscadd">More locked forms of collars</li>
+				<li class="rscdel">Purged old balls</li>
+				<li class="balance">Removed the funny buffs each colored tennis ball had, down with the powergame!</li>
+				<li class="imageadd">Added polychromic fluff icons, vendor icons, suit icons, snack icons, fancy box icons, and a polychromic version of Izzy's ball.</li>
+				<li class="imagedel">Deleted old balls, Izzy's Ball, except the rainbow one since it's special and as I did not go out of my way to get permission to touch.</li>
+				<li class="spellcheck">Walked into vending.dm and glared for a moment at hydroponics' grammar.</li>
 			</ul>
-			<h3 class="author">necromanceranne updated:</h3>
+			<h3 class="author">LetterN updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="bugfix">Properly segments all the augment sprites so that they correctly display.</li>
-				<li class="bugfix">Properly labels the augment limb icon sprites.</li>
-				<li class="bugfix">Fixes going over the defined limit of roundstart prosthetics</li>
+				<li class="bugfix">fixed laptops pickability</li>
+				<li class="bugfix">fixed closets being unweldable</li>
+			</ul>
+			<h3 class="author">qweq12yt updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">added the black market uplink</li>
+				<li class="imageadd">added blackmarket.dmi</li>
+				<li class="bugfix">increased the black market interface's width, now the delivery options will show properly when the LTSRBT is built</li>
+			</ul>
+
 			<h2 class="date">23 March 2021</h2>
 			<h3 class="author">LetterN updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ae22fdc466..e114e7c3fa 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28815,3 +28815,28 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   LetterN:
   - bugfix: NIRM departamental purchases now work. Have fun spending the entire R&D
       Budget!
+2021-03-24:
+  Hatterhat:
+  - bugfix: The NOGUNS trait now takes precedence over the triggerguard checks.
+  ItzGabby:
+  - rscadd: Fluff Items with polychromic support
+  - rscadd: A new vendor called Bark box
+  - rscadd: A new form of snack with it's own box
+  - rscadd: Two harness, one of them being lewd
+  - rscadd: One new collar, with a ribbon. Classy.
+  - rscadd: More locked forms of collars
+  - rscdel: Purged old balls
+  - balance: Removed the funny buffs each colored tennis ball had, down with the powergame!
+  - imageadd: Added polychromic fluff icons, vendor icons, suit icons, snack icons,
+      fancy box icons, and a polychromic version of Izzy's ball.
+  - imagedel: Deleted old balls, Izzy's Ball, except the rainbow one since it's special
+      and as I did not go out of my way to get permission to touch.
+  - spellcheck: Walked into vending.dm and glared for a moment at hydroponics' grammar.
+  LetterN:
+  - bugfix: fixed laptops pickability
+  - bugfix: fixed closets being unweldable
+  qweq12yt:
+  - rscadd: added the black market uplink
+  - imageadd: added blackmarket.dmi
+  - bugfix: increased the black market interface's width, now the delivery options
+      will show properly when the LTSRBT is built
diff --git a/html/changelogs/AutoChangeLog-pr-14447.yml b/html/changelogs/AutoChangeLog-pr-14447.yml
deleted file mode 100644
index 1ed321f6b9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14447.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes: 
-  - bugfix: "fixed laptops pickability"
-  - bugfix: "fixed closets being unweldable"
diff --git a/html/changelogs/AutoChangeLog-pr-14473.yml b/html/changelogs/AutoChangeLog-pr-14473.yml
deleted file mode 100644
index 1d7db07abe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14473.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-author: "ItzGabby"
-delete-after: True
-changes: 
-  - rscadd: "Fluff Items with polychromic support"
-  - rscadd: "A new vendor called Bark box"
-  - rscadd: "A new form of snack with it's own box"
-  - rscadd: "Two harness, one of them being lewd"
-  - rscadd: "One new collar, with a ribbon. Classy."
-  - rscadd: "More locked forms of collars"
-  - rscdel: "Purged old balls"
-  - balance: "Removed the funny buffs each colored tennis ball had, down with the powergame!"
-  - imageadd: "Added polychromic fluff icons, vendor icons, suit icons, snack icons, fancy box icons, and a polychromic version of Izzy's ball."
-  - imagedel: "Deleted old balls, Izzy's Ball, except the rainbow one since it's special and as I did not go out of my way to get permission to touch."
-  - spellcheck: "Walked into vending.dm and glared for a moment at hydroponics' grammar."
diff --git a/html/changelogs/AutoChangeLog-pr-14475.yml b/html/changelogs/AutoChangeLog-pr-14475.yml
deleted file mode 100644
index 5c26ac3970..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14475.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "qweq12yt"
-delete-after: True
-changes: 
-  - rscadd: "added the black market uplink"
-  - imageadd: "added blackmarket.dmi"
-  - bugfix: "increased the black market interface's width, now the delivery options will show properly when the LTSRBT is built"
diff --git a/html/changelogs/AutoChangeLog-pr-14491.yml b/html/changelogs/AutoChangeLog-pr-14491.yml
deleted file mode 100644
index a40970617c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14491.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes: 
-  - bugfix: "The NOGUNS trait now takes precedence over the triggerguard checks."