Had an extra arg going into the job selection proc.

Turned off the new del test on the singularity for now.
Bit of work on the signalers.	
Jetpacks edited to use less fuel.


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

code/modules/assembly/signaler.dm

@@ -24,13 +24,13 @@
 
 
 	activate()
-		if(!..())	return 0//Cooldown check
+		if(cooldown > 0)	return 0
+		cooldown = 2
+		spawn(10)
+			process_cooldown()
+
 		signal()
-		pulse(0)
-		if(istype(src.loc, /obj/machinery/door/airlock) && src.airlock_wire && src.wires)
-			var/obj/machinery/door/airlock/A = src.loc
-			A.pulse(src.airlock_wire)
-//		pulse(1)//?
+
 		return 1
 
 
@@ -67,34 +67,32 @@
 
 
 	Topic(href, href_list)
-		//..()
-		if(usr.stat)
+		..()
+
+		if(get_dist(src, usr) > 1)
+			usr << browse(null, "window=signal")
+			onclose(usr, "signal")
 			return
-		if ((usr.contents.Find(src) || (usr.contents.Find(src.holder) || (in_range(src, usr) && istype(src.loc, /turf)))))
-			usr.machine = src
-			if (href_list["freq"])
-				src.frequency += text2num(href_list["freq"])
-				src.frequency = round(src.frequency)
-				src.frequency = min(100, src.frequency)
-				src.frequency = max(1, src.frequency)
-				return
 
-			if(href_list["code"])
-				src.code += text2num(href_list["code"])
-				src.code = round(src.code)
-				src.code = min(100, src.code)
-				src.code = max(1, src.code)
+		if (href_list["freq"])
+			src.frequency += text2num(href_list["freq"])
+			src.frequency = round(src.frequency)
+			src.frequency = min(100, src.frequency)
+			src.frequency = max(1, src.frequency)
 
-			if(href_list["send"])
-				spawn( 0 )
-					send_signal()
-					return
+		if(href_list["code"])
+			src.code += text2num(href_list["code"])
+			src.code = round(src.code)
+			src.code = min(100, src.code)
+			src.code = max(1, src.code)
+
+		if(href_list["send"])
+			spawn( 0 )
+				signal()
+
+		if(usr)
+			attack_self(usr)
 
-//					if(href_list["listen"])
-//						src.listening = text2num(href_list["listen"])
-		else
-			usr << browse(null, "window=radio")
-			return
 		return
 
 	proc/signal()//will have to do for now
@@ -102,6 +100,16 @@
 			if(!S)	continue
 			if(S == src)	continue
 			if((S.frequency == src.frequency) && (S.code == src.code))
-				S.pulsed(1)
+				spawn(0)
+					S.pulse(0)
 				return 1
-		return 0
+		return 0
+
+
+	pulse(var/radio = 0)
+		if(istype(src.loc, /obj/machinery/door/airlock) && src.airlock_wire && src.wires)
+			var/obj/machinery/door/airlock/A = src.loc
+			A.pulse(src.airlock_wire)
+		else
+			holder.process_activation(src, 1, 0)
+		return 1

code/modules/mob/new_player/new_player.dm

@@ -217,7 +217,7 @@
 
 	proc/AttemptLateSpawn(rank)
 		var/datum/job/job = job_master.GetJob(rank)
-		if(job && ((job.title == "Assistant") || (job.current_positions < job.total_positions)))
+		if(job && (job.current_positions < job.total_positions))
 			var/mob/living/carbon/human/character = create_character()
 			var/icon/char_icon = getFlatIcon(character,0)//We're creating out own cache so it's not needed.
 			if(job_master.AssignRole(character, rank, 1))

code/modules/power/singularity/singularity.dm

@@ -31,7 +31,7 @@ var/global/list/uneatable = list(
 		event_chance = 15 //Prob for event each tick
 		target = null //its target. moves towards the target if it has one
 		last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
-		teleport_del = 1
+		teleport_del = 0
 
 	New(loc, var/starting_energy = 50, var/temp = 0)
 		src.energy = starting_energy