From c1a5b10c6da973b91c1ffb35b31d12374b1fc4bf Mon Sep 17 00:00:00 2001
From: Jordie0608 <jordie0608@gmail.com>
Date: Tue, 22 Dec 2015 18:36:54 +1100
Subject: [PATCH] changelog

---
 html/changelog.html                        | 32 ++++++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 26 ++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-13813.yml |  4 ---
 html/changelogs/AutoChangeLog-pr-13858.yml |  8 ------
 html/changelogs/AutoChangeLog-pr-13869.yml |  4 ---
 5 files changed, 58 insertions(+), 16 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13813.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13858.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-13869.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0d5a368c21d..45ad67df58b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,38 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">22 December 2015</h2>
+			<h3 class="author">Iamgoofball updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Tesla engine has been added alongside the singularity engine to all maps.</li>
+			</ul>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="wip">Adds three new blob chemicals:</li>
+				<li class="rscadd">Replicating Foam, which is brown, does brute damage, has bonus expansion, and has a chance to expand when damaged.</li>
+				<li class="rscadd">Sporing Pods, which is light orange, does low toxin damage, and has a chance to produce weak spores when expanding or killed.</li>
+				<li class="rscadd">Synchronous Mesh, which is teal, does brute damage and bonus damage for each blob tile near the target, and splits damage taken between nearby blobs.</li>
+				<li class="experiment">Synchronous Mesh blobs take 25% more damage, to compensate for the spread damage.</li>
+			</ul>
+			<h3 class="author">Kor updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Cayenne will no longer be targeted by the syndicate turrets.</li>
+				<li class="tweak">Energy shields now only reflect energy projectiles.</li>
+				<li class="rscadd">Added accelerator sniper rounds to uplink, a weak projectile that ramps up damage the farther it flies.</li>
+			</ul>
+			<h3 class="author">MMMiracles updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Saber magazines have been dropped to 21 per magazine. When asked, Nanotrasens official ballistic department replied "There is indeed such a thing as too much bullet."</li>
+			</ul>
+			<h3 class="author">Xhuis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Stun batons can now be blocked by shields, blocked hits don't deduct charge.</li>
+			</ul>
+			<h3 class="author">xxalpha updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Janitor cyborgs now have a bottle of drying agent.</li>
+			</ul>
+
 			<h2 class="date">21 December 2015</h2>
 			<h3 class="author">AnturK updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3b91d8d4bac..63049f81b10 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3014,3 +3014,29 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       for a special discount.
   The-Albinobigfoot:
   - rscadd: Nuclear Operative families may once again requisition ultra-adhesive footwear.
+2015-12-22:
+  Iamgoofball:
+  - rscadd: Tesla engine has been added alongside the singularity engine to all maps.
+  Joan:
+  - wip: 'Adds three new blob chemicals:'
+  - rscadd: Replicating Foam, which is brown, does brute damage, has bonus expansion,
+      and has a chance to expand when damaged.
+  - rscadd: Sporing Pods, which is light orange, does low toxin damage, and has a
+      chance to produce weak spores when expanding or killed.
+  - rscadd: Synchronous Mesh, which is teal, does brute damage and bonus damage for
+      each blob tile near the target, and splits damage taken between nearby blobs.
+  - experiment: Synchronous Mesh blobs take 25% more damage, to compensate for the
+      spread damage.
+  Kor:
+  - rscadd: Cayenne will no longer be targeted by the syndicate turrets.
+  - tweak: Energy shields now only reflect energy projectiles.
+  - rscadd: Added accelerator sniper rounds to uplink, a weak projectile that ramps
+      up damage the farther it flies.
+  MMMiracles:
+  - bugfix: Saber magazines have been dropped to 21 per magazine. When asked, Nanotrasens
+      official ballistic department replied "There is indeed such a thing as too much
+      bullet."
+  Xhuis:
+  - tweak: Stun batons can now be blocked by shields, blocked hits don't deduct charge.
+  xxalpha:
+  - rscadd: Janitor cyborgs now have a bottle of drying agent.
diff --git a/html/changelogs/AutoChangeLog-pr-13813.yml b/html/changelogs/AutoChangeLog-pr-13813.yml
deleted file mode 100644
index 96e64af3792..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13813.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: MMMiracles
-delete-after: True
-changes: 
-  - bugfix: "Saber magazines have been dropped to 21 per magazine. When asked, Nanotrasens official ballistic department replied \"There is indeed such a thing as too much bullet.\""
diff --git a/html/changelogs/AutoChangeLog-pr-13858.yml b/html/changelogs/AutoChangeLog-pr-13858.yml
deleted file mode 100644
index 6ea0c2a028b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13858.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - wip: "Adds three new blob chemicals:"
-  - rscadd: "Replicating Foam, which is brown, does brute damage, has bonus expansion, and has a chance to expand when damaged."
-  - rscadd: "Sporing Pods, which is light orange, does low toxin damage, and has a chance to produce weak spores when expanding or killed."
-  - rscadd: "Synchronous Mesh, which is teal, does brute damage and bonus damage for each blob tile near the target, and splits damage taken between nearby blobs."
-  - experiment: "Synchronous Mesh blobs take 25% more damage, to compensate for the spread damage."
diff --git a/html/changelogs/AutoChangeLog-pr-13869.yml b/html/changelogs/AutoChangeLog-pr-13869.yml
deleted file mode 100644
index 213d5f3e5a1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-13869.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Kor
-delete-after: True
-changes: 
-  - rscadd: "Cayenne will no longer be targeted by the syndicate turrets."