From 7c750ec08777f27083e9c7efd868a4fd67ded714 Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Sat, 6 Feb 2016 09:56:42 +0100
Subject: [PATCH] Updates changelog.

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

diff --git a/html/changelog.html b/html/changelog.html
index 43a3e63c172..bb967a2c13f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">06 February 2016</h2>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Should again be possible to resist out of chairs, beds, and welded lockers.</li>
+			</ul>
+
 			<h2 class="date">03 February 2016</h2>
 			<h3 class="author">PsiOmegaDelta updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 408247c863f..027d552efb7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2536,3 +2536,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   PsiOmegaDelta:
   - tweak: Antagonist and special role preferences has been overhauled. Please update
       these specific character preferences as they have been reset.
+2016-02-06:
+  PsiOmegaDelta:
+  - bugfix: Should again be possible to resist out of chairs, beds, and welded lockers.
diff --git a/html/changelogs/AutoChangeLog-pr-12122.yml b/html/changelogs/AutoChangeLog-pr-12122.yml
deleted file mode 100644
index 940a3cd2063..00000000000
--- a/html/changelogs/AutoChangeLog-pr-12122.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes: 
-  - bugfix: "Should again be possible to resist out of chairs, beds, and welded lockers."