From 2d01f92e8fb29dc5d98e9c8fc52de2175c0d294e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 1 Feb 2020 20:29:00 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.02.01.20.29.00"

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

diff --git a/html/changelog.html b/html/changelog.html
index 576baa33901..54254296b5b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,6 +47,7 @@
 				<li class="rscadd">Diona gestalts can now use their biomass / arms to create biomass structures.</li>
 				<li class="rscdel">Removed nymphs' ability to open biomass walls. It was buggy.</li>
 				<li class="tweak">Nymphs can now be holstered and worn on the ear slots.</li>
+				<li class="bugfix">Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description fluff.</li>
 			</ul>
 			<h3 class="author">Goret updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 368009a052c..888da3b748b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11592,6 +11592,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Diona gestalts can now use their biomass / arms to create biomass structures.
   - rscdel: Removed nymphs' ability to open biomass walls. It was buggy.
   - tweak: Nymphs can now be holstered and worn on the ear slots.
+  - bugfix: Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description
+      fluff.
   Goret:
   - bugfix: Upon breaking, borosilicate glass will now make borosilicate shards.
   YourDaddy117:
diff --git a/html/changelogs/geeves-pistol_fix.yml b/html/changelogs/geeves-pistol_fix.yml
deleted file mode 100644
index a7f2b5b26ef..00000000000
--- a/html/changelogs/geeves-pistol_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description fluff."
\ No newline at end of file