From 0a8b9f88132bc6022323eb750cb0990b52b33bf3 Mon Sep 17 00:00:00 2001 From: Miniature Date: Fri, 13 Apr 2012 19:34:54 +0930 Subject: [PATCH] Fixed a recursion crash in organs taking damage. --- code/modules/mob/organ/organ.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 164ded1d36f..42e8cc10227 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -82,7 +82,7 @@ del(W) ..() - proc/take_damage(brute, burn, sharp, used_weapon = null) + proc/take_damage(brute, burn, sharp, used_weapon = null, spread=0) if((brute <= 0) && (burn <= 0)) return 0 if(destroyed) @@ -144,11 +144,12 @@ if(!possible_points.len) message_admins("Oh god WHAT! [owner]'s [src] was unable to find an organ to pass overdamage too!") else - var/datum/organ/external/target = pick(possible_points) - if(brute) - target.take_damage(passed_dam, 0, sharp, used_weapon) - else - target.take_damage(0, passed_dam, sharp, used_weapon) + if(!spread) + var/datum/organ/external/target = pick(possible_points) + if(brute) + target.take_damage(passed_dam, 0, sharp, used_weapon,1) + else + target.take_damage(0, passed_dam, sharp, used_weapon,1) else droplimb(1) //Robot limbs just kinda fail at full damage.