From 8a7d68b0d5a63e724d47b8bab42332e1f9b8aecb Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Mon, 18 Dec 2017 05:08:02 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 13 +++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-33302.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-33574.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-33605.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-33614.yml |  4 ----
 6 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-33302.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-33574.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-33605.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-33614.yml

diff --git a/html/changelog.html b/html/changelog.html
index 977a24abf4a..ab7bf653986 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,10 +56,18 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">18 December 2017</h2>
+			<h3 class="author">AnturK updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Repeated messages will now be squashed in the chat.</li>
+			</ul>
 			<h3 class="author">Cyberboss updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Allied station communications are back, now with potentially multiple stations</li>
 			</ul>
+			<h3 class="author">Naksu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Hostile mobs on z-levels without living players will now conserve their efforts and simply not run AI routines at all. Also, idling mob routines should be significantly cheaper on non-station Z-levels.</li>
+			</ul>
 			<h3 class="author">Xhuis updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Microwave sound loops now correctly stop when it breaks or is otherwise interrupted mid-cook.</li>
@@ -67,6 +75,11 @@
 			<h3 class="author">coiax updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">A lollipop dispenser in "dispense lollipops" mode can push the lollipop straight into the targets hand, rather than getting it dirty on the floor first.</li>
+				<li class="tweak">Aliens (and humans with alien organs) will have a prompt if they try to create resin structures or lay eggs atop vents or scrubbers.</li>
+			</ul>
+			<h3 class="author">ninjanomnom updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Decals should now rotate the correct way around.</li>
 			</ul>
 			<h3 class="author">oranges updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c5063470914..016bbc00c56 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14398,15 +14398,25 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: You can use Shift+E or Shift+B for belt/backpack respectively to quickly
       put in your held item or take out the most recently added item.
 2017-12-18:
+  AnturK:
+  - rscadd: Repeated messages will now be squashed in the chat.
   Cyberboss:
   - bugfix: Allied station communications are back, now with potentially multiple
       stations
+  Naksu:
+  - tweak: Hostile mobs on z-levels without living players will now conserve their
+      efforts and simply not run AI routines at all. Also, idling mob routines should
+      be significantly cheaper on non-station Z-levels.
   Xhuis:
   - bugfix: Microwave sound loops now correctly stop when it breaks or is otherwise
       interrupted mid-cook.
   coiax:
   - rscadd: A lollipop dispenser in "dispense lollipops" mode can push the lollipop
       straight into the targets hand, rather than getting it dirty on the floor first.
+  - tweak: Aliens (and humans with alien organs) will have a prompt if they try to
+      create resin structures or lay eggs atop vents or scrubbers.
+  ninjanomnom:
+  - bugfix: Decals should now rotate the correct way around.
   oranges:
   - tweak: Dance machine will not play tracks to you if you have instruments turned
       off
diff --git a/html/changelogs/AutoChangeLog-pr-33302.yml b/html/changelogs/AutoChangeLog-pr-33302.yml
deleted file mode 100644
index d442a1e7da3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33302.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "coiax"
-delete-after: True
-changes: 
-  - tweak: "Aliens (and humans with alien organs) will have a prompt
-if they try to create resin structures or lay eggs atop vents or scrubbers."
diff --git a/html/changelogs/AutoChangeLog-pr-33574.yml b/html/changelogs/AutoChangeLog-pr-33574.yml
deleted file mode 100644
index 11fd6bb4a71..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33574.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - tweak: "Hostile mobs on z-levels without living players will now conserve their efforts and simply not run AI routines at all. Also, idling mob routines should be significantly cheaper on non-station Z-levels."
diff --git a/html/changelogs/AutoChangeLog-pr-33605.yml b/html/changelogs/AutoChangeLog-pr-33605.yml
deleted file mode 100644
index d2422c8828d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33605.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "AnturK"
-delete-after: True
-changes: 
-  - rscadd: "Repeated messages will now be squashed in the chat."
diff --git a/html/changelogs/AutoChangeLog-pr-33614.yml b/html/changelogs/AutoChangeLog-pr-33614.yml
deleted file mode 100644
index 39bde171398..00000000000
--- a/html/changelogs/AutoChangeLog-pr-33614.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ninjanomnom"
-delete-after: True
-changes: 
-  - bugfix: "Decals should now rotate the correct way around."