cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

nerfs heart damage (#7201)

Browse Source
This commit is contained in:
tacoguy7765093
2023-11-11 06:25:18 -06:00
committed by GitHub
parent d4ef4d44ac
commit e2d03b23a3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/devices/defib.dm
View File

@@ -346,8 +346,8 @@
blood_volume *= 0.3 blood_volume *= 0.3
else if(heart.is_bruised()) else if(heart.is_bruised())
blood_volume *= 0.7 blood_volume *= 0.7
else if(heart.damage > 1) else if(heart.damage > 5) //CHOMPedit, so ONE heart damage isnt 20% of blood missing, now its 5
blood_volume *= 0.8 blood_volume *= 0.9 //chompedit, 90% instead of 80%
return blood_volume < H.species.blood_volume*H.species.blood_level_fatal return blood_volume < H.species.blood_volume*H.species.blood_level_fatal
/obj/item/weapon/shockpaddles/proc/check_charge(var/charge_amt) /obj/item/weapon/shockpaddles/proc/check_charge(var/charge_amt)

6
code/modules/organs/blood.dm
View File

@@ -94,9 +94,11 @@ var/const/CE_STABLE_THRESHOLD = 0.5
else if(heart.is_bruised()) else if(heart.is_bruised())
blood_volume_raw *= 0.7 blood_volume_raw *= 0.7
blood_volume *= 0.7 blood_volume *= 0.7
else if(heart.damage > 5) //CHOMPedit, //CHOMPedit, so 0.00005 heart damage isnt 20% of blood missing, now its 5
blood_volume_raw *= 0.9 //chompedit from 0.8 to 0.9
blood_volume *= 0.9 //chompedit from 0.8 to 0.9
else if(heart.damage) else if(heart.damage)
blood_volume_raw *= 0.8 return
blood_volume *= 0.8
//Effects of bloodloss //Effects of bloodloss
var/dmg_coef = 1 //Lower means less damage taken var/dmg_coef = 1 //Lower means less damage taken