Merge pull request #5545 from RemieRichards/DiseaseRework

Disease Code Partial Rework

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

@@ -71,6 +71,7 @@
 	else
 		..()
 
+
 /mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
 	shock_damage *= siemens_coeff
 	if (shock_damage<1)

code/modules/mob/living/carbon/carbon_defense.dm

@@ -27,12 +27,12 @@
 		return
 
 	for(var/datum/disease/D in viruses)
-		if(D.spread_by_touch())
-			user.contract_disease(D, 0, 1, CONTACT_HANDS)
+		if(D.IsSpreadByTouch())
+			user.ContractDisease(D)
 
 	for(var/datum/disease/D in user.viruses)
-		if(D.spread_by_touch())
-			contract_disease(D, 0, 1, CONTACT_HANDS)
+		if(D.IsSpreadByTouch())
+			ContractDisease(D)
 
 	if(lying || isslime(src))
 		if(user.a_intent == "help")
@@ -48,16 +48,16 @@
 		return 0
 
 	for(var/datum/disease/D in viruses)
-		if(D.spread_by_touch())
-			M.contract_disease(D, 0, 1, CONTACT_HANDS)
+		if(D.IsSpreadByTouch())
+			M.ContractDisease(D)
 
 	for(var/datum/disease/D in M.viruses)
-		if(D.spread_by_touch())
-			contract_disease(D, 0, 1, CONTACT_HANDS)
+		if(D.IsSpreadByTouch())
+			ContractDisease(D)
 
 	if(..()) //successful monkey bite.
 		for(var/datum/disease/D in M.viruses)
-			contract_disease(D,1,0)
+			ForceContractDisease(D)
 		return 1
 
 	if(M.a_intent == "help")

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

@@ -7,4 +7,6 @@
 			apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
 			updatehealth()
 
+		for(var/datum/disease/D in M.viruses)
+			ContractDisease(D)
 	return

code/modules/mob/living/silicon/pai/software.dm

@@ -508,9 +508,9 @@
 		for(var/datum/disease/D in M.viruses)
 			dat += {"<h4>Infection Detected.</h4><br>
 					 Name: [D.name]<br>
-					 Type: [D.spread]<br>
+					 Type: [D.spread_text]<br>
 					 Stage: [D.stage]/[D.max_stages]<br>
-					 Possible Cure: [D.cure]<br>
+					 Possible Cure: [D.cure_text]<br>
 					"}
 		dat += "<a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Visual Status Overlay</a><br>"
 	return dat
@@ -641,4 +641,4 @@
 /mob/living/silicon/pai/proc/chatroom()
 
 	pda.mode = 5
-	pda.attack_self()
+	pda.attack_self()

code/modules/mob/mob_cleanup.dm

@@ -3,174 +3,3 @@
 Put (mob/proc)s here that are in dire need of a code cleanup.
 */
 
-/mob/proc/has_disease(var/datum/disease/virus)
-	for(var/datum/disease/D in viruses)
-		if(D.IsSame(virus))
-			//error("[D.name]/[D.type] is the same as [virus.name]/[virus.type]")
-			return 1
-	return 0
-
-/mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1, var/spread_type = -5)
-	//world << "Contract_disease called by [src] with virus [virus]"
-	if(stat >=2)
-		//world << "He's dead jim."
-		return
-	if(istype(virus, /datum/disease/advance))
-		//world << "It's an advance virus."
-		var/datum/disease/advance/A = virus
-		if(A.GetDiseaseID() in resistances)
-			//world << "It resisted us!"
-			return
-		if(count_by_type(viruses, /datum/disease/advance) >= 3)
-			return
-
-	else
-		if(src.resistances.Find(virus.type))
-			//world << "Normal virus and resisted"
-			return
-
-
-	if(has_disease(virus))
-		return
-
-
-	if(force_species_check)
-		var/fail = 1
-		for(var/name in virus.affected_species)
-			var/mob_type = text2path("/mob/living/carbon/[lowertext(name)]")
-			if(mob_type && istype(src, mob_type))
-				fail = 0
-				break
-		if(fail) return
-
-	if(skip_this == 1)
-		//world << "infectin"
-		//if(src.virus)				< -- this used to replace the current disease. Not anymore!
-			//src.virus.cure(0)
-		var/datum/disease/v = new virus.type(1, virus, 0)
-		src.viruses += v
-		v.affected_mob = src
-		v.strain_data = virus.strain_data.Copy()
-		v.holder = src
-		if(v.can_carry && prob(5))
-			v.carrier = 1
-		return
-	//world << "Not skipping."
-	//if(src.virus) //
-		//return //
-
-
-/*
-	var/list/clothing_areas	= list()
-	var/list/covers = list(CHEST,GROIN,LEGS,FEET,ARMS,HANDS)
-	for(var/Covers in covers)
-		clothing_areas[Covers] = list()
-
-	for(var/obj/item/clothing/Clothing in src)
-		if(Clothing)
-			for(var/Covers in covers)
-				if(Clothing&Covers)
-					clothing_areas[Covers] += Clothing
-
-*/
-	if(prob(15/virus.permeability_mod)) return //the power of immunity compels this disease! but then you forgot resistances
-	//world << "past prob()"
-	var/obj/item/clothing/Cl = null
-	var/passed = 1
-
-	//chances to target this zone
-	var/head_ch
-	var/body_ch
-	var/hands_ch
-	var/feet_ch
-
-	if(spread_type == -5)
-		spread_type = virus.spread_type
-
-	switch(spread_type)
-		if(CONTACT_HANDS)
-			head_ch = 0
-			body_ch = 0
-			hands_ch = 100
-			feet_ch = 0
-		if(CONTACT_FEET)
-			head_ch = 0
-			body_ch = 0
-			hands_ch = 0
-			feet_ch = 100
-		else
-			head_ch = 100
-			body_ch = 100
-			hands_ch = 25
-			feet_ch = 25
-
-
-	var/target_zone = pick(head_ch;1,body_ch;2,hands_ch;3,feet_ch;4)//1 - head, 2 - body, 3 - hands, 4- feet
-
-	if(istype(src, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = src
-
-		switch(target_zone)
-			if(1)
-				if(isobj(H.head) && !istype(H.head, /obj/item/weapon/paper))
-					Cl = H.head
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-				if(passed && isobj(H.wear_mask))
-					Cl = H.wear_mask
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-			if(2)//arms and legs included
-				if(isobj(H.wear_suit))
-					Cl = H.wear_suit
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-				if(passed && isobj(slot_w_uniform))
-					Cl = slot_w_uniform
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-			if(3)
-				if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS)
-					Cl = H.wear_suit
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-
-				if(passed && isobj(H.gloves))
-					Cl = H.gloves
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-			if(4)
-				if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&FEET)
-					Cl = H.wear_suit
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-
-				if(passed && isobj(H.shoes))
-					Cl = H.shoes
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-			else
-				src << "Something strange's going on, something's wrong."
-
-			/*if("feet")
-				if(H.shoes && istype(H.shoes, /obj/item/clothing/))
-					Cl = H.shoes
-					passed = prob(Cl.permeability_coefficient*100)
-					//
-					world << "Shoes pass [passed]"
-			*/		//
-	else if(istype(src, /mob/living/carbon/monkey))
-		var/mob/living/carbon/monkey/M = src
-		switch(target_zone)
-			if(1)
-				if(M.wear_mask && isobj(M.wear_mask))
-					Cl = M.wear_mask
-					passed = prob((Cl.permeability_coefficient*100) - 1)
-					//world << "Mask pass [passed]"
-
-	if(!passed && spread_type == AIRBORNE && !internals)
-		passed = (prob((50*virus.permeability_mod) - 1))
-
-	if(passed)
-		//world << "Infection in the mob [src]. YAY"
-		var/datum/disease/v = new virus.type(1, virus, 0)
-		src.viruses += v
-		v.affected_mob = src
-		v.strain_data = virus.strain_data.Copy()
-		v.holder = src
-		if(v.can_carry && prob(5))
-			v.carrier = 1
-		return
-	return