From 4ca9eb4171e69761ed6c4c6e6d93b4507e487ba6 Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 20 Feb 2020 18:11:54 -0500 Subject: [PATCH 1/2] Fixes healing nanites Fixes Accelerated Regeneration, Bio Regen, and Mechanical. Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do. --- code/modules/research/nanites/nanite_programs/healing.dm | 6 +++--- code/modules/research/nanites/nanite_programs/utility.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm index 5114e156d8..cd165c791e 100644 --- a/code/modules/research/nanites/nanite_programs/healing.dm +++ b/code/modules/research/nanites/nanite_programs/healing.dm @@ -23,7 +23,7 @@ if(!parts.len) return for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(0.5/parts.len, 0.5/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(0.5/parts.len, 0.5/parts.len)) host_mob.update_damage_overlays() else host_mob.adjustBruteLoss(-0.5, TRUE) @@ -136,7 +136,7 @@ return var/update = FALSE for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(1.5/parts.len, 1.5/parts.len, null, BODYPART_ROBOTIC)) //much faster than organic healing + if(L.heal_damage(1.5/parts.len, 1.5/parts.len, only_robotic = TRUE, only_organic = FALSE)) //much faster than organic healing update = TRUE if(update) host_mob.update_damage_overlays() @@ -180,7 +180,7 @@ return var/update = FALSE for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(3/parts.len, 3/parts.len, null, BODYPART_ORGANIC)) + if(L.heal_damage(3/parts.len, 3/parts.len, FALSE)) update = TRUE if(update) host_mob.update_damage_overlays() diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 6352f50b8b..9e0d8d1386 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -241,7 +241,7 @@ for(var/mob/living/L in oview(5, host_mob)) if(!prob(25)) continue - if(!(L.mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD))) + if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes)) continue target_hosts += L if(!target_hosts.len) From 7a1bc9d22b77a858ddce4fce039a85e124913027 Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 20 Feb 2020 19:11:04 -0500 Subject: [PATCH 2/2] Fixes the travis issues Fixes the travis issues, Exo still remains a mystery --- code/modules/research/nanites/nanite_programs/healing.dm | 2 +- code/modules/research/nanites/nanite_programs/utility.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm index cd165c791e..70a1412b11 100644 --- a/code/modules/research/nanites/nanite_programs/healing.dm +++ b/code/modules/research/nanites/nanite_programs/healing.dm @@ -136,7 +136,7 @@ return var/update = FALSE for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(1.5/parts.len, 1.5/parts.len, only_robotic = TRUE, only_organic = FALSE)) //much faster than organic healing + if(L.heal_damage(1.5/parts.len, 1.5/parts.len, null, TRUE, FALSE)) //much faster than organic healing update = TRUE if(update) host_mob.update_damage_overlays() diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 9e0d8d1386..6352f50b8b 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -241,7 +241,7 @@ for(var/mob/living/L in oview(5, host_mob)) if(!prob(25)) continue - if(!(MOB_ORGANIC in L.mob_biotypes) && !(MOB_UNDEAD in L.mob_biotypes)) + if(!(L.mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD))) continue target_hosts += L if(!target_hosts.len)