From a79095944eccda8796bedbc1d31d24df9dc4c5a9 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 23 Mar 2019 14:13:56 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 12 ++++++++++++
 html/changelogs/.all_changelog.yml         |  7 +++++++
 html/changelogs/AutoChangeLog-pr-11049.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-11061.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-11074.yml |  4 ----
 5 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11049.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11061.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11074.yml

diff --git a/html/changelog.html b/html/changelog.html
index afcf8494712..db8890e9e97 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,10 +62,22 @@
 				<li class="bugfix">Players who enable AntagHUD are now unable to join the round as swarmers</li>
 				<li class="rscadd">Adds a message explaining why Antag-banned players cannot join the round as cortical borer</li>
 			</ul>
+			<h3 class="author">Calecute updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">South Prison camera now belongs to Prison camera network, thus showind in Prison camera monitor</li>
+			</ul>
 			<h3 class="author">Kyep updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Admins offering control of a mob with no real_name to ghosts will no longer cause a "Do you want to play as ?" popup. Instead, the ? will be replaced with a descriptive string, such as "the blobbernaut".</li>
 			</ul>
+			<h3 class="author">Tails2091 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Lockboxes actually close when locked now.</li>
+			</ul>
+			<h3 class="author">farie82 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">When disarming a bomb from a guardian you now don't pickup an empty object.</li>
+			</ul>
 
 			<h2 class="date">22 March 2019</h2>
 			<h3 class="author">Arkatos updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e19b944145d..e784dbd014a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9414,7 +9414,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Players who enable AntagHUD are now unable to join the round as swarmers
   - rscadd: Adds a message explaining why Antag-banned players cannot join the round
       as cortical borer
+  Calecute:
+  - bugfix: South Prison camera now belongs to Prison camera network, thus showind
+      in Prison camera monitor
   Kyep:
   - bugfix: Admins offering control of a mob with no real_name to ghosts will no longer
       cause a "Do you want to play as ?" popup. Instead, the ? will be replaced with
       a descriptive string, such as "the blobbernaut".
+  Tails2091:
+  - bugfix: Lockboxes actually close when locked now.
+  farie82:
+  - bugfix: When disarming a bomb from a guardian you now don't pickup an empty object.
diff --git a/html/changelogs/AutoChangeLog-pr-11049.yml b/html/changelogs/AutoChangeLog-pr-11049.yml
deleted file mode 100644
index c1e16fdd9e9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-11049.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tails2091"
-delete-after: True
-changes: 
-  - bugfix: "Lockboxes actually close when locked now."
diff --git a/html/changelogs/AutoChangeLog-pr-11061.yml b/html/changelogs/AutoChangeLog-pr-11061.yml
deleted file mode 100644
index 7cf7bfeebd8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-11061.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Calecute"
-delete-after: True
-changes: 
-  - bugfix: "South Prison camera now belongs to Prison camera network, thus showind in Prison camera monitor"
diff --git a/html/changelogs/AutoChangeLog-pr-11074.yml b/html/changelogs/AutoChangeLog-pr-11074.yml
deleted file mode 100644
index 96862f9f9e7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-11074.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "farie82"
-delete-after: True
-changes: 
-  - bugfix: "When disarming a bomb from a guardian you now don't pickup an empty object."