The end of an era, reworks virology [DRAFT]

code/__DEFINES/combat.dm

@@ -263,6 +263,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define GRENADE_NONCLUMSY_FUMBLE 2
 #define GRENADE_NO_FUMBLE 3
 
+#define BODY_ZONE_EVERYTHING "everything"
+#define BODY_ZONE_ARMS "arms"
+#define BODY_ZONE_LEGS "legs"
 #define BODY_ZONE_HEAD "head"
 #define BODY_ZONE_CHEST "chest"
 #define BODY_ZONE_L_ARM "l_arm"

code/__DEFINES/vv.dm

@@ -161,3 +161,4 @@
 #define VV_HK_WEAKREF_RESOLVE "weakref_resolve"
 
 #define VV_HK_POSSESS_ITEM "possess_item"
+#define VV_HK_VIEW_DISEASE_DATA "disease_data"

code/__DEFINES/~monkestation/virology.dm

@@ -0,0 +1,33 @@
+#define EFFECT_DANGER_HELPFUL	"0"
+#define EFFECT_DANGER_FLAVOR	"1"
+#define EFFECT_DANGER_ANNOYING	"2"
+#define EFFECT_DANGER_HINDRANCE	"3"
+#define EFFECT_DANGER_HARMFUL	"4"
+#define EFFECT_DANGER_DEADLY	"5"
+
+#define	ANTIGEN_BLOOD	"blood"
+#define	ANTIGEN_COMMON	"common"
+#define	ANTIGEN_RARE	"rare"
+#define	ANTIGEN_ALIEN	"alien"
+
+//blood antigens
+#define	ANTIGEN_O	"O"
+#define	ANTIGEN_A	"A"
+#define	ANTIGEN_B	"B"
+#define	ANTIGEN_RH	"Rh"
+//common antigens
+#define	ANTIGEN_Q	"Q"
+#define	ANTIGEN_U	"U"
+#define	ANTIGEN_V	"V"
+//rare antigens
+#define	ANTIGEN_M	"M"
+#define	ANTIGEN_N	"N"
+#define	ANTIGEN_P	"P"
+//alien antigens
+#define	ANTIGEN_X	"X"
+#define	ANTIGEN_Y	"Y"
+#define	ANTIGEN_Z	"Z"
+
+
+#define DISEASE_BUMP "bump"
+#define DISEASE_TOUCH "touch"

code/__HELPERS/~monkestation-helpers/virology.dm

@@ -0,0 +1,51 @@
+GLOBAL_LIST_INIT(all_antigens, list(
+	ANTIGEN_O,
+	ANTIGEN_A,
+	ANTIGEN_B,
+	ANTIGEN_RH,
+	ANTIGEN_Q,
+	ANTIGEN_U,
+	ANTIGEN_V,
+	ANTIGEN_M,
+	ANTIGEN_N,
+	ANTIGEN_P,
+	ANTIGEN_X,
+	ANTIGEN_Y,
+	ANTIGEN_Z,
+	))
+
+GLOBAL_LIST_INIT(blood_antigens, list(
+	ANTIGEN_O,
+	ANTIGEN_A,
+	ANTIGEN_B,
+	ANTIGEN_RH,
+))
+
+GLOBAL_LIST_INIT(common_antigens, list(
+	ANTIGEN_Q,
+	ANTIGEN_U,
+	ANTIGEN_V,
+))
+
+GLOBAL_LIST_INIT(rare_antigens, list(
+	ANTIGEN_M,
+	ANTIGEN_N,
+	ANTIGEN_P,
+))
+
+GLOBAL_LIST_INIT(alien_antigens, list(
+	ANTIGEN_X,
+	ANTIGEN_Y,
+	ANTIGEN_Z,
+))
+
+/proc/antigen_family(id)
+	switch(id)
+		if (ANTIGEN_BLOOD)
+			return GLOB.blood_antigens
+		if (ANTIGEN_COMMON)
+			return GLOB.common_antigens
+		if (ANTIGEN_RARE)
+			return GLOB.rare_antigens
+		if (ANTIGEN_ALIEN)
+			return GLOB.alien_antigens

code/datums/diseases/_MobProcs.dm

@@ -64,7 +64,7 @@
 	if(ishuman(src))
 		var/mob/living/carbon/human/infecting_human = src
 
-		if(infecting_human.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) && prob(75))
+		if(infecting_human.reagents.has_reagent(/datum/reagent/medicine/antipathogenic/spaceacillin) && prob(75))
 			return
 
 		switch(target_zone)
@@ -97,7 +97,7 @@
 /mob/living/proc/AirborneContractDisease(datum/disease/disease, force_spread)
 	if(ishuman(src))
 		var/mob/living/carbon/human/infecting_human = src
-		if(infecting_human.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) && prob(75))
+		if(infecting_human.reagents.has_reagent(/datum/reagent/medicine/antipathogenic/spaceacillin) && prob(75))
 			return
 
 	if(((disease.spread_flags & DISEASE_SPREAD_AIRBORNE) || force_spread) && prob((50*disease.spreading_modifier) - 1))

code/datums/diseases/_disease.dm

@@ -1,8 +1,10 @@
+GLOBAL_LIST_INIT(inspectable_diseases, list())
+
 /datum/disease
 	//Flags
 	var/visibility_flags = 0
 	var/disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
-	var/spread_flags = DISEASE_SPREAD_AIRBORNE | DISEASE_SPREAD_CONTACT_FLUIDS | DISEASE_SPREAD_CONTACT_SKIN
+	var/spread_flags = 0
 
 	//Fluff
 	var/form = "Virus"
@@ -14,7 +16,7 @@
 
 	//Stages
 	var/stage = 1
-	var/max_stages = 0
+	var/max_stages = 4
 	/// The probability of this infection advancing a stage every second the cure is not present.
 	var/stage_prob = 2
 
@@ -36,12 +38,14 @@
 	var/infectable_biotypes = MOB_ORGANIC //if the disease can spread on organics, synthetics, or undead
 	var/process_dead = FALSE //if this ticks while the host is dead
 	var/copy_type = null //if this is null, copies will use the type of the instance being copied
+	var/list/symptoms = list() // The symptoms of the disease.
 
 /datum/disease/Destroy()
 	. = ..()
+	GLOB.inspectable_diseases -= src
 	if(affected_mob)
 		remove_disease()
-	SSdisease.active_diseases.Remove(src)
+	//SSdisease.active_diseases.Remove(src)
 
 //add this disease if the host does not already have too many
 /datum/disease/proc/try_infect(mob/living/infectee, make_copy = TRUE)
@@ -53,7 +57,7 @@
 	var/datum/disease/D = make_copy ? Copy() : src
 	LAZYADD(infectee.diseases, D)
 	D.affected_mob = infectee
-	SSdisease.active_diseases += D //Add it to the active diseases list, now that it's actually in a mob and being processed.
+	//SSdisease.active_diseases += D //Add it to the active diseases list, now that it's actually in a mob and being processed.
 
 	D.after_add()
 	infectee.med_hud_set_status()
@@ -64,7 +68,7 @@
 
 ///Proc to process the disease and decide on whether to advance, cure or make the sympthoms appear. Returns a boolean on whether to continue acting on the symptoms or not.
 /datum/disease/proc/stage_act(seconds_per_tick, times_fired)
-	var/slowdown = affected_mob.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) ? 0.5 : 1 // spaceacillin slows stage speed by 50%
+	var/slowdown = affected_mob.reagents.has_reagent(/datum/reagent/medicine/antipathogenic/spaceacillin) ? 0.5 : 1 // spaceacillin slows stage speed by 50%
 
 	if(has_cure())
 		if(SPT_PROB(cure_chance, seconds_per_tick))
@@ -101,21 +105,18 @@
 	if(!(spread_flags & DISEASE_SPREAD_AIRBORNE) && !force_spread)
 		return
 
-	if(affected_mob.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
+	if(affected_mob.reagents.has_reagent(/datum/reagent/medicine/antipathogenic/spaceacillin) || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
 		return
 
-	var/spread_range = 2
-
-	if(force_spread)
-		spread_range = force_spread
-
+	affected_mob.spread_airborne_diseases()
+	/*
 	var/turf/T = affected_mob.loc
 	if(istype(T))
 		for(var/mob/living/carbon/C in oview(spread_range, affected_mob))
 			var/turf/V = get_turf(C)
 			if(disease_air_spread_walk(T, V))
 				C.AirborneContractDisease(src, force_spread)
-
+	*/
 /proc/disease_air_spread_walk(turf/start, turf/end)
 	if(!start || !end)
 		return FALSE
@@ -127,25 +128,67 @@
 			return FALSE
 		end = Temp
 
+/datum/disease/proc/IsSame(datum/disease/D)
+	if(istype(D, type))
+		return TRUE
+	return FALSE
 
 /datum/disease/proc/cure(add_resistance = TRUE)
 	if(affected_mob)
 		if(add_resistance && (disease_flags & CAN_RESIST))
 			LAZYOR(affected_mob.disease_resistances, GetDiseaseID())
 	qdel(src)
 
-/datum/disease/proc/IsSame(datum/disease/D)
-	if(istype(D, type))
-		return TRUE
-	return FALSE
-
-
 /datum/disease/proc/Copy()
 	//note that stage is not copied over - the copy starts over at stage 1
-	var/static/list/copy_vars = list("name", "visibility_flags", "disease_flags", "spread_flags", "form", "desc", "agent", "spread_text",
-									"cure_text", "max_stages", "stage_prob", "viable_mobtypes", "cures", "infectivity", "cure_chance",
-									"bypasses_immunity", "spreading_modifier", "severity", "required_organs", "needs_all_cures", "strain_data",
-									"infectable_biotypes", "process_dead")
+	var/static/list/copy_vars = list(
+		"name",
+		"visibility_flags",
+		"disease_flags",
+		"spread_flags",
+		"form",
+		"desc",
+		"agent",
+		"spread_text",
+		"cure_text",
+		"max_stages",
+		"stage_prob",
+		"viable_mobtypes",
+		"cures",
+		"infectivity",
+		"cure_chance",
+		"bypasses_immunity",
+		"spreading_modifier",
+		"severity",
+		"required_organs",
+		"needs_all_cures",
+		"strain_data",
+		"infectable_biotypes",
+		"process_dead",
+		"mutation_modifier",
+		"strength",
+		"robustness",
+		"max_bodytemperature",
+		"min_bodytemperature",
+		"log",
+		"origin",
+		"logged_virusfood",
+		"fever_warning",
+		"color",
+		"pattern",
+		"pattern_color",
+		"can_kill",
+		"infectionchance",
+		"infectionchance_base",
+		"ticks",
+		"speed",
+		"subID",
+		"uniqueID",
+		"childID",
+		"symptoms",
+		"stageprob",
+		"antigen",
+		)
 
 	var/datum/disease/D = copy_type ? new copy_type() : new type()
 	for(var/V in copy_vars)

code/datums/diseases/advance/advance.dm

@@ -27,7 +27,6 @@
 
 	// NEW VARS
 	var/list/properties = list()
-	var/list/symptoms = list() // The symptoms of the disease.
 	var/id = ""
 	var/processing = FALSE
 	var/mutable = TRUE //set to FALSE to prevent most in-game methods of altering the disease via virology

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

@@ -1,3 +1,5 @@
+/*
+
 /** Facial Hypertrichosis
  * No change to stealth.
  * Increases resistance.
@@ -35,3 +37,4 @@
 			H.facial_hairstyle = beard_order[index]
 			H.update_body_parts()
 
+*/

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

@@ -1,3 +1,5 @@
+/*
+
 /**Coughing
  * Slightly decreases stealth
  * Reduces resistance
@@ -78,3 +80,4 @@
 				addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 6)
 				addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 12)
 				addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 18)
+*/

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

@@ -38,14 +38,6 @@
 	///If this symptom can appear from /datum/disease/advance/GenerateSymptoms()
 	var/naturally_occuring = TRUE
 
-/datum/symptom/New()
-	var/list/S = SSdisease.list_symptoms
-	for(var/i = 1; i <= S.len; i++)
-		if(type == S[i])
-			id = "[i]"
-			return
-	CRASH("We couldn't assign an ID!")
-
 ///Called when processing of the advance disease that holds this symptom infects a host and upon each Refresh() of that advance disease.
 /datum/symptom/proc/Start(datum/disease/advance/A)
 	if(neutered)

code/datums/diseases/cold.dm

@@ -3,7 +3,7 @@
 	desc = "If left untreated the subject will contract the flu."
 	max_stages = 3
 	cure_text = "Rest & Spaceacillin"
-	cures = list(/datum/reagent/medicine/spaceacillin)
+	cures = list(/datum/reagent/medicine/antipathogenic/spaceacillin)
 	agent = "XY-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	spreading_modifier = 0.5

code/datums/diseases/cold9.dm

@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Common Cold Anti-bodies & Spaceacillin"
-	cures = list(/datum/reagent/medicine/spaceacillin)
+	cures = list(/datum/reagent/medicine/antipathogenic/spaceacillin)
 	agent = "ICE9-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "If left untreated the subject will slow, as if partly frozen."

code/datums/diseases/flu.dm

@@ -3,7 +3,7 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin"
-	cures = list(/datum/reagent/medicine/spaceacillin)
+	cures = list(/datum/reagent/medicine/antipathogenic/spaceacillin)
 	cure_chance = 5
 	agent = "H13N1 flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human)

code/datums/diseases/fluspanish.dm

@@ -3,7 +3,7 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & Anti-bodies to the common flu"
-	cures = list(/datum/reagent/medicine/spaceacillin)
+	cures = list(/datum/reagent/medicine/antipathogenic/spaceacillin)
 	cure_chance = 5
 	agent = "1nqu1s1t10n flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human)

code/datums/diseases/transformation.dm

@@ -192,7 +192,7 @@
 
 	name = "Xenomorph Transformation"
 	cure_text = "Spaceacillin & Glycerol"
-	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/glycerol)
+	cures = list(/datum/reagent/medicine/antipathogenic/spaceacillin, /datum/reagent/glycerol)
 	cure_chance = 2.5
 	agent = "Rip-LEY Alien Microbes"
 	desc = "This disease changes the victim into a xenomorph."

code/datums/diseases/tuberculosis.dm

@@ -4,7 +4,7 @@
 	max_stages = 5
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & Convermol"
-	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/c2/convermol)
+	cures = list(/datum/reagent/medicine/antipathogenic/spaceacillin, /datum/reagent/medicine/c2/convermol)
 	agent = "Fungal Tubercle bacillus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 2.5 //like hell are you getting out of hell

code/datums/wounds/burns.dm

@@ -48,7 +48,7 @@
 		return
 
 	if(victim.reagents)
-		if(victim.reagents.has_reagent(/datum/reagent/medicine/spaceacillin))
+		if(victim.reagents.has_reagent(/datum/reagent/medicine/antipathogenic/spaceacillin))
 			sanitization += 0.9
 		if(victim.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine/))
 			sanitization += 0.9

code/game/atoms.dm

@@ -1015,6 +1015,9 @@
 ///to add blood from a mob onto something, and transfer their dna info
 /atom/proc/add_mob_blood(mob/living/injected_mob)
 	var/list/blood_dna = injected_mob.get_blood_dna_list()
+	if(iscarbon(injected_mob))
+		var/mob/living/carbon/mob = injected_mob
+		try_infect_with_mobs_diseases(mob.diseases)
 	if(!blood_dna)
 		return FALSE
 	return add_blood_DNA(blood_dna)