https://github.com/tgstation/tgstation/pull/55902

2021-06-16 01:09:30 +03:00
parent e2eb9d52d0
commit b0d7482f04
1 changed files with 9 additions and 1 deletions
@@ -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)