diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index f2b4a1e5881..4637bde1bd2 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -104,7 +104,8 @@ else if (E.is_dislocated()) stance_damage += 0.5 - if(E) limb_pain = E.organ_can_feel_pain() + if(E && (!E.is_usable() || E.is_broken() || E.is_dislocated())) //VOREStation Edit + limb_pain = E.organ_can_feel_pain() // Canes and crutches help you stand (if the latter is ever added) // One cane mitigates a broken leg+foot, or a missing foot. diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index fb9beed574b..9777f197b03 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -53,6 +53,9 @@ var/datum/species/new_copy = new to_copy.type() + for(var/organ in to_copy.has_limbs) + var/list/organ_data = to_copy.has_limbs[organ] + new_copy.has_limbs[organ] = organ_data.Copy() new_copy.traits = traits //If you had traits, apply them