Master into dev-freeze.

code/modules/virus2/helpers.dm

@@ -11,16 +11,17 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne")
 			if(M.internal)
 				score = 6	//not breathing infected air helps greatly
 				var/obj/item/I = M.wear_mask
-				
+
 				//masks provide a small bonus and can replace overall bio protection
-				score = max(score, round(0.06*I.armor["bio"]))
-				if (istype(I, /obj/item/clothing/mask))
-					score += 1 //this should be added after
-		
+				if(I)
+					score = max(score, round(0.06*I.armor["bio"]))
+					if (istype(I, /obj/item/clothing/mask))
+						score += 1 //this should be added after
+
 		if("Contact")
 			if(istype(M, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = M
-				
+
 				//gloves provide a larger bonus
 				if (istype(H.gloves, /obj/item/clothing/gloves))
 					score += 2
@@ -45,12 +46,12 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne")
 		return 0
 
 	var/protection = M.getarmor(null, "bio")	//gets the full body bio armour value, weighted by body part coverage.
-	
+
 	if (vector == "Airborne")
 		var/obj/item/I = M.wear_mask
 		if (istype(I))
 			protection = max(protection, round(0.06*I.armor["bio"]))
-	
+
 	return prob(protection)
 
 //Checks if table-passing table can reach target (5 tile radius)
@@ -134,7 +135,7 @@ proc/airborne_can_reach(turf/source, turf/target)
 //			log_debug("Attempting virus [ID]")
 			var/datum/disease2/disease/V = virus2[ID]
 			if(V.spreadtype != vector) continue
-			
+
 			//It's hard to get other people sick if you're in an airtight suit.
 			if(!infection_spreading_check(src, V.spreadtype)) continue