From 1daecab5572f66ae15ed06dfc96cff48d632f52f Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 2 May 2020 21:29:39 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.05.02.21.29.39"

---
 html/changelog.html                  | 1 +
 html/changelogs/.all_changelog.yml   | 1 +
 html/changelogs/alberyk-caltrops.yml | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/alberyk-caltrops.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4dca620a8e6..f9ba8d624d7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,7 @@
 			<ul class="changes bgimages16">
 				<li class="rscdel">Removed the chaplain cult backpack, black hood and robes from their wardrobe.</li>
 				<li class="rscadd">Guns now throws casings around when fired.</li>
+				<li class="rscadd">Added caltrops to the traitor uplink.</li>
 			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8e863365aaf..b6c831fe965 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -12973,6 +12973,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Alberyk:
   - rscdel: Removed the chaplain cult backpack, black hood and robes from their wardrobe.
   - rscadd: Guns now throws casings around when fired.
+  - rscadd: Added caltrops to the traitor uplink.
   Skull132:
   - bugfix: Fixes a roughly 6+ year old bug where showering doesn't immediately update
       your mob's icon.
diff --git a/html/changelogs/alberyk-caltrops.yml b/html/changelogs/alberyk-caltrops.yml
deleted file mode 100644
index 7a6bafc8339..00000000000
--- a/html/changelogs/alberyk-caltrops.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Alberyk
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added caltrops to the traitor uplink."