From 290e9135d016290bee0e5f504429ad910dff49da Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Mon, 25 Mar 2019 15:32:28 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 10 ++++++++++
 html/changelogs/.all_changelog.yml         |  6 ++++++
 html/changelogs/AutoChangeLog-pr-11112.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-11121.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-11128.yml |  5 -----
 5 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11112.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11121.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11128.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5401db048ea..a14f4f89ef8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -63,6 +63,16 @@
 				<li class="bugfix">Fixes chem smoke lagging under some circumstances</li>
 				<li class="bugfix">Fixes smoke not wanting to garbage collect</li>
 				<li class="bugfix">Fixes flares not returning a qdel hint</li>
+				<li class="bugfix">Fixes hotspots being slow to ignite turfs around them</li>
+				<li class="bugfix">Fixes LINDA not conducting temperature through things.</li>
+			</ul>
+			<h3 class="author">Mitchs98 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Chitinous Mass is no longer weaponized lag if examined.</li>
+			</ul>
+			<h3 class="author">farie82 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Diona nymphs are grabbable and punchable again</li>
 			</ul>
 
 			<h2 class="date">24 March 2019</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 958cb315944..62927d69529 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9497,3 +9497,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes chem smoke lagging under some circumstances
   - bugfix: Fixes smoke not wanting to garbage collect
   - bugfix: Fixes flares not returning a qdel hint
+  - bugfix: Fixes hotspots being slow to ignite turfs around them
+  - bugfix: Fixes LINDA not conducting temperature through things.
+  Mitchs98:
+  - bugfix: Chitinous Mass is no longer weaponized lag if examined.
+  farie82:
+  - bugfix: Diona nymphs are grabbable and punchable again
diff --git a/html/changelogs/AutoChangeLog-pr-11112.yml b/html/changelogs/AutoChangeLog-pr-11112.yml
deleted file mode 100644
index bba97366aa5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-11112.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Mitchs98"
-delete-after: True
-changes: 
-  - bugfix: "Chitinous Mass is no longer weaponized lag if examined."
diff --git a/html/changelogs/AutoChangeLog-pr-11121.yml b/html/changelogs/AutoChangeLog-pr-11121.yml
deleted file mode 100644
index 4d532c63e78..00000000000
--- a/html/changelogs/AutoChangeLog-pr-11121.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "farie82"
-delete-after: True
-changes: 
-  - bugfix: "Diona nymphs are grabbable and punchable again"
diff --git a/html/changelogs/AutoChangeLog-pr-11128.yml b/html/changelogs/AutoChangeLog-pr-11128.yml
deleted file mode 100644
index 2fa1c97eeeb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-11128.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - bugfix: "Fixes hotspots being slow to ignite turfs around them"
-  - bugfix: "Fixes LINDA not conducting temperature through things."