diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 544a67c0cd5..8ef57a4b9ea 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -11,14 +11,12 @@ /obj/item/gun/magic/staff/proc/is_wizard_or_friend(mob/user) if(!user?.mind?.has_antag_datum(/datum/antagonist/wizard) \ && !user.mind.has_antag_datum(/datum/antagonist/survivalist/magic) \ - && !user.mind.has_antag_datum(/datum/antagonist/wizard_minion)) + && !user.mind.has_antag_datum(/datum/antagonist/wizard_minion) \ + && !allow_intruder_use) return FALSE return TRUE /obj/item/gun/magic/staff/check_botched(mob/living/user, atom/target) - if(allow_intruder_use) - return ..() - if(!is_wizard_or_friend(user)) return !on_intruder_use(user, target) return ..()