datums/controller stuff

2018-04-23 00:02:42 -05:00
parent f2b0456dc5
commit e5f9765d2a
29 changed files with 1283 additions and 91 deletions
@@ -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