Merge pull request #12128 from PsiOmegaDelta/dev

Updates changelog.

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">

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.

html/changelogs/AutoChangeLog-pr-12122.yml

@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes: 
-  - bugfix: "Should again be possible to resist out of chairs, beds, and welded lockers."