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

Fixes apply_damage ignoring species mods

Browse Source 
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
This commit is contained in:
mwerezak
2014-06-17 00:45:05 -04:00
parent 274b03b083
commit 72377d160f
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,36 @@
heal_overall_damage(0, -amount) heal_overall_damage(0, -amount)
hud_updateflag |= 1 << HEALTH_HUD hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
if(species && species.brute_mod)
amount = amount*species.brute_mod
if (organ_name in organs_by_name)
var/datum/organ/external/O = get_organ(organ_name)
if(amount > 0)
O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
else
//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
O.heal_damage(-amount, 0, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
if(species && species.burn_mod)
amount = amount*species.burn_mod
if (organ_name in organs_by_name)
var/datum/organ/external/O = get_organ(organ_name)
if(amount > 0)
O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
else
//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
O.heal_damage(0, -amount, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/Stun(amount) /mob/living/carbon/human/Stun(amount)
if(HULK in mutations) return if(HULK in mutations) return
..() ..()
@@ -250,10 +280,14 @@ This function restores all organs.
switch(damagetype) switch(damagetype)
if(BRUTE) if(BRUTE)
damageoverlaytemp = 20 damageoverlaytemp = 20
if(species && species.brute_mod)
damage = damage*species.brute_mod
if(organ.take_damage(damage, 0, sharp, edge, used_weapon)) if(organ.take_damage(damage, 0, sharp, edge, used_weapon))
UpdateDamageIcon() UpdateDamageIcon()
if(BURN) if(BURN)
damageoverlaytemp = 20 damageoverlaytemp = 20
if(species && species.burn_mod)
damage = damage*species.burn_mod
if(organ.take_damage(0, damage, sharp, edge, used_weapon)) if(organ.take_damage(0, damage, sharp, edge, used_weapon))
UpdateDamageIcon() UpdateDamageIcon()