cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6728

Browse Source
This commit is contained in:
Zuhayr
2014-10-16 14:02:10 +10:30
parent ff9bd99ee7
commit adb58be3b0
1 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -11,9 +11,9 @@
total_brute += O.brute_dam total_brute += O.brute_dam
total_burn += O.burn_dam total_burn += O.burn_dam
var/oxy_l = (species.flags & NO_BREATHE ? 0 : getOxyLoss()) var/oxy_l = ((species.flags & NO_BREATHE) ? 0 : getOxyLoss())
var/tox_l = (species.flags & NO_POISON ? 0 : getToxLoss()) var/tox_l = ((species.flags & NO_POISON) ? 0 : getToxLoss())
var/clone_l = getCloneLoss() //TODO: link this to NO_SCAN var/clone_l = getCloneLoss()
health = species.total_health - oxy_l - tox_l - clone_l - total_burn - total_brute health = species.total_health - oxy_l - tox_l - clone_l - total_burn - total_brute
@@ -138,10 +138,22 @@
if(HULK in mutations) return if(HULK in mutations) return
..() ..()
/mob/living/carbon/human/getCloneLoss()
if(species.flags & (IS_SYNTHETIC | NO_SCAN))
cloneloss = 0
..()
/mob/living/carbon/human/setCloneLoss(var/amount)
if(species.flags & (IS_SYNTHETIC | NO_SCAN))
cloneloss = 0
else
..()
/mob/living/carbon/human/adjustCloneLoss(var/amount) /mob/living/carbon/human/adjustCloneLoss(var/amount)
..() ..()
if(species.flags & IS_SYNTHETIC) if(species.flags & (IS_SYNTHETIC | NO_SCAN))
cloneloss = 0
return return
var/heal_prob = max(0, 80 - getCloneLoss()) var/heal_prob = max(0, 80 - getCloneLoss())
@@ -172,6 +184,41 @@
src << "<span class = 'notice'>Your [O.display_name] is shaped normally again.</span>" src << "<span class = 'notice'>Your [O.display_name] is shaped normally again.</span>"
hud_updateflag |= 1 << HEALTH_HUD hud_updateflag |= 1 << HEALTH_HUD
// Defined here solely to take species flags into account without having to recast at mob/living level.
/mob/living/carbon/human/getOxyLoss()
if(species.flags & NO_BREATHE)
oxyloss = 0
..()
/mob/living/carbon/human/adjustOxyLoss(var/amount)
if(species.flags & NO_BREATHE)
oxyloss = 0
else
..()
/mob/living/carbon/human/setOxyLoss(var/amount)
if(species.flags & NO_BREATHE)
oxyloss = 0
else
..()
/mob/living/carbon/human/getToxLoss()
if(species.flags & NO_POISON)
toxloss = 0
..()
/mob/living/carbon/human/adjustToxLoss(var/amount)
if(species.flags & NO_POISON)
toxloss = 0
else
..()
/mob/living/carbon/human/setToxLoss(var/amount)
if(species.flags & NO_POISON)
toxloss = 0
else
..()
//////////////////////////////////////////// ////////////////////////////////////////////
//Returns a list of damaged organs //Returns a list of damaged organs