Merge pull request #2933 from Furlucis/master

Fixes and tweaks for Obscure, Reveal and Seer runes, plus some amount of floundering around with git
This commit is contained in:
Chinsky
2013-05-31 20:09:10 -07:00
6 changed files with 1280 additions and 1274 deletions
+2 -2
View File
@@ -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)