-Ghosted queens don't count towards drones not being able to evolve.

-Changed facehuggers slightly. They eventually go active again.

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

code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm

@@ -26,8 +26,13 @@
 
 	if(powerc(500))
 		// Queen check
-		var/mob/living/carbon/alien/humanoid/queen/Q = locate(/mob/living/carbon/alien/humanoid/queen) in living_mob_list
-		if(!Q)
+		var/no_queen = 1
+		for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list)
+			if(!Q.key && Q.brain_op_stage != 4)
+				continue
+			no_queen = 0
+
+		if(no_queen)
 			adjustToxLoss(-500)
 			src << "\green You begin to evolve!"
 			for(var/mob/O in viewers(src, null))

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -174,9 +174,6 @@ var/const/MAX_ACTIVE_TIME = 600
 		if(alien && alien.client)
 			alien.client.images += activeIndicator	*/
 
-	spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
-		GoIdle()
-
 	return
 
 /obj/item/clothing/mask/facehugger/proc/GoIdle()
@@ -187,6 +184,8 @@ var/const/MAX_ACTIVE_TIME = 600
 
 	stat = UNCONSCIOUS
 
+	spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
+		GoActive()
 	return
 
 /obj/item/clothing/mask/facehugger/proc/Die()