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/game/gamemodes/blob/blob.dm

@@ -122,7 +122,9 @@
 
 
 /datum/game_mode/blob/check_finished()
-	if((stage >= 4)||(stage <= 1))
+	if(stage <= 1)
+		return 0
+	if(stage >= 4)
 		return 1
 
 	for(var/obj/blob/B in blobs)

code/game/gamemodes/blob/theblob.dm

@@ -105,6 +105,7 @@
 
 	bullet_act(var/obj/item/projectile/Proj)
 		health -= Proj.damage
+		..()
 		update()
 
 

code/game/gamemodes/changeling/changeling.dm

@@ -77,7 +77,7 @@
 
 	var/datum/objective/absorb/absorb_objective = new
 	absorb_objective.owner = changeling
-	absorb_objective.gen_amount_goal()
+	absorb_objective.gen_amount_goal(8,12)
 	changeling.objectives += absorb_objective
 
 	switch(rand(1,100))

code/game/gamemodes/events/ninja_equipment.dm

@@ -1382,6 +1382,7 @@ It is possible to destroy the net by the occupant or someone else.
 
 	bullet_act(var/obj/item/projectile/Proj)
 		health -= Proj.damage
+		..()
 		healthcheck()
 		return
 

code/game/gamemodes/objective.dm

@@ -410,8 +410,8 @@ datum/objective/capture
 
 
 datum/objective/absorb
-	proc/gen_amount_goal()  //this doesn't work -- should work now, changed it a bit -- Urist
-		target_amount = rand (4,6)
+	proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
+		target_amount = rand (lowbound,highbound)
 		if (ticker)
 			var/n_p = 1 //autowin
 			if (ticker.current_state == GAME_STATE_SETTING_UP)
@@ -433,6 +433,8 @@ datum/objective/absorb
 		else
 			return 0
 
+
+
 /* Isn't suited for global objectives
 /*---------CULTIST----------*/
 

code/game/gamemodes/traitor/traitor.dm

@@ -5,7 +5,7 @@
 /datum/game_mode/traitor
 	name = "traitor"
 	config_tag = "traitor"
-	restricted_jobs = list("Cyborg", "Security Officer", "Warden", "Detective", "Head of Security")//Approved by headmins for a week test
+	restricted_jobs = list("Cyborg", "AI", "Security Officer", "Warden", "Detective", "Head of Security")//Approved by headmins for a week test, if you see this it would be nice if you didn't spread it everywhere
 	required_players = 0
 	required_enemies = 1