From 8418db56ec11ad47f98464e8418e8a1150dfdecc Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Tue, 23 Jan 2018 15:13:28 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 24 +++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 28 ++++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-34142.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-34466.yml |  7 ------
 html/changelogs/AutoChangeLog-pr-34522.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-34524.yml |  9 -------
 html/changelogs/AutoChangeLog-pr-34560.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-34767.yml |  4 ----
 8 files changed, 52 insertions(+), 32 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34142.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34466.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34522.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34524.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34560.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-34767.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4ed875beb7c..1f2a1332f0e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,18 +65,42 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed missing tile under autolathes</li>
 			</ul>
+			<h3 class="author">MrDoomBringer updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">NanoTrasen's Creative Psychology Initiative has brought new training to all crewmembers to foster rapid, innovative problem-solving! You can now kill yourself in so many more ways!</li>
+				<li class="rscadd">The RnD department can now develop firmware upgrades to the Express Supply Console, unlocking advanced cargo drop pods!</li>
+			</ul>
 			<h3 class="author">Naksu updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="code_imp">removed a bunch of unnecessary vars, combining them into a bitfield</li>
 			</ul>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed occasional runtimes when ion storms or overflow would replace an existing law.</li>
+			</ul>
 			<h3 class="author">WJohnston updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Space syndie listening post now has a real microwave, and a book management console. Lava listening post comms room intercom now no longer starts with broadcast on.</li>
 				<li class="rscadd">the syndicate drop ship and fighter pods from the caravan ambush can now be flown to the syndicate listening post. The fighter pods also now have xray cameras because regular ones were super useless.</li>
 			</ul>
+			<h3 class="author">XDTM updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added Regenerative Jelly, made with tricordrazine and slime jelly. It regenerates a bit faster, and won't harm jellypeople.</li>
+				<li class="rscadd">Added Energized Jelly, made with teslium and jelly. It works as an anti-stun chemical for slimepeople and speeds up luminescents' power cooldown, but non-jellypeople will just get shocked.</li>
+				<li class="rscadd">Added Pyroxadone, made with cryoxadone and slime jelly. It's basically inverse cryoxadone: it heals faster the hotter your body temperature is.</li>
+				<li class="tweak">Cryoxadone no longer deals toxin damage to jellypeople.</li>
+				<li class="tweak">Purple Slime Extracts no longer have their sugar->slime jelly reaction (obsolete with extract grinding), and instead have a blood->regen jelly reaction.</li>
+				<li class="tweak">Purple Extract's major activation by Luminescents now give regenerative jelly instead of tricordrazine.</li>
+			</ul>
+			<h3 class="author">coiax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Fake nuclear disks can only be identified by the captain, observers, nuclear operatives, seeing where the pinpointer points, or attempting to put it into a nuclear device.</li>
+				<li class="rscadd">Fake nuclear disks "respawn" on the station just like the real one.</li>
+			</ul>
 			<h3 class="author">kevinz000 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscdel">pulling claw can now only passively grab</li>
+				<li class="bugfix">Infrared beams now update instantly.</li>
 			</ul>
 			<h3 class="author">ninjanomnom updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fdbf271049e..41666d02ef5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15141,8 +15141,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: cables now show up on t-ray scans.
   Dax Dupont:
   - bugfix: Fixed missing tile under autolathes
+  MrDoomBringer:
+  - rscadd: NanoTrasen's Creative Psychology Initiative has brought new training to
+      all crewmembers to foster rapid, innovative problem-solving! You can now kill
+      yourself in so many more ways!
+  - rscadd: The RnD department can now develop firmware upgrades to the Express Supply
+      Console, unlocking advanced cargo drop pods!
   Naksu:
   - code_imp: removed a bunch of unnecessary vars, combining them into a bitfield
+  SpaceManiac:
+  - bugfix: Fixed occasional runtimes when ion storms or overflow would replace an
+      existing law.
   WJohnston:
   - bugfix: Space syndie listening post now has a real microwave, and a book management
       console. Lava listening post comms room intercom now no longer starts with broadcast
@@ -15150,8 +15159,27 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: the syndicate drop ship and fighter pods from the caravan ambush can now
       be flown to the syndicate listening post. The fighter pods also now have xray
       cameras because regular ones were super useless.
+  XDTM:
+  - rscadd: Added Regenerative Jelly, made with tricordrazine and slime jelly. It
+      regenerates a bit faster, and won't harm jellypeople.
+  - rscadd: Added Energized Jelly, made with teslium and jelly. It works as an anti-stun
+      chemical for slimepeople and speeds up luminescents' power cooldown, but non-jellypeople
+      will just get shocked.
+  - rscadd: 'Added Pyroxadone, made with cryoxadone and slime jelly. It''s basically
+      inverse cryoxadone: it heals faster the hotter your body temperature is.'
+  - tweak: Cryoxadone no longer deals toxin damage to jellypeople.
+  - tweak: Purple Slime Extracts no longer have their sugar->slime jelly reaction
+      (obsolete with extract grinding), and instead have a blood->regen jelly reaction.
+  - tweak: Purple Extract's major activation by Luminescents now give regenerative
+      jelly instead of tricordrazine.
+  coiax:
+  - rscadd: Fake nuclear disks can only be identified by the captain, observers, nuclear
+      operatives, seeing where the pinpointer points, or attempting to put it into
+      a nuclear device.
+  - rscadd: Fake nuclear disks "respawn" on the station just like the real one.
   kevinz000:
   - rscdel: pulling claw can now only passively grab
+  - bugfix: Infrared beams now update instantly.
   ninjanomnom:
   - bugfix: Changeling clothing can get bloodied again.
   the hatchet man (i eat garbage code):
diff --git a/html/changelogs/AutoChangeLog-pr-34142.yml b/html/changelogs/AutoChangeLog-pr-34142.yml
deleted file mode 100644
index fa1780c0486..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34142.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes: 
-  - bugfix: "Infrared beams now update instantly."
diff --git a/html/changelogs/AutoChangeLog-pr-34466.yml b/html/changelogs/AutoChangeLog-pr-34466.yml
deleted file mode 100644
index 94d1e317db1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34466.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - rscadd: "Fake nuclear disks can only be identified by the captain,
-observers, nuclear operatives, seeing where the pinpointer points, or
-attempting to put it into a nuclear device."
-  - rscadd: "Fake nuclear disks \"respawn\" on the station just like the real one."
diff --git a/html/changelogs/AutoChangeLog-pr-34522.yml b/html/changelogs/AutoChangeLog-pr-34522.yml
deleted file mode 100644
index 4176da0fcff..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34522.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrDoomBringer"
-delete-after: True
-changes: 
-  - rscadd: "NanoTrasen's Creative Psychology Initiative has brought new training to all crewmembers to foster rapid, innovative problem-solving! You can now kill yourself in so many more ways!"
diff --git a/html/changelogs/AutoChangeLog-pr-34524.yml b/html/changelogs/AutoChangeLog-pr-34524.yml
deleted file mode 100644
index d386bc3cc1a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34524.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "XDTM"
-delete-after: True
-changes: 
-  - rscadd: "Added Regenerative Jelly, made with tricordrazine and slime jelly. It regenerates a bit faster, and won't harm jellypeople."
-  - rscadd: "Added Energized Jelly, made with teslium and jelly. It works as an anti-stun chemical for slimepeople and speeds up luminescents' power cooldown, but non-jellypeople will just get shocked."
-  - rscadd: "Added Pyroxadone, made with cryoxadone and slime jelly. It's basically inverse cryoxadone: it heals faster the hotter your body temperature is."
-  - tweak: "Cryoxadone no longer deals toxin damage to jellypeople."
-  - tweak: "Purple Slime Extracts no longer have their sugar->slime jelly reaction (obsolete with extract grinding), and instead have a blood->regen jelly reaction."
-  - tweak: "Purple Extract's major activation by Luminescents now give regenerative jelly instead of tricordrazine."
diff --git a/html/changelogs/AutoChangeLog-pr-34560.yml b/html/changelogs/AutoChangeLog-pr-34560.yml
deleted file mode 100644
index eeb0c584df0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34560.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrDoomBringer"
-delete-after: True
-changes: 
-  - rscadd: "The RnD department can now develop firmware upgrades to the Express Supply Console, unlocking advanced cargo drop pods!"
diff --git a/html/changelogs/AutoChangeLog-pr-34767.yml b/html/changelogs/AutoChangeLog-pr-34767.yml
deleted file mode 100644
index 7c05ba1a38a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-34767.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "Fixed occasional runtimes when ion storms or overflow would replace an existing law."