cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

hugbox (#19581)

Browse Source
This commit is contained in:
SapphicOverload
2023-07-10 19:01:51 -04:00
committed by GitHub
parent 905261f2e5
commit da97b44db0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__DEFINES/combat.dm
View File

@@ -254,8 +254,10 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
#define BODY_ZONE_PRECISE_L_FOOT "l_foot"
#define BODY_ZONE_PRECISE_R_FOOT "r_foot"
//We will round to this value in damage calculations.
/// We will round to this value in damage calculations.
#define DAMAGE_PRECISION 0.1
/// Damage transferred to the chest when hitting a limb that has reached the damage cap
#define DAMAGE_TRANSFER_COEFFICIENT 0.33
//bullet_act() return values
/// It's a successful hit, whatever that means in the context of the thing it's hitting.

16
code/modules/surgery/bodyparts/_bodyparts.dm
View File

@@ -293,13 +293,23 @@
//back to our regularly scheduled program, we now actually apply damage if there's room below limb damage cap
var/can_inflict = max_damage - get_damage()
var/total_damage = brute + burn
var/surplus_damage = total_damage - can_inflict
// If the limb is at its maximum damage, apply some of the surplus damage to the chest
if(owner && surplus_damage > 0)
var/obj/item/bodypart/chest/chest = owner.get_bodypart(BODY_ZONE_CHEST)
chest.receive_damage(surplus_damage * DAMAGE_TRANSFER_COEFFICIENT) // the chest should always be there unless something fucked up
// End early if the limb is at its maximum damage
if(can_inflict <= 0)
return FALSE
// Set the damage applied to as much as the limb can handle
if(total_damage > can_inflict && total_damage > 0) // TODO: the second part of this check should be removed once disabling is all done
brute = round(brute * (can_inflict / total_damage),DAMAGE_PRECISION)
burn = round(burn * (can_inflict / total_damage),DAMAGE_PRECISION)
if(can_inflict <= 0)
return FALSE
// And finally, apply that damage to the limb
if(brute)
set_brute_dam(brute_dam + brute)
if(burn)