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

[MIRROR] Fixes some cases of adjusting wound blood flow to use the hlper [MDB IGNORE] (#16051)

Browse Source 
* Fixes some cases of adjusting wound blood flow to use the helper (#69513)

Makes blood flow adjustments use the blood flow adjustment helper.

* Fixes some cases of adjusting wound blood flow to use the hlper

* modular

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
This commit is contained in:
SkyratBot
2022-09-11 23:10:37 -07:00
committed by GitHub
co-authored by MrMelbert John Doe
parent 3e6fc10846
commit 40c6558dd6
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wounds/slash.dm
+1 -1
View File
@@ -224,7 +224,7 @@
if(!lasgun.process_fire(victim, victim, TRUE, null, limb.body_zone))
return
victim.emote("scream")
blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good
adjust_blood_flow(-1 * (damage / (5 * self_penalty_mult))) // 20 / 5 = 4 bloodflow removed, p good
victim.visible_message(span_warning("The cuts on [victim]'s [limb.plaintext_zone] scar over!"))
/// If someone is using either a cautery tool or something with heat to cauterize this cut
code/modules/antagonists/heretic/knowledge/blade_lore.dm
+2 -2
View File
@@ -219,7 +219,7 @@
route = PATH_BLADE
/// The amount of blood flow reduced per level of severity of gained bleeding wounds for Stance of the Torn Champion.
#define BLOOD_FLOW_PER_SEVEIRTY 1
#define BLOOD_FLOW_PER_SEVEIRTY -1
/datum/heretic_knowledge/duel_stance
name = "Stance of the Torn Champion"
@@ -268,7 +268,7 @@
if(gained_wound.blood_flow <= 0)
return
gained_wound.blood_flow -= (gained_wound.severity * BLOOD_FLOW_PER_SEVEIRTY)
gained_wound.adjust_blood_flow(gained_wound.severity * BLOOD_FLOW_PER_SEVEIRTY)
/datum/heretic_knowledge/duel_stance/proc/on_health_update(mob/living/source)
SIGNAL_HANDLER
code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
+4 -2
View File
@@ -102,5 +102,7 @@
if(iter_wound.blood_flow && (iter_wound.blood_flow > bloodiest_wound?.blood_flow))
bloodiest_wound = iter_wound
if(bloodiest_wound)
bloodiest_wound.set_blood_flow(max(0, bloodiest_wound.blood_flow - 0.5))
if(!bloodiest_wound)
return
bloodiest_wound.adjust_blood_flow(-0.5)
modular_skyrat/modules/medical/code/wounds/slash.dm
+1 -1
View File
@@ -225,7 +225,7 @@
if(!lasgun.process_fire(victim, victim, TRUE, null, limb.body_zone))
return
victim.emote("scream")
blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good
adjust_blood_flow(-1 * (damage / (5 * self_penalty_mult))) // 20 / 5 = 4 bloodflow removed, p good
victim.visible_message(span_warning("The cuts on [victim]'s [parse_zone(limb.body_zone)] scar over!"))
/// If someone is using either a cautery tool or something with heat to cauterize this cut