From 0f9a1fe71c43a5bb33222520524df20913d2a831 Mon Sep 17 00:00:00 2001 From: Furlucis Date: Fri, 31 May 2013 19:42:27 -0400 Subject: [PATCH] Fixes and a few tweaks to Obscure, Seer, and Reveal runes. Signed-off-by: Furlucis --- code/game/gamemodes/cult/runes.dm | 17 ++++++++++++----- code/modules/mob/living/carbon/human/life.dm | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index f8b743eb701..7d8231d9520 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -202,13 +202,20 @@ var/list/sacrificed = list() seer() if(usr.loc==src.loc) - usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!") - if(usr.see_invisible!=0 && usr.see_invisible!=15) + if(usr.seer==1) + usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium viortia.") + usr << "\red The world beyond fades from your vision." + usr.see_invisible = SEE_INVISIBLE_LIVING + usr.seer = 0 + else if(usr.see_invisible!=SEE_INVISIBLE_LIVING) usr << "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision." + usr.see_invisible = SEE_INVISIBLE_OBSERVER + usr.seer = 0 else + usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!") usr << "\red The world beyond opens to your eyes." - usr.see_invisible = SEE_INVISIBLE_OBSERVER - usr.seer = 1 + usr.see_invisible = SEE_INVISIBLE_OBSERVER + usr.seer = 1 return return fizzle() @@ -310,7 +317,7 @@ var/list/sacrificed = list() var/S=0 for(var/obj/effect/rune/R in orange(rad,src)) if(R!=src) - R:visibility=0 + R.invisibility=INVISIBILITY_OBSERVER S=1 if(S) if(istype(src,/obj/effect/rune)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 36b039dc89b..f38066d49a6 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1121,7 +1121,7 @@ see_in_dark = 8 if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO - if(seer) + if(seer==1) var/obj/effect/rune/R = locate() in loc if(R && R.word1 == cultwords["see"] && R.word2 == cultwords["hell"] && R.word3 == cultwords["join"]) see_invisible = SEE_INVISIBLE_OBSERVER @@ -1185,7 +1185,7 @@ see_invisible = SEE_INVISIBLE_LIVING else see_invisible = SEE_INVISIBLE_LIVING - else + else if(!seer) see_invisible = SEE_INVISIBLE_LIVING if(healths)