cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cult'

Browse Source
This commit is contained in:
Chinsky
2013-01-12 22:30:56 +04:00
parent 2f70033ac0 4f173c52a8
commit dc2f77ddd0
8 changed files with 155 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/admin/verbs/debug.dm
View File

@@ -302,7 +302,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set category = "Fun"
set name = "Make Cultist"
set desc = "Makes target a cultist"
if(!wordtravel)
if(!cultwords["travel"])
runerandom()
if(M)
if(M.mind in ticker.mode.cult)
@@ -316,21 +316,21 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/glimpse=pick("1","2","3","4","5","6","7","8")
switch(glimpse)
if("1")
M << "\red You remembered one thing from the glimpse... [wordtravel] is travel..."
M << "\red You remembered one thing from the glimpse... [cultwords["travel"]] is travel..."
if("2")
M << "\red You remembered one thing from the glimpse... [wordblood] is blood..."
M << "\red You remembered one thing from the glimpse... [cultwords["blood"]] is blood..."
if("3")
M << "\red You remembered one thing from the glimpse... [wordjoin] is join..."
M << "\red You remembered one thing from the glimpse... [cultwords["join"]] is join..."
if("4")
M << "\red You remembered one thing from the glimpse... [wordhell] is Hell..."
M << "\red You remembered one thing from the glimpse... [cultwords["hell"]] is Hell..."
if("5")
M << "\red You remembered one thing from the glimpse... [worddestr] is destroy..."
M << "\red You remembered one thing from the glimpse... [cultwords["destroy"]] is destroy..."
if("6")
M << "\red You remembered one thing from the glimpse... [wordtech] is technology..."
M << "\red You remembered one thing from the glimpse... [cultwords["technology"]] is technology..."
if("7")
M << "\red You remembered one thing from the glimpse... [wordself] is self..."
M << "\red You remembered one thing from the glimpse... [cultwords["self"]] is self..."
if("8")
M << "\red You remembered one thing from the glimpse... [wordsee] is see..."
M << "\red You remembered one thing from the glimpse... [cultwords["see"]] is see..."
if(M.mind)
M.mind.special_role = "Cultist"

2
code/modules/mob/dead/observer/observer.dm
View File

@@ -142,7 +142,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune).
var/obj/effect/rune/R = locate() in mind.current.loc //whilst corpse is alive, we can only reenter the body if it's on the rune
if(!(R && R.word1 == wordhell && R.word2 == wordtravel && R.word3 == wordself)) //astral journeying rune
if(!(R && R.word1 == cultwords["hell"] && R.word2 == cultwords["travel"] && R.word3 == cultwords["self"])) //astral journeying rune
usr << "<span class='warning'>The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.</span>"
return
mind.current.ajourn=0

2
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1359,7 +1359,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if(seer)
var/obj/effect/rune/R = locate() in loc
if(R && R.word1 == wordsee && R.word2 == wordhell && R.word3 == wordjoin)
if(R && R.word1 == cultwords["see"] && R.word2 == cultwords["hell"] && R.word3 == cultwords["join"])
see_invisible = SEE_INVISIBLE_OBSERVER
else
see_invisible = SEE_INVISIBLE_LIVING