Barring any errent merge conflict fixing fuckery.
This commit is contained in:
Aurorablade
2016-12-29 11:39:18 -05:00
parent 98b7a89a17
commit fc71122914
6 changed files with 1325 additions and 1713 deletions
@@ -601,15 +601,6 @@ It'll return null if the organ doesn't correspond, so include null checks when u
if(E.see_invisible)
H.see_invisible = min(H.see_invisible, E.see_invisible)
if(H.seer == 1)
var/obj/effect/rune/R = locate() in H.loc
if(R && R.word1 == cultwords["see"] && R.word2 == cultwords["hell"] && R.word3 == cultwords["join"])
H.see_invisible = SEE_INVISIBLE_OBSERVER
else
H.see_invisible = SEE_INVISIBLE_LIVING
H.seer = 0
var/lesser_darkview_bonus = INFINITY
// my glasses, I can't see without my glasses
if(H.glasses)