Refactors virus spreading

code/datums/diseases/_disease.dm

@@ -1,36 +1,8 @@
-
-//Visibility Flags
-#define HIDDEN_SCANNER	1
-#define HIDDEN_PANDEMIC	2
-
-//Disease Flags
-#define CURABLE		1
-#define CAN_CARRY	2
-#define CAN_RESIST	4
-
-//Spread Flags
-#define SPECIAL 1
-#define NON_CONTAGIOUS 2
-#define BLOOD 4
-#define CONTACT_FEET 8
-#define CONTACT_HANDS 16
-#define CONTACT_GENERAL 32
-#define AIRBORNE 64
-
-
-//Severity Defines
-#define NONTHREAT	"No threat"
-#define MINOR		"Minor"
-#define MEDIUM		"Medium"
-#define HARMFUL		"Harmful"
-#define DANGEROUS 	"Dangerous!"
-#define BIOHAZARD	"BIOHAZARD THREAT!"
-
 /datum/disease
 	//Flags
 	var/visibility_flags = 0
 	var/disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
-	var/spread_flags = AIRBORNE
+	var/spread_flags = VIRUS_SPREAD_AIRBORNE | VIRUS_SPREAD_CONTACT_FLUIDS | VIRUS_SPREAD_CONTACT_SKIN
 
 	//Fluff
 	var/form = "Virus"
@@ -54,7 +26,7 @@
 	var/carrier = FALSE //If our host is only a carrier
 	var/bypasses_immunity = FALSE //Does it skip species virus immunity check? Some things may diseases and not viruses
 	var/permeability_mod = 1
-	var/severity =	NONTHREAT
+	var/severity = VIRUS_SEVERITY_POSITIVE
 	var/list/required_organs = list()
 	var/needs_all_cures = TRUE
 	var/list/strain_data = list() //dna_spread special bullshit
@@ -95,25 +67,22 @@
 	if(!. || (needs_all_cures && . < cures.len))
 		return 0
 
-
+//Airborne spreading
 /datum/disease/proc/spread(force_spread = 0)
 	if(!affected_mob)
 		return
 
-	if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread)
+	if(!(spread_flags & VIRUS_SPREAD_AIRBORNE) && !force_spread)
 		return
 
 	if(affected_mob.reagents.has_reagent("spaceacillin") || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
 		return
 
-	var/spread_range = 1
+	var/spread_range = 2
 
 	if(force_spread)
 		spread_range = force_spread
 
-	if(spread_flags & AIRBORNE)
-		spread_range++
-
 	var/turf/T = affected_mob.loc
 	if(istype(T))
 		for(var/mob/living/carbon/C in oview(spread_range, affected_mob))
@@ -121,7 +90,7 @@
 			if(V)
 				while(TRUE)
 					if(V == T)
-						C.ContractDisease(src)
+						C.AirborneContractDisease(src)
 						break
 					var/turf/Temp = get_step_towards(V, T)
 					if(!CANATMOSPASS(V, Temp))
@@ -152,12 +121,6 @@
 /datum/disease/proc/GetDiseaseID()
 	return type
 
-
-/datum/disease/proc/IsSpreadByTouch()
-	if(spread_flags & CONTACT_FEET || spread_flags & CONTACT_HANDS || spread_flags & CONTACT_GENERAL)
-		return 1
-	return 0
-
 //don't use this proc directly. this should only ever be called by cure()
 /datum/disease/proc/remove_virus()
 	affected_mob.viruses -= src		//remove the datum from the list