Lawyer now has a purple suit and the job has two slots.

Lowered the number of spare jumpsuits in most of the lockers from 6 to 3.
The old arrival message is now back in.
Finished the Ion Rifle and added one to the armory.  Might need to change it up a bit depending on how well it works.
Bullet_act worked on a bit, EMP effects should work now.
Cyborgs are stunned by EMPs.
Raised the changelings required genome number for multichan at the request of Urist. 


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

code/modules/power/singularity/field_generator.dm

@@ -175,6 +175,12 @@ field_generator power level display
 		if(Proj.flag != "bullet")
 			power += Proj.damage
 			update_icon()
+		if(Proj.effects["emp"])
+			var/emppulse = Proj.effects["emp"]
+			if(prob(Proj.effectprob["emp"]))
+				empulse(src, emppulse, emppulse)
+			else
+				empulse(src, 0, emppulse)
 		return
 
 

code/modules/power/singularity/singularity.dm

@@ -31,6 +31,7 @@ var/global/list/uneatable = list(
 		consume_range = 0 //How many tiles out do we eat
 		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
 
 
 	New(loc, var/starting_energy = 50, var/temp = 0)
@@ -269,10 +270,17 @@ var/global/list/uneatable = list(
 		move(var/movement_dir = 0)
 			if(!move_self)
 				return 0
-			if(!(movement_dir in cardinal))
-				movement_dir = pick(NORTH, SOUTH, EAST, WEST)
+
 			if(target && prob(80))
 				movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
+			else if(!(movement_dir in cardinal))
+				movement_dir = pick(NORTH, SOUTH, EAST, WEST)
+
+			if(movement_dir == last_failed_movement)
+				var/list/L = new/list(NORTH, SOUTH, EAST, WEST)
+				L.Remove(last_failed_movement)
+				movement_dir = pick(L)
+
 			if(current_size >= 9)//The superlarge one does not care about things in its way
 				spawn(0)
 					step(src, movement_dir)
@@ -280,9 +288,12 @@ var/global/list/uneatable = list(
 					step(src, movement_dir)
 				return 1
 			else if(check_turfs_in(movement_dir))
+				last_failed_movement = 0//Reset this because we moved
 				spawn(0)
 					step(src, movement_dir)
 				return 1
+			else
+				last_failed_movement = movement_dir
 			return 0