Added Wjohntsons little toy mechas.

Removed restrictions for cultists, anyone can be converted now.

Bibles no longer deconvert cultists to stop the random bible smashing from ruining rounds

Soulstones can no longer capture the manifested ghosts. No more infinite constructs.

Removed the telecomm traffic control from the map until its fixed.

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

code/defines/obj/toy.dm

@@ -4,6 +4,68 @@
 	throw_range = 20
 	force = 0
 
+
+/////////Toy Mechs/////////
+
+/obj/item/toy/prize
+	icon = 'toy.dmi'
+	icon_state = "ripleytoy"
+
+/obj/item/toy/prize/ripley
+	name = "toy ripley"
+	desc = "Mini-Mecha action figure! Collect them all! 1/11"
+
+/obj/item/toy/prize/fireripley
+	name = "toy firefighting ripley"
+	desc = "Mini-Mecha action figure! Collect them all! 2/11"
+	icon_state = "fireripleytoy"
+
+/obj/item/toy/prize/deathripley
+	name = "toy deathsquad ripley"
+	desc = "Mini-Mecha action figure! Collect them all! 3/11"
+	icon_state = "deathripleytoy"
+
+/obj/item/toy/prize/gygax
+	name = "toy gygax"
+	desc = "Mini-Mecha action figure! Collect them all! 4/11"
+	icon_state = "gygaxtoy"
+
+/obj/item/toy/prize/durand
+	name = "toy gygax"
+	desc = "Mini-Mecha action figure! Collect them all! 5/11"
+	icon_state = "durandprize"
+
+/obj/item/toy/prize/honk
+	name = "toy H.O.N.K."
+	desc = "Mini-Mecha action figure! Collect them all! 6/11"
+	icon_state = "honkprize"
+
+/obj/item/toy/prize/marauder
+	name = "toy marauder"
+	desc = "Mini-Mecha action figure! Collect them all! 7/11"
+	icon_state = "marauderprize"
+
+/obj/item/toy/prize/seraph
+	name = "toy seraph"
+	desc = "Mini-Mecha action figure! Collect them all! 8/11"
+	icon_state = "seraphprize"
+
+/obj/item/toy/prize/mauler
+	name = "toy mauler"
+	desc = "Mini-Mecha action figure! Collect them all! 9/11"
+	icon_state = "maulerprize"
+
+/obj/item/toy/prize/odysseus
+	name = "toy odysseus"
+	desc = "Mini-Mecha action figure! Collect them all! 10/11"
+	icon_state = "odysseusprize"
+
+/obj/item/toy/prize/phazon
+	name = "toy phazon"
+	desc = "Mini-Mecha action figure! Collect them all! 11/11"
+	icon_state = "phazonprize"
+
+
 /obj/item/toy/syndicateballoon
 	name = "syndicate balloon"
 	desc = "There is a tag on the back that reads \"FUK NT!11!\"."

code/game/gamemodes/cult/cult.dm

@@ -9,10 +9,10 @@
 
 /proc/is_convertable_to_cult(datum/mind/mind)
 	if(!istype(mind))	return 0
-	if(istype(mind.current, /mob/living/carbon/human) && (mind.assigned_role in list("Captain", "Head of Security", "Security Officer", "Detective", "Chaplain", "Warden")))	return 0
+	/*if(istype(mind.current, /mob/living/carbon/human) && (mind.assigned_role in list("Captain", "Head of Security", "Security Officer", "Detective", "Chaplain", "Warden")))	return 0
 	for(var/obj/item/weapon/implant/loyalty/L in mind.current)
 		if(L && L.implanted)
-			return 0
+			return 0 */
 	return 1
 
 

code/game/gamemodes/wizard/soulstone.dm

@@ -15,6 +15,8 @@
 	attack(mob/living/carbon/human/M as mob, mob/user as mob)
 		if(!istype(M, /mob/living/carbon/human))//If target is not a human.
 			return ..()
+		if(istype(M, /mob/living/carbon/human/dummy))
+			return..()
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their soul captured with [src.name] by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to capture the soul of [M.name] ([M.ckey])</font>")
 

code/game/objects/storage/bible.dm

@@ -48,10 +48,10 @@
 		if(M.mind && (M.mind.assigned_role == "Chaplain"))
 			user << "\red You can't heal yourself!"
 			return
-		if((M.mind in ticker.mode.cult) && (prob(20)))
+		/*if((M.mind in ticker.mode.cult) && (prob(20)))
 			M << "\red The power of [src.deity_name] clears your mind of heresy!"
 			user << "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!"
-			ticker.mode.remove_cultist(M.mind)
+			ticker.mode.remove_cultist(M.mind)*/
 		if ((istype(M, /mob/living/carbon/human) && prob(60)))
 			bless(M)
 			for(var/mob/O in viewers(M, null))