From 3a953d895ff7ce4d312dd7d14fc98041e5940c65 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 22 Jul 2016 04:19:49 +0100 Subject: [PATCH] Fixes undislocation --- code/modules/mob/living/carbon/human/human.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ccf700a278..c1926cb71a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1328,13 +1328,11 @@ var/obj/item/organ/external/current_limb = organs_by_name[limb] if(current_limb && current_limb.dislocated > 0 && !current_limb.is_parent_dislocated()) //if the parent is also dislocated you will have to relocate that first limbs |= current_limb - var/choice = input(usr,"Which joint do you wish to relocate?") as null|anything in limbs + var/obj/item/organ/external/current_limb = input(usr,"Which joint do you wish to relocate?") as null|anything in limbs - if(!choice) + if(!current_limb) return - var/obj/item/organ/external/current_limb = organs_by_name[choice] - if(self) src << "You brace yourself to relocate your [current_limb.joint]..." else @@ -1342,7 +1340,7 @@ if(!do_after(U, 30)) return - if(!choice || !current_limb || !S || !U) + if(!current_limb || !S || !U) return if(self)