cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 20:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

MASSIVE Nerf to Everyone, Especially Unathi and Vaurca (#6081)

Browse Source
This commit is contained in:
LordFowl
2019-02-24 06:17:47 -05:00
committed by Werner
parent edd11d37c3
commit 985db7d2ff
2 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,27 +102,27 @@
/mob/living/carbon/human/adjustBruteLoss(var/amount)
amount *= brute_mod
if(amount > 0)
amount *= brute_mod
take_overall_damage(amount, 0)
else
heal_overall_damage(-amount, 0)
BITSET(hud_updateflag, HEALTH_HUD)
/mob/living/carbon/human/adjustFireLoss(var/amount)
amount *= burn_mod
if(amount > 0)
amount *= burn_mod
take_overall_damage(0, amount)
else
heal_overall_damage(0, -amount)
BITSET(hud_updateflag, HEALTH_HUD)
/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
amount *= brute_mod
if (organ_name in organs_by_name)
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
amount *= brute_mod
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.
@@ -131,11 +131,11 @@
BITSET(hud_updateflag, HEALTH_HUD)
/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
amount *= burn_mod
if (organ_name in organs_by_name)
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
amount *= burn_mod
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.
@@ -214,7 +214,9 @@
if(species.flags & NO_BREATHE)
oxyloss = 0
else
amount = amount*species.oxy_mod
if(amount > 0)
amount *= species.oxy_mod
if(getOxyLoss() + amount >= abs(config.health_threshold_crit)) //start taking brain damage if they go into crit from oxyloss
adjustBrainLoss(amount,55) //this brain damage won't be lethal)
..(amount)
@@ -231,12 +233,11 @@
return ..()
/mob/living/carbon/human/adjustToxLoss(var/amount)
if(species && species.toxins_mod)
amount = amount*species.toxins_mod
if(species && species.toxins_mod && amount > 0)
amount *= species.toxins_mod
if(species.flags & NO_POISON)
toxloss = 0
else
amount = amount*species.toxins_mod
..(amount)
/mob/living/carbon/human/setToxLoss(var/amount)
@@ -423,12 +424,14 @@ This function restores all organs.
switch(damagetype)
if(BRUTE)
damageoverlaytemp = 20
damage = damage*species.brute_mod
if(damage > 0)
damage *= species.brute_mod
if(organ.take_damage(damage, 0, sharp, edge, used_weapon))
UpdateDamageIcon()
if(BURN)
damageoverlaytemp = 20
damage = damage*species.burn_mod
if(damage > 0)
damage *= species.burn_mod
if(organ.take_damage(0, damage, sharp, edge, used_weapon))
UpdateDamageIcon()