Merge pull request #4766 from Cheridan/cult_spam

Horrible Cult Spam Fix

code/game/gamemodes/cult/ritual.dm

@@ -187,7 +187,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 		user << "<span class='notice'>You are unable to speak the words of the rune.</span>"
 		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 << "<span class='danger'>You feel the life draining from you, as if Lord Nar-Sie is displeased with you.</span>"
-		return fizzle()
+		return fizzle(user)
 
 
-/obj/effect/rune/proc/fizzle()
+/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))
-		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"))
+			cultist.say(gibberish)
 		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"))
+			cultist.whisper(gibberish)
-	for (var/mob/V in viewers(src))
+	visible_message("<span class='danger'>The markings pulse with a small burst of light, then fall dark.</span>", 3, "<span class='danger'>You hear a faint fizzle.</span>", 2)
-		V.show_message("<span class='danger'>The markings pulse with a small burst of light, then fall dark.</span>", 3, "<span class='danger'>You hear a faint fizzle.</span>", 2)
 	return
 
 /obj/effect/rune/proc/check_icon()

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 << "<span class='danger'>You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric</span>"
+		user << "<span class='danger'>You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric</span>"
 		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("<span class='danger'>You feel air moving from the rune - like as it was swapped with somewhere else.</span>", \
@@ -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")
@@ -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 << "<span class='danger'>You cannot summon the [cultist], for his shackles of blood are strong</span>"
-			return fizzle()
+			return fizzle(user)
 		cultist.loc = src.loc
 		cultist.Weaken(5)
 		cultist.regenerate_icons()
@@ -869,7 +870,7 @@ var/list/sacrificed = list()
 		"<span class='danger'>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.</span>", \
 		"<span class='danger'>You hear a pop and smell ozone.</span>")
 		qdel(src)
-	return fizzle()
+	return fizzle(user)
 
 /////////////////////////////////////////TWENTIETH RUNES