From 26aee9cb33bf921e53b8b0840f145747ca7c6b38 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sat, 7 Jan 2017 18:40:03 -0500
Subject: [PATCH] i want to see it play live

reverts convert change i want to see it live first
Fixes https://github.com/ParadiseSS13/Paradise/issues/6107
---
 code/game/gamemodes/cult/runes.dm        | 13 ++-----------
 code/game/gamemodes/setupgame.dm         |  2 +-
 code/modules/power/singularity/narsie.dm |  2 ++
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index b61a72db8f4..50294159fd4 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -316,8 +316,7 @@ var/list/teleport_runes = list()
 	cultist_desc = "converts a normal crewmember on top of it to the cult. Does not work on loyalty-implanted crew."
 	invocation = "Mah'weyh pleggh at e'ntrath!"
 	icon_state = "3"
-	req_cultists = 1
-	allow_excess_invokers = 1
+	req_cultists = 2
 
 /obj/effect/rune/convert/do_invoke_glow()
 	return
@@ -325,12 +324,6 @@ var/list/teleport_runes = list()
 /obj/effect/rune/convert/invoke(var/list/invokers)
 	var/list/convertees = list()
 	var/turf/T = get_turf(src)
-	var/convert_time = 300
-
-	if(invokers.len == 2)
-		convert_time  = 150
-	else if(invokers.len > 3)
-		convert_time = 0
 
 	for(var/mob/living/M in T.contents)
 		if(!iscultist(M) && !isloyal(M))
@@ -349,9 +342,7 @@ var/list/teleport_runes = list()
 		log_game("Convert rune failed - convertee could not be converted")
 		return
 	..()
-	if(!do_after(usr, convert_time, target = src))
-		to_chat(usr, "<span class='warning'>The victim was moved!</span>")
-		return
+
 	new_cultist.visible_message("<span class='warning'>[new_cultist] writhes in pain as the markings below them glow a bloody red!</span>", \
 					  			"<span class='cultlarge'><i>AAAAAAAAAAAAAA-</i></span>")
 	ticker.mode.add_cultist(new_cultist.mind, 1)
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index 688566163a8..3bfb4e2fd4e 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -153,5 +153,5 @@
 	var/random_cult = pick(all_cults)
 	var/picked_cult = new random_cult() //this seems redundent as fuck
 	if(!picked_cult)//shouldn't happen BUT JUST TO BE SURE LET US KNOW
-		log_startup_progress(" Failed to select a cult datum, Shank a coder!")
+		warning(" Failed to select a cult datum, Shank a coder!")
 	return picked_cult
\ No newline at end of file
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index ee8f6d96c67..00028e58afd 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -123,6 +123,8 @@
 
 
 /obj/singularity/narsie/proc/acquire(var/mob/food)
+	if(food == target)
+		return
 	to_chat(target, "<span class='cultlarge'>[uppertext(ticker.mode.cultdat.entity_name)] HAS LOST INTEREST IN YOU</span>")
 	target = food
 	if(ishuman(target))