From 7516bbad0b6366dfafc3dc850e615988625d4d80 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 1 Dec 2020 17:59:45 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.12.01.17.59.45"

---
 html/changelog.html                      | 2 ++
 html/changelogs/.all_changelog.yml       | 4 ++++
 html/changelogs/geeves-shields_stink.yml | 7 -------
 3 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/geeves-shields_stink.yml

diff --git a/html/changelog.html b/html/changelog.html
index 21f9c85c540..05d6b9e7229 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,8 @@
 				<li class="tweak">Optimized explosion code a little, it should be a teeny bit faster.</li>
 				<li class="rscadd">Added a full stop to the sentence saying which slot you're holding your animal / pAI / drone.</li>
 				<li class="bugfix">Species with off-centre alignments will now retain those alignments after attacking or after being grabbed.</li>
+				<li class="rscadd">You can now destroy the energy fields that shield generators make by hitting it, as long as your weapon is strong enough.</li>
+				<li class="rscadd">Energy shields now fade in and fade out, instead of just popping into existence.</li>
 			</ul>
 			<h3 class="author">Karolis2011 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f9718627210..be887c4b2d9 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17211,6 +17211,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       animal / pAI / drone.
   - bugfix: Species with off-centre alignments will now retain those alignments after
       attacking or after being grabbed.
+  - rscadd: You can now destroy the energy fields that shield generators make by hitting
+      it, as long as your weapon is strong enough.
+  - rscadd: Energy shields now fade in and fade out, instead of just popping into
+      existence.
   Karolis2011:
   - rscadd: Added back clock to modular computers.
   MoondancerPony:
diff --git a/html/changelogs/geeves-shields_stink.yml b/html/changelogs/geeves-shields_stink.yml
deleted file mode 100644
index cc829c1e955..00000000000
--- a/html/changelogs/geeves-shields_stink.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - rscadd: "You can now destroy the energy fields that shield generators make by hitting it, as long as your weapon is strong enough."
-  - rscadd: "Energy shields now fade in and fade out, instead of just popping into existence."
\ No newline at end of file