cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes synthflesh not causing toxin damage on healing brute/burn. [MDB IGNORE] (#24824)

Browse Source 
* Fixes synthflesh not causing toxin damage on healing brute/burn. (#79534)

## About The Pull Request

does what it says on the tin - after the refactor of damage application,
it was going with the minimum value of brute or burn loss vs. the amount
healed, so in fact you could get toxin healing from synthflesh.

## Why It's Good For The Game

synth could probably use some tweaks but this just takes it back to what
it was supposed to do before, it should have a tradeoff of some sort

* Fixes synthflesh not causing toxin damage on healing brute/burn.

---------

Co-authored-by: Higgin <cdonny11@yahoo.com>
This commit is contained in:
SkyratBot
2023-11-06 21:20:52 -05:00
committed by GitHub
co-authored by Higgin
parent 33bb6decb2
commit da579e8919
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+5 -3
View File
@@ -502,13 +502,15 @@
show_message = 0
if(!(methods & (PATCH|TOUCH|VAPOR)))
return
var/harmies = min(carbies.getBruteLoss(), carbies.adjustBruteLoss(-1.25 * reac_volume, updating_health = FALSE, required_bodytype = affected_bodytype)*-1)
var/burnies = min(carbies.getFireLoss(), carbies.adjustFireLoss(-1.25 * reac_volume, updating_health = FALSE, required_bodytype = affected_bodytype)*-1)
var/current_bruteloss = carbies.getBruteLoss() // because this will be changed after calling adjustBruteLoss()
var/current_fireloss = carbies.getFireLoss() // because this will be changed after calling adjustFireLoss()
var/harmies = clamp(carbies.adjustBruteLoss(-1.25 * reac_volume, updating_health = FALSE, required_bodytype = affected_bodytype), 0, current_bruteloss)
var/burnies = clamp(carbies.adjustFireLoss(-1.25 * reac_volume, updating_health = FALSE, required_bodytype = affected_bodytype), 0, current_fireloss)
for(var/i in carbies.all_wounds)
var/datum/wound/iter_wound = i
iter_wound.on_synthflesh(reac_volume)
var/need_mob_update = harmies + burnies
need_mob_update += carbies.adjustToxLoss((harmies+burnies)*(0.5 + (0.25*(1-creation_purity))), updating_health = FALSE, required_biotype = affected_biotype) //0.5 - 0.75
need_mob_update = carbies.adjustToxLoss((harmies + burnies)*(0.5 + (0.25*(1-creation_purity))), updating_health = FALSE, required_biotype = affected_biotype) || need_mob_update //0.5 - 0.75
if(need_mob_update)
carbies.updatehealth()