diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 947332c9673..f51d1493347 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -42,6 +42,11 @@ if(!V.get_ability(/datum/vampire_passive/full)) to_chat(M, "The nullrod's power interferes with your own!") V.adjust_nullification(30 + sanctify_force, 15 + sanctify_force) + if(!sanctify_force) + return + if(isliving(M)) + var/mob/living/L = M + L.adjustFireLoss(sanctify_force) // Bonus fire damage for sanctified (ERT) versions of nullrod /obj/item/nullrod/pickup(mob/living/user) . = ..() @@ -96,14 +101,6 @@ return FALSE return TRUE -/obj/item/nullrod/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() - if(!sanctify_force) - return - if(isliving(AM)) - var/mob/living/L = AM - L.adjustFireLoss(sanctify_force) // Bonus fire damage for sanctified (ERT) versions of nullrod - /// fluff subtype to be used for all donator nullrods /obj/item/nullrod/fluff reskin_selectable = FALSE