Some changes to cult mode.

Fixed cyborgs just pressing cancel when choosing AIs.
Midis setting now carries over when ghosting.
Can now check if a borg is emagged from the player panel.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@367 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/procs/helpers.dm

@@ -574,7 +574,7 @@
 		ais[name] = A
 
 	if (ais.len)
-		select = input("AI signals detected:", "AI selection", null, null) as null|anything in ais
+		select = input("AI signals detected:", "AI selection") in ais
 		return ais[select]
 
 /proc/getmobs()

code/game/gamemodes/cult/cult.dm

@@ -158,11 +158,26 @@
 	if(!(cult_mind in cult) && !(cult_mind in uncons))
 		cult += cult_mind
 		update_cult_icons_added(cult_mind)
+		for(var/obj_count = 1,obj_count <= objectives.len,obj_count++)
+			var/explanation
+			switch(objectives[obj_count])
+				if("survive")
+					explanation = "Our knowledge must live on. Make sure at least [acolytes_needed] acolytes escape on the shuttle to spread their work on an another station."
+				if("sacrifice")
+					if(sacrifice_target)
+						explanation = "Sacrifice [sacrifice_target.current.real_name], the [sacrifice_target.assigned_role]. You will need the sacrifice rune (Hell join blood) and three acolytes to do so."
+					else
+						explanation = "Free objective."
+				if("eldergod")
+					explanation = "Summon Nar-Sie via the use of an appropriate rune. It will only work if nine cultists stand on and around it."
+			cult_mind.current << "<B>Objective #[obj_count]</B>: [explanation]"
+			cult_mind.memory += "<B>Objective #[obj_count]</B>: [explanation]<BR>"
 
 /datum/game_mode/cult/proc/remove_cultist(datum/mind/cult_mind)
 	if(cult_mind in cult)
 		cult -= cult_mind
 		cult_mind.current << "\red <FONT size = 3><B>You have been brainwashed! You are no longer a cultist!</B></FONT>"
+		cult_mind.memory = ""
 		update_cult_icons_removed(cult_mind)
 		for(var/mob/living/M in view(cult_mind.current))
 			M << "<FONT size = 3>[cult_mind.current] looks like they just reverted to their old faith!</FONT>"

code/game/objects/items/robot_parts.dm

@@ -119,12 +119,16 @@
 
 	if(istype(W, /obj/item/brain))
 		if(src.check_completion())
+			if(!istype(src.loc,/turf))
+				user << "\red You can't put the brain in, it has to be standing on the ground to be perfectly precise."
+				return
 			user.drop_item()
 			W.loc = src
 			src.brain = W
 			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(src.loc))
 			if (src.brain.owner)
 				O.gender = src.brain.owner.gender
+				O.midis = src.brain.owner.midis
 			//O.start = 1
 			O.invisibility = 0
 			O.name = "Cyborg"

code/game/objects/storage/bible.dm

@@ -45,7 +45,10 @@
 
 	if (M.stat !=2)
 		if (ticker.mode.name == "cult" && prob(10))
-			ticker.mode:remove_cultist(M.mind)
+			if(ticker.mode:cult.Find(M.mind))
+				ticker.mode:remove_cultist(M.mind)
+		if (cultists.Find(M) && prob(10))
+			cultists -= M
 		if ((istype(M, /mob/living/carbon/human) && prob(60)))
 			bless(M)
 			for(var/mob/O in viewers(M, null))

code/modules/admin/admin.dm

@@ -704,6 +704,11 @@ var/showadminmessages = 1
 				if(M.mind in current_mode:syndicates)
 					alert("Is a Syndicate operative!", "[M.key]")
 					return
+		if(istype(M,/mob/living/silicon/robot))
+			var/mob/living/silicon/robot/R = M
+			if(R.emagged)
+				alert("Is emagged!\n0th law: [R.laws.zeroth]", "[R.key]")
+				return
 		// traitor, or other modes where traitors/counteroperatives would be.
 		if(M.mind in current_mode.traitors)
 			var/datum/mind/antagonist = M.mind
@@ -2000,6 +2005,10 @@ var/showadminmessages = 1
 		if("changeling")
 			if(M.mind in ticker.mode:changelings)
 				return 1
+	if(istype(M,/mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = M
+		if(R.emagged)
+			return 1
 	if(M.mind in ticker.mode.traitors)
 		return 1
 

code/modules/admin/admin_verbs.dm

@@ -825,6 +825,8 @@
 					M << "\red You remembered one thing from the glimpse... [wordsee] is see..."
 			cultists.Add(M)
 			src << "Made [M] a cultist."
+			if(ticker.mode.name == "cult")
+				ticker.mode:cult += M.mind
 
 /client/proc/check_words() // -- Urist
 	set category = "Special Verbs"

code/modules/mob/dead/observer/observer.dm

@@ -10,6 +10,7 @@
 		src.loc = get_turf(corpse.loc)
 		src.real_name = corpse.real_name
 		src.name = corpse.real_name
+		src.midis = corpse.midis
 		src.verbs += /mob/dead/observer/proc/reenter_corpse
 
 /mob/proc/ghostize()