From b0d7482f04c86b5d81e9751159f25d02ffbf5486 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 16 Jun 2021 01:09:30 +0300 Subject: [PATCH] https://github.com/tgstation/tgstation/pull/55902 --- .../research/nanites/nanite_programs/healing.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm index 920faae928..7bf00816ab 100644 --- a/code/modules/research/nanites/nanite_programs/healing.dm +++ b/code/modules/research/nanites/nanite_programs/healing.dm @@ -53,10 +53,16 @@ rogue_types = list(/datum/nanite_program/suffocating, /datum/nanite_program/necrotic) /datum/nanite_program/purging/check_conditions() +<<<<<<< HEAD var/foreign_reagent = length(host_mob.reagents?.reagent_list) if(!host_mob.getToxLoss() && !foreign_reagent) return FALSE return ..() +======= + . = ..() + if(!. || !host_mob.reagents) + return FALSE // No trying to purge simple mobs +>>>>>>> e543f07... Fixes nanite purge runtime on simple mobs (#55902) /datum/nanite_program/purging/active_effect() host_mob.adjustToxLoss(-1) @@ -153,13 +159,15 @@ rogue_types = list(/datum/nanite_program/suffocating, /datum/nanite_program/necrotic) /datum/nanite_program/purging_advanced/check_conditions() + . = ..() + if(!. || !host_mob.reagents) + return FALSE var/foreign_reagent = FALSE for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list) foreign_reagent = TRUE break if(!host_mob.getToxLoss() && !foreign_reagent) return FALSE - return ..() /datum/nanite_program/purging_advanced/active_effect() host_mob.adjustToxLoss(-1, forced = TRUE)