From 2e0b019bd7b79f8939fe3e000a70408ddcc137de Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 7 Dec 2019 03:11:54 -0700 Subject: [PATCH 1/4] Update utility.dm --- code/modules/research/nanites/nanite_programs/utility.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 44b85e4210..e7a0070ac2 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -236,7 +236,7 @@ /datum/nanite_program/spreading/active_effect() if(prob(10)) var/list/mob/living/target_hosts = list() - for(var/mob/living/L in oview(5, host_mob)) + for(var/mob/living/L in dview(5, host_mob)) if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes)) continue target_hosts += L From 41a61cffa72fbe94860f23e2741426c35481cb1b Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 11 Dec 2019 14:46:05 -0700 Subject: [PATCH 2/4] Update utility.dm --- code/modules/research/nanites/nanite_programs/utility.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index e7a0070ac2..680da2052b 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -236,9 +236,12 @@ /datum/nanite_program/spreading/active_effect() if(prob(10)) var/list/mob/living/target_hosts = list() - for(var/mob/living/L in dview(5, host_mob)) + var/turf/T = get_turf(host_mob) + for(var/mob/living/L in range(5, host_mob)) if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes)) continue + if(!disease_spread_air_walk(T, get_turf(L))) + continue target_hosts += L if(!target_hosts.len) return From 4624a1739a3fd42787e89d3cd2c6cecdc9a03f94 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 21 Dec 2019 16:30:02 +0100 Subject: [PATCH 3/4] typo --- code/modules/research/nanites/nanite_programs/utility.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 680da2052b..833362b39d 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -240,7 +240,7 @@ for(var/mob/living/L in range(5, host_mob)) if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes)) continue - if(!disease_spread_air_walk(T, get_turf(L))) + if(!disease_air_spread_walk(T, get_turf(L))) continue target_hosts += L if(!target_hosts.len) From 5c3d3f4cc5f7c3ea568576acc42f01bade267f01 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 21 Dec 2019 16:40:32 +0100 Subject: [PATCH 4/4] Is merging someone else's PR you personally fixed considerable as self-merging? --- code/modules/research/nanites/nanite_programs/utility.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 833362b39d..a269d01ac0 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -243,6 +243,7 @@ if(!disease_air_spread_walk(T, get_turf(L))) continue target_hosts += L + target_hosts -= host_mob if(!target_hosts.len) return var/mob/living/infectee = pick(target_hosts)