diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm index 62cdd5bf48a..6273273c98d 100644 --- a/code/game/gamemodes/cult/construct_spells.dm +++ b/code/game/gamemodes/cult/construct_spells.dm @@ -472,7 +472,7 @@ var/mob/living/carbon/human/H = owner if(!H.should_have_organ(O_HEART)) return 1 - if(H.vessel.remove_reagent("blood", amount)) + if(H.remove_blood(amount)) return 1 return 0 @@ -673,4 +673,4 @@ else user.visible_message("\The [user] lowers its fist.") return - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index cc61ca0bd69..6ec2f0ae81e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1261,7 +1261,7 @@ vessel.maximum_volume = species.blood_volume vessel.add_reagent("blood", species.blood_volume - vessel.total_volume) else if(vessel.total_volume > species.blood_volume) - vessel.remove_reagent("blood", vessel.total_volume - species.blood_volume) + vessel.remove_reagent("blood",vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart vessel.maximum_volume = species.blood_volume fixblood() species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup. @@ -1731,7 +1731,7 @@ if(blood_volume < species?.blood_volume*species?.blood_level_fatal) bloodtrail = 0 //Most of it's gone already, just leave it be else - vessel.remove_reagent("blood", 1) + remove_blood(1) if(bloodtrail) if(istype(loc, /turf/simulated)) var/turf/T = loc diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm index d206cb5820f..0b1c99d64b2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -183,7 +183,7 @@ if(!docile && ishuman(host) && chemicals < max_chemicals) var/mob/living/carbon/human/H = host - H.vessel.remove_reagent("blood", 1) + H.remove_blood(1) if(!H.reagents.has_reagent("inaprovaline")) H.reagents.add_reagent("inaprovaline", 1) chemicals += 2 diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 071bb05e913..b264c1eb952 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -260,7 +260,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 return null . = ..() - vessel.remove_reagent("blood",amount) // Removes blood if human + remove_blood(amount) // Removes blood if human //Transfers blood from container ot vessels /mob/living/carbon/proc/inject_blood(var/datum/reagent/blood/injected, var/amount) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 0c85e2aa276..b22ee48e988 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -750,7 +750,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(!(W.can_autoheal() || (bicardose && inaprovaline) || myeldose)) //bicaridine and inaprovaline stop internal wounds from growing bigger with time, unless it is so small that it is already healing W.open_wound(0.1 * wound_update_accuracy) - owner.vessel.remove_reagent("blood", wound_update_accuracy * W.damage/40) //line should possibly be moved to handle_blood, so all the bleeding stuff is in one place. + owner.remove_blood( wound_update_accuracy * W.damage/40) //line should possibly be moved to handle_blood, so all the bleeding stuff is in one place. if(prob(1 * wound_update_accuracy)) owner.custom_pain("You feel a stabbing pain in your [name]!", 50) diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm index 29cabc5b2a3..757f02889a8 100644 --- a/code/modules/xenoarcheaology/effects/vampire.dm +++ b/code/modules/xenoarcheaology/effects/vampire.dm @@ -27,7 +27,7 @@ B.target_turf = pick(RANGE_TURFS(1, holder)) B.blood_DNA = list() B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type - M.vessel.remove_reagent("blood",rand(10,30)) + M.remove_blood(rand(10,30)) /datum/artifact_effect/vampire/DoEffectTouch(var/mob/user) bloodcall(user) diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index e7c66148d54..af22d90dbf7 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -134,7 +134,7 @@ B.target_turf = pick(range(1, src)) B.blood_DNA = list() B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type - M.vessel.remove_reagent("blood",rand(25,50)) + M.remove_blood(rand(25,50)) //animated blood 2 SPOOKY /obj/effect/decal/cleanable/blood/splatter/animated