Merge pull request #14685 from Arturlang/fake_blood

Reworks blood regeneration into something a bit more tame

code/modules/antagonists/abductor/equipment/glands/heal.dm

@@ -144,7 +144,7 @@
 	owner.Stun(15)
 	owner.adjustToxLoss(-15, TRUE, TRUE)
 
-	owner.blood_volume = min(BLOOD_VOLUME_NORMAL, owner.blood_volume + 20)
+	owner.adjust_integration_blood(20)
 	if(owner.blood_volume < BLOOD_VOLUME_NORMAL)
 		keep_going = TRUE
 

code/modules/antagonists/bloodsucker/bloodsucker_life.dm

@@ -89,6 +89,7 @@
 	owner.current.adjustStaminaLoss(-1.5 + (actual_regen * -7) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more.
 	owner.current.adjustCloneLoss(-0.1 * (actual_regen * 2) * mult, 0)
 	owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (actual_regen * 4) * mult)
+	owner.current.integrating_blood = 0
 	// No Bleeding
 	/*if(ishuman(owner.current)) //NOTE Current bleeding is horrible, not to count the amount of blood ballistics delete.
 		var/mob/living/carbon/human/H = owner.current

code/modules/antagonists/cult/blood_magic.dm

@@ -687,10 +687,10 @@
 				if(H.stat == DEAD)
 					to_chat(user,"<span class='warning'>Only a revive rune can bring back the dead!</span>")
 					return
-				if(H.blood_volume < (BLOOD_VOLUME_SAFE*H.blood_ratio))
+				if(H.functional_blood() < (BLOOD_VOLUME_SAFE*H.blood_ratio))
 					var/restore_blood = (BLOOD_VOLUME_SAFE*H.blood_ratio) - H.blood_volume
-					if(uses*2 < restore_blood)
-						H.blood_volume += uses*2
+					if(uses * 2 < restore_blood)
+						H.adjust_integration_blood(uses * 2)
 						to_chat(user,"<span class='danger'>You use the last of your blood rites to restore what blood you could!</span>")
 						uses = 0
 						return ..()

code/modules/antagonists/cult/cult_structures.dm

@@ -219,7 +219,7 @@
 					if(M.health < M.maxHealth)
 						M.adjustHealth(-3)
 			if(ishuman(L) && L.blood_volume < (BLOOD_VOLUME_NORMAL * L.blood_ratio))
-				L.blood_volume += 1.0
+				L.adjust_integration_blood(1.0)
 		CHECK_TICK
 
 

code/modules/antagonists/eldritch_cult/eldritch_magic.dm

@@ -147,7 +147,7 @@
 
 		carbon_target.blood_volume -= 20
 		if(carbon_user.blood_volume < BLOOD_VOLUME_MAXIMUM) //we dont want to explode after all
-			carbon_user.blood_volume += 20
+			carbon_user.adjust_integration_blood(20)
 		return
 
 /obj/effect/proc_holder/spell/pointed/blood_siphon/can_target(atom/target, mob/user, silent)