Merge pull request #933 from Zuhayr/tesharifixes

Small mob reagent changes.

code/modules/organs/blood.dm

@@ -1,14 +1,14 @@
 /****************************************************
 				BLOOD SYSTEM
 ****************************************************/
-//Blood levels
-var/const/BLOOD_VOLUME_SAFE = 501
-var/const/BLOOD_VOLUME_OKAY = 336
-var/const/BLOOD_VOLUME_BAD = 224
-var/const/BLOOD_VOLUME_SURVIVE = 122
+//Blood levels. These are percentages based on the species blood_volume far.
+var/const/BLOOD_VOLUME_SAFE =    85
+var/const/BLOOD_VOLUME_OKAY =    75
+var/const/BLOOD_VOLUME_BAD =     60
+var/const/BLOOD_VOLUME_SURVIVE = 40
 
-/mob/living/carbon/human/var/datum/reagents/vessel	//Container for blood and BLOOD ONLY. Do not transfer other chems here.
-/mob/living/carbon/human/var/var/pale = 0			//Should affect how mob sprite is drawn, but currently doesn't.
+/mob/living/carbon/human/var/datum/reagents/vessel // Container for blood and BLOOD ONLY. Do not transfer other chems here.
+/mob/living/carbon/human/var/var/pale = 0          // Should affect how mob sprite is drawn, but currently doesn't.
 
 //Initializes blood vessels
 /mob/living/carbon/human/proc/make_blood()
@@ -16,13 +16,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 	if(vessel)
 		return
 
-	vessel = new/datum/reagents(600)
+	vessel = new/datum/reagents(species.blood_volume)
 	vessel.my_atom = src
 
 	if(!should_have_organ(O_HEART)) //We want the var for safety but we can do without the actual blood.
 		return
 
-	vessel.add_reagent("blood",560)
+	vessel.add_reagent("blood",species.blood_volume)
 	spawn(1)
 		fixblood()
 
@@ -44,10 +44,11 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 	if(stat != DEAD && bodytemperature >= 170)	//Dead or cryosleep people do not pump the blood.
 
-		var/blood_volume = round(vessel.get_reagent_amount("blood"))
+		var/blood_volume_raw = vessel.get_reagent_amount("blood")
+		var/blood_volume = round((blood_volume_raw/species.blood_volume)*100) // Percentage.
 
 		//Blood regeneration if there is some space
-		if(blood_volume < 560 && blood_volume)
+		if(blood_volume_raw < species.blood_volume)
 			var/datum/reagent/blood/B = locate() in vessel.reagent_list //Grab some blood
 			if(B) // Make sure there's some blood at all
 				if(B.data["donor"] != src) //If it's not theirs, then we look for theirs
@@ -75,46 +76,45 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 				blood_volume *= 0.3
 
 		//Effects of bloodloss
-		switch(blood_volume)
-			if(BLOOD_VOLUME_SAFE to 10000)
-				if(pale)
-					pale = 0
-					update_body()
-			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
-				if(!pale)
-					pale = 1
-					update_body()
-					var/word = pick("dizzy","woosey","faint")
-					src << "\red You feel [word]"
-				if(prob(1))
-					var/word = pick("dizzy","woosey","faint")
-					src << "\red You feel [word]"
-				if(oxyloss < 20)
-					oxyloss += 3
-			if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
-				if(!pale)
-					pale = 1
-					update_body()
-				eye_blurry = max(eye_blurry,6)
-				if(oxyloss < 50)
-					oxyloss += 10
-				oxyloss += 1
-				if(prob(15))
-					Paralyse(rand(1,3))
-					var/word = pick("dizzy","woosey","faint")
-					src << "\red You feel extremely [word]"
-			if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
-				oxyloss += 5
-				toxloss += 3
-				if(prob(15))
-					var/word = pick("dizzy","woosey","faint")
-					src << "\red You feel extremely [word]"
-			if(0 to BLOOD_VOLUME_SURVIVE)
-				// There currently is a strange bug here. If the mob is not below -100 health
-				// when death() is called, apparently they will be just fine, and this way it'll
-				// spam deathgasp. Adjusting toxloss ensures the mob will stay dead.
-				toxloss += 300 // just to be safe!
-				death()
+		if(blood_volume >= BLOOD_VOLUME_SAFE)
+			if(pale)
+				pale = 0
+				update_body()
+		else if(blood_volume >= BLOOD_VOLUME_OKAY)
+			if(!pale)
+				pale = 1
+				update_body()
+				var/word = pick("dizzy","woosey","faint")
+				src << "\red You feel [word]"
+			if(prob(1))
+				var/word = pick("dizzy","woosey","faint")
+				src << "\red You feel [word]"
+			if(oxyloss < 20)
+				oxyloss += 3
+		else if(blood_volume >= BLOOD_VOLUME_BAD)
+			if(!pale)
+				pale = 1
+				update_body()
+			eye_blurry = max(eye_blurry,6)
+			if(oxyloss < 50)
+				oxyloss += 10
+			oxyloss += 1
+			if(prob(15))
+				Paralyse(rand(1,3))
+				var/word = pick("dizzy","woosey","faint")
+				src << "\red You feel extremely [word]"
+		else if(blood_volume >= BLOOD_VOLUME_SURVIVE)
+			oxyloss += 5
+			toxloss += 3
+			if(prob(15))
+				var/word = pick("dizzy","woosey","faint")
+				src << "\red You feel extremely [word]"
+		else
+			// There currently is a strange bug here. If the mob is not below -100 health
+			// when death() is called, apparently they will be just fine, and this way it'll
+			// spam deathgasp. Adjusting toxloss ensures the mob will stay dead.
+			toxloss += 300 // just to be safe!
+			death()
 
 		// Without enough blood you slowly go hungry.
 		if(blood_volume < BLOOD_VOLUME_SAFE)
@@ -205,7 +205,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 	var/list/chems = list()
 	chems = params2list(injected.data["trace_chem"])
 	for(var/C in chems)
-		src.reagents.add_reagent(C, (text2num(chems[C]) / 560) * amount)//adds trace chemicals to owner's blood
+		src.reagents.add_reagent(C, (text2num(chems[C]) / species.blood_volume) * amount)//adds trace chemicals to owner's blood
 	reagents.update_total()
 
 //Transfers blood from reagents to vessel, respecting blood types compatability.

code/modules/organs/organ.dm

@@ -117,7 +117,7 @@ var/list/organ_cache = list()
 		if(germ_level >= INFECTION_LEVEL_THREE)
 			die()
 
-	else if(owner.bodytemperature >= 170)	//cryo stops germs from moving and doing their bad stuffs
+	else if(owner && owner.bodytemperature >= 170)	//cryo stops germs from moving and doing their bad stuffs
 		//** Handle antibiotics and curing infections
 		handle_antibiotics()
 		handle_rejection()