Merge pull request #15250 from Runa-Dacino/bloodfix

Fixes human mobs ending up with their blood datums deleted, creates fallback if that still happens
This commit is contained in:
Heroman3003
2023-08-19 08:12:31 +10:00
committed by GitHub
7 changed files with 50 additions and 17 deletions
@@ -1263,7 +1263,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.
@@ -1733,7 +1733,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
@@ -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