From 07bf6959a46d5cf663ed3aba17806f5dc9cf32f3 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Mon, 24 Dec 2018 02:28:58 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 22 ++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 27 ++++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-10364.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-10450.yml |  6 -----
 html/changelogs/AutoChangeLog-pr-10469.yml |  5 ----
 html/changelogs/AutoChangeLog-pr-10474.yml | 11 ---------
 6 files changed, 49 insertions(+), 26 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10364.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10450.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10469.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10474.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2e0689f03de..95136730580 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,28 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">24 December 2018</h2>
+			<h3 class="author">Alffd updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed fart based mechanics.</li>
+			</ul>
+			<h3 class="author">datlo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added the grenadier belt for nukies, ported from tg, containing a LOT of various grenades to throw at people.</li>
+				<li class="rscadd">Added the gluon grenade (Freeze floors and irradiate) and the frag grenade.</li>
+				<li class="rscadd">Added Toxins tech to RND. Can only be improved by testing explosives in the toxins lab, and unlocks various atmospherics tanks and items in the protolathe.</li>
+				<li class="rscadd">Added the Bluespace Rapid Pipe Dispenser, allowing you to place pipes at a distance. Built in the protolathe after improving Toxins and Bluespace tech. Sprite made by Ionward.</li>
+				<li class="tweak">Welding Gas Mask now requires toxins tech.</li>
+				<li class="rscadd">Syndicate Officer job now available for admins, along with a brand new office connecting to the SIT, SST, and nuke ops ready room.</li>
+				<li class="tweak">Remapped SIT and SST starting areas to be next to nuke ops starting area. Added sleepers and a couple of other QOL stuff in their ready rooms</li>
+				<li class="rscadd">Added a holding cell to the SIT starting area</li>
+				<li class="rscadd">Added a teleporter available to SIT and SST if admin enables it, can go to and from the z2 area.</li>
+				<li class="rscadd">Added an armory SST can get if admin enables it. 2 bulldogs, 2 SMG, 1 sniper, 1 medigun, 1 rocket launcher and assorted ammo.</li>
+				<li class="rscadd">Added 3 dark gygaxes, tools, and welding fuel to the SST mechbay room (admin access required)</li>
+				<li class="bugfix">Added a new subtype of mech rechargers for CC zlevel that will always recharge an attached mech even without power/recharger monitor</li>
+				<li class="bugfix">Added SIT shuttle transit area</li>
+			</ul>
+
 			<h2 class="date">19 December 2018</h2>
 			<h3 class="author">Citinited updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cbfc34169fa..07a7de370c3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8406,3 +8406,30 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       Ho ho ho!
   uc_guy:
   - bugfix: Fixed anomalies being disabled by random radio traffic.
+2018-12-24:
+  Alffd:
+  - rscdel: Removed fart based mechanics.
+  datlo:
+  - rscadd: Added the grenadier belt for nukies, ported from tg, containing a LOT
+      of various grenades to throw at people.
+  - rscadd: Added the gluon grenade (Freeze floors and irradiate) and the frag grenade.
+  - rscadd: Added Toxins tech to RND. Can only be improved by testing explosives in
+      the toxins lab, and unlocks various atmospherics tanks and items in the protolathe.
+  - rscadd: Added the Bluespace Rapid Pipe Dispenser, allowing you to place pipes
+      at a distance. Built in the protolathe after improving Toxins and Bluespace
+      tech. Sprite made by Ionward.
+  - tweak: Welding Gas Mask now requires toxins tech.
+  - rscadd: Syndicate Officer job now available for admins, along with a brand new
+      office connecting to the SIT, SST, and nuke ops ready room.
+  - tweak: Remapped SIT and SST starting areas to be next to nuke ops starting area.
+      Added sleepers and a couple of other QOL stuff in their ready rooms
+  - rscadd: Added a holding cell to the SIT starting area
+  - rscadd: Added a teleporter available to SIT and SST if admin enables it, can go
+      to and from the z2 area.
+  - rscadd: Added an armory SST can get if admin enables it. 2 bulldogs, 2 SMG, 1
+      sniper, 1 medigun, 1 rocket launcher and assorted ammo.
+  - rscadd: Added 3 dark gygaxes, tools, and welding fuel to the SST mechbay room
+      (admin access required)
+  - bugfix: Added a new subtype of mech rechargers for CC zlevel that will always
+      recharge an attached mech even without power/recharger monitor
+  - bugfix: Added SIT shuttle transit area
diff --git a/html/changelogs/AutoChangeLog-pr-10364.yml b/html/changelogs/AutoChangeLog-pr-10364.yml
deleted file mode 100644
index ad753dbe7d2..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10364.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Alffd"
-delete-after: True
-changes: 
-  - rscdel: "Removed fart based mechanics."
diff --git a/html/changelogs/AutoChangeLog-pr-10450.yml b/html/changelogs/AutoChangeLog-pr-10450.yml
deleted file mode 100644
index cd1a24e0f07..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10450.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "datlo"
-delete-after: True
-changes: 
-  - rscadd: "Added Toxins tech to RND. Can only be improved by testing explosives in the toxins lab, and unlocks various atmospherics tanks and items in the protolathe."
-  - rscadd: "Added the Bluespace Rapid Pipe Dispenser, allowing you to place pipes at a distance. Built in the protolathe after improving Toxins and Bluespace tech. Sprite made by Ionward."
-  - tweak: "Welding Gas Mask now requires toxins tech."
diff --git a/html/changelogs/AutoChangeLog-pr-10469.yml b/html/changelogs/AutoChangeLog-pr-10469.yml
deleted file mode 100644
index f022ab95421..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10469.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "datlo"
-delete-after: True
-changes: 
-  - rscadd: "Added the grenadier belt for nukies, ported from tg, containing a LOT of various grenades to throw at people."
-  - rscadd: "Added the gluon grenade (Freeze floors and irradiate) and the frag grenade."
diff --git a/html/changelogs/AutoChangeLog-pr-10474.yml b/html/changelogs/AutoChangeLog-pr-10474.yml
deleted file mode 100644
index d50ae93f5d8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10474.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: "datlo"
-delete-after: True
-changes: 
-  - rscadd: "Syndicate Officer job now available for admins, along with a brand new office connecting to the SIT, SST, and nuke ops ready room."
-  - tweak: "Remapped SIT and SST starting areas to be next to nuke ops starting area. Added sleepers and a couple of other QOL stuff in their ready rooms"
-  - rscadd: "Added a holding cell to the SIT starting area"
-  - rscadd: "Added a teleporter available to SIT and SST if admin enables it, can go to and from the z2 area."
-  - rscadd: "Added an armory SST can get if admin enables it. 2 bulldogs, 2 SMG, 1 sniper, 1 medigun, 1 rocket launcher and assorted ammo."
-  - rscadd: "Added 3 dark gygaxes, tools, and welding fuel to the SST mechbay room (admin access required)"
-  - bugfix: "Added a new subtype of mech rechargers for CC zlevel that will always recharge an attached mech even without power/recharger monitor"
-  - bugfix: "Added SIT shuttle transit area"