From 9294302f6b5e998b034cb0d481dacd0202b52d80 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Mon, 12 Feb 2018 22:49:59 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 19 +++++++++++++
 html/changelogs/.all_changelog.yml         | 32 ++++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-35433.yml | 16 -----------
 html/changelogs/AutoChangeLog-pr-35517.yml |  5 ----
 html/changelogs/AutoChangeLog-pr-35528.yml |  4 ---
 5 files changed, 51 insertions(+), 25 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-35433.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-35517.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-35528.yml

diff --git a/html/changelog.html b/html/changelog.html
index db2aa503d59..1f2b6f31861 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,6 +60,8 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">AI no longers block ark after mass_recall</li>
 				<li class="bugfix">Placed the dispersal logic AFTER the mass_recall on ark activation instead of infront(did nothing before basically).</li>
+				<li class="rscadd">Cell chargers can now be built and upgraded with capacitors!</li>
+				<li class="bugfix">Fixed empty subtype batteries not updating icons</li>
 			</ul>
 			<h3 class="author">Denton updated:</h3>
 			<ul class="changes bgimages16">
@@ -69,6 +71,23 @@
 			<h3 class="author">More Robust Than You updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Your hand no longer magically squishes urinal cakes when trying to pick them up</li>
+				<li class="bugfix">SCP-294 no longer looks fucked up</li>
+			</ul>
+			<h3 class="author">Robustin updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">The rift created by teleporting in from space will now include a description indicating the direction of the "origin" teleport rune - giving the examiner a fair idea of where the "space base" is located.</li>
+				<li class="balance">You can no longer manifest spirits or summon cultists while in space or Lavaland. You may still ascend as a spirit (formerly spirit sight, astral jaunt, etc.) in either of these locations.</li>
+				<li class="balance">Juggernauts have lost 20% reflect rate on energy projectiles (now around 50% for standard lasers).</li>
+				<li class="balance">Wraiths and Juggernauts have -5 melee damage (20 and 25 now, respectively).</li>
+				<li class="balance">Construct shells now cost 50 metal through the "twisted construction" spell. Twisted construction is now a "single use" spell.</li>
+				<li class="balance">The Concealment spell will now work on cult airlocks (including converted airlocks). The "concealed" airlock will appear as a generic airlock but will deny access to any non-cultist.</li>
+				<li class="balance">The draw blood effect on blood splatters will now draw more blood from stains with low blood levels.</li>
+				<li class="tweak">Unanchored (via ritual dagger) cult structures are no longer "dense", meaning you can move them through teleport runes more efficiently.</li>
+				<li class="tweak">The button to nominate yourself for cult master now has a confirmation prompt seeking assurance that the user is prepared to be the cult's master.</li>
+				<li class="tweak">The reveal aspect of the concealment spell is slightly smaller, albeit still slightly larger (6 range) than the concealment aspect (5 range).</li>
+				<li class="imageadd">Juggernauts "gauntlet echo" now has a more cult-themed appearance.</li>
+				<li class="bugfix">Using a shuttle curse to push the shuttle timer above its default can no longer be "reset" with a recall. This also adds a block_recall(time_in_deciseconds) helper-proc to the shuttle subsystem.</li>
+				<li class="bugfix">Using runed metal on a regular girder is no longer an option, preventing runtimes and deletions associated with the (unintended) combination.</li>
 			</ul>
 
 			<h2 class="date">11 February 2018</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fb5d13aeaa4..305b79a8a2a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15896,6 +15896,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: AI no longers block ark after mass_recall
   - bugfix: Placed the dispersal logic AFTER the mass_recall on ark activation instead
       of infront(did nothing before basically).
+  - rscadd: Cell chargers can now be built and upgraded with capacitors!
+  - bugfix: Fixed empty subtype batteries not updating icons
   Denton:
   - bugfix: Fixes lye/plastic/charcoal conflicts when mixing.
   - bugfix: Lye is now made by combining ash with water and carbon. Plastic sheets
@@ -15903,3 +15905,33 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   More Robust Than You:
   - bugfix: Your hand no longer magically squishes urinal cakes when trying to pick
       them up
+  - bugfix: SCP-294 no longer looks fucked up
+  Robustin:
+  - balance: The rift created by teleporting in from space will now include a description
+      indicating the direction of the "origin" teleport rune - giving the examiner
+      a fair idea of where the "space base" is located.
+  - balance: You can no longer manifest spirits or summon cultists while in space
+      or Lavaland. You may still ascend as a spirit (formerly spirit sight, astral
+      jaunt, etc.) in either of these locations.
+  - balance: Juggernauts have lost 20% reflect rate on energy projectiles (now around
+      50% for standard lasers).
+  - balance: Wraiths and Juggernauts have -5 melee damage (20 and 25 now, respectively).
+  - balance: Construct shells now cost 50 metal through the "twisted construction"
+      spell. Twisted construction is now a "single use" spell.
+  - balance: The Concealment spell will now work on cult airlocks (including converted
+      airlocks). The "concealed" airlock will appear as a generic airlock but will
+      deny access to any non-cultist.
+  - balance: The draw blood effect on blood splatters will now draw more blood from
+      stains with low blood levels.
+  - tweak: Unanchored (via ritual dagger) cult structures are no longer "dense", meaning
+      you can move them through teleport runes more efficiently.
+  - tweak: The button to nominate yourself for cult master now has a confirmation
+      prompt seeking assurance that the user is prepared to be the cult's master.
+  - tweak: The reveal aspect of the concealment spell is slightly smaller, albeit
+      still slightly larger (6 range) than the concealment aspect (5 range).
+  - imageadd: Juggernauts "gauntlet echo" now has a more cult-themed appearance.
+  - bugfix: Using a shuttle curse to push the shuttle timer above its default can
+      no longer be "reset" with a recall. This also adds a block_recall(time_in_deciseconds)
+      helper-proc to the shuttle subsystem.
+  - bugfix: Using runed metal on a regular girder is no longer an option, preventing
+      runtimes and deletions associated with the (unintended) combination.
diff --git a/html/changelogs/AutoChangeLog-pr-35433.yml b/html/changelogs/AutoChangeLog-pr-35433.yml
deleted file mode 100644
index 4cd5e4a0e03..00000000000
--- a/html/changelogs/AutoChangeLog-pr-35433.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-author: "Robustin"
-delete-after: True
-changes: 
-  - balance: "The rift created by teleporting in from space will now include a description indicating the direction of the \"origin\" teleport rune - giving the examiner a fair idea of where the \"space base\" is located."
-  - balance: "You can no longer manifest spirits or summon cultists while in space or Lavaland. You may still ascend as a spirit (formerly spirit sight, astral jaunt, etc.) in either of these locations."
-  - balance: "Juggernauts have lost 20% reflect rate on energy projectiles (now around 50% for standard lasers)."
-  - balance: "Wraiths and Juggernauts have -5 melee damage (20 and 25 now, respectively)."
-  - balance: "Construct shells now cost 50 metal through the \"twisted construction\" spell. Twisted construction is now a \"single use\" spell."
-  - balance: "The Concealment spell will now work on cult airlocks (including converted airlocks). The \"concealed\" airlock will appear as a generic airlock but will deny access to any non-cultist."
-  - balance: "The draw blood effect on blood splatters will now draw more blood from stains with low blood levels."
-  - tweak: "Unanchored (via ritual dagger) cult structures are no longer \"dense\", meaning you can move them through teleport runes more efficiently."
-  - tweak: "The button to nominate yourself for cult master now has a confirmation prompt seeking assurance that the user is prepared to be the cult's master."
-  - tweak: "The reveal aspect of the concealment spell is slightly smaller, albeit still slightly larger (6 range) than the concealment aspect (5 range)."
-  - imageadd: "Juggernauts \"gauntlet echo\" now has a more cult-themed appearance."
-  - bugfix: "Using a shuttle curse to push the shuttle timer above its default can no longer be \"reset\" with a recall. This also adds a block_recall(time_in_deciseconds) helper-proc to the shuttle subsystem."
-  - bugfix: "Using runed metal on a regular girder is no longer an option, preventing runtimes and deletions associated with the (unintended) combination."
diff --git a/html/changelogs/AutoChangeLog-pr-35517.yml b/html/changelogs/AutoChangeLog-pr-35517.yml
deleted file mode 100644
index 1b4b8dd3342..00000000000
--- a/html/changelogs/AutoChangeLog-pr-35517.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Dax Dupont"
-delete-after: True
-changes: 
-  - rscadd: "Cell chargers can now be built and upgraded with capacitors!"
-  - bugfix: "Fixed empty subtype batteries not updating icons"
diff --git a/html/changelogs/AutoChangeLog-pr-35528.yml b/html/changelogs/AutoChangeLog-pr-35528.yml
deleted file mode 100644
index 40def083f55..00000000000
--- a/html/changelogs/AutoChangeLog-pr-35528.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "More Robust Than You"
-delete-after: True
-changes: 
-  - bugfix: "SCP-294 no longer looks fucked up"