From 6808769235414a2dfa383f294ed439efbafe1ebe Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 23 Oct 2020 12:10:35 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.10.23.12.10.35"

---
 html/changelog.html                                           | 4 ++++
 html/changelogs/.all_changelog.yml                            | 2 ++
 .../changelogs/Ferner-201022-bugfix_hostile-turret-attack.yml | 4 ----
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/Ferner-201022-bugfix_hostile-turret-attack.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5dbe319f5a3..d5db243c484 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,6 +41,10 @@
 				<li class="rscadd">End of round summary will now show antagonists as 'apprehended' if they end the round in brig or in cuffs (in 'regular' areas like station, centcom or shuttle) instead of 'fled the station'.</li>
 				<li class="backend">Added two area flags: PRISON and NO_CREW_EXPECTED. The former marks prison areas while the latter marks areas where crew is never present unless for extraordinary circumstances. They are used to detect brigged people and antag status at end of round.</li>
 			</ul>
+			<h3 class="author">Ferner updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Hostile mobs no longer attack turrets that aren't raised.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">When you check yourself for injuries, you will now be able to feel if they contain shrapnel/implants.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 54c1a41d52f..735a12f8aab 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -16298,6 +16298,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       prison areas while the latter marks areas where crew is never present unless
       for extraordinary circumstances. They are used to detect brigged people and
       antag status at end of round.'
+  Ferner:
+  - bugfix: Hostile mobs no longer attack turrets that aren't raised.
   Geeves:
   - rscadd: When you check yourself for injuries, you will now be able to feel if
       they contain shrapnel/implants.
diff --git a/html/changelogs/Ferner-201022-bugfix_hostile-turret-attack.yml b/html/changelogs/Ferner-201022-bugfix_hostile-turret-attack.yml
deleted file mode 100644
index dcac267165d..00000000000
--- a/html/changelogs/Ferner-201022-bugfix_hostile-turret-attack.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Ferner
-delete-after: True
-changes: 
-  - bugfix: "Hostile mobs no longer attack turrets that aren't raised."
\ No newline at end of file