Merge branch 'master' of git://github.com/Baystation12/Baystation12

code/modules/clothing/glasses/hud.dm

@@ -51,8 +51,10 @@
 			for(var/datum/disease/D in patient.viruses)
 				if(!D.hidden[SCANNER])
 					foundVirus++
-			if(patient.virus2)
-				foundVirus++
+
+			// jesus fuck, no, don't display vira by just looking at them
+			/*if(patient.virus2)
+				foundVirus++*/
 			C.images += image(tempHud,patient,"hud[RoundHealth(patient.health)]")
 			if(patient.stat == 2)
 				C.images += image(tempHud,patient,"huddead")

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

@@ -992,6 +992,8 @@
 				for(var/datum/disease/D in viruses)
 					D.cure()
 
+			// clean all the symptoms incurred by the virus
+			src.disease_symptoms = 0
 
 			if(!virus2)
 			    // the following is silly since it lets you infect people through glass
@@ -1013,8 +1015,10 @@
 				// check if we're immune
 				if(virus2.antigen & src.antibodies) virus2.dead = 1
 				if(src.get_infection_chance())
-					var/obj/virus/V = new(src.loc)
-					V.disease = src.virus2
+				    // need more pathogens
+					for(var/i=0, i<3, i++)
+						var/obj/virus/V = new(src.loc)
+						V.disease = src.virus2
 
 
 

code/modules/mob/living/say.dm

@@ -132,6 +132,9 @@
 	if (!message)
 		return
 
+	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
+		message_mode = "whisper"
+
 	message = capitalize(message) //capitalize the first letter of what they actually say
 
 	// :downs:

code/modules/mob/say.dm

@@ -54,6 +54,8 @@
 
 /mob/proc/say_quote(var/text)
 	var/ending = copytext(text, length(text))
+	if (src.disease_symptoms & DISEASE_HOARSE)
+		return "rasps, \"[text]\"";
 	if (src.stuttering)
 		return "stammers, \"[text]\"";
 	if (src.slurring)