From ce101738c09ec918cdc3cdfea964488f88150599 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Sun, 13 Nov 2016 03:30:22 +0000
Subject: [PATCH] Fixes the changelog

---
 html/changelog.html                | 5 +----
 html/changelogs/.all_changelog.yml | 7 +++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 7a6bdf04c32..3fd5085e686 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -74,15 +74,12 @@
 				<li class="tweak">Supply department icons are now brown.</li>
 				<li class="tweak">Chemist icon is now white and red, like the rest of medical.</li>
 				<li class="tweak">Using a roll of tape on a person requires the same level of grip as handcuffs.</li>
+				<li class="tweak">The disclocation chance when using disarm intent with a weapon has had its' formula changed, meaning the threshold for always disclocatiing is now higher, and no longer 15 force. Meaning weapons will dislocate limbs less often and will also do less damage.</li>
 			</ul>
 			<h3 class="author">MagmaRam updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Rates of blood loss now depend on the type of wound inflicted and where the wound is inflicted, as well as the damage.</li>
 			</ul>
-			<h3 class="author">Anewbe updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">The disclocation chance when using disarm intent with a weapon has had its' formula changed, meaning the threshold for always disclocatiing is now higher, and no longer 15 force. Meaning weapons will dislocate limbs less often and will also do less damage.</li>
-			</ul>
 			<h3 class="author">Neerti updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Changes how the grid check event works.  A new machine called the grid checker exists in engineering, near the engineering substation.  The actual event now involves a power spike originating from the engine, which the grid checker will activate upon sensing it, and causing a blackout.  Engineering can restore power faster if they hack the grid checker correctly.  A piece of paper left in the substation has more details.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c63d1e1c5e2..7ce7354f423 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2970,14 +2970,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Supply department icons are now brown.
   - tweak: Chemist icon is now white and red, like the rest of medical.
   - tweak: Using a roll of tape on a person requires the same level of grip as handcuffs.
-  MagmaRam:
-  - tweak: Rates of blood loss now depend on the type of wound inflicted and where
-      the wound is inflicted, as well as the damage.
-  Anewbe:
   - tweak: The disclocation chance when using disarm intent with a weapon has had
       its' formula changed, meaning the threshold for always disclocatiing is now
       higher, and no longer 15 force. Meaning weapons will dislocate limbs less often
       and will also do less damage.
+  MagmaRam:
+  - tweak: Rates of blood loss now depend on the type of wound inflicted and where
+      the wound is inflicted, as well as the damage.
   Neerti:
   - tweak: Changes how the grid check event works.  A new machine called the grid
       checker exists in engineering, near the engineering substation.  The actual