From 743601ec77d970d8205b8a6a306779b6a87e8c64 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 12 Feb 2023 10:35:04 +0100 Subject: [PATCH] [MIRROR] you can no longer change non null rod null rods [MDB IGNORE] (#19093) * you can no longer change non null rod null rods * Update holy_weapons.dm --------- Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/game/objects/items/holy_weapons.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 695bdd7f279..073bfdbefab 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -30,8 +30,9 @@ on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \ effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune)) - AddElement(/datum/element/bane, /mob/living/simple_animal/revenant, 0, 25, FALSE) - if(!GLOB.holy_weapon_type && istype(src, /obj/item/nullrod)) + AddElement(/datum/element/bane, target_type = /mob/living/simple_animal/revenant, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE) + + if(!GLOB.holy_weapon_type && type == /obj/item/nullrod) var/list/rods = list() for(var/obj/item/nullrod/nullrod_type as anything in typesof(/obj/item/nullrod)) if(!initial(nullrod_type.chaplain_spawnable))