From 4b354d592c22d884a8d63a5c27e09c2e592b5eab Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Wed, 24 Oct 2018 23:43:50 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 17 +++++++++++++++++
 html/changelogs/.all_changelog.yml        |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-9958.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9963.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-9964.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-9965.yml |  4 ----
 6 files changed, 26 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9958.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9963.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9964.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9965.yml

diff --git a/html/changelog.html b/html/changelog.html
index e9a976df625..d47810dba2c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,11 +65,28 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Backend cleanup of assembly.dm and proximity.dm</li>
 			</ul>
+			<h3 class="author">Certhic updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Runtime error in CureIfHasDisability</li>
+				<li class="bugfix">Borg health is now updated after being repaired</li>
+			</ul>
+			<h3 class="author">Farie82 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Tablets now spawn correctly. No more buying (seemingly) broken tablets</li>
+			</ul>
 			<h3 class="author">Fethas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Ipcs bleed oil. Bleeding can be patched by welders and organ mainp surgery(if you have to heal an ipc via surgery we may as well take that out too).</li>
 				<li class="tweak">Kidan biolum slightly brighter. tweak:Vox now become confused and unintellible(..more) on cort stack damage.</li>
 			</ul>
+			<h3 class="author">Warior4356 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Safe tumbler 2 no longer makes I am open noise when turning tumbler 1.</li>
+			</ul>
+			<h3 class="author">dovydas12345 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added data disk to misc designs.</li>
+			</ul>
 			<h3 class="author">variableundefined updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Using reagent dispenser like fuel and water tank no longer give you an attack cooldown / animation.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 777ab338d51..4c718142c63 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7669,11 +7669,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Mind check in pre_quip added, to prevent runtime.
   Birdtalon:
   - tweak: Backend cleanup of assembly.dm and proximity.dm
+  Certhic:
+  - bugfix: Runtime error in CureIfHasDisability
+  - bugfix: Borg health is now updated after being repaired
+  Farie82:
+  - bugfix: Tablets now spawn correctly. No more buying (seemingly) broken tablets
   Fethas:
   - tweak: Ipcs bleed oil. Bleeding can be patched by welders and organ mainp surgery(if
       you have to heal an ipc via surgery we may as well take that out too).
   - tweak: Kidan biolum slightly brighter. tweak:Vox now become confused and unintellible(..more)
       on cort stack damage.
+  Warior4356:
+  - bugfix: Safe tumbler 2 no longer makes I am open noise when turning tumbler 1.
+  dovydas12345:
+  - rscadd: Added data disk to misc designs.
   variableundefined:
   - bugfix: Using reagent dispenser like fuel and water tank no longer give you an
       attack cooldown / animation.
diff --git a/html/changelogs/AutoChangeLog-pr-9958.yml b/html/changelogs/AutoChangeLog-pr-9958.yml
deleted file mode 100644
index b00914c262d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9958.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "dovydas12345"
-delete-after: True
-changes: 
-  - rscadd: "Added data disk to misc designs."
diff --git a/html/changelogs/AutoChangeLog-pr-9963.yml b/html/changelogs/AutoChangeLog-pr-9963.yml
deleted file mode 100644
index 721e1942a34..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9963.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Farie82"
-delete-after: True
-changes: 
-  - bugfix: "Tablets now spawn correctly. No more buying (seemingly) broken tablets"
diff --git a/html/changelogs/AutoChangeLog-pr-9964.yml b/html/changelogs/AutoChangeLog-pr-9964.yml
deleted file mode 100644
index 2affa9a28f1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9964.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Certhic"
-delete-after: True
-changes: 
-  - bugfix: "Runtime error in CureIfHasDisability"
-  - bugfix: "Borg health is now updated after being repaired"
diff --git a/html/changelogs/AutoChangeLog-pr-9965.yml b/html/changelogs/AutoChangeLog-pr-9965.yml
deleted file mode 100644
index c193bee8aca..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9965.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Warior4356"
-delete-after: True
-changes: 
-  - bugfix: "Safe tumbler 2 no longer makes I am open noise when turning tumbler 1."