From 96057e5aa778034238d62175bbe14e911cb37422 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Thu, 12 Sep 2013 00:46:48 -0700 Subject: [PATCH 01/14] Cult.dm updated for tome rework No longer give 2 words per cultist at round start, back to original 1 word per. --- code/game/gamemodes/cult/cult.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 2028b11f5e1..5bd6324a52f 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -95,10 +95,10 @@ for(var/datum/mind/cult_mind in cult) equip_cultist(cult_mind.current) grant_runeword(cult_mind.current) - grant_secondword(cult_mind.current) +// grant_secondword(cult_mind.current) update_cult_icons_added(cult_mind) cult_mind.current << "\blue You are a member of the cult!" - memoize_cult_objectives(cult_mind) + memorize_cult_objectives(cult_mind) cult_mind.special_role = "Cultist" spawn (rand(waittime_l, waittime_h)) @@ -106,7 +106,7 @@ ..() -/datum/game_mode/cult/proc/memoize_cult_objectives(var/datum/mind/cult_mind) +/datum/game_mode/cult/proc/memorize_cult_objectives(var/datum/mind/cult_mind) for(var/obj_count = 1,obj_count <= objectives.len,obj_count++) var/explanation switch(objectives[obj_count]) @@ -213,8 +213,8 @@ /datum/game_mode/cult/add_cultist(datum/mind/cult_mind) //INHERIT if (!..(cult_mind)) + memorize_cult_objectives(cult_mind) return - memoize_cult_objectives(cult_mind) /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1) From e7f4536325736070a8fedada643f503a559a1d84 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Thu, 12 Sep 2013 00:47:33 -0700 Subject: [PATCH 02/14] Runes.dm updated for tome rework. Convert now gives a guaranteed rune word to the cultist that converts. --- code/game/gamemodes/cult/runes.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index b6cb92a5df3..5426ba36b5e 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -77,7 +77,6 @@ var/list/sacrificed = list() return fizzle() - /////////////////////////////////////////SECOND RUNE tomesummon() @@ -114,6 +113,8 @@ var/list/sacrificed = list() M.mind.special_role = "Cultist" M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + usr << "\red The Geometer of Blood is pleased to see his followers grow in numbers." + ticker.mode:grant_runeword(usr) return 1 else M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." From 52546ac3f33070349cc3d550b3d66c19da58c081 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Thu, 12 Sep 2013 00:56:55 -0700 Subject: [PATCH 03/14] Tome rework. Tomes reworked for user friendliness! A fairly large change to cult. Tomes no longer make you choose from a list of words three times to form a rune. Tomes now use the "notes" section to decide whether you can scribe a rune or not, once you've translated the appropriate words into english, the usable runes will be in the list when you choose scribe rune, it will scribe the appropriate word that you translated. I.E. If "Ire" was translated to "join", the first word will be "ire". This removes researching words. Though, it's still possible to do by changing words in your notes, it's slower, and using an incorrect rune now does overall damage 75 to the user, so "testing" the runes you make with incorrect words will potentially kill the user. Hopefuly this will keep people from actually trying to research. On top of removing research (Which people found annoying and or too easy.), converting people now gives you a word, so this hopefully makes cult rounds more involved for all sides, because cultists need to convert a couple people before they can start using their full arsenal of runes, instead of fucking off into space for 20 minutes before anything happens. As well, choosing a rune from a list means you no longer need to memorize word combinations, and you can't mess up by clicking the wrong second/third word by accident. --- code/game/gamemodes/cult/ritual.dm | 99 ++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 32 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index d74578198e4..d409053ee22 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -194,6 +194,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(word1 == wordjoin && word2 == wordhide && word3 == wordtech) return runestun() else + user.take_overall_damage(75, 0) return fizzle() @@ -355,7 +356,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",

Teleport self

Teleport rune is a special rune, as it only needs two words, with the third word being destination. Basically, when you have two runes with the same destination, invoking one will teleport you to the other one. If there are more than 2 runes, you will be teleported to a random one. Runes with different third words will create separate networks. You can imbue this rune into a talisman, giving you a great escape mechanism.

Teleport other

- Teleport other allows for teleportation for any movable object to another rune with the same third word. You need 3 cultists chanting the invocation for this rune to work.
+ Teleport other allows for teleportation for any movable object to another rune with the same third word.

Summon new tome

Invoking this rune summons a new arcane tome.

Convert a person

@@ -385,7 +386,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",

Summon cultist

This rune allows you to summon a fellow cultist to your location. The target cultist must be unhandcuffed ant not buckled to anything. You also need to have 3 people chanting at the rune to succesfully invoke it. Invoking it takes heavy strain on the bodies of all chanting cultists.

Free a cultist

- This rune unhandcuffs and unbuckles any cultist of your choice, no matter where he is. You need to have 3 people invoking the rune for it to work. Invoking it takes heavy strain on the bodies of all chanting cultists.
+ This rune unhandcuffs and unbuckles any cultist of your choice, no matter where he is. Invoking it takes heavy strain on the bodies of all chanting cultists.

Deafen

This rune temporarily deafens all non-cultists around you.

Blind

@@ -415,9 +416,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", words[words[number]] = words[number] if("change") words[words[number]] = input("Enter the translation for [words[number]]", "Word notes") in engwords - for (var/w in words) - if ((words[w] == words[words[number]]) && (w != words[number])) - words[w] = w + for (var/entry in words) + if ((words[entry] == words[words[number]]) && (entry != words[number])) + words[entry] = entry notedat = {"
Word translation notes
[words[1]] is [words[words[1]]] Clear
@@ -534,29 +535,62 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(usr.get_active_hand() != src) return - var/w1 - var/w2 - var/w3 - var/list/english = list() - for (var/w in words) - english+=words[w] - if(usr) - w1 = input("Write your first rune:", "Rune Scribing") in english - for (var/w in words) - if (words[w] == w1) - w1 = w - if(usr) - w2 = input("Write your second rune:", "Rune Scribing") in english - for (var/w in words) - if (words[w] == w2) - w2 = w - if(usr) - w3 = input("Write your third rune:", "Rune Scribing") in english - for (var/w in words) - if (words[w] == w3) - w3 = w + var/list/dictionary = list( + "convert" = list("join","blood","self"), + "wall" = list("destroy","travel","self"), + "blood boil" = list("destroy","see","blood"), + "blood drain" = list("travel","blood","self"), + "raise dead" = list("blood","join","hell"), + "summon narsie" = list("hell","join","self"), + "communicate" = list("self","other","technology"), + "emp" = list("destroy","see","technology"), + "manifest" = list("blood","see","travel"), + "summon tome" = list("see","blood","hell"), + "see invisible" = list("see","hell","join"), + "hide" = list("hide","see","blood"), + "reveal" = list("blood","see","hide"), + "astral journey" = list("hell","travel","self"), + "imbue" = list("hell","technology","join"), + "sacrifice" = list("hell","blood","join"), + "summon cultist" = list("join","other","self"), + "free cultist" = list("travel","technology","other"), + "deafen" = list("hide","other","see"), + "blind" = list("destroy","see","other"), + "stun" = list("join","hide","technology"), + "armor" = list("hell","destroy","other"), + "teleport" = list("travel","self"), + "teleport other" = list("travel","other") + ) - if(usr.get_active_hand() != src) + + var/list/scribewords = list("none") + + var/list/english = list() + + for (var/entry in words) + if (words[entry] != entry) + english+=list(words[entry] = entry) + + for (var/entry in dictionary) + var/list/required = dictionary[entry] + if (length(english&required) == required.len) + scribewords += entry + + var/chosen_rune = null + + + if(usr) + chosen_rune = input ("Choose a rune to scribe.") in scribewords + if (!chosen_rune) + return + if (chosen_rune == "none") + return + if (chosen_rune == "teleport") + dictionary[chosen_rune] += input ("Choose a destination word") in english + if (chosen_rune == "teleport other") + dictionary[chosen_rune] += input ("Choose a destination word") in english + + if(user.get_active_hand() != src) return for (var/mob/V in viewers(src)) @@ -569,9 +603,10 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", var/mob/living/carbon/human/H = user var/obj/effect/rune/R = new /obj/effect/rune(user.loc) user << "\red You finish drawing the arcane markings of the Geometer." - R.word1 = w1 - R.word2 = w2 - R.word3 = w3 + var/list/required = dictionary[chosen_rune] + R.word1 = english[required[1]] + R.word2 = english[required[2]] + R.word3 = english[required[3]] R.check_icon() R.blood_DNA = list() R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type @@ -590,8 +625,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // return // for(var/mob/M in nearby) // if(M == user) - for(var/w in words) - words[w] = T.words[w] + for(var/entry in words) + words[entry] = T.words[entry] user << "You copy the translation notes from your tome." From b3a8d295ff1f71e609bf7f4148372d5acee92b2c Mon Sep 17 00:00:00 2001 From: Sabbat Date: Thu, 12 Sep 2013 01:53:48 -0700 Subject: [PATCH 04/14] Update mind.dm --- code/datums/mind.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index bce844da53c..ba5498bda69 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -591,7 +591,7 @@ datum/mind special_role = null var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) - cult.memoize_cult_objectives(src) + cult.memorize_cult_objectives(src) current << "\red You have been brainwashed! You are no longer a cultist!" memory = "" message_admins("[key_name_admin(usr)] has de-cult'ed [current].") @@ -605,7 +605,7 @@ datum/mind current << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) - cult.memoize_cult_objectives(src) + cult.memorize_cult_objectives(src) message_admins("[key_name_admin(usr)] has de-cult'ed [current].") log_admin("[key_name_admin(usr)] has cult'ed [current].") if("tome") @@ -1055,7 +1055,7 @@ datum/mind current << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) - cult.memoize_cult_objectives(src) + cult.memorize_cult_objectives(src) else var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." current << "Objective #1: [explanation]" From 1075b5114745766c9b8a6020b1bdaf80f1fb9212 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Thu, 12 Sep 2013 02:53:16 -0700 Subject: [PATCH 05/14] Icon fix --- code/game/gamemodes/cult/ritual.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index d409053ee22..c58d291ff2a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -290,6 +290,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(word1 == wordtravel && word2 == wordother) icon_state = "1" src.icon += rgb(200, 0, 0) + return if(word1 == wordjoin && word2 == wordhide && word3 == wordtech) icon_state = "2" src.icon += rgb(100, 0, 100) @@ -577,8 +578,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", scribewords += entry var/chosen_rune = null - - + + if(usr) chosen_rune = input ("Choose a rune to scribe.") in scribewords if (!chosen_rune) @@ -589,7 +590,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", dictionary[chosen_rune] += input ("Choose a destination word") in english if (chosen_rune == "teleport other") dictionary[chosen_rune] += input ("Choose a destination word") in english - + if(user.get_active_hand() != src) return From e0e6683e2249ab30f8400ac57ad47d7ee2ef63c2 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Fri, 13 Sep 2013 19:38:03 -0700 Subject: [PATCH 06/14] Update cult.dm So Malkevin stops whining like an entitled 4 year old. --- code/game/gamemodes/cult/cult.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 5bd6324a52f..8709a7dc6f6 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -34,7 +34,7 @@ var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) var/list/startwords = list("blood","join","self","hell") - var/list/secondwords = list("travel","see","tech","destroy", "other", "hide") + var/list/secondwords = list("blood","join","self","hell")) var/list/objectives = list() @@ -95,7 +95,7 @@ for(var/datum/mind/cult_mind in cult) equip_cultist(cult_mind.current) grant_runeword(cult_mind.current) -// grant_secondword(cult_mind.current) + grant_secondword(cult_mind.current) update_cult_icons_added(cult_mind) cult_mind.current << "\blue You are a member of the cult!" memorize_cult_objectives(cult_mind) From 0794b9444faf0b8d2ce2c626323a9b5c05effb2c Mon Sep 17 00:00:00 2001 From: Sabbat Date: Wed, 18 Sep 2013 11:06:39 -0700 Subject: [PATCH 07/14] All cultists start with convert words. --- code/game/gamemodes/cult/cult.dm | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 8709a7dc6f6..6f3beab98f5 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -3,7 +3,7 @@ /datum/game_mode var/list/datum/mind/cult = list() var/list/allwords = list("travel","self","see","hell","blood","join","tech","destroy", "other", "hide") - + var/list/grantwords = list("travel", "see", "hell", "tech", "destroy", "other", "hide") /proc/iscultist(mob/living/M as mob) return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.cult) @@ -34,8 +34,8 @@ var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) var/list/startwords = list("blood","join","self","hell") - var/list/secondwords = list("blood","join","self","hell")) - + var/list/secondwords = list("travel", "see", "tech", "destroy", "other", "hide") + var/list/objectives = list() var/eldergod = 1 //for the summon god objective @@ -96,6 +96,7 @@ equip_cultist(cult_mind.current) grant_runeword(cult_mind.current) grant_secondword(cult_mind.current) + grant_thirdword(cult_mind.current) update_cult_icons_added(cult_mind) cult_mind.current << "\blue You are a member of the cult!" memorize_cult_objectives(cult_mind) @@ -121,8 +122,8 @@ explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." cult_mind.current << "Objective #[obj_count]: [explanation]" cult_mind.memory += "Objective #[obj_count]: [explanation]
" - cult_mind.current << "The convert rune is join blood self" - cult_mind.memory += "The convert rune is join blood self
" + cult_mind.current << "The Geometer of Blood grants you the knowledge to convert non-believers. (Join Blood Self)" + cult_mind.memory += "The Geometer of Blood grants you the knowledge to convert non-believers. (Join Blood Self)
" /datum/game_mode/proc/equip_cultist(mob/living/carbon/human/mob) @@ -151,26 +152,27 @@ mob.update_icons() return 1 -/datum/game_mode/cult/proc/grant_secondword(mob/living/carbon/human/cult_mob, var/word) - if (!word) - if(secondwords.len > 0) - word=pick(secondwords) - secondwords -= word - grant_runeword(cult_mob,word) /datum/game_mode/cult/grant_runeword(mob/living/carbon/human/cult_mob, var/word) if (!word) - if(startwords.len > 0) - word=pick(startwords) - startwords -= word + word="join" return ..(cult_mob,word) +/datum/game_mode/cult/proc/grant_secondword(mob/living/carbon/human/cult_mob, var/word) + if (!word) + word="blood" + grant_runeword(cult_mob,word) + +/datum/game_mode/cult/proc/grant_thirdword(mob/living/carbon/human/cult_mob, var/word) + if (!word) + word="self" + grant_runeword(cult_mob,word) /datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) if(!wordtravel) runerandom() if (!word) - word=pick(allwords) + word=pick(grantwords) var/wordexp switch(word) if("travel") @@ -197,7 +199,7 @@ // wordexp = "[wordfree] is free..." if("hide") wordexp = "[wordhide] is hide..." - cult_mob << "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]" + cult_mob << "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You catch a brief glimmer of the otherside")]... [wordexp]" cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0) From 60215f496c569acdf864126c9918fe0898532b9b Mon Sep 17 00:00:00 2001 From: Sabbat Date: Wed, 18 Sep 2013 14:21:54 -0700 Subject: [PATCH 08/14] SHOULD ACTUALLY BE FIXED NOW. --- code/game/gamemodes/cult/cult.dm | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 6f3beab98f5..18e0d3e6128 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -94,9 +94,8 @@ for(var/datum/mind/cult_mind in cult) equip_cultist(cult_mind.current) - grant_runeword(cult_mind.current) - grant_secondword(cult_mind.current) - grant_thirdword(cult_mind.current) +// grant_runeword(cult_mind.current) +// grant_secondword(cult_mind.current) update_cult_icons_added(cult_mind) cult_mind.current << "\blue You are a member of the cult!" memorize_cult_objectives(cult_mind) @@ -124,7 +123,9 @@ cult_mind.memory += "Objective #[obj_count]: [explanation]
" cult_mind.current << "The Geometer of Blood grants you the knowledge to convert non-believers. (Join Blood Self)" cult_mind.memory += "The Geometer of Blood grants you the knowledge to convert non-believers. (Join Blood Self)
" - + grant_runeword(cult_mind.current,"join") + grant_runeword(cult_mind.current,"blood") + grant_runeword(cult_mind.current,"self") /datum/game_mode/proc/equip_cultist(mob/living/carbon/human/mob) if(!istype(mob)) @@ -153,21 +154,20 @@ return 1 +//datum/game_mode/cult/proc/grant_secondword(mob/living/carbon/human/cult_mob, var/word) +// if (!word) +// if(secondwords.len > 0) +// word=pick(secondwords) +// secondwords -= word +// grant_runeword(cult_mob,word) + /datum/game_mode/cult/grant_runeword(mob/living/carbon/human/cult_mob, var/word) if (!word) - word="join" + if(startwords.len > 0) + word=pick(startwords) + startwords -= word return ..(cult_mob,word) -/datum/game_mode/cult/proc/grant_secondword(mob/living/carbon/human/cult_mob, var/word) - if (!word) - word="blood" - grant_runeword(cult_mob,word) - -/datum/game_mode/cult/proc/grant_thirdword(mob/living/carbon/human/cult_mob, var/word) - if (!word) - word="self" - grant_runeword(cult_mob,word) - /datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) if(!wordtravel) runerandom() @@ -177,14 +177,14 @@ switch(word) if("travel") wordexp = "[wordtravel] is travel..." - if("blood") - wordexp = "[wordblood] is blood..." - if("join") - wordexp = "[wordjoin] is join..." +// 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("self") +// wordexp = "[wordself] is self..." if("see") wordexp = "[wordsee] is see..." if("tech") From 7baf720ea265b79d8a81499a0379139b30fa5770 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Wed, 18 Sep 2013 14:42:30 -0700 Subject: [PATCH 09/14] Precaution (Though originally it didn't affect anything.) Commented out some shit. --- code/game/gamemodes/cult/cult.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 18e0d3e6128..3ac19977e62 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -161,12 +161,12 @@ // secondwords -= word // grant_runeword(cult_mob,word) -/datum/game_mode/cult/grant_runeword(mob/living/carbon/human/cult_mob, var/word) - if (!word) - if(startwords.len > 0) - word=pick(startwords) - startwords -= word - return ..(cult_mob,word) +//datum/game_mode/cult/grant_runeword(mob/living/carbon/human/cult_mob, var/word) +// if (!word) +// if(startwords.len > 0) +// word=pick(startwords) +// startwords -= word +// return ..(cult_mob,word) /datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) if(!wordtravel) From bf8af25556d05701bf02f2de166a06673da1270a Mon Sep 17 00:00:00 2001 From: Sabbat Date: Wed, 18 Sep 2013 15:02:45 -0700 Subject: [PATCH 10/14] Fixed. Don't code at 3PM without sleeping for over a day. --- code/game/gamemodes/cult/cult.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 3ac19977e62..478ef28072a 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -177,14 +177,14 @@ switch(word) if("travel") wordexp = "[wordtravel] is travel..." -// if("blood") -// wordexp = "[wordblood] is blood..." -// if("join") -// wordexp = "[wordjoin] is join..." + 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("self") + wordexp = "[wordself] is self..." if("see") wordexp = "[wordsee] is see..." if("tech") From a3389db817e1b9ea3f7e03f947512e61d14ef06c Mon Sep 17 00:00:00 2001 From: Sabbat Date: Thu, 19 Sep 2013 01:02:57 -0700 Subject: [PATCH 11/14] Typo fix. --- code/datums/mind.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index ba5498bda69..e639bd179a9 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -606,7 +606,7 @@ datum/mind var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) cult.memorize_cult_objectives(src) - message_admins("[key_name_admin(usr)] has de-cult'ed [current].") + message_admins("[key_name_admin(usr)] has cult'ed [current].") log_admin("[key_name_admin(usr)] has cult'ed [current].") if("tome") var/mob/living/carbon/human/H = current From ced984d835e46420b68c8aeca2857db9f21a1632 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Sat, 5 Oct 2013 18:35:01 -0700 Subject: [PATCH 12/14] Update ritual.dm --- code/game/gamemodes/cult/ritual.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index c58d291ff2a..caf7dcdab61 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -193,8 +193,11 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return itemport(src.word3) if(word1 == wordjoin && word2 == wordhide && word3 == wordtech) return runestun() + if(word1 == worddestr && word2 == wordhell && word3 == wordother) + return clown() else - user.take_overall_damage(75, 0) + user.take_overall_damage(30, 0) + user << "\red You feel the life draining from you, as if Lord Nar-Sie is displeased with you." return fizzle() @@ -295,6 +298,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", icon_state = "2" src.icon += rgb(100, 0, 100) return + if(word1 == worddestr && word2 == wordhell && word3 == wordother) + icon_state = "[rand(1,6)]" 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)) @@ -560,7 +565,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", "stun" = list("join","hide","technology"), "armor" = list("hell","destroy","other"), "teleport" = list("travel","self"), - "teleport other" = list("travel","other") + "teleport other" = list("travel","other"), ) @@ -585,6 +590,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if (!chosen_rune) return if (chosen_rune == "none") + user << "\red You decide against scribing a rune, perhaps you should take this time to study your notes." return if (chosen_rune == "teleport") dictionary[chosen_rune] += input ("Choose a destination word") in english From 862f2915f9e1d119492a682024618bfda7ae024e Mon Sep 17 00:00:00 2001 From: Sabbat Date: Sat, 5 Oct 2013 18:35:17 -0700 Subject: [PATCH 13/14] Update runes.dm --- code/game/gamemodes/cult/runes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 5426ba36b5e..925300219ee 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -1036,3 +1036,4 @@ var/list/sacrificed = list() del(src) return + From 9dc50e9ce8168c9c23177555fa8c0082e03155a2 Mon Sep 17 00:00:00 2001 From: Sabbat Date: Sat, 5 Oct 2013 18:39:09 -0700 Subject: [PATCH 14/14] Update ritual.dm --- code/game/gamemodes/cult/ritual.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index caf7dcdab61..ddd0ca0be09 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -193,8 +193,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return itemport(src.word3) if(word1 == wordjoin && word2 == wordhide && word3 == wordtech) return runestun() - if(word1 == worddestr && word2 == wordhell && word3 == wordother) - return clown() else user.take_overall_damage(30, 0) user << "\red You feel the life draining from you, as if Lord Nar-Sie is displeased with you." @@ -298,8 +296,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", icon_state = "2" src.icon += rgb(100, 0, 100) return - if(word1 == worddestr && word2 == wordhell && word3 == wordother) - icon_state = "[rand(1,6)]" 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)) @@ -565,7 +561,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", "stun" = list("join","hide","technology"), "armor" = list("hell","destroy","other"), "teleport" = list("travel","self"), - "teleport other" = list("travel","other"), + "teleport other" = list("travel","other") )