From 377851df0a533a0202ce935ef53536d775d4fefe Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 23 Apr 2017 01:38:06 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 11 +++++++++++
 html/changelogs/.all_changelog.yml        |  7 +++++++
 html/changelogs/AutoChangeLog-pr-7135.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-7148.yml |  4 ----
 4 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7135.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7148.yml

diff --git a/html/changelog.html b/html/changelog.html
index f3bff003087..df428ed0b35 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">23 April 2017</h2>
+			<h3 class="author">IK3I updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">flipping aliums now have a cooldown</li>
+				<li class="rscadd">Aliums have some more sounds to play with</li>
+			</ul>
+			<h3 class="author">Tayyyyyyy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">You can no longer use space pod verbs when restrained, dead, or otherwise incapacitated.</li>
+			</ul>
+
 			<h2 class="date">21 April 2017</h2>
 			<h3 class="author">Anticept updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5c568b2e10f..52e16e4f07b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4528,3 +4528,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       you haven't voted on.
   - rscadd: Adds an browser popup for creating new polls
   - tweak: Your account needs to be at least 30 days old in order to vote on polls
+2017-04-23:
+  IK3I:
+  - bugfix: flipping aliums now have a cooldown
+  - rscadd: Aliums have some more sounds to play with
+  Tayyyyyyy:
+  - bugfix: You can no longer use space pod verbs when restrained, dead, or otherwise
+      incapacitated.
diff --git a/html/changelogs/AutoChangeLog-pr-7135.yml b/html/changelogs/AutoChangeLog-pr-7135.yml
deleted file mode 100644
index f7cbc28c794..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7135.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "IK3I"
-delete-after: True
-changes: 
-  - bugfix: "flipping aliums now have a cooldown"
-  - rscadd: "Aliums have some more sounds to play with"
diff --git a/html/changelogs/AutoChangeLog-pr-7148.yml b/html/changelogs/AutoChangeLog-pr-7148.yml
deleted file mode 100644
index f3890b9e1f1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7148.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - bugfix: "You can no longer use space pod verbs when restrained, dead, or otherwise incapacitated."