salglu works like normal now again and adds more sanity

2021-07-29 23:55:27 +03:00
parent 2fec997e1f
commit 6b5bdae184
6 changed files with 43 additions and 33 deletions
@@ -144,7 +144,7 @@
 	owner.Stun(15)
 	owner.adjustToxLoss(-15, TRUE, TRUE)

-	owner.AddIntegrationBlood(min(BLOOD_VOLUME_NORMAL, owner.blood_volume + 20))
+	owner.AddIntegrationBlood(20)
 	if(owner.blood_volume < BLOOD_VOLUME_NORMAL)
 		keep_going = TRUE

@@ -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.AddIntegrationBlood(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 ..()