diff --git a/code/datums/elements/bane.dm b/code/datums/elements/bane.dm index 110a755de23..769cf8d361d 100644 --- a/code/datums/elements/bane.dm +++ b/code/datums/elements/bane.dm @@ -76,12 +76,13 @@ * Checks typepaths and the mob's biotype, returning TRUE if correct and FALSE if wrong. * Additionally checks if combat mode is required, and if so whether it's enabled or not. */ -/datum/element/bane/proc/check_biotype_path(mob/living/bane_applier, atom/target) +/datum/element/bane/proc/check_biotype_path(atom/bane_applier, atom/target) if(!isliving(target)) return FALSE var/mob/living/living_target = target - if(bane_applier) - if(requires_combat_mode && !bane_applier.combat_mode) + if(isliving(bane_applier) && bane_applier) + var/mob/living/living_bane_applier = bane_applier + if(requires_combat_mode && !living_bane_applier.combat_mode) return FALSE var/is_correct_biotype = living_target.mob_biotypes & mob_biotypes if(mob_biotypes && !(is_correct_biotype))