Moves blood regeneration onto the liver for want of a better organ.

dnivji · Feb 6, 2017 · 581d7b1 · 581d7b1
1 parent 3f672bf
commit 581d7b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm
@@ -134,11 +134,3 @@ var/const/BLOOD_VOLUME_SURVIVE = 40
 					owner.drip(blood_max, get_turf(owner))
 		else
 			owner.drip(blood_max)
-
-	//Blood regeneration if there is some space
-	var/blood_volume_raw = owner.vessel.get_reagent_amount("blood")
-	if(blood_volume_raw < species.blood_volume)
-		var/datum/reagent/blood/B = owner.get_blood(owner.vessel)
-		B.volume += 0.1 // regenerate blood VERY slowly
-		if(CE_BLOODRESTORE in owner.chem_effects)
-			B.volume += owner.chem_effects[CE_BLOODRESTORE]
diff --git a/code/modules/organs/internal/liver.dm b/code/modules/organs/internal/liver.dm
@@ -57,8 +57,16 @@
 			else
 				take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * PROCESS_ACCURACY, prob(1)) // Chance to warn them
 
+	//Blood regeneration if there is some space
+	var/blood_volume_raw = owner.vessel.get_reagent_amount("blood")
+	if(blood_volume_raw < species.blood_volume)
+		var/datum/reagent/blood/B = owner.get_blood(owner.vessel)
+		B.volume += 0.1 // regenerate blood VERY slowly
+		if(CE_BLOODRESTORE in owner.chem_effects)
+			B.volume += owner.chem_effects[CE_BLOODRESTORE]
+
 	// Blood loss or liver damage make you lose nutriments
-	var/blood_volume = round((owner.vessel.get_reagent_amount("blood")/species.blood_volume)*100)
+	var/blood_volume = round((blood_volume_raw/species.blood_volume)*100)
 	if(blood_volume < BLOOD_VOLUME_SAFE || is_bruised())
 		if(owner.nutrition >= 300)
 			owner.nutrition -= 10