From 85c4bcc22f9d7a392dbd8f93ff3b9481ce701c1c Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Sat, 4 Feb 2017 09:52:59 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 21 +++++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 19 +++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-23502.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-23565.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-23625.yml | 15 ---------------
 html/changelogs/AutoChangeLog-pr-23635.yml |  4 ----
 6 files changed, 40 insertions(+), 27 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-23502.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-23565.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-23625.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-23635.yml

diff --git a/html/changelog.html b/html/changelog.html
index a278c19e6af..f7ba6261c76 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,6 +60,12 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Modular computers now explode properly</li>
 				<li class="bugfix">Emagged holograms can no longer be exported for credits</li>
+				<li class="bugfix">Abstract entities no longer feed the singularity</li>
+				<li class="tweak">Machine frames will no longer be anchored when created</li>
+			</ul>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Vanguard now shows you how long you have until it deactivates.</li>
 			</ul>
 			<h3 class="author">Kor updated:</h3>
 			<ul class="changes bgimages16">
@@ -70,6 +76,21 @@
 				<li class="rscadd">[Delta] Removes space money from gold crate replaces with 3 Gold Bars Gold Wrestling belt is still there.</li>
 				<li class="rscadd">[Delta] Removes space money from silver crate replaces with 5 Silver Coins.</li>
 			</ul>
+			<h3 class="author">WhiteHusky updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Fields are supported when printing with a modular computer</li>
+				<li class="rscadd">PRINTER_FONT is now a variable</li>
+				<li class="rscdel">Removed the [logo] tag on Modular computers as the logo no longer exists</li>
+				<li class="tweak">New lines on paper are parsed properly</li>
+				<li class="tweak">[tab] is now four non-breaking spaces on papers</li>
+				<li class="tweak">Papers have an additional proc, reload_fields, to allow fields made programmatically to be used</li>
+				<li class="tweak">stripped_input stripped_multiline_input has a new argument: no_trim</li>
+				<li class="bugfix">Modular computers no longer spew HTML when looking at a file, rather it is unescaped like it should</li>
+				<li class="bugfix">Modular computers no longer show escaped HTML entities when editing</li>
+				<li class="bugfix">Modular computers can now propperly read and write from external media</li>
+				<li class="bugfix">Modular computers' file browser lists files correctly</li>
+				<li class="spellcheck">NTOS File Manager had a spelling mistake; Manage instead of Manager</li>
+			</ul>
 			<h3 class="author">coiax updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Engraved messages can no longer be moved by a gravitational singularity.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c8fa4c935ae..4d66a282e90 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9244,6 +9244,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Cyberboss:
   - bugfix: Modular computers now explode properly
   - bugfix: Emagged holograms can no longer be exported for credits
+  - bugfix: Abstract entities no longer feed the singularity
+  - tweak: Machine frames will no longer be anchored when created
+  Joan:
+  - rscadd: Vanguard now shows you how long you have until it deactivates.
   Kor:
   - rscadd: 'By combing two flashlights and cable coil, you can create a new eye implant:
       flashlight eyes. People with flashlights for eyes can not see, but they will
@@ -9253,6 +9257,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       Gold Wrestling belt is still there.'
   - rscadd: '[Delta] Removes space money from silver crate replaces with 5 Silver
       Coins.'
+  WhiteHusky:
+  - rscadd: Fields are supported when printing with a modular computer
+  - rscadd: PRINTER_FONT is now a variable
+  - rscdel: Removed the [logo] tag on Modular computers as the logo no longer exists
+  - tweak: New lines on paper are parsed properly
+  - tweak: '[tab] is now four non-breaking spaces on papers'
+  - tweak: Papers have an additional proc, reload_fields, to allow fields made programmatically
+      to be used
+  - tweak: 'stripped_input stripped_multiline_input has a new argument: no_trim'
+  - bugfix: Modular computers no longer spew HTML when looking at a file, rather it
+      is unescaped like it should
+  - bugfix: Modular computers no longer show escaped HTML entities when editing
+  - bugfix: Modular computers can now propperly read and write from external media
+  - bugfix: Modular computers' file browser lists files correctly
+  - spellcheck: NTOS File Manager had a spelling mistake; Manage instead of Manager
   coiax:
   - bugfix: Engraved messages can no longer be moved by a gravitational singularity.
   - tweak: The deadchat notification of randomly triggered events now uses the deadsay
diff --git a/html/changelogs/AutoChangeLog-pr-23502.yml b/html/changelogs/AutoChangeLog-pr-23502.yml
deleted file mode 100644
index ebe11709b04..00000000000
--- a/html/changelogs/AutoChangeLog-pr-23502.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cyberboss"
-delete-after: True
-changes: 
-  - bugfix: "Abstract entities no longer feed the singularity"
diff --git a/html/changelogs/AutoChangeLog-pr-23565.yml b/html/changelogs/AutoChangeLog-pr-23565.yml
deleted file mode 100644
index 1920f6a9752..00000000000
--- a/html/changelogs/AutoChangeLog-pr-23565.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cyberboss"
-delete-after: True
-changes: 
-  - tweak: "Machine frames will no longer be anchored when created"
diff --git a/html/changelogs/AutoChangeLog-pr-23625.yml b/html/changelogs/AutoChangeLog-pr-23625.yml
deleted file mode 100644
index 74019c69add..00000000000
--- a/html/changelogs/AutoChangeLog-pr-23625.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-author: "WhiteHusky"
-delete-after: True
-changes: 
-  - rscadd: "Fields are supported when printing with a modular computer"
-  - rscadd: "PRINTER_FONT is now a variable"
-  - rscdel: "Removed the [logo] tag on Modular computers as the logo no longer exists"
-  - tweak: "New lines on paper are parsed properly"
-  - tweak: "[tab] is now four non-breaking spaces on papers"
-  - tweak: "Papers have an additional proc, reload_fields, to allow fields made programmatically to be used"
-  - tweak: "stripped_input stripped_multiline_input has a new argument: no_trim"
-  - bugfix: "Modular computers no longer spew HTML when looking at a file, rather it is unescaped like it should"
-  - bugfix: "Modular computers no longer show escaped HTML entities when editing"
-  - bugfix: "Modular computers can now propperly read and write from external media"
-  - bugfix: "Modular computers' file browser lists files correctly"
-  - spellcheck: "NTOS File Manager had a spelling mistake; Manage instead of Manager"
diff --git a/html/changelogs/AutoChangeLog-pr-23635.yml b/html/changelogs/AutoChangeLog-pr-23635.yml
deleted file mode 100644
index 8d7d1285edf..00000000000
--- a/html/changelogs/AutoChangeLog-pr-23635.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscadd: "Vanguard now shows you how long you have until it deactivates."