From 71825d2c0d05bb7a536eea4f4b057df2645be710 Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Tue, 6 Feb 2018 06:37:35 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 50 +++++++---------------
 html/changelogs/.all_changelog.yml         |  6 +++
 html/changelogs/AutoChangeLog-pr-35284.yml |  4 --
 html/changelogs/AutoChangeLog-pr-35324.yml |  4 --
 html/changelogs/AutoChangeLog-pr-35341.yml |  4 --
 5 files changed, 21 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-35284.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-35324.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-35341.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2f3a72808ad..d0be923a76b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">06 February 2018</h2>
+			<h3 class="author">Dax Dupont updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">AIs can no longer turn on broken APCs,</li>
+			</ul>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Defibrillator mounts no longer spam the error log while empty.</li>
+				<li class="bugfix">The various ships in the caravan ambush space ruin can now fly again.</li>
+			</ul>
+
 			<h2 class="date">05 February 2018</h2>
 			<h3 class="author">Dax Dupont updated:</h3>
 			<ul class="changes bgimages16">
@@ -689,6 +700,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Changeling clothing can get bloodied again.</li>
 			</ul>
+			<h3 class="author">the hatchet man (i eat garbage code) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">you shitlords picked the wrong virtual anime tits to fuck so im takin away your space bases experimental: lets be fair all you guys did in those was jack off to hentai, and not real man's gachimuchi</li>
+			</ul>
 
 			<h2 class="date">22 January 2018</h2>
 			<h3 class="author">DaedalusGame updated:</h3>
@@ -1960,41 +1975,6 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">The drone dispenser on Metastation has been moved to the maintenance by Robotics.</li>
 			</ul>
-
-			<h2 class="date">05 December 2017</h2>
-			<h3 class="author">Cyberboss updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="sounddel">Reduced the volume of showers</li>
-			</ul>
-			<h3 class="author">Dax Dupont updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Nanotrasen is happy to announce the pinnacle in plasma research! The Disco Inferno shuttle design is the result of decades of plasma research. Burn, baby, burn!</li>
-			</ul>
-			<h3 class="author">MrPerson & ninjanomnom updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="refactor">Completely changed how keyboard input is read.</li>
-				<li class="rscadd">Holding two directions at the same time will now move you diagonally. This works with the arrow keys, wasd, and the numpad.</li>
-				<li class="tweak">Moving diagonally takes twice as long as moving a cardinal direction.</li>
-				<li class="bugfix">You can use control to turn using wasd and the numpad instead of just the arrow keys.</li>
-				<li class="rscdel">Some old non-hotkey mode behaviors, especially in relation to chatbox interaction, can't be kept with the new system. Of key note: You can't type while walking. This is due to limitations of byond and the work necessary to overcome it is better done as another overhaul allowing custom controls.</li>
-			</ul>
-			<h3 class="author">Robustin updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscdel">Reverted changes in 3d sound system that tripled the distance that sound would carry.</li>
-			</ul>
-			<h3 class="author">SpaceManiac updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="spellcheck">Energy values are now measured in joules. What was previously 1 unit is now 1 kJ.</li>
-				<li class="bugfix">Syndicate uplink implants now work again.</li>
-			</ul>
-			<h3 class="author">Xhuis updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Stethoscopes now inform the user if the target can be defibrillated; the user will hear a "faint, fluttery pulse."</li>
-			</ul>
-			<h3 class="author">coiax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Quiet areas of libraries on station have now been equipped with a vending machine containing suitable recreational activities.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1c34591393c..7bf023422ad 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15694,3 +15694,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Slime scanning now has a more readable output, especially when scanning
       multiple slimes at once
   - tweak: Eggs from the abductor egg gland now have a random reagent instead of acid
+2018-02-06:
+  Dax Dupont:
+  - bugfix: AIs can no longer turn on broken APCs,
+  SpaceManiac:
+  - bugfix: Defibrillator mounts no longer spam the error log while empty.
+  - bugfix: The various ships in the caravan ambush space ruin can now fly again.
diff --git a/html/changelogs/AutoChangeLog-pr-35284.yml b/html/changelogs/AutoChangeLog-pr-35284.yml
deleted file mode 100644
index fa006b4ee14..00000000000
--- a/html/changelogs/AutoChangeLog-pr-35284.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Dax Dupont"
-delete-after: True
-changes: 
-  - bugfix: "AIs can no longer turn on broken APCs,"
diff --git a/html/changelogs/AutoChangeLog-pr-35324.yml b/html/changelogs/AutoChangeLog-pr-35324.yml
deleted file mode 100644
index cb57e5d3904..00000000000
--- a/html/changelogs/AutoChangeLog-pr-35324.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "Defibrillator mounts no longer spam the error log while empty."
diff --git a/html/changelogs/AutoChangeLog-pr-35341.yml b/html/changelogs/AutoChangeLog-pr-35341.yml
deleted file mode 100644
index b10c3bfde0c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-35341.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "The various ships in the caravan ambush space ruin can now fly again."