From 4cc1c04e24977efcad1801c763f23f080bc6b90b Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 24 Jun 2020 20:13:33 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.24.20.13.33"

---
 html/changelog.html                         | 6 ++++++
 html/changelogs/.all_changelog.yml          | 6 ++++++
 html/changelogs/geeves-cargo_spawn_fix.yml  | 6 ------
 html/changelogs/geeves-webbing_overlays.yml | 6 ------
 html/changelogs/skull132_gravity.yml        | 5 -----
 5 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/geeves-cargo_spawn_fix.yml
 delete mode 100644 html/changelogs/geeves-webbing_overlays.yml
 delete mode 100644 html/changelogs/skull132_gravity.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3b9bba81a42..a7b722b4203 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,12 @@
 				<li class="bugfix">Bear traps will no longer trap you if they take your limb off while triggering.</li>
 				<li class="rscadd">Added closet teleporters to the Stealth and Camouflage Items uplink, a device that start linked and can be attached to closets to set-up a teleport network. Step inside and close the door to teleport.</li>
 				<li class="tweak">Pushing a wall to try and find a secret entrance now takes a few seconds of touching and feeling.</li>
+				<li class="bugfix">Cargo warehouse now has the proper amount of stock to account for two Z-levels.</li>
+				<li class="rscadd">Overlays have been added to webs, making it look like you're travelling through them instead of travelling over them.</li>
+			</ul>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adjust some gravity behaviour, maybe fix a few bugs.</li>
 			</ul>
 			<h3 class="author">Snakebitten updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b3e940902e3..1ecb0b2fd2a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13819,6 +13819,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       network. Step inside and close the door to teleport.
   - tweak: Pushing a wall to try and find a secret entrance now takes a few seconds
       of touching and feeling.
+  - bugfix: Cargo warehouse now has the proper amount of stock to account for two
+      Z-levels.
+  - rscadd: Overlays have been added to webs, making it look like you're travelling
+      through them instead of travelling over them.
+  Skull132:
+  - tweak: Adjust some gravity behaviour, maybe fix a few bugs.
   Snakebitten:
   - rscadd: Adds a psionic receiver augment. This allows vaurca and IPCs to be picked
       up by psionic pings and telepathic messages, and allows humans and other races
diff --git a/html/changelogs/geeves-cargo_spawn_fix.yml b/html/changelogs/geeves-cargo_spawn_fix.yml
deleted file mode 100644
index 5c7916a6851..00000000000
--- a/html/changelogs/geeves-cargo_spawn_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Cargo warehouse now has the proper amount of stock to account for two Z-levels."
\ No newline at end of file
diff --git a/html/changelogs/geeves-webbing_overlays.yml b/html/changelogs/geeves-webbing_overlays.yml
deleted file mode 100644
index a013606a477..00000000000
--- a/html/changelogs/geeves-webbing_overlays.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - rscadd: "Overlays have been added to webs, making it look like you're travelling through them instead of travelling over them."
\ No newline at end of file
diff --git a/html/changelogs/skull132_gravity.yml b/html/changelogs/skull132_gravity.yml
deleted file mode 100644
index e3034c55ad6..00000000000
--- a/html/changelogs/skull132_gravity.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Skull132
-delete-after: True
-
-changes:
-  - tweak: "Adjust some gravity behaviour, maybe fix a few bugs."