diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 935760efdb1..5a78b702d04 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -552,6 +552,8 @@ ) if(istype(M, /mob/living/carbon/human)) var/datum/organ/internal/eyes/eyes = H.internal_organs_by_name["eyes"] + if(!eyes) + return eyes.damage += rand(3,4) if(eyes.damage >= eyes.min_bruised_damage) if(M.stat != 2) @@ -631,4 +633,3 @@ var/obj/item/I = get_active_hand() if(I && !I.abstract) I.showoff(src) - diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 4ad6e328afa..4ed10047564 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -159,9 +159,9 @@ src.damage += 0.2 * process_accuracy //Damaged one shares the fun else - var/victim = pick(owner.internal_organs) - var/datum/organ/internal/O = owner.internal_organs[victim] - O.damage += 0.2 * process_accuracy + var/datum/organ/internal/O = pick(owner.internal_organs) + if(O) + O.damage += 0.2 * process_accuracy //Detox can heal small amounts of damage if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))