Merge pull request #1627 from Screemonster/chimeratweaks

chimera bugfixes and tweaks

code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm

@@ -17,13 +17,13 @@
 			return
 
 		if(C.stat == DEAD) //Uh oh, you died!
-			if(C.reagents.has_reagent("nutriment")) //Let's hope you have nutriment in you.... If not
+			if(C.hasnutriment()) //Let's hope you have nutriment in you.... If not
 				var/time = (500+1/((nutrition_used/100+1)/1300))
 				C.weakened = 10000 //Since it takes 1 tick to lose one weaken. Due to prior rounding errors, you'd sometimes unweaken before regenning. This fixes that.
 				C.reviving = 1
 				C.canmove = 0 //Make them unable to move. In case they somehow get up before the delay.
 				C << "You begin to reconstruct your form. You will not be able to move during this time. It should take aproximately [round(time)] seconds."
-				C.in_stasis = 1
+				C.does_not_breathe = 1 //effectively makes them spaceworthy while regenning
 
 				spawn(time SECONDS)
 					if(C) //Runtime prevention.
@@ -42,7 +42,7 @@
 			C.reviving = 1
 			C.canmove = 0 //Make them unable to move. In case they somehow get up before the delay.
 			C << "You begin to reconstruct your form. You will not be able to move during this time. It should take aproximately [round(time)] seconds."
-			C.in_stasis = 1
+			C.does_not_breathe = 1 //effectively makes them spaceworthy while regenning
 
 			spawn(time SECONDS)
 				if(C.stat != DEAD) //If they're still alive after regenning.
@@ -50,11 +50,12 @@
 					C.verbs += /mob/living/carbon/human/proc/hatch
 					return
 				else if(C.stat == DEAD)
-					if(C.reagents.has_reagent("nutriment")) //Let's hope you have nutriment in you.... If not
+					if(C.hasnutriment()) //Let's hope you have nutriment in you.... If not
 						C << "<span class='notice'>Consciousness begins to stir as your new body awakens, ready to hatch..</span>"
 						C.verbs += /mob/living/carbon/human/proc/hatch
 					else //Dead until nutrition injected.
 						C << "Your body was unable to regenerate, what few living cells remain require additional nutrients to complete the process."
+						C.reviving = 0 // so they can try again when they're given a kickstart
 						return
 				else
 					return //Something went wrong
@@ -63,6 +64,14 @@
 
 
 
+/mob/living/carbon/human/proc/hasnutriment()
+	if (src.bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
+		return 1
+	else if (src.ingested.has_reagent("nutriment", 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
+		return 1
+	else return 0
+
+
 /mob/living/carbon/human/proc/hatch()
 	set name = "Hatch"
 	set category = "Abilities"
@@ -85,7 +94,7 @@
 					var/T = get_turf(src)
 					new /obj/effect/gibspawner/human/scree(T)
 					var/braindamage = C.brainloss/2 //If you have 100 brainloss, it gives you 50.
-					C.in_stasis = 0
+					C.does_not_breathe = 0 //start breathing again
 					C.revive() // I did have special snowflake code, but this is easier.
 					C.weakened = 2 //Not going to let you get up immediately. 2 ticks before you get up. Overrides the above 10000 weaken.
 					C.nutrition = old_nutrition
@@ -119,7 +128,7 @@
 				C.drop_from_inventory(W)
 			spawn(3600 SECONDS) //1 hour wait until you can revive again.
 				C.reviving = 0
-			C.in_stasis = 0
+			C.does_not_breathe = 0 //start breathing again
 			C.verbs -= /mob/living/carbon/human/proc/hatch
 			return
 		else

code/modules/mob/living/carbon/human/species/station/station_special_vr.dm

@@ -73,7 +73,7 @@
 				H.feral = min(150-H.nutrition, H.feral+1) //Feralness increases while this hungry, capped at 50-150 depending on hunger.
 
 		// If they're hurt, chance of snapping. Not if they're straight-up KO'd though.
-		if (H.stat == CONSCIOUS && H.traumatic_shock >=36 && H.in_stasis == 0) //30 brute/burn, or 18 halloss.
+		if (H.stat == CONSCIOUS && H.traumatic_shock >=36) //30 brute/burn, or 18 halloss.
 			if (2.5*H.halloss >= H.traumatic_shock) //If the majority of their shock is due to halloss, greater chance of snapping.
 				if(prob(min(10,(0.2 * H.traumatic_shock))))
 					if(H.feral == 0)
@@ -111,6 +111,8 @@
 	if(H.feral > 0) //do the following if feral, otherwise no effects.
 		var/light_amount = H.getlightlevel() //how much light there is in the place
 
+		H.shock_stage = max(H.shock_stage-(H.feral/20), 0) //if they lose enough health to hit softcrit, handle_shock() will keep resetting this. Otherwise, pissed off critters will lose shock faster than they gain it.
+
 		for(var/mob/living/M in viewers(H))
 			if(M != H) // someone in view
 				if(prob(0.5)) // 1 in 200 chance of doing something so as not to interrupt scenes
@@ -160,28 +162,25 @@
 	var/pressure2 = environment.return_pressure()
 	var/adjusted_pressure2 = H.calculate_affecting_pressure(pressure2)
 
-	if(adjusted_pressure2 <= 20 && H.in_stasis == 1) //If they're in a enviroment with no pressure and are in stasis (See: regenerating), don't kill them.
+	if(adjusted_pressure2 <= 20 && H.does_not_breathe) //If they're in a enviroment with no pressure and are not breathing (See: regenerating), don't kill them.
 		//This is just to prevent them from taking damage if they're in stasis.
 
 	else if(adjusted_pressure2 <= 20) //If they're in an enviroment with no pressure and are NOT in stasis, damage them.
 		H.take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure")
 
-	if(H.bodytemperature <= 260 && H.in_stasis == 1) //If they're in stasis, don't give them them the negative cold effects
+	if(H.bodytemperature <= 260 && H.does_not_breathe) //If they're regenerating, don't give them them the negative cold effects
 		//This is just here to prevent them from getting cold effects
 
 	else if(H.bodytemperature <= 260) //If they're not in stasis and are cold. Don't really have to add in an exception to cryo cells, as the effects aren't anything /too/ horrible.
-		var/colddamage = 0
+		var/coldshock = 0
 		if(H.bodytemperature <= 260 && H.bodytemperature >= 200) //Chilly.
-			colddamage = 4 //This will begin to knock them out until they run out of oxygen and suffocate or until someone finds them.
+			coldshock = 4 //This will begin to knock them out until they run out of oxygen and suffocate or until someone finds them.
 			H.eye_blurry = 5 //Blurry vision in the cold.
 		if(H.bodytemperature <= 199 && H.bodytemperature >= 100) //Extremely cold. Even in somewhere like the server room it takes a while for bodytemp to drop this low.
-			colddamage = 8
+			coldshock = 8
 			H.eye_blurry = 5
 		if(H.bodytemperature <= 99) //Insanely cold.
-			colddamage = 20
+			coldshock = 16
 			H.eye_blurry = 5
-		if(H.paralysis) //stops weaken spam from being repeatedly taken over max halloss when already KO'd.
-			H.halloss = min(H.halloss+colddamage, H.species.total_health - 1) //if already stunned, only take them up to the point of restunning
-		else
-			H.halloss += colddamage //Harsh punishment for staying in space, and it'll take them a while to fully thaw out when they get retrieved.
+		H.shock_stage = min(H.shock_stage + coldshock, 160) //cold hurts and gives them pain messages, eventually weakening and paralysing, but doesn't damage or trigger feral.
 		return

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -34,10 +34,12 @@
 				data -= taste
 
 /datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	if(!injectable)
+	/* if(!injectable) vorestation removal
 		M.adjustToxLoss(0.1 * removed)
 		return
-	affect_ingest(M, alien, removed)
+	affect_ingest(M, alien, removed) */
+	if(injectable) //vorestation addition/replacement
+		affect_ingest(M, alien, removed)
 
 /datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	switch(alien)