From a92d633c84e8445854e79010cf3ce419c8daa5b7 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Wed, 16 Sep 2015 05:18:15 +0000
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                           | 32 ++++++++++++++++
 html/changelogs/.all_changelog.yml            | 38 +++++++++++++++++++
 html/changelogs/Razharas-PR-11643.yml         | 36 ------------------
 html/changelogs/Supermichael777-pr-#11738.yml |  6 ---
 html/changelogs/phil235-CultRefactor.yml      | 19 ----------
 .../phil235-ShieldThrowTableFixes.yml         |  7 ----
 6 files changed, 70 insertions(+), 68 deletions(-)
 delete mode 100644 html/changelogs/Razharas-PR-11643.yml
 delete mode 100644 html/changelogs/Supermichael777-pr-#11738.yml
 delete mode 100644 html/changelogs/phil235-CultRefactor.yml
 delete mode 100644 html/changelogs/phil235-ShieldThrowTableFixes.yml

diff --git a/html/changelog.html b/html/changelog.html
index 725f17d0468..78c8c984294 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,38 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">16 September 2015</h2>
+			<h3 class="author">Razharas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Replaces the space cube with space torus. Space levels are now each round randomly placed on the grid with at least one neigbour, any side of the space level that doesnt have neigbour will loop either onto itself or onto the opposite side of the furthest straight-connected space level on the same axis.</li>
+			</ul>
+			<h3 class="author">Supermichael777 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The detomax pda cartridge no longer blows its user up.</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="experimental">Cultists will now be able to create all runes without needing to research or collect words. This is subject to change.</li>
+				<li class="tweak">Cult code has been significantly improved and will run much faster and be more responsive.</li>
+				<li class="tweak">Conversion runes can now be invoked with less than three cultists, but take a small amount of time to convert the target.</li>
+				<li class="tweak">Armor runes will only outfit the user with standard armor, rather than having different loadouts for different worn clothing items.</li>
+				<li class="tweak">Astral Journey runes will now pull the user back to the rune if they are moved. The user also has a different color while on the rune.</li>
+				<li class="tweak">Free Cultist has been removed. Summon Cultist now works even if the target is restrained.</li>
+				<li class="tweak">Sacrifice and Raise Dead runes now offer more precise target selection.</li>
+				<li class="soundadd">Sacrifice runes now have different sounds, and gib rather than dust (assuming the target is not a silicon).</li>
+				<li class="tweak">There is no longer a maximum cap on active runes.</li>
+				<li class="tweak">Runes have been renamed to Rites. For instance, the Teleport rune is now the Rite of Translocation. The only exception to this is the rune to summon Nar-Sie, which is a Ritual.</li>
+				<li class="tweak">Nar-Sie now has a new summon sound.</li>
+				<li class="tweak">The Nar-Sie summon rune has a new 3x3 sprite.</li>
+				<li class="tweak">The stun rune no longer stuns cultists.</li>
+				<li class="rscadd">The Rite of False Truths had been added, that will make all nearby runes appear as if they were drawn in crayon.</li>
+				<li class="rscadd">Runes can now be examined by cultists to determine their name, function, and words.</li>
+			</ul>
+			<h3 class="author">phil235 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Riot and energy shield users now have a chance to block things thrown at them as well as xeno leaping at them.</li>
+			</ul>
+
 			<h2 class="date">14 September 2015</h2>
 			<h3 class="author">Fox P McCloud updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 06e1d3f215c..282418ead79 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1773,3 +1773,41 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Reduced alien disarm stun duration vs cyborgs, from 7 seconds to 2 seconds.
   - tweak: Alien sentinels now move as fast as humans.
   - tweak: Facehuggers and alien eggs layers increased to be higher than resin walls.
+2015-09-16:
+  Razharas:
+  - tweak: Replaces the space cube with space torus. Space levels are now each round
+      randomly placed on the grid with at least one neigbour, any side of the space
+      level that doesnt have neigbour will loop either onto itself or onto the opposite
+      side of the furthest straight-connected space level on the same axis.
+  Supermichael777:
+  - tweak: The detomax pda cartridge no longer blows its user up.
+  Xhuis:
+  - experimental: Cultists will now be able to create all runes without needing to
+      research or collect words. This is subject to change.
+  - tweak: Cult code has been significantly improved and will run much faster and
+      be more responsive.
+  - tweak: Conversion runes can now be invoked with less than three cultists, but
+      take a small amount of time to convert the target.
+  - tweak: Armor runes will only outfit the user with standard armor, rather than
+      having different loadouts for different worn clothing items.
+  - tweak: Astral Journey runes will now pull the user back to the rune if they are
+      moved. The user also has a different color while on the rune.
+  - tweak: Free Cultist has been removed. Summon Cultist now works even if the target
+      is restrained.
+  - tweak: Sacrifice and Raise Dead runes now offer more precise target selection.
+  - soundadd: Sacrifice runes now have different sounds, and gib rather than dust
+      (assuming the target is not a silicon).
+  - tweak: There is no longer a maximum cap on active runes.
+  - tweak: Runes have been renamed to Rites. For instance, the Teleport rune is now
+      the Rite of Translocation. The only exception to this is the rune to summon
+      Nar-Sie, which is a Ritual.
+  - tweak: Nar-Sie now has a new summon sound.
+  - tweak: The Nar-Sie summon rune has a new 3x3 sprite.
+  - tweak: The stun rune no longer stuns cultists.
+  - rscadd: The Rite of False Truths had been added, that will make all nearby runes
+      appear as if they were drawn in crayon.
+  - rscadd: Runes can now be examined by cultists to determine their name, function,
+      and words.
+  phil235:
+  - tweak: Riot and energy shield users now have a chance to block things thrown at
+      them as well as xeno leaping at them.
diff --git a/html/changelogs/Razharas-PR-11643.yml b/html/changelogs/Razharas-PR-11643.yml
deleted file mode 100644
index 5d0f0034857..00000000000
--- a/html/changelogs/Razharas-PR-11643.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   spellcheck (typo fixes)
-#   experiment
-#   tgs (TG-ported fixes?)
-#################################
-
-# Your name.  
-author: Razharas
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Replaces the space cube with space torus. Space levels are now each round randomly placed on the grid with at least one neigbour, any side of the space level that doesnt have neigbour will loop either onto itself or onto the opposite side of the furthest straight-connected space level on the same axis."
diff --git a/html/changelogs/Supermichael777-pr-#11738.yml b/html/changelogs/Supermichael777-pr-#11738.yml
deleted file mode 100644
index bf59db5bb98..00000000000
--- a/html/changelogs/Supermichael777-pr-#11738.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Supermichael777
-
-delete-after: True
-
-changes: 
-  - tweak: "The detomax pda cartridge no longer blows its user up."
diff --git a/html/changelogs/phil235-CultRefactor.yml b/html/changelogs/phil235-CultRefactor.yml
deleted file mode 100644
index 4e89baa68d6..00000000000
--- a/html/changelogs/phil235-CultRefactor.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-author: Xhuis
-delete-after: True
-
-changes: 
-  - experimental: "Cultists will now be able to create all runes without needing to research or collect words. This is subject to change."
-  - tweak: "Cult code has been significantly improved and will run much faster and be more responsive."
-  - tweak: "Conversion runes can now be invoked with less than three cultists, but take a small amount of time to convert the target."
-  - tweak: "Armor runes will only outfit the user with standard armor, rather than having different loadouts for different worn clothing items."
-  - tweak: "Astral Journey runes will now pull the user back to the rune if they are moved. The user also has a different color while on the rune."
-  - tweak: "Free Cultist has been removed. Summon Cultist now works even if the target is restrained."
-  - tweak: "Sacrifice and Raise Dead runes now offer more precise target selection."
-  - soundadd: "Sacrifice runes now have different sounds, and gib rather than dust (assuming the target is not a silicon)."
-  - tweak: "There is no longer a maximum cap on active runes."
-  - tweak: "Runes have been renamed to Rites. For instance, the Teleport rune is now the Rite of Translocation. The only exception to this is the rune to summon Nar-Sie, which is a Ritual."
-  - tweak: "Nar-Sie now has a new summon sound."
-  - tweak: "The Nar-Sie summon rune has a new 3x3 sprite."
-  - tweak: "The stun rune no longer stuns cultists."
-  - rscadd: "The Rite of False Truths had been added, that will make all nearby runes appear as if they were drawn in crayon."
-  - rscadd: "Runes can now be examined by cultists to determine their name, function, and words."
\ No newline at end of file
diff --git a/html/changelogs/phil235-ShieldThrowTableFixes.yml b/html/changelogs/phil235-ShieldThrowTableFixes.yml
deleted file mode 100644
index bca61f11d64..00000000000
--- a/html/changelogs/phil235-ShieldThrowTableFixes.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-author: phil235
-
-delete-after: True
-
-changes: 
-  - tweak: "Riot and energy shield users now have a chance to block things thrown at them as well as xeno leaping at them."