Merge pull request #5783 from Walter0o/master

fixes nullpointer caused by broken organ list reading
This commit is contained in:
Chinsky
2014-07-27 14:46:31 +04:00
2 changed files with 5 additions and 4 deletions
+3 -3
View File
@@ -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"))