Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix

Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
This commit is contained in:
Aranclanos
2013-12-30 10:23:54 -08:00
8 changed files with 45 additions and 35 deletions
@@ -35,9 +35,24 @@ Bonus
/datum/symptom/damage_converter/proc/Convert(var/mob/living/M)
if(M.getFireLoss() > 0 || M.getBruteLoss() > 0)
var/get_damage = rand(1, 2)
M.adjustFireLoss(-get_damage)
M.adjustBruteLoss(-get_damage)
M.adjustToxLoss(get_damage)
return 1
var/get_damage = rand(1, 2)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/parts = H.get_damaged_organs(1,1) //1,1 because it needs inputs.
for(var/obj/item/organ/limb/L in parts)
L.heal_damage(get_damage, get_damage, 0)
else
if(M.getFireLoss() > 0 || M.getBruteLoss() > 0)
M.adjustFireLoss(-get_damage)
M.adjustBruteLoss(-get_damage)
M.adjustToxLoss(get_damage)
return 1