From 166ae91a75ff3ba4f65dfda14e4d1748810e53c3 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 13 Feb 2021 19:30:10 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2021.02.13.19.30.10"

---
 html/changelog.html                 | 7 +++++++
 html/changelogs/.all_changelog.yml  | 8 ++++++++
 html/changelogs/colourlighter.yml   | 6 ------
 html/changelogs/geeves-red_grab.yml | 8 --------
 4 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/colourlighter.yml
 delete mode 100644 html/changelogs/geeves-red_grab.yml

diff --git a/html/changelog.html b/html/changelog.html
index 051bb9a3df9..62ca612da1c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,13 @@
 				<li class="bugfix">Fixed TTV devices not being able to open their UIs.</li>
 				<li class="rscadd">Removing a device from a TTV now puts it in your hand.</li>
 				<li class="bugfix">Fixed megaphones having the wrong handedness.</li>
+				<li class="rscadd">A neck grab and above will now always hoist the grabbee into a raised position.</li>
+				<li class="rscadd">If the person you have in a neck grab is lying down for whatever reason, you cannot use them as a shield.</li>
+				<li class="rscadd">You can only use a human shield if you&#x27;re facing the direction you&#x27;re being shot at. Bullets that come from behind you will bypass your human shield.</li>
+			</ul>
+			<h3 class="author">Sparky_hotdog updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Cheap lighters are now colourable in the loadout.</li>
 			</ul>
 			<h3 class="author">WickedCybs updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2bd88db5030..1bfd0c862e2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18267,6 +18267,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed TTV devices not being able to open their UIs.
   - rscadd: Removing a device from a TTV now puts it in your hand.
   - bugfix: Fixed megaphones having the wrong handedness.
+  - rscadd: A neck grab and above will now always hoist the grabbee into a raised
+      position.
+  - rscadd: If the person you have in a neck grab is lying down for whatever reason,
+      you cannot use them as a shield.
+  - rscadd: You can only use a human shield if you&#x27;re facing the direction you&#x27;re
+      being shot at. Bullets that come from behind you will bypass your human shield.
+  Sparky_hotdog:
+  - tweak: Cheap lighters are now colourable in the loadout.
   WickedCybs:
   - rscadd: Adds Tajara specific flats in a selection contained within their loadout
       menu.
diff --git a/html/changelogs/colourlighter.yml b/html/changelogs/colourlighter.yml
deleted file mode 100644
index 45d7b29625b..00000000000
--- a/html/changelogs/colourlighter.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Sparky_hotdog
-
-delete-after: True
-
-changes:
-  - tweak: "Cheap lighters are now colourable in the loadout."
diff --git a/html/changelogs/geeves-red_grab.yml b/html/changelogs/geeves-red_grab.yml
deleted file mode 100644
index 88394f0c470..00000000000
--- a/html/changelogs/geeves-red_grab.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - rscadd: "A neck grab and above will now always hoist the grabbee into a raised position."
-  - rscadd: "If the person you have in a neck grab is lying down for whatever reason, you cannot use them as a shield."
-  - rscadd: "You can only use a human shield if you're facing the direction you're being shot at. Bullets that come from behind you will bypass your human shield."