From 6fd1954acd75704bd4d9a2ee3e7bf7cfa20aa2ad Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 25 May 2017 14:02:00 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 13 +++++++++++++
 html/changelogs/.all_changelog.yml        |  9 +++++++++
 html/changelogs/AutoChangeLog-pr-7358.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7365.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7372.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7382.yml |  4 ----
 6 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7358.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7365.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7372.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7382.yml

diff --git a/html/changelog.html b/html/changelog.html
index 187ab8fbd26..c0eefd74188 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,18 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">25 May 2017</h2>
+			<h3 class="author">FalseIncarnate updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Matter Eater now requires your mouth be uncovered before you can eat matter.</li>
+			</ul>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">PLASMAMAN ATMOS SUITS ARE NOW THE SAME AS REGULAR ATMOS SUITS FLAG WISE! AND SO IS THE CE SUIT</li>
+			</ul>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed some mapping bugs on Centcom, e.g: shuttle medbay no longer has black walls.</li>
+			</ul>
 			<h3 class="author">Purpose2 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Metastation - Adds the Paramedic's cart and locker.</li>
@@ -66,6 +78,7 @@
 				<li class="tweak">Metastation - Moved Containment out a single tile, to fix irregularities with Singularity setups.</li>
 				<li class="rscdel">Metastation - Reduced redundant redundancies in the Atmos/Wiring.</li>
 				<li class="rscdel">Metastation - removed blob spawn that was only a few tiles from Cryostorage....</li>
+				<li class="bugfix">Drones can now grip Tracker Electronics & Vending Refills</li>
 			</ul>
 
 			<h2 class="date">24 May 2017</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9e8c863e025..34b8ab9167e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4751,6 +4751,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       These consoles cannot be used to hire anyone, or to accept cross-department
       transfers.
 2017-05-25:
+  FalseIncarnate:
+  - tweak: Matter Eater now requires your mouth be uncovered before you can eat matter.
+  Fethas:
+  - tweak: PLASMAMAN ATMOS SUITS ARE NOW THE SAME AS REGULAR ATMOS SUITS FLAG WISE!
+      AND SO IS THE CE SUIT
+  Kyep:
+  - bugfix: 'Fixed some mapping bugs on Centcom, e.g: shuttle medbay no longer has
+      black walls.'
   Purpose2:
   - rscadd: Metastation - Adds the Paramedic's cart and locker.
   - rscadd: Metastation - Adds a backup set of paramedic keys in the CMO's office.
@@ -4761,3 +4769,4 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       with Singularity setups.
   - rscdel: Metastation - Reduced redundant redundancies in the Atmos/Wiring.
   - rscdel: Metastation - removed blob spawn that was only a few tiles from Cryostorage....
+  - bugfix: Drones can now grip Tracker Electronics & Vending Refills
diff --git a/html/changelogs/AutoChangeLog-pr-7358.yml b/html/changelogs/AutoChangeLog-pr-7358.yml
deleted file mode 100644
index 4ed42f55edc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7358.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "FalseIncarnate"
-delete-after: True
-changes: 
-  - tweak: "Matter Eater now requires your mouth be uncovered before you can eat matter."
diff --git a/html/changelogs/AutoChangeLog-pr-7365.yml b/html/changelogs/AutoChangeLog-pr-7365.yml
deleted file mode 100644
index a0ade820299..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7365.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "Fixed some mapping bugs on Centcom, e.g: shuttle medbay no longer has black walls."
diff --git a/html/changelogs/AutoChangeLog-pr-7372.yml b/html/changelogs/AutoChangeLog-pr-7372.yml
deleted file mode 100644
index 30c74bfb5ba..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7372.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - tweak: "PLASMAMAN ATMOS SUITS ARE NOW THE SAME AS REGULAR ATMOS SUITS FLAG WISE! AND SO IS THE CE SUIT"
diff --git a/html/changelogs/AutoChangeLog-pr-7382.yml b/html/changelogs/AutoChangeLog-pr-7382.yml
deleted file mode 100644
index 798f070ddb5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7382.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Purpose2"
-delete-after: True
-changes: 
-  - bugfix: "Drones can now grip Tracker Electronics & Vending Refills"