Merge pull request #9333 from comma/dev

Fixes dislocation not being set properly on an actual targeted limb.

code/modules/mob/living/carbon/human/human.dm

@@ -1321,7 +1321,6 @@
 	var/mob/S = src
 	var/mob/U = usr
 	var/self = null
-
 	if(S == U)
 		self = 1 // Removing object from yourself.
 
@@ -1330,8 +1329,7 @@
 		var/obj/item/organ/external/current_limb = organs_by_name[limb]
 		if(current_limb && current_limb.dislocated == 2)
 			limbs |= limb
-
-	var/choice = input(src,"Which joint do you wish to relocate?") as null|anything in limbs
+	var/choice = input(usr,"Which joint do you wish to relocate?") as null|anything in limbs
 
 	if(!choice)
 		return

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -300,7 +300,7 @@
 	var/dislocation_str
 	if(prob(W.force))
 		dislocation_str = "[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!"
-		organ.dislocate()
+		organ.dislocate(1)
 	return dislocation_str
 
 //Used to attack a joint through grabbing
@@ -324,7 +324,7 @@
 
 	user.visible_message("<span class='warning'>[user] begins to dislocate [src]'s [organ.joint]!</span>")
 	if(do_after(user, 100))
-		organ.dislocate()
+		organ.dislocate(1)
 		src.visible_message("<span class='danger'>[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!</span>")
 		return 1
 	return 0

code/modules/surgery/implant.dm

@@ -16,9 +16,9 @@
 		switch (affected.name)
 			if ("head")
 				return 1
-			if ("chest")
+			if ("upper body")
 				return 3
-			if ("groin")
+			if ("lower body")
 				return 2
 		return 0
 
@@ -26,9 +26,9 @@
 		switch (affected.name)
 			if ("head")
 				return "cranial"
-			if ("chest")
+			if ("upper body")
 				return "thoracic"
-			if ("groin")
+			if ("lower body")
 				return "abdominal"
 		return ""