The infinite cells return proc has been set to return 1 rather than null.

Communications.dm works once again. 
Updated a few admin commands that I missed to work with the job datums.
Fixed a type path issue in the cult talismans.
Assembly remote signalers now iterate though their for loop properly.


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

code/modules/admin/admin.dm

@@ -122,15 +122,18 @@
 		var/header = "<b>Pick Job to ban this guy from.<br>"
 		var/body
 		var/jobs = ""
-		for(var/job in uniquelist(occupations + assistant_occupations))
-			if(job == "Tourist")
+		if(!job_master)
+			usr << "Job Master has not been setup!"
+			return
+		for(var/datum/job/job in job_master.occupations)
+			if(job.title == "Tourist")
 				continue
-			if(jobban_isbanned(M, job))
-				jobs += "<a href='?src=\ref[src];jobban3=[job];jobban4=\ref[M]'><font color=red>[dd_replacetext(job, " ", "&nbsp")]</font></a> "
+			if(jobban_isbanned(M, job.title))
+				jobs += "<a href='?src=\ref[src];jobban3=[job.title];jobban4=\ref[M]'><font color=red>[dd_replacetext(job.title, " ", "&nbsp")]</font></a> "
 			else
-				jobs += "<a href='?src=\ref[src];jobban3=[job];jobban4=\ref[M]'>[dd_replacetext(job, " ", "&nbsp")]</a> "
+				jobs += "<a href='?src=\ref[src];jobban3=[job.title];jobban4=\ref[M]'>[dd_replacetext(job.title, " ", "&nbsp")]</a> "
 
-		if(jobban_isbanned(M, "Captain"))
+/*		if(jobban_isbanned(M, "Captain")) These two are now jobs in the datums and should show up in the above code
 			jobs += "<a href='?src=\ref[src];jobban3=Captain;jobban4=\ref[M]'><font color=red>Captain</font></a> "
 		else
 			jobs += "<a href='?src=\ref[src];jobban3=Captain;jobban4=\ref[M]'>Captain</a> "
@@ -139,7 +142,7 @@
 			jobs += "<a href='?src=\ref[src];jobban3=AI;jobban4=\ref[M]'><font color=red>AI</font></a> "
 		else
 			jobs += "<a href='?src=\ref[src];jobban3=AI;jobban4=\ref[M]'>AI</a> "
-
+*/
 		if(jobban_isbanned(M, "Syndicate"))
 			jobs += "<BR><a href='?src=\ref[src];jobban3=Syndicate;jobban4=\ref[M]'><font color=red>[dd_replacetext("Syndicate", " ", "&nbsp")]</font></a> "
 		else
@@ -272,18 +275,19 @@
 		jobs += "<a href='?src=\ref[src];newjobban2=Scientist_RD;jobban4=\ref[M]'>Scientist+RD</a> <br>"
 		jobs += "<a href='?src=\ref[src];newjobban2=AI_Cyborg;jobban4=\ref[M]'>AI+Cyborg</a> <br>"
 		jobs += "<a href='?src=\ref[src];newjobban2=Detective_HoS;jobban4=\ref[M]'>Detective+HoS</a> <br><br>"
-		for(var/job in uniquelist(occupations + assistant_occupations))
-			if(job == "Tourist")
+		for(var/datum/job/job in job_master.occupations)
+			if(job.title == "Tourist")
 				continue
-			if(jobban_isbanned(M, job))
-				jobs += "<a href='?src=\ref[src];newjobban2=[job];jobban4=\ref[M]'><font color=red>[dd_replacetext(job, " ", "&nbsp")]</font></a> "
+			if(jobban_isbanned(M, job.title))
+				jobs += "<a href='?src=\ref[src];newjobban2=[job.title];jobban4=\ref[M]'><font color=red>[dd_replacetext(job.title, " ", "&nbsp")]</font></a> "
 			else
-				jobs += "<a href='?src=\ref[src];newjobban2=[job];jobban4=\ref[M]'>[dd_replacetext(job, " ", "&nbsp")]</a> " //why doesn't this work the stupid cunt
+				jobs += "<a href='?src=\ref[src];newjobban2=[job.title];jobban4=\ref[M]'>[dd_replacetext(job.title, " ", "&nbsp")]</a> " //why doesn't this work the stupid cunt
 
-		if(jobban_isbanned(M, "Captain"))
+/*		if(jobban_isbanned(M, "Captain"))
 			jobs += "<a href='?src=\ref[src];newjobban2=Captain;jobban4=\ref[M]'><font color=red>Captain</font></a> "
 		else
 			jobs += "<a href='?src=\ref[src];newjobban2=Captain;jobban4=\ref[M]'>Captain</a> " //why doesn't this work the stupid cunt
+*/
 		if(jobban_isbanned(M, "Syndicate"))
 			jobs += "<BR><a href='?src=\ref[src];newjobban2=Syndicate;jobban4=\ref[M]'><font color=red>[dd_replacetext("Syndicate", " ", "&nbsp")]</font></a> "
 		else

code/modules/admin/verbs/randomverbs.dm

@@ -558,9 +558,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if (!authenticated || !holder)
 		src << "Only administrators may use this command."
 		return
-
-	for(var/t in occupations)
-		src << "[t]: [occupations[t]]"
+	if(job_master)
+		for(var/datum/job/job in job_master.occupations)
+			src << "[job.title]: [job.total_positions]"
 
 /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world)
 	set category = "Special Verbs"

code/modules/admin/verbs/tripAI.dm

@@ -5,12 +5,18 @@
 	if(ticker.current_state > GAME_STATE_PREGAME)
 		usr << "This option is currently only usable during pregame. This may change at a later date."
 		return
-	if (occupations["AI"] > 1)
-		occupations["AI"] -= 2
-		usr << "Only one AI will be spawned at round start."
-		message_admins("\blue [key_name_admin(usr)] has toggled off triple AIs at round start.", 1)
-	else
-		occupations["AI"] += 2
-		usr << "There will be an AI Triumvirate at round start."
-		message_admins("\blue [key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
+	if(job_master)
+		var/datum/job/job = job_master.GetJob("AI")
+		if(!job)
+			usr << "Unable to locate the AI job"
+			return
+
+		if(job.spawn_positions >= 3)
+			job.spawn_positions -= 2
+			usr << "Only one AI will be spawned at round start."
+			message_admins("\blue [key_name_admin(usr)] has toggled off triple AIs at round start.", 1)
+		else
+			job.spawn_positions += 2
+			usr << "There will be an AI Triumvirate at round start."
+			message_admins("\blue [key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
 	return

code/modules/assembly/signaler.dm

@@ -102,7 +102,6 @@
 			if((S.frequency == src.frequency) && (S.code == src.code))
 				spawn(0)
 					S.pulse(0)
-				return 1
 		return 0