From abde5f29c09709edfff3645e512ea2b649db2b78 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Fri, 8 Dec 2017 23:18:21 +0200
Subject: [PATCH] Changelogs, 08DEC2017

---
 html/changelog.html                 | 10 ++++++++++
 html/changelogs/.all_changelog.yml  |  6 ++++++
 html/changelogs/lohikar-pipedel.yml |  4 ----
 3 files changed, 16 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/lohikar-pipedel.yml

diff --git a/html/changelog.html b/html/changelog.html
index 839bf38a65f..87ccf6d8983 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">08 December 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="experiment">Made some changes to how the server deletes pipes; explosions will probably be laggier, but there should no longer be crushing lag 5 minutes later.</li>
+			</ul>
+			<h3 class="author">Santa updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Merry Christmas NSS Aurora!</li>
+			</ul>
+
 			<h2 class="date">30 November 2017</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cbda95e337a..176c82d2a6c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4842,3 +4842,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Tesla's Engine APC is no longer affected by power down even
   - tweak: Tesla coils and grounding rods can now be fully constructed from machine
       assembly
+2017-12-08:
+  Lohikar:
+  - experiment: Made some changes to how the server deletes pipes; explosions will
+      probably be laggier, but there should no longer be crushing lag 5 minutes later.
+  Santa:
+  - rscadd: Merry Christmas NSS Aurora!
diff --git a/html/changelogs/lohikar-pipedel.yml b/html/changelogs/lohikar-pipedel.yml
deleted file mode 100644
index e2d277a783e..00000000000
--- a/html/changelogs/lohikar-pipedel.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Lohikar
-delete-after: True
-changes: 
-  - experiment: "Made some changes to how the server deletes pipes; explosions will probably be laggier, but there should no longer be crushing lag 5 minutes later."