From 2e8e5c3a37009e888f620a8f81b788f41875cb59 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 22 Oct 2015 02:48:46 -0400 Subject: [PATCH] friendly-fire-proofing --- code/game/gamemodes/wizard/artefact.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 8c2fa530834..97cdc43c189 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -250,6 +250,12 @@ var/global/list/multiverse = list() multiverse.Remove(src) return ..() +/obj/item/weapon/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. + if(M.faction == user.faction) + user << "The [src] detects benevolent energies in your target and redirects your attack!" + return + ..() + /obj/item/weapon/multisword/attack_self(mob/user) if(user.mind.special_role == "apprentice") user << "You know better than to touch your teacher's stuff."