From 7090a6880fe49c44d8b0dcda62239c0ebcbf88fe Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Thu, 30 Mar 2017 17:37:47 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 5 +++++
 html/changelogs/.all_changelog.yml        | 4 ++++
 html/changelogs/AutoChangeLog-pr-6970.yml | 5 -----
 3 files changed, 9 insertions(+), 5 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6970.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6262f14c776..440e8b7166a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -68,6 +68,11 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">You can now slam drinks/bottles/flasks by click-dragging them onto yourself while it's in your active hand.</li>
 			</ul>
+			<h3 class="author">uraniummeltdown updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Emagging a closed firelock does not permanently break it anymore, only opens it.</li>
+				<li class="bugfix">Emagged windoors should be able to be screwdriver+crowbar'd again.</li>
+			</ul>
 
 			<h2 class="date">29 March 2017</h2>
 			<h3 class="author">Purpose2 updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ca8584c734c..0ecf1c23e1b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4350,3 +4350,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   KasparoVy:
   - rscadd: You can now slam drinks/bottles/flasks by click-dragging them onto yourself
       while it's in your active hand.
+  uraniummeltdown:
+  - bugfix: Emagging a closed firelock does not permanently break it anymore, only
+      opens it.
+  - bugfix: Emagged windoors should be able to be screwdriver+crowbar'd again.
diff --git a/html/changelogs/AutoChangeLog-pr-6970.yml b/html/changelogs/AutoChangeLog-pr-6970.yml
deleted file mode 100644
index 2e33dde276d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6970.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "uraniummeltdown"
-delete-after: True
-changes: 
-  - bugfix: "Emagging a closed firelock does not permanently break it anymore, only opens it."
-  - bugfix: "Emagged windoors should be able to be screwdriver+crowbar'd again."