diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8fa19821cc6..3eacc549267 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 9bdb873e34b..0deb593c846 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/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("[user] begins to dislocate [src]'s [organ.joint]!") if(do_after(user, 100)) - organ.dislocate() + organ.dislocate(1) src.visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") return 1 return 0