Added a new symptom with a high level, so that it's not possible to gain through mutations.

Gave the high level symptoms their own preset diseases and added them to the virus crate, along with a bottle of mutagen.

Several disease fixes, such as disease stages going below 0. Diseases which spread by blood will longer spread when you touch someone (i.e: click on someone)

I also did some cleaning up with comments.

Made handheld radios broadcast if their messages aren't sent on the same level as they're on, meaning that turning off the relay to the station will not make it impossible to communicate with others with radios.

Made some events only effect people on the station Z level.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5192 316c924e-a436-60f5-8080-3fe189b3f50e

code/datums/disease.dm

@@ -63,13 +63,15 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 
 	if(stage > max_stages)
 		stage = max_stages
-	if(stage_prob != 0 && prob(stage_prob) && stage != max_stages && !cure_present) //now the disease shouldn't get back up to stage 4 in no time
+
+	if(stage < max_stages && prob(stage_prob) && !cure_present) //now the disease shouldn't get back up to stage 4 in no time
 		stage++
 		//world << "up"
-	if(cure_present && prob(cure_chance))
+	if(stage > 0 && (cure_present && prob(cure_chance)))
 		stage--
 		//world << "down"
-	else if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
+
+	if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
 //		world << "Cured as stage act"
 		cure()
 		return
@@ -96,6 +98,11 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 
 	return result
 
+/datum/disease/proc/spread_by_touch()
+	switch(spread_type)
+		if(CONTACT_FEET, CONTACT_HANDS, CONTACT_GENERAL)
+			return 1
+	return 0
 
 /datum/disease/proc/spread(var/atom/source=null, var/airborne_range = 2,  var/force_spread)
 	//world << "Disease [src] proc spread was called from holder [source]"

code/datums/diseases/advance/cold.dm

@@ -1,5 +0,0 @@
-/datum/disease/advance/cold/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
-	if(!D)
-		name = "Cold"
-		symptoms = list(new/datum/symptom/sneeze)
-	..(process, D, copy)

code/datums/diseases/advance/flu.dm

@@ -1,5 +0,0 @@
-/datum/disease/advance/flu/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
-	if(!D)
-		name = "Flu"
-		symptoms = list(new/datum/symptom/cough)
-	..(process, D, copy)

code/datums/diseases/advance/presets.dm

@@ -0,0 +1,34 @@
+// Cold
+
+/datum/disease/advance/cold/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Cold"
+		symptoms = list(new/datum/symptom/sneeze)
+	..(process, D, copy)
+
+
+// Flu
+
+/datum/disease/advance/flu/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Flu"
+		symptoms = list(new/datum/symptom/cough)
+	..(process, D, copy)
+
+
+// Voice Changing
+
+/datum/disease/advance/voice_change/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Epiglottis Mutation"
+		symptoms = list(new/datum/symptom/voice_change)
+	..(process, D, copy)
+
+
+// Toxin Filter
+
+/datum/disease/advance/heal/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0)
+	if(!D)
+		name = "Liver Enhancer"
+		symptoms = list(new/datum/symptom/heal)
+	..(process, D, copy)

code/datums/diseases/advance/symptoms/damage_converter.dm

@@ -15,7 +15,7 @@ Bonus
 //////////////////////////////////////
 */
 
-/datum/symptom/damage_converter // Not the egg
+/datum/symptom/damage_converter
 
 	name = "Toxic Compensation"
 	stealth = 1

code/datums/diseases/advance/symptoms/voice_change.dm

@@ -38,9 +38,9 @@ Bonus
 					var/random_name = ""
 					switch(H.gender)
 						if(MALE)
-							random_name = (pick(first_names_male))
+							random_name = pick(first_names_male)
 						else
-							random_name = (pick(first_names_female))
+							random_name = pick(first_names_female)
 					random_name += " [pick(last_names)]"
 					H.SetSpecialVoice(random_name)
 

code/datums/supplypacks.dm

@@ -280,12 +280,13 @@
 	name = "Virus crate"
 	contains = list(/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,
 					/obj/item/weapon/reagent_containers/glass/bottle/cold,
+					/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion,
+					/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion,
 					/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs,
 					/obj/item/weapon/reagent_containers/glass/bottle/magnitis,
-//					/obj/item/weapon/reagent_containers/glass/bottle/wizarditis, worse than GBS if anything
-//					/obj/item/weapon/reagent_containers/glass/bottle/gbs, No. Just no.
 					/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
 					/obj/item/weapon/reagent_containers/glass/bottle/brainrot,
+					/obj/item/weapon/reagent_containers/glass/bottle/mutagen,
 					/obj/item/weapon/storage/syringes,
 					/obj/item/weapon/storage/beakerbox)
 	cost = 20