Limb overhaul first comit

This commit is contained in:
ZomgPonies
2015-03-24 08:38:33 -04:00
parent 84752bc5ed
commit 6770819ae8
5 changed files with 36 additions and 25 deletions
@@ -6,9 +6,11 @@
return
var/total_burn = 0
var/total_brute = 0
limbpain = 0
for(var/datum/organ/external/O in organs) //hardcoded to streamline things a bit
total_brute += O.brute_dam
total_burn += O.burn_dam
if(O.vital)
total_brute += O.brute_dam
total_burn += O.burn_dam
health = 100 - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
//TODO: fix husking
if( (((100 - total_burn) < config.health_threshold_dead) && stat == DEAD) && (!species.flags & IS_SYNTHETIC))//100 only being used as the magic human max health number, feel free to change it if you add a var for it -- Urist
@@ -49,20 +51,21 @@
/mob/living/carbon/human/getBruteLoss()
var/amount = 0
for(var/datum/organ/external/O in organs)
amount += O.brute_dam
if(O.vital)
amount += O.brute_dam
return amount
/mob/living/carbon/human/getFireLoss()
var/amount = 0
for(var/datum/organ/external/O in organs)
amount += O.burn_dam
if(O.vital)
amount += O.burn_dam
return amount
/mob/living/carbon/human/adjustBruteLoss(var/amount)
if(species && species.brute_mod)
amount = amount*species.brute_mod
if(amount > 0)
take_overall_damage(amount, 0)
else
@@ -72,7 +75,6 @@
/mob/living/carbon/human/adjustFireLoss(var/amount)
if(species && species.burn_mod)
amount = amount*species.burn_mod
if(amount > 0)
take_overall_damage(0, amount)
else
@@ -79,5 +79,7 @@
var/frozen = 0 //used for preventing attacks on admin-frozen people
var/limbpain = 0
fire_dmi = 'icons/mob/OnFire.dmi'
fire_sprite = "Standing"