From bed732d505363306dd3582b84386ebb1eb809127 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Fri, 4 Nov 2016 12:47:57 -0700 Subject: [PATCH] Addresses Fox's requests --- code/game/gamemodes/cult/ritual.dm | 5 +++++ code/game/gamemodes/cult/runes.dm | 3 +++ code/modules/mob/living/carbon/human/species/species.dm | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index ab25f22a8fd..8e288c39a70 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -107,6 +107,11 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return return +// This is for the seer rune, so you don't get permanent ghost sight +/obj/effect/rune/Uncrossed(atom/movable/O) + if(isliving(O)) + var/mob/living/L = O + L.update_sight() /obj/effect/rune/proc/get_word_string() if(word1 == cultwords["travel"]) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 20133d972c8..ff08b31e700 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -210,6 +210,8 @@ var/list/sacrificed = list() /obj/effect/rune/proc/seer() if(usr.loc==src.loc) + // No. Bad cultcode. Bad. + var/mob/living/carbon/human/H = usr if(usr.seer==1) usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium viortia.") to_chat(usr, "\red The world beyond fades from your vision.") @@ -224,6 +226,7 @@ var/list/sacrificed = list() to_chat(usr, "\red The world beyond opens to your eyes.") usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 1 + H.update_sight() return return fizzle() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 39ed75d7cbf..44636988941 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -577,8 +577,6 @@ It'll return null if the organ doesn't correspond, so include null checks when u /datum/species/proc/update_sight(mob/living/carbon/human/H) - if(!H.client) - return 1 H.sight = initial(H.sight) H.see_in_dark = darksight H.see_invisible = invis_sight