From d1b15fc601a63224f7224b5fa0ab4138d095946a Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 10 Jul 2015 01:02:16 -0400 Subject: [PATCH] Fixes a couple more virus oversights/bugs Fixes contact viruses spreading through windows, fixes bad copypasta in infection_spreading_check() --- code/modules/virus2/helpers.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/virus2/helpers.dm b/code/modules/virus2/helpers.dm index feb7aec6a63..2628274f7b8 100644 --- a/code/modules/virus2/helpers.dm +++ b/code/modules/virus2/helpers.dm @@ -50,7 +50,7 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne") if (vector == "Airborne") var/obj/item/I = M.wear_mask if (istype(I)) - protection = max(protection, round(0.06*I.armor["bio"])) + protection = max(protection, I.armor["bio"]) return prob(protection) @@ -147,12 +147,12 @@ proc/airborne_can_reach(turf/source, turf/target) // log_debug("Could not reach target") if (vector == "Contact") - if (in_range(src, victim)) + if (Adjacent(victim)) // log_debug("In range, infecting") infect_virus2(victim,V) //contact goes both ways - if (victim.virus2.len > 0 && vector == "Contact") + if (victim.virus2.len > 0 && vector == "Contact" && Adjacent(victim)) // log_debug("Spreading [vector] diseases from [victim] to [src]") var/nudity = 1