diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 36317ec9ca7..262c90379c3 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -187,7 +187,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
user << "You are unable to speak the words of the rune."
return
if(!word1 || !word2 || !word3 || prob(user.getBrainLoss()))
- return fizzle()
+ return fizzle(user)
if(word1 == wordtravel && word2 == wordself)
return teleport(src.word3)
if(word1 == wordsee && word2 == wordblood && word3 == wordhell)
@@ -241,16 +241,18 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
else
user.take_overall_damage(30, 0)
user << "You feel the life draining from you, as if Lord Nar-Sie is displeased with you."
- return fizzle()
+ return fizzle(user)
-/obj/effect/rune/proc/fizzle()
- if(istype(src,/obj/effect/rune))
- usr.say(pick("B'ADMINES SP'WNIN SH'T","IC'IN O'OC","RO'SHA'M I'SA GRI'FF'N ME'AI","TOX'IN'S O'NM FI'RAH","IA BL'AME TOX'IN'S","FIR'A NON'AN RE'SONA","A'OI I'RS ROUA'GE","LE'OAN JU'STA SP'A'C Z'EE SH'EF","IA PT'WOBEA'RD, IA A'DMI'NEH'LP"))
- else
- usr.whisper(pick("B'ADMINES SP'WNIN SH'T","IC'IN O'OC","RO'SHA'M I'SA GRI'FF'N ME'AI","TOX'IN'S O'NM FI'RAH","IA BL'AME TOX'IN'S","FIR'A NON'AN RE'SONA","A'OI I'RS ROUA'GE","LE'OAN JU'STA SP'A'C Z'EE SH'EF","IA PT'WOBEA'RD, IA A'DMI'NEH'LP"))
- for (var/mob/V in viewers(src))
- V.show_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2)
+/obj/effect/rune/proc/fizzle(var/mob/living/cultist = null)
+ var/gibberish = pick("B'ADMINES SP'WNIN SH'T","IC'IN O'OC","RO'SHA'M I'SA GRI'FF'N ME'AI","TOX'IN'S O'NM FI'RAH","IA BL'AME TOX'IN'S","FIR'A NON'AN RE'SONA","A'OI I'RS ROUA'GE","LE'OAN JU'STA SP'A'C Z'EE SH'EF","IA PT'WOBEA'RD, IA A'DMI'NEH'LP")
+
+ if(cultist)
+ if(istype(src,/obj/effect/rune))
+ cultist.say(gibberish)
+ else
+ cultist.whisper(gibberish)
+ visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2)
return
/obj/effect/rune/proc/check_icon()
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 9209b4f3df2..e899e1a7be2 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -31,7 +31,7 @@ var/list/sacrificed = list()
user.loc = allrunesloc[rand(1,index)]
return
if(istype(src,/obj/effect/rune))
- return fizzle() //Use friggin manuals, Dorf, your list was of zero length.
+ return fizzle(user) //Use friggin manuals, Dorf, your list was of zero length.
else
call(/obj/effect/rune/proc/fizzle)()
return
@@ -53,7 +53,7 @@ var/list/sacrificed = list()
IP = R
runecount++
if(runecount >= 2)
- user << "You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
+ user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric"
if (istype(user, /mob/living))
user.take_overall_damage(5, 0)
qdel(src)
@@ -61,7 +61,7 @@ var/list/sacrificed = list()
if(iscultist(C) && !C.stat)
culcount++
if(user.loc==src.loc)
- return fizzle()
+ return fizzle(user)
if(culcount>=1)
user.say("Sas[pick("'","`")]so c'arta forbici tarem!")
user.visible_message("You feel air moving from the rune - like as it was swapped with somewhere else.", \
@@ -74,7 +74,7 @@ var/list/sacrificed = list()
M.loc = IP.loc
return
- return fizzle()
+ return fizzle(user)
/////////////////////////////////////////SECOND RUNE
@@ -152,9 +152,10 @@ var/list/sacrificed = list()
/obj/effect/rune/proc/tearreality()
var/list/mob/living/carbon/human/cultist_count = list()
+ var/mob/living/user = usr
+ user.say("Tok-lyr rqa'nap g[pick("'","`")]lt-ulotf!")
for(var/mob/M in range(1,src))
if(iscultist(M) && !M.stat)
- M.say("Tok-lyr rqa'nap g[pick("'","`")]lt-ulotf!")
cultist_count += M
if(cultist_count.len >= 9)
if(ticker.mode.name == "cult")
@@ -374,7 +375,7 @@ var/list/sacrificed = list()
return
if(istype(src,/obj/effect/rune))
- return fizzle()
+ return fizzle()
else
call(/obj/effect/rune/proc/fizzle)()
return
@@ -769,7 +770,7 @@ var/list/sacrificed = list()
return
return
if(istype(W,/obj/effect/rune))
- return fizzle()
+ return fizzle()
if(istype(W,/obj/item/weapon/paper/talisman))
call(/obj/effect/rune/proc/fizzle)()
return
@@ -802,7 +803,7 @@ var/list/sacrificed = list()
if(users.len>=1)
var/mob/living/carbon/cultist = input("Choose the one who you want to free", "Followers of Geometer") as null|anything in (cultists - users)
if(!cultist)
- return fizzle()
+ return fizzle(user)
if (cultist == user) //just to be sure.
return
if(!(cultist.buckled || \
@@ -835,7 +836,7 @@ var/list/sacrificed = list()
user.take_overall_damage(15, 0)
C.say("Khari[pick("'","`")]d! Gual'te nikka!")
qdel(src)
- return fizzle()
+ return fizzle(user)
/////////////////////////////////////////NINETEENTH RUNE
@@ -852,12 +853,12 @@ var/list/sacrificed = list()
if(users.len>=3)
var/mob/living/carbon/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - user)
if(!cultist)
- return fizzle()
+ return fizzle(user)
if(cultist == user) //just to be sure.
return
if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet)))
user << "You cannot summon the [cultist], for his shackles of blood are strong"
- return fizzle()
+ return fizzle(user)
cultist.loc = src.loc
cultist.Weaken(5)
cultist.regenerate_icons()
@@ -869,7 +870,7 @@ var/list/sacrificed = list()
"You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
"You hear a pop and smell ozone.")
qdel(src)
- return fizzle()
+ return fizzle(user)
/////////////////////////////////////////TWENTIETH RUNES