Merge branch 'cult'

This commit is contained in:
Chinsky
2013-01-12 22:30:56 +04:00
8 changed files with 155 additions and 299 deletions

View File

@@ -405,6 +405,7 @@
#include "code\game\machinery\telecomms\telecomunications.dm"
#include "code\game\machinery\telecomms\telemonitor.dm"
#include "code\game\machinery\telecomms\traffic_control.dm"
#include "code\game\magic\Uristrunes.dm"
#include "code\game\mecha\mech_bay.dm"
#include "code\game\mecha\mech_fabricator.dm"
#include "code\game\mecha\mecha.dm"

View File

@@ -159,36 +159,11 @@
/datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word)
if(!wordtravel)
if(!cultwords["travel"])
runerandom()
if (!word)
word=pick(allwords)
var/wordexp
switch(word)
if("travel")
wordexp = "[wordtravel] is travel..."
if("blood")
wordexp = "[wordblood] is blood..."
if("join")
wordexp = "[wordjoin] is join..."
if("hell")
wordexp = "[wordhell] is Hell..."
if("self")
wordexp = "[wordself] is self..."
if("see")
wordexp = "[wordsee] is see..."
if("tech")
wordexp = "[wordtech] is technology..."
if("destroy")
wordexp = "[worddestr] is destroy..."
if("other")
wordexp = "[wordother] is other..."
// if("hear")
// wordexp = "[wordhear] is hear..."
// if("free")
// wordexp = "[wordfree] is free..."
if("hide")
wordexp = "[wordhide] is hide..."
var/wordexp = "[cultwords[word]] is [word]..."
cult_mob << "\red You remember one thing from the dark teachings of your master... [wordexp]"
cult_mob.mind.store_memory("<B>You remember that</B> [wordexp]", 0, 0)

View File

@@ -1,18 +1,6 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
var/wordtravel = null
var/wordself = null
var/wordsee = null
var/wordhell = null
var/wordblood = null
var/wordjoin = null
var/wordtech = null
var/worddestr = null
var/wordother = null
//var/wordhear = null
//var/wordfree = null
var/wordhide = null
var/cultwords = list()
var/runedec = 0
var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", "self", "see", "other", "hide")
@@ -20,37 +8,16 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
set category = "Special Verbs"
set name = "Check Rune Words"
set desc = "Check the rune-word meaning"
if(!wordtravel)
if(!cultwords["travel"])
runerandom()
usr << "[wordtravel] is travel, [wordblood] is blood, [wordjoin] is join, [wordhell] is Hell, [worddestr] is destroy, [wordtech] is technology, [wordself] is self, [wordsee] is see, [wordother] is other, [wordhide] is hide."
for (var/word in engwords)
usr << "[cultwords[word]] is [word]"
/proc/runerandom() //randomizes word meaning
var/list/runewords=list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri") ///"orkan" and "allaq" removed.
wordtravel=pick(runewords)
runewords-=wordtravel
wordself=pick(runewords)
runewords-=wordself
wordsee=pick(runewords)
runewords-=wordsee
wordhell=pick(runewords)
runewords-=wordhell
wordblood=pick(runewords)
runewords-=wordblood
wordjoin=pick(runewords)
runewords-=wordjoin
wordtech=pick(runewords)
runewords-=wordtech
worddestr=pick(runewords)
runewords-=worddestr
wordother=pick(runewords)
runewords-=wordother
// wordhear=pick(runewords)
// runewords-=wordhear
// wordfree=pick(runewords)
// runewords-=wordfree
wordhide=pick(runewords)
runewords-=wordhide
for (var/word in engwords)
cultwords[word] = pick(runewords)
runewords-=cultwords[word]
/obj/effect/rune
desc = ""
@@ -146,53 +113,53 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return fizzle()
// if(!src.visibility)
// src.visibility=1
if(word1 == wordtravel && word2 == wordself)
if(word1 == cultwords["travel"] && word2 == cultwords["self"])
return teleport(src.word3)
if(word1 == wordsee && word2 == wordblood && word3 == wordhell)
if(word1 == cultwords["see"] && word2 == cultwords["blood"] && word3 == cultwords["hell"])
return tomesummon()
if(word1 == wordhell && word2 == worddestr && word3 == wordother)
if(word1 == cultwords["hell"] && word2 == cultwords["destroy"] && word3 == cultwords["other"])
return armor()
if(word1 == wordjoin && word2 == wordblood && word3 == wordself)
if(word1 == cultwords["join"] && word2 == cultwords["blood"] && word3 == cultwords["self"])
return convert()
if(word1 == wordhell && word2 == wordjoin && word3 == wordself)
if(word1 == cultwords["hell"] && word2 == cultwords["join"] && word3 == cultwords["self"])
return tearreality()
if(word1 == worddestr && word2 == wordsee && word3 == wordtech)
if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["technology"])
return emp(src.loc,3)
if(word1 == wordtravel && word2 == wordblood && word3 == wordself)
if(word1 == cultwords["travel"] && word2 == cultwords["blood"] && word3 == cultwords["self"])
return drain()
if(word1 == wordsee && word2 == wordhell && word3 == wordjoin)
if(word1 == cultwords["see"] && word2 == cultwords["hell"] && word3 == cultwords["join"])
return seer()
if(word1 == wordblood && word2 == wordjoin && word3 == wordhell)
if(word1 == cultwords["blood"] && word2 == cultwords["join"] && word3 == cultwords["hell"])
return raise()
if(word1 == wordhide && word2 == wordsee && word3 == wordblood)
if(word1 == cultwords["hide"] && word2 == cultwords["see"] && word3 == cultwords["blood"])
return obscure(4)
if(word1 == wordhell && word2 == wordtravel && word3 == wordself)
if(word1 == cultwords["hell"] && word2 == cultwords["travel"] && word3 == cultwords["self"])
return ajourney()
if(word1 == wordblood && word2 == wordsee && word3 == wordtravel)
if(word1 == cultwords["blood"] && word2 == cultwords["see"] && word3 == cultwords["travel"])
return manifest()
if(word1 == wordhell && word2 == wordtech && word3 == wordjoin)
if(word1 == cultwords["hell"] && word2 == cultwords["technology"] && word3 == cultwords["join"])
return talisman()
if(word1 == wordhell && word2 == wordblood && word3 == wordjoin)
if(word1 == cultwords["hell"] && word2 == cultwords["blood"] && word3 == cultwords["join"])
return sacrifice()
if(word1 == wordblood && word2 == wordsee && word3 == wordhide)
if(word1 == cultwords["blood"] && word2 == cultwords["see"] && word3 == cultwords["hide"])
return revealrunes(src)
if(word1 == worddestr && word2 == wordtravel && word3 == wordself)
if(word1 == cultwords["destroy"] && word2 == cultwords["travel"] && word3 == cultwords["self"])
return wall()
if(word1 == wordtravel && word2 == wordtech && word3 == wordother)
if(word1 == cultwords["travel"] && word2 == cultwords["technology"] && word3 == cultwords["other"])
return freedom()
if(word1 == wordjoin && word2 == wordother && word3 == wordself)
if(word1 == cultwords["join"] && word2 == cultwords["other"] && word3 == cultwords["self"])
return cultsummon()
if(word1 == wordhide && word2 == wordother && word3 == wordsee)
if(word1 == cultwords["hide"] && word2 == cultwords["other"] && word3 == cultwords["see"])
return deafen()
if(word1 == worddestr && word2 == wordsee && word3 == wordother)
if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["other"])
return blind()
if(word1 == worddestr && word2 == wordsee && word3 == wordblood)
if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["blood"])
return bloodboil()
if(word1 == wordself && word2 == wordother && word3 == wordtech)
if(word1 == cultwords["self"] && word2 == cultwords["other"] && word3 == cultwords["technology"])
return communicate()
if(word1 == wordtravel && word2 == wordother)
if(word1 == cultwords["travel"] && word2 == cultwords["other"])
return itemport(src.word3)
if(word1 == wordjoin && word2 == wordhide && word3 == wordtech)
if(word1 == cultwords["join"] && word2 == cultwords["hide"] && word3 == cultwords["technology"])
return runestun()
else
return fizzle()
@@ -209,94 +176,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return
check_icon()
if(word1 == wordtravel && word2 == wordself)
icon_state = "2"
src.icon += rgb(0, 0 , 255)
return
if(word1 == wordjoin && word2 == wordblood && word3 == wordself)
icon_state = "3"
return
if(word1 == wordhell && word2 == wordjoin && word3 == wordself)
icon_state = "4"
return
if(word1 == wordsee && word2 == wordblood && word3 == wordhell)
icon_state = "5"
src.icon += rgb(0, 0 , 255)
return
if(word1 == worddestr && word2 == wordsee && word3 == wordtech)
icon_state = "5"
return
if(word1 == wordtravel && word2 == wordblood && word3 == wordself)
icon_state = "2"
return
if(word1 == wordsee && word2 == wordhell && word3 == wordjoin)
icon_state = "4"
src.icon += rgb(0, 0 , 255)
return
if(word1 == wordblood && word2 == wordjoin && word3 == wordhell)
icon_state = "1"
return
if(word1 == wordhide && word2 == wordsee && word3 == wordblood)
icon_state = "1"
src.icon += rgb(0, 0 , 255)
return
if(word1 == wordhell && word2 == wordtravel && word3 == wordself)
icon_state = "6"
src.icon += rgb(0, 0 , 255)
return
if(word1 == wordblood && word2 == wordsee && word3 == wordtravel)
icon_state = "6"
return
if(word1 == wordhell && word2 == wordtech && word3 == wordjoin)
icon_state = "3"
src.icon += rgb(0, 0 , 255)
return
if(word1 == wordhell && word2 == wordblood && word3 == wordjoin)
icon_state = "[rand(1,6)]"
src.icon += rgb(255, 255, 255)
return
if(word1 == wordblood && word2 == wordsee && word3 == wordhide)
icon_state = "4"
src.icon += rgb(255, 255, 255)
return
if(word1 == worddestr && word2 == wordtravel && word3 == wordself)
icon_state = "1"
src.icon += rgb(255, 0, 0)
return
if(word1 == wordtravel && word2 == wordtech && word3 == wordother)
icon_state = "4"
src.icon += rgb(255, 0, 255)
return
if(word1 == wordjoin && word2 == wordother && word3 == wordself)
icon_state = "2"
src.icon += rgb(0, 255, 0)
return
if(word1 == wordhide && word2 == wordother && word3 == wordsee)
icon_state = "4"
src.icon += rgb(0, 255, 0)
return
if(word1 == worddestr && word2 == wordsee && word3 == wordother)
icon_state = "4"
src.icon += rgb(0, 0, 255)
return
if(word1 == worddestr && word2 == wordsee && word3 == wordblood)
icon_state = "4"
src.icon += rgb(255, 0, 0)
return
if(word1 == wordself && word2 == wordother && word3 == wordtech)
icon_state = "3"
src.icon += rgb(200, 0, 0)
return
if(word1 == wordtravel && word2 == wordother)
icon_state = "1"
src.icon += rgb(200, 0, 0)
if(word1 == wordjoin && word2 == wordhide && word3 == wordtech)
icon_state = "2"
src.icon += rgb(100, 0, 100)
return
icon_state="[rand(1,6)]" //random shape and color for dummy runes
src.icon -= rgb(255,255,255)
src.icon += rgb(rand(1,255),rand(1,255),rand(1,255))
icon = get_uristrune_cult(word1, word2, word3)
/obj/item/weapon/tome
name = "arcane tome"
@@ -487,7 +367,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
if(!usr.canmove || usr.stat || usr.restrained())
return
if(!wordtravel)
if(!cultwords["travel"])
runerandom()
if(iscultist(user))
var/C = 0
@@ -608,7 +488,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
attack_self(mob/user as mob)
if(src.cultistsonly && !iscultist(usr))
return
if(!wordtravel)
if(!cultwords["travel"])
runerandom()
if(user)
var/r
@@ -627,8 +507,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
var/beacon
if(usr)
beacon = input("Select the last rune", "Rune Scribing") in words
R.word1=wordtravel
R.word2=wordself
R.word1=cultwords["travel"]
R.word2=cultwords["self"]
R.word3=beacon
R.loc = user.loc
R.check_icon()
@@ -637,141 +517,141 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
var/beacon
if(usr)
beacon = input("Select the last rune", "Rune Scribing") in words
R.word1=wordtravel
R.word2=wordother
R.word1=cultwords["travel"]
R.word2=cultwords["other"]
R.word3=beacon
R.loc = user.loc
R.check_icon()
if("tome")
R.word1=wordsee
R.word2=wordblood
R.word3=wordhell
R.word1=cultwords["see"]
R.word2=cultwords["blood"]
R.word3=cultwords["hell"]
R.loc = user.loc
R.check_icon()
if("armor")
R.word1=wordhell
R.word2=worddestr
R.word3=wordother
R.word1=cultwords["hell"]
R.word2=cultwords["destroy"]
R.word3=cultwords["other"]
R.loc = user.loc
R.check_icon()
if("convert")
R.word1=wordjoin
R.word2=wordblood
R.word3=wordself
R.word1=cultwords["join"]
R.word2=cultwords["blood"]
R.word3=cultwords["self"]
R.loc = user.loc
R.check_icon()
if("tear in reality")
R.word1=wordhell
R.word2=wordjoin
R.word3=wordself
R.word1=cultwords["hell"]
R.word2=cultwords["join"]
R.word3=cultwords["self"]
R.loc = user.loc
R.check_icon()
if("emp")
R.word1=worddestr
R.word2=wordsee
R.word3=wordtech
R.word1=cultwords["destroy"]
R.word2=cultwords["see"]
R.word3=cultwords["technology"]
R.loc = user.loc
R.check_icon()
if("drain")
R.word1=wordtravel
R.word2=wordblood
R.word3=wordself
R.word1=cultwords["travel"]
R.word2=cultwords["blood"]
R.word3=cultwords["self"]
R.loc = user.loc
R.check_icon()
if("seer")
R.word1=wordsee
R.word2=wordhell
R.word3=wordjoin
R.word1=cultwords["see"]
R.word2=cultwords["hell"]
R.word3=cultwords["join"]
R.loc = user.loc
R.check_icon()
if("raise")
R.word1=wordblood
R.word2=wordjoin
R.word3=wordhell
R.word1=cultwords["blood"]
R.word2=cultwords["join"]
R.word3=cultwords["hell"]
R.loc = user.loc
R.check_icon()
if("obscure")
R.word1=wordhide
R.word2=wordsee
R.word3=wordblood
R.word1=cultwords["hide"]
R.word2=cultwords["see"]
R.word3=cultwords["blood"]
R.loc = user.loc
R.check_icon()
if("astral journey")
R.word1=wordhell
R.word2=wordtravel
R.word3=wordself
R.word1=cultwords["hell"]
R.word2=cultwords["travel"]
R.word3=cultwords["self"]
R.loc = user.loc
R.check_icon()
if("manifest")
R.word1=wordblood
R.word2=wordsee
R.word3=wordtravel
R.word1=cultwords["blood"]
R.word2=cultwords["see"]
R.word3=cultwords["travel"]
R.loc = user.loc
R.check_icon()
if("imbue talisman")
R.word1=wordhell
R.word2=wordtech
R.word3=wordjoin
R.word1=cultwords["hell"]
R.word2=cultwords["technology"]
R.word3=cultwords["join"]
R.loc = user.loc
R.check_icon()
if("sacrifice")
R.word1=wordhell
R.word2=wordblood
R.word3=wordjoin
R.word1=cultwords["hell"]
R.word2=cultwords["blood"]
R.word3=cultwords["join"]
R.loc = user.loc
R.check_icon()
if("reveal")
R.word1=wordblood
R.word2=wordsee
R.word3=wordhide
R.word1=cultwords["blood"]
R.word2=cultwords["see"]
R.word3=cultwords["hide"]
R.loc = user.loc
R.check_icon()
if("wall")
R.word1=worddestr
R.word2=wordtravel
R.word3=wordself
R.word1=cultwords["destroy"]
R.word2=cultwords["travel"]
R.word3=cultwords["self"]
R.loc = user.loc
R.check_icon()
if("freedom")
R.word1=wordtravel
R.word2=wordtech
R.word3=wordother
R.word1=cultwords["travel"]
R.word2=cultwords["technology"]
R.word3=cultwords["other"]
R.loc = user.loc
R.check_icon()
if("cultsummon")
R.word1=wordjoin
R.word2=wordother
R.word3=wordself
R.word1=cultwords["join"]
R.word2=cultwords["other"]
R.word3=cultwords["self"]
R.loc = user.loc
R.check_icon()
if("deafen")
R.word1=wordhide
R.word2=wordother
R.word3=wordsee
R.word1=cultwords["hide"]
R.word2=cultwords["other"]
R.word3=cultwords["see"]
R.loc = user.loc
R.check_icon()
if("blind")
R.word1=worddestr
R.word2=wordsee
R.word3=wordother
R.word1=cultwords["destroy"]
R.word2=cultwords["see"]
R.word3=cultwords["other"]
R.loc = user.loc
R.check_icon()
if("bloodboil")
R.word1=worddestr
R.word2=wordsee
R.word3=wordblood
R.word1=cultwords["destroy"]
R.word2=cultwords["see"]
R.word3=cultwords["blood"]
R.loc = user.loc
R.check_icon()
if("communicate")
R.word1=wordself
R.word2=wordother
R.word3=wordtech
R.word1=cultwords["self"]
R.word2=cultwords["other"]
R.word3=cultwords["technology"]
R.loc = user.loc
R.check_icon()
if("stun")
R.word1=wordjoin
R.word2=wordhide
R.word3=wordtech
R.word1=cultwords["join"]
R.word2=cultwords["hide"]
R.word3=cultwords["technology"]
R.loc = user.loc
R.check_icon()

View File

@@ -12,7 +12,7 @@ var/list/sacrificed = list()
for(var/obj/effect/rune/R in world)
if(R == src)
continue
if(R.word1 == wordtravel && R.word2 == wordself && R.word3 == key && R.z != 2)
if(R.word1 == cultwords["travel"] && R.word2 == cultwords["self"] && R.word3 == key && R.z != 2)
index++
allrunesloc.len = index
allrunesloc[index] = R.loc
@@ -50,7 +50,7 @@ var/list/sacrificed = list()
for(var/obj/effect/rune/R in world)
if(R == src)
continue
if(R.word1 == wordtravel && R.word2 == wordother && R.word3 == key)
if(R.word1 == cultwords["travel"] && R.word2 == cultwords["other"] && R.word3 == key)
IP = R
runecount++
if(runecount >= 2)
@@ -159,7 +159,7 @@ var/list/sacrificed = list()
drain()
var/drain = 0
for(var/obj/effect/rune/R in world)
if(R.word1==wordtravel && R.word2==wordblood && R.word3==wordself)
if(R.word1==cultwords["travel"] && R.word2==cultwords["blood"] && R.word3==cultwords["self"])
for(var/mob/living/carbon/D in R.loc)
if(D.stat!=2)
var/bdrain = rand(1,25)
@@ -237,7 +237,7 @@ var/list/sacrificed = list()
is_sacrifice_target = 0
find_sacrifice:
for(var/obj/effect/rune/R in world)
if(R.word1==wordblood && R.word2==wordjoin && R.word3==wordhell)
if(R.word1==cultwords["blood"] && R.word2==cultwords["join"] && R.word3==cultwords["hell"])
for(var/mob/living/carbon/human/N in R.loc)
if(ticker.mode.name == "cult" && N.mind && N.mind == ticker.mode:sacrifice_target)
is_sacrifice_target = 1
@@ -431,53 +431,53 @@ var/list/sacrificed = list()
for(var/obj/effect/rune/R in orange(1,src))
if(R==src)
continue
if(R.word1==wordtravel && R.word2==wordself) //teleport
if(R.word1==cultwords["travel"] && R.word2==cultwords["self"]) //teleport
T = new(src.loc)
T.imbue = "[R.word3]"
T.info = "[R.word3]"
imbued_from = R
break
if(R.word1==wordsee && R.word2==wordblood && R.word3==wordhell) //tome
if(R.word1==cultwords["see"] && R.word2==cultwords["blood"] && R.word3==cultwords["hell"]) //tome
T = new(src.loc)
T.imbue = "newtome"
imbued_from = R
break
if(R.word1==worddestr && R.word2==wordsee && R.word3==wordtech) //emp
if(R.word1==cultwords["destroy"] && R.word2==cultwords["see"] && R.word3==cultwords["technology"]) //emp
T = new(src.loc)
T.imbue = "emp"
imbued_from = R
break
if(R.word1==wordblood && R.word2==wordsee && R.word3==worddestr) //conceal
if(R.word1==cultwords["blood"] && R.word2==cultwords["see"] && R.word3==cultwords["destroy"]) //conceal
T = new(src.loc)
T.imbue = "conceal"
imbued_from = R
break
if(R.word1==wordhell && R.word2==worddestr && R.word3==wordother) //armor
if(R.word1==cultwords["hell"] && R.word2==cultwords["destroy"] && R.word3==cultwords["other"]) //armor
T = new(src.loc)
T.imbue = "armor"
imbued_from = R
break
if(R.word1==wordblood && R.word2==wordsee && R.word3==wordhide) //reveal
if(R.word1==cultwords["blood"] && R.word2==cultwords["see"] && R.word3==cultwords["hide"]) //reveal
T = new(src.loc)
T.imbue = "revealrunes"
imbued_from = R
break
if(R.word1==wordhide && R.word2==wordother && R.word3==wordsee) //deafen
if(R.word1==cultwords["hide"] && R.word2==cultwords["other"] && R.word3==cultwords["see"]) //deafen
T = new(src.loc)
T.imbue = "deafen"
imbued_from = R
break
if(R.word1==worddestr && R.word2==wordsee && R.word3==wordother) //blind
if(R.word1==cultwords["destroy"] && R.word2==cultwords["see"] && R.word3==cultwords["other"]) //blind
T = new(src.loc)
T.imbue = "blind"
imbued_from = R
break
if(R.word1==wordself && R.word2==wordother && R.word3==wordtech) //communicat
if(R.word1==cultwords["self"] && R.word2==cultwords["other"] && R.word3==cultwords["technology"]) //communicat
T = new(src.loc)
T.imbue = "communicate"
imbued_from = R
break
if(R.word1==wordjoin && R.word2==wordhide && R.word3==wordtech) //communicat
if(R.word1==cultwords["join"] && R.word2==cultwords["hide"] && R.word3==cultwords["technology"]) //communicat
T = new(src.loc)
T.imbue = "runestun"
imbued_from = R

View File

@@ -23,29 +23,29 @@ var/list/word_to_uristrune_table = null
/proc/get_uristrune_cult(word1, word2, word3)
var/animated
if((word1 == wordtravel && word2 == wordself) \
|| (word1 == wordjoin && word2 == wordblood && word3 == wordself) \
|| (word1 == wordhell && word2 == wordjoin && word3 == wordself) \
|| (word1 == wordsee && word2 == wordblood && word3 == wordhell) \
|| (word1 == worddestr && word2 == wordsee && word3 == wordtech) \
|| (word1 == wordtravel && word2 == wordblood && word3 == wordself) \
|| (word1 == wordsee && word2 == wordhell && word3 == wordjoin) \
|| (word1 == wordblood && word2 == wordjoin && word3 == wordhell) \
|| (word1 == wordhide && word2 == wordsee && word3 == wordblood) \
|| (word1 == wordhell && word2 == wordtravel && word3 == wordself) \
|| (word1 == wordblood && word2 == wordsee && word3 == wordtravel) \
|| (word1 == wordhell && word2 == wordtech && word3 == wordjoin) \
|| (word1 == wordhell && word2 == wordblood && word3 == wordjoin) \
|| (word1 == wordblood && word2 == wordsee && word3 == wordhide) \
|| (word1 == worddestr && word2 == wordtravel && word3 == wordself) \
|| (word1 == wordtravel && word2 == wordtech && word3 == wordother) \
|| (word1 == wordjoin && word2 == wordother && word3 == wordself) \
|| (word1 == wordhide && word2 == wordother && word3 == wordsee) \
|| (word1 == worddestr && word2 == wordsee && word3 == wordother) \
|| (word1 == worddestr && word2 == wordsee && word3 == wordblood) \
|| (word1 == wordself && word2 == wordother && word3 == wordtech) \
|| (word1 == wordtravel && word2 == wordother) \
|| (word1 == wordjoin && word2 == wordhide && word3 == wordtech) )
if((word1 == cultwords["travel"] && word2 == cultwords["self"]) \
|| (word1 == cultwords["join"] && word2 == cultwords["blood"] && word3 == cultwords["self"]) \
|| (word1 == cultwords["hell"] && word2 == cultwords["join"] && word3 == cultwords["self"]) \
|| (word1 == cultwords["see"] && word2 == cultwords["blood"] && word3 == cultwords["hell"]) \
|| (word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["technology"]) \
|| (word1 == cultwords["travel"] && word2 == cultwords["blood"] && word3 == cultwords["self"]) \
|| (word1 == cultwords["see"] && word2 == cultwords["hell"] && word3 == cultwords["join"]) \
|| (word1 == cultwords["blood"] && word2 == cultwords["join"] && word3 == cultwords["hell"]) \
|| (word1 == cultwords["hide"] && word2 == cultwords["see"] && word3 == cultwords["blood"]) \
|| (word1 == cultwords["hell"] && word2 == cultwords["travel"] && word3 == cultwords["self"]) \
|| (word1 == cultwords["blood"] && word2 == cultwords["see"] && word3 == cultwords["travel"]) \
|| (word1 == cultwords["hell"] && word2 == cultwords["technology"] && word3 == cultwords["join"]) \
|| (word1 == cultwords["hell"] && word2 == cultwords["blood"] && word3 == cultwords["join"]) \
|| (word1 == cultwords["blood"] && word2 == cultwords["see"] && word3 == cultwords["hide"]) \
|| (word1 == cultwords["destroy"] && word2 == cultwords["travel"] && word3 == cultwords["self"]) \
|| (word1 == cultwords["travel"] && word2 == cultwords["technology"] && word3 == cultwords["other"]) \
|| (word1 == cultwords["join"] && word2 == cultwords["other"] && word3 == cultwords["self"]) \
|| (word1 == cultwords["hide"] && word2 == cultwords["other"] && word3 == cultwords["see"]) \
|| (word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["other"]) \
|| (word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["blood"]) \
|| (word1 == cultwords["self"] && word2 == cultwords["other"] && word3 == cultwords["technology"]) \
|| (word1 == cultwords["travel"] && word2 == cultwords["other"]) \
|| (word1 == cultwords["join"] && word2 == cultwords["hide"] && word3 == cultwords["technology"]) )
animated = 1
else
animated = 0

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"

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

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