Merge pull request #173 from CIB/master

Fix stupid bug with trauma/cryo

code/WorkInProgress/virus2/base.dm

@@ -104,7 +104,6 @@
 	if(!M.virus2)
 		M.virus2 = new /datum/disease2/disease
 		M.virus2.makerandom()
-		M.virus2.infectionchance = 1
 
 /proc/infect_mob_random_greater(var/mob/living/carbon/M)
 	if(!M.virus2)
@@ -154,7 +153,7 @@
 			holder.getrandomeffect_lesser()
 		effects += holder
 		uniqueID = rand(0,10000)
-		infectionchance = rand(1,10)
+		infectionchance = rand(4,10)
 		// pick 2 antigens
 		antigen |= text2num(pick(ANTIGENS))
 		antigen |= text2num(pick(ANTIGENS))

code/modules/mob/living/carbon/human/life.dm

@@ -1084,7 +1084,6 @@
 			if(shock_stage == 30) emote("me",1,"is having trouble keeping their eyes open.")
 			eye_blurry = max(2, eye_blurry)
 			stuttering = max(stuttering, 5)
-			bodytemperature = 313.15 // high fever
 		// pain messages
 		if(shock_stage == 10)
 			src << "<font color='red'><b>"+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!")