From d5ac1063928eb22fcd5d7c680182a80a85f09495 Mon Sep 17 00:00:00 2001
From: sybil <sybil@tgstation13.org>
Date: Thu, 18 May 2017 19:56:16 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 17 +++++++++++++++++
 html/changelogs/AutoChangeLog-pr-27234.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-27316.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-27337.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-27359.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-27361.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-27371.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-27372.yml |  4 ----
 9 files changed, 36 insertions(+), 32 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27234.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27316.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27337.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27359.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27361.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27371.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-27372.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2f8fe7ebbcb..e31707dda01 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,12 +56,31 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">18 May 2017</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Proselytizing alloy shards will now proselytize all the shards in the tile, instead of requiring you to proselytize each one at a time.</li>
+			</ul>
+			<h3 class="author">Lordpidey updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Space ninjas now use action buttons instead of verbs for a more consistent user experience.</li>
+				<li class="rscadd">Toy toolboxes with realistic rumbling action have been added to arcade prizes.</li>
+			</ul>
+			<h3 class="author">Tacolizard Forever: Plasmaman Powercreep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Plasmaman tanks are the same size as emergency oxygen tanks.</li>
+			</ul>
 			<h3 class="author">coiax updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Syndicate agents can purchase a "codespeak manual", that teaches them a language that sounds like a series of codewords. You can also hit other people with the manual to teach them. One use per manual.</li>
 				<li class="rscadd">Nuclear operatives have access to a deluxe manual that is more expensive but has unlimited uses.</li>
 				<li class="rscadd">Syndicate AIs know Codespeak for free.</li>
 				<li class="bugfix">Spacevines can no longer spread on space transit turfs.</li>
+				<li class="balance">Plastic explosives can no longer be detonated by EMPs.</li>
+				<li class="rscadd">Various vending machines, when shooting their inventory at nearby people, will "demonstrate their products features". This means that if a cigarette vending machine throws a lighter at you, it will be on. Vending machines also choose random products when throwing, rather than the first available one.</li>
+			</ul>
+			<h3 class="author">kevinz000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Peacekeeper cyborgs now have projectile dampening fields.</li>
 			</ul>
 
 			<h2 class="date">17 May 2017</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 398c8550afe..488671e683a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11303,6 +11303,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   coiax:
   - balance: Magic eightballs are now tiny items, able to fit into a box and pocket.
 2017-05-18:
+  Joan:
+  - rscadd: Proselytizing alloy shards will now proselytize all the shards in the
+      tile, instead of requiring you to proselytize each one at a time.
+  Lordpidey:
+  - tweak: Space ninjas now use action buttons instead of verbs for a more consistent
+      user experience.
+  - rscadd: Toy toolboxes with realistic rumbling action have been added to arcade
+      prizes.
+  'Tacolizard Forever: Plasmaman Powercreep':
+  - tweak: Plasmaman tanks are the same size as emergency oxygen tanks.
   coiax:
   - rscadd: Syndicate agents can purchase a "codespeak manual", that teaches them
       a language that sounds like a series of codewords. You can also hit other people
@@ -11311,3 +11321,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       but has unlimited uses.
   - rscadd: Syndicate AIs know Codespeak for free.
   - bugfix: Spacevines can no longer spread on space transit turfs.
+  - balance: Plastic explosives can no longer be detonated by EMPs.
+  - rscadd: Various vending machines, when shooting their inventory at nearby people,
+      will "demonstrate their products features". This means that if a cigarette vending
+      machine throws a lighter at you, it will be on. Vending machines also choose
+      random products when throwing, rather than the first available one.
+  kevinz000:
+  - rscadd: Peacekeeper cyborgs now have projectile dampening fields.
diff --git a/html/changelogs/AutoChangeLog-pr-27234.yml b/html/changelogs/AutoChangeLog-pr-27234.yml
deleted file mode 100644
index 55add0d61b3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27234.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes: 
-  - rscadd: "Peacekeeper cyborgs now have projectile dampening fields."
diff --git a/html/changelogs/AutoChangeLog-pr-27316.yml b/html/changelogs/AutoChangeLog-pr-27316.yml
deleted file mode 100644
index ac36de1da25..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27316.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Lordpidey"
-delete-after: True
-changes: 
-  - tweak: "Space ninjas now use action buttons instead of verbs for a more consistent user experience."
diff --git a/html/changelogs/AutoChangeLog-pr-27337.yml b/html/changelogs/AutoChangeLog-pr-27337.yml
deleted file mode 100644
index 55633298a8f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27337.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscadd: "Proselytizing alloy shards will now proselytize all the shards in the tile, instead of requiring you to proselytize each one at a time."
diff --git a/html/changelogs/AutoChangeLog-pr-27359.yml b/html/changelogs/AutoChangeLog-pr-27359.yml
deleted file mode 100644
index 26b56e1b299..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27359.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - balance: "Plastic explosives can no longer be detonated by EMPs."
diff --git a/html/changelogs/AutoChangeLog-pr-27361.yml b/html/changelogs/AutoChangeLog-pr-27361.yml
deleted file mode 100644
index 85daa80c5e6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27361.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - rscadd: "Various vending machines, when shooting their inventory at nearby
-people, will \"demonstrate their products features\". This means that if a
-cigarette vending machine throws a lighter at you, it will be on.
-Vending machines also choose random products when throwing, rather than
-the first available one."
diff --git a/html/changelogs/AutoChangeLog-pr-27371.yml b/html/changelogs/AutoChangeLog-pr-27371.yml
deleted file mode 100644
index 5557069616b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27371.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Lordpidey"
-delete-after: True
-changes: 
-  - rscadd: "Toy toolboxes with realistic rumbling action have been added to arcade prizes."
diff --git a/html/changelogs/AutoChangeLog-pr-27372.yml b/html/changelogs/AutoChangeLog-pr-27372.yml
deleted file mode 100644
index 40e5e1abd01..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27372.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tacolizard Forever: Plasmaman Powercreep"
-delete-after: True
-changes: 
-  - tweak: "Plasmaman tanks are the same size as emergency oxygen tanks."