From cd0dae9b8573c194f65596f43edb79a3e3eeb084 Mon Sep 17 00:00:00 2001
From: Kelenius <kelenius@ya.ru>
Date: Tue, 29 Mar 2016 11:41:37 +0300
Subject: [PATCH] Updates changelog

---
 html/changelog.html                             | 15 +++++++++++++++
 html/changelogs/.all_changelog.yml              | 16 ++++++++++++++++
 html/changelogs/Datraen-AdditionalModes.yml     |  7 -------
 html/changelogs/Datraen-Buckle-ResistFix.yml    |  7 -------
 html/changelogs/Datraen-ManifestTweak.yml       |  6 ------
 html/changelogs/Datraen-MicrowaveRework.yml     |  6 ------
 html/changelogs/Datraen-PBAPCCheck.yml          |  6 ------
 html/changelogs/Datraen-SpawnTurf.yml           |  6 ------
 html/changelogs/datraen-TraitorHackCheckFix.yml |  7 -------
 9 files changed, 31 insertions(+), 45 deletions(-)
 delete mode 100644 html/changelogs/Datraen-AdditionalModes.yml
 delete mode 100644 html/changelogs/Datraen-Buckle-ResistFix.yml
 delete mode 100644 html/changelogs/Datraen-ManifestTweak.yml
 delete mode 100644 html/changelogs/Datraen-MicrowaveRework.yml
 delete mode 100644 html/changelogs/Datraen-PBAPCCheck.yml
 delete mode 100644 html/changelogs/Datraen-SpawnTurf.yml
 delete mode 100644 html/changelogs/datraen-TraitorHackCheckFix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0c56f2860a..d0d79d8f17 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,21 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 March 2016</h2>
+			<h3 class="author">Datraen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added Three New Mixed Gamemodes: Lizard, Changeling + Wizard; Intrigue, Traitors + Ninja; Visitors, Ninja + Wizard.</li>
+				<li class="tweak">Created a variable for latespawning antagonist templates, for customization of autospawning antagonists in mixed game modes.</li>
+				<li class="bugfix">Fixes the buckled check limiting whether or not someone can interact while sitting.</li>
+				<li class="bugfix">Resisting while buckled and cuffed will process the hand and leg cuffs before unbuckling.</li>
+				<li class="tweak">Removed JSON encoding of the PDA Manifest list.</li>
+				<li class="bugfix">Microwaves no longer try cooking their components while cooking.</li>
+				<li class="bugfix">Adds a check to prison breaks that makes sure the APC is on before continuing.</li>
+				<li class="bugfix">Artifacts will no longer spawn on floor turfs.</li>
+				<li class="bugfix">Stops traitorborgs from being able to hack other borgs.</li>
+				<li class="bugfix">Stops traitorAIs from being able to hack unlinked borgs.</li>
+			</ul>
+
 			<h2 class="date">16 March 2016</h2>
 			<h3 class="author">Datraen updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 01df44e3c4..ee6b447e18 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2182,3 +2182,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Harmbaton no longer causes halloss while inactive.
   Kelenius:
   - bugfix: Potassium and nitroglycerin explosive grenades now work.
+2016-03-29:
+  Datraen:
+  - rscadd: 'Added Three New Mixed Gamemodes: Lizard, Changeling + Wizard; Intrigue,
+      Traitors + Ninja; Visitors, Ninja + Wizard.'
+  - tweak: Created a variable for latespawning antagonist templates, for customization
+      of autospawning antagonists in mixed game modes.
+  - bugfix: Fixes the buckled check limiting whether or not someone can interact while
+      sitting.
+  - bugfix: Resisting while buckled and cuffed will process the hand and leg cuffs
+      before unbuckling.
+  - tweak: Removed JSON encoding of the PDA Manifest list.
+  - bugfix: Microwaves no longer try cooking their components while cooking.
+  - bugfix: Adds a check to prison breaks that makes sure the APC is on before continuing.
+  - bugfix: Artifacts will no longer spawn on floor turfs.
+  - bugfix: Stops traitorborgs from being able to hack other borgs.
+  - bugfix: Stops traitorAIs from being able to hack unlinked borgs.
diff --git a/html/changelogs/Datraen-AdditionalModes.yml b/html/changelogs/Datraen-AdditionalModes.yml
deleted file mode 100644
index d9fa39439e..0000000000
--- a/html/changelogs/Datraen-AdditionalModes.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added Three New Mixed Gamemodes: Lizard, Changeling + Wizard; Intrigue, Traitors + Ninja; Visitors, Ninja + Wizard."
-  - tweak: "Created a variable for latespawning antagonist templates, for customization of autospawning antagonists in mixed game modes."
diff --git a/html/changelogs/Datraen-Buckle-ResistFix.yml b/html/changelogs/Datraen-Buckle-ResistFix.yml
deleted file mode 100644
index 9c2566cab0..0000000000
--- a/html/changelogs/Datraen-Buckle-ResistFix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixes the buckled check limiting whether or not someone can interact while sitting."
-  - bugfix: "Resisting while buckled and cuffed will process the hand and leg cuffs before unbuckling."
diff --git a/html/changelogs/Datraen-ManifestTweak.yml b/html/changelogs/Datraen-ManifestTweak.yml
deleted file mode 100644
index 34401ded76..0000000000
--- a/html/changelogs/Datraen-ManifestTweak.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - tweak: "Removed JSON encoding of the PDA Manifest list."
diff --git a/html/changelogs/Datraen-MicrowaveRework.yml b/html/changelogs/Datraen-MicrowaveRework.yml
deleted file mode 100644
index 1859d3c180..0000000000
--- a/html/changelogs/Datraen-MicrowaveRework.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - bugfix: "Microwaves no longer try cooking their components while cooking."
diff --git a/html/changelogs/Datraen-PBAPCCheck.yml b/html/changelogs/Datraen-PBAPCCheck.yml
deleted file mode 100644
index 03e3702eba..0000000000
--- a/html/changelogs/Datraen-PBAPCCheck.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - bugfix: "Adds a check to prison breaks that makes sure the APC is on before continuing."
diff --git a/html/changelogs/Datraen-SpawnTurf.yml b/html/changelogs/Datraen-SpawnTurf.yml
deleted file mode 100644
index ab5d705c17..0000000000
--- a/html/changelogs/Datraen-SpawnTurf.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - bugfix: "Artifacts will no longer spawn on floor turfs."
diff --git a/html/changelogs/datraen-TraitorHackCheckFix.yml b/html/changelogs/datraen-TraitorHackCheckFix.yml
deleted file mode 100644
index 4acd2abee1..0000000000
--- a/html/changelogs/datraen-TraitorHackCheckFix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - bugfix: "Stops traitorborgs from being able to hack other borgs."
-  - bugfix: "Stops traitorAIs from being able to hack unlinked borgs."