From 665f467b2f8ddc4e37810307770f1393ab86abd0 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Tue, 19 Jul 2022 20:55:42 -0300 Subject: [PATCH] WOOO please pass your arguments if you want to use them! --- code/modules/mob/living/blood.dm | 10 +++++----- code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/mob/living/carbon/life.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 99bfa7a91d..c287dbc3dd 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -30,7 +30,7 @@ // Takes care blood loss and regeneration -/mob/living/carbon/human/handle_blood() +/mob/living/carbon/human/handle_blood(delta_time, times_fired) if(NOBLOOD in dna.species.species_traits || bleedsuppress || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) return @@ -39,7 +39,7 @@ return if(bodytemperature >= TCRYO && !(HAS_TRAIT(src, TRAIT_HUSK))) //cryosleep or husked people do not pump the blood. - if(dna.species.handle_blood()) // if this returns TRUE, then the species is not handling blood itself and we can control everything + if(dna.species.handle_blood(src, delta_time, times_fired)) // if this returns TRUE, then the species is not handling blood itself and we can control everything if(integrating_blood > 0) var/blood_integrated = max(integrating_blood - 1, 0) var/blood_diff = integrating_blood - blood_integrated @@ -378,10 +378,10 @@ var/mob/living/carbon/human/H = src if (HAS_TRAIT(src, TRAIT_HIGH_BLOOD)) blood_ratio = 1.2 - H.handle_blood() + H.handle_blood(delta_time, times_fired) return blood_ratio = 1 - H.handle_blood() + H.handle_blood(delta_time, times_fired) return blood_ratio = 1 @@ -391,7 +391,7 @@ blood_ratio = value if(ishuman(src)) var/mob/living/carbon/human/H = src - H.handle_blood() + H.handle_blood(delta_time, times_fired) /mob/living/proc/adjust_integration_blood(value, remove_actual_blood, force) if(integrating_blood + value < 0 && remove_actual_blood) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index af49998afe..ddbb23741b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2456,7 +2456,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) //Blood Stuff/// //////////////// // true = handle blood normally, false = do not (and then handle blood in this proc instead please!!) -/datum/species/proc/handle_blood() +/datum/species/proc/handle_blood(mob/living/carbon/human/H, delta_time, times_fired) return TRUE //////////////// diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 27f795015e..9ba2eb6bf7 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -9,7 +9,7 @@ . = FALSE if(!.) return - handle_blood() + handle_blood(delta_time, times_fired) // handle_blood *could* kill us. // we should probably have a better system for if we need to check for death or something in the future hmw if(stat != DEAD) @@ -375,7 +375,7 @@ miasma_turf.air_update_turf() -/mob/living/carbon/proc/handle_blood() +/mob/living/carbon/proc/handle_blood(delta_time, times_fired) return /mob/living/carbon/proc/handle_bodyparts(seconds, times_fired)