From 3afd1c3fb4b10f033bd00b79982ebfc92a7f334c Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 12 Jul 2020 14:19:42 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.12.14.19.42"

---
 html/changelog.html                      | 4 ++++
 html/changelogs/.all_changelog.yml       | 8 ++++++++
 html/changelogs/geeves-better_naming.yml | 7 -------
 html/changelogs/geeves-no_lung_pop.yml   | 7 -------
 4 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/geeves-better_naming.yml
 delete mode 100644 html/changelogs/geeves-no_lung_pop.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5127cbc7259..cf4e9a31331 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -52,6 +52,10 @@
 				<li class="tweak">Being disfigured makes speech difficult, thus your voice will appear as Unknown.</li>
 				<li class="rscadd">Wizard healing spells now heal internal organs as well.</li>
 				<li class="rscadd">Hacking no longer requires you to hold the tool (wirecutters, multitool, signaler) in your active hand, just that the tool is in one of your hands. This applies to cyborgs as well.</li>
+				<li class="tweak">Tweaked the name of the 'check misc. lifeforms' turret option to 'Neutralize All Wildlife' to more accurately represent what it does.</li>
+				<li class="rscadd">You no longer have to swipe on a turret or turret control panel to access it, as long as you have access. The option remains if you want to open it for others.</li>
+				<li class="bugfix">Drowning in the pool no longer causes your lungs to pop.</li>
+				<li class="bugfix">You will no longer gasp for air when submerged, instead you will flail violently.</li>
 			</ul>
 			<h3 class="author">mikomyazaki updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d5900ac6b06..28454b09f70 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14141,6 +14141,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Hacking no longer requires you to hold the tool (wirecutters, multitool,
       signaler) in your active hand, just that the tool is in one of your hands. This
       applies to cyborgs as well.
+  - tweak: Tweaked the name of the 'check misc. lifeforms' turret option to 'Neutralize
+      All Wildlife' to more accurately represent what it does.
+  - rscadd: You no longer have to swipe on a turret or turret control panel to access
+      it, as long as you have access. The option remains if you want to open it for
+      others.
+  - bugfix: Drowning in the pool no longer causes your lungs to pop.
+  - bugfix: You will no longer gasp for air when submerged, instead you will flail
+      violently.
   mikomyazaki:
   - bugfix: A traitor AI/cyborg accessing an airlock UI will see the proper button
       state for dropping door bolts.
diff --git a/html/changelogs/geeves-better_naming.yml b/html/changelogs/geeves-better_naming.yml
deleted file mode 100644
index 01df268cf78..00000000000
--- a/html/changelogs/geeves-better_naming.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - tweak: "Tweaked the name of the 'check misc. lifeforms' turret option to 'Neutralize All Wildlife' to more accurately represent what it does."
-  - rscadd: "You no longer have to swipe on a turret or turret control panel to access it, as long as you have access. The option remains if you want to open it for others."
\ No newline at end of file
diff --git a/html/changelogs/geeves-no_lung_pop.yml b/html/changelogs/geeves-no_lung_pop.yml
deleted file mode 100644
index d2426389abf..00000000000
--- a/html/changelogs/geeves-no_lung_pop.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - bugfix: "Drowning in the pool no longer causes your lungs to pop."
-  - bugfix: "You will no longer gasp for air when submerged, instead you will flail violently."
\ No newline at end of file