From 541f2ef15e5128f7821e1dca3a146cfe2e3ebd4b Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 15 May 2018 23:14:32 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 6 ++++++
 html/changelogs/.all_changelog.yml        | 3 +++
 html/changelogs/AutoChangeLog-pr-9017.yml | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9017.yml

diff --git a/html/changelog.html b/html/changelog.html
index 1101724c3ac..663a4b11154 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">15 May 2018</h2>
+			<h3 class="author">Tayyyyyyy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Pun pun is back!</li>
+			</ul>
+
 			<h2 class="date">11 May 2018</h2>
 			<h3 class="author">Kyep updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4bedbcf58cd..77de385b0cc 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6399,3 +6399,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Kyep:
   - bugfix: It is no longer possible to create an infinite number of monkeys from
       the same monkey cube.
+2018-05-15:
+  Tayyyyyyy:
+  - bugfix: Pun pun is back!
diff --git a/html/changelogs/AutoChangeLog-pr-9017.yml b/html/changelogs/AutoChangeLog-pr-9017.yml
deleted file mode 100644
index 39638cb4663..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9017.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tayyyyyyy"
-delete-after: True
-changes: 
-  - bugfix: "Pun pun is back!"