datums/controller stuff

code/datums/diseases/_MobProcs.dm

@@ -17,6 +17,14 @@
 	if(HasDisease(D))
 		return FALSE
 
+	var/can_infect = FALSE
+	for(var/host_type in D.infectable_biotypes)
+		if(host_type in mob_biotypes)
+			can_infect = TRUE
+			break
+	if(!can_infect)
+		return FALSE
+
 	if(!(type in D.viable_mobtypes))
 		return FALSE
 
@@ -132,14 +140,6 @@
 		if(has_trait(TRAIT_VIRUSIMMUNE) && !D.bypasses_immunity)
 			return FALSE
 
-		var/can_infect = FALSE
-		for(var/host_type in D.infectable_hosts)
-			if(host_type in dna.species.species_traits)
-				can_infect = TRUE
-				break
-		if(!can_infect)
-			return FALSE
-
 	for(var/thing in D.required_organs)
 		if(!((locate(thing) in bodyparts) || (locate(thing) in internal_organs)))
 			return FALSE

code/datums/diseases/_disease.dm

@@ -30,7 +30,7 @@
 	var/list/required_organs = list()
 	var/needs_all_cures = TRUE
 	var/list/strain_data = list() //dna_spread special bullshit
-	var/list/infectable_hosts = list(SPECIES_ORGANIC) //if the disease can spread on organics, synthetics, or undead
+	var/list/infectable_biotypes = list(MOB_ORGANIC) //if the disease can spread on organics, synthetics, or undead
 	var/process_dead = FALSE //if this ticks while the host is dead
 
 /datum/disease/Destroy()
@@ -139,7 +139,7 @@
 	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", "permeability_mod", "severity", "required_organs", "needs_all_cures", "strain_data",
-									"infectable_hosts", "process_dead")
+									"infectable_biotypes", "process_dead")
 
 	var/datum/disease/D = new type()
 	for(var/V in copy_vars)

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

@@ -12,7 +12,7 @@
 	if(!..())
 		return
 	A.process_dead = TRUE
-	A.infectable_hosts |= SPECIES_UNDEAD
+	A.infectable_biotypes |= MOB_UNDEAD
 
 /datum/symptom/inorganic_adaptation
 	name = "Inorganic Biology"
@@ -27,4 +27,4 @@
 /datum/symptom/inorganic_adaptation/Start(datum/disease/advance/A)
 	if(!..())
 		return
-	A.infectable_hosts |= SPECIES_INORGANIC
+	A.infectable_biotypes |= MOB_INORGANIC

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

@@ -1,44 +0,0 @@
-/*
-//////////////////////////////////////
-
-Weakness
-
-	Slightly noticeable.
-	Lowers resistance slightly.
-	Decreases stage speed moderately.
-	Decreases transmittablity moderately.
-	Moderate Level.
-
-Bonus
-	Deals stamina damage to the host
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/weakness
-
-	name = "Weakness"
-	stealth = -1
-	resistance = -1
-	stage_speed = -2
-	transmittable = -2
-	level = 3
-	severity = 3
-
-/datum/symptom/weakness/Activate(datum/disease/advance/A)
-	..()
-	if(prob(SYMPTOM_ACTIVATION_PROB))
-		var/mob/living/M = A.affected_mob
-		switch(A.stage)
-			if(1, 2)
-				to_chat(M, "<span class='warning'>[pick("You feel weak.", "You feel lazy.")]</span>")
-			if(3, 4)
-				to_chat(M, "<span class='warning'><b>[pick("You feel very frail.", "You think you might faint.")]</span>")
-				M.adjustStaminaLoss(15)
-			else
-				to_chat(M, "<span class='userdanger'>[pick("You feel tremendously weak!", "Your body trembles as exhaustion creeps over you.")]</span>")
-				M.adjustStaminaLoss(30)
-				if(M.getStaminaLoss() > 60 && !M.stat)
-					M.visible_message("<span class='warning'>[M] faints!</span>", "<span class='userdanger'>You swoon and faint...</span>")
-					M.AdjustSleeping(100)
-	return

code/datums/diseases/beesease.dm

@@ -10,7 +10,7 @@
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated subject will regurgitate bees."
 	severity = DISEASE_SEVERITY_MEDIUM
-	infectable_hosts = list(SPECIES_ORGANIC, SPECIES_UNDEAD) //bees nesting in corpses
+	infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD) //bees nesting in corpses
 
 /datum/disease/beesease/stage_act()
 	..()

code/datums/diseases/magnitis.dm

@@ -10,7 +10,7 @@
 	permeability_mod = 0.75
 	desc = "This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field."
 	severity = DISEASE_SEVERITY_MEDIUM
-	infectable_hosts = list(SPECIES_ORGANIC, SPECIES_ROBOTIC)
+	infectable_biotypes = list(MOB_ORGANIC, MOB_ROBOTIC)
 	process_dead = TRUE
 
 /datum/disease/magnitis/stage_act()

code/datums/diseases/parrotpossession.dm

@@ -11,7 +11,7 @@
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "Subject is possesed by the vengeful spirit of a parrot. Call the priest."
 	severity = DISEASE_SEVERITY_MEDIUM
-	infectable_hosts = list(SPECIES_ORGANIC, SPECIES_UNDEAD, SPECIES_INORGANIC, SPECIES_ROBOTIC)
+	infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD, MOB_INORGANIC, MOB_ROBOTIC)
 	bypasses_immunity = TRUE //2spook
 	var/mob/living/simple_animal/parrot/Poly/ghost/parrot
 

code/datums/diseases/transformation.dm

@@ -149,7 +149,7 @@
 	stage4	= list("<span class='danger'>Your skin feels very loose.</span>", "<span class='danger'>You can feel... something...inside you.</span>")
 	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
 	new_form = /mob/living/silicon/robot
-	infectable_hosts = list(SPECIES_ORGANIC, SPECIES_UNDEAD, SPECIES_ROBOTIC)
+	infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD, MOB_ROBOTIC)
 
 /datum/disease/transformation/robot/stage_act()
 	..()
@@ -263,4 +263,4 @@
 	stage4	= list("<span class='danger'>You're ravenous.</span>")
 	stage5	= list("<span class='danger'>You have become a morph.</span>")
 	new_form = /mob/living/simple_animal/hostile/morph
-	infectable_hosts = list(SPECIES_ORGANIC, SPECIES_INORGANIC, SPECIES_UNDEAD) //magic!
+	infectable_biotypes = list(MOB_ORGANIC, MOB_INORGANIC, MOB_UNDEAD) //magic!