From afe081d836156664ccf09ae395487123920c67d9 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 5 Jun 2015 18:35:19 +0100 Subject: [PATCH 1/2] Makes scrying orb only usable by wizards --- code/modules/spells/artifacts.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm index 0a96b6aa2e..e28550f9b5 100644 --- a/code/modules/spells/artifacts.dm +++ b/code/modules/spells/artifacts.dm @@ -13,6 +13,10 @@ hitsound = 'sound/items/welder2.ogg' /obj/item/weapon/scrying/attack_self(mob/user as mob) + if((user.mind && !wizards.is_antagonist(user.mind))) + usr << "You stare into the orb and see nothing but your own reflection." + return + user << "You can see... everything!" visible_message("[usr] stares into [src], their eyes glazing over.") announce_ghost_joinleave(user.ghostize(1), 1, "You feel that they used a powerful artifact to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place with their presence.") From 7b19c85ac5932bf602774bf37e556f89dc8fc80a Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 5 Jun 2015 19:04:11 +0100 Subject: [PATCH 2/2] Makes file use user and not usr --- code/modules/spells/artifacts.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm index e28550f9b5..9790dc3dbe 100644 --- a/code/modules/spells/artifacts.dm +++ b/code/modules/spells/artifacts.dm @@ -14,10 +14,10 @@ /obj/item/weapon/scrying/attack_self(mob/user as mob) if((user.mind && !wizards.is_antagonist(user.mind))) - usr << "You stare into the orb and see nothing but your own reflection." + user << "You stare into the orb and see nothing but your own reflection." return user << "You can see... everything!" - visible_message("[usr] stares into [src], their eyes glazing over.") + visible_message("[user] stares into [src], their eyes glazing over.") announce_ghost_joinleave(user.ghostize(1), 1, "You feel that they used a powerful artifact to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place with their presence.") return